diff options
| author | Michael Kuhn <suraia@ikkoku.de> | 2016-07-21 13:15:53 +0200 |
|---|---|---|
| committer | Michael Kuhn <suraia@ikkoku.de> | 2016-07-21 13:15:53 +0200 |
| commit | 732c24f603864ec7dbec425ac4507b47fdb7a641 (patch) | |
| tree | a67d88ccf20220b94477e1ce40100db264354c73 /share | |
| parent | 07d4c6cf0b1d74db387bdb574ff165c5ba4a3197 (diff) | |
| download | spack-732c24f603864ec7dbec425ac4507b47fdb7a641.tar.gz spack-732c24f603864ec7dbec425ac4507b47fdb7a641.tar.bz2 spack-732c24f603864ec7dbec425ac4507b47fdb7a641.tar.xz spack-732c24f603864ec7dbec425ac4507b47fdb7a641.zip | |
Fix recursive module loading.
Diffstat (limited to 'share')
| -rwxr-xr-x | share/spack/setup-env.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/share/spack/setup-env.sh b/share/spack/setup-env.sh index c6183f990d..2eb1dfecb3 100755 --- a/share/spack/setup-env.sh +++ b/share/spack/setup-env.sh @@ -117,19 +117,19 @@ function spack { # If spack module command comes back with an error, do nothing. case $_sp_subcommand in "use") - if _sp_full_spec=$(command spack $_sp_flags module find $_sp_subcommand_args --module-type dotkit $_sp_spec); then + if _sp_full_spec=$(command spack $_sp_flags module loads --input-only $_sp_subcommand_args --module-type dotkit $_sp_spec); then use $_sp_module_args $_sp_full_spec fi ;; "unuse") - if _sp_full_spec=$(command spack $_sp_flags module find $_sp_subcommand_args --module-type dotkit $_sp_spec); then + if _sp_full_spec=$(command spack $_sp_flags module loads --input-only $_sp_subcommand_args --module-type dotkit $_sp_spec); then unuse $_sp_module_args $_sp_full_spec fi ;; "load") - if _sp_full_spec=$(command spack $_sp_flags module find $_sp_subcommand_args --module-type tcl $_sp_spec); then + if _sp_full_spec=$(command spack $_sp_flags module loads --input-only $_sp_subcommand_args --module-type tcl $_sp_spec); then module load $_sp_module_args $_sp_full_spec fi ;; "unload") - if _sp_full_spec=$(command spack $_sp_flags module find $_sp_subcommand_args --module-type tcl $_sp_spec); then + if _sp_full_spec=$(command spack $_sp_flags module loads --input-only $_sp_subcommand_args --module-type tcl $_sp_spec); then module unload $_sp_module_args $_sp_full_spec fi ;; esac |