From 554a6ab7383fbf181783afcc68a72f82d2afc0f5 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 24 Jan 2014 13:17:54 +0000 Subject: [PATCH] fixed typos and missing include --- DAMASK_env.sh | 6 ++++++ installation/mods_MarcMentat/apply_DAMASK_modifications.sh | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/DAMASK_env.sh b/DAMASK_env.sh index 07c67db04..63810cfc4 100644 --- a/DAMASK_env.sh +++ b/DAMASK_env.sh @@ -8,6 +8,12 @@ else DAMASK_ROOT=${STAT##* } fi +if [ -f $HOME/.damask/damask.conf ]; then + source $HOME/.damask/damask.conf +else + source /etc/damask.conf +fi + if [ "x$DAMASK_NUM_THREADS" != "x" ] then export DAMASK_NUM_THREADS=$DAMASK_NUM_THREADS fi diff --git a/installation/mods_MarcMentat/apply_DAMASK_modifications.sh b/installation/mods_MarcMentat/apply_DAMASK_modifications.sh index 7263b1332..0489f46cb 100755 --- a/installation/mods_MarcMentat/apply_DAMASK_modifications.sh +++ b/installation/mods_MarcMentat/apply_DAMASK_modifications.sh @@ -4,7 +4,7 @@ DEFAULT_VERSION='2013.1' WORKINGDIR="$( cd "$( dirname "$0" )" && pwd )" -if [ -f $HOME/.damask/damask.conf ] then +if [ -f $HOME/.damask/damask.conf ]; then source $HOME/.damask/damask.conf else source /etc/damask.conf