From 64c9a367c0304212a917a489793310b3ed01d62a Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 25 Apr 2019 07:16:24 +0200 Subject: [PATCH] always install post processing scripts into {$DAMASK_ROOT}/bin custom installation directions will be made available by more standard approaches --- CONFIG | 2 -- installation/symlink_Processing.py | 2 +- python/damask/environment.py | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/CONFIG b/CONFIG index 31a9c34c8..6d5226c89 100644 --- a/CONFIG +++ b/CONFIG @@ -1,8 +1,6 @@ # "set"-syntax needed only for tcsh (but works with bash and zsh) # DAMASK_ROOT will be expanded -set DAMASK_BIN = ${DAMASK_ROOT}/bin - set DAMASK_NUM_THREADS = 4 set MSC_ROOT = /opt/msc diff --git a/installation/symlink_Processing.py b/installation/symlink_Processing.py index 60f8d3639..90497c0eb 100755 --- a/installation/symlink_Processing.py +++ b/installation/symlink_Processing.py @@ -7,7 +7,7 @@ import damask damaskEnv = damask.Environment() baseDir = damaskEnv.relPath('processing/') -binDir = damaskEnv.options['DAMASK_BIN'] +binDir = damaskEnv.relPath('bin/') if not os.path.isdir(binDir): os.mkdir(binDir) diff --git a/python/damask/environment.py b/python/damask/environment.py index 0b77c94d2..21eb24694 100644 --- a/python/damask/environment.py +++ b/python/damask/environment.py @@ -1,6 +1,6 @@ # -*- coding: UTF-8 no BOM -*- -import os,subprocess,shlex,re +import os,re class Environment(): __slots__ = [ \