From 576c4492d49c1456188ca7c2cf290bf821d20b0d Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Tue, 18 Dec 2018 09:24:25 -0500 Subject: [PATCH] [skip ci] bugfix for DAMASK_BIN==empty check; [ logical ] --> [[ logical ]] to align with bash syntax --- env/DAMASK.zsh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/env/DAMASK.zsh b/env/DAMASK.zsh index ae34fdfd2..4d5a1e47d 100644 --- a/env/DAMASK.zsh +++ b/env/DAMASK.zsh @@ -25,15 +25,15 @@ unset -f set cd $DAMASK_ROOT >/dev/null; BRANCH=$(git branch 2>/dev/null| grep -E '^\* '); cd - >/dev/null # add DAMASK_BIN if present -[ "x$DAMASK_BIN != x" ] && PATH=$DAMASK_BIN:$PATH +[[ "x$DAMASK_BIN" != "x" ]] && PATH=$DAMASK_BIN:$PATH SOLVER=$(which DAMASK_spectral || true 2>/dev/null) -[ "x$SOLVER" = "x" ] && SOLVER=$(blink 'Not found!') +[[ "x$SOLVER" == "x" ]] && SOLVER=$(blink 'Not found!') PROCESSING=$(which postResults || true 2>/dev/null) -[ "x$PROCESSING" = "x" ] && PROCESSING=$(blink 'Not found!') +[[ "x$PROCESSING" == "x" ]] && PROCESSING=$(blink 'Not found!') -[ "x$DAMASK_NUM_THREADS" = "x" ] && DAMASK_NUM_THREADS=1 +[[ "x$DAMASK_NUM_THREADS" == "x" ]] && DAMASK_NUM_THREADS=1 # currently, there is no information that unlimited causes problems # still, http://software.intel.com/en-us/forums/topic/501500 suggest to fix it @@ -56,13 +56,13 @@ if [ ! -z "$PS1" ]; then echo "DAMASK $DAMASK_ROOT $BRANCH" echo "Spectral Solver $SOLVER" echo "Post Processing $PROCESSING" - if [ "x$PETSC_DIR" != "x" ]; then + if [ "x$PETSC_DIR" != "x" ]; then echo -n "PETSc location " [ -d $PETSC_DIR ] && echo $PETSC_DIR || blink $PETSC_DIR [[ $(canonicalPath "$PETSC_DIR") == $PETSC_DIR ]] \ || echo " ~~> "$(canonicalPath "$PETSC_DIR") fi - [[ "x$PETSC_ARCH" == "x" ]] \ + [[ "x$PETSC_ARCH" == "x" ]] \ || echo "PETSc architecture $PETSC_ARCH" echo -n "MSC.Marc/Mentat " [ -d $MSC_ROOT ] && echo $MSC_ROOT || blink $MSC_ROOT