summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authoralalazo <massimiliano.culpo@googlemail.com>2016-05-09 08:23:30 +0200
committeralalazo <massimiliano.culpo@googlemail.com>2016-05-09 08:23:30 +0200
commit497ed9f933f1ce50beca9e03f478aaa6cca836d9 (patch)
tree7ffffa0cb60823fccf662ffe2d653bebabc140d1 /share
parent6cffac79bd39443047d380eb46121a43a256737e (diff)
parentea408cc0d0d2d961be3c342494db87d8018bec9d (diff)
downloadspack-497ed9f933f1ce50beca9e03f478aaa6cca836d9.tar.gz
spack-497ed9f933f1ce50beca9e03f478aaa6cca836d9.tar.bz2
spack-497ed9f933f1ce50beca9e03f478aaa6cca836d9.tar.xz
spack-497ed9f933f1ce50beca9e03f478aaa6cca836d9.zip
Merge branch 'develop' of https://github.com/LLNL/spack into openmpi_variants
Conflicts: var/spack/repos/builtin/packages/openmpi/package.py
Diffstat (limited to 'share')
-rwxr-xr-xshare/spack/setup-env.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/share/spack/setup-env.sh b/share/spack/setup-env.sh
index 764af68400..11a4c0a70c 100755
--- 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
;;