diff options
| author | Erik Schnetter <schnetter@gmail.com> | 2015-12-21 13:18:35 -0500 |
|---|---|---|
| committer | Erik Schnetter <schnetter@gmail.com> | 2015-12-21 13:18:35 -0500 |
| commit | 611537eaed1a1e4d65d87184569b9723a1cf8128 (patch) | |
| tree | 2886eca4809a3e0e829d5029cb76c5570352f9ba /share | |
| parent | ba22fc8b78841728500966d471db7b5bfd26cf56 (diff) | |
| parent | d5e9279c1d40831f806ec6de87d0c447c55d4015 (diff) | |
| download | spack-611537eaed1a1e4d65d87184569b9723a1cf8128.tar.gz spack-611537eaed1a1e4d65d87184569b9723a1cf8128.tar.bz2 spack-611537eaed1a1e4d65d87184569b9723a1cf8128.tar.xz spack-611537eaed1a1e4d65d87184569b9723a1cf8128.zip | |
Merge branch 'develop' into correct-cc
Diffstat (limited to 'share')
| -rwxr-xr-x | share/spack/setup-env.sh | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/share/spack/setup-env.sh b/share/spack/setup-env.sh index c96a94195d..47202f6087 100755 --- a/share/spack/setup-env.sh +++ b/share/spack/setup-env.sh @@ -56,6 +56,12 @@ # spack dotfiles. ######################################################################## function spack { + # save raw arguments into an array before butchering them + args=() + for a in "$@"; do + # yup, this is awful, blame bash2 compat + args=("${args[@]}" "$a") + done # accumulate initial flags for main spack command _sp_flags="" while [[ "$1" =~ ^- ]]; do @@ -116,7 +122,7 @@ function spack { esac ;; *) - command spack $_sp_flags $_sp_subcommand $_sp_spec + command spack "${args[@]}" ;; esac } @@ -167,8 +173,8 @@ fi # _sp_share_dir=$(cd "$(dirname $_sp_source_file)" && pwd) _sp_prefix=$(cd "$(dirname $(dirname $_sp_share_dir))" && pwd) +_spack_pathadd PATH "${_sp_prefix%/}/bin" -# TODO: fix SYS_TYPE to something non-LLNL-specific -_spack_pathadd DK_NODE "$_sp_share_dir/dotkit/$SYS_TYPE" -_spack_pathadd MODULEPATH "$_sp_share_dir/modules/$SYS_TYPE" -_spack_pathadd PATH "$_sp_prefix/bin" +_sp_sys_type=$(spack-python -c 'print(spack.architecture.sys_type())') +_spack_pathadd DK_NODE "${_sp_share_dir%/}/dotkit/$_sp_sys_type" +_spack_pathadd MODULEPATH "${_sp_share_dir%/}/modules/$_sp_sys_type" |