Merge 9d8152f7e2 into ff75f542ae

bin/autojump.bash

@@ -59,6 +59,7 @@ j() {
         return
     fi
 
+    local output
     output="$(autojump ${@})"
     if [[ -d "${output}" ]]; then
         if [ -t 1 ]; then  # if stdout is a terminal, use colors
@@ -94,6 +95,7 @@ jo() {
         return
     fi
 
+    local output
     output="$(autojump ${@})"
     if [[ -d "${output}" ]]; then
         case ${OSTYPE} in

bin/autojump.sh

@@ -14,7 +14,7 @@ fi
 
 # prevent circular loop for sh shells
 if [ "${shell}" = "sh" ]; then
-    return 0
+    :
 
 # check local install
 elif [ -s ~/.autojump/share/autojump/autojump.${shell} ]; then
@@ -24,3 +24,5 @@ elif [ -s ~/.autojump/share/autojump/autojump.${shell} ]; then
 elif [ -s /usr/local/share/autojump/autojump.${shell} ]; then
     source /usr/local/share/autojump/autojump.${shell}
 fi
+
+unset shell