From 97d19320ce1ba11c8e38f18b0a3004f9fbc809c2 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 13 Apr 2017 08:20:30 +0200 Subject: [PATCH] fixed .zsh script as well, checking out PRIVATE repo again --- .gitlab-ci.yml | 4 ++-- DAMASK_env.zsh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3409c8dbc..bdafe9d72 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -83,10 +83,10 @@ checkout: - echo $CI_PIPELINE_ID > $HOME/GitLabCI.lock script: - mkdir -p $DAMASKROOT - - git clone git@magit1.mpie.de:damask/DAMASK.git $DAMASKROOT + - git clone -q git@magit1.mpie.de:damask/DAMASK.git $DAMASKROOT - cd $DAMASKROOT - git checkout $CI_COMMIT_SHA - #- git clone -q git@magit1.mpie.de:damask/PRIVATE.git + - git clone -q git@magit1.mpie.de:damask/PRIVATE.git - source $DAMASKROOT/DAMASK_env.sh - make install diff --git a/DAMASK_env.zsh b/DAMASK_env.zsh index dbb781894..0d043c390 100644 --- a/DAMASK_env.zsh +++ b/DAMASK_env.zsh @@ -19,8 +19,8 @@ if [[ ( "x$DAMASK_BIN" != "x" ) && ( "x$MATCH" = "x" ) ]]; then export PATH=$DAMASK_BIN:$PATH fi -SOLVER=`which DAMASK_spectral 2>/dev/null` -PROCESSING=`which postResults 2>/dev/null` +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