More fixes bash vs zsh

2 files changed, 10 insertions, 4 deletions

diff --git a/g.sh b/g.sh
index b3cc3cc..8a487a9 100644
--- a/g.sh
+++ b/g.sh
@@ -14,7 +14,6 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-
 # Print the usage string.
 __g_usage() {
     echo "usage: g [-h | --help] [-v | --version] <command> [<args>]"
@@ -55,8 +54,15 @@ __g_save_shortcuts() {
     # Erase the contents of the __g_file.
     :>$__g_file
 
+    # Bash vs zsh
+    if [ -n "$ZSH_VERSION" ]; then
+        keys="${(@i)__g_shortcuts}"
+    else
+        keys="${!__g_shortcuts[@]}"
+    fi
+
     # Finally write the hash into the __g_file.
-    for i in "${!__g_shortcuts[@]}"; do
+    for i in $keys; do
         echo "$i" >> $__g_file
         echo "${__g_shortcuts[$i]}" >> $__g_file
     done
@@ -82,7 +88,7 @@ __g_join_path() {
 # Replacement for the non-standard `realpath` command. Implemented taken from
 # https://github.com/travis-ci/gimme.
 __g_realpath() {
-    [ -d "$1" ] && echo "$(cd "$1" && pwd)" || echo "$(cd "$(dirname "$1")"
+    [ -d "$1" ] && echo "$(cd "$1" && pwd)" || echo "$(cd "$(dirname "$1")" \
         && pwd)/$(basename "$1")"
 }
 
diff --git a/t/tests.sh b/t/tests.sh
index 2eb0e00..75867d8 100644
--- a/t/tests.sh
+++ b/t/tests.sh
@@ -17,7 +17,7 @@ set -e
 
 # From g.sh
 __g_realpath() {
-    [ -d "$1" ] && echo "$(cd "$1" && pwd)" || echo "$(cd "$(dirname "$1")"
+    [ -d "$1" ] && echo "$(cd "$1" && pwd)" || echo "$(cd "$(dirname "$1")" \
         && pwd)/$(basename "$1")"
 }