Merge pdksh fix to v2

9 years ago · caf2a96ef9
parent 27be0421c0
commit caf2a96ef9
2 changed files with 3 additions and 1 deletions
--- a/hacking/env-setup
+++ b/hacking/env-setup
@ -16,6 +16,7 @@ if [ -n "$BASH_SOURCE" ] ; then
    HACKING_DIR=$(dirname "$BASH_SOURCE")
 elif [ $(basename -- "$0") = "env-setup" ]; then
    HACKING_DIR=$(dirname "$0")
+# Works with ksh93 but not pdksh
 elif [ -n "$KSH_VERSION" ] && echo $KSH_VERSION | grep -qv '^@(#)PD KSH'; then
    HACKING_DIR=$(dirname "${.sh.file}")
 else
--- a/v2/hacking/env-setup
+++ b/v2/hacking/env-setup
@ -16,7 +16,8 @@ if [ -n "$BASH_SOURCE" ] ; then
    HACKING_DIR=$(dirname "$BASH_SOURCE")
 elif [ $(basename -- "$0") = "env-setup" ]; then
    HACKING_DIR=$(dirname "$0")
-elif [ -n "$KSH_VERSION" ]; then
+# Works with ksh93 but not pdksh
+elif [ -n "$KSH_VERSION" ] && echo $KSH_VERSION | grep -qv '^@(#)PD KSH'; then
    HACKING_DIR=$(dirname "${.sh.file}")
 else
    HACKING_DIR="$PWD/hacking"