From 7ff56e393e3f7159c1deb6882255df0b18fdc5c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz>
Date: Wed, 12 Feb 2020 15:25:26 +0100
Subject: [PATCH 01/45] add history options

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

diff --git a/myshell_load_defaults b/myshell_load_defaults
index b21e102..618f0cf 100644
--- a/myshell_load_defaults
+++ b/myshell_load_defaults
@@ -126,6 +126,8 @@ fi
 # Disable Ctrl+s to freeze terminal
 # Source https://www.digitalocean.com/community/tutorials/how-to-use-bash-history-commands-and-expansions-on-a-linux-vps
 stty -ixon
+HISTCONTROL=erasedups
+HISTIGNORE="ls:cd:exit"
 
 echo "bashrc_add sourced" 2>&1 |tee -a ${MYSHELLCONFIG_LOGFILE} >&2
 #echo "bashrc_add sourced" >&2

From 9840b0cbd22b9ac8ec0c22cf032b6e75d7c620b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz>
Date: Thu, 13 Feb 2020 06:39:02 +0100
Subject: [PATCH 02/45] add history options

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

diff --git a/myshell_load_defaults b/myshell_load_defaults
index 618f0cf..84ea72d 100644
--- a/myshell_load_defaults
+++ b/myshell_load_defaults
@@ -126,8 +126,10 @@ fi
 # Disable Ctrl+s to freeze terminal
 # Source https://www.digitalocean.com/community/tutorials/how-to-use-bash-history-commands-and-expansions-on-a-linux-vps
 stty -ixon
-HISTCONTROL=erasedups
-HISTIGNORE="ls:cd:exit"
+export HISTCONTROL=erasedups,ignorespace,ignoredups
+export HISTIGNORE="ls:l:cd:exit:pwd:date:"
+export HISTTIMEFORMAT='%F %T  '
+export HIStSIZE=999999
 
 echo "bashrc_add sourced" 2>&1 |tee -a ${MYSHELLCONFIG_LOGFILE} >&2
 #echo "bashrc_add sourced" >&2

From 9b9d24da19443533696d8b8c55090df8947b27a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz>
Date: Thu, 13 Feb 2020 06:40:21 +0100
Subject: [PATCH 03/45] fix typo

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

diff --git a/myshell_load_defaults b/myshell_load_defaults
index 84ea72d..25f2209 100644
--- a/myshell_load_defaults
+++ b/myshell_load_defaults
@@ -129,7 +129,7 @@ stty -ixon
 export HISTCONTROL=erasedups,ignorespace,ignoredups
 export HISTIGNORE="ls:l:cd:exit:pwd:date:"
 export HISTTIMEFORMAT='%F %T  '
-export HIStSIZE=999999
+export HISTSIZE=999999
 
 echo "bashrc_add sourced" 2>&1 |tee -a ${MYSHELLCONFIG_LOGFILE} >&2
 #echo "bashrc_add sourced" >&2

From 458da61bc9c7453d89a141213a1a5fb423decae8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz>
Date: Thu, 13 Feb 2020 14:01:31 +0100
Subject: [PATCH 04/45] added some functions for git

---
 .gitconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitconfig b/.gitconfig
index 5ed804f..1cc553e 100755
--- a/.gitconfig
+++ b/.gitconfig
@@ -22,6 +22,8 @@
         purge-last-commit = reset --hard HEAD~1
         pushdetachedhead = push origin HEAD:master
         getbranchauthor = "!f() { git for-each-ref --format='%(committerdate) %09 %(authorname) %09 %(refname)' | sort -k5n -k2M -k3n -k4n; }; f"
+        grepp = grep --break --heading --line-number
+        grephist = "!f() { regex=$1; git grep --break --heading --line-number -e $regex $(git rev-list --all); }; f"
 [merge]
 	conflictstyle = diff3
 	tool = vimdiff

From 0d187178313a684d3d508078480c14ad75d0c695 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz>
Date: Mon, 17 Feb 2020 20:02:33 +0100
Subject: [PATCH 05/45] add alias for ssh to fix console after broken conn

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

diff --git a/aliases b/aliases
index b52549d..2b7c9f5 100644
--- a/aliases
+++ b/aliases
@@ -10,6 +10,7 @@ alias vilastcatfile='vim $(history -p \!cat:$:t)'
 alias vio='vim $(history -p \!less:$:t)'
 alias viless='vim $(history -p \!less:$:t)'
 alias cdlastfiledir='cd $(history -p \!\!:$:h)'
+alias ssh='function f() { trap "reset; stty sane; tput rs1; clear; echo -e \"\033c\"" EXIT ; ssh $@; }; f $@'
 
 
 

From 0205d4afadc1519bb8fb1f82178bd1395bfacedf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz>
Date: Mon, 17 Feb 2020 20:02:59 +0100
Subject: [PATCH 06/45] fix HISTCONTROL from , to : separated list

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

diff --git a/myshell_load_defaults b/myshell_load_defaults
index 25f2209..dcdfe10 100644
--- a/myshell_load_defaults
+++ b/myshell_load_defaults
@@ -126,7 +126,7 @@ fi
 # Disable Ctrl+s to freeze terminal
 # Source https://www.digitalocean.com/community/tutorials/how-to-use-bash-history-commands-and-expansions-on-a-linux-vps
 stty -ixon
-export HISTCONTROL=erasedups,ignorespace,ignoredups
+export HISTCONTROL=erasedups:ignorespace:ignoredups
 export HISTIGNORE="ls:l:cd:exit:pwd:date:"
 export HISTTIMEFORMAT='%F %T  '
 export HISTSIZE=999999

From 4779f22f1ecdc0eb7c6e4be0829a69e942b898a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz>
Date: Mon, 17 Feb 2020 20:03:22 +0100
Subject: [PATCH 07/45] fix functions

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

diff --git a/functions.sh b/functions.sh
index 518d687..52939f2 100644
--- a/functions.sh
+++ b/functions.sh
@@ -318,6 +318,7 @@ EOF
     fi
 }
 
+
 VIMRC="${MYSHELLCONFIG_BASE}/vimrc"
 
 svi () { 

From ee09b0c3d89dda252ac9cce6888a56cae89c0bbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz>
Date: Mon, 17 Feb 2020 20:16:34 +0100
Subject: [PATCH 08/45] modify HISTIGNORE

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

diff --git a/myshell_load_defaults b/myshell_load_defaults
index dcdfe10..48fe265 100644
--- a/myshell_load_defaults
+++ b/myshell_load_defaults
@@ -127,7 +127,7 @@ fi
 # Source https://www.digitalocean.com/community/tutorials/how-to-use-bash-history-commands-and-expansions-on-a-linux-vps
 stty -ixon
 export HISTCONTROL=erasedups:ignorespace:ignoredups
-export HISTIGNORE="ls:l:cd:exit:pwd:date:"
+export HISTIGNORE="ls:l:cd:exit:pwd:date:mencfs:"
 export HISTTIMEFORMAT='%F %T  '
 export HISTSIZE=999999
 

From 88b271e3ce2f12ad096d5e19ad36445735a94e98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz>
Date: Tue, 18 Feb 2020 14:58:07 +0100
Subject: [PATCH 09/45] remote ssh alias

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

diff --git a/aliases b/aliases
index 2b7c9f5..b70f523 100644
--- a/aliases
+++ b/aliases
@@ -10,7 +10,7 @@ alias vilastcatfile='vim $(history -p \!cat:$:t)'
 alias vio='vim $(history -p \!less:$:t)'
 alias viless='vim $(history -p \!less:$:t)'
 alias cdlastfiledir='cd $(history -p \!\!:$:h)'
-alias ssh='function f() { trap "reset; stty sane; tput rs1; clear; echo -e \"\033c\"" EXIT ; ssh $@; }; f $@'
+#alias ssh='function f() { trap "reset; stty sane; tput rs1; clear; echo -e \"\033c\"" EXIT ; ssh $@; }; f $@'
 
 
 

From f6a5417d7ee29480ef614ff468eea4f882ae8bfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz>
Date: Sun, 23 Feb 2020 11:16:18 +0100
Subject: [PATCH 10/45] add new alias for youtube-dl

---
 aliases | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/aliases b/aliases
index b70f523..1d6f09a 100644
--- a/aliases
+++ b/aliases
@@ -100,7 +100,7 @@ alias u=umount
 alias testmail='echo testemail von ${USER}@${HOSTNAME} am $(date)|mail -s "TESTEMAIL ${USER}@${HOSTNAME} $(date)"'
 
 # logging
-alias tailmail='sudo tail -f /var/log/mail.log /var/log/exim4/mainlog /var/log/exim4/rejectlog /var/log/exim4/paniclog'
+alias tailexim='sudo tail -f /var/log/mail.log /var/log/exim4/mainlog /var/log/exim4/rejectlog /var/log/exim4/paniclog'
 alias tailmail='sudo journalctl -f -u exim4.service -u dovecot.service -u rspamd.service -u getmail*'
 alias taildemsg='sudo watch -n1 "dmesg|tail -n20"'
 alias tailsys='sudo tail -f /var/log/syslog /var/log/dmesg'
@@ -121,6 +121,8 @@ alias unetbootin='export QT_X11_NO_MITSHM=1 unetbootin'
 alias vi='/usr/bin/vim'
 alias vlc='VDPAU_DRIVER=va_gl vlc'
 alias tmux='tmux -f ~/.tmux.conf'
+alias youtube-dl-whole-user="youtube-dl --yes-playlist --write-description --write-info-json --write-annotations --write-all-thumbnails -f 'mp4' -o '%(uploader)s/%(playlist)s/%(playlist_index)s - %(title)s.%(ext)s' -w -c "
+alias youtube-dl-whole-playlist="youtube-dl --yes-playlist --write-description --write-info-json --write-annotations --write-all-thumbnails -f 'mp4' -o '%(playlist)s/%(playlist_index)s - %(title)s.%(ext)s' -w -c "
 
 # rock64
 alias rock64='sudo  minicom -D /dev/ttyUSB0 --color=on'

From 8827e99d53f79d1532384e1a648e1fae3738e2f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz>
Date: Mon, 24 Feb 2020 08:43:28 +0100
Subject: [PATCH 11/45] add script for youtube-dl

to download or update a full user/playlist from youtube, add a file
named "url" in the directory and run youtube-dl-download-or-update.sh.
It picks the file "url" and grabs the whole playlist or even
youtube-user and downloads all playlists in separate directories
---
 bin/youtube-dl-download-or-update.sh | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100755 bin/youtube-dl-download-or-update.sh

diff --git a/bin/youtube-dl-download-or-update.sh b/bin/youtube-dl-download-or-update.sh
new file mode 100755
index 0000000..4401f68
--- /dev/null
+++ b/bin/youtube-dl-download-or-update.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+youtube-dl --write-description --write-info-json --write-annotations --write-all-thumbnails -f 'bestvideo[ext=mp4]+bestaudio[ext=m4a]/best[ext=mp4]/best' -o '%(playlist)s/%(playlist_index)s - %(title)s.%(ext)s' -c -w -a ./url

From 85b6f63cbd4c465bf5aab6f8ce7ffede7d6cd63e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz>
Date: Tue, 25 Feb 2020 12:12:05 +0100
Subject: [PATCH 12/45] add "nosync"

---
 bashrc_add | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/bashrc_add b/bashrc_add
index cffa5aa..a57c54b 100755
--- a/bashrc_add
+++ b/bashrc_add
@@ -38,10 +38,15 @@ EOF
     # define functions
     ckrepo () {
         # check if remote repo is reachable
-        if $( timeout --foreground "${MYSHELLCONFIG_GIT_TIMEOUT}"  $SGIT ls-remote >/dev/null  2>&1) ;then 
+        if $MYSHELLCONFIG_NOSYNC; then
+            echo "no sync allowed from config" >&2
             return 0
-        else 
-            return 1
+        else
+            if $( timeout --foreground "${MYSHELLCONFIG_GIT_TIMEOUT}"  $SGIT ls-remote >/dev/null  2>&1) ;then 
+                return 0
+            else 
+                return 1
+            fi
         fi
 
     }

From 42e20462ca2127309dcdacb7e0058da2db6560bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz>
Date: Tue, 25 Feb 2020 16:15:32 +0100
Subject: [PATCH 13/45] add option for sync or not sync profile

Variable MYSHELLCONFIG_GIT_SYNC in ~/.bashrc
if unset it defaults to true. So profile is synced
If Set to false, do not sync profile
---
 bashrc_add | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/bashrc_add b/bashrc_add
index cffa5aa..fc95be8 100755
--- a/bashrc_add
+++ b/bashrc_add
@@ -27,6 +27,7 @@ if [[ $- = *i* ]] ; then
     [ -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"
+    [ -z "${MYSHELLCONFIG_GIT_SYNC+x}" ] && MYSHELLCONFIG_GIT_SYNC=true
 
     SGIT="git -C ${MYSHELLCONFIG_BASE}" 
     export MYSHELLCONFIG_BASE MYSHELLCONFIG_LOGDIR MYSHELLCONFIG_LOGFILE SGIT MYSHELLCONFIG_VIM_PLUGINS
@@ -47,22 +48,26 @@ EOF
     }
 
     sync_config () {
-        local nok=""
-        local gco=""
-        if which git >/dev/null; then
-            echo -n "Sync config with ${MYSHELLCONFIG_GIT_SERVER}: " 1>&2
-            # MYSHELLCONFIG_GITCHECKOUTSCRIPT_OPTIONS are options for bin/git-myshellconfig-checkout
-            if [ -z ${MYSHELLCONFIG_GIT_CHECKOUTSCRIPT_OPTIONS+x} ]; then
-                gco="-h"
-            else
-                gco="$MYSHELLCONFIG_GIT_CHECKOUTSCRIPT_OPTIONS"
-            fi
-            ${MYSHELLCONFIG_BASE}/bin/git-myshellconfig-checkout ${gco}|| nok="not " 1>>"${MYSHELLCONFIG_LOGFILE}" 2>&1 
-            printf '%s\n' "${nok}synced" 1>&2
-            [ -z "$nok"  ] && mkdir -pv "${MYSHELLCONFIG_LOGDIR}"
+        if $MYSHELLCONFIG_GIT_SYNC; then
+            local nok=""
+            local gco=""
+            if which git >/dev/null; then
+                echo -n "Sync config with ${MYSHELLCONFIG_GIT_SERVER}: " 1>&2
+                # MYSHELLCONFIG_GITCHECKOUTSCRIPT_OPTIONS are options for bin/git-myshellconfig-checkout
+                if [ -z ${MYSHELLCONFIG_GIT_CHECKOUTSCRIPT_OPTIONS+x} ]; then
+                    gco="-h"
+                else
+                    gco="$MYSHELLCONFIG_GIT_CHECKOUTSCRIPT_OPTIONS"
+                fi
+                ${MYSHELLCONFIG_BASE}/bin/git-myshellconfig-checkout ${gco}|| nok="not " 1>>"${MYSHELLCONFIG_LOGFILE}" 2>&1 
+                printf '%s\n' "${nok}synced" 1>&2
+                [ -z "$nok"  ] && mkdir -pv "${MYSHELLCONFIG_LOGDIR}"
 
+            else
+                echo "git not installed, no configuration possible, please install git" >&2
+            fi
         else
-            echo "git not installed, no configuration possible, please install git" >&2
+            echo "Not syncing profile in case of configuration"
         fi
     }
 

From c74f20e0f1d1f54ca8ff7065e725c4df40656f75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz>
Date: Wed, 26 Feb 2020 18:24:46 +0100
Subject: [PATCH 14/45] change nosync

---
 myshell_git_sync | 1 -
 1 file changed, 1 deletion(-)

diff --git a/myshell_git_sync b/myshell_git_sync
index d6ff3a5..d1933fb 100644
--- a/myshell_git_sync
+++ b/myshell_git_sync
@@ -131,7 +131,6 @@ if ! $SSHS; then
                 vim -c "PluginInstall" -c ":qa!"
             fi
             [ -z ${MYSHELLCONFIG_GIT_REMOTE_PUSH+x} ] || $SGIT remote set-url --push ${MYSHELLCONFIG_GIT_REMOTE_NAME} "${MYSHELLCONFIG_GIT_REMOTE_PUSH}" 
-    #            cd ${HOME}
             ;;
         *screen*)
             echo "I'm in sceen/tmux now" >&2

From 572f73fd2e4071b22e839e4996110ccf41ea21c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <schuer4>
Date: Thu, 27 Feb 2020 09:08:43 +0100
Subject: [PATCH 15/45] fix ssh-completion error

---
 bash_completion.d/sshmyshellconfig |  2 +-
 bash_completion.d/sshs             |  2 +-
 bash_completion.d/sshserverconfig  |  2 +-
 bashrc_add                         | 15 +++++++++++++++
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/bash_completion.d/sshmyshellconfig b/bash_completion.d/sshmyshellconfig
index 58af84e..01c2cff 100644
--- a/bash_completion.d/sshmyshellconfig
+++ b/bash_completion.d/sshmyshellconfig
@@ -1,2 +1,2 @@
-. /usr/share/bash-completion/completions/ssh
+#. /usr/share/bash-completion/completions/ssh
 shopt -u hostcomplete && complete -F _ssh sshmyshellconfig
diff --git a/bash_completion.d/sshs b/bash_completion.d/sshs
index 025afeb..1b8e5fb 100644
--- a/bash_completion.d/sshs
+++ b/bash_completion.d/sshs
@@ -1,2 +1,2 @@
-. /usr/share/bash-completion/completions/ssh
+#. /usr/share/bash-completion/completions/ssh
 shopt -u hostcomplete && complete -F _ssh sshs
diff --git a/bash_completion.d/sshserverconfig b/bash_completion.d/sshserverconfig
index 12800fe..d5d5284 100644
--- a/bash_completion.d/sshserverconfig
+++ b/bash_completion.d/sshserverconfig
@@ -1,2 +1,2 @@
-. /usr/share/bash-completion/completions/ssh
+#. /usr/share/bash-completion/completions/ssh
 shopt -u hostcomplete && complete -F _ssh sshserverconfig
diff --git a/bashrc_add b/bashrc_add
index c04c7f3..694b7ac 100755
--- a/bashrc_add
+++ b/bashrc_add
@@ -76,6 +76,21 @@ EOF
         fi
     }
 
+    # Check for interactive bash and that we haven't already been sourced.
+    if [ -n "${BASH_VERSION-}" -a -n "${PS1-}" -a -z "${BASH_COMPLETION_VERSINFO-}" ]; then
+
+        # Check for recent enough version of bash.
+        if [ ${BASH_VERSINFO[0]} -gt 4 ] || \
+           [ ${BASH_VERSINFO[0]} -eq 4 -a ${BASH_VERSINFO[1]} -ge 1 ]; then
+            [ -r "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion" ] && \
+                . "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion"
+            if shopt -q progcomp && [ -r /usr/share/bash-completion/bash_completion ]; then
+                # Source completion code.
+                . /usr/share/bash-completion/bash_completion
+            fi
+        fi
+
+    fi
 
 
     # source git-sync part of myshellconfig

From 1ec4e954c6d0e3903a725f3bff91200ce7ec0ea4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <schuer4>
Date: Thu, 27 Feb 2020 09:10:54 +0100
Subject: [PATCH 16/45] add debug

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

diff --git a/bashrc_add b/bashrc_add
index 694b7ac..ac9505d 100755
--- a/bashrc_add
+++ b/bashrc_add
@@ -86,6 +86,7 @@ EOF
                 . "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion"
             if shopt -q progcomp && [ -r /usr/share/bash-completion/bash_completion ]; then
                 # Source completion code.
+                echo "Source bash-completion"
                 . /usr/share/bash-completion/bash_completion
             fi
         fi

From afeb5087240f53bfb1cda6b6d542a601fba1a1ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <schuer4>
Date: Thu, 27 Feb 2020 09:12:37 +0100
Subject: [PATCH 17/45] uncomment sourcing of ssh-completion

---
 bash_completion.d/sshmyshellconfig | 2 +-
 bash_completion.d/sshs             | 2 +-
 bash_completion.d/sshserverconfig  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bash_completion.d/sshmyshellconfig b/bash_completion.d/sshmyshellconfig
index 01c2cff..58af84e 100644
--- a/bash_completion.d/sshmyshellconfig
+++ b/bash_completion.d/sshmyshellconfig
@@ -1,2 +1,2 @@
-#. /usr/share/bash-completion/completions/ssh
+. /usr/share/bash-completion/completions/ssh
 shopt -u hostcomplete && complete -F _ssh sshmyshellconfig
diff --git a/bash_completion.d/sshs b/bash_completion.d/sshs
index 1b8e5fb..025afeb 100644
--- a/bash_completion.d/sshs
+++ b/bash_completion.d/sshs
@@ -1,2 +1,2 @@
-#. /usr/share/bash-completion/completions/ssh
+. /usr/share/bash-completion/completions/ssh
 shopt -u hostcomplete && complete -F _ssh sshs
diff --git a/bash_completion.d/sshserverconfig b/bash_completion.d/sshserverconfig
index d5d5284..12800fe 100644
--- a/bash_completion.d/sshserverconfig
+++ b/bash_completion.d/sshserverconfig
@@ -1,2 +1,2 @@
-#. /usr/share/bash-completion/completions/ssh
+. /usr/share/bash-completion/completions/ssh
 shopt -u hostcomplete && complete -F _ssh sshserverconfig

From 51d751a8b044e7d6e9e31a42a9465cd419e923b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <schuer4>
Date: Thu, 27 Feb 2020 15:34:47 +0100
Subject: [PATCH 18/45] rework unsetproxy

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

diff --git a/functions.sh b/functions.sh
index 52939f2..5c36381 100644
--- a/functions.sh
+++ b/functions.sh
@@ -72,6 +72,8 @@ setproxy () {
         source "${CONFIG}"
         echo "sourced"
         export PROXY_CREDS="${PROXY_USER}:${PROXY_PASS}@"
+        export proxy_user=$PROXY_USER
+        export proxy_pass=$PROXY_PASS
     else
         echo "${CONFIG} not existing"
         export PROXY_CREDS=""
@@ -195,8 +197,10 @@ ${KERBEROS_PASSWORD}
 }
 
 unsetproxy () {
-    unset {http,https,fpt}_proxy
+    unset {HTTP,HTTPS,FPT}_PROXY
     unset PROXY_{CREDS,USER,PASS,SERVER,PORT}
+    unset {http,https,fpt}_proxy
+    unset proxy_{creds,user,pass,server,port}
 }
 
 git-mergedetachedheadtomaster () {

From aece5cbbf170fc459cbec94aec9a377f1eab2f35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <schuer4>
Date: Thu, 27 Feb 2020 15:39:48 +0100
Subject: [PATCH 19/45] set and unset proxy upper and lower case

---
 functions.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/functions.sh b/functions.sh
index 5c36381..feed7e8 100644
--- a/functions.sh
+++ b/functions.sh
@@ -72,13 +72,12 @@ setproxy () {
         source "${CONFIG}"
         echo "sourced"
         export PROXY_CREDS="${PROXY_USER}:${PROXY_PASS}@"
-        export proxy_user=$PROXY_USER
-        export proxy_pass=$PROXY_PASS
     else
         echo "${CONFIG} not existing"
         export PROXY_CREDS=""
     fi
     export {http,https,ftp}_proxy="http://${PROXY_CREDS}${PROXY_SERVER}:${PROXY_PORT}"
+    export {HTTP,HTTPS,FTP}_PROXY="http://${PROXY_CREDS}${PROXY_SERVER}:${PROXY_PORT}"
 }
 
 mencfs () {
@@ -197,9 +196,9 @@ ${KERBEROS_PASSWORD}
 }
 
 unsetproxy () {
-    unset {HTTP,HTTPS,FPT}_PROXY
+    unset {HTTP,HTTPS,FTP}_PROXY
     unset PROXY_{CREDS,USER,PASS,SERVER,PORT}
-    unset {http,https,fpt}_proxy
+    unset {http,https,ftp}_proxy
     unset proxy_{creds,user,pass,server,port}
 }
 

From 55763cb582c5e780655c2eaeb085af36dbf1b466 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz>
Date: Sun, 1 Mar 2020 23:56:38 +0100
Subject: [PATCH 20/45] add alias for all videoinformations

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

diff --git a/aliases b/aliases
index 1d6f09a..f838fcc 100644
--- a/aliases
+++ b/aliases
@@ -121,6 +121,7 @@ alias unetbootin='export QT_X11_NO_MITSHM=1 unetbootin'
 alias vi='/usr/bin/vim'
 alias vlc='VDPAU_DRIVER=va_gl vlc'
 alias tmux='tmux -f ~/.tmux.conf'
+alias youtube-dl-whole-video="youtube-dl --write-description --write-info-json --write-annotations --write-all-thumbnails -f 'mp4' -o '%(uploader)s/%(playlist)s/%(playlist_index)s - %(title)s.%(ext)s' -w -c "
 alias youtube-dl-whole-user="youtube-dl --yes-playlist --write-description --write-info-json --write-annotations --write-all-thumbnails -f 'mp4' -o '%(uploader)s/%(playlist)s/%(playlist_index)s - %(title)s.%(ext)s' -w -c "
 alias youtube-dl-whole-playlist="youtube-dl --yes-playlist --write-description --write-info-json --write-annotations --write-all-thumbnails -f 'mp4' -o '%(playlist)s/%(playlist_index)s - %(title)s.%(ext)s' -w -c "
 

From aa32c9ff32f3a1a2ee47b955adea21a8c1eb2117 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz>
Date: Wed, 4 Mar 2020 01:13:02 +0100
Subject: [PATCH 21/45] add alias for youtube-dl

---
 aliases | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/aliases b/aliases
index f838fcc..80392fa 100644
--- a/aliases
+++ b/aliases
@@ -121,7 +121,8 @@ alias unetbootin='export QT_X11_NO_MITSHM=1 unetbootin'
 alias vi='/usr/bin/vim'
 alias vlc='VDPAU_DRIVER=va_gl vlc'
 alias tmux='tmux -f ~/.tmux.conf'
-alias youtube-dl-whole-video="youtube-dl --write-description --write-info-json --write-annotations --write-all-thumbnails -f 'mp4' -o '%(uploader)s/%(playlist)s/%(playlist_index)s - %(title)s.%(ext)s' -w -c "
+alias youtube-dl-whole-video="youtube-dl --write-description --write-info-json --write-annotations --write-all-thumbnails -f 'mp4' -o '%(title)s.%(ext)s' -w -c "
+alias youtube-dl-whole-video-to-playlistdir="youtube-dl --write-description --write-info-json --write-annotations --write-all-thumbnails -f 'mp4' -o '%(uploader)s/%(playlist)s/%(playlist_index)s - %(title)s.%(ext)s' -w -c "
 alias youtube-dl-whole-user="youtube-dl --yes-playlist --write-description --write-info-json --write-annotations --write-all-thumbnails -f 'mp4' -o '%(uploader)s/%(playlist)s/%(playlist_index)s - %(title)s.%(ext)s' -w -c "
 alias youtube-dl-whole-playlist="youtube-dl --yes-playlist --write-description --write-info-json --write-annotations --write-all-thumbnails -f 'mp4' -o '%(playlist)s/%(playlist_index)s - %(title)s.%(ext)s' -w -c "
 

From 5f17e520768961989852b410ad65396efc9e1499 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <schuer4>
Date: Wed, 4 Mar 2020 10:09:59 +0100
Subject: [PATCH 22/45] add alias s for reuser ssh host with sshs host

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

diff --git a/aliases b/aliases
index 1d6f09a..1ba0e26 100644
--- a/aliases
+++ b/aliases
@@ -11,6 +11,7 @@ alias vio='vim $(history -p \!less:$:t)'
 alias viless='vim $(history -p \!less:$:t)'
 alias cdlastfiledir='cd $(history -p \!\!:$:h)'
 #alias ssh='function f() { trap "reset; stty sane; tput rs1; clear; echo -e \"\033c\"" EXIT ; ssh $@; }; f $@'
+alias s='sshs $(history -p \!ssh:$:t)'
 
 
 

From a6227d20257b3ad8518e99555b9d284216faae30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <schuer4>
Date: Wed, 4 Mar 2020 10:27:13 +0100
Subject: [PATCH 23/45] add function to turnoff shell beep

---
 functions.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/functions.sh b/functions.sh
index feed7e8..4d3fde7 100644
--- a/functions.sh
+++ b/functions.sh
@@ -488,3 +488,10 @@ EOF
         
     fi
 }
+
+turnoffbeep() {
+    line='set bell-style none'
+    file=~/.inputrc
+    grep -qxF "$line" "$file" || echo "$line" >> "$file"
+}
+#EOF

From d6493640bdd480a005d14ebb6b9f6aca506296e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <schuer4>
Date: Wed, 4 Mar 2020 10:46:48 +0100
Subject: [PATCH 24/45] fix turnoffbeep when file does not exist

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

diff --git a/functions.sh b/functions.sh
index 4d3fde7..ac23b6f 100644
--- a/functions.sh
+++ b/functions.sh
@@ -492,6 +492,6 @@ EOF
 turnoffbeep() {
     line='set bell-style none'
     file=~/.inputrc
-    grep -qxF "$line" "$file" || echo "$line" >> "$file"
+    [ -e "$file" ] && grep -qxF "$line" "$file" || echo "$line" >> "$file"
 }
 #EOF

From cdfca9ee991150dc2361509f8d49fcda492ad4fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <schuer4>
Date: Wed, 4 Mar 2020 10:47:05 +0100
Subject: [PATCH 25/45] turnoffbeep if not

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

diff --git a/myshell_load_fortmpconfig b/myshell_load_fortmpconfig
index 3eb26c0..2168a47 100644
--- a/myshell_load_fortmpconfig
+++ b/myshell_load_fortmpconfig
@@ -11,3 +11,5 @@ if [ -f ~/.aliases ]; then
 fi
 
 export WORK=~/Work
+
+turnoffbeep

From 1ddc07b4eaef9d1022ac873dfba5795fabd9c021 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <schuer4>
Date: Wed, 4 Mar 2020 10:56:48 +0100
Subject: [PATCH 26/45] add file /media/$USER/gitstick/

---
 myshell_git_sync | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/myshell_git_sync b/myshell_git_sync
index d1933fb..dca8503 100644
--- a/myshell_git_sync
+++ b/myshell_git_sync
@@ -11,15 +11,18 @@ if ! $SSHS; then
     MYSHELLCONFIG_GIT_PROTOCOL_GIT="git://"
     MYSHELLCONFIG_GIT_PROTOCOL_HTTP="http://"
     MYSHELLCONFIG_GIT_PROTOCOL_SSH="git@"
+    MYSHELLCONFIG_GIT_PROTOCOL_FILE=""
     [ -z "${MYSHELLCONFIG_GIT_SERVER+x}" ] && MYSHELLCONFIG_GIT_SERVER="git.schuerz.at"
     [ -z "${MYSHELLCONFIG_GIT_REPO_NAME+x}" ] && MYSHELLCONFIG_GIT_REPO_NAME="$(basename $MYSHELLCONFIG_BASE).git"
     [ -z "${MYSHELLCONFIG_GIT_REPO_PATH_HTTP+x}" ] && MYSHELLCONFIG_GIT_REPO_PATH_HTTP="/public/"
     [ -z "${MYSHELLCONFIG_GIT_REPO_PATH_SSH+x}" ] && MYSHELLCONFIG_GIT_REPO_PATH_SSH=":public/"
     [ -z "${MYSHELLCONFIG_GIT_REPO_PATH_GIT+x}" ] && MYSHELLCONFIG_GIT_REPO_PATH_GIT="/public/"
+    [ -z "${MYSHELLCONFIG_GIT_REPO_PATH_FILE+x}" ] && MYSHELLCONFIG_GIT_REPO_PATH_FILE="/media/$USER/gitstick/"
 
     MYSHELLCONFIG_GIT_REMOTE_PUBLIC_GIT="${MYSHELLCONFIG_GIT_PROTOCOL_GIT}${MYSHELLCONFIG_GIT_SERVER}${MYSHELLCONFIG_GIT_REPO_PATH_GIT}"
     MYSHELLCONFIG_GIT_REMOTE_PUBLIC_SSH="${MYSHELLCONFIG_GIT_PROTOCOL_SSH}${MYSHELLCONFIG_GIT_SERVER}${MYSHELLCONFIG_GIT_REPO_PATH_SSH}"
     MYSHELLCONFIG_GIT_REMOTE_PUBLIC_HTTP="${MYSHELLCONFIG_GIT_PROTOCOL_HTTP}${MYSHELLCONFIG_GIT_SERVER}${MYSHELLCONFIG_GIT_REPO_PATH_HTTP}"
+    MYSHELLCONFIG_GIT_REMOTE_PUBLIC_FILE="${MYSHELLCONFIG_GIT_PROTOCOL_FILE}${MYSHELLCONFIG_GIT_REPO_PATH_FILE}"
     MYSHELLCONFIG_GIT_REMOTE_PUBLIC_DEFAULT="${MYSHELLCONFIG_GIT_REMOTE_PUBLIC_GIT}"
 
     MYSHELLCONFIG_GIT_REMOTE_DEFAULT="${MYSHELLCONFIG_GIT_PROTOCOL_GIT}${MYSHELLCONFIG_GIT_SERVER}${MYSHELLCONFIG_GIT_REPO_PATH_GIT}"
@@ -39,6 +42,9 @@ if ! $SSHS; then
             http)
                 MYSHELLCONFIG_GIT_REMOTE_PUBLIC="${MYSHELLCONFIG_GIT_REMOTE_PUBLIC_HTTP}"
                 ;;
+            file)
+                MYSHELLCONFIG_GIT_REMOTE_PUBLIC="${MYSHELLCONFIG_GIT_REMOTE_PUBLIC_FILE}"
+                ;;
             *)
                 MYSHELLCONFIG_GIT_REMOTE_PUBLIC="${MYSHELLCONFIG_GIT_REMOTE_DEFAULT}"
                 ;;
@@ -57,6 +63,9 @@ if ! $SSHS; then
             http)
                 MYSHELLCONFIG_GIT_REMOTE_PUSH_PUBLIC="${MYSHELLCONFIG_GIT_REMOTE_PUBLIC_HTTP}"
                 ;;
+            file)
+                MYSHELLCONFIG_GIT_REMOTE_PUSH_PUBLIC="${MYSHELLCONFIG_GIT_REMOTE_PUBLIC_FILE}"
+                ;;
             *)
                 MYSHELLCONFIG_GIT_REMOTE_PUSH_PUBLIC="${MYSHELLCONFIG_GIT_REMOTE_PUBLIC_DEFAULT}"
                 ;;

From 7eedb510e08f6719d042b96f4a7320b528a72900 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <schuer4>
Date: Wed, 4 Mar 2020 11:04:15 +0100
Subject: [PATCH 27/45] update README

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index ffe4bdd..0647ec9 100644
--- a/README.md
+++ b/README.md
@@ -70,6 +70,7 @@ Mögliche Optionen:
     * git - (default) Gitprotokoll ist git (Auf manchen Umgebungen kann der dazu notwenidge Port gesperrt sein)
     * http - wenn git nicht möglich ist, kann das http/https Protokoll verwendet werden. (ist langsamer als git, jedoch ist fast überall Port 80 oder 440 freigeschaltet)
     * ssh - Wenn auch schreibend auf das Repo zugegriffen werden soll, so muss Privatekey, Pubkey (und wenn konfiguriert Certifikate mit den notwendigen Principals) vorhanden sein, dann kann das ssh-Prodokoll verwendet werden.
+    * file - Das entfernte Repository ist auf einem USB-Stick, welcher unter /media/$USER/gitstick beim Einstecken gemountet wird. Der Pfad ist anpassbar (siehe MYSHELLCONFIG_GIT_REPO_PATH)
 
 Vim Plugins werden prinzipiell von github.com bezogen. Für spezielle Anwendungsfälle (github.com ist per firewall gesperrt), kann man diese auch in eigenen Repos hosten. Um diese eigenen Repos zu verwenden, muss in ~/.bashrc die Variable entsprechend gesetzt werden. Es ist ein Verzeichnis anzugeben, unter dem alle Pluginrepos als bare-Repos gecloned werden. Wichtig ist, dass die Usernamenverzeichnisse von github.com hier auch vorhanden sind, damit ohne dieser gesetzten Variable die Plugins direkt von github.com geladen werden können.
 
@@ -96,6 +97,7 @@ MYSHELLCONFIG\_GIT\_REPO\_NAME="server-config.git"
 MYSHELLCONFIG\_GIT\_REPO\_PATH\_HTTP="/public/"
 MYSHELLCONFIG\_GIT\_REPO\_PATH\_SSH=":public/"
 MYSHELLCONFIG\_GIT\_REPO\_PATH\_GIT="/public/"
+MYSHELLCONFIG\_GIT\_REPO\_PATH\_FILE="/media/$USER/gitstick"
 
 
 # Verteilen auf neuen Host/User

From 185a06d5dc20ba210eb97373ec2eb1ef426b4966 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <schuer4>
Date: Wed, 4 Mar 2020 11:10:18 +0100
Subject: [PATCH 28/45] do nosync

---
 bashrc_add | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bashrc_add b/bashrc_add
index ac9505d..4c91422 100755
--- a/bashrc_add
+++ b/bashrc_add
@@ -39,15 +39,15 @@ EOF
     # define functions
     ckrepo () {
         # check if remote repo is reachable
-        if $MYSHELLCONFIG_NOSYNC; then
-            echo "no sync allowed from config" >&2
-            return 0
-        else
+        if $MYSHELLCONFIG_GIT_SYNC; then
             if $( timeout --foreground "${MYSHELLCONFIG_GIT_TIMEOUT}"  $SGIT ls-remote >/dev/null  2>&1) ;then 
                 return 0
             else 
                 return 1
             fi
+        else
+            echo "no sync allowed from config" >&2
+            return 0
         fi
 
     }

From c4f40141577cbd1e988c2368d662d4bdc07d0d39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <schuer4>
Date: Wed, 4 Mar 2020 11:23:44 +0100
Subject: [PATCH 29/45] add git-sync config variable to .bashrc

---
 functions.sh | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/functions.sh b/functions.sh
index ac23b6f..cc0e905 100644
--- a/functions.sh
+++ b/functions.sh
@@ -494,4 +494,23 @@ turnoffbeep() {
     file=~/.inputrc
     [ -e "$file" ] && grep -qxF "$line" "$file" || echo "$line" >> "$file"
 }
+
+turnoffconfigsync() {
+    line='MYSHELLCONFIG_GIT_SYNC='
+    file=~/.bashrc
+    if [ -e "$file" ] ; then
+        sed -i -e "/$line/d" "${file}"
+    fi
+    sed -i -e "/#MYSHELLCONFIG-start/i${line}false" "$file"
+}
+
+turnonconfigsync() {
+    line='MYSHELLCONFIG_GIT_SYNC='
+    file=~/.bashrc
+    if [ -e "$file" ] ; then
+        sed -i -e "/$line/d" "${file}"
+    fi
+    sed -i "/#MYSHELLCONFIG-start/i${line}true" "$file"
+}
+
 #EOF

From 84c53e7fdd3bcb0d2532fc0e8c7f1995a894b949 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <schuer4>
Date: Wed, 4 Mar 2020 11:26:51 +0100
Subject: [PATCH 30/45] fit dump server

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

diff --git a/myshell_git_sync b/myshell_git_sync
index dca8503..ba9fd49 100644
--- a/myshell_git_sync
+++ b/myshell_git_sync
@@ -44,6 +44,7 @@ if ! $SSHS; then
                 ;;
             file)
                 MYSHELLCONFIG_GIT_REMOTE_PUBLIC="${MYSHELLCONFIG_GIT_REMOTE_PUBLIC_FILE}"
+                MYSHELLCONFIG_GIT_SERVER="${MYSHELLCONFIG_GIT_REPO_PATH_FILE}"
                 ;;
             *)
                 MYSHELLCONFIG_GIT_REMOTE_PUBLIC="${MYSHELLCONFIG_GIT_REMOTE_DEFAULT}"

From 2c3be9f7ce18e00622b9bf3283b89c33a90f6950 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz>
Date: Wed, 4 Mar 2020 11:45:14 +0100
Subject: [PATCH 31/45] change beep

---
 functions.sh | 39 +++++++++++++++++++++++++++++++--------
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/functions.sh b/functions.sh
index cc0e905..bf7996c 100644
--- a/functions.sh
+++ b/functions.sh
@@ -490,27 +490,50 @@ EOF
 }
 
 turnoffbeep() {
-    line='set bell-style none'
+    changebeep none
+}
+
+changebeep() {
+    case $1 in
+        none)
+            style=visible
+            ;;
+        visible)
+            style=visible
+            ;;
+        audible)
+            style=audible
+            ;;
+        *)
+            echo "usage: changebeep [none|visible|audible]"
+            return 1
+            ;;
+    esac
+    line='set bell-style'
     file=~/.inputrc
-    [ -e "$file" ] && grep -qxF "$line" "$file" || echo "$line" >> "$file"
+    if [ -e "${file}" ] ; then
+        sed -i -e "/$line/d" "${file}"
+    fi
+    echo "${line} ${style}" >> "${file}"
+    return 0
 }
 
 turnoffconfigsync() {
     line='MYSHELLCONFIG_GIT_SYNC='
     file=~/.bashrc
-    if [ -e "$file" ] ; then
-        sed -i -e "/$line/d" "${file}"
+    if [ -e "${file}" ] ; then
+        sed -i -e "/${line}/d" "${file}"
     fi
-    sed -i -e "/#MYSHELLCONFIG-start/i${line}false" "$file"
+    sed -i -e "/#MYSHELLCONFIG-start/i${line}false" "${file}"
 }
 
 turnonconfigsync() {
     line='MYSHELLCONFIG_GIT_SYNC='
     file=~/.bashrc
-    if [ -e "$file" ] ; then
-        sed -i -e "/$line/d" "${file}"
+    if [ -e "${file}" ] ; then
+        sed -i -e "/${line}/d" "${file}"
     fi
-    sed -i "/#MYSHELLCONFIG-start/i${line}true" "$file"
+    sed -i "/#MYSHELLCONFIG-start/i${line}true" "${file}"
 }
 
 #EOF

From fab46e19b8f06d4d3cbe9cc5a0f4d53d0f75b3be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz>
Date: Wed, 4 Mar 2020 11:47:11 +0100
Subject: [PATCH 32/45] fix changebeep none

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

diff --git a/functions.sh b/functions.sh
index bf7996c..f018bd5 100644
--- a/functions.sh
+++ b/functions.sh
@@ -496,7 +496,7 @@ turnoffbeep() {
 changebeep() {
     case $1 in
         none)
-            style=visible
+            style=none
             ;;
         visible)
             style=visible

From f736d91faa2632b23a9de1892d0faf6456e77f80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz>
Date: Wed, 4 Mar 2020 21:01:46 +0100
Subject: [PATCH 33/45] fix sourcing-error bash-completion ssh

---
 bash_completion.d/sshmyshellconfig | 2 +-
 bash_completion.d/sshs             | 2 +-
 bash_completion.d/sshserverconfig  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bash_completion.d/sshmyshellconfig b/bash_completion.d/sshmyshellconfig
index 58af84e..79c32ae 100644
--- a/bash_completion.d/sshmyshellconfig
+++ b/bash_completion.d/sshmyshellconfig
@@ -1,2 +1,2 @@
-. /usr/share/bash-completion/completions/ssh
+[ -e . /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion
 shopt -u hostcomplete && complete -F _ssh sshmyshellconfig
diff --git a/bash_completion.d/sshs b/bash_completion.d/sshs
index 025afeb..1e733ec 100644
--- a/bash_completion.d/sshs
+++ b/bash_completion.d/sshs
@@ -1,2 +1,2 @@
-. /usr/share/bash-completion/completions/ssh
+[ -e . /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion
 shopt -u hostcomplete && complete -F _ssh sshs
diff --git a/bash_completion.d/sshserverconfig b/bash_completion.d/sshserverconfig
index 12800fe..8a09edb 100644
--- a/bash_completion.d/sshserverconfig
+++ b/bash_completion.d/sshserverconfig
@@ -1,2 +1,2 @@
-. /usr/share/bash-completion/completions/ssh
+[ -e . /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion
 shopt -u hostcomplete && complete -F _ssh sshserverconfig

From 928ccc66137bc124bd51c0c01da0a9ca3a550bcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz>
Date: Wed, 4 Mar 2020 21:04:26 +0100
Subject: [PATCH 34/45] fix if

---
 bash_completion.d/sshmyshellconfig | 2 +-
 bash_completion.d/sshs             | 2 +-
 bash_completion.d/sshserverconfig  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bash_completion.d/sshmyshellconfig b/bash_completion.d/sshmyshellconfig
index 79c32ae..a500099 100644
--- a/bash_completion.d/sshmyshellconfig
+++ b/bash_completion.d/sshmyshellconfig
@@ -1,2 +1,2 @@
-[ -e . /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion
+[ -e /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion
 shopt -u hostcomplete && complete -F _ssh sshmyshellconfig
diff --git a/bash_completion.d/sshs b/bash_completion.d/sshs
index 1e733ec..31c4bdb 100644
--- a/bash_completion.d/sshs
+++ b/bash_completion.d/sshs
@@ -1,2 +1,2 @@
-[ -e . /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion
+[ -e /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion
 shopt -u hostcomplete && complete -F _ssh sshs
diff --git a/bash_completion.d/sshserverconfig b/bash_completion.d/sshserverconfig
index 8a09edb..c865280 100644
--- a/bash_completion.d/sshserverconfig
+++ b/bash_completion.d/sshserverconfig
@@ -1,2 +1,2 @@
-[ -e . /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion
+[ -e /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion
 shopt -u hostcomplete && complete -F _ssh sshserverconfig

From 0e9651626e33c5068d0a952522220ef270f3f238 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz>
Date: Thu, 5 Mar 2020 11:48:00 +0100
Subject: [PATCH 35/45] change enable systemwide gnome-shell-extensions

---
 functions.sh | 37 +++++++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/functions.sh b/functions.sh
index f018bd5..05546c6 100644
--- a/functions.sh
+++ b/functions.sh
@@ -494,6 +494,7 @@ turnoffbeep() {
 }
 
 changebeep() {
+    local style
     case $1 in
         none)
             style=none
@@ -509,8 +510,8 @@ changebeep() {
             return 1
             ;;
     esac
-    line='set bell-style'
-    file=~/.inputrc
+    local line='set bell-style'
+    local file=~/.inputrc
     if [ -e "${file}" ] ; then
         sed -i -e "/$line/d" "${file}"
     fi
@@ -519,8 +520,8 @@ changebeep() {
 }
 
 turnoffconfigsync() {
-    line='MYSHELLCONFIG_GIT_SYNC='
-    file=~/.bashrc
+    local line='MYSHELLCONFIG_GIT_SYNC='
+    local file=~/.bashrc
     if [ -e "${file}" ] ; then
         sed -i -e "/${line}/d" "${file}"
     fi
@@ -528,12 +529,36 @@ turnoffconfigsync() {
 }
 
 turnonconfigsync() {
-    line='MYSHELLCONFIG_GIT_SYNC='
-    file=~/.bashrc
+    local line='MYSHELLCONFIG_GIT_SYNC='
+    local file=~/.bashrc
     if [ -e "${file}" ] ; then
         sed -i -e "/${line}/d" "${file}"
     fi
     sed -i "/#MYSHELLCONFIG-start/i${line}true" "${file}"
 }
 
+gnome-shell-extensions-make-actual-permanent-systemwide() {
+    # https://people.gnome.org/~pmkovar/system-admin-guide/extensions-enable.html
+    # https://askubuntu.com/questions/359958/extensions-are-turned-off-after-reboot
+    local file="/etc/dconf/profile/user"
+    local line='user-db:user'
+    if [ -e "${file}" ] ; then
+        echo "$command"
+        sudo sh -c "$command"
+    fi
+    local line='system-db:local'
+    if [ -e "${file}" ] ; then
+        command="grep -xqF -- ${line} ${file} || echo $line >> $file"
+        sudo sh -c "$command"
+    fi
+    local line='enabled-extensions='
+    local file='/etc/dconf/db/local.d/00-extensions'
+    if [ -e "${file}" ] ; then
+        sudo sed -i -e "/${line}/d" "${file}"
+        sudo sed -i -e "/\[org\/gnome\/shell\]/d" "${file}"
+    fi
+    local EXTENSIONS=$(gsettings get org.gnome.shell enabled-extensions)
+    echo "[org/gnome/shell]" | sudo tee -a "${file}"
+    echo "${EXTENSIONS}" | sudo tee -a "${file}"
+}
 #EOF

From b0b180f05665c18b5e980089bdc54ebb8bab92d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <schuer4>
Date: Thu, 5 Mar 2020 11:52:01 +0100
Subject: [PATCH 36/45] create dir if not existing

---
 functions.sh | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/functions.sh b/functions.sh
index 05546c6..bf521f9 100644
--- a/functions.sh
+++ b/functions.sh
@@ -450,15 +450,6 @@ function tmuxx() {
 }
 
 
-function gnome-shell-extensions-enable-defaults() { 
-    if [ -f ~/.config/gnome-shell-extensions-default.list ]; then
-        for i in $(cat ~/.config/gnome-shell-extensions-default.list); do 
-            #gnome-shell-extension-tool -e $i;
-            gnome-extensions enable $i;
-        done; 
-    fi
-}
-
 function checkbkp() {
     if ping -c 3 backup.vpn >/dev/null 2>&1 ; then
         local SSH="/usr/bin/ssh"
@@ -537,10 +528,20 @@ turnonconfigsync() {
     sed -i "/#MYSHELLCONFIG-start/i${line}true" "${file}"
 }
 
+function gnome-shell-extensions-enable-defaults() { 
+    if [ -f ~/.config/gnome-shell-extensions-default.list ]; then
+        for i in $(cat ~/.config/gnome-shell-extensions-default.list); do 
+            #gnome-shell-extension-tool -e $i;
+            gnome-extensions enable $i;
+        done; 
+    fi
+}
+
 gnome-shell-extensions-make-actual-permanent-systemwide() {
     # https://people.gnome.org/~pmkovar/system-admin-guide/extensions-enable.html
     # https://askubuntu.com/questions/359958/extensions-are-turned-off-after-reboot
     local file="/etc/dconf/profile/user"
+    sudo mkdir -p "/etc/dconf/profile/"
     local line='user-db:user'
     if [ -e "${file}" ] ; then
         echo "$command"
@@ -553,6 +554,7 @@ gnome-shell-extensions-make-actual-permanent-systemwide() {
     fi
     local line='enabled-extensions='
     local file='/etc/dconf/db/local.d/00-extensions'
+    sudo mkdir -p '/etc/dconf/db/local.d'
     if [ -e "${file}" ] ; then
         sudo sed -i -e "/${line}/d" "${file}"
         sudo sed -i -e "/\[org\/gnome\/shell\]/d" "${file}"

From 467aa2e5349e0a23159c2b9d189c635be5eb493b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <schuer4>
Date: Thu, 5 Mar 2020 12:53:58 +0100
Subject: [PATCH 37/45] fix enable gnome-shell-extensions

---
 functions.sh | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/functions.sh b/functions.sh
index bf521f9..1c84f19 100644
--- a/functions.sh
+++ b/functions.sh
@@ -557,10 +557,17 @@ gnome-shell-extensions-make-actual-permanent-systemwide() {
     sudo mkdir -p '/etc/dconf/db/local.d'
     if [ -e "${file}" ] ; then
         sudo sed -i -e "/${line}/d" "${file}"
-        sudo sed -i -e "/\[org\/gnome\/shell\]/d" "${file}"
+        #sudo sed -i -e "/\[org\/gnome\/shell\]/d" "${file}"
     fi
     local EXTENSIONS=$(gsettings get org.gnome.shell enabled-extensions)
-    echo "[org/gnome/shell]" | sudo tee -a "${file}"
-    echo "${EXTENSIONS}" | sudo tee -a "${file}"
+    line="[org/gnome/shell]"
+    command="grep -xqF -- ${line} ${file} || echo $line >> $file"
+    sudo sh -c "$command"
+
+    local line='enabled-extensions='
+    echo "Update or add extensions"
+    #echo "${line}${EXTENSIONS}" | sudo tee -a "${file}"
+    sudo sed -i "/\[org\/gnome\/shell\]/a${line}${EXTENSIONS}" "${file}"
+    sudo dconf update
 }
 #EOF

From b7d3bd3023a8a82c0c0266549363017350687148 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <schuer4>
Date: Wed, 11 Mar 2020 18:10:42 +0100
Subject: [PATCH 38/45] try to fix bash_completions for ssh

sourcing only the first line gives error
    sshs bash: completion: Funktion `_ssh' nicht gefunden.
---
 bash_completion.d/sshmyshellconfig | 1 +
 bash_completion.d/sshs             | 1 +
 bash_completion.d/sshserverconfig  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/bash_completion.d/sshmyshellconfig b/bash_completion.d/sshmyshellconfig
index a500099..66e384f 100644
--- a/bash_completion.d/sshmyshellconfig
+++ b/bash_completion.d/sshmyshellconfig
@@ -1,2 +1,3 @@
 [ -e /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion
+[ -e /usr/share/bash-completion/completions/ssh ] && . /usr/share/bash-completion/completions/ssh
 shopt -u hostcomplete && complete -F _ssh sshmyshellconfig
diff --git a/bash_completion.d/sshs b/bash_completion.d/sshs
index 31c4bdb..ea780ca 100644
--- a/bash_completion.d/sshs
+++ b/bash_completion.d/sshs
@@ -1,2 +1,3 @@
 [ -e /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion
+[ -e /usr/share/bash-completion/completions/ssh ] && . /usr/share/bash-completion/completions/ssh
 shopt -u hostcomplete && complete -F _ssh sshs
diff --git a/bash_completion.d/sshserverconfig b/bash_completion.d/sshserverconfig
index c865280..11a1657 100644
--- a/bash_completion.d/sshserverconfig
+++ b/bash_completion.d/sshserverconfig
@@ -1,2 +1,3 @@
 [ -e /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion
+[ -e /usr/share/bash-completion/completions/ssh ] && . /usr/share/bash-completion/completions/ssh
 shopt -u hostcomplete && complete -F _ssh sshserverconfig

From d68a65338fa485d253635b35eeeb58f8feecdd06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <schuer4>
Date: Thu, 12 Mar 2020 10:32:37 +0100
Subject: [PATCH 39/45] add root timeout

---
 bashrc_add | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bashrc_add b/bashrc_add
index 4c91422..70da519 100755
--- a/bashrc_add
+++ b/bashrc_add
@@ -11,6 +11,7 @@ if [[ $- = *i* ]] ; then
     #echo "interactive shell" >&2
 
     # define variables
+    [ -z "${MYSHELLCONFIIG_ROOT_TMOUT+x}" ] && MYSHELLCONFIIG_ROOT_TMOUT=0
     [ -z "${USERNAME+x}" ]                  && USERNAME="$USER"
     [ -z "${USEREMAIL+x}" ]                 && USEREMAIL="$USER@$(domainname -f)"
     [ -z "${FULLNAME+x}" ]                  && FULLNAME="$(getent passwd $USER | cut -d ":" -f 5 | cut -d ',' -f 1)"
@@ -32,6 +33,8 @@ if [[ $- = *i* ]] ; then
     SGIT="git -C ${MYSHELLCONFIG_BASE}" 
     export MYSHELLCONFIG_BASE MYSHELLCONFIG_LOGDIR MYSHELLCONFIG_LOGFILE SGIT MYSHELLCONFIG_VIM_PLUGINS
 
+    # if we are root, exit after 5 Minutes
+    [ $( id -u ) -eq 0 ] && TMOUT=${MYSHELLCONFIIG_ROOT_TMOUT}
     cat << EOF >> "${MYSHELLCONFIG_LOGFILE}"
     ------- start -------------- $(date) ---------------8<--
 

From 81793e06c39da462590309bbefba8e279fb63cbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <schuer4>
Date: Thu, 12 Mar 2020 10:39:22 +0100
Subject: [PATCH 40/45] add user-timeout, move set timouts to load_default

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

diff --git a/bashrc_add b/bashrc_add
index 70da519..628c507 100755
--- a/bashrc_add
+++ b/bashrc_add
@@ -11,7 +11,8 @@ if [[ $- = *i* ]] ; then
     #echo "interactive shell" >&2
 
     # define variables
-    [ -z "${MYSHELLCONFIIG_ROOT_TMOUT+x}" ] && MYSHELLCONFIIG_ROOT_TMOUT=0
+    [ -z "${MYSHELLCONFIIG_ROOT_TMOUT+x}" ] && MYSHELLCONFIIG_ROOT_TMOUT=500
+    [ -z "${MYSHELLCONFIIG_USER_TMOUT+x}" ] && MYSHELLCONFIIG_USER_TMOUT=0
     [ -z "${USERNAME+x}" ]                  && USERNAME="$USER"
     [ -z "${USEREMAIL+x}" ]                 && USEREMAIL="$USER@$(domainname -f)"
     [ -z "${FULLNAME+x}" ]                  && FULLNAME="$(getent passwd $USER | cut -d ":" -f 5 | cut -d ',' -f 1)"
@@ -33,8 +34,6 @@ if [[ $- = *i* ]] ; then
     SGIT="git -C ${MYSHELLCONFIG_BASE}" 
     export MYSHELLCONFIG_BASE MYSHELLCONFIG_LOGDIR MYSHELLCONFIG_LOGFILE SGIT MYSHELLCONFIG_VIM_PLUGINS
 
-    # if we are root, exit after 5 Minutes
-    [ $( id -u ) -eq 0 ] && TMOUT=${MYSHELLCONFIIG_ROOT_TMOUT}
     cat << EOF >> "${MYSHELLCONFIG_LOGFILE}"
     ------- start -------------- $(date) ---------------8<--
 
diff --git a/myshell_load_defaults b/myshell_load_defaults
index 48fe265..876eeea 100644
--- a/myshell_load_defaults
+++ b/myshell_load_defaults
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+# if we are root, exit after 5 Minutes
+[ $( id -u ) -eq 0 ] && TMOUT=${MYSHELLCONFIIG_ROOT_TMOUT}
+[ $( id -u ) -gt 0 ] && TMOUT=${MYSHELLCONFIIG_USER_TMOUT}
+
 # Load default values, functions, aliases for myshellconfig
 if ! $SSHS; then
     if [ -e ${MYSHELLCONFIG_BASE}/functions.sh ]; then

From 98b96b25e972188540a36cf9bde3881dfc189343 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz>
Date: Thu, 12 Mar 2020 18:22:31 +0100
Subject: [PATCH 41/45] add debug test if tty or not

---
 bashrc_add | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bashrc_add b/bashrc_add
index 628c507..6e05545 100755
--- a/bashrc_add
+++ b/bashrc_add
@@ -10,6 +10,12 @@ if [ -z ${SSHS+x} ]; then SSHS=false;fi
 if [[ $- = *i* ]] ; then
     #echo "interactive shell" >&2
 
+    case $(tty) in 
+        /dev/tty[0-9]*)
+            echo "Run in TTY" ;;
+        *)
+            echo "Run in other terminal";;
+    esac
     # define variables
     [ -z "${MYSHELLCONFIIG_ROOT_TMOUT+x}" ] && MYSHELLCONFIIG_ROOT_TMOUT=500
     [ -z "${MYSHELLCONFIIG_USER_TMOUT+x}" ] && MYSHELLCONFIIG_USER_TMOUT=0

From 04e217184d2fa1bc7d283e860aba7a7348e14343 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz>
Date: Thu, 12 Mar 2020 18:26:04 +0100
Subject: [PATCH 42/45] set timeout only if run in TTY

---
 bashrc_add            |  6 ------
 myshell_load_defaults | 12 ++++++++++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/bashrc_add b/bashrc_add
index 6e05545..628c507 100755
--- a/bashrc_add
+++ b/bashrc_add
@@ -10,12 +10,6 @@ if [ -z ${SSHS+x} ]; then SSHS=false;fi
 if [[ $- = *i* ]] ; then
     #echo "interactive shell" >&2
 
-    case $(tty) in 
-        /dev/tty[0-9]*)
-            echo "Run in TTY" ;;
-        *)
-            echo "Run in other terminal";;
-    esac
     # define variables
     [ -z "${MYSHELLCONFIIG_ROOT_TMOUT+x}" ] && MYSHELLCONFIIG_ROOT_TMOUT=500
     [ -z "${MYSHELLCONFIIG_USER_TMOUT+x}" ] && MYSHELLCONFIIG_USER_TMOUT=0
diff --git a/myshell_load_defaults b/myshell_load_defaults
index 876eeea..187539c 100644
--- a/myshell_load_defaults
+++ b/myshell_load_defaults
@@ -1,8 +1,16 @@
 #!/bin/bash
 
 # if we are root, exit after 5 Minutes
-[ $( id -u ) -eq 0 ] && TMOUT=${MYSHELLCONFIIG_ROOT_TMOUT}
-[ $( id -u ) -gt 0 ] && TMOUT=${MYSHELLCONFIIG_USER_TMOUT}
+case $(tty) in 
+    /dev/tty[0-9]*)
+        echo "Run in TTY -> set autologout \$TMOUT=$TMOUT" >&2
+        [ $( id -u ) -eq 0 ] && TMOUT=${MYSHELLCONFIIG_ROOT_TMOUT}
+        [ $( id -u ) -gt 0 ] && TMOUT=${MYSHELLCONFIIG_USER_TMOUT}
+        ;;
+    *)
+        echo "Run in other terminal" >&2
+        ;;
+esac
 
 # Load default values, functions, aliases for myshellconfig
 if ! $SSHS; then

From d69fbd974bec3051e9b59a1f321f97a08288794a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz>
Date: Thu, 12 Mar 2020 18:27:38 +0100
Subject: [PATCH 43/45] fix output for autologout debug

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

diff --git a/myshell_load_defaults b/myshell_load_defaults
index 187539c..be7f2d3 100644
--- a/myshell_load_defaults
+++ b/myshell_load_defaults
@@ -3,9 +3,9 @@
 # if we are root, exit after 5 Minutes
 case $(tty) in 
     /dev/tty[0-9]*)
-        echo "Run in TTY -> set autologout \$TMOUT=$TMOUT" >&2
         [ $( id -u ) -eq 0 ] && TMOUT=${MYSHELLCONFIIG_ROOT_TMOUT}
         [ $( id -u ) -gt 0 ] && TMOUT=${MYSHELLCONFIIG_USER_TMOUT}
+        echo "Run in TTY -> set autologout \$TMOUT=$TMOUT" >&2
         ;;
     *)
         echo "Run in other terminal" >&2

From 2d6a4a5d059ff6e63f6da8b3f50cfe0c83599f07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz>
Date: Thu, 12 Mar 2020 20:48:27 +0100
Subject: [PATCH 44/45] fix typo in variable, change from if to case

---
 bashrc_add            |  4 ++--
 myshell_load_defaults | 12 ++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/bashrc_add b/bashrc_add
index 628c507..774ce44 100755
--- a/bashrc_add
+++ b/bashrc_add
@@ -11,8 +11,8 @@ if [[ $- = *i* ]] ; then
     #echo "interactive shell" >&2
 
     # define variables
-    [ -z "${MYSHELLCONFIIG_ROOT_TMOUT+x}" ] && MYSHELLCONFIIG_ROOT_TMOUT=500
-    [ -z "${MYSHELLCONFIIG_USER_TMOUT+x}" ] && MYSHELLCONFIIG_USER_TMOUT=0
+    [ -z "${MYSHELLCONFIG_ROOT_TMOUT+x}" ]  && MYSHELLCONFIG_ROOT_TMOUT=500
+    [ -z "${MYSHELLCONFIG_USER_TMOUT+x}" ]  && MYSHELLCONFIG_USER_TMOUT=0
     [ -z "${USERNAME+x}" ]                  && USERNAME="$USER"
     [ -z "${USEREMAIL+x}" ]                 && USEREMAIL="$USER@$(domainname -f)"
     [ -z "${FULLNAME+x}" ]                  && FULLNAME="$(getent passwd $USER | cut -d ":" -f 5 | cut -d ',' -f 1)"
diff --git a/myshell_load_defaults b/myshell_load_defaults
index be7f2d3..5a6c6c7 100644
--- a/myshell_load_defaults
+++ b/myshell_load_defaults
@@ -3,8 +3,16 @@
 # if we are root, exit after 5 Minutes
 case $(tty) in 
     /dev/tty[0-9]*)
-        [ $( id -u ) -eq 0 ] && TMOUT=${MYSHELLCONFIIG_ROOT_TMOUT}
-        [ $( id -u ) -gt 0 ] && TMOUT=${MYSHELLCONFIIG_USER_TMOUT}
+        #[ $( id -u ) -eq 0 ] && TMOUT=${MYSHELLCONFIG_ROOT_TMOUT}
+        #[ $( id -u ) -gt 0 ] && TMOUT=${MYSHELLCONFIG_USER_TMOUT}
+        case $(id u) in
+            0)
+                TMOUT=${MYSHELLCONFIG_ROOT_TMOUT}
+                ;;
+            *)
+                TMOUT=${MYSHELLCONFIG_USER_TMOUT}
+                ;;
+        esac
         echo "Run in TTY -> set autologout \$TMOUT=$TMOUT" >&2
         ;;
     *)

From 945b2f8348a78139f8ba3591c0858b10517d0f88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz>
Date: Thu, 12 Mar 2020 20:59:57 +0100
Subject: [PATCH 45/45] use bash parameter-expansion

---
 bashrc_add            | 5 +++--
 myshell_load_defaults | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bashrc_add b/bashrc_add
index 774ce44..d5bb109 100755
--- a/bashrc_add
+++ b/bashrc_add
@@ -11,8 +11,9 @@ if [[ $- = *i* ]] ; then
     #echo "interactive shell" >&2
 
     # define variables
-    [ -z "${MYSHELLCONFIG_ROOT_TMOUT+x}" ]  && MYSHELLCONFIG_ROOT_TMOUT=500
-    [ -z "${MYSHELLCONFIG_USER_TMOUT+x}" ]  && MYSHELLCONFIG_USER_TMOUT=0
+    # default timeouts definted in myshellconfig_load_default
+    #[ -z "${MYSHELLCONFIG_ROOT_TMOUT+x}" ]  && MYSHELLCONFIG_ROOT_TMOUT=500
+    #[ -z "${MYSHELLCONFIG_USER_TMOUT+x}" ]  && MYSHELLCONFIG_USER_TMOUT=0
     [ -z "${USERNAME+x}" ]                  && USERNAME="$USER"
     [ -z "${USEREMAIL+x}" ]                 && USEREMAIL="$USER@$(domainname -f)"
     [ -z "${FULLNAME+x}" ]                  && FULLNAME="$(getent passwd $USER | cut -d ":" -f 5 | cut -d ',' -f 1)"
diff --git a/myshell_load_defaults b/myshell_load_defaults
index 5a6c6c7..96b1427 100644
--- a/myshell_load_defaults
+++ b/myshell_load_defaults
@@ -7,10 +7,10 @@ case $(tty) in
         #[ $( id -u ) -gt 0 ] && TMOUT=${MYSHELLCONFIG_USER_TMOUT}
         case $(id u) in
             0)
-                TMOUT=${MYSHELLCONFIG_ROOT_TMOUT}
+                TMOUT=${MYSHELLCONFIG_ROOT_TMOUT:-500}
                 ;;
             *)
-                TMOUT=${MYSHELLCONFIG_USER_TMOUT}
+                TMOUT=${MYSHELLCONFIG_USER_TMOUT:-0}
                 ;;
         esac
         echo "Run in TTY -> set autologout \$TMOUT=$TMOUT" >&2