diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2015-02-24 10:42:58 -0800 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2015-02-24 10:42:58 -0800 |
| commit | 8eab69fc0b06994ad063efec4d40c418aef49a10 (patch) | |
| tree | 764ba29462f20fb1196b9fba1dc3374f9bec2c8f /share | |
| parent | fa21acc470d9c32619b3c67dcce54c7b0a69a07a (diff) | |
| parent | ffdb90f39a56e5f0dacefd19ccf85ddd0e7a01c0 (diff) | |
| download | spack-8eab69fc0b06994ad063efec4d40c418aef49a10.tar.gz spack-8eab69fc0b06994ad063efec4d40c418aef49a10.tar.bz2 spack-8eab69fc0b06994ad063efec4d40c418aef49a10.tar.xz spack-8eab69fc0b06994ad063efec4d40c418aef49a10.zip | |
Merge branch 'develop' for v0.8.15v0.8.15
Diffstat (limited to 'share')
| -rwxr-xr-x | share/spack/setup-env.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/share/spack/setup-env.sh b/share/spack/setup-env.sh index 91b1dc4630..b2bcbaf6c7 100755 --- a/share/spack/setup-env.sh +++ b/share/spack/setup-env.sh @@ -165,8 +165,8 @@ fi # # Set up modules and dotkit search paths in the user environment # -_sp_share_dir="$(dirname $_sp_source_file)" -_sp_prefix="$(dirname $(dirname $_sp_share_dir))" +_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" |