diff options
author | Matthew LeGendre <legendre1@llnl.gov> | 2016-01-25 10:52:17 -0800 |
---|---|---|
committer | Matthew LeGendre <legendre1@llnl.gov> | 2016-01-25 10:52:17 -0800 |
commit | fa888a4ba15176e9d415ffced41f6f16801f1938 (patch) | |
tree | f39f431b0bd37f385353c62d0f6ce1a981abff3f /share | |
parent | fac4428766fb0a6b6cd357b654215f55df1220d4 (diff) | |
parent | 04a8439c39e674abb89d7a3f8dea82810c7ca682 (diff) | |
download | spack-fa888a4ba15176e9d415ffced41f6f16801f1938.tar.gz spack-fa888a4ba15176e9d415ffced41f6f16801f1938.tar.bz2 spack-fa888a4ba15176e9d415ffced41f6f16801f1938.tar.xz spack-fa888a4ba15176e9d415ffced41f6f16801f1938.zip |
Merge branch 'develop' into features/external-packages
Conflicts:
lib/spack/spack/cmd/mirror.py
lib/spack/spack/concretize.py
lib/spack/spack/config.py
lib/spack/spack/spec.py
lib/spack/spack/stage.py
var/spack/packages/mvapich2/package.py
Diffstat (limited to 'share')
-rw-r--r-- | share/spack/csh/spack.csh | 2 | ||||
-rwxr-xr-x | share/spack/logo/favicon.ico | bin | 0 -> 1150 bytes | |||
-rw-r--r-- | share/spack/logo/spack-logo-text-64.png | bin | 0 -> 18644 bytes | |||
-rw-r--r-- | share/spack/logo/spack-logo-white-text-48.png | bin | 0 -> 12201 bytes | |||
-rwxr-xr-x | share/spack/setup-env.csh | 2 | ||||
-rwxr-xr-x | share/spack/setup-env.sh | 16 |
6 files changed, 12 insertions, 8 deletions
diff --git a/share/spack/csh/spack.csh b/share/spack/csh/spack.csh index b21da23836..d64ce8935b 100644 --- a/share/spack/csh/spack.csh +++ b/share/spack/csh/spack.csh @@ -101,7 +101,7 @@ case unload: breaksw default: - \spack $_sp_args + \spack $_sp_flags $_sp_args breaksw endsw diff --git a/share/spack/logo/favicon.ico b/share/spack/logo/favicon.ico Binary files differnew file mode 100755 index 0000000000..95a67ae5b1 --- /dev/null +++ b/share/spack/logo/favicon.ico diff --git a/share/spack/logo/spack-logo-text-64.png b/share/spack/logo/spack-logo-text-64.png Binary files differnew file mode 100644 index 0000000000..8dad4c519f --- /dev/null +++ b/share/spack/logo/spack-logo-text-64.png diff --git a/share/spack/logo/spack-logo-white-text-48.png b/share/spack/logo/spack-logo-white-text-48.png Binary files differnew file mode 100644 index 0000000000..9e60867e81 --- /dev/null +++ b/share/spack/logo/spack-logo-white-text-48.png diff --git a/share/spack/setup-env.csh b/share/spack/setup-env.csh index 5f91670a60..42d8c42726 100755 --- a/share/spack/setup-env.csh +++ b/share/spack/setup-env.csh @@ -6,7 +6,7 @@ # Written by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. # LLNL-CODE-647188 # -# For details, see https://scalability-llnl.github.io/spack +# For details, see https://github.com/llnl/spack # Please also see the LICENSE file for our notice and the LGPL. # # This program is free software; you can redistribute it and/or modify diff --git a/share/spack/setup-env.sh b/share/spack/setup-env.sh index b90846d28f..586a5b836b 100755 --- a/share/spack/setup-env.sh +++ b/share/spack/setup-env.sh @@ -6,7 +6,7 @@ # Written by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. # LLNL-CODE-647188 # -# For details, see https://scalability-llnl.github.io/spack +# For details, see https://github.com/llnl/spack # Please also see the LICENSE file for our notice and the LGPL. # # This program is free software; you can redistribute it and/or modify @@ -55,7 +55,11 @@ # avoids the need to come up with a user-friendly naming scheme for # spack dotfiles. ######################################################################## + function spack { + # save raw arguments into an array before butchering them + args=( "$@" ) + # accumulate initial flags for main spack command _sp_flags="" while [[ "$1" =~ ^- ]]; do @@ -116,7 +120,7 @@ function spack { esac ;; *) - command spack $_sp_flags $_sp_subcommand $_sp_spec + command spack "${args[@]}" ;; esac } @@ -167,8 +171,8 @@ fi # _sp_share_dir=$(cd "$(dirname $_sp_source_file)" && pwd) _sp_prefix=$(cd "$(dirname $(dirname $_sp_share_dir))" && pwd) +_spack_pathadd PATH "${_sp_prefix%/}/bin" -# TODO: fix SYS_TYPE to something non-LLNL-specific -_spack_pathadd DK_NODE "$_sp_share_dir/dotkit/$SYS_TYPE" -_spack_pathadd MODULEPATH "$_sp_share_dir/modules/$SYS_TYPE" -_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" |