From 296a349d49f552b222120053eee227ccb14d0b7d Mon Sep 17 00:00:00 2001
From: Massimiliano Culpo <massimiliano.culpo@googlemail.com>
Date: Fri, 4 Nov 2016 20:00:01 +0100
Subject: [PATCH] setup script for bash : fixes #2209 for sh setup (#2212)
---
share/spack/setup-env.sh | 6 ++++--
1 file 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"
--
GitLab