From 66d74eee9f5ba8d3ef10127f60bb0c9684f6543d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz>
Date: Wed, 22 Jan 2020 10:10:10 +0100
Subject: [PATCH] improve output

---
 bashrc_add            |  2 +-
 myshell_load_defaults | 31 +++++++++++++++++--------------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/bashrc_add b/bashrc_add
index 49979e9..25a8a27 100755
--- a/bashrc_add
+++ b/bashrc_add
@@ -23,7 +23,7 @@ if [[ $- = *i* ]] ; then
     [ -z "${MYSHELLCONFIG_BASE+x}" ]        && MYSHELLCONFIG_BASE="${HOME}/${MYSHELLCONFIG_SUBPATH}"
     MYSHELLCONFIG_BASE_PARENT="$(dirname $MYSHELLCONFIG_BASE)"
     [ -z "${MYSHELLCONFIG_LOGDIR+x}" ]      && MYSHELLCONFIG_LOGDIR="${MYSHELLCONFIG_BASE}/logs"
-    [ -z "${MYSHELLCONFIG_LOGFILE+x}" ]     && MYSHELLCONFIG_LOGFILE="${MYSHELLCONFIG_LOGDIR}/git.log"
+    [ -z "${MYSHELLCONFIG_LOGFILE+x}" ]     && MYSHELLCONFIG_LOGFILE="${MYSHELLCONFIG_LOGDIR}/myshellconfig.log"
     [ -z "${MYSHELLCONFIG_GIT_TIMEOUT+x}" ] && MYSHELLCONFIG_GIT_TIMEOUT=5s
     [ -z "${MYSHELLCONFIG_GIT_CHECKOUT_TIMEOUT+x}" ] && MYSHELLCONFIG_GIT_CHECKOUT_TIMEOUT=20s
     MYSHELLCONFIG_BASH_COMPLETION="${HOME}/${MYSHELLCONFIG_SUBPATH}/bash_completion.d"
diff --git a/myshell_load_defaults b/myshell_load_defaults
index 6232bfb..a091e7e 100644
--- a/myshell_load_defaults
+++ b/myshell_load_defaults
@@ -59,20 +59,6 @@ if ! $SSHS; then
     # Go HOME
     #cd ${HOME}
 
-    # Create and link Work-Dir of the Day
-
-    WDOTD=$(date "+${HOME}/archive/work/%Y/%m/work_%Y%m%d")
-    [ -e $WDOTD ] || mkdir -pv "${WDOTD}"
-    if [[ ( -e "${HOME}/WORK" && -h "${HOME}/WORK" ) ||  ! -e "${HOME}/WORK" ]] ; then
-        ln -svnf "${WDOTD}" "${HOME}/WORK"
-    else
-        echo "${HOME}/WORK exists and is real directory" 
-    fi
-
-
-
-    echo "bashrc_add sourced" 1>&2
-
     if test ! $TMUX && test $SSH_TTY && test $TERM != screen && test $(systemctl status tmux@${USER}.service 1>/dev/null 2>&1; echo $? ) -eq 0; then
         cat << EOF
 
@@ -110,3 +96,20 @@ else
     esac
 
 fi
+
+# Create and link Work-Dir of the Day
+
+if [ $(id -u) -ne 0 ]; then
+    WDOTD=$(date "+${HOME}/archive/work/%Y/%m/work_%Y%m%d")
+    [ -e $WDOTD ] || mkdir -pv "${WDOTD}"
+    if [[ ( -e "${HOME}/WORK" && -h "${HOME}/WORK" ) ||  ! -e "${HOME}/WORK" ]] ; then
+        ln -svnf "${WDOTD}" "${HOME}/WORK"   >${MYSHELLCONFIG_LOGFILE} 2>&1
+    else
+        echo "${HOME}/WORK exists and is real directory"  >${MYSHELLCONFIG_LOGFILE} 2>&1
+    fi
+fi
+
+
+
+echo "bashrc_add sourced" 2>&1 |tee -a ${MYSHELLCONFIG_LOGFILE} >&2
+