summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Westlund <john.a.westlund@intel.com>2015-12-18 21:28:44 -0800
committerJohn Westlund <john.a.westlund@intel.com>2015-12-18 21:28:44 -0800
commit3e1ba6cc246d126bb3f900ed27192902bb1f57fc (patch)
treeb5e8349dbfc7fb26677b18cc55eb81f3f7bf5aef
parent3198522a7f2dab6bee33bb3be3d3738fe8c7c1f9 (diff)
downloadspack-3e1ba6cc246d126bb3f900ed27192902bb1f57fc.tar.gz
spack-3e1ba6cc246d126bb3f900ed27192902bb1f57fc.tar.bz2
spack-3e1ba6cc246d126bb3f900ed27192902bb1f57fc.tar.xz
spack-3e1ba6cc246d126bb3f900ed27192902bb1f57fc.zip
remove possible trailing slash in _sp_prefix or _sp_share_dir
-rwxr-xr-xshare/spack/setup-env.sh6
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"