From 0773fb5fae16daac21c6bad3af9a1d672196d5c3 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 22 Apr 2021 08:04:46 +0200 Subject: [PATCH] KISS setting shell variables directly is more verbose --- env/CONFIG | 5 ----- env/DAMASK.sh | 11 ----------- env/DAMASK.zsh | 13 ------------- 3 files changed, 29 deletions(-) delete mode 100644 env/CONFIG diff --git a/env/CONFIG b/env/CONFIG deleted file mode 100644 index 4407f4d2b..000000000 --- a/env/CONFIG +++ /dev/null @@ -1,5 +0,0 @@ -# "set"-syntax needed only for tcsh (but works with bash and zsh) -set OMP_NUM_THREADS = 4 - -set MSC_ROOT = /opt/msc -set MSC_VERSION = 2020 diff --git a/env/DAMASK.sh b/env/DAMASK.sh index f8ccfc1e0..edf019921 100644 --- a/env/DAMASK.sh +++ b/env/DAMASK.sh @@ -19,17 +19,9 @@ fi DAMASK_ROOT=$(canonicalPath "$ENV_ROOT/../") - # shorthand command to change to DAMASK_ROOT directory eval "function DAMASK_root() { cd $DAMASK_ROOT; }" -# defining set() allows to source the same file for tcsh and bash, with and without space around = -set() { - export $1$2$3 - } -source $ENV_ROOT/CONFIG -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 @@ -86,9 +78,6 @@ if [ ! -z "$PS1" ]; then echo fi -export OMP_NUM_THREADS -export MSC_ROOT -export MSC_VERSION export DAMASK_ROOT export PYTHONPATH=$DAMASK_ROOT/python:$PYTHONPATH diff --git a/env/DAMASK.zsh b/env/DAMASK.zsh index 2c74657fd..07064eb7a 100644 --- a/env/DAMASK.zsh +++ b/env/DAMASK.zsh @@ -12,16 +12,6 @@ function blink { ENV_ROOT=$(canonicalPath "${0:a:h}") DAMASK_ROOT=$(canonicalPath "${0:a:h}'/..") -# shorthand command to change to DAMASK_ROOT directory -eval "function DAMASK_root() { cd $DAMASK_ROOT; }" - -# defining set() allows to source the same file for tcsh and zsh, with and without space around = -set() { - export $1$2$3 - } -source $ENV_ROOT/CONFIG -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 @@ -80,9 +70,6 @@ if [ ! -z "$PS1" ]; then echo fi -export OMP_NUM_THREADS -export MSC_ROOT -export MSC_VERSION export DAMASK_ROOT export PYTHONPATH=$DAMASK_ROOT/python:$PYTHONPATH