From 11a3d9c3330f6442ab1044a8e9c7ef2dd0797ec0 Mon Sep 17 00:00:00 2001
From: Martin Diehl <m.diehl@mpie.de>
Date: Thu, 13 Apr 2017 08:15:01 +0200
Subject: [PATCH] error in DAMASK_env.sh seems to be the reason

---
 .gitlab-ci.yml | 6 +++---
 DAMASK_env.sh  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2cef795fd..3409c8dbc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,7 @@ stages:
 
 ###################################################################################################
 before_script:
-  - eval 'source $DAMASKROOT/DAMASK_env.sh'
+  - source $DAMASKROOT/DAMASK_env.sh
   - module purge
   - cd $DAMASKROOT/PRIVATE/testing
 
@@ -34,7 +34,7 @@ variables:
   #================================================================================================
   # Shortcut names
   #================================================================================================
-  DAMASKROOT:                      "/tmp/GitlabCI_Pipeline_$CI_PIPELINE_ID/DAMASK"
+  DAMASKROOT:                      "$HOME/GitlabCI_Pipeline_$CI_PIPELINE_ID/DAMASK"
 
   #================================================================================================
   # Names of module files to load
@@ -87,7 +87,7 @@ checkout:
     - cd $DAMASKROOT
     - git checkout $CI_COMMIT_SHA
     #- git clone -q git@magit1.mpie.de:damask/PRIVATE.git
-    - eval 'source $DAMASKROOT/DAMASK_env.sh'
+    - source $DAMASKROOT/DAMASK_env.sh
     - make install
 
 ###################################################################################################
diff --git a/DAMASK_env.sh b/DAMASK_env.sh
index fa3171c48..078dd582b 100644
--- a/DAMASK_env.sh
+++ b/DAMASK_env.sh
@@ -25,11 +25,11 @@ if [[ "x$DAMASK_BIN" != "x" && ! $(echo ":$PATH:" | grep $DAMASK_BIN:) ]]; then
   export PATH=$DAMASK_BIN:$PATH
 fi
 
-SOLVER=$(which DAMASK_spectral 2>/dev/null)
+SOLVER=$(which DAMASK_spectral || true 2>/dev/null)
 if [ "x$SOLVER" == "x" ]; then
   SOLVER='Not found!'
 fi
-PROCESSING=$(which postResults 2>/dev/null)
+PROCESSING=$(which postResults || true 2>/dev/null)
 if [ "x$PROCESSING" == "x" ]; then
   PROCESSING='Not found!'
 fi