Refactor JFrog CLI completion configuration

jfrog-oauth/run.sh

@@ -101,10 +101,9 @@ fi
 # Configure the JFrog CLI completion
 echo "📦 Configuring JFrog CLI completion..."
 jf completion $SHELL --install
-# Append the completion script to the shell profile if its bash or zsh if it isn't already there.
+SHELLNAME=$(basename $SHELL)
-if [ "$SHELL" = "/bin/bash" ] || [ "$SHELL" = "/bin/zsh" ]; then
+if [ "$SHELLNAME" == "bash" ] || [ "$SHELLNAME" == "zsh" ]; then
-  if ! grep -q "source $HOME/.jfrog/jfrog_$${SHELL}_completion" ~/.$${SHELL}rc; then
+  if ! grep -q "source $HOME/.jfrog/jfrog_$${SHELLNAME}_completion" ~/.$${SHELLNAME}rc; then
-    echo "📦 Adding JFrog CLI completion to shell profile..."
+    echo "source $HOME/.jfrog/jfrog_$${SHELLNAME}_completion" >> ~/.$${SHELLNAME}rc
-    echo "source $HOME/.jfrog/jfrog_$${SHELL}_completion" >> ~/.$${SHELL}rc
   fi
 fi

jfrog-token/run.sh

@@ -101,11 +101,8 @@ fi
 # Configure the JFrog CLI completion
 echo "📦 Configuring JFrog CLI completion..."
 jf completion $SHELL --install
-# Append the completion script to the shell profile if its bash or zsh if it isn't already there.
+if [ "$SHELLNAME" == "bash" ] || [ "$SHELLNAME" == "zsh" ]; then
-if [ "$SHELL" = "/bin/bash" ] || [ "$SHELL" = "/bin/zsh" ]; then
+  if ! grep -q "source $HOME/.jfrog/jfrog_$${SHELLNAME}_completion" ~/.$${SHELLNAME}rc; then
-  if ! grep -q "source $HOME/.jfrog/jfrog_$${SHELL}_completion" ~/.$${SHELL}rc; then
+    echo "source $HOME/.jfrog/jfrog_$${SHELLNAME}_completion" >> ~/.$${SHELLNAME}rc
-    echo "📦 Adding JFrog CLI completion to shell profile..."
-    echo "source $HOME/.jfrog/jfrog_$${SHELL}_completion" >> ~/.$${SHELL}rc
   fi
 fi
-