From 3e1ba6cc246d126bb3f900ed27192902bb1f57fc Mon Sep 17 00:00:00 2001
From: John Westlund <john.a.westlund@intel.com>
Date: Fri, 18 Dec 2015 21:28:44 -0800
Subject: remove possible trailing slash in _sp_prefix or _sp_share_dir
---
share/spack/setup-env.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'share')
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"
--
cgit v1.2.3-70-g09d2