From b677438fa80ccafbdd8cc3863fe48fa48038dd65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Wed, 20 Jan 2021 17:09:09 +0100
Subject: [PATCH 01/34] remove token and readd if add not possible

---
 functions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/functions.sh b/functions.sh
index 943acb9..9f116f1 100755
--- a/functions.sh
+++ b/functions.sh
@@ -827,7 +827,7 @@ token(){
     #   token -r|-f|--reload-token <identity>   will remove token from agent and add it again (if plugged off and plugged in again
 #    startagent -t $@
     loadagent $@
-    loginfo "$(ssh-add -s $PKCS11_MODULE)"
+    loginfo "$(ssh-add -s $PKCS11_MODULE || { ssh-add -e $PKCS11-MODULE; ssh-add -s $PKCS11_MODULE; } )"
     loginfo "$(ssh-add -l)"
 
     

From 5f9db11400e18318f735f9244e9e4db00d4f88ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Sat, 23 Jan 2021 20:50:45 +0100
Subject: [PATCH 02/34] update submodules

---
 functions.sh                    | 2 +-
 tmux/plugins/tmux-themepack     | 2 +-
 tmux/plugins/tpm                | 2 +-
 vim/pack/plugins/start/fzf      | 2 +-
 vim/pack/plugins/start/fzf.vim  | 2 +-
 vim/pack/plugins/start/nerdtree | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/functions.sh b/functions.sh
index 9f116f1..bf14b88 100755
--- a/functions.sh
+++ b/functions.sh
@@ -827,7 +827,7 @@ token(){
     #   token -r|-f|--reload-token <identity>   will remove token from agent and add it again (if plugged off and plugged in again
 #    startagent -t $@
     loadagent $@
-    loginfo "$(ssh-add -s $PKCS11_MODULE || { ssh-add -e $PKCS11-MODULE; ssh-add -s $PKCS11_MODULE; } )"
+    loginfo "$(ssh-add -s $PKCS11_MODULE || { ssh-add -e $PKCS11-MODULE; ssh-add -s $PKCS11_MODULE; } )"
     loginfo "$(ssh-add -l)"
 
     
diff --git a/tmux/plugins/tmux-themepack b/tmux/plugins/tmux-themepack
index 7c59902..1b1b809 160000
--- a/tmux/plugins/tmux-themepack
+++ b/tmux/plugins/tmux-themepack
@@ -1 +1 @@
-Subproject commit 7c59902f64dcd7ea356e891274b21144d1ea5948
+Subproject commit 1b1b8098419daacb92ca401ad6ee0ca6894a40ca
diff --git a/tmux/plugins/tpm b/tmux/plugins/tpm
index 60a36d6..38576cf 160000
--- a/tmux/plugins/tpm
+++ b/tmux/plugins/tpm
@@ -1 +1 @@
-Subproject commit 60a36d6f7adddfb68d68349dce3081e7d5c4d4ab
+Subproject commit 38576cf76ea0d9959dae8bccc77306e70b318f8e
diff --git a/vim/pack/plugins/start/fzf b/vim/pack/plugins/start/fzf
index af48b3d..32c493e 160000
--- a/vim/pack/plugins/start/fzf
+++ b/vim/pack/plugins/start/fzf
@@ -1 +1 @@
-Subproject commit af48b3df29a0c9658e95a109141f4a3c168b40a0
+Subproject commit 32c493e994288f63c2ceec1dbeaadc5de7399552
diff --git a/vim/pack/plugins/start/fzf.vim b/vim/pack/plugins/start/fzf.vim
index d43df0e..36de5db 160000
--- a/vim/pack/plugins/start/fzf.vim
+++ b/vim/pack/plugins/start/fzf.vim
@@ -1 +1 @@
-Subproject commit d43df0ea2f099836c2e3499756101e87bcbd3e25
+Subproject commit 36de5db9f0af1fb2e788f890d7f28f1f8239bd4b
diff --git a/vim/pack/plugins/start/nerdtree b/vim/pack/plugins/start/nerdtree
index aaa946f..b134f65 160000
--- a/vim/pack/plugins/start/nerdtree
+++ b/vim/pack/plugins/start/nerdtree
@@ -1 +1 @@
-Subproject commit aaa946fb6bd79b9af86fbaf4b6b63fd81d839bd9
+Subproject commit b134f6518b902c7e0482ae770b804fd47c2d2426

From 84be8e371c5aba06035dd3b1d1c2dfd68f6354ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Tue, 2 Feb 2021 09:48:40 +0100
Subject: [PATCH 03/34] fix local and remote start of tmux

---
 bashrc_add            | 5 ++---
 defaults.conf         | 2 ++
 myshell_load_defaults | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bashrc_add b/bashrc_add
index 70e2c4b..325e89c 100755
--- a/bashrc_add
+++ b/bashrc_add
@@ -11,7 +11,6 @@
 
 # set some variables to defaults, if not set in .bashrc
 [ -z ${SSHS+x} ] && export SSHS=false
-[ -z ${STARTTMUX+x} ] && export STARTTMUX=false
 
 # check if we are a interactive shell
 # https://guide.bash.academy/expansions/
@@ -204,8 +203,8 @@ EOF
     SCRIPTEXIT
 
     # Start tmux if not defined as STARTTMUX in bashrc
-    logdebug "start tmux ${STARTTMUXDEFAULT} - ${STARTTMUXDEFAULT-$STARTTMUX}"
-    if ${STARTTMUXDEFAULT-$STARTTMUX} ; then
+    logdebug "start tmux ${STARTTMUXDEFAULT} - ${STARTTMUXDEFAULT} - ${STARTTMUXDEFAULT-$STARTTMUX}"
+    if ${STARTTMUX-$STARTTMUXDEFAULT} ; then
         cat << EOF
 
 "User: $USER - $UID"
diff --git a/defaults.conf b/defaults.conf
index 9f514cf..a2c83dc 100644
--- a/defaults.conf
+++ b/defaults.conf
@@ -13,3 +13,5 @@ export MSC_LOGLEVEL_DEFAULT="INFO"
 export MSC_FILELOGLEVEL_DEFAULT="DEBUG"
 export LOGLEVEL_DEFAULT="${MSC_LOGLEVEL_DEFAULT}"
 export FILELOGLEVEL_DEFAULT="${MSC_FILELOGLEVEL_DEFAULT}"
+export STARTTMUXDEFAULT=false
+export STARTTMUXREMOTEDEFAULT=true
diff --git a/myshell_load_defaults b/myshell_load_defaults
index cf93e44..fcc2bf5 100644
--- a/myshell_load_defaults
+++ b/myshell_load_defaults
@@ -81,7 +81,7 @@ if ! $SSHS; then
 
     # Start tmux if not defined as STARTTMUX in bashrc
     if test ! $TMUX && test $SSH_TTY && test $TERM != screen && test $(systemctl status tmux@${USER}.service 1>/dev/null 2>&1; echo $? ) -eq 0; then
-            STARTTMUXDEFAULT=true
+            STARTTMUXDEFAULT=${STARTTMUXREMOTEDEFAULT}
     fi
 
     unset -f pathmunge

From df9a7c3ec44070ab86b0d72143665b7a50f43c8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Tue, 2 Feb 2021 09:49:05 +0100
Subject: [PATCH 04/34] add debug

---
 functions.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/functions.sh b/functions.sh
index bf14b88..a39a17c 100755
--- a/functions.sh
+++ b/functions.sh
@@ -334,7 +334,10 @@ sshmyshellconfig() {
     echo
     echo cleanup from old config
     rm -rf  ~/server-config && echo rm -rf  ~/server-config
-    echo git clone
+    echo mkdir -p ~/.local
+    mkdir -p ~/.local
+    #echo git clone
+    echo git clone --recurse-submodules $MSC_GIT_REMOTE \${HOME}/${MSC_SUBPATH}
     git clone --recurse-submodules $MSC_GIT_REMOTE \${HOME}/${MSC_SUBPATH}
     date "+%s" > \${HOME}/${MSC_SUBPATH}/.last_update_submodules
     date "+%s" > \${HOME}/${MSC_SUBPATH}/.last_update_repo

From 15e65e15a922766da5eb1c8b255a38d5e10eefe0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Tue, 2 Feb 2021 10:40:04 +0100
Subject: [PATCH 05/34] add debug

---
 myshell_load_defaults | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/myshell_load_defaults b/myshell_load_defaults
index fcc2bf5..6d12d38 100644
--- a/myshell_load_defaults
+++ b/myshell_load_defaults
@@ -80,8 +80,12 @@ if ! $SSHS; then
     #cd ${HOME}
 
     # Start tmux if not defined as STARTTMUX in bashrc
+    logwarn -n "attach tmux?"
     if test ! $TMUX && test $SSH_TTY && test $TERM != screen && test $(systemctl status tmux@${USER}.service 1>/dev/null 2>&1; echo $? ) -eq 0; then
-            STARTTMUXDEFAULT=${STARTTMUXREMOTEDEFAULT}
+        STARTTMUXDEFAULT=${STARTTMUXREMOTEDEFAULT}
+        logwarn "${STARTTMUXDEFAULT}"
+    else
+        logwarn "no"
     fi
 
     unset -f pathmunge

From 08dad34a672054310cf70027d01d590566f9851e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Tue, 2 Feb 2021 10:43:02 +0100
Subject: [PATCH 06/34] add debug

---
 myshell_load_defaults | 1 +
 1 file changed, 1 insertion(+)

diff --git a/myshell_load_defaults b/myshell_load_defaults
index 6d12d38..b3cfb78 100644
--- a/myshell_load_defaults
+++ b/myshell_load_defaults
@@ -93,6 +93,7 @@ if ! $SSHS; then
 else
     # run with temporary config
 
+    logwarn "tmpconf"
     case $TERM in
         *screen*)
             loginfo BASHRC: $BASHRC -> source it

From 933683ea295c08005849b76382b6b8e4324fccd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Tue, 2 Feb 2021 10:45:25 +0100
Subject: [PATCH 07/34] debug

---
 myshell_load_defaults | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/myshell_load_defaults b/myshell_load_defaults
index b3cfb78..62bd48d 100644
--- a/myshell_load_defaults
+++ b/myshell_load_defaults
@@ -21,6 +21,14 @@ esac
 
 # Load default values, functions, aliases for myshellconfig
 if ! $SSHS; then
+    ######################################################################################
+    # ls is not in color on all systems
+    export LS_OPTIONS='--color=auto'
+    eval "`dircolors`"
+
+    #######################################################################################
+    # User specific aliases and function
+    echo "notmpconf"
     if [ -e ${MSC_BASE}/functions.sh ]; then
         . ${MSC_BASE}/functions.sh
     else
@@ -29,13 +37,6 @@ if ! $SSHS; then
 
 
 
-    ######################################################################################
-    # ls is not in color on all systems
-    export LS_OPTIONS='--color=auto'
-    eval "`dircolors`"
-
-    #######################################################################################
-    # User specific aliases and function
 
 
     if [ -d "${MSC_BASE}/bin" ] ; then
@@ -93,7 +94,7 @@ if ! $SSHS; then
 else
     # run with temporary config
 
-    logwarn "tmpconf"
+    echo "tmpconf"
     case $TERM in
         *screen*)
             loginfo BASHRC: $BASHRC -> source it

From 93bfa52113f18d387e40647062690916ff5f1e31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Tue, 2 Feb 2021 10:49:23 +0100
Subject: [PATCH 08/34] debug

---
 myshell_load_defaults | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/myshell_load_defaults b/myshell_load_defaults
index 62bd48d..2a5ceb9 100644
--- a/myshell_load_defaults
+++ b/myshell_load_defaults
@@ -83,11 +83,11 @@ if ! $SSHS; then
     # Start tmux if not defined as STARTTMUX in bashrc
     logwarn -n "attach tmux?"
     if test ! $TMUX && test $SSH_TTY && test $TERM != screen && test $(systemctl status tmux@${USER}.service 1>/dev/null 2>&1; echo $? ) -eq 0; then
-        STARTTMUXDEFAULT=${STARTTMUXREMOTEDEFAULT}
-        logwarn "${STARTTMUXDEFAULT}"
+      : #  STARTTMUXDEFAULT=${STARTTMUXREMOTEDEFAULT}
     else
-        logwarn "no"
+        STARTTMUXDEFAULT=${STARTTMUXREMOTEDEFAULT}
     fi
+    logwarn "${STARTTMUXDEFAULT}"
 
     unset -f pathmunge
 

From 6108bc2b846892361200d24c13a813831d2436e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Tue, 2 Feb 2021 10:53:45 +0100
Subject: [PATCH 09/34] fix variable

---
 bin/git-myshellconfig-checkout | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/bin/git-myshellconfig-checkout b/bin/git-myshellconfig-checkout
index bbd22fb..f145f08 100755
--- a/bin/git-myshellconfig-checkout
+++ b/bin/git-myshellconfig-checkout
@@ -41,11 +41,12 @@ while [ $# -gt 0 ]; do
     case $1 in
         -h|--headless)
             # Headless repo local
+            logwarn "git remote name: ${MSC_GIT_REMOTE_NAME}"
             PRE="${MSC_GIT_REMOTE_NAME}"
             shift
             ;;
         -r|--force-repo-update)
-            dosubmodupdate="true"
+            dorepomodupdate="true"
             shift
             ;;
         -s|--force-submodules-update)
@@ -66,14 +67,8 @@ done
 
 # Check for updates in submodules only if last check was INTERVALL hours in the past
 #if [ $(cat ${MSC_BASE%/}${MSC_BASE:+/}.last_update_submodules 2>/dev/null || echo 0 ) \
-[ -z "${MSC_GIT_UPD_SUBMOD_STATFILE+x}" ] && export MSC_GIT_UPD_SUBMOD_STATFILE="${MSC_BASE%/}${MSC_BASE:+/}.last_update_submodules" 
 [ -z "${MSC_GIT_UPD_REPO_STATFILE+x}" ] && export MSC_GIT_UPD_REPO_STATFILE="${MSC_BASE%/}${MSC_BASE:+/}.last_update_repo" 
-
-if [ $(stat --printf %Y ${MSC_GIT_UPD_SUBMOD_STATFILE}  2>/dev/null || echo 0 ) \
-    -lt $(date --date="${MSC_GIT_SUBMODULES_UPDATE_INTERVALL-${MSC_GIT_SUBMODULES_UPDATE_INTERVALL_DEFAULT}} hours ago" "+%s") \
-    -a ${MSC_GIT_SUBMODULES_UPDATE-${MSC_GIT_SUBMODULES_UPDATE_DEFAULT-true}} ]; then
-    [ -z "${dosubmodupdate+x}" ] && dosubmodupdate="true"
-fi
+[ -z "${MSC_GIT_UPD_SUBMOD_STATFILE+x}" ] && export MSC_GIT_UPD_SUBMOD_STATFILE="${MSC_BASE%/}${MSC_BASE:+/}.last_update_submodules" 
 
 if [ $(stat --printf %Y ${MSC_GIT_UPD_REPO_STATFILE}  2>/dev/null || echo 0 ) \
     -lt $(date --date="${MSC_GIT_REPO_UPDATE_INTERVALL-${MSC_GIT_REPO_UPDATE_INTERVALL_DEFAULT}} hours ago" "+%s") \
@@ -81,6 +76,12 @@ if [ $(stat --printf %Y ${MSC_GIT_UPD_REPO_STATFILE}  2>/dev/null || echo 0 ) \
     [ -z "${dorepoupdate+x}" ] && dorepoupdate="true"
 fi
     
+if [ $(stat --printf %Y ${MSC_GIT_UPD_SUBMOD_STATFILE}  2>/dev/null || echo 0 ) \
+    -lt $(date --date="${MSC_GIT_SUBMODULES_UPDATE_INTERVALL-${MSC_GIT_SUBMODULES_UPDATE_INTERVALL_DEFAULT}} hours ago" "+%s") \
+    -a ${MSC_GIT_SUBMODULES_UPDATE-${MSC_GIT_SUBMODULES_UPDATE_DEFAULT-true}} ]; then
+    [ -z "${dosubmodupdate+x}" ] && dosubmodupdate="true"
+fi
+
 #echo $SGIT fetch ${MSC_GIT_REMOTE_NAME} -p 1>&2 
 if $dorepoupdate; then
     loginfo "fetch repo${dosubmodupdate:+ and submodules}"

From 140d5ff96cf21e1b11845844ab9e5e84c036c26f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Tue, 2 Feb 2021 11:09:41 +0100
Subject: [PATCH 10/34] fix herefile

---
 bin/git-myshellconfig-checkout | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/git-myshellconfig-checkout b/bin/git-myshellconfig-checkout
index f145f08..0818381 100755
--- a/bin/git-myshellconfig-checkout
+++ b/bin/git-myshellconfig-checkout
@@ -59,7 +59,7 @@ while [ $# -gt 0 ]; do
             ;;
     esac
 done
-# If TAG is set, checkout is always headless. 
+# If MSC_GIT_TAG is set, checkout is always headless. 
 [ -z "${MSC_GIT_TAG:+x}" ] || { export MSC_GIT_BRANCH=${MSC_GIT_TAG}; export PRE=""; }
 
 # Output
@@ -94,7 +94,7 @@ if $dorepoupdate; then
     if $SGIT diff-index --ignore-submodules --exit-code HEAD -- >> "${MSC_LOGFILE}" ; then
         cat << EOF >> "${MSC_LOGFILE}"
         no changes in local repo
-        $SGIT checkout repo ${PRE}${PRE:+/}${MSC_GIT_BRANCH}
+        $SGIT checkout repo  ${PRE}${PRE:+/}${MSC_GIT_BRANCH}
     EOF
         $SGIT checkout ${PRE}${PRE:+/}${MSC_GIT_BRANCH} 1>>"${MSC_LOGFILE}" 2>>"${MSC_LOGFILE}"|| { gitupdateend; exit 2; }
         $SGIT merge FETCH_HEAD 1>>"${MSC_LOGFILE}" 2>>"${MSC_LOGFILE}"|| { gitupdateend; exit 3; }

From 082865b6d08fc8bba8a081007a4dfeefbffab0c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Tue, 2 Feb 2021 11:14:06 +0100
Subject: [PATCH 11/34] try fix herefile

---
 bin/git-myshellconfig-checkout | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/git-myshellconfig-checkout b/bin/git-myshellconfig-checkout
index 0818381..975a363 100755
--- a/bin/git-myshellconfig-checkout
+++ b/bin/git-myshellconfig-checkout
@@ -94,8 +94,8 @@ if $dorepoupdate; then
     if $SGIT diff-index --ignore-submodules --exit-code HEAD -- >> "${MSC_LOGFILE}" ; then
         cat << EOF >> "${MSC_LOGFILE}"
         no changes in local repo
-        $SGIT checkout repo  ${PRE}${PRE:+/}${MSC_GIT_BRANCH}
-    EOF
+        $SGIT checkout repo ${PRE}${PRE:+/}${MSC_GIT_BRANCH}
+EOF
         $SGIT checkout ${PRE}${PRE:+/}${MSC_GIT_BRANCH} 1>>"${MSC_LOGFILE}" 2>>"${MSC_LOGFILE}"|| { gitupdateend; exit 2; }
         $SGIT merge FETCH_HEAD 1>>"${MSC_LOGFILE}" 2>>"${MSC_LOGFILE}"|| { gitupdateend; exit 3; }
         touch $MSC_GIT_UPD_REPO_STATFILE

From cec89c1e22a6e20c899392d07618d2ffe34ab211 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Tue, 2 Feb 2021 11:20:49 +0100
Subject: [PATCH 12/34] debug

---
 bin/git-myshellconfig-checkout | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/git-myshellconfig-checkout b/bin/git-myshellconfig-checkout
index 975a363..8e7a677 100755
--- a/bin/git-myshellconfig-checkout
+++ b/bin/git-myshellconfig-checkout
@@ -60,7 +60,8 @@ while [ $# -gt 0 ]; do
     esac
 done
 # If MSC_GIT_TAG is set, checkout is always headless. 
-[ -z "${MSC_GIT_TAG:+x}" ] || { export MSC_GIT_BRANCH=${MSC_GIT_TAG}; export PRE=""; }
+[ -z "${MSC_GIT_TAG:+x}" ] || { export MSC_GIT_BRANCH=${MSC_GIT_TAG}; export PRE=""; echo "DEBUG"; }
+logwarn "git PRE: ${PRE}"
 
 # Output
 #echo -n " remote: ${MSC_GIT_REMOTE_NAME}, branch: ${MSC_GIT_BRANCH}: "

From 32eb7140b28a461eafc6b1af92ab5234c1deec6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Tue, 2 Feb 2021 11:22:53 +0100
Subject: [PATCH 13/34] debug

---
 bin/git-myshellconfig-checkout | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/git-myshellconfig-checkout b/bin/git-myshellconfig-checkout
index 8e7a677..5b19f2c 100755
--- a/bin/git-myshellconfig-checkout
+++ b/bin/git-myshellconfig-checkout
@@ -60,6 +60,7 @@ while [ $# -gt 0 ]; do
     esac
 done
 # If MSC_GIT_TAG is set, checkout is always headless. 
+logwarn "git PRE: ${PRE}"
 [ -z "${MSC_GIT_TAG:+x}" ] || { export MSC_GIT_BRANCH=${MSC_GIT_TAG}; export PRE=""; echo "DEBUG"; }
 logwarn "git PRE: ${PRE}"
 

From cd10898db8144bb0c7959e4120674fba18e20387 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Tue, 2 Feb 2021 11:24:23 +0100
Subject: [PATCH 14/34] debug

---
 bin/git-myshellconfig-checkout | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/git-myshellconfig-checkout b/bin/git-myshellconfig-checkout
index 5b19f2c..ed748b4 100755
--- a/bin/git-myshellconfig-checkout
+++ b/bin/git-myshellconfig-checkout
@@ -43,6 +43,7 @@ while [ $# -gt 0 ]; do
             # Headless repo local
             logwarn "git remote name: ${MSC_GIT_REMOTE_NAME}"
             PRE="${MSC_GIT_REMOTE_NAME}"
+            logwarn "git PRE: ${PRE}"
             shift
             ;;
         -r|--force-repo-update)

From 91d1337ae66af9f3bd7de40b9aac75d6a430d52a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Tue, 2 Feb 2021 11:25:52 +0100
Subject: [PATCH 15/34] debug

---
 bin/git-myshellconfig-checkout | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/git-myshellconfig-checkout b/bin/git-myshellconfig-checkout
index ed748b4..3fd18d0 100755
--- a/bin/git-myshellconfig-checkout
+++ b/bin/git-myshellconfig-checkout
@@ -41,9 +41,9 @@ while [ $# -gt 0 ]; do
     case $1 in
         -h|--headless)
             # Headless repo local
-            logwarn "git remote name: ${MSC_GIT_REMOTE_NAME}"
+            echo "git remote name: ${MSC_GIT_REMOTE_NAME}"
             PRE="${MSC_GIT_REMOTE_NAME}"
-            logwarn "git PRE: ${PRE}"
+            echo "git PRE: ${PRE}"
             shift
             ;;
         -r|--force-repo-update)

From 6e12b8063e3751ed546bfb55deb23a8c6bce4819 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Tue, 2 Feb 2021 11:27:39 +0100
Subject: [PATCH 16/34] debug

---
 bin/git-myshellconfig-checkout | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bin/git-myshellconfig-checkout b/bin/git-myshellconfig-checkout
index 3fd18d0..d7186ab 100755
--- a/bin/git-myshellconfig-checkout
+++ b/bin/git-myshellconfig-checkout
@@ -41,9 +41,7 @@ while [ $# -gt 0 ]; do
     case $1 in
         -h|--headless)
             # Headless repo local
-            echo "git remote name: ${MSC_GIT_REMOTE_NAME}"
             PRE="${MSC_GIT_REMOTE_NAME}"
-            echo "git PRE: ${PRE}"
             shift
             ;;
         -r|--force-repo-update)
@@ -56,6 +54,7 @@ while [ $# -gt 0 ]; do
             ;;
         *)
             PRE=""
+            echo bla
             shift
             ;;
     esac

From d4d5c29049b65762a58fe059b682f213cd703468 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Tue, 2 Feb 2021 11:28:34 +0100
Subject: [PATCH 17/34] debug

---
 bin/git-myshellconfig-checkout | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/git-myshellconfig-checkout b/bin/git-myshellconfig-checkout
index d7186ab..b68f36a 100755
--- a/bin/git-myshellconfig-checkout
+++ b/bin/git-myshellconfig-checkout
@@ -53,6 +53,7 @@ while [ $# -gt 0 ]; do
             shift
             ;;
         *)
+            echo "1: $1"
             PRE=""
             echo bla
             shift

From 75d1935d1d8ba01d47a1a85eacb9bc7297d1d1cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Tue, 2 Feb 2021 11:30:09 +0100
Subject: [PATCH 18/34] debug

---
 bin/git-myshellconfig-checkout | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bin/git-myshellconfig-checkout b/bin/git-myshellconfig-checkout
index b68f36a..c1e8bc9 100755
--- a/bin/git-myshellconfig-checkout
+++ b/bin/git-myshellconfig-checkout
@@ -52,6 +52,10 @@ while [ $# -gt 0 ]; do
             dosubmodupdate="true"
             shift
             ;;
+        --)
+            shift
+            break
+            ;;
         *)
             echo "1: $1"
             PRE=""

From 03a09069c6dea835d12bf6c0d86d544fc5760c67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Sun, 7 Feb 2021 01:31:37 +0100
Subject: [PATCH 19/34] update submodules

---
 vim/pack/plugins/start/fzf           | 2 +-
 vim/pack/plugins/start/fzf.vim       | 2 +-
 vim/pack/plugins/start/nerdtree      | 2 +-
 vim/pack/plugins/start/vim-airline   | 2 +-
 vim/pack/plugins/start/vim-fugitive  | 2 +-
 vim/pack/plugins/start/vim-gitgutter | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/vim/pack/plugins/start/fzf b/vim/pack/plugins/start/fzf
index 32c493e..6654239 160000
--- a/vim/pack/plugins/start/fzf
+++ b/vim/pack/plugins/start/fzf
@@ -1 +1 @@
-Subproject commit 32c493e994288f63c2ceec1dbeaadc5de7399552
+Subproject commit 6654239c94667fefb38d76cfc47b6abf5ced8149
diff --git a/vim/pack/plugins/start/fzf.vim b/vim/pack/plugins/start/fzf.vim
index 36de5db..02a192e 160000
--- a/vim/pack/plugins/start/fzf.vim
+++ b/vim/pack/plugins/start/fzf.vim
@@ -1 +1 @@
-Subproject commit 36de5db9f0af1fb2e788f890d7f28f1f8239bd4b
+Subproject commit 02a192ea0bed22a015e005b281e55e0da2a8e496
diff --git a/vim/pack/plugins/start/nerdtree b/vim/pack/plugins/start/nerdtree
index b134f65..1b19089 160000
--- a/vim/pack/plugins/start/nerdtree
+++ b/vim/pack/plugins/start/nerdtree
@@ -1 +1 @@
-Subproject commit b134f6518b902c7e0482ae770b804fd47c2d2426
+Subproject commit 1b19089917cc3e0a81d3294fead2424c419d545c
diff --git a/vim/pack/plugins/start/vim-airline b/vim/pack/plugins/start/vim-airline
index c7a633c..c01977d 160000
--- a/vim/pack/plugins/start/vim-airline
+++ b/vim/pack/plugins/start/vim-airline
@@ -1 +1 @@
-Subproject commit c7a633ce8f4547e680377efe8ea70493fcce1349
+Subproject commit c01977d027de854c6a85ed5c57915a7e8848f4b9
diff --git a/vim/pack/plugins/start/vim-fugitive b/vim/pack/plugins/start/vim-fugitive
index bebe504..8cf0cf5 160000
--- a/vim/pack/plugins/start/vim-fugitive
+++ b/vim/pack/plugins/start/vim-fugitive
@@ -1 +1 @@
-Subproject commit bebe504e38d0a20c30d6dd666c4c793b3cc66104
+Subproject commit 8cf0cf5bfb2b858faecf4e0f6c1b8d0948805e5e
diff --git a/vim/pack/plugins/start/vim-gitgutter b/vim/pack/plugins/start/vim-gitgutter
index 512e299..ff9d134 160000
--- a/vim/pack/plugins/start/vim-gitgutter
+++ b/vim/pack/plugins/start/vim-gitgutter
@@ -1 +1 @@
-Subproject commit 512e2999ed7ff367580e0d6bc4d2daa81663221f
+Subproject commit ff9d134f0c69e25d391138036051b2c5e6bac864

From 4eafc733d85d3f20712db51a7067c1bf2e07caff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Sun, 7 Feb 2021 21:17:35 +0100
Subject: [PATCH 20/34] add debug

---
 myshell_load_defaults | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/myshell_load_defaults b/myshell_load_defaults
index 2a5ceb9..db100ea 100644
--- a/myshell_load_defaults
+++ b/myshell_load_defaults
@@ -82,6 +82,10 @@ if ! $SSHS; then
 
     # Start tmux if not defined as STARTTMUX in bashrc
     logwarn -n "attach tmux?"
+    logwarn "TMUX: $TMUX"
+    logwarn "SSH_TTY: $SSH_TTY"
+    logwarn "TERM: $TERM"
+    logwarn "tmux@${USER}: $(systemctl status tmux@${USER}.service 1>/dev/null 2>&1; echo $? )"
     if test ! $TMUX && test $SSH_TTY && test $TERM != screen && test $(systemctl status tmux@${USER}.service 1>/dev/null 2>&1; echo $? ) -eq 0; then
       : #  STARTTMUXDEFAULT=${STARTTMUXREMOTEDEFAULT}
     else

From 61c600ffbfcdfec30f0a91f4ee65ce2d9ca57ac9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Sun, 7 Feb 2021 21:20:19 +0100
Subject: [PATCH 21/34] add debug

---
 myshell_load_defaults | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/myshell_load_defaults b/myshell_load_defaults
index db100ea..caeab5b 100644
--- a/myshell_load_defaults
+++ b/myshell_load_defaults
@@ -88,7 +88,9 @@ if ! $SSHS; then
     logwarn "tmux@${USER}: $(systemctl status tmux@${USER}.service 1>/dev/null 2>&1; echo $? )"
     if test ! $TMUX && test $SSH_TTY && test $TERM != screen && test $(systemctl status tmux@${USER}.service 1>/dev/null 2>&1; echo $? ) -eq 0; then
       : #  STARTTMUXDEFAULT=${STARTTMUXREMOTEDEFAULT}
+      logwarn "TEST1"
     else
+      logwarn "TEST2"
         STARTTMUXDEFAULT=${STARTTMUXREMOTEDEFAULT}
     fi
     logwarn "${STARTTMUXDEFAULT}"

From 7fe196faea9761c053eeb2fc582326a2fe47e6a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Sun, 7 Feb 2021 21:26:14 +0100
Subject: [PATCH 22/34] add debug

---
 bashrc_add            |  2 +-
 myshell_load_defaults | 23 +++++++++++++++++------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/bashrc_add b/bashrc_add
index 325e89c..6e5c37e 100755
--- a/bashrc_add
+++ b/bashrc_add
@@ -203,7 +203,7 @@ EOF
     SCRIPTEXIT
 
     # Start tmux if not defined as STARTTMUX in bashrc
-    logdebug "start tmux ${STARTTMUXDEFAULT} - ${STARTTMUXDEFAULT} - ${STARTTMUXDEFAULT-$STARTTMUX}"
+    logdebug "start tmux ${STARTTMUXDEFAULT} - ${STARTTMUXREMOTEDEFAULT} - ${STARTTMUX-$STARTTMUXDEFAULT}"
     if ${STARTTMUX-$STARTTMUXDEFAULT} ; then
         cat << EOF
 
diff --git a/myshell_load_defaults b/myshell_load_defaults
index caeab5b..5e5fbf5 100644
--- a/myshell_load_defaults
+++ b/myshell_load_defaults
@@ -86,13 +86,24 @@ if ! $SSHS; then
     logwarn "SSH_TTY: $SSH_TTY"
     logwarn "TERM: $TERM"
     logwarn "tmux@${USER}: $(systemctl status tmux@${USER}.service 1>/dev/null 2>&1; echo $? )"
-    if test ! $TMUX && test $SSH_TTY && test $TERM != screen && test $(systemctl status tmux@${USER}.service 1>/dev/null 2>&1; echo $? ) -eq 0; then
-      : #  STARTTMUXDEFAULT=${STARTTMUXREMOTEDEFAULT}
-      logwarn "TEST1"
-    else
-      logwarn "TEST2"
-        STARTTMUXDEFAULT=${STARTTMUXREMOTEDEFAULT}
+    if test $SSH_TTY; then
+        logwarn "im remote"
+        if test ! $TMUX && $TERM != screen; then
+            logwarn "no screen"
+            if test $(systemctl status tmux@${USER}.service 1>/dev/null 2>&1; echo $? ) -eq 0; then
+                logwarn "tmux@${USER} is running"
+                STARTTMUXDEFAULT=${STARTTMUXREMOTEDEFAULT}
+            fi
+        fi
     fi
+
+#    if test ! $TMUX && test $SSH_TTY && test $TERM != screen && test $(systemctl status tmux@${USER}.service 1>/dev/null 2>&1; echo $? ) -eq 0; then
+#      : #  STARTTMUXDEFAULT=${STARTTMUXREMOTEDEFAULT}
+#      logwarn "TEST1"
+#    else
+#      logwarn "TEST2"
+#        STARTTMUXDEFAULT=${STARTTMUXREMOTEDEFAULT}
+#    fi
     logwarn "${STARTTMUXDEFAULT}"
 
     unset -f pathmunge

From 6cf7db5461858d7f70cc98cd69d9664f398049cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Sun, 7 Feb 2021 21:30:38 +0100
Subject: [PATCH 23/34] fix if

---
 myshell_load_defaults | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/myshell_load_defaults b/myshell_load_defaults
index 5e5fbf5..7d922e8 100644
--- a/myshell_load_defaults
+++ b/myshell_load_defaults
@@ -88,7 +88,7 @@ if ! $SSHS; then
     logwarn "tmux@${USER}: $(systemctl status tmux@${USER}.service 1>/dev/null 2>&1; echo $? )"
     if test $SSH_TTY; then
         logwarn "im remote"
-        if test ! $TMUX && $TERM != screen; then
+        if test ! $TMUX && test $TERM != screen; then
             logwarn "no screen"
             if test $(systemctl status tmux@${USER}.service 1>/dev/null 2>&1; echo $? ) -eq 0; then
                 logwarn "tmux@${USER} is running"

From 325310b10d780de56449be69619e2a1273de2186 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Sun, 14 Feb 2021 00:27:47 +0100
Subject: [PATCH 24/34] change variable-substitution

---
 myshell_git_sync | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/myshell_git_sync b/myshell_git_sync
index 2694e95..d349aaf 100644
--- a/myshell_git_sync
+++ b/myshell_git_sync
@@ -79,7 +79,7 @@ if ! $SSHS; then
     [ -z "${MSC_GIT_REMOTE_NAME+x}" ] && export MSC_GIT_REMOTE_NAME=origin
     [ -z "${MSC_GIT_BRANCH+x}" ] && export MSC_GIT_BRANCH=master
     # If TAG is set, checkout is always headless. 
-    [ -z "${MSC_GIT_TAG:+x}" ] || { export MSC_GIT_BRANCH=${MSC_GIT_TAG}; export MSC_GIT_CHECKOUTSCRIPT_OPTIONS="-h"; }
+    [ -z "${MSC_GIT_TAG:-x}" ] || { export MSC_GIT_BRANCH=${MSC_GIT_TAG}; export MSC_GIT_CHECKOUTSCRIPT_OPTIONS="-h"; }
 
     #GIT_SSH_PATH="/srv/repos"
 

From c6ecc07812039bad972a126bf6db3d34a067650e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Sun, 14 Feb 2021 02:16:54 +0100
Subject: [PATCH 25/34] remove timestamp for repo

first login does not create symlinks
---
 functions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/functions.sh b/functions.sh
index a39a17c..2fba532 100755
--- a/functions.sh
+++ b/functions.sh
@@ -340,7 +340,7 @@ sshmyshellconfig() {
     echo git clone --recurse-submodules $MSC_GIT_REMOTE \${HOME}/${MSC_SUBPATH}
     git clone --recurse-submodules $MSC_GIT_REMOTE \${HOME}/${MSC_SUBPATH}
     date "+%s" > \${HOME}/${MSC_SUBPATH}/.last_update_submodules
-    date "+%s" > \${HOME}/${MSC_SUBPATH}/.last_update_repo
+#    date "+%s" > \${HOME}/${MSC_SUBPATH}/.last_update_repo
 
 EOF
     EXIT

From b180cdb6a601c156f197c6f3093b7a2e602a4679 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Mon, 15 Feb 2021 15:16:49 +0100
Subject: [PATCH 26/34] add trashmail create script

---
 bin/trashmail | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 128 insertions(+)
 create mode 100755 bin/trashmail

diff --git a/bin/trashmail b/bin/trashmail
new file mode 100755
index 0000000..b9661da
--- /dev/null
+++ b/bin/trashmail
@@ -0,0 +1,128 @@
+#!/bin/bash
+
+# creates trash email for registration for online-services
+# email is hashed from domain of service + login-username from linux-system
+# or only unhashed service-domain
+# this created email-address is added to LDAP target email als dcMailAlias
+# also added to pass passwordmanager of user
+
+OWN_DOMAIN=schuerz.at
+TARGET_MAIL=wertstoffe@xundeenergie.at
+LDAP_HOST=ldap.schuerz.at
+BIND_DN=cn=admin,dc=schuerz,dc=at
+PASS_ID="LDAP/binddn-admin"
+HASHED_DEFAULT=true
+
+set -- $(getopt -u -o fh --long force,hashed,not-hashed -- "$@" )
+
+while : ; do
+    case $1 in
+        -n|--not-hashed)
+            HASHED=false
+            shift
+            ;;
+        -h|--hashed)
+            HASHED=true
+            shift
+            ;;
+        -f|--force)
+            FORCE=true
+            shift
+            ;;
+        --)
+            shift
+            break
+            ;;
+        *)
+            wrong argument $1
+            shift
+            continue
+            ;;
+    esac
+done
+
+URL=$1
+
+case $URL in
+    http*)
+        DEST_DOMAIN=$(echo $URL|awk -F/ '{print $3}')
+        ;;
+    [a-zA-Z]*)
+        DEST_DOMAIN=${URL,,}
+        ;;
+    *)
+        logwarn "$URL is no regular url"
+        exit 1
+        ;;
+esac
+echo "Create a trashmail-address for ${DEST_DOMAIN}" >&2
+
+
+if ${HASHED:-$HASHED_DEFAULT}; then
+    TRASHUSER="$(echo ${DEST_DOMAIN}${USER}|md5sum -|awk '{print $1}')"
+else
+    TRASHUSER=${DEST_DOMAIN}
+fi
+
+TRASHMAIL=${TRASHUSER}@${OWN_DOMAIN}
+echo $TRASHMAIL
+
+PASS_ENTRY="${PASS_PREFIX%/}${PASS_PREFIX:+/}${DEST_DOMAIN}/${TRASHMAIL}"
+
+set -x
+cat << EOF |ldapmodify -Z -H ldap://${LDAP_HOST} -D ${BIND_DN} -x -w $(pass ${PASS_ID}|head -n 1)
+dn: dcSubMailAddress=${TARGET_MAIL},ou=mailaccounts,dc=schuerz,dc=at
+changetype: modify
+add: dcMailAlternateAddress
+dcMailAlternateAddress: ${TRASHMAIL}
+EOF
+
+if [ $? -gt 0 ]; then
+    echo pass find ${PASS_ENTRY}
+    pass find ${TRASHMAIL}
+    pass find ${TRASHMAIL}|grep -v "Search Terms"
+    case $? in
+        1)
+            # returncode 1 from grep means, no line selected. so no entry exists, create new one
+            echo "TEST1"
+            CREATE=true
+            ;;
+        0)
+            echo FORCE: ${FORCE-false}
+            if ${FORCE-false} ; then
+                CREATE=true
+            else
+                echo "Current password for ${PASS_ENTRY} is $(pass ${PASS_ENTRY} |head -n1)."
+                read -p "Overwrite? [Y|n]: "
+                echo ""
+                case $REPLY in
+                    y|Y)
+                        CREATE=true
+                        ;;
+                    *)
+                        CREATE=false
+                        ;;
+                esac
+            fi
+            ;;
+        *)
+            echo "Something went wrong"
+            exit 2
+            ;;
+    esac
+else
+    CREATE=true
+fi
+
+if ${CREATE-false}; then
+cat << EOF |pass insert -m ${PASS_ENTRY}
+$(pwgen -s 50 1)
+email: ${TRASHMAIL}
+login: ${TRASHUSER}
+url: ${URL}
+comment: trashemail autogenerated, delete, when delete account there
+EOF
+fi
+set +x
+    #pass git commit "${PASS_ENTRY}"
+    pass -c ${PASS_ENTRY}

From 50cdd9b1028a8ac38fa67aa607a79d94eb144701 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Mon, 15 Feb 2021 15:27:00 +0100
Subject: [PATCH 27/34] add example defaults config

---
 defaults.conf.sample | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 defaults.conf.sample

diff --git a/defaults.conf.sample b/defaults.conf.sample
new file mode 100644
index 0000000..16ef84d
--- /dev/null
+++ b/defaults.conf.sample
@@ -0,0 +1,24 @@
+### GIT ####
+export MSC_GIT_REPO_UPDATE_DEFAULT=true
+export MSC_GIT_REPO_UPDATE_INTERVALL_DEFAULT=48 #intervall in hours
+export MSC_GIT_SUBMODULES_UPDATE_DEFAULT=true
+export MSC_GIT_SUBMODULES_UPDATE_INTERVALL_DEFAULT=196 #intervall in hours
+export MSC_GIT_SUBMODULES_SERVER_DEFAULT="git://github.com/"
+export MSC_GIT_CHECKOUTSCRIPT_OPTIONS_DEFAULT="-h"
+export MSC_GIT_TIMEOUT_DEFAULT=5s
+export MSC_GIT_CHECKOUT_TIMEOUT_DEFAULT=20s
+### LOGGING ###
+# Possible loglevel-values: ERROR, WARN, INFO, DEBUG, TRACE
+export MSC_LOGLEVEL_DEFAULT="INFO"
+export MSC_FILELOGLEVEL_DEFAULT="DEBUG"
+export LOGLEVEL_DEFAULT="${MSC_LOGLEVEL_DEFAULT}"
+export FILELOGLEVEL_DEFAULT="${MSC_FILELOGLEVEL_DEFAULT}"
+export STARTTMUXDEFAULT=false
+export STARTTMUXREMOTEDEFAULT=true
+
+export LDAP_HOST_DEFAULT=ldap.example.com
+export LDAP_ADMIN_BIND_DN=cn=admin,dc=example,dc=com
+export PASS_ID_LDAP_ADMIN="LDAP/binddn-admin"
+export TRASHMAIL_OWN_DOMAIN_DEFAULT=example.com
+export TRASHMAIL_TARGET_MAIL_DEFAULT=user@example.com
+export TRASHMAIL_HASHED_DEFAULT=true

From 8f1c2fa9bd4f4b2d9196ff3ce020222d9e6205a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Mon, 15 Feb 2021 15:27:28 +0100
Subject: [PATCH 28/34] anonymizies trashmail

---
 bin/trashmail | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/bin/trashmail b/bin/trashmail
index b9661da..f11fabe 100755
--- a/bin/trashmail
+++ b/bin/trashmail
@@ -6,12 +6,14 @@
 # this created email-address is added to LDAP target email als dcMailAlias
 # also added to pass passwordmanager of user
 
-OWN_DOMAIN=schuerz.at
-TARGET_MAIL=wertstoffe@xundeenergie.at
-LDAP_HOST=ldap.schuerz.at
-BIND_DN=cn=admin,dc=schuerz,dc=at
-PASS_ID="LDAP/binddn-admin"
-HASHED_DEFAULT=true
+[ -e ${MSC_BASE}/defaults.conf ] && . ${MSC_BASE}/defaults.conf
+
+LDAP_HOST=${LDAP_HOST_DEFAULT}
+BIND_DN=${LDAP_ADMIN_BIND_DN}
+PASS_ID=${PASS_ID_LDAP_ADMIN}
+OWN_DOMAIN=${TRASHMAIL_OWN_DOMAIN_DEFAULT}
+TARGET_MAIL=${TRASHMAIL_TARGET_MAIL_DEFAULT}
+HASHED_DEFAULT=${TRASHMAIL_HASHED_DEFAULT}
 
 set -- $(getopt -u -o fh --long force,hashed,not-hashed -- "$@" )
 

From 2c3c5c0ba5253a8b018c5d00c1f4d905f0895e06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Mon, 15 Feb 2021 15:27:45 +0100
Subject: [PATCH 29/34] add default.conf to gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 9aa67e1..7993c39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ bashrc_local
 .git-token
 .last_update_submodules
 .last_update_repo
+defaults.config

From 6e51454f793a07acb86ab655e857ebf0044e9b88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Mon, 15 Feb 2021 15:32:25 +0100
Subject: [PATCH 30/34] remove unneeded to ignore files

---
 .gitignore | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7993c39..1232c91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,9 +7,7 @@ logs
 *.swp
 *.orig
 serverconfig.local.conf
-bashrc_local
 .local_scripts
 .git-token
 .last_update_submodules
 .last_update_repo
-defaults.config

From bdd814ca5640ea3f082a2bf81a6047a286c00edd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Mon, 15 Feb 2021 15:32:56 +0100
Subject: [PATCH 31/34] add trasmail settings

---
 defaults.conf | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/defaults.conf b/defaults.conf
index a2c83dc..86b29b5 100644
--- a/defaults.conf
+++ b/defaults.conf
@@ -15,3 +15,10 @@ export LOGLEVEL_DEFAULT="${MSC_LOGLEVEL_DEFAULT}"
 export FILELOGLEVEL_DEFAULT="${MSC_FILELOGLEVEL_DEFAULT}"
 export STARTTMUXDEFAULT=false
 export STARTTMUXREMOTEDEFAULT=true
+
+export LDAP_HOST_DEFAULT=ldap.schuerz.at
+export LDAP_ADMIN_BIND_DN=cn=admin,dc=schuerz,dc=at
+export PASS_ID_LDAP_ADMIN="LDAP/binddn-admin"
+export TRASHMAIL_OWN_DOMAIN_DEFAULT=schuerz.at
+export TRASHMAIL_TARGET_MAIL_DEFAULT=wertstoffe@xundeenergie.at
+export TRASHMAIL_HASHED_DEFAULT=true

From f79935139bd0405d74989fb0dd0c77626c8d043a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Sat, 20 Feb 2021 15:48:01 +0100
Subject: [PATCH 32/34] change check for running tmux session

---
 myshell_load_defaults | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/myshell_load_defaults b/myshell_load_defaults
index 7d922e8..2e5e75c 100644
--- a/myshell_load_defaults
+++ b/myshell_load_defaults
@@ -87,10 +87,11 @@ if ! $SSHS; then
     logwarn "TERM: $TERM"
     logwarn "tmux@${USER}: $(systemctl status tmux@${USER}.service 1>/dev/null 2>&1; echo $? )"
     if test $SSH_TTY; then
-        logwarn "im remote"
+        logwarn "i am remote"
         if test ! $TMUX && test $TERM != screen; then
             logwarn "no screen"
-            if test $(systemctl status tmux@${USER}.service 1>/dev/null 2>&1; echo $? ) -eq 0; then
+#            if test $(systemctl status tmux@${USER}.service 1>/dev/null 2>&1; echo $? ) -eq 0; then
+            if test tmux has-session -t User -o tmux has-session -t "${USER}"; then
                 logwarn "tmux@${USER} is running"
                 STARTTMUXDEFAULT=${STARTTMUXREMOTEDEFAULT}
             fi

From def29fc5a7be4a86100d23dbf5d3d36de348e344 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Sat, 20 Feb 2021 15:53:43 +0100
Subject: [PATCH 33/34] debug

---
 myshell_load_defaults | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/myshell_load_defaults b/myshell_load_defaults
index 2e5e75c..10b2c57 100644
--- a/myshell_load_defaults
+++ b/myshell_load_defaults
@@ -91,7 +91,7 @@ if ! $SSHS; then
         if test ! $TMUX && test $TERM != screen; then
             logwarn "no screen"
 #            if test $(systemctl status tmux@${USER}.service 1>/dev/null 2>&1; echo $? ) -eq 0; then
-            if test tmux has-session -t User -o tmux has-session -t "${USER}"; then
+            if tmux has-session -t User || tmux has-session -t "${USER}"; then
                 logwarn "tmux@${USER} is running"
                 STARTTMUXDEFAULT=${STARTTMUXREMOTEDEFAULT}
             fi

From 7c6db6d04b2df7b8de426f46370a9dfed633f78f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Thu, 25 Feb 2021 22:38:20 +0100
Subject: [PATCH 34/34] change password generation

---
 bin/trashmail | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/trashmail b/bin/trashmail
index f11fabe..5048060 100755
--- a/bin/trashmail
+++ b/bin/trashmail
@@ -118,7 +118,7 @@ fi
 
 if ${CREATE-false}; then
 cat << EOF |pass insert -m ${PASS_ENTRY}
-$(pwgen -s 50 1)
+$(pwgen -y 50 1)
 email: ${TRASHMAIL}
 login: ${TRASHUSER}
 url: ${URL}