diff options
| author | Massimiliano Culpo <massimiliano.culpo@googlemail.com> | 2016-11-04 20:00:01 +0100 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2016-11-04 12:00:01 -0700 |
| commit | 296a349d49f552b222120053eee227ccb14d0b7d (patch) | |
| tree | f625a3425d6fe21f0512a88abc973257f97db31e /share | |
| parent | 472ad39db35dd2c68dc64fc4e54f5044d4f9d1c7 (diff) | |
| download | spack-296a349d49f552b222120053eee227ccb14d0b7d.tar.gz spack-296a349d49f552b222120053eee227ccb14d0b7d.tar.bz2 spack-296a349d49f552b222120053eee227ccb14d0b7d.tar.xz spack-296a349d49f552b222120053eee227ccb14d0b7d.zip | |
setup script for bash : fixes #2209 for sh setup (#2212)
Diffstat (limited to 'share')
| -rwxr-xr-x | share/spack/setup-env.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/share/spack/setup-env.sh b/share/spack/setup-env.sh index 2eb1dfecb3..f602ea627e 100755 --- a/share/spack/setup-env.sh +++ b/share/spack/setup-env.sh @@ -189,5 +189,7 @@ _sp_prefix=$(cd "$(dirname $(dirname $_sp_share_dir))" && pwd) _spack_pathadd PATH "${_sp_prefix%/}/bin" _sp_sys_type=$(spack-python -c 'print(spack.architecture.sys_type())') -_spack_pathadd DK_NODE "${_sp_share_dir%/}/dotkit/$_sp_sys_type" -_spack_pathadd MODULEPATH "${_sp_share_dir%/}/modules/$_sp_sys_type" +_sp_dotkit_root=$(spack-python -c "print(spack.util.path.canonicalize_path(spack.config.get_config('config').get('module_roots', {}).get('dotkit')))") +_sp_tcl_root=$(spack-python -c "print(spack.util.path.canonicalize_path(spack.config.get_config('config').get('module_roots', {}).get('tcl')))") +_spack_pathadd DK_NODE "${_sp_dotkit_root%/}/$_sp_sys_type" +_spack_pathadd MODULEPATH "${_sp_tcl_root%/}/$_sp_sys_type" |