zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1246 from suraia/improve-shell-integration

Browse Source 
Improve shell integration.
This commit is contained in:
becker33
2016-07-15 14:23:51 -07:00
committed by GitHub
parent c0be585b67 64d91943ec
commit 36f818b9fb
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
share/spack/setup-env.sh
View File

@@ -57,6 +57,11 @@
######################################################################## ########################################################################
function spack { function spack {
# Zsh does not do word splitting by default, this enables it for this function only
if [ -n "$ZSH_VERSION" ]; then
emulate -L sh
fi
# save raw arguments into an array before butchering them # save raw arguments into an array before butchering them
args=( "$@" ) args=( "$@" )
@@ -93,11 +98,18 @@ function spack {
;; ;;
"use"|"unuse"|"load"|"unload") "use"|"unuse"|"load"|"unload")
# Shift any other args for use off before parsing spec. # Shift any other args for use off before parsing spec.
_sp_subcommand_args=""
_sp_module_args="" _sp_module_args=""
if [[ "$1" =~ ^- ]]; then while [[ "$1" =~ ^- ]]; do
_sp_module_args="$1"; shift if [ "$1" = "-r" -o "$1" = "--dependencies" ]; then
_sp_spec="$@" _sp_subcommand_args="$_sp_subcommand_args $1"
fi else
_sp_module_args="$_sp_module_args $1"
fi
shift
done
_sp_spec="$@"
# Here the user has run use or unuse with a spec. Find a matching # Here the user has run use or unuse with a spec. Find a matching
# spec using 'spack module find', then use the appropriate module # spec using 'spack module find', then use the appropriate module
@@ -105,19 +117,19 @@ function spack {
# If spack module command comes back with an error, do nothing. # If spack module command comes back with an error, do nothing.
case $_sp_subcommand in case $_sp_subcommand in
"use") "use")
if _sp_full_spec=$(command spack $_sp_flags module find dotkit $_sp_spec); then if _sp_full_spec=$(command spack $_sp_flags module find $_sp_subcommand_args dotkit $_sp_spec); then
use $_sp_module_args $_sp_full_spec use $_sp_module_args $_sp_full_spec
fi ;; fi ;;
"unuse") "unuse")
if _sp_full_spec=$(command spack $_sp_flags module find dotkit $_sp_spec); then if _sp_full_spec=$(command spack $_sp_flags module find $_sp_subcommand_args dotkit $_sp_spec); then
unuse $_sp_module_args $_sp_full_spec unuse $_sp_module_args $_sp_full_spec
fi ;; fi ;;
"load") "load")
if _sp_full_spec=$(command spack $_sp_flags module find tcl $_sp_spec); then if _sp_full_spec=$(command spack $_sp_flags module find $_sp_subcommand_args tcl $_sp_spec); then
module load $_sp_module_args $_sp_full_spec module load $_sp_module_args $_sp_full_spec
fi ;; fi ;;
"unload") "unload")
if _sp_full_spec=$(command spack $_sp_flags module find tcl $_sp_spec); then if _sp_full_spec=$(command spack $_sp_flags module find $_sp_subcommand_args tcl $_sp_spec); then
module unload $_sp_module_args $_sp_full_spec module unload $_sp_module_args $_sp_full_spec
fi ;; fi ;;
esac esac