fix: --with-short-names not compatible with fzf (#79)

When kubectx is installed as kctx, FZF_DEFAULT_COMMAND=kubectx won't work. Fixes #78. Signed-off-by: Ahmet Alp Balkan <[email protected]>
ahmetb · Aug 24, 2018 · f01719a · f01719a
1 parent 46d5933
commit f01719a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/kubectx b/kubectx
@@ -21,6 +21,7 @@
 set -eou pipefail
 IFS=$'\n\t'
 
+SELF_CMD="$0"
 KUBECTX="${HOME}/.kube/kubectx"
 
 usage() {
@@ -91,7 +92,7 @@ switch_context() {
 
 choose_context_interactive() {
   local choice
-  choice="$(FZF_DEFAULT_COMMAND='kubectx' fzf --ansi || true)"
+  choice="$(FZF_DEFAULT_COMMAND="${SELF_CMD}" fzf --ansi || true)"
   if [[ -z "${choice}" ]]; then
     echo 2>&1 "error: you did not choose any of the options"
     exit 1

diff --git a/kubens b/kubens
@@ -21,6 +21,7 @@
 set -eou pipefail
 IFS=$'\n\t'
 
+SELF_CMD="$0"
 KUBENS_DIR="${HOME}/.kube/kubens"
 
 usage() {
@@ -95,7 +96,7 @@ choose_namespace_interactive() {
   fi
 
   local choice
-  choice="$(FZF_DEFAULT_COMMAND='kubens' fzf --ansi || true)"
+  choice="$(FZF_DEFAULT_COMMAND="${SELF_CMD}" fzf --ansi || true)"
   if [[ -z "${choice}" ]]; then
     echo 2>&1 "error: you did not choose any of the options"
     exit 1