Fix shell detection: zsh5 -> zsh (#14858)

2020-02-13 20:07:09 -06:00 · 2020-02-13 20:07:09 -06:00 · e0dfc3ddbf
commit e0dfc3ddbf
parent 8beb42e749
1 changed files with 2 additions and 1 deletions
--- a/share/spack/setup-env.sh
+++ b/share/spack/setup-env.sh
@ -212,7 +212,8 @@ _spack_determine_shell() {
        # If procfs is present this seems a more reliable
        # way to detect the current shell
        _sp_exe=$(readlink /proc/$$/exe)
-        basename ${_sp_exe}
+        # Shell may contain number, like zsh5 instead of zsh
+        basename ${_sp_exe} | tr -d '0123456789'
    elif [ -n "${BASH:-}" ]; then
        echo bash
    elif [ -n "${ZSH_NAME:-}" ]; then