now works in "sourcing" mode.

still have to worry about figuring out the lib/pathinfo details and setting LD_LIBRARY_PATH accordingly...

damask_env.sh

@@ -1,31 +1,16 @@
-#!/bin/bash
 # sets up an environment for DAMASK
 # usage:  source damask_env.sh
 
-# It would be nice to set the variables
+currentDir=${PWD}
-# depending on the location of the script
+if [ "${BASH_SOURCE[0]:0:1}" = "/" ]
-# /!\ CAREFUL WITH HARDLINKS
+then cd -P `dirname "${BASH_SOURCE[0]}"`
-# but the ideas below don't work with sourcing this snippet.
+else cd -P `dirname "${PWD}/${BASH_SOURCE[0]}"`
-# scriptloc = `dirname $0`
+fi
-scriptloc=`dirname $(readlink -f $0)`
+theRoot=${PWD}
-#echo I am here: $scriptloc
+cd $currentDir
-#export DAMASK_ROOT=$scriptloc
-#export DAMASK_BIN=$scriptloc/bin
 
-
+export DAMASK_ROOT=$theRoot
-# Until the above works, we assume DAMASK
+export DAMASK_BIN=$theRoot/bin
-# lives at the top of the user's home dir
+[[ "${PATH}" == *"${DAMASK_BIN}"* ]]            || export PATH=${PATH}:${DAMASK_BIN}
-# strip the username from "MPIE\"
+[[ "${PYTHONPATH}" == *"${DAMASK_ROOT}/lib"* ]] || export PYTHONPATH=${PYTHONPATH}:${DAMASK_ROOT}/lib
-me=`echo $USER |cut -d'\\' -f 2` 
+#export LD_LIBRARY_PATH=${DAMASK_ROOT}/lib/fftw/lib:lib/acml4.4.0/ifort64_mp/lib:lib/acml4.4.0/ifort64/lib:${LD_LIBRARY_PATH}
-#echo user: $me
-#export DAMASK_ROOT=`echo /nethome/$me/DAMASK`
-#export DAMASK_BIN=`echo /nethome/$me/DAMASK/bin`
-export DAMASK_ROOT=~/DAMASK
-export DAMASK_BIN=~/DAMASK/bin
-
-echo DAMASK_ROOT = $DAMASK_ROOT
-echo DAMASK_BIN = $DAMASK_BIN
-# set more variables depending on the above ones
-export PATH=${PATH}:${DAMASK_BIN}
-export PYTHONPATH=${PYTHONPATH}:${DAMASK_ROOT}/lib
-export LD_LIBRARY_PATH=${DAMASK_ROOT}/lib/fftw/lib:lib/acml4.4.0/ifort64_mp/lib:lib/acml4.4.0/ifort64/lib:${LD_LIBRARY_PATH}