Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development

This commit is contained in:
Martin Diehl 2018-07-03 11:22:32 +02:00
commit ba80c8336e
2 changed files with 2 additions and 10 deletions

View File

@ -1 +1 @@
v2.0.2-156-g5e5f975b v2.0.2-162-g2b15468f

10
env/DAMASK.csh vendored
View File

@ -3,15 +3,7 @@
set CALLED=($_) set CALLED=($_)
set DIRNAME=`dirname $CALLED[2]` set DIRNAME=`dirname $CALLED[2]`
set DAMASK_ROOT=`python -c "import os,sys; print(os.path.realpath(os.path.expanduser(sys.argv[1])))" $DIRNAME"/../"`
# 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 source $DAMASK_ROOT/CONFIG