Merge pull request #252 from JohnWestlund/develop

remove possible trailing slash in _sp_prefix or _sp_share_dir
This commit is contained in:
Todd Gamblin 2015-12-18 22:31:18 -08:00
commit 5f9a61616b

View file

@ -175,6 +175,6 @@ _sp_share_dir=$(cd "$(dirname $_sp_source_file)" && pwd)
_sp_prefix=$(cd "$(dirname $(dirname $_sp_share_dir))" && pwd) _sp_prefix=$(cd "$(dirname $(dirname $_sp_share_dir))" && pwd)
# TODO: fix SYS_TYPE to something non-LLNL-specific # TODO: fix SYS_TYPE to something non-LLNL-specific
_spack_pathadd DK_NODE "$_sp_share_dir/dotkit/$SYS_TYPE" _spack_pathadd DK_NODE "${_sp_share_dir%/}/dotkit/$SYS_TYPE"
_spack_pathadd MODULEPATH "$_sp_share_dir/modules/$SYS_TYPE" _spack_pathadd MODULEPATH "${_sp_share_dir%/}/modules/$SYS_TYPE"
_spack_pathadd PATH "$_sp_prefix/bin" _spack_pathadd PATH "${_sp_prefix%/}/bin"