diff options
| author | Gregory L. Lee <lee218@cab687.llnl.gov> | 2015-12-19 07:44:12 -0800 |
|---|---|---|
| committer | Gregory L. Lee <lee218@cab687.llnl.gov> | 2015-12-19 07:44:12 -0800 |
| commit | a62f590653d1f69eb82ae65a53567f5415883a5b (patch) | |
| tree | 69a31483c116caebd8dd3921b9de2c716fdcde95 | |
| parent | 8dd1f3ffa59dfc9a36572e3f3c4b80a3cdad4f97 (diff) | |
| parent | 5f9a61616b20c6fa181f10727767612de7352911 (diff) | |
| download | spack-a62f590653d1f69eb82ae65a53567f5415883a5b.tar.gz spack-a62f590653d1f69eb82ae65a53567f5415883a5b.tar.bz2 spack-a62f590653d1f69eb82ae65a53567f5415883a5b.tar.xz spack-a62f590653d1f69eb82ae65a53567f5415883a5b.zip | |
Merge branch 'develop' of https://github.com/llnl/spack into develop
| -rwxr-xr-x | share/spack/setup-env.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/share/spack/setup-env.sh b/share/spack/setup-env.sh index 9f4ddd3faf..5b03aa8955 100755 --- a/share/spack/setup-env.sh +++ b/share/spack/setup-env.sh @@ -175,6 +175,6 @@ _sp_share_dir=$(cd "$(dirname $_sp_source_file)" && pwd) _sp_prefix=$(cd "$(dirname $(dirname $_sp_share_dir))" && pwd) # 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" +_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" |