summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjppelteret <jppelteret@gmail.com>2016-04-30 16:22:32 +0200
committerjppelteret <jppelteret@gmail.com>2016-04-30 16:22:32 +0200
commit11596ec0f847d75c051d97238ed74c8a19608ec7 (patch)
tree52d5482a651270a9973b816045ee263bd857ffad
parent8fc43046ebfaa41410c28ba6d3d27fffed25ee4e (diff)
parentc92621464096ea139ad29e51c2b13afe9388fe52 (diff)
downloadspack-11596ec0f847d75c051d97238ed74c8a19608ec7.tar.gz
spack-11596ec0f847d75c051d97238ed74c8a19608ec7.tar.bz2
spack-11596ec0f847d75c051d97238ed74c8a19608ec7.tar.xz
spack-11596ec0f847d75c051d97238ed74c8a19608ec7.zip
Merge branch 'develop' into bugfix/glm
-rwxr-xr-xshare/spack/setup-env.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/share/spack/setup-env.sh b/share/spack/setup-env.sh
index e3dd1cb4b9..11a4c0a70c 100755
--- a/share/spack/setup-env.sh
+++ b/share/spack/setup-env.sh
@@ -84,10 +84,10 @@ function spack {
if [ "$_sp_arg" = "-h" ]; then
command spack cd -h
else
- LOC="$(spack location $_sp_arg "$@")"
- if [[ "x" -ne "x$LOC" ]] ; then
+ LOC="$(spack location $_sp_arg "$@")"
+ if [[ -d "$LOC" ]] ; then
cd "$LOC"
- fi
+ fi
fi
return
;;