From eab2ce376186d2f846b33b275e4e0f12624012b8 Mon Sep 17 00:00:00 2001
From: Martin Diehl <mail@martin-diehl.net>
Date: Thu, 25 Apr 2019 08:00:09 +0200
Subject: [PATCH] point always to $DAMASK_ROOT/bin

---
 env/DAMASK.csh | 4 +---
 env/DAMASK.sh  | 3 +--
 env/DAMASK.zsh | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/env/DAMASK.csh b/env/DAMASK.csh
index 1819dd305..d223d885a 100644
--- a/env/DAMASK.csh
+++ b/env/DAMASK.csh
@@ -13,9 +13,7 @@ set BRANCH = `git branch 2>/dev/null| grep -E '^\* ')`
 cd - >/dev/null
 
 # if DAMASK_BIN is present
-if ( $?DAMASK_BIN) then
-  set path = ($DAMASK_BIN $path)
-endif
+set path = ($DAMASK_ROOT/bin $path)
 
 set SOLVER=`which DAMASK_spectral`                                                          
 set PROCESSING=`which postResults`                                                          
diff --git a/env/DAMASK.sh b/env/DAMASK.sh
index fa2c8db25..1b4bea86a 100644
--- a/env/DAMASK.sh
+++ b/env/DAMASK.sh
@@ -33,8 +33,7 @@ unset -f set
 # add BRANCH if DAMASK_ROOT is a git repository
 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
+PATH=${DAMASK_ROOT}/bin:$PATH
 
 SOLVER=$(type -p DAMASK_spectral || true 2>/dev/null)
 [ "x$SOLVER" == "x" ] && SOLVER=$(blink 'Not found!')
diff --git a/env/DAMASK.zsh b/env/DAMASK.zsh
index 61b9c89f9..5449007f9 100644
--- a/env/DAMASK.zsh
+++ b/env/DAMASK.zsh
@@ -25,7 +25,7 @@ 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
+PATH=${DAMASK_ROOT}/bin:$PATH
 
 SOLVER=$(which DAMASK_spectral || true 2>/dev/null)
 [[ "x$SOLVER" == "x" ]] && SOLVER=$(blink 'Not found!')