Merge branch 'develop' of https://github.com/LLNL/spack into features/custom_modulefile_from_config

2016-05-10 11:13:19 +02:00
parent 67a01ef2ee 42edb6840e
commit 9eee71edf7
148 changed files with 3692 additions and 767 deletions
--- a/share/spack/setup-env.sh
+++ b/share/spack/setup-env.sh
@@ -1,4 +1,4 @@
-##############################################################################
+#####################################################################
 # Copyright (c) 2013, Lawrence Livermore National Security, LLC.
 # Produced at the Lawrence Livermore National Laboratory.
 #
@@ -84,7 +84,10 @@ function spack {
            if [ "$_sp_arg" = "-h" ]; then
                command spack cd -h
            else
-                cd $(spack location $_sp_arg "$@")
+                LOC="$(spack location $_sp_arg "$@")"
+                if [[ -d "$LOC" ]] ; then
+                    cd "$LOC"
+                fi
            fi
            return
            ;;