zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Harden shell detection when procfs is available (#13950)

Browse Source
This commit is contained in:
Massimiliano Culpo 2019-12-16 23:51:58 +01:00 committed by Todd Gamblin
parent e366d5b559
commit 9ceec7e219
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
share/spack/setup-env.sh
View File

@ -215,11 +215,14 @@ _spack_pathadd() {
} }
#
# Determine which shell is being used # Determine which shell is being used
#
_spack_determine_shell() { _spack_determine_shell() {
if [ -n "${BASH:-}" ]; then if [ -f "/proc/$$/exe" ]; then
# If procfs is present this seems a more reliable
# way to detect the current shell
_sp_exe=$(readlink /proc/$$/exe)
basename ${_sp_exe}
elif [ -n "${BASH:-}" ]; then
echo bash echo bash
elif [ -n "${ZSH_NAME:-}" ]; then elif [ -n "${ZSH_NAME:-}" ]; then
echo zsh echo zsh