diff options
Diffstat (limited to 'share')
-rwxr-xr-x | share/spack/setup-env.csh | 4 | ||||
-rwxr-xr-x | share/spack/setup-env.sh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/share/spack/setup-env.csh b/share/spack/setup-env.csh index b17b753bbe..0f67ef7906 100755 --- a/share/spack/setup-env.csh +++ b/share/spack/setup-env.csh @@ -41,8 +41,8 @@ if ($?SPACK_ROOT) then # Shamelessly stolen from setup-env.sh set _sp_sys_type = `$SPACK_ROOT/bin/spack python -c 'print(spack.architecture.sys_type())'` - set _sp_dotkit_root = `$SPACK_ROOT/bin/spack python -c "print(spack.util.path.canonicalize_path(spack.config.get_config('config').get('module_roots').get('dotkit')))"` - set _sp_tcl_root = `$SPACK_ROOT/bin/spack python -c "print(spack.util.path.canonicalize_path(spack.config.get_config('config').get('module_roots').get('tcl')))"` + set _sp_dotkit_root = `$SPACK_ROOT/bin/spack python -c "print(spack.util.path.canonicalize_path(spack.config.get('config:module_roots', {}).get('dotkit')))"` + set _sp_tcl_root = `$SPACK_ROOT/bin/spack python -c "print(spack.util.path.canonicalize_path(spack.config.get('config:module_roots', {}).get('tcl')))"` # Set up modules and dotkit search paths in the user environment _spack_pathadd DK_NODE "$_sp_dotkit_root/$_sp_sys_type" diff --git a/share/spack/setup-env.sh b/share/spack/setup-env.sh index 1dbc49c8a7..b983299975 100755 --- a/share/spack/setup-env.sh +++ b/share/spack/setup-env.sh @@ -239,8 +239,8 @@ fi; _python_command=$(printf "%s\\\n%s\\\n%s" \ "print(\'_sp_sys_type={0}\'.format(spack.architecture.sys_type()))" \ -"print(\'_sp_dotkit_root={0}\'.format(spack.util.path.canonicalize_path(spack.config.get_config(\'config\').get(\'module_roots\', {}).get(\'dotkit\'))))" \ -"print(\'_sp_tcl_root={0}\'.format(spack.util.path.canonicalize_path(spack.config.get_config(\'config\').get(\'module_roots\', {}).get(\'tcl\'))))" +"print(\'_sp_dotkit_root={0}\'.format(spack.util.path.canonicalize_path(spack.config.get(\'config:module_roots\', {}).get(\'dotkit\'))))" \ +"print(\'_sp_tcl_root={0}\'.format(spack.util.path.canonicalize_path(spack.config.get(\'config:module_roots\', {}).get(\'tcl\'))))" ) _assignment_command=$(spack-python -c "exec('${_python_command}')") |