From eff2b4ca1cb92221757d3c732e165352f25dd019 Mon Sep 17 00:00:00 2001
From: Martin Diehl <m.diehl@mpie.de>
Date: Wed, 17 May 2017 08:53:37 +0200
Subject: [PATCH] scripts now work if sourced from new location

---
 DAMASK_env.csh                     |  2 +-
 DAMASK_env.sh                      |  2 +-
 DAMASK_env.zsh                     |  2 +-
 env/{DAMASK_env.csh => DAMASK.csh} | 21 +++++++++++++++------
 env/{DAMASK_env.sh => DAMASK.sh}   | 27 +++++++++++++--------------
 env/{DAMASK_env.zsh => DAMASK.zsh} | 20 ++++++++++----------
 6 files changed, 41 insertions(+), 33 deletions(-)
 rename env/{DAMASK_env.csh => DAMASK.csh} (84%)
 rename env/{DAMASK_env.sh => DAMASK.sh} (88%)
 rename env/{DAMASK_env.zsh => DAMASK.zsh} (89%)

diff --git a/DAMASK_env.csh b/DAMASK_env.csh
index 4535015d8..73a008b34 120000
--- a/DAMASK_env.csh
+++ b/DAMASK_env.csh
@@ -1 +1 @@
-env/DAMASK_env.csh
\ No newline at end of file
+./env/DAMASK.csh
\ No newline at end of file
diff --git a/DAMASK_env.sh b/DAMASK_env.sh
index e49b7df7c..2ec9efd4a 120000
--- a/DAMASK_env.sh
+++ b/DAMASK_env.sh
@@ -1 +1 @@
-env/DAMASK_env.sh
\ No newline at end of file
+./env/DAMASK.sh
\ No newline at end of file
diff --git a/DAMASK_env.zsh b/DAMASK_env.zsh
index 22da3bd4d..7af0ffdbc 120000
--- a/DAMASK_env.zsh
+++ b/DAMASK_env.zsh
@@ -1 +1 @@
-env/DAMASK_env.zsh
\ No newline at end of file
+./env/DAMASK.zsh
\ No newline at end of file
diff --git a/env/DAMASK_env.csh b/env/DAMASK.csh
similarity index 84%
rename from env/DAMASK_env.csh
rename to env/DAMASK.csh
index 81d4de421..819b263ef 100644
--- a/env/DAMASK_env.csh
+++ b/env/DAMASK.csh
@@ -3,16 +3,21 @@
 
 set CALLED=($_)
 set DIRNAME=`dirname $CALLED[2]`
+
+# transition compatibility (renamed $DAMASK_ROOT/DAMASK_env.csh to $DAMASK_ROOT/env/DAMASK.csh)
+set FILENAME=`basename $CALLED[2]`
+if ($FILENAME == "DAMASK.csh") then
+  set DIRNAME=$DIRNAME"/../"
+endif
+
 set DAMASK_ROOT=`python -c "import os,sys; print(os.path.realpath(os.path.expanduser(sys.argv[1])))" $DIRNAME`
 
+
 source $DAMASK_ROOT/CONFIG
 
-# if DAMASK_BIN is present and not in $PATH, add it
+# if DAMASK_BIN is present
 if ( $?DAMASK_BIN) then
-  set MATCH=`echo :${PATH}: | grep ${DAMASK_BIN}:`
-  if ( "x$MATCH" == "x" ) then
-    set PATH=${DAMASK_BIN}:${PATH}
-  endif
+  set path = ($DAMASK_BIN $path)
 endif
 
 set SOLVER=`which DAMASK_spectral`                                                          
@@ -62,4 +67,8 @@ if ( $?prompt ) then
 endif
 
 setenv DAMASK_NUM_THREADS $DAMASK_NUM_THREADS
-setenv PYTHONPATH $DAMASK_ROOT/lib:$PYTHONPATH
+if ( ! $?PYTHONPATH ) then
+  setenv PYTHONPATH $DAMASK_ROOT/lib
+else
+  setenv PYTHONPATH $DAMASK_ROOT/lib:$PYTHONPATH
+endif
diff --git a/env/DAMASK_env.sh b/env/DAMASK.sh
similarity index 88%
rename from env/DAMASK_env.sh
rename to env/DAMASK.sh
index 264ae9c94..2674505f7 100644
--- a/env/DAMASK_env.sh
+++ b/env/DAMASK.sh
@@ -1,5 +1,5 @@
 # sets up an environment for DAMASK on bash
-# usage:  source DAMASK_env.sh
+# usage:  source DAMASK.sh
 
 
 if [ "$OSTYPE" == "linux-gnu" ] || [ "$OSTYPE" == 'linux' ]; then
@@ -10,6 +10,11 @@ else
   DAMASK_ROOT=${STAT##* }
 fi
 
+# transition compatibility (renamed $DAMASK_ROOT/DAMASK_env.sh to $DAMASK_ROOT/env/DAMASK.sh)
+if [ ${BASH_SOURCE##*/} == "DAMASK.sh" ]; then
+  DAMASK_ROOT=$DAMASK_ROOT'/..'
+fi
+
 # shorthand command to change to DAMASK_ROOT directory
 eval "function damask() { cd $DAMASK_ROOT; }"
 
@@ -20,22 +25,16 @@ set() {
 source $DAMASK_ROOT/CONFIG
 unset -f set
 
-# add DAMASK_BIN if present but not yet in $PATH
-if [[ "x$DAMASK_BIN" != "x" && ! $(echo ":$PATH:" | grep $DAMASK_BIN:) ]]; then
-  export PATH=$DAMASK_BIN:$PATH
-fi
+# add DAMASK_BIN if present
+[ "x$DAMASK_BIN" != "x" ] && PATH=$DAMASK_BIN:$PATH
 
 SOLVER=$(which DAMASK_spectral || true 2>/dev/null)
-if [ "x$SOLVER" == "x" ]; then
-  SOLVER='Not found!'
-fi
+[ "x$SOLVER" == "x" ] && SOLVER='Not found!'
+
 PROCESSING=$(which postResults || true 2>/dev/null)
-if [ "x$PROCESSING" == "x" ]; then
-  PROCESSING='Not found!'
-fi
-if [ "x$DAMASK_NUM_THREADS" == "x" ]; then
-  DAMASK_NUM_THREADS=1
-fi
+[ "x$PROCESSING" == "x" ] && PROCESSING='Not found!'
+
+[ "x$DAMASK_NUM_THREADS" == "x" ] && DAMASK_NUM_THREADS=1
 
 # according to http://software.intel.com/en-us/forums/topic/501500
 # this seems to make sense for the stack size
diff --git a/env/DAMASK_env.zsh b/env/DAMASK.zsh
similarity index 89%
rename from env/DAMASK_env.zsh
rename to env/DAMASK.zsh
index 9098352bf..23b057d68 100644
--- a/env/DAMASK_env.zsh
+++ b/env/DAMASK.zsh
@@ -1,7 +1,12 @@
 # sets up an environment for DAMASK on zsh
-# usage:  source DAMASK_env.zsh
+# usage:  source DAMASK.zsh
 
-DAMASK_ROOT=${0:a:h}
+# transition compatibility (renamed $DAMASK_ROOT/DAMASK_env.zsh to $DAMASK_ROOT/env/DAMASK.zsh)
+if [ ${0:t:r} = 'DAMASK' ]; then
+  DAMASK_ROOT=${0:a:h}'/..'
+else
+  DAMASK_ROOT=${0:a:h}
+fi
 
 # shorthand command to change to DAMASK_ROOT directory
 eval "function damask() { cd $DAMASK_ROOT; }"
@@ -13,17 +18,12 @@ set() {
 source $DAMASK_ROOT/CONFIG
 unset -f set
 
-# add DAMASK_BIN if present but not yet in $PATH
-MATCH=`echo ":$PATH:" | grep $DAMASK_BIN:`
-if [[ ( "x$DAMASK_BIN" != "x" ) && ( "x$MATCH" = "x" ) ]]; then
-  export PATH=$DAMASK_BIN:$PATH
-fi
+# add DAMASK_BIN if present
+[ ( "x$DAMASK_BIN" != "x" ) ] && PATH=$DAMASK_BIN:$PATH
 
 SOLVER=`which DAMASK_spectral || True 2>/dev/null`
 PROCESSING=`which postResults || True 2>/dev/null`
-if [ "x$DAMASK_NUM_THREADS" = "x" ]; then
-  DAMASK_NUM_THREADS=1
-fi
+[ "x$DAMASK_NUM_THREADS" = "x" ] && DAMASK_NUM_THREADS=1
 
 # according to http://software.intel.com/en-us/forums/topic/501500
 # this seems to make sense for the stack size