From f225591ccc1c624c800c8bdb230c26056a869d8f Mon Sep 17 00:00:00 2001
From: Martin Diehl <m.diehl@mpie.de>
Date: Tue, 19 Jun 2018 12:54:43 +0200
Subject: [PATCH] transition compatibility not needed anymore, more verbose

---
 env/DAMASK.sh  |  8 ++------
 env/DAMASK.zsh | 25 +++++++++++++------------
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/env/DAMASK.sh b/env/DAMASK.sh
index 021603b57..509f5f1b7 100644
--- a/env/DAMASK.sh
+++ b/env/DAMASK.sh
@@ -2,7 +2,7 @@
 # usage:  source DAMASK.sh
 
 function canonicalPath {
-  python -c "import os,sys; print(os.path.realpath(os.path.expanduser(sys.argv[1])))" $1
+  python -c "import os,sys; print(os.path.normpath(os.path.realpath(os.path.expanduser(sys.argv[1]))))" $1
 }
 
 function blink {
@@ -17,12 +17,8 @@ else
   DAMASK_ROOT=${STAT##* }
 fi
 
-# transition compatibility (renamed $DAMASK_ROOT/DAMASK_env.sh to $DAMASK_ROOT/env/DAMASK.sh)
-if [ ${BASH_SOURCE##*/} == "DAMASK.sh" ]; then
-  DAMASK_ROOT="$DAMASK_ROOT/.."
-fi
+DAMASK_ROOT=$(canonicalPath "$DAMASK_ROOT/../")
 
-DAMASK_ROOT=$(canonicalPath $DAMASK_ROOT)
 
 # shorthand command to change to DAMASK_ROOT directory
 eval "function DAMASK_root() { cd $DAMASK_ROOT; }"
diff --git a/env/DAMASK.zsh b/env/DAMASK.zsh
index 2d2bc9aa0..4638ae734 100644
--- a/env/DAMASK.zsh
+++ b/env/DAMASK.zsh
@@ -2,15 +2,14 @@
 # usage:  source DAMASK.zsh
 
 function canonicalPath {
-  python -c "import os,sys; print(os.path.realpath(os.path.expanduser(sys.argv[1])))" $1
+  python -c "import os,sys; print(os.path.normpath(os.path.realpath(os.path.expanduser(sys.argv[1]))))" $1
 }
 
-# transition compatibility (renamed $DAMASK_ROOT/DAMASK_env.zsh to $DAMASK_ROOT/env/DAMASK.zsh)
-if [ ${0:t:r} = 'DAMASK' ]; then
-  DAMASK_ROOT=${0:a:h}'/..'
-else
-  DAMASK_ROOT=${0:a:h}
-fi
+function blink {
+  echo -e "\033[2;5m$1\033[0m"
+}
+
+DAMASK_ROOT=$(canonicalPath "${0:a:h}'/..")
 
 # shorthand command to change to DAMASK_ROOT directory
 eval "function DAMASK_root() { cd $DAMASK_ROOT; }"
@@ -26,10 +25,10 @@ unset -f set
 [ "x$DAMASK_BIN != x" ] && PATH=$DAMASK_BIN:$PATH
 
 SOLVER=$(type -p DAMASK_spectral || true 2>/dev/null)
-[ "x$SOLVER == x" ] && SOLVER='Not found!'
+[ "x$SOLVER == x" ] && SOLVER=$(blink 'Not found!')
 
 PROCESSING=$(type -p postResults || true 2>/dev/null)
-[ "x$PROCESSING == x" ] && PROCESSING='Not found!'
+[ "x$PROCESSING == x" ] && PROCESSING=$(blink 'Not found!')
 
 [ "x$DAMASK_NUM_THREADS == x" ] && DAMASK_NUM_THREADS=1
 
@@ -52,16 +51,18 @@ if [ ! -z "$PS1" ]; then
   echo "DAMASK             $DAMASK_ROOT"
   echo "Spectral Solver    $SOLVER" 
   echo "Post Processing    $PROCESSING"
-  echo "Multithreading     DAMASK_NUM_THREADS=$DAMASK_NUM_THREADS"
   if [ "x$PETSC_DIR"   != "x" ]; then
-    echo "PETSc location     $PETSC_DIR"
+    echo -n "PETSc location     "
+    [ -d $PETSC_DIR ] && echo $PETSC_DIR || blink $PETSC_DIR
     [[ $(canonicalPath "$PETSC_DIR") == $PETSC_DIR ]] \
     || echo "               ~~> "$(canonicalPath "$PETSC_DIR")
   fi
   [[ "x$PETSC_ARCH"  == "x" ]] \
   || echo "PETSc architecture $PETSC_ARCH"
-  echo "MSC.Marc/Mentat    $MSC_ROOT"
+  echo -n "MSC.Marc/Mentat    "
+  [ -d $MSC_ROOT ] && echo $MSC_ROOT || blink $MSC_ROOT
   echo
+  echo "Multithreading     DAMASK_NUM_THREADS=$DAMASK_NUM_THREADS"
   echo -n "heap  size         "
    [[ "$(ulimit -d)" == "unlimited" ]] \
    && echo "unlimited" \