Merge pull request #452 from gouvinb/master

Quote all references to path related variables

available-plugins/ant/etc/jenv.d/rehash/ant.bash

@@ -1,11 +1,11 @@
 
 
-backuppath=$PATH
+backuppath="$PATH"
 
 PATH="$(remove_from_path "${JENV_ROOT}/shims")"
 ANT_BIN="$(command -v "ant" || true)"
 
-PATH=$backuppath
+PATH="$backuppath"
 
 #echo "make shims $MAVEN_BIN"
 make_shims "$ANT_BIN"   

available-plugins/export/etc/jenv.d/init/export_jenv_hook.bash

@@ -1,16 +1,15 @@
 #export
 
 
- _jenv_export_hook() {
-  export JAVA_HOME=$(jenv javahome 2>/dev/null)
+_jenv_export_hook() {
+  export JAVA_HOME="$(jenv javahome 2>/dev/null)"
   export JENV_FORCEJAVAHOME=true
 
-  if [ -e "$JAVA_HOME/bin/javac" ]
-  then
+  if [ -e "$JAVA_HOME/bin/javac" ]; then
     export JDK_HOME="$JAVA_HOME"
     export JENV_FORCEJDKHOME=true
   fi
-   }
+}
 
 if ! [[ "$PROMPT_COMMAND" =~ _jenv_export_hook ]]; then
     PROMPT_COMMAND="_jenv_export_hook;$PROMPT_COMMAND";

available-plugins/export/etc/jenv.d/init/export_jenv_hook.zsh

@@ -1,15 +1,14 @@
 #export
 
- _jenv_export_hook() {
-  export JAVA_HOME=$(jenv javahome 2>/dev/null)
+_jenv_export_hook() {
+  export JAVA_HOME="$(jenv javahome 2>/dev/null)"
   export JENV_FORCEJAVAHOME=true
 
-  if [ -e "$JAVA_HOME/bin/javac" ]
-  then
+  if [ -e "$JAVA_HOME/bin/javac" ]; then
     export JDK_HOME="$JAVA_HOME"
     export JENV_FORCEJDKHOME=true
   fi
- }
+}
 
 #echo "configure export plugin for ZSH"
 function install_hook {

available-plugins/golo/etc/jenv.d/rehash/golo.bash

@@ -1,6 +1,6 @@
 
 
-backuppath=$PATH
+backuppath="$PATH"
 
 PATH="$(remove_from_path "${JENV_ROOT}/shims")"
 GOLO_BIN="$(command -v "golo" || true)"
@@ -8,7 +8,7 @@ GOLOC_BIN="$(command -v "goloc" || true)"
 GOLOGOLO_BIN="$(command -v "gologolo" || true)"
 
 
-PATH=$backuppath
+PATH="$backuppath"
 
 make_shims "$GOLOGOLO_BIN"    
 make_shims "$GOLOC_BIN"  

available-plugins/gradle/etc/jenv.d/rehash/gradle.bash

@@ -1,11 +1,11 @@
 
 
-backuppath=$PATH
+backuppath="$PATH"
 
 PATH="$(remove_from_path "${JENV_ROOT}/shims")"
 GRADLE_BIN="$(command -v "gradle" || true)"
 
-PATH=$backuppath
+PATH="$backuppath"
 
 #echo "make shims $MAVEN_BIN"
 make_shims "$GRADLE_BIN"   

available-plugins/grails/etc/jenv.d/rehash/grails.bash

@@ -1,6 +1,6 @@
 
 
-backuppath=$PATH
+backuppath="$PATH"
 
 PATH="$(remove_from_path "${JENV_ROOT}/shims")"
 GRAILS_BIN="$(command -v "grails" || true)"
@@ -9,7 +9,7 @@ make_shims "$GRAILS_BIN"
 GRAILS_DEBUG="$(command -v "grails-debug" || true)"
 make_shims "$GRAILS_DEBUG"
 
-PATH=$backuppath
+PATH="$backuppath"
 
 
 

available-plugins/groovy/etc/jenv.d/rehash/groovy.bash

@@ -1,6 +1,6 @@
 
 
-backuppath=$PATH
+backuppath="$PATH"
 
 PATH="$(remove_from_path "${JENV_ROOT}/shims")"
 GROOVY_BIN="$(command -v "groovy" || true)"
@@ -16,7 +16,7 @@ GROOVY_BIN="$(command -v "groovysh" || true)"
 make_shims "$GROOVY_BIN"
 
 
-PATH=$backuppath
+PATH="$backuppath"
 
 
 

available-plugins/lein/etc/jenv.d/rehash/lein.bash

@@ -1,13 +1,13 @@
 
 
-backuppath=$PATH
+backuppath="$PATH"
 
 PATH="$(remove_from_path "${JENV_ROOT}/shims")"
 LEIN_BIN="$(command -v "lein" || true)"
 
 
 
-PATH=$backuppath
+PATH="$backuppath"
 
 make_shims "$LEIN_BIN"  
 

available-plugins/maven/etc/jenv.d/rehash/maven.bash

@@ -1,13 +1,13 @@
 
 
-backuppath=$PATH
+backuppath="$PATH"
 
 PATH="$(remove_from_path "${JENV_ROOT}/shims")"
 MAVEN_BIN="$(command -v "mvn" || true)"
 MAVEN_DEBUG="$(command -v "mvnDebug" || true)"
 
 
-PATH=$backuppath
+PATH="$backuppath"
 
 make_shims "$MAVEN_BIN"  
 make_shims "$MAVEN_DEBUG"  

available-plugins/sbt/etc/jenv.d/exec/sbt-before.bash

@@ -7,5 +7,5 @@ if [ "$1" = "sbt" ]; then
     fi
     unset JENV_OPTIONS
   fi
-  JENV_OPTIONS="$JENV_OPTIONS -java-home $JAVA_HOME"
+  JENV_OPTIONS="$JENV_OPTIONS -java-home '$JAVA_HOME'"
 fi

available-plugins/sbt/etc/jenv.d/rehash/sbt.bash

@@ -1,12 +1,12 @@
 
 
-backuppath=$PATH
+backuppath="$PATH"
 
 PATH="$(remove_from_path "${JENV_ROOT}/shims")"
 SBT_BIN="$(command -v "sbt" || true)"
 
 
-PATH=$backuppath
+PATH="$backuppath"
 
 make_shims "$SBT_BIN"  
 

available-plugins/scala/etc/jenv.d/rehash/scala.bash

@@ -1,6 +1,6 @@
 
 
-backuppath=$PATH
+backuppath="$PATH"
 
 PATH="$(remove_from_path "${JENV_ROOT}/shims")"
 SCALA_BIN="$(command -v "scala" || true)"
@@ -8,7 +8,7 @@ SCALAC_BIN="$(command -v "scalac" || true)"
 FSC_BIN="$(command -v "fsc" || true)"
 
 
-PATH=$backuppath
+PATH="$backuppath"
 
 make_shims "$SCALA_BIN"    
 make_shims "$SCALAC_BIN"  

available-plugins/springboot/etc/jenv.d/rehash/springboot.bash

@@ -1,6 +1,6 @@
 
 
-backuppath=$PATH
+backuppath="$PATH"
 
 PATH="$(remove_from_path "${JENV_ROOT}/shims")"
 GRAILS_BIN="$(command -v "spring" || true)"
@@ -8,7 +8,7 @@ make_shims "$GRAILS_BIN"
 
 
 
-PATH=$backuppath
+PATH="$backuppath"
 
 
 

available-plugins/vlt/etc/jenv.d/rehash/vlt.bash

@@ -1,9 +1,9 @@
 
 
-backuppath=$PATH
+backuppath="$PATH"
 
 PATH="$(remove_from_path "${JENV_ROOT}/shims")"
 VLT_BIN="$(command -v "vlt" || true)"
 make_shims "$VLT_BIN"    
 
-PATH=$backuppath
+PATH="$backuppath"

libexec/jenv

@@ -22,23 +22,23 @@ abs_dirname() {
 
 resolvepath() {
   local cwd="$(pwd)" 
-  cd $1
+  cd "$1"
   echo "$(pwd)"
   cd "$cwd"
 }
 
 samedir()  {
-  if [ -d $1 ] && [ -d $2 ]; then
-  local path1="$(resolvepath $1)"
-  local path2="$(resolvepath $2)"
-
-  if [ $path1 == $path2 ]; then
-   return 0; 
-  else
-   return 1;
+  if [ -d "$1" ] && [ -d "$2" ]; then
+    local path1="$(resolvepath "$1")"
+    local path2="$(resolvepath "$2")"
+
+    if [ "$path1" == "$path2" ]; then
+      return 0; 
+    else
+      return 1;
+    fi
   fi
-fi
-return 0;
+  return 0;
 }
 
 if [ -z "${JENV_ROOT}" ]; then
@@ -70,7 +70,7 @@ shopt -s nullglob
 bin_path="$(abs_dirname "$0")"    
                   
 if ! samedir "${JENV_ROOT}" "$bin_path/../"  ; then
-   JENV_INSTALL_DIR=$(resolvepath "$bin_path/../")
+   JENV_INSTALL_DIR="$(resolvepath "$bin_path/../")"
 else
     JENV_INSTALL_DIR="$JENV_ROOT"
 fi
@@ -91,7 +91,7 @@ for plugin_hook in "${JENV_ROOT}/plugins/"*/etc/jenv.d; do
 done   
 
 
-export JENV_HOOK_PATH=$hook_path
+export JENV_HOOK_PATH="$hook_path"
 
 
 

libexec/jenv-add

@@ -13,7 +13,7 @@ fi
 if [ "$1" = "--complete" ]; then
   echo "--skip-existing"
   for d in ${!#}*; do
-    [[ -d "$d" ]] && echo $d/
+    [[ -d "$d" ]] && echo "$d/"
   done
   exit
 fi
@@ -59,7 +59,7 @@ function add_alias_check(){
 
 function add_alias(){
 	cd "${JENV_JAVAPATH}"
-    JENV_JAVAPATH=$PWD
+    JENV_JAVAPATH="$PWD"
     cd - 2>&1 > /dev/null
     mkdir -p "${JENV_ROOT}/versions"
 	ln -s  "${JENV_JAVAPATH}" "${JENV_ROOT}/versions/$1"
@@ -122,7 +122,7 @@ if [ -f "${JENV_JAVAPATH}/bin/java" ]; then
     if [ $JAVA_PROVIDER=="sap" ]; then
         JAVA_PLATFORM="64"
     else
-        if ${JENV_JAVAPATH}/bin/java -version 2>&1 | grep -q "64-Bit"; then
+        if "${JENV_JAVAPATH}/bin/java" -version 2>&1 | grep -q "64-Bit"; then
             JAVA_PLATFORM="64"
         else
             JAVA_PLATFORM="32"

libexec/jenv-hooks

@@ -49,17 +49,17 @@ for path in ${JENV_HOOK_PATH//:/$'\n'}; do
   case "$shell" in
   bash )
     for script in $path/"$JENV_COMMAND"/*.bash; do
-    echo $(realpath $script)
+    echo $(realpath "$script")
     done
     ;;
   zsh )
     for script in $path/"$JENV_COMMAND"/*.zsh; do
-    echo $(realpath $script)
+    echo $(realpath "$script")
     done 
     ;;
   fish )
     for script in $path/"$JENV_COMMAND"/*.fish; do
-    echo $(realpath $script)
+    echo $(realpath "$script")
     done
     ;;
 esac

libexec/jenv-plugins

@@ -21,7 +21,7 @@ samedir()  {
   local path1="$(resolvepath $1)"
   local path2="$(resolvepath $2)"
 
-  if [ $path1 == $path2 ]; then
+  if [ "$path1" == "$path2" ]; then
    return 0; 
   else
    return 1;
@@ -30,7 +30,7 @@ samedir()  {
 
 resolvepath() {
   local cwd="$(pwd)" 
-  cd $1
+  cd "$1"
   echo "$(pwd)"
   cd "$cwd"
 }

libexec/jenv-refresh-plugins

@@ -32,7 +32,7 @@ if [ ! "$lastVersion" == "$currentVersion"  ] || [ $FORCE_REFRESH == "1" ]; then
     echo "jenv has been updated, process to refresh plugin links"
     for path in "${JENV_ROOT}/plugins/"*; do
         if [ -L "$path" ]; then
-        pluginName=$(basename $path)
+        pluginName=$(basename "$path")
         echo "Refresh plugin $pluginName"
         ln -sfn  "${JENV_INSTALL_DIR}/available-plugins/$pluginName" "${JENV_ROOT}/plugins/$pluginName" 
         fi

libexec/jenv-refresh-versions

@@ -11,9 +11,9 @@ set -e
 for path in "${JENV_ROOT}/versions/"*; do
   if [ -d "$path" ]; then
 
-      aliasname=$(basename $path)
+      aliasname=$(basename "$path")
       if test "${JENV_ROOT}/$aliasname.time" -ot "$path/bin/java"; then
-           realpath=$(resolve_link $path)
+           realpath="$(resolve_link "$path")"
            jenv remove $aliasname >> /dev/null 
            newalias=$(jenv add $realpath) 
            newalias=${newalias%added}

libexec/jenv-versions

@@ -25,7 +25,7 @@ fi
 
 resolvepath() {
   local cwd="$(pwd)" 
-  cd $1
+  cd "$1"
   echo "$(pwd -P)"
   cd "$cwd"
 }
@@ -37,7 +37,7 @@ print_version() {
   if [ "$1" == "$current_version" ]; then
     echo "${hit_prefix}$(jenv-version 2>/dev/null)"
     if $verbose ; then
-      local realPath="$(resolvepath $2)"
+      local realPath="$(resolvepath "$2")"
      echo "         $2"
      echo "         --> $realPath"
      echo ""
@@ -45,7 +45,7 @@ print_version() {
   else
     echo "${miss_prefix}$1"
     if $verbose ; then
-            local realPath="$(resolvepath $2)"
+            local realPath="$(resolvepath "$2")"
 
       echo "         $2"
      echo "         --> $realPath"