fixes

curusarn · Jan 17, 2020 · d3b1b84 · d3b1b84
1 parent d2cc85a
commit d3b1b84
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/scripts/hooks.sh b/scripts/hooks.sh
@@ -42,10 +42,10 @@ __resh_collect() {
     #__RESH_GIT_TOPLEVEL="$(git rev-parse --show-toplevel)"
     #__RESH_GIT_TOPLEVEL_EXIT_CODE=$?
 
-    if [ -n "$ZSH_VERSION" ]; then
+    if [ -n "${ZSH_VERSION-}" ]; then
         # assume Zsh
         local __RESH_PID="$$" # current pid
-    elif [ -n "$BASH_VERSION" ]; then
+    elif [ -n "${BASH_VERSION-}" ]; then
         # assume Bash
         if [ "${BASH_VERSINFO[0]}" -ge "4" ]; then
             # $BASHPID is only available in bash4+

diff --git a/scripts/util.sh b/scripts/util.sh
@@ -9,7 +9,13 @@ __resh_get_pid() {
         local __RESH_PID="$$" # current pid
     elif [ -n "${BASH_VERSION-}" ]; then
         # assume Bash
-        local __RESH_PID="$BASHPID" # current pid
+        if [ "${BASH_VERSINFO[0]}" -ge "4" ]; then
+            # $BASHPID is only available in bash4+
+            # $$ is fairly similar so it should not be an issue
+            local __RESH_PID="$BASHPID" # current pid
+        else
+            local __RESH_PID="$$" # current pid
+        fi
     fi
     echo "$__RESH_PID"
 }