Detect invocation style only in usage() (#183)

- removes global SELF variable - fixes #181 Signed-off-by: Ahmet Alp Balkan <[email protected]>
ahmetb · Nov 11, 2019 · 56e30d2 · 56e30d2
1 parent dcb43fd
commit 56e30d2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/kubectx b/kubectx
@@ -22,14 +22,16 @@ set -eou pipefail
 IFS=$'\n\t'
 
 SELF_CMD="$0"
-SELF="kubectx"
-if [[ "$(basename "$0")" == kubectl-* ]]; then # invoked as plugin
-  SELF="kubectl ctx"
-fi
 
 KUBECTX="${XDG_CACHE_HOME:-$HOME/.kube}/kubectx"
 
 usage() {
+  local SELF
+  SELF="kubectx"
+  if [[ "$(basename "$0")" == kubectl-* ]]; then # invoked as plugin
+    SELF="kubectl ctx"
+  fi
+
   cat <<EOF
 USAGE:
   $SELF                       : list the contexts

diff --git a/kubens b/kubens
@@ -22,14 +22,16 @@ set -eou pipefail
 IFS=$'\n\t'
 
 SELF_CMD="$0"
-SELF="kubens"
-if [[ "$(basename "$0")" == kubectl-* ]]; then # invoked as plugin
-  SELF="kubectl ns"
-fi
 
 KUBENS_DIR="${XDG_CACHE_HOME:-$HOME/.kube}/kubens"
 
 usage() {
+  local SELF
+  SELF="kubens"
+  if [[ "$(basename "$0")" == kubectl-* ]]; then # invoked as plugin
+    SELF="kubectl ns"
+  fi
+
   cat <<EOF
 USAGE:
   $SELF                    : list the namespaces in the current context