From c98bfb1cad8c3a18b54b63f5a5f9480abe255f2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 18 Nov 2020 09:08:25 +0100 Subject: [PATCH 001/187] update submodules --- tmux/plugins/tmux-themepack | 2 +- vim/pack/plugins/start/fzf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tmux/plugins/tmux-themepack b/tmux/plugins/tmux-themepack index 1b1b809..7c59902 160000 --- a/tmux/plugins/tmux-themepack +++ b/tmux/plugins/tmux-themepack @@ -1 +1 @@ -Subproject commit 1b1b8098419daacb92ca401ad6ee0ca6894a40ca +Subproject commit 7c59902f64dcd7ea356e891274b21144d1ea5948 diff --git a/vim/pack/plugins/start/fzf b/vim/pack/plugins/start/fzf index 7bd99a2..1ed25d7 160000 --- a/vim/pack/plugins/start/fzf +++ b/vim/pack/plugins/start/fzf @@ -1 +1 @@ -Subproject commit 7bd99a22eeba74c88ad60f860111247a052f5586 +Subproject commit 1ed25d76ba51f9b3ab66f75b73734be43d41b8c3 From e794cc08ea044d9d4b30c5850035562a7d1ff896 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 16 Dec 2020 22:53:56 +0100 Subject: [PATCH 002/187] update submodules --- vim/pack/plugins/start/fzf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/pack/plugins/start/fzf b/vim/pack/plugins/start/fzf index 00f4551..ab3937e 160000 --- a/vim/pack/plugins/start/fzf +++ b/vim/pack/plugins/start/fzf @@ -1 +1 @@ -Subproject commit 00f4551a7b9edda202f15f43e694f949f04927de +Subproject commit ab3937ee5a62d63bac9307bfe72601eeb4fc9cd2 From 7ef29d4b199ec4ce0b5cd704fa3ffa703b6c2c54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 23 Dec 2020 23:28:24 +0100 Subject: [PATCH 003/187] update submodules --- vim/pack/plugins/start/fzf | 2 +- vim/pack/plugins/start/nerdtree | 2 +- vim/pack/plugins/start/vim-airline | 2 +- vim/pack/plugins/start/vim-airline-themes | 2 +- vim/pack/plugins/start/vim-fugitive | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/vim/pack/plugins/start/fzf b/vim/pack/plugins/start/fzf index ab3937e..e9bc733 160000 --- a/vim/pack/plugins/start/fzf +++ b/vim/pack/plugins/start/fzf @@ -1 +1 @@ -Subproject commit ab3937ee5a62d63bac9307bfe72601eeb4fc9cd2 +Subproject commit e9bc7331bde238e84f24b76ebb1f5e18799b15c4 diff --git a/vim/pack/plugins/start/nerdtree b/vim/pack/plugins/start/nerdtree index 14af897..aaa946f 160000 --- a/vim/pack/plugins/start/nerdtree +++ b/vim/pack/plugins/start/nerdtree @@ -1 +1 @@ -Subproject commit 14af89743ac1c31ff9bb43682025eda50333a7d5 +Subproject commit aaa946fb6bd79b9af86fbaf4b6b63fd81d839bd9 diff --git a/vim/pack/plugins/start/vim-airline b/vim/pack/plugins/start/vim-airline index f39208f..59b4826 160000 --- a/vim/pack/plugins/start/vim-airline +++ b/vim/pack/plugins/start/vim-airline @@ -1 +1 @@ -Subproject commit f39208f1a074fb525270312a20c87521a50c74ef +Subproject commit 59b4826806156142e9babc0179abd31a76b81a20 diff --git a/vim/pack/plugins/start/vim-airline-themes b/vim/pack/plugins/start/vim-airline-themes index 5cf03c3..8f1aa2c 160000 --- a/vim/pack/plugins/start/vim-airline-themes +++ b/vim/pack/plugins/start/vim-airline-themes @@ -1 +1 @@ -Subproject commit 5cf03c355b64836ebcb681136539f48ada34f363 +Subproject commit 8f1aa2c7fa44bf33b1fd4678f9c7b40c126b0e2b diff --git a/vim/pack/plugins/start/vim-fugitive b/vim/pack/plugins/start/vim-fugitive index 7afa1cf..bebe504 160000 --- a/vim/pack/plugins/start/vim-fugitive +++ b/vim/pack/plugins/start/vim-fugitive @@ -1 +1 @@ -Subproject commit 7afa1cfaa62e7fc6f891d0d59f4b10d046b5fd8e +Subproject commit bebe504e38d0a20c30d6dd666c4c793b3cc66104 From 89d2d40629583e6f76746000206a72c51927ed02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 30 Dec 2020 00:12:12 +0100 Subject: [PATCH 004/187] update submodules --- bin/startagent | 2 +- functions.sh | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/bin/startagent b/bin/startagent index 270bec7..8f62f48 100755 --- a/bin/startagent +++ b/bin/startagent @@ -7,7 +7,7 @@ for f in logerror logwarn loginfo logdebug logtrace ENTRY EXIT SCRIPTENTRY SCRIP : else fx=${f//log/} - #echo create function $f for $fx + echo create function $f for $fx eval "$f () { \ local loglevels; \ declare -a loglevels; \ diff --git a/functions.sh b/functions.sh index 585f338..52b2835 100755 --- a/functions.sh +++ b/functions.sh @@ -362,7 +362,7 @@ sshs() { done fi echo "FILELIST: $FILELIST" - local SSH_OPTS="-o VisualHostKey=no -o ControlMaster=auto -o ControlPersist=15s -o ControlPath=~/.ssh/ssh-%r@%h:%p" + local SSH_OPTS="-o VisualHostKey=no -o ControlMaster=yes -o ControlPersist=15s -o ControlPath=~/.ssh/ssh-%n-%C" # Read /etc/bashrc or /etc/bash.bashrc (depending on distribution) and /etc/profile.d/*.sh first cat << EOF >> "${TMPBASHCONFIG}" [ -e /etc/bashrc ] && BASHRC=/etc/bashrc @@ -398,7 +398,9 @@ EOF if [ $# -ge 1 ]; then if [ -e "${TMPBASHCONFIG}" ] ; then local RCMD="/bin/bash --noprofile --norc -c " + logdebug "create remote bashrc" local REMOTETMPBASHCONFIG=$(ssh -T ${SSH_OPTS} $@ "mktemp -p \${XDG_RUNTIME_DIR-~} -t bashrc.XXXXXXXX --suffix=.conf"| tr -d '[:space:]' ) + logdebug "create remote vimrc" local REMOTETMPVIMCONFIG=$(ssh -T ${SSH_OPTS} $@ "mktemp -p \${XDG_RUNTIME_DIR-~} -t vimrc.XXXXXXXX --suffix=.conf"| tr -d '[:space:]') # Add additional aliases to bashrc for remote-machine @@ -413,10 +415,13 @@ title "\$USER@\$HOSTNAME: \$PWD" loginfo "This bash runs with temporary config from \$BASHRC" EOF + logdebug "create fill remote bashrc" ssh -T ${SSH_OPTS} $@ "cat > ${REMOTETMPBASHCONFIG}" < "${TMPBASHCONFIG}" + logdebug "create fill remote vimrc" ssh -T ${SSH_OPTS} $@ "cat > ${REMOTETMPVIMCONFIG}" < "${MSC_BASE}/vimrc" RCMD=" trap \"rm -f ${REMOTETMPBASHCONFIG} ${REMOTETMPVIMCONFIG}\" EXIT " ; + logdebug "run remote shell with temporary config" ssh -t ${SSH_OPTS} $@ "$RCMD; SSHS=true bash -c \"function bash () { /bin/bash --rcfile ${REMOTETMPBASHCONFIG} -i ; } ; export -f bash; exec bash --rcfile ${REMOTETMPBASHCONFIG}\"" rm "${TMPBASHCONFIG}" else From 8b9e9b73059f5dc0c785bf67e89511dc0ebc0471 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Tue, 12 Jan 2021 11:03:26 +0100 Subject: [PATCH 005/187] fix wrong update-variable --- 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 cb72aae..bbd22fb 100755 --- a/bin/git-myshellconfig-checkout +++ b/bin/git-myshellconfig-checkout @@ -72,13 +72,13 @@ done 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 "${dorepoupdate+x}" ] && dorepoupdate="true" + [ -z "${dosubmodupdate+x}" ] && dosubmodupdate="true" fi 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") \ -a ${MSC_GIT_REPO_UPDATE-${MSC_GIT_REPO_UPDATE_DEFAULT-true}} ]; then - [ -z "${dosubmodupdate+x}" ] && dosubmodupdate="true" + [ -z "${dorepoupdate+x}" ] && dorepoupdate="true" fi #echo $SGIT fetch ${MSC_GIT_REMOTE_NAME} -p 1>&2 From e996ba02c30e2362c14727d5dff25f18d21e97f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Tue, 12 Jan 2021 16:46:26 +0100 Subject: [PATCH 006/187] fix variables --- bashrc_add | 6 ++---- myshell_load_defaults | 6 ------ 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/bashrc_add b/bashrc_add index fbbaf6f..70e2c4b 100755 --- a/bashrc_add +++ b/bashrc_add @@ -100,7 +100,7 @@ EOF fi else local seconds=$(( $( date --date="@$(stat --printf %Y ${MSC_GIT_UPD_REPO_STATFILE} 2>/dev/null || echo 0 )" "+%s") - $(date --date="${MSC_GIT_REPO_UPDATE_INTERVALL-${MSC_GIT_REPO_UPDATE_INTERVALL_DEFAULT}} hours ago" "+%s") )) - logwarn "sync-intervall (${MSC_GIT_REPO_UPDATE_INTERVALL-${MSC_GIT_REPO_UPDATE_INTERVALL_DEFAULT}} hours) not reached yet. $((seconds/86400)) days $(date -d "1970-01-01 + $seconds seconds" "+%H hours %M minutes %S seconds") left." + logwarn "repo sync-intervall (${MSC_GIT_REPO_UPDATE_INTERVALL-${MSC_GIT_REPO_UPDATE_INTERVALL_DEFAULT}} hours) not reached yet. $((seconds/86400)) days $(date -d "1970-01-01 + $seconds seconds" "+%H hours %M minutes %S seconds") left." return 2 fi else @@ -111,13 +111,11 @@ EOF } lastupdatesubmodules () { - #date "+%s" > ${MSC_GIT_UPD_SUBMOD_STATFILE} - touch ${MSC_GIT_UPD_REPO_STATFILE} + touch ${MSC_GIT_UPD_SUBMOD_STATFILE} } export -f lastupdatesubmodules lastupdaterepo () { - #date "+%s" > ${MSC_GIT_UPD_REPO_STATFILE} touch ${MSC_GIT_UPD_REPO_STATFILE} } export -f lastupdaterepo diff --git a/myshell_load_defaults b/myshell_load_defaults index 88b45b6..cf93e44 100644 --- a/myshell_load_defaults +++ b/myshell_load_defaults @@ -117,7 +117,6 @@ export HISTTIMEFORMAT='%F %T ' export HISTSIZE=999999 loginfo "bashrc_add sourced" 2>&1 |tee -a ${MSC_LOGFILE} >&2 -#echo "bashrc_add sourced" >&2 # Export several functions for being usable in subshells export -f token @@ -138,8 +137,3 @@ export -f reachable-default [ -z "${SSH_AGENTS_DEFAULT_DIR+x}" ] || mkdir -p "${SSH_AGENTS_DEFAULT_DIR}" -#cat << EOF > "${SSH_AGENTS_DEFAULT_DIR}/agent-default-$(hostname)" -#SSH_AUTH_SOCK=${SSH_AUTH_SOCK}; export SSH_AUTH_SOCK; -#SSH_AGENT_PID=${SSH_AGENT_PID}; export SSH_AGENT_PID; -#loginfo Agent pid ${SSH_AGENT_PID}; -#EOF From da87d89612bebed32a23932d0e8a5db5bd7e679e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Tue, 12 Jan 2021 16:57:08 +0100 Subject: [PATCH 007/187] add configfile --- sshs_addfiles.conf | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 sshs_addfiles.conf diff --git a/sshs_addfiles.conf b/sshs_addfiles.conf new file mode 100644 index 0000000..f4722b0 --- /dev/null +++ b/sshs_addfiles.conf @@ -0,0 +1,7 @@ +${MSC_BASE}/functions.sh +${MSC_BASE}/logging +${MSC_BASE}/myshell_load_fortmpconfig +$(getbashrcfile) ~/.aliases +${MSC_BASE}/aliases +${MSC_BASE}/PS1 +${MSC_BASE}/bash_completion.d/* From bcc7747eee93c449cb5d35616abf4ab40ecb26ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Fri, 15 Jan 2021 08:21:50 +0100 Subject: [PATCH 008/187] update submodules --- functions.sh | 2 ++ vim/pack/plugins/start/fzf | 2 +- vim/pack/plugins/start/fzf.vim | 2 +- vim/pack/plugins/start/syntastic | 2 +- vim/pack/plugins/start/vim-airline | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/functions.sh b/functions.sh index 52b2835..943acb9 100755 --- a/functions.sh +++ b/functions.sh @@ -115,6 +115,8 @@ setproxy () { fi ;; esac + + logwarn "CONFIG: ${CONFIG}" if [ -e ${CONFIG} ]; then loginfo -n "${CONFIG} existing: " diff --git a/vim/pack/plugins/start/fzf b/vim/pack/plugins/start/fzf index e9bc733..af48b3d 160000 --- a/vim/pack/plugins/start/fzf +++ b/vim/pack/plugins/start/fzf @@ -1 +1 @@ -Subproject commit e9bc7331bde238e84f24b76ebb1f5e18799b15c4 +Subproject commit af48b3df29a0c9658e95a109141f4a3c168b40a0 diff --git a/vim/pack/plugins/start/fzf.vim b/vim/pack/plugins/start/fzf.vim index e9d62b4..d43df0e 160000 --- a/vim/pack/plugins/start/fzf.vim +++ b/vim/pack/plugins/start/fzf.vim @@ -1 +1 @@ -Subproject commit e9d62b4c873f5f207202b4ba5bbd63de7003a0d3 +Subproject commit d43df0ea2f099836c2e3499756101e87bcbd3e25 diff --git a/vim/pack/plugins/start/syntastic b/vim/pack/plugins/start/syntastic index 6374164..d97a664 160000 --- a/vim/pack/plugins/start/syntastic +++ b/vim/pack/plugins/start/syntastic @@ -1 +1 @@ -Subproject commit 63741646a9e87bbe105674747555aded6f52c490 +Subproject commit d97a664b9adbd1a0a9cba6c1c3baf071a1059d1e diff --git a/vim/pack/plugins/start/vim-airline b/vim/pack/plugins/start/vim-airline index 59b4826..c7a633c 160000 --- a/vim/pack/plugins/start/vim-airline +++ b/vim/pack/plugins/start/vim-airline @@ -1 +1 @@ -Subproject commit 59b4826806156142e9babc0179abd31a76b81a20 +Subproject commit c7a633ce8f4547e680377efe8ea70493fcce1349 From ce65bf7954bb94cfeb51880cdcf50f2fa4e5ea6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Fri, 15 Jan 2021 08:46:51 +0100 Subject: [PATCH 009/187] add file for deploying pvp in bmi --- bash_completion.d/deploypvp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 bash_completion.d/deploypvp diff --git a/bash_completion.d/deploypvp b/bash_completion.d/deploypvp new file mode 100644 index 0000000..56ce85a --- /dev/null +++ b/bash_completion.d/deploypvp @@ -0,0 +1,20 @@ +function _scppvpconfig() { + CONFIG_DIRS=(~/.config/scppvp.d) + KEYS="" + for KEY_DIR in ${CONFIG_DIRS[*]};do + KEYS="${KEYS} $(find ${CONFIG_DIRS[*]} -type f -name "*.conf" -exec basename {} \; 2>/dev/null |sed 's/\.conf$//' )" + done + echo $KEYS + +} + +function _scppvpfiles() { + COMPREPLY=() + local CUR KEYS + CUR="${COMP_WORDS[COMP_CWORD]}" + KEYS=$(_scppvpconfig) + COMPREPLY=( $(compgen -W "${KEYS}" -- ${CUR}) ) + return 0 +} +complete -F _scppvpfiles scppvp + From 2c145246c3c749c2c95c069150ccf6de4850f3af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Fri, 15 Jan 2021 09:50:47 +0100 Subject: [PATCH 010/187] add deplypvp --- bash_completion.d/deploypvp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bash_completion.d/deploypvp b/bash_completion.d/deploypvp index 56ce85a..9038c4e 100644 --- a/bash_completion.d/deploypvp +++ b/bash_completion.d/deploypvp @@ -16,5 +16,5 @@ function _scppvpfiles() { COMPREPLY=( $(compgen -W "${KEYS}" -- ${CUR}) ) return 0 } -complete -F _scppvpfiles scppvp +complete -F _scppvpfiles scppvp deploypvp From b677438fa80ccafbdd8cc3863fe48fa48038dd65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 20 Jan 2021 17:09:09 +0100 Subject: [PATCH 011/187] 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 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?= Date: Sat, 23 Jan 2021 20:50:45 +0100 Subject: [PATCH 012/187] 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 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?= Date: Tue, 2 Feb 2021 09:48:40 +0100 Subject: [PATCH 013/187] 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?= Date: Tue, 2 Feb 2021 09:49:05 +0100 Subject: [PATCH 014/187] 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?= Date: Tue, 2 Feb 2021 10:40:04 +0100 Subject: [PATCH 015/187] 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?= Date: Tue, 2 Feb 2021 10:43:02 +0100 Subject: [PATCH 016/187] 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?= Date: Tue, 2 Feb 2021 10:45:25 +0100 Subject: [PATCH 017/187] 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?= Date: Tue, 2 Feb 2021 10:49:23 +0100 Subject: [PATCH 018/187] 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?= Date: Tue, 2 Feb 2021 10:53:45 +0100 Subject: [PATCH 019/187] 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?= Date: Tue, 2 Feb 2021 11:09:41 +0100 Subject: [PATCH 020/187] 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?= Date: Tue, 2 Feb 2021 11:14:06 +0100 Subject: [PATCH 021/187] 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?= Date: Tue, 2 Feb 2021 11:20:49 +0100 Subject: [PATCH 022/187] 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?= Date: Tue, 2 Feb 2021 11:22:53 +0100 Subject: [PATCH 023/187] 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?= Date: Tue, 2 Feb 2021 11:24:23 +0100 Subject: [PATCH 024/187] 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?= Date: Tue, 2 Feb 2021 11:25:52 +0100 Subject: [PATCH 025/187] 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?= Date: Tue, 2 Feb 2021 11:27:39 +0100 Subject: [PATCH 026/187] 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?= Date: Tue, 2 Feb 2021 11:28:34 +0100 Subject: [PATCH 027/187] 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?= Date: Tue, 2 Feb 2021 11:30:09 +0100 Subject: [PATCH 028/187] 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 aad886cc3e8c2999e59a2d642a9f27efebdf73ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 4 Feb 2021 09:02:54 +0100 Subject: [PATCH 029/187] update submodules --- functions.sh | 1 + tmux/plugins/tpm | 2 +- 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 +- 8 files changed, 8 insertions(+), 7 deletions(-) diff --git a/functions.sh b/functions.sh index 943acb9..dc34122 100755 --- a/functions.sh +++ b/functions.sh @@ -66,6 +66,7 @@ sudo() { SSHS="$SSHS" \ SSH_TTY="$SSH_TTY" \ SSH_AUTH_SOCK="$SSH_AUTH_SOCK" \ + http_proxy="$http_proxy" \ "$@" } 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..6654239 160000 --- a/vim/pack/plugins/start/fzf +++ b/vim/pack/plugins/start/fzf @@ -1 +1 @@ -Subproject commit af48b3df29a0c9658e95a109141f4a3c168b40a0 +Subproject commit 6654239c94667fefb38d76cfc47b6abf5ced8149 diff --git a/vim/pack/plugins/start/fzf.vim b/vim/pack/plugins/start/fzf.vim index d43df0e..02a192e 160000 --- a/vim/pack/plugins/start/fzf.vim +++ b/vim/pack/plugins/start/fzf.vim @@ -1 +1 @@ -Subproject commit d43df0ea2f099836c2e3499756101e87bcbd3e25 +Subproject commit 02a192ea0bed22a015e005b281e55e0da2a8e496 diff --git a/vim/pack/plugins/start/nerdtree b/vim/pack/plugins/start/nerdtree index aaa946f..1b19089 160000 --- a/vim/pack/plugins/start/nerdtree +++ b/vim/pack/plugins/start/nerdtree @@ -1 +1 @@ -Subproject commit aaa946fb6bd79b9af86fbaf4b6b63fd81d839bd9 +Subproject commit 1b19089917cc3e0a81d3294fead2424c419d545c diff --git a/vim/pack/plugins/start/vim-airline b/vim/pack/plugins/start/vim-airline index c7a633c..6def2f0 160000 --- a/vim/pack/plugins/start/vim-airline +++ b/vim/pack/plugins/start/vim-airline @@ -1 +1 @@ -Subproject commit c7a633ce8f4547e680377efe8ea70493fcce1349 +Subproject commit 6def2f0a8278410e6a908c491fd428b870d6516e 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 03a09069c6dea835d12bf6c0d86d544fc5760c67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Sun, 7 Feb 2021 01:31:37 +0100 Subject: [PATCH 030/187] 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?= Date: Sun, 7 Feb 2021 21:17:35 +0100 Subject: [PATCH 031/187] 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?= Date: Sun, 7 Feb 2021 21:20:19 +0100 Subject: [PATCH 032/187] 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?= Date: Sun, 7 Feb 2021 21:26:14 +0100 Subject: [PATCH 033/187] 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?= Date: Sun, 7 Feb 2021 21:30:38 +0100 Subject: [PATCH 034/187] 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?= Date: Sun, 14 Feb 2021 00:27:47 +0100 Subject: [PATCH 035/187] 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?= Date: Sun, 14 Feb 2021 02:16:54 +0100 Subject: [PATCH 036/187] 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?= Date: Mon, 15 Feb 2021 15:16:49 +0100 Subject: [PATCH 037/187] 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?= Date: Mon, 15 Feb 2021 15:27:00 +0100 Subject: [PATCH 038/187] 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?= Date: Mon, 15 Feb 2021 15:27:28 +0100 Subject: [PATCH 039/187] 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?= Date: Mon, 15 Feb 2021 15:27:45 +0100 Subject: [PATCH 040/187] 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?= Date: Mon, 15 Feb 2021 15:32:25 +0100 Subject: [PATCH 041/187] 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?= Date: Mon, 15 Feb 2021 15:32:56 +0100 Subject: [PATCH 042/187] 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?= Date: Sat, 20 Feb 2021 15:48:01 +0100 Subject: [PATCH 043/187] 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?= Date: Sat, 20 Feb 2021 15:53:43 +0100 Subject: [PATCH 044/187] 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?= Date: Thu, 25 Feb 2021 22:38:20 +0100 Subject: [PATCH 045/187] 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} From 12a6d378dc53bf82d862b6ed25269582a2235467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Sat, 27 Feb 2021 01:43:36 +0100 Subject: [PATCH 046/187] change ssh-master name in sshfs --- functions.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/functions.sh b/functions.sh index 82ea30e..e2b5d56 100755 --- a/functions.sh +++ b/functions.sh @@ -368,7 +368,8 @@ sshs() { done fi echo "FILELIST: $FILELIST" - local SSH_OPTS="-o VisualHostKey=no -o ControlMaster=yes -o ControlPersist=15s -o ControlPath=~/.ssh/ssh-%n-%C" + #local SSH_OPTS="-o VisualHostKey=no -o ControlMaster=yes -o ControlPersist=15s -o ControlPath=~/.ssh/ssh-%C" + local SSH_OPTS="-o VisualHostKey=no -o ControlMaster=yes -o ControlPersist=2s -o ControlPath=~/.ssh/ssh-%C" # Read /etc/bashrc or /etc/bash.bashrc (depending on distribution) and /etc/profile.d/*.sh first cat << EOF >> "${TMPBASHCONFIG}" [ -e /etc/bashrc ] && BASHRC=/etc/bashrc From 7833bc449f5d6dd3d0af634e307ab604d4ca35c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Mon, 1 Mar 2021 06:45:20 +0100 Subject: [PATCH 047/187] update submodules --- tmux/plugins/tmux-themepack | 2 +- tmux/plugins/tpm | 2 +- vim/pack/plugins/start/fzf | 2 +- vim/pack/plugins/start/nerdtree | 2 +- vim/pack/plugins/start/vim-airline | 2 +- vim/pack/plugins/start/vim-airline-themes | 2 +- vim/pack/plugins/start/vim-fugitive | 2 +- vim/pack/plugins/start/vim-gitgutter | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tmux/plugins/tmux-themepack b/tmux/plugins/tmux-themepack index 1b1b809..7c59902 160000 --- a/tmux/plugins/tmux-themepack +++ b/tmux/plugins/tmux-themepack @@ -1 +1 @@ -Subproject commit 1b1b8098419daacb92ca401ad6ee0ca6894a40ca +Subproject commit 7c59902f64dcd7ea356e891274b21144d1ea5948 diff --git a/tmux/plugins/tpm b/tmux/plugins/tpm index 38576cf..29c871e 160000 --- a/tmux/plugins/tpm +++ b/tmux/plugins/tpm @@ -1 +1 @@ -Subproject commit 38576cf76ea0d9959dae8bccc77306e70b318f8e +Subproject commit 29c871e8105dee0c4994ac97682d26bf9f9a4371 diff --git a/vim/pack/plugins/start/fzf b/vim/pack/plugins/start/fzf index 6654239..4f9a7f8 160000 --- a/vim/pack/plugins/start/fzf +++ b/vim/pack/plugins/start/fzf @@ -1 +1 @@ -Subproject commit 6654239c94667fefb38d76cfc47b6abf5ced8149 +Subproject commit 4f9a7f8c879ef625f3bec5946df9e7fe5768f9dd diff --git a/vim/pack/plugins/start/nerdtree b/vim/pack/plugins/start/nerdtree index 1b19089..a1fa4a3 160000 --- a/vim/pack/plugins/start/nerdtree +++ b/vim/pack/plugins/start/nerdtree @@ -1 +1 @@ -Subproject commit 1b19089917cc3e0a81d3294fead2424c419d545c +Subproject commit a1fa4a33bf16b6661e502080fc97788bb98afd35 diff --git a/vim/pack/plugins/start/vim-airline b/vim/pack/plugins/start/vim-airline index c01977d..cb1bc19 160000 --- a/vim/pack/plugins/start/vim-airline +++ b/vim/pack/plugins/start/vim-airline @@ -1 +1 @@ -Subproject commit c01977d027de854c6a85ed5c57915a7e8848f4b9 +Subproject commit cb1bc19064d3762e4e08103afb37a246b797d902 diff --git a/vim/pack/plugins/start/vim-airline-themes b/vim/pack/plugins/start/vim-airline-themes index 8f1aa2c..d148d42 160000 --- a/vim/pack/plugins/start/vim-airline-themes +++ b/vim/pack/plugins/start/vim-airline-themes @@ -1 +1 @@ -Subproject commit 8f1aa2c7fa44bf33b1fd4678f9c7b40c126b0e2b +Subproject commit d148d42d9caf331ff08b6cae683d5b210003cde7 diff --git a/vim/pack/plugins/start/vim-fugitive b/vim/pack/plugins/start/vim-fugitive index 8cf0cf5..601bf2e 160000 --- a/vim/pack/plugins/start/vim-fugitive +++ b/vim/pack/plugins/start/vim-fugitive @@ -1 +1 @@ -Subproject commit 8cf0cf5bfb2b858faecf4e0f6c1b8d0948805e5e +Subproject commit 601bf2e225af61bd64440f841f6d64dbb3d95be5 diff --git a/vim/pack/plugins/start/vim-gitgutter b/vim/pack/plugins/start/vim-gitgutter index ff9d134..1283ec1 160000 --- a/vim/pack/plugins/start/vim-gitgutter +++ b/vim/pack/plugins/start/vim-gitgutter @@ -1 +1 @@ -Subproject commit ff9d134f0c69e25d391138036051b2c5e6bac864 +Subproject commit 1283ec1670d1f4fce37213c5d66924088b2e730c From 335bec8f7a66adc20fd65e5980e30695257f8d45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Mon, 1 Mar 2021 13:42:52 +0100 Subject: [PATCH 048/187] target-domain in username, pwgen --- bin/trashmail | 116 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 84 insertions(+), 32 deletions(-) diff --git a/bin/trashmail b/bin/trashmail index 5048060..1b27075 100755 --- a/bin/trashmail +++ b/bin/trashmail @@ -14,21 +14,40 @@ PASS_ID=${PASS_ID_LDAP_ADMIN} OWN_DOMAIN=${TRASHMAIL_OWN_DOMAIN_DEFAULT} TARGET_MAIL=${TRASHMAIL_TARGET_MAIL_DEFAULT} HASHED_DEFAULT=${TRASHMAIL_HASHED_DEFAULT} +HASHLENGTH_DEFAULT=8 +PWOPTS_DEFAULT="-c -n -s" +PWLENGTH_DEFAULT=50 -set -- $(getopt -u -o fh --long force,hashed,not-hashed -- "$@" ) +set -- $(getopt -u -o dfhl:nwy --long force,hashed,not-hashed,hashlength:,whole-hash -- "$@" ) while : ; do case $1 in - -n|--not-hashed) - HASHED=false + -d) + INCLUDE_DOMAIN=true + shift + ;; + -f|--force) + FORCE=true shift ;; -h|--hashed) HASHED=true shift ;; - -f|--force) - FORCE=true + -l|--hashlength) + HASHLENGTH=$2 + shift; shift; + ;; + -n|--not-hashed) + HASHED=false + shift + ;; + -w|--full-hash) + HASHLENGTH=full + shift; + ;; + -y) + PWOPTS="${PWOPTS} -y" shift ;; --) @@ -36,42 +55,75 @@ while : ; do break ;; *) - wrong argument $1 + wrong argument $1 >&2 shift continue ;; esac done -URL=$1 +# Urlparsing inspired by: https://gist.github.com/joshisa/297b0bc1ec0dcdda0d1625029711fa24 +# Referenced and tweaked from http://stackoverflow.com/questions/6174220/parse-url-in-shell-script#6174447 -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 +URL=$1 +protocol=$(echo "$1" | grep "://" | sed -e's,^\(.*://\).*,\1,g') +# Remove the protocol +url_no_protocol=$(echo "${1/$protocol/}") +# Use tr: Make the protocol lower-case for easy string compare +protocol=$(echo "$protocol" | tr '[:upper:]' '[:lower:]') + + +# Extract the user and password (if any) +# cut 1: Remove the path part to prevent @ in the querystring from breaking the next cut +# rev: Reverse string so cut -f1 takes the (reversed) rightmost field, and -f2- is what we want +# cut 2: Remove the host:port +# rev: Undo the first rev above +userpass=$(echo "$url_no_protocol" | grep "@" | cut -d"/" -f1 | rev | cut -d"@" -f2- | rev) +pass=$(echo "$userpass" | grep ":" | cut -d":" -f2) +if [ -n "$pass" ]; then + user=$(echo "$userpass" | grep ":" | cut -d":" -f1) +else + user="$userpass" +fi + +# Extract the host +hostport=$(echo "${url_no_protocol/$userpass@/}" | cut -d"/" -f1) +host=$(echo "$hostport" | cut -d":" -f1) +port=$(echo "$hostport" | grep ":" | cut -d":" -f2) +path=$(echo "$url_no_protocol" | grep "/" | cut -d"/" -f2-) + +echo "Create a trashmail-address for ${host}" >&2 if ${HASHED:-$HASHED_DEFAULT}; then - TRASHUSER="$(echo ${DEST_DOMAIN}${USER}|md5sum -|awk '{print $1}')" + case $HASHLENGTH in + full) + TRASHUSER="$(echo ${host}${USER}|md5sum -|awk '{print $1}')" + ;; + [0-9]|[0-9][0-9]) + TRASHUSER="$(echo ${host}${USER}|md5sum -|awk '{print $1}'|cut -c-${HASHLENGTH})" + ;; + *) + TRASHUSER="$(echo ${host}${USER}|md5sum -|awk '{print $1}'|cut -c-${HASHLENGTH_DEFAULT})" + ;; + esac + + if ${INCLUDE_DOMAIN:-false} ;then + $INCLUDE_DOMAIN && TRASHUSER=${TRASHUSER}.${host} + fi + + else - TRASHUSER=${DEST_DOMAIN} + TRASHUSER=${host} fi TRASHMAIL=${TRASHUSER}@${OWN_DOMAIN} echo $TRASHMAIL -PASS_ENTRY="${PASS_PREFIX%/}${PASS_PREFIX:+/}${DEST_DOMAIN}/${TRASHMAIL}" +PASS_ENTRY="${PASS_PREFIX%/}${PASS_PREFIX:+/}${host}/${TRASHMAIL}" -set -x +#set -x +echo "Add new trashmail to LDAP" 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 @@ -81,19 +133,19 @@ 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" + echo "Entry not found --> create new pass-entry" CREATE=true ;; 0) - echo FORCE: ${FORCE-false} if ${FORCE-false} ; then + echo "Entry found but enforced to overwrite" CREATE=true else + echo echo "Current password for ${PASS_ENTRY} is $(pass ${PASS_ENTRY} |head -n1)." read -p "Overwrite? [Y|n]: " echo "" @@ -118,13 +170,13 @@ fi if ${CREATE-false}; then cat << EOF |pass insert -m ${PASS_ENTRY} -$(pwgen -y 50 1) +$(pwgen ${PWOPTS_DEFAULT} ${PWOPTS} ${2:-$PWLENGTH_DEFAULT} 1) email: ${TRASHMAIL} login: ${TRASHUSER} url: ${URL} -comment: trashemail autogenerated, delete, when delete account there +comment: trashemail autogenerated md5-hash from »${host}${USER}« cut to ${HASHLENGTH}. Delete email, when account deleted!!! EOF fi -set +x - #pass git commit "${PASS_ENTRY}" - pass -c ${PASS_ENTRY} +#set +x +#pass git commit "${PASS_ENTRY}" +pass -c ${PASS_ENTRY} From 99b322a1f36d7a0771dfb573949e6af34aff4b55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Tue, 2 Mar 2021 22:41:52 +0100 Subject: [PATCH 049/187] reload token pkcs11 if not available after plugout --- bin/startagent | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/bin/startagent b/bin/startagent index 8f62f48..f27a60a 100755 --- a/bin/startagent +++ b/bin/startagent @@ -227,6 +227,8 @@ agent-load-identity-keys () { local agentsocket local fingerprints declare -a fingerprints + local pubkeysonly + declare -a pubkeysonly local fingerprint local tokenfingerprint @@ -248,6 +250,7 @@ agent-load-identity-keys () { logdebug "$f" done if ! $tokenonly ; then + # load keys for key in $(ls ${SSH_IDENTITIES_DIR}/${ssh_identity}/id_*|grep -v "pub$\|so$\|config$\|public$"); do fingerprint=$(ssh-keygen -l -f $key|awk '{print $2}') if [[ ${fingerprints[*]} =~ "$fingerprint" ]]; then @@ -266,6 +269,25 @@ agent-load-identity-keys () { done fi if ! $keyonly ; then + # load tokens + for pubkey in $(ls ${SSH_IDENTITIES_DIR}/${ssh_identity}/id_*|grep "pub$\|public$"|grep -v "cert.pub"); do + if $( ls ${pubkey%.pub} 1>/dev/null 2>&1);then + echo "pk1 $pubkey" + else + echo "pk2 $pubkey" + pubkeysonly+=($pubkey) + fi + done + loginfo "pubkeysonly: ${pubkeysonly[@]} ${#pubkeysonly[*]}" + if [ ${#pubkeysonly[*]} -gt 0 ] ; then + for p in ${pubkeysonly[@]}; do + ssh-runinagent $agentfile ssh-add -T ${p} 2>&1 || { $remove || readd=true; break; } + done + fi + logdebug "readd: $readd" + + + for key in $(ls ${SSH_IDENTITIES_DIR}/${ssh_identity}/*|grep "\.so$"); do tokenfingerprint="$(ssh-keygen -l -D $key|tr -s ' '|awk '{print $2}')" if [[ ${fingerprints[*]} =~ "$tokenfingerprint" ]]; then From 012b8c60176edfce741983ad5106ae719fa52094 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Tue, 2 Mar 2021 22:42:38 +0100 Subject: [PATCH 050/187] load logging if not in environment --- bin/exif-fixdatetime | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/exif-fixdatetime b/bin/exif-fixdatetime index a1fa3e8..1824fe8 100755 --- a/bin/exif-fixdatetime +++ b/bin/exif-fixdatetime @@ -1,5 +1,7 @@ #!/bin/bash +[ type loginfo > /dev/null 2>&1 ] || . $(dirname $0)/../logging + export SCRIPT_LOG=./$(basename $0).log export LOGFILE=./$(basename $0).move.log [ -z "${move+x}" ] && move=false From 7bda80aa0cb858619725b38fcb279aaf4b35b54c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 3 Mar 2021 06:20:28 +0100 Subject: [PATCH 051/187] add help known issues: * if getopt parsing failes, no exit --- bin/trashmail | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/bin/trashmail b/bin/trashmail index 1b27075..6eff679 100755 --- a/bin/trashmail +++ b/bin/trashmail @@ -18,7 +18,30 @@ HASHLENGTH_DEFAULT=8 PWOPTS_DEFAULT="-c -n -s" PWLENGTH_DEFAULT=50 -set -- $(getopt -u -o dfhl:nwy --long force,hashed,not-hashed,hashlength:,whole-hash -- "$@" ) +show_help () { + cat << EOF + + usage: ${0} [] + + URL: https://target.domain.tld:8080/path/to/site | target.domain.tld + PWLENGTH: Integer, count characters in generated password + + OPTIONS: + -d include domain from in username: 8ee948ae.target.domain.tld@mydomain.tld + -f|--force force overwrite existing entry in pass + -h|--hashed create hash from domain and linux-login-user (${USER}) + --help show this help/usage + -l|--length |full cut hashed part of username to characters from start (default: ${HASHLENGHT_DEFAULT}) + -n|--not-hashed do not hash username from targetdomain and linux-login-user + -w|--full-hash do not cut hash (same as »-l full«) + -y|--symbols same option as in pwgen. Include at least one special character in the password. + + +EOF + +} +set -- $(getopt -u -o dfhl:nwy --long force,hashed,help,not-hashed,hashlength:,whole-hash,symblols -- "$@" || exit 2) +echo getopt $? while : ; do case $1 in @@ -34,6 +57,10 @@ while : ; do HASHED=true shift ;; + --help) + show_help + exit 0 + ;; -l|--hashlength) HASHLENGTH=$2 shift; shift; @@ -55,9 +82,9 @@ while : ; do break ;; *) - wrong argument $1 >&2 - shift - continue + echo wrong argument $1 >&2 + show_help + exit 1 ;; esac done From e1cd65774760bc7d54ac78c7e6a55483a8e5569f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 3 Mar 2021 17:35:43 +0100 Subject: [PATCH 052/187] workaround to exit, when options are wrong --- bin/trashmail | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bin/trashmail b/bin/trashmail index 6eff679..b51e8db 100755 --- a/bin/trashmail +++ b/bin/trashmail @@ -40,9 +40,12 @@ show_help () { EOF } -set -- $(getopt -u -o dfhl:nwy --long force,hashed,help,not-hashed,hashlength:,whole-hash,symblols -- "$@" || exit 2) -echo getopt $? +# TODO: how exit main-shell from error in subshell??? +getopt -u -o dfhl:nwy --long force,hashed,help,not-hashed,hashlength:,whole-hash,symblols -- "$@" || exit $? +set -- $(getopt -u -o dfhl:nwy --long force,hashed,help,not-hashed,hashlength:,whole-hash,symblols -- "$@"|| exit $?) + +echo @: $@ while : ; do case $1 in -d) From 971805c8a3d992da643e8b34b4605f4242f35a8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Sat, 6 Mar 2021 20:24:28 +0100 Subject: [PATCH 053/187] change debug --- bin/git-myshellconfig-checkout | 2 -- myshell_load_defaults | 18 +++++++++--------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/bin/git-myshellconfig-checkout b/bin/git-myshellconfig-checkout index c1e8bc9..92ed232 100755 --- a/bin/git-myshellconfig-checkout +++ b/bin/git-myshellconfig-checkout @@ -65,9 +65,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}" # Output #echo -n " remote: ${MSC_GIT_REMOTE_NAME}, branch: ${MSC_GIT_BRANCH}: " diff --git a/myshell_load_defaults b/myshell_load_defaults index 10b2c57..c928b3a 100644 --- a/myshell_load_defaults +++ b/myshell_load_defaults @@ -81,18 +81,18 @@ if ! $SSHS; then #cd ${HOME} # 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 $? )" + logdebug "attach tmux?" + logdebug "TMUX: $TMUX" + logdebug "SSH_TTY: $SSH_TTY" + logdebug "TERM: $TERM" + logdebug "tmux@${USER}: $(systemctl status tmux@${USER}.service 1>/dev/null 2>&1; echo $? )" if test $SSH_TTY; then - logwarn "i am remote" + loginfo "i am remote" if test ! $TMUX && test $TERM != screen; then - logwarn "no screen" + loginfo "no screen" # if test $(systemctl status tmux@${USER}.service 1>/dev/null 2>&1; echo $? ) -eq 0; then if tmux has-session -t User || tmux has-session -t "${USER}"; then - logwarn "tmux@${USER} is running" + loginfo "tmux@${USER} is running" STARTTMUXDEFAULT=${STARTTMUXREMOTEDEFAULT} fi fi @@ -105,7 +105,7 @@ if ! $SSHS; then # logwarn "TEST2" # STARTTMUXDEFAULT=${STARTTMUXREMOTEDEFAULT} # fi - logwarn "${STARTTMUXDEFAULT}" + logdebug "${STARTTMUXDEFAULT}" unset -f pathmunge From e2469ed60c9b7acbe868b9532eae51a9b7836e3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Mon, 8 Mar 2021 12:07:34 +0100 Subject: [PATCH 054/187] ControlMasterSec increased sshs did not finish every time the config, because connection Master broke down --- functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions.sh b/functions.sh index e2b5d56..b80cc3e 100755 --- a/functions.sh +++ b/functions.sh @@ -369,7 +369,7 @@ sshs() { fi echo "FILELIST: $FILELIST" #local SSH_OPTS="-o VisualHostKey=no -o ControlMaster=yes -o ControlPersist=15s -o ControlPath=~/.ssh/ssh-%C" - local SSH_OPTS="-o VisualHostKey=no -o ControlMaster=yes -o ControlPersist=2s -o ControlPath=~/.ssh/ssh-%C" + local SSH_OPTS="-o VisualHostKey=no -o ControlMaster=yes -o ControlPersist=10s -o ControlPath=~/.ssh/ssh-%C" # Read /etc/bashrc or /etc/bash.bashrc (depending on distribution) and /etc/profile.d/*.sh first cat << EOF >> "${TMPBASHCONFIG}" [ -e /etc/bashrc ] && BASHRC=/etc/bashrc From a88a1a77e224076ab5304e066a35ec1c4cf90cd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 10 Mar 2021 10:22:04 +0100 Subject: [PATCH 055/187] 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-airline-themes | 2 +- vim/pack/plugins/start/vim-fugitive | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/vim/pack/plugins/start/fzf b/vim/pack/plugins/start/fzf index 4f9a7f8..f4e1ed2 160000 --- a/vim/pack/plugins/start/fzf +++ b/vim/pack/plugins/start/fzf @@ -1 +1 @@ -Subproject commit 4f9a7f8c879ef625f3bec5946df9e7fe5768f9dd +Subproject commit f4e1ed25f224d0ebb4e6bd27c4a012a42c1ccfcd diff --git a/vim/pack/plugins/start/fzf.vim b/vim/pack/plugins/start/fzf.vim index 02a192e..711fb41 160000 --- a/vim/pack/plugins/start/fzf.vim +++ b/vim/pack/plugins/start/fzf.vim @@ -1 +1 @@ -Subproject commit 02a192ea0bed22a015e005b281e55e0da2a8e496 +Subproject commit 711fb41e39e2ad3abec1ec9720782acbac6fb6b4 diff --git a/vim/pack/plugins/start/nerdtree b/vim/pack/plugins/start/nerdtree index a1fa4a3..f63fb69 160000 --- a/vim/pack/plugins/start/nerdtree +++ b/vim/pack/plugins/start/nerdtree @@ -1 +1 @@ -Subproject commit a1fa4a33bf16b6661e502080fc97788bb98afd35 +Subproject commit f63fb6984f9cd07cf723c3e2e20f6ccc0aad48c2 diff --git a/vim/pack/plugins/start/vim-airline b/vim/pack/plugins/start/vim-airline index cb1bc19..09dbd09 160000 --- a/vim/pack/plugins/start/vim-airline +++ b/vim/pack/plugins/start/vim-airline @@ -1 +1 @@ -Subproject commit cb1bc19064d3762e4e08103afb37a246b797d902 +Subproject commit 09dbd09ed3b6318ca4c3cda8f61f02f1bc8ce783 diff --git a/vim/pack/plugins/start/vim-airline-themes b/vim/pack/plugins/start/vim-airline-themes index d148d42..fa808d7 160000 --- a/vim/pack/plugins/start/vim-airline-themes +++ b/vim/pack/plugins/start/vim-airline-themes @@ -1 +1 @@ -Subproject commit d148d42d9caf331ff08b6cae683d5b210003cde7 +Subproject commit fa808d74e0aacf131337b58f01ee45fd3d3588af diff --git a/vim/pack/plugins/start/vim-fugitive b/vim/pack/plugins/start/vim-fugitive index 601bf2e..753318e 160000 --- a/vim/pack/plugins/start/vim-fugitive +++ b/vim/pack/plugins/start/vim-fugitive @@ -1 +1 @@ -Subproject commit 601bf2e225af61bd64440f841f6d64dbb3d95be5 +Subproject commit 753318ef83b685f32c6bda5ae5b65b7b239a29a7 From ad7b1da4d46e26dd35502aff6fc0aa869d6bc9a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 11 Mar 2021 14:16:09 +0100 Subject: [PATCH 056/187] modify token --- functions.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/functions.sh b/functions.sh index b80cc3e..01c12bb 100755 --- a/functions.sh +++ b/functions.sh @@ -424,6 +424,7 @@ EOF logdebug "create fill remote bashrc" ssh -T ${SSH_OPTS} $@ "cat > ${REMOTETMPBASHCONFIG}" < "${TMPBASHCONFIG}" + ssh -T ${SSH_OPTS} $@ "cat ${REMOTETMPBASHCONFIG}" logdebug "create fill remote vimrc" ssh -T ${SSH_OPTS} $@ "cat > ${REMOTETMPVIMCONFIG}" < "${MSC_BASE}/vimrc" RCMD=" @@ -831,8 +832,8 @@ token(){ # token will load token in agent. does nothing, if token is already loaded # token -r|-f|--reload-token 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; } )" +# loadagent $@ + loginfo "$(ssh-add -s $PKCS11_MODULE || { ssh-add -e $PKCS11_MODULE; ssh-add -s $PKCS11_MODULE; } )" loginfo "$(ssh-add -l)" From 2c3ee9a2e0b6d62119acddcca8610d396a42bb8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Sun, 21 Mar 2021 00:58:17 +0100 Subject: [PATCH 057/187] fix check for pubkey for token --- bin/startagent | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/bin/startagent b/bin/startagent index f27a60a..696b345 100755 --- a/bin/startagent +++ b/bin/startagent @@ -279,12 +279,6 @@ agent-load-identity-keys () { fi done loginfo "pubkeysonly: ${pubkeysonly[@]} ${#pubkeysonly[*]}" - if [ ${#pubkeysonly[*]} -gt 0 ] ; then - for p in ${pubkeysonly[@]}; do - ssh-runinagent $agentfile ssh-add -T ${p} 2>&1 || { $remove || readd=true; break; } - done - fi - logdebug "readd: $readd" @@ -292,6 +286,7 @@ agent-load-identity-keys () { tokenfingerprint="$(ssh-keygen -l -D $key|tr -s ' '|awk '{print $2}')" if [[ ${fingerprints[*]} =~ "$tokenfingerprint" ]]; then logdebug "token: $key ($tokenfingerprint) is loaded" + check-pubkeysonly if $readd || $remove ; then $readd && logdebug "re-add token $key" $remove && logdebug "remove token $key" @@ -314,6 +309,22 @@ agent-load-identity-keys () { EXIT } +function check-pubkeysonly () { + if [ ${#pubkeysonly[*]} -gt 0 ] ; then + for p in ${pubkeysonly[@]}; do + ssh-runinagent $agentfile ssh-add -T ${p} 2>&1 || { $remove || readd=true; break; } + done + else + logwarn "obviously there is no pubkey for the token in ${SSH_IDENTITIES_DIR}/${ssh_identity}/" + logwarn "you can add the pubkey with" + logwarn " ssh-add -L > ${SSH_IDENTITIES_DIR}/${ssh_identity}/id_etoken.pub" + logwarn "make sure, only the token is loaded into ssh-agent with" + logwarn " ssh-add -l" + logwarn "only one line should be the output" + fi + logdebug "readd: $readd" +} + ssh-runinagent () { ENTRY From 2bc2a4b64f5614efdaa25049a75924a88d158dc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Sun, 21 Mar 2021 00:59:11 +0100 Subject: [PATCH 058/187] changes for nerdtree --- vimrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/vimrc b/vimrc index 72c7cab..672475c 100644 --- a/vimrc +++ b/vimrc @@ -468,9 +468,18 @@ let NERDTreeIgnore=['\.pyc$', '\~$'] "ignore files in NERDTree " write .netrwhist to cache-dir instead of ~/.vim to prevent configcheckout " problems let g:netrw_home=$XDG_CACHE_HOME.'/vim' + "let g:nerdtree_tabs_open_on_console_startup=1 let g:nerdtree_tabs_open_on_console_startup=0 +" Start NERDTree. If a file is specified, move the cursor to its window. +"autocmd StdinReadPre * let s:std_in=1 +"autocmd VimEnter * NERDTree | if argc() > 0 || exists("s:std_in") | wincmd p | endif + +" Start NERDTree when Vim is started without file arguments. +autocmd StdinReadPre * let s:std_in=1 +autocmd VimEnter * if argc() == 0 && !exists('s:std_in') | NERDTree | endif + let g:NERDTreeGitStatusIndicatorMapCustom= { \ "Modified" : "✹", \ "Staged" : "✚", From d76fce4878342075778f225f4e0ec74ca98570cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Sun, 21 Mar 2021 00:59:58 +0100 Subject: [PATCH 059/187] add option to delete trashmail completely --- bin/trashmail | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/bin/trashmail b/bin/trashmail index b51e8db..10a1d5b 100755 --- a/bin/trashmail +++ b/bin/trashmail @@ -27,6 +27,7 @@ show_help () { PWLENGTH: Integer, count characters in generated password OPTIONS: + --delete delete trashmail from LDAP -d include domain from in username: 8ee948ae.target.domain.tld@mydomain.tld -f|--force force overwrite existing entry in pass -h|--hashed create hash from domain and linux-login-user (${USER}) @@ -42,12 +43,16 @@ EOF } # TODO: how exit main-shell from error in subshell??? -getopt -u -o dfhl:nwy --long force,hashed,help,not-hashed,hashlength:,whole-hash,symblols -- "$@" || exit $? -set -- $(getopt -u -o dfhl:nwy --long force,hashed,help,not-hashed,hashlength:,whole-hash,symblols -- "$@"|| exit $?) +getopt -u -o dfhl:nwy --long delete,force,hashed,help,not-hashed,hashlength:,whole-hash,symblols -- "$@" || exit $? +set -- $(getopt -u -o dfhl:nwy --long delete,force,hashed,help,not-hashed,hashlength:,whole-hash,symblols -- "$@"|| exit $?) echo @: $@ while : ; do case $1 in + --delete) + ACTION=delete + shift + ;; -d) INCLUDE_DOMAIN=true shift @@ -152,6 +157,8 @@ echo $TRASHMAIL PASS_ENTRY="${PASS_PREFIX%/}${PASS_PREFIX:+/}${host}/${TRASHMAIL}" +case ${ACTION:-create} in + create) #set -x echo "Add new trashmail to LDAP" cat << EOF |ldapmodify -Z -H ldap://${LDAP_HOST} -D ${BIND_DN} -x -w $(pass ${PASS_ID}|head -n 1) @@ -210,3 +217,18 @@ fi #set +x #pass git commit "${PASS_ENTRY}" pass -c ${PASS_ENTRY} + ;; + delete) + +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 +delete: dcMailAlternateAddress +dcMailAlternateAddress: ${TRASHMAIL} +EOF + ;; + *) + echo action $ACTION not known + exit 1 + ;; +esac From e9f404a25e5ed0e48062ce65b65edee27e689560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Mon, 29 Mar 2021 08:24:46 +0200 Subject: [PATCH 060/187] tmux vim update --- 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 +- vim/pack/plugins/start/vim-airline | 2 +- vim/pack/plugins/start/vim-airline-themes | 2 +- vim/pack/plugins/start/vim-fugitive | 2 +- vim/pack/plugins/start/vim-gitgutter | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) 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 29c871e..38576cf 160000 --- a/tmux/plugins/tpm +++ b/tmux/plugins/tpm @@ -1 +1 @@ -Subproject commit 29c871e8105dee0c4994ac97682d26bf9f9a4371 +Subproject commit 38576cf76ea0d9959dae8bccc77306e70b318f8e diff --git a/vim/pack/plugins/start/fzf b/vim/pack/plugins/start/fzf index f4e1ed2..6654239 160000 --- a/vim/pack/plugins/start/fzf +++ b/vim/pack/plugins/start/fzf @@ -1 +1 @@ -Subproject commit f4e1ed25f224d0ebb4e6bd27c4a012a42c1ccfcd +Subproject commit 6654239c94667fefb38d76cfc47b6abf5ced8149 diff --git a/vim/pack/plugins/start/fzf.vim b/vim/pack/plugins/start/fzf.vim index 711fb41..02a192e 160000 --- a/vim/pack/plugins/start/fzf.vim +++ b/vim/pack/plugins/start/fzf.vim @@ -1 +1 @@ -Subproject commit 711fb41e39e2ad3abec1ec9720782acbac6fb6b4 +Subproject commit 02a192ea0bed22a015e005b281e55e0da2a8e496 diff --git a/vim/pack/plugins/start/nerdtree b/vim/pack/plugins/start/nerdtree index f63fb69..1b19089 160000 --- a/vim/pack/plugins/start/nerdtree +++ b/vim/pack/plugins/start/nerdtree @@ -1 +1 @@ -Subproject commit f63fb6984f9cd07cf723c3e2e20f6ccc0aad48c2 +Subproject commit 1b19089917cc3e0a81d3294fead2424c419d545c diff --git a/vim/pack/plugins/start/vim-airline b/vim/pack/plugins/start/vim-airline index 09dbd09..c01977d 160000 --- a/vim/pack/plugins/start/vim-airline +++ b/vim/pack/plugins/start/vim-airline @@ -1 +1 @@ -Subproject commit 09dbd09ed3b6318ca4c3cda8f61f02f1bc8ce783 +Subproject commit c01977d027de854c6a85ed5c57915a7e8848f4b9 diff --git a/vim/pack/plugins/start/vim-airline-themes b/vim/pack/plugins/start/vim-airline-themes index fa808d7..8f1aa2c 160000 --- a/vim/pack/plugins/start/vim-airline-themes +++ b/vim/pack/plugins/start/vim-airline-themes @@ -1 +1 @@ -Subproject commit fa808d74e0aacf131337b58f01ee45fd3d3588af +Subproject commit 8f1aa2c7fa44bf33b1fd4678f9c7b40c126b0e2b diff --git a/vim/pack/plugins/start/vim-fugitive b/vim/pack/plugins/start/vim-fugitive index 753318e..8cf0cf5 160000 --- a/vim/pack/plugins/start/vim-fugitive +++ b/vim/pack/plugins/start/vim-fugitive @@ -1 +1 @@ -Subproject commit 753318ef83b685f32c6bda5ae5b65b7b239a29a7 +Subproject commit 8cf0cf5bfb2b858faecf4e0f6c1b8d0948805e5e diff --git a/vim/pack/plugins/start/vim-gitgutter b/vim/pack/plugins/start/vim-gitgutter index 1283ec1..ff9d134 160000 --- a/vim/pack/plugins/start/vim-gitgutter +++ b/vim/pack/plugins/start/vim-gitgutter @@ -1 +1 @@ -Subproject commit 1283ec1670d1f4fce37213c5d66924088b2e730c +Subproject commit ff9d134f0c69e25d391138036051b2c5e6bac864 From b030cc5b68244536bcd18225503aea37e6c4f5f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Fri, 9 Apr 2021 11:41:52 +0200 Subject: [PATCH 061/187] change master lifetime --- functions.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/functions.sh b/functions.sh index 01c12bb..3a5e91f 100755 --- a/functions.sh +++ b/functions.sh @@ -368,8 +368,8 @@ sshs() { done fi echo "FILELIST: $FILELIST" - #local SSH_OPTS="-o VisualHostKey=no -o ControlMaster=yes -o ControlPersist=15s -o ControlPath=~/.ssh/ssh-%C" - local SSH_OPTS="-o VisualHostKey=no -o ControlMaster=yes -o ControlPersist=10s -o ControlPath=~/.ssh/ssh-%C" + local SSH_OPTS="-o VisualHostKey=no -o ControlMaster=yes -o ControlPersist=15s -o ControlPath=~/.ssh/ssh-%C" + #local SSH_OPTS="-o VisualHostKey=no -o ControlMaster=yes -o ControlPersist=10s -o ControlPath=~/.ssh/ssh-%C" # Read /etc/bashrc or /etc/bash.bashrc (depending on distribution) and /etc/profile.d/*.sh first cat << EOF >> "${TMPBASHCONFIG}" [ -e /etc/bashrc ] && BASHRC=/etc/bashrc @@ -407,6 +407,7 @@ EOF local RCMD="/bin/bash --noprofile --norc -c " logdebug "create remote bashrc" local REMOTETMPBASHCONFIG=$(ssh -T ${SSH_OPTS} $@ "mktemp -p \${XDG_RUNTIME_DIR-~} -t bashrc.XXXXXXXX --suffix=.conf"| tr -d '[:space:]' ) + ssh -T ${SSH_OPTS} $@ "stat ${REMOTETMPBASHCONFIG}" logdebug "create remote vimrc" local REMOTETMPVIMCONFIG=$(ssh -T ${SSH_OPTS} $@ "mktemp -p \${XDG_RUNTIME_DIR-~} -t vimrc.XXXXXXXX --suffix=.conf"| tr -d '[:space:]') @@ -424,7 +425,7 @@ EOF logdebug "create fill remote bashrc" ssh -T ${SSH_OPTS} $@ "cat > ${REMOTETMPBASHCONFIG}" < "${TMPBASHCONFIG}" - ssh -T ${SSH_OPTS} $@ "cat ${REMOTETMPBASHCONFIG}" + ssh -T ${SSH_OPTS} $@ "stat ${REMOTETMPBASHCONFIG}" logdebug "create fill remote vimrc" ssh -T ${SSH_OPTS} $@ "cat > ${REMOTETMPVIMCONFIG}" < "${MSC_BASE}/vimrc" RCMD=" From cb2e1d77ceddc9ff7a5f7f9ac8474a46bf10d2c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Tue, 27 Apr 2021 17:54:23 +0200 Subject: [PATCH 062/187] add debug --- functions.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/functions.sh b/functions.sh index 3a5e91f..add497f 100755 --- a/functions.sh +++ b/functions.sh @@ -406,10 +406,12 @@ EOF if [ -e "${TMPBASHCONFIG}" ] ; then local RCMD="/bin/bash --noprofile --norc -c " logdebug "create remote bashrc" - local REMOTETMPBASHCONFIG=$(ssh -T ${SSH_OPTS} $@ "mktemp -p \${XDG_RUNTIME_DIR-~} -t bashrc.XXXXXXXX --suffix=.conf"| tr -d '[:space:]' ) + local REMOTETMPBASHCONFIG=$(ssh -T ${SSH_OPTS} $@ "mktemp -p \${XDG_RUNTIME_DIR-~} -t bashrc.XXXXXXXX --suffix=.conf" 2> ~/myshellconfig.log | tr -d '[:space:]' ) + logwarn "REMOTETMPBASHCONFIG: $REMOTETMPBASHCONFIG" ssh -T ${SSH_OPTS} $@ "stat ${REMOTETMPBASHCONFIG}" + ssh -T ${SSH_OPTS} $@ "hostnamectl" logdebug "create remote vimrc" - local REMOTETMPVIMCONFIG=$(ssh -T ${SSH_OPTS} $@ "mktemp -p \${XDG_RUNTIME_DIR-~} -t vimrc.XXXXXXXX --suffix=.conf"| tr -d '[:space:]') + local REMOTETMPVIMCONFIG=$(ssh -T ${SSH_OPTS} $@ "mktemp -p \${XDG_RUNTIME_DIR-~} -t vimrc.XXXXXXXX --suffix=.conf" 2> ~/myshellconfig.log | tr -d '[:space:]' ) # Add additional aliases to bashrc for remote-machine cat << EOF >> "${TMPBASHCONFIG}" From 5b561f825336073cb014f74e2b887907f1c1bd55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 28 Apr 2021 08:58:42 +0200 Subject: [PATCH 063/187] fix ControlMaster in sshs --- functions.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/functions.sh b/functions.sh index add497f..5790737 100755 --- a/functions.sh +++ b/functions.sh @@ -368,7 +368,7 @@ sshs() { done fi echo "FILELIST: $FILELIST" - local SSH_OPTS="-o VisualHostKey=no -o ControlMaster=yes -o ControlPersist=15s -o ControlPath=~/.ssh/ssh-%C" + local SSH_OPTS="-o VisualHostKey=no -o ControlMaster=auto -o ControlPersist=15s -o ControlPath=~/.ssh/ssh-%C" #local SSH_OPTS="-o VisualHostKey=no -o ControlMaster=yes -o ControlPersist=10s -o ControlPath=~/.ssh/ssh-%C" # Read /etc/bashrc or /etc/bash.bashrc (depending on distribution) and /etc/profile.d/*.sh first cat << EOF >> "${TMPBASHCONFIG}" @@ -404,14 +404,15 @@ EOF if [ $# -ge 1 ]; then if [ -e "${TMPBASHCONFIG}" ] ; then - local RCMD="/bin/bash --noprofile --norc -c " logdebug "create remote bashrc" - local REMOTETMPBASHCONFIG=$(ssh -T ${SSH_OPTS} $@ "mktemp -p \${XDG_RUNTIME_DIR-~} -t bashrc.XXXXXXXX --suffix=.conf" 2> ~/myshellconfig.log | tr -d '[:space:]' ) + logdebug "SSH_OPTS: $SSH_OPTS" + local REMOTETMPBASHCONFIG=$(ssh -T ${SSH_OPTS} $@ "mktemp -p \${XDG_RUNTIME_DIR-~} -t bashrc.XXXXXXXX --suffix=.conf" | tr -d '[:space:]' ) logwarn "REMOTETMPBASHCONFIG: $REMOTETMPBASHCONFIG" - ssh -T ${SSH_OPTS} $@ "stat ${REMOTETMPBASHCONFIG}" - ssh -T ${SSH_OPTS} $@ "hostnamectl" + logdebug $(ssh -T ${SSH_OPTS} $@ "stat ${REMOTETMPBASHCONFIG}") + logdebug $(ssh -T ${SSH_OPTS} $@ "hostnamectl") logdebug "create remote vimrc" - local REMOTETMPVIMCONFIG=$(ssh -T ${SSH_OPTS} $@ "mktemp -p \${XDG_RUNTIME_DIR-~} -t vimrc.XXXXXXXX --suffix=.conf" 2> ~/myshellconfig.log | tr -d '[:space:]' ) + local REMOTETMPVIMCONFIG=$(ssh -T ${SSH_OPTS} $@ "mktemp -p \${XDG_RUNTIME_DIR-~} -t vimrc.XXXXXXXX --suffix=.conf" | tr -d '[:space:]' ) + logwarn "REMOTETMPVIMCONFIG: $REMOTETMPVIMCONFIG" # Add additional aliases to bashrc for remote-machine cat << EOF >> "${TMPBASHCONFIG}" @@ -430,13 +431,14 @@ EOF ssh -T ${SSH_OPTS} $@ "stat ${REMOTETMPBASHCONFIG}" logdebug "create fill remote vimrc" ssh -T ${SSH_OPTS} $@ "cat > ${REMOTETMPVIMCONFIG}" < "${MSC_BASE}/vimrc" + local RCMD="/bin/bash --noprofile --norc -c " RCMD=" trap \"rm -f ${REMOTETMPBASHCONFIG} ${REMOTETMPVIMCONFIG}\" EXIT " ; logdebug "run remote shell with temporary config" ssh -t ${SSH_OPTS} $@ "$RCMD; SSHS=true bash -c \"function bash () { /bin/bash --rcfile ${REMOTETMPBASHCONFIG} -i ; } ; export -f bash; exec bash --rcfile ${REMOTETMPBASHCONFIG}\"" rm "${TMPBASHCONFIG}" else - loginfo "${TMPBASHCONFIG} does not exist. Use »ssh $@«" >&2 + loginfo "${TMPBASHCONFIG} does not exist. Using »ssh -t $@«" ssh -t "$@" fi else From c48262229c9381a95973820c6166d56a956cf6aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 28 Apr 2021 08:58:12 +0200 Subject: [PATCH 064/187] pull-strategie auf rebase gesetzt --- .gitconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitconfig b/.gitconfig index b3881f9..866b979 100755 --- a/.gitconfig +++ b/.gitconfig @@ -48,3 +48,5 @@ path = ~/.gitconfig_local [status] submodulesummary = 1 +[pull] + rebase = true From 2ba56db7fca55a04d646ee9a4a7f5246ffd326ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 28 Apr 2021 09:02:18 +0200 Subject: [PATCH 065/187] update submodules --- tmux/plugins/tmux-sensible | 2 +- tmux/plugins/tmux-themepack | 2 +- tmux/plugins/tpm | 2 +- vim/pack/plugins/start/ctrlp.vim | 2 +- vim/pack/plugins/start/fzf | 2 +- vim/pack/plugins/start/fzf.vim | 2 +- vim/pack/plugins/start/nerdtree | 2 +- vim/pack/plugins/start/nerdtree-git-plugin | 2 +- vim/pack/plugins/start/syntastic | 2 +- vim/pack/plugins/start/vim-airline | 2 +- vim/pack/plugins/start/vim-airline-themes | 2 +- vim/pack/plugins/start/vim-fugitive | 2 +- vim/pack/plugins/start/vim-gitgutter | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tmux/plugins/tmux-sensible b/tmux/plugins/tmux-sensible index e91b178..44af8d8 160000 --- a/tmux/plugins/tmux-sensible +++ b/tmux/plugins/tmux-sensible @@ -1 +1 @@ -Subproject commit e91b178ff832b7bcbbf4d99d9f467f63fd1b76b5 +Subproject commit 44af8d8eff820eedd9702704d832ceda6732b34c diff --git a/tmux/plugins/tmux-themepack b/tmux/plugins/tmux-themepack index 1b1b809..7c59902 160000 --- a/tmux/plugins/tmux-themepack +++ b/tmux/plugins/tmux-themepack @@ -1 +1 @@ -Subproject commit 1b1b8098419daacb92ca401ad6ee0ca6894a40ca +Subproject commit 7c59902f64dcd7ea356e891274b21144d1ea5948 diff --git a/tmux/plugins/tpm b/tmux/plugins/tpm index 38576cf..2afeff1 160000 --- a/tmux/plugins/tpm +++ b/tmux/plugins/tpm @@ -1 +1 @@ -Subproject commit 38576cf76ea0d9959dae8bccc77306e70b318f8e +Subproject commit 2afeff1529ec85d0c5ced5ece3714c2220b646a5 diff --git a/vim/pack/plugins/start/ctrlp.vim b/vim/pack/plugins/start/ctrlp.vim index 971c4d4..f68f4d0 160000 --- a/vim/pack/plugins/start/ctrlp.vim +++ b/vim/pack/plugins/start/ctrlp.vim @@ -1 +1 @@ -Subproject commit 971c4d41880b72dbbf1620b3ad91418a6a6f6b9c +Subproject commit f68f4d00b9c99d0d711bfde3b071f0dafd249901 diff --git a/vim/pack/plugins/start/fzf b/vim/pack/plugins/start/fzf index 6654239..6e3a2fe 160000 --- a/vim/pack/plugins/start/fzf +++ b/vim/pack/plugins/start/fzf @@ -1 +1 @@ -Subproject commit 6654239c94667fefb38d76cfc47b6abf5ced8149 +Subproject commit 6e3a2fe0bf5d53434b41e868c501d9f63c6328aa diff --git a/vim/pack/plugins/start/fzf.vim b/vim/pack/plugins/start/fzf.vim index 02a192e..ee91c93 160000 --- a/vim/pack/plugins/start/fzf.vim +++ b/vim/pack/plugins/start/fzf.vim @@ -1 +1 @@ -Subproject commit 02a192ea0bed22a015e005b281e55e0da2a8e496 +Subproject commit ee91c93d4cbc6f29cf82877ca39f3ce23d5c5b7b diff --git a/vim/pack/plugins/start/nerdtree b/vim/pack/plugins/start/nerdtree index 1b19089..81f3eab 160000 --- a/vim/pack/plugins/start/nerdtree +++ b/vim/pack/plugins/start/nerdtree @@ -1 +1 @@ -Subproject commit 1b19089917cc3e0a81d3294fead2424c419d545c +Subproject commit 81f3eaba295b3fceb2d032db57e5eae99ae480f8 diff --git a/vim/pack/plugins/start/nerdtree-git-plugin b/vim/pack/plugins/start/nerdtree-git-plugin index 5fa0e3e..73da028 160000 --- a/vim/pack/plugins/start/nerdtree-git-plugin +++ b/vim/pack/plugins/start/nerdtree-git-plugin @@ -1 +1 @@ -Subproject commit 5fa0e3e1487b17f8a23fc2674ebde5f55ce6a816 +Subproject commit 73da0283ead8fa2bbce83d219fcab3ba1e8cf0dd diff --git a/vim/pack/plugins/start/syntastic b/vim/pack/plugins/start/syntastic index d97a664..a739985 160000 --- a/vim/pack/plugins/start/syntastic +++ b/vim/pack/plugins/start/syntastic @@ -1 +1 @@ -Subproject commit d97a664b9adbd1a0a9cba6c1c3baf071a1059d1e +Subproject commit a739985ef9fbb9888bdeea2f442d0574a9db0565 diff --git a/vim/pack/plugins/start/vim-airline b/vim/pack/plugins/start/vim-airline index c01977d..30f8ada 160000 --- a/vim/pack/plugins/start/vim-airline +++ b/vim/pack/plugins/start/vim-airline @@ -1 +1 @@ -Subproject commit c01977d027de854c6a85ed5c57915a7e8848f4b9 +Subproject commit 30f8ada1d6021d89228092b3c51840916c75a542 diff --git a/vim/pack/plugins/start/vim-airline-themes b/vim/pack/plugins/start/vim-airline-themes index 8f1aa2c..0f9995d 160000 --- a/vim/pack/plugins/start/vim-airline-themes +++ b/vim/pack/plugins/start/vim-airline-themes @@ -1 +1 @@ -Subproject commit 8f1aa2c7fa44bf33b1fd4678f9c7b40c126b0e2b +Subproject commit 0f9995d5996adf613297896c744415cd9e6b7a80 diff --git a/vim/pack/plugins/start/vim-fugitive b/vim/pack/plugins/start/vim-fugitive index 8cf0cf5..8f4a23e 160000 --- a/vim/pack/plugins/start/vim-fugitive +++ b/vim/pack/plugins/start/vim-fugitive @@ -1 +1 @@ -Subproject commit 8cf0cf5bfb2b858faecf4e0f6c1b8d0948805e5e +Subproject commit 8f4a23e6639ff67c0efd7242870d4beed47b5d37 diff --git a/vim/pack/plugins/start/vim-gitgutter b/vim/pack/plugins/start/vim-gitgutter index ff9d134..f4bdaa4 160000 --- a/vim/pack/plugins/start/vim-gitgutter +++ b/vim/pack/plugins/start/vim-gitgutter @@ -1 +1 @@ -Subproject commit ff9d134f0c69e25d391138036051b2c5e6bac864 +Subproject commit f4bdaa4e9cf07f62ce1161a3d0ff70c8aad25bc5 From e56e9722ea6e12de0c050d2c86191da757582db3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 28 Apr 2021 09:00:39 +0200 Subject: [PATCH 066/187] update submodules --- tmux/plugins/tmux-sensible | 2 +- tmux/plugins/tmux-themepack | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tmux/plugins/tmux-sensible b/tmux/plugins/tmux-sensible index 44af8d8..e91b178 160000 --- a/tmux/plugins/tmux-sensible +++ b/tmux/plugins/tmux-sensible @@ -1 +1 @@ -Subproject commit 44af8d8eff820eedd9702704d832ceda6732b34c +Subproject commit e91b178ff832b7bcbbf4d99d9f467f63fd1b76b5 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 From 5893b71f0df068872fd664f92bd9297fb28f51ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 28 Apr 2021 09:04:25 +0200 Subject: [PATCH 067/187] update submodules --- tmux/plugins/tmux-sensible | 2 +- tmux/plugins/tmux-themepack | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tmux/plugins/tmux-sensible b/tmux/plugins/tmux-sensible index e91b178..44af8d8 160000 --- a/tmux/plugins/tmux-sensible +++ b/tmux/plugins/tmux-sensible @@ -1 +1 @@ -Subproject commit e91b178ff832b7bcbbf4d99d9f467f63fd1b76b5 +Subproject commit 44af8d8eff820eedd9702704d832ceda6732b34c diff --git a/tmux/plugins/tmux-themepack b/tmux/plugins/tmux-themepack index 1b1b809..7c59902 160000 --- a/tmux/plugins/tmux-themepack +++ b/tmux/plugins/tmux-themepack @@ -1 +1 @@ -Subproject commit 1b1b8098419daacb92ca401ad6ee0ca6894a40ca +Subproject commit 7c59902f64dcd7ea356e891274b21144d1ea5948 From 7e7a0d69f3e4423e10b7cb5f0a7647400a9edb87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 28 Apr 2021 09:07:46 +0200 Subject: [PATCH 068/187] change debug sshs --- functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions.sh b/functions.sh index 5790737..e9dd135 100755 --- a/functions.sh +++ b/functions.sh @@ -428,7 +428,7 @@ EOF logdebug "create fill remote bashrc" ssh -T ${SSH_OPTS} $@ "cat > ${REMOTETMPBASHCONFIG}" < "${TMPBASHCONFIG}" - ssh -T ${SSH_OPTS} $@ "stat ${REMOTETMPBASHCONFIG}" + logdebug $(ssh -T ${SSH_OPTS} $@ "stat ${REMOTETMPBASHCONFIG}") logdebug "create fill remote vimrc" ssh -T ${SSH_OPTS} $@ "cat > ${REMOTETMPVIMCONFIG}" < "${MSC_BASE}/vimrc" local RCMD="/bin/bash --noprofile --norc -c " From 6e4814c04a92607a38b588fe5335ae781bbf8bdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 28 Apr 2021 09:08:05 +0200 Subject: [PATCH 069/187] change debug --- functions.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/functions.sh b/functions.sh index e9dd135..a702b37 100755 --- a/functions.sh +++ b/functions.sh @@ -359,15 +359,15 @@ sshs() { local TMPBASHCONFIG=$(mktemp -p ${XDG_RUNTIME_DIR} -t bashrc.XXXXXXXX --suffix=.conf) local FILELIST=( "${MSC_BASE}/functions.sh" "${MSC_BASE}/logging" "${MSC_BASE}/myshell_load_fortmpconfig" $(getbashrcfile) ~/.aliases "${MSC_BASE}/aliases" "${MSC_BASE}/PS1" "${MSC_BASE}/bash_completion.d/*" ) - echo "FILELIST: $FILELIST" + logdebug "FILELIST: $FILELIST" if [ -e "${HOME}/.config/myshellconfig/sshs_addfiles.conf" ] ; then for f in $(cat "${HOME}/.config/myshellconfig/sshs_addfiles.conf");do [ -e "$f" ] && {\ - echo "add $f to FILELIST"; \ + loginfo "add $f to FILELIST"; \ FILELIST+=("$f"); } done fi - echo "FILELIST: $FILELIST" + logdebug "FILELIST: $FILELIST" local SSH_OPTS="-o VisualHostKey=no -o ControlMaster=auto -o ControlPersist=15s -o ControlPath=~/.ssh/ssh-%C" #local SSH_OPTS="-o VisualHostKey=no -o ControlMaster=yes -o ControlPersist=10s -o ControlPath=~/.ssh/ssh-%C" # Read /etc/bashrc or /etc/bash.bashrc (depending on distribution) and /etc/profile.d/*.sh first From 09817e390f74ce48e501a3ec882a5192332b266f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 28 Apr 2021 09:14:20 +0200 Subject: [PATCH 070/187] change debug --- functions.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/functions.sh b/functions.sh index a702b37..79b3153 100755 --- a/functions.sh +++ b/functions.sh @@ -363,7 +363,7 @@ sshs() { if [ -e "${HOME}/.config/myshellconfig/sshs_addfiles.conf" ] ; then for f in $(cat "${HOME}/.config/myshellconfig/sshs_addfiles.conf");do [ -e "$f" ] && {\ - loginfo "add $f to FILELIST"; \ + logdebug "add $f to FILELIST"; \ FILELIST+=("$f"); } done fi @@ -407,12 +407,12 @@ EOF logdebug "create remote bashrc" logdebug "SSH_OPTS: $SSH_OPTS" local REMOTETMPBASHCONFIG=$(ssh -T ${SSH_OPTS} $@ "mktemp -p \${XDG_RUNTIME_DIR-~} -t bashrc.XXXXXXXX --suffix=.conf" | tr -d '[:space:]' ) - logwarn "REMOTETMPBASHCONFIG: $REMOTETMPBASHCONFIG" + logdebug "REMOTETMPBASHCONFIG: $REMOTETMPBASHCONFIG" logdebug $(ssh -T ${SSH_OPTS} $@ "stat ${REMOTETMPBASHCONFIG}") logdebug $(ssh -T ${SSH_OPTS} $@ "hostnamectl") logdebug "create remote vimrc" local REMOTETMPVIMCONFIG=$(ssh -T ${SSH_OPTS} $@ "mktemp -p \${XDG_RUNTIME_DIR-~} -t vimrc.XXXXXXXX --suffix=.conf" | tr -d '[:space:]' ) - logwarn "REMOTETMPVIMCONFIG: $REMOTETMPVIMCONFIG" + logdebug "REMOTETMPVIMCONFIG: $REMOTETMPVIMCONFIG" # Add additional aliases to bashrc for remote-machine cat << EOF >> "${TMPBASHCONFIG}" @@ -438,7 +438,7 @@ EOF ssh -t ${SSH_OPTS} $@ "$RCMD; SSHS=true bash -c \"function bash () { /bin/bash --rcfile ${REMOTETMPBASHCONFIG} -i ; } ; export -f bash; exec bash --rcfile ${REMOTETMPBASHCONFIG}\"" rm "${TMPBASHCONFIG}" else - loginfo "${TMPBASHCONFIG} does not exist. Using »ssh -t $@«" + logwarn "${TMPBASHCONFIG} does not exist. Using »ssh -t $@«" ssh -t "$@" fi else @@ -794,7 +794,7 @@ reachable () { local i loginfo -n "Try to connect to ${SERVER} (${IP}):${PORT} " >&2 for i in $(seq 1 $SEC); do - logdebug -n "." >&2 + loginfo -n "." >&2 if reachable-default ${IP} ${PORT} 2>/dev/null; then res=0 break From a35d9eddcbc65874df3e4145ac50322c5795b5b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 28 Apr 2021 09:16:36 +0200 Subject: [PATCH 071/187] change debug --- functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions.sh b/functions.sh index 79b3153..2102a04 100755 --- a/functions.sh +++ b/functions.sh @@ -397,7 +397,7 @@ EOF for f in ${FILELIST[*]}; do if [ -e $f ]; then - echo add $f to tmpconfig + logdebug "add $f to tmpconfig" cat "$f" >> "${TMPBASHCONFIG}"; fi done From e4f8c314fa2e7e90b9744d6ed9c30582e48efcfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 6 May 2021 00:56:01 +0200 Subject: [PATCH 072/187] change variable from PKCS11_MODUlE to P11M --- bashrc_add | 8 ++++++-- bin/ssh-init-pkcs11 | 10 +++++----- functions.sh | 16 ++++++++-------- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/bashrc_add b/bashrc_add index 6e5c37e..fd2f7e5 100755 --- a/bashrc_add +++ b/bashrc_add @@ -67,8 +67,12 @@ if [[ $- = *i* ]] ; then # load logging functions . ${MSC_BASE}/logging - # PKCS11_MODULE for etoken/smartcard authentification - [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && PKCS11_MODULE=$(whereis p11-kit-proxy.so|awk '{print $2}') + # P11M for etoken/smartcard authentification + echo P11M: $P11M + echo PM: $PM + echo P11M: $P11M + [ -z "${P11M+x}" ] && [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && P11M=$(whereis p11-kit-proxy.so|awk '{print $2}') + [ -z "${P11M+x}" ] && [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && P11M=$(whereis p11-kit-proxy.so|awk '{print $2}') # Basics [ -z "${VISUAL+x}" ] && export VISUAL=vim diff --git a/bin/ssh-init-pkcs11 b/bin/ssh-init-pkcs11 index 35f36a3..605d939 100755 --- a/bin/ssh-init-pkcs11 +++ b/bin/ssh-init-pkcs11 @@ -2,7 +2,7 @@ set -eu set -x -[ -z "${PKCS11_MODULE+x}" ] && PKCS11_MODULE="$(dnf repoquery --installed -l p11-kit | grep \/p11-kit-proxy.so\$ | head -1)" +[ -z "${P11M+x}" ] && P11M="$(dnf repoquery --installed -l p11-kit | grep \/p11-kit-proxy.so\$ | head -1)" echo SSH_AGENT_PID before: $SSH_AGENT_PID @@ -11,13 +11,13 @@ echo SSH_AGENT_PID before: $SSH_AGENT_PID echo SSH_AGENT_PID after: $SSH_AGENT_PID -#if ssh-add -l | grep -q "${PKCS11_MODULE}"; then +#if ssh-add -l | grep -q "${P11M}"; then # # Remove any stale loaded keys from token, ssh-agent does not automatically # # reconnect with the token when you reinsert it. -# ssh-add -e "${PKCS11_MODULE}" +# ssh-add -e "${P11M}" #fi -ssh-add -e "${PKCS11_MODULE}" 2>/dev/null +ssh-add -e "${P11M}" 2>/dev/null echo $? # Tell ssh-agent to use the keys on the token -ssh-add -s "${PKCS11_MODULE}" +ssh-add -s "${P11M}" diff --git a/functions.sh b/functions.sh index 2102a04..82e7c76 100755 --- a/functions.sh +++ b/functions.sh @@ -816,14 +816,14 @@ utoken () { ENTRY ssh_identity=$1 - [ -z "${PKCS11_MODULE+x}" ] && { PKCS11_MODULE=/usr/lib64/p11-kit-proxy.so; export PKCS11_MODULE; } + [ -z "${P11M+x}" ] && { P11M=/usr/lib64/p11-kit-proxy.so; export P11M; } if [ -n "${ssh_identity+x}" ]; then agentfile="${HOME}/.ssh/agents/agent-${ssh_identity}-$(hostname)" if [ -e "$agentfile" ]; then local SSH_AUTH_SOCK local SSH_AGENT_PID - /bin/sh -c ". $agentfile >/dev/null 2>/dev/null; ssh-add -l; ssh-add -e $PKCS11_MODULE; ssh-add -l" + /bin/sh -c ". $agentfile >/dev/null 2>/dev/null; ssh-add -l; ssh-add -e $P11M; ssh-add -l" fi fi EXIT @@ -831,14 +831,14 @@ utoken () { token(){ - [ -z "${PKCS11_MODULE+x}" ] && { PKCS11_MODULE=/usr/lib64/p11-kit-proxy.so; export PKCS11_MODULE; } + [ -z "${P11M+x}" ] && { P11M=/usr/lib64/p11-kit-proxy.so; export P11M; } # Usage: # token will load token in agent. does nothing, if token is already loaded # token -r|-f|--reload-token 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 $P11M || { ssh-add -e $P11M; ssh-add -s $P11M; } )" loginfo "$(ssh-add -l)" @@ -846,8 +846,8 @@ token(){ token-extract-pubkey() { - if pkcs11-tool --module $PKCS11_MODULE --list-token-slots >&2 ;then - ssh-keygen -i -m pkcs8 -f <(pkcs11-tool --module $PKCS11_MODULE -r --type pubkey $1 $2 |openssl rsa -pubin -inform DER ) + if pkcs11-tool --module $P11M --list-token-slots >&2 ;then + ssh-keygen -i -m pkcs8 -f <(pkcs11-tool --module $P11M -r --type pubkey $1 $2 |openssl rsa -pubin -inform DER ) if [ $? -gt 0 ] ; then token-list-objects fi @@ -860,10 +860,10 @@ token-extract-pubkey() { token-list-objects() { case $1 in --login|-l) - pkcs11-tool --module $PKCS11_MODULE --login --list-objects + pkcs11-tool --module $P11M --login --list-objects ;; *) - pkcs11-tool --module $PKCS11_MODULE --list-objects + pkcs11-tool --module $P11M --list-objects ;; esac From 520196cff26486727f35b11f02e4258265b85250 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 6 May 2021 00:57:20 +0200 Subject: [PATCH 073/187] add P11M to sshs --- functions.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/functions.sh b/functions.sh index 2102a04..4259586 100755 --- a/functions.sh +++ b/functions.sh @@ -64,6 +64,7 @@ sudo() { GIT_COMMITTER_NAME="$GIT_COMMITTER_NAME" \ TMUX="$TMUX" \ SSHS="$SSHS" \ + P11M="$P11M" \ SSH_TTY="$SSH_TTY" \ SSH_AUTH_SOCK="$SSH_AUTH_SOCK" \ http_proxy="$http_proxy" \ From 9ffd8eac4580411de988ca640d8d8c95194f5996 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 6 May 2021 00:58:00 +0200 Subject: [PATCH 074/187] add alias --- aliases | 1 + 1 file changed, 1 insertion(+) diff --git a/aliases b/aliases index 146132e..afb345a 100644 --- a/aliases +++ b/aliases @@ -13,6 +13,7 @@ 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)' alias sexit='ssh -O exit $(history -p \!ssh:$:t)' +alias remountshared='sudo systemctl restart media-remote-sharefs-userdata.mount' From 85d84a86253494321eb85140eb366904c04823f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 6 May 2021 00:57:20 +0200 Subject: [PATCH 075/187] add P11M to sshs --- functions.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/functions.sh b/functions.sh index 82e7c76..c644bb5 100755 --- a/functions.sh +++ b/functions.sh @@ -64,6 +64,7 @@ sudo() { GIT_COMMITTER_NAME="$GIT_COMMITTER_NAME" \ TMUX="$TMUX" \ SSHS="$SSHS" \ + P11M="$P11M" \ SSH_TTY="$SSH_TTY" \ SSH_AUTH_SOCK="$SSH_AUTH_SOCK" \ http_proxy="$http_proxy" \ From 247d0e782eb829127de6bf6b0e0c4af606ef3bd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 6 May 2021 00:58:00 +0200 Subject: [PATCH 076/187] add alias --- aliases | 1 + 1 file changed, 1 insertion(+) diff --git a/aliases b/aliases index 146132e..afb345a 100644 --- a/aliases +++ b/aliases @@ -13,6 +13,7 @@ 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)' alias sexit='ssh -O exit $(history -p \!ssh:$:t)' +alias remountshared='sudo systemctl restart media-remote-sharefs-userdata.mount' From eb85d752d86c756941277bef7a561e60f0fa7a86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 6 May 2021 01:07:21 +0200 Subject: [PATCH 077/187] remove duplicate line --- bashrc_add | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bashrc_add b/bashrc_add index fd2f7e5..aef1389 100755 --- a/bashrc_add +++ b/bashrc_add @@ -72,7 +72,7 @@ if [[ $- = *i* ]] ; then echo PM: $PM echo P11M: $P11M [ -z "${P11M+x}" ] && [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && P11M=$(whereis p11-kit-proxy.so|awk '{print $2}') - [ -z "${P11M+x}" ] && [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && P11M=$(whereis p11-kit-proxy.so|awk '{print $2}') + #[ -z "${P11M+x}" ] && [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && P11M=$(whereis p11-kit-proxy.so|awk '{print $2}') # Basics [ -z "${VISUAL+x}" ] && export VISUAL=vim From e1d1ec4a3c51e03cbd2f87cba5a13ce38328e2d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 6 May 2021 01:08:53 +0200 Subject: [PATCH 078/187] change filling variable --- bashrc_add | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/bashrc_add b/bashrc_add index aef1389..f311367 100755 --- a/bashrc_add +++ b/bashrc_add @@ -69,9 +69,7 @@ if [[ $- = *i* ]] ; then # P11M for etoken/smartcard authentification echo P11M: $P11M - echo PM: $PM - echo P11M: $P11M - [ -z "${P11M+x}" ] && [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && P11M=$(whereis p11-kit-proxy.so|awk '{print $2}') + [ -n "${P11M+x}" ] && [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && P11M=$(whereis p11-kit-proxy.so|awk '{print $2}') #[ -z "${P11M+x}" ] && [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && P11M=$(whereis p11-kit-proxy.so|awk '{print $2}') # Basics From 5dc7ef31c7ea0ea939bee9218ef96da9e5c6a5b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 6 May 2021 01:10:59 +0200 Subject: [PATCH 079/187] change filling variable --- bashrc_add | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bashrc_add b/bashrc_add index f311367..d48cbb0 100755 --- a/bashrc_add +++ b/bashrc_add @@ -69,7 +69,7 @@ if [[ $- = *i* ]] ; then # P11M for etoken/smartcard authentification echo P11M: $P11M - [ -n "${P11M+x}" ] && [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && P11M=$(whereis p11-kit-proxy.so|awk '{print $2}') + [ -z "${P11M+x}" ] && [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && P11M=$(whereis p11-kit-proxy.so|awk '{print $2}') #[ -z "${P11M+x}" ] && [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && P11M=$(whereis p11-kit-proxy.so|awk '{print $2}') # Basics From bb8fe79fea1c04686a58ac15770b7f0f7a94ec03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 6 May 2021 01:14:08 +0200 Subject: [PATCH 080/187] add debug --- bashrc_add | 1 + 1 file changed, 1 insertion(+) diff --git a/bashrc_add b/bashrc_add index d48cbb0..f0686ee 100755 --- a/bashrc_add +++ b/bashrc_add @@ -70,6 +70,7 @@ if [[ $- = *i* ]] ; then # P11M for etoken/smartcard authentification echo P11M: $P11M [ -z "${P11M+x}" ] && [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && P11M=$(whereis p11-kit-proxy.so|awk '{print $2}') + echo P11M: $P11M #[ -z "${P11M+x}" ] && [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && P11M=$(whereis p11-kit-proxy.so|awk '{print $2}') # Basics From 911a6c5af02436085fae411db445018c2acf0bcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 6 May 2021 01:15:20 +0200 Subject: [PATCH 081/187] change debug --- bashrc_add | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bashrc_add b/bashrc_add index f0686ee..80f5a79 100755 --- a/bashrc_add +++ b/bashrc_add @@ -68,9 +68,9 @@ if [[ $- = *i* ]] ; then . ${MSC_BASE}/logging # P11M for etoken/smartcard authentification - echo P11M: $P11M + logdebug P11M: $P11M [ -z "${P11M+x}" ] && [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && P11M=$(whereis p11-kit-proxy.so|awk '{print $2}') - echo P11M: $P11M + logdebug P11M: $P11M #[ -z "${P11M+x}" ] && [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && P11M=$(whereis p11-kit-proxy.so|awk '{print $2}') # Basics From f73bff54b6b023633d5f861cceb717809dbd7b8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 6 May 2021 01:29:13 +0200 Subject: [PATCH 082/187] add variable to tmux environment --- tmux/tmux.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmux/tmux.conf b/tmux/tmux.conf index fb1374f..69c914a 100644 --- a/tmux/tmux.conf +++ b/tmux/tmux.conf @@ -177,7 +177,7 @@ source-file "${HOME}/.tmux/plugins/tmux-themepack/powerline/block/green.tmuxthem # source local tmux.config source-file -q "${HOME}/.local/share/tmux/tmux.conf" -set -g update-environment "SSH_ASKPASS WINDOWID SSH_CONNECTION XAUTHORITY SSH_TTY SSH_AUTH_SOCK DISPLAY" +set -g update-environment "SSH_ASKPASS WINDOWID SSH_CONNECTION XAUTHORITY SSH_TTY SSH_AUTH_SOCK DISPLAY P11M" #set-environment -g 'SSH_AUTH_SOCK' ~/.ssh/ssh_auth_sock From d1d9596868118f613a6d8b115243f7ed2ecdfc80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 6 May 2021 00:56:01 +0200 Subject: [PATCH 083/187] change variable from PKCS11_MODUlE to P11M --- bashrc_add | 8 ++++++-- bin/ssh-init-pkcs11 | 10 +++++----- functions.sh | 16 ++++++++-------- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/bashrc_add b/bashrc_add index 6e5c37e..fd2f7e5 100755 --- a/bashrc_add +++ b/bashrc_add @@ -67,8 +67,12 @@ if [[ $- = *i* ]] ; then # load logging functions . ${MSC_BASE}/logging - # PKCS11_MODULE for etoken/smartcard authentification - [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && PKCS11_MODULE=$(whereis p11-kit-proxy.so|awk '{print $2}') + # P11M for etoken/smartcard authentification + echo P11M: $P11M + echo PM: $PM + echo P11M: $P11M + [ -z "${P11M+x}" ] && [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && P11M=$(whereis p11-kit-proxy.so|awk '{print $2}') + [ -z "${P11M+x}" ] && [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && P11M=$(whereis p11-kit-proxy.so|awk '{print $2}') # Basics [ -z "${VISUAL+x}" ] && export VISUAL=vim diff --git a/bin/ssh-init-pkcs11 b/bin/ssh-init-pkcs11 index 35f36a3..605d939 100755 --- a/bin/ssh-init-pkcs11 +++ b/bin/ssh-init-pkcs11 @@ -2,7 +2,7 @@ set -eu set -x -[ -z "${PKCS11_MODULE+x}" ] && PKCS11_MODULE="$(dnf repoquery --installed -l p11-kit | grep \/p11-kit-proxy.so\$ | head -1)" +[ -z "${P11M+x}" ] && P11M="$(dnf repoquery --installed -l p11-kit | grep \/p11-kit-proxy.so\$ | head -1)" echo SSH_AGENT_PID before: $SSH_AGENT_PID @@ -11,13 +11,13 @@ echo SSH_AGENT_PID before: $SSH_AGENT_PID echo SSH_AGENT_PID after: $SSH_AGENT_PID -#if ssh-add -l | grep -q "${PKCS11_MODULE}"; then +#if ssh-add -l | grep -q "${P11M}"; then # # Remove any stale loaded keys from token, ssh-agent does not automatically # # reconnect with the token when you reinsert it. -# ssh-add -e "${PKCS11_MODULE}" +# ssh-add -e "${P11M}" #fi -ssh-add -e "${PKCS11_MODULE}" 2>/dev/null +ssh-add -e "${P11M}" 2>/dev/null echo $? # Tell ssh-agent to use the keys on the token -ssh-add -s "${PKCS11_MODULE}" +ssh-add -s "${P11M}" diff --git a/functions.sh b/functions.sh index 4259586..c644bb5 100755 --- a/functions.sh +++ b/functions.sh @@ -817,14 +817,14 @@ utoken () { ENTRY ssh_identity=$1 - [ -z "${PKCS11_MODULE+x}" ] && { PKCS11_MODULE=/usr/lib64/p11-kit-proxy.so; export PKCS11_MODULE; } + [ -z "${P11M+x}" ] && { P11M=/usr/lib64/p11-kit-proxy.so; export P11M; } if [ -n "${ssh_identity+x}" ]; then agentfile="${HOME}/.ssh/agents/agent-${ssh_identity}-$(hostname)" if [ -e "$agentfile" ]; then local SSH_AUTH_SOCK local SSH_AGENT_PID - /bin/sh -c ". $agentfile >/dev/null 2>/dev/null; ssh-add -l; ssh-add -e $PKCS11_MODULE; ssh-add -l" + /bin/sh -c ". $agentfile >/dev/null 2>/dev/null; ssh-add -l; ssh-add -e $P11M; ssh-add -l" fi fi EXIT @@ -832,14 +832,14 @@ utoken () { token(){ - [ -z "${PKCS11_MODULE+x}" ] && { PKCS11_MODULE=/usr/lib64/p11-kit-proxy.so; export PKCS11_MODULE; } + [ -z "${P11M+x}" ] && { P11M=/usr/lib64/p11-kit-proxy.so; export P11M; } # Usage: # token will load token in agent. does nothing, if token is already loaded # token -r|-f|--reload-token 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 $P11M || { ssh-add -e $P11M; ssh-add -s $P11M; } )" loginfo "$(ssh-add -l)" @@ -847,8 +847,8 @@ token(){ token-extract-pubkey() { - if pkcs11-tool --module $PKCS11_MODULE --list-token-slots >&2 ;then - ssh-keygen -i -m pkcs8 -f <(pkcs11-tool --module $PKCS11_MODULE -r --type pubkey $1 $2 |openssl rsa -pubin -inform DER ) + if pkcs11-tool --module $P11M --list-token-slots >&2 ;then + ssh-keygen -i -m pkcs8 -f <(pkcs11-tool --module $P11M -r --type pubkey $1 $2 |openssl rsa -pubin -inform DER ) if [ $? -gt 0 ] ; then token-list-objects fi @@ -861,10 +861,10 @@ token-extract-pubkey() { token-list-objects() { case $1 in --login|-l) - pkcs11-tool --module $PKCS11_MODULE --login --list-objects + pkcs11-tool --module $P11M --login --list-objects ;; *) - pkcs11-tool --module $PKCS11_MODULE --list-objects + pkcs11-tool --module $P11M --list-objects ;; esac From 07971b9e0b7af70dd6e12f9a923b5b93d69535bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 6 May 2021 01:07:21 +0200 Subject: [PATCH 084/187] remove duplicate line --- bashrc_add | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bashrc_add b/bashrc_add index fd2f7e5..aef1389 100755 --- a/bashrc_add +++ b/bashrc_add @@ -72,7 +72,7 @@ if [[ $- = *i* ]] ; then echo PM: $PM echo P11M: $P11M [ -z "${P11M+x}" ] && [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && P11M=$(whereis p11-kit-proxy.so|awk '{print $2}') - [ -z "${P11M+x}" ] && [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && P11M=$(whereis p11-kit-proxy.so|awk '{print $2}') + #[ -z "${P11M+x}" ] && [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && P11M=$(whereis p11-kit-proxy.so|awk '{print $2}') # Basics [ -z "${VISUAL+x}" ] && export VISUAL=vim From 2b025acbba4b19b57ba8ab12a8f6c45e1e1a3854 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 6 May 2021 01:08:53 +0200 Subject: [PATCH 085/187] change filling variable --- bashrc_add | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/bashrc_add b/bashrc_add index aef1389..f311367 100755 --- a/bashrc_add +++ b/bashrc_add @@ -69,9 +69,7 @@ if [[ $- = *i* ]] ; then # P11M for etoken/smartcard authentification echo P11M: $P11M - echo PM: $PM - echo P11M: $P11M - [ -z "${P11M+x}" ] && [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && P11M=$(whereis p11-kit-proxy.so|awk '{print $2}') + [ -n "${P11M+x}" ] && [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && P11M=$(whereis p11-kit-proxy.so|awk '{print $2}') #[ -z "${P11M+x}" ] && [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && P11M=$(whereis p11-kit-proxy.so|awk '{print $2}') # Basics From 933698320ae551b86775a0329d14f7bac783966c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 6 May 2021 01:10:59 +0200 Subject: [PATCH 086/187] change filling variable --- bashrc_add | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bashrc_add b/bashrc_add index f311367..d48cbb0 100755 --- a/bashrc_add +++ b/bashrc_add @@ -69,7 +69,7 @@ if [[ $- = *i* ]] ; then # P11M for etoken/smartcard authentification echo P11M: $P11M - [ -n "${P11M+x}" ] && [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && P11M=$(whereis p11-kit-proxy.so|awk '{print $2}') + [ -z "${P11M+x}" ] && [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && P11M=$(whereis p11-kit-proxy.so|awk '{print $2}') #[ -z "${P11M+x}" ] && [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && P11M=$(whereis p11-kit-proxy.so|awk '{print $2}') # Basics From 15655b8c984463a8f6c742d37ed0ce6df625b996 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 6 May 2021 01:14:08 +0200 Subject: [PATCH 087/187] add debug --- bashrc_add | 1 + 1 file changed, 1 insertion(+) diff --git a/bashrc_add b/bashrc_add index d48cbb0..f0686ee 100755 --- a/bashrc_add +++ b/bashrc_add @@ -70,6 +70,7 @@ if [[ $- = *i* ]] ; then # P11M for etoken/smartcard authentification echo P11M: $P11M [ -z "${P11M+x}" ] && [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && P11M=$(whereis p11-kit-proxy.so|awk '{print $2}') + echo P11M: $P11M #[ -z "${P11M+x}" ] && [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && P11M=$(whereis p11-kit-proxy.so|awk '{print $2}') # Basics From 6539c2d44ab8955a9088d15f7afdcd7e12a55164 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 6 May 2021 01:15:20 +0200 Subject: [PATCH 088/187] change debug --- bashrc_add | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bashrc_add b/bashrc_add index f0686ee..80f5a79 100755 --- a/bashrc_add +++ b/bashrc_add @@ -68,9 +68,9 @@ if [[ $- = *i* ]] ; then . ${MSC_BASE}/logging # P11M for etoken/smartcard authentification - echo P11M: $P11M + logdebug P11M: $P11M [ -z "${P11M+x}" ] && [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && P11M=$(whereis p11-kit-proxy.so|awk '{print $2}') - echo P11M: $P11M + logdebug P11M: $P11M #[ -z "${P11M+x}" ] && [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && P11M=$(whereis p11-kit-proxy.so|awk '{print $2}') # Basics From c08f07a0b1bbe1b6ceb9604d981d8008a86c9f26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 6 May 2021 01:29:13 +0200 Subject: [PATCH 089/187] add variable to tmux environment --- tmux/tmux.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmux/tmux.conf b/tmux/tmux.conf index fb1374f..69c914a 100644 --- a/tmux/tmux.conf +++ b/tmux/tmux.conf @@ -177,7 +177,7 @@ source-file "${HOME}/.tmux/plugins/tmux-themepack/powerline/block/green.tmuxthem # source local tmux.config source-file -q "${HOME}/.local/share/tmux/tmux.conf" -set -g update-environment "SSH_ASKPASS WINDOWID SSH_CONNECTION XAUTHORITY SSH_TTY SSH_AUTH_SOCK DISPLAY" +set -g update-environment "SSH_ASKPASS WINDOWID SSH_CONNECTION XAUTHORITY SSH_TTY SSH_AUTH_SOCK DISPLAY P11M" #set-environment -g 'SSH_AUTH_SOCK' ~/.ssh/ssh_auth_sock From cf13a8c8cb7061376a8f698989f3d325e881582f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 6 May 2021 01:36:15 +0200 Subject: [PATCH 090/187] update submodules --- vim/pack/plugins/start/fzf | 2 +- vim/pack/plugins/start/fzf.vim | 2 +- vim/pack/plugins/start/vim-airline | 2 +- vim/pack/plugins/start/vim-fugitive | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vim/pack/plugins/start/fzf b/vim/pack/plugins/start/fzf index 6e3a2fe..4cd621e 160000 --- a/vim/pack/plugins/start/fzf +++ b/vim/pack/plugins/start/fzf @@ -1 +1 @@ -Subproject commit 6e3a2fe0bf5d53434b41e868c501d9f63c6328aa +Subproject commit 4cd621e877cb3a8e44b12ba3a7ce58709862922f diff --git a/vim/pack/plugins/start/fzf.vim b/vim/pack/plugins/start/fzf.vim index ee91c93..75c7e87 160000 --- a/vim/pack/plugins/start/fzf.vim +++ b/vim/pack/plugins/start/fzf.vim @@ -1 +1 @@ -Subproject commit ee91c93d4cbc6f29cf82877ca39f3ce23d5c5b7b +Subproject commit 75c7e87de1ed7ff41183d479b1a23023070bfe54 diff --git a/vim/pack/plugins/start/vim-airline b/vim/pack/plugins/start/vim-airline index 30f8ada..f7cbf8c 160000 --- a/vim/pack/plugins/start/vim-airline +++ b/vim/pack/plugins/start/vim-airline @@ -1 +1 @@ -Subproject commit 30f8ada1d6021d89228092b3c51840916c75a542 +Subproject commit f7cbf8c42959689461e6dfcc92b4e453cb4ae17c diff --git a/vim/pack/plugins/start/vim-fugitive b/vim/pack/plugins/start/vim-fugitive index 8f4a23e..32b0d62 160000 --- a/vim/pack/plugins/start/vim-fugitive +++ b/vim/pack/plugins/start/vim-fugitive @@ -1 +1 @@ -Subproject commit 8f4a23e6639ff67c0efd7242870d4beed47b5d37 +Subproject commit 32b0d6266361614a6a07cfe850750e900cd50575 From f5a74e3f03e376699bdc32bdec4d505e01f18642 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 6 May 2021 01:37:28 +0200 Subject: [PATCH 091/187] change merge-strategy --- .gitconfig | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitconfig b/.gitconfig index 866b979..b3881f9 100755 --- a/.gitconfig +++ b/.gitconfig @@ -48,5 +48,3 @@ path = ~/.gitconfig_local [status] submodulesummary = 1 -[pull] - rebase = true From 4cb7f2058b9224c0a67c2e07ea90efc2a34df835 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 6 May 2021 01:39:52 +0200 Subject: [PATCH 092/187] export P11M --- bashrc_add | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bashrc_add b/bashrc_add index 80f5a79..863e1eb 100755 --- a/bashrc_add +++ b/bashrc_add @@ -70,8 +70,8 @@ if [[ $- = *i* ]] ; then # P11M for etoken/smartcard authentification logdebug P11M: $P11M [ -z "${P11M+x}" ] && [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && P11M=$(whereis p11-kit-proxy.so|awk '{print $2}') + export P11M logdebug P11M: $P11M - #[ -z "${P11M+x}" ] && [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && P11M=$(whereis p11-kit-proxy.so|awk '{print $2}') # Basics [ -z "${VISUAL+x}" ] && export VISUAL=vim From 2303caec48f62ee12a9f23cd8a261e4e6cfa9bac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 6 May 2021 01:43:12 +0200 Subject: [PATCH 093/187] remove debug --- bashrc_add | 2 -- 1 file changed, 2 deletions(-) diff --git a/bashrc_add b/bashrc_add index 863e1eb..309200d 100755 --- a/bashrc_add +++ b/bashrc_add @@ -68,10 +68,8 @@ if [[ $- = *i* ]] ; then . ${MSC_BASE}/logging # P11M for etoken/smartcard authentification - logdebug P11M: $P11M [ -z "${P11M+x}" ] && [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && P11M=$(whereis p11-kit-proxy.so|awk '{print $2}') export P11M - logdebug P11M: $P11M # Basics [ -z "${VISUAL+x}" ] && export VISUAL=vim From 3c67a1f7ba76ac0bdf010c1ee55dae92b26e2954 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Tue, 11 May 2021 11:51:37 +0200 Subject: [PATCH 094/187] check if token == P11M and add debug --- bin/startagent | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/startagent b/bin/startagent index 696b345..beb6d59 100755 --- a/bin/startagent +++ b/bin/startagent @@ -283,6 +283,8 @@ agent-load-identity-keys () { for key in $(ls ${SSH_IDENTITIES_DIR}/${ssh_identity}/*|grep "\.so$"); do + logdebug "P11M: $P11M - key: $key" + [ "$(readlink - f $key)" == "$P11M" ] || key="$P11M" tokenfingerprint="$(ssh-keygen -l -D $key|tr -s ' '|awk '{print $2}')" if [[ ${fingerprints[*]} =~ "$tokenfingerprint" ]]; then logdebug "token: $key ($tokenfingerprint) is loaded" From cf31d57179958bde11c65449a7fdb34d449b8af4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Tue, 11 May 2021 11:59:30 +0200 Subject: [PATCH 095/187] test if token is loaded --- bin/startagent | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/startagent b/bin/startagent index beb6d59..277f043 100755 --- a/bin/startagent +++ b/bin/startagent @@ -285,6 +285,8 @@ agent-load-identity-keys () { for key in $(ls ${SSH_IDENTITIES_DIR}/${ssh_identity}/*|grep "\.so$"); do logdebug "P11M: $P11M - key: $key" [ "$(readlink - f $key)" == "$P11M" ] || key="$P11M" + logdebug "P11M: $P11M - key: $key" + logdebug "$(ssh-add -T $key)" tokenfingerprint="$(ssh-keygen -l -D $key|tr -s ' '|awk '{print $2}')" if [[ ${fingerprints[*]} =~ "$tokenfingerprint" ]]; then logdebug "token: $key ($tokenfingerprint) is loaded" From 9e9ddaee7eaff9d28ec0ed336e5e0daf273c1a17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Tue, 11 May 2021 12:10:52 +0200 Subject: [PATCH 096/187] change check for token proxy --- bin/startagent | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/bin/startagent b/bin/startagent index 277f043..538de0e 100755 --- a/bin/startagent +++ b/bin/startagent @@ -272,13 +272,13 @@ agent-load-identity-keys () { # load tokens for pubkey in $(ls ${SSH_IDENTITIES_DIR}/${ssh_identity}/id_*|grep "pub$\|public$"|grep -v "cert.pub"); do if $( ls ${pubkey%.pub} 1>/dev/null 2>&1);then - echo "pk1 $pubkey" + echo "pubkey with privkey: $pubkey" else - echo "pk2 $pubkey" + echo "pubkey without privkey: $pubkey" pubkeysonly+=($pubkey) fi done - loginfo "pubkeysonly: ${pubkeysonly[@]} ${#pubkeysonly[*]}" + loginfo "pubkeysonly: ${pubkeysonly[@]} (count: ${#pubkeysonly[*]})" @@ -286,10 +286,11 @@ agent-load-identity-keys () { logdebug "P11M: $P11M - key: $key" [ "$(readlink - f $key)" == "$P11M" ] || key="$P11M" logdebug "P11M: $P11M - key: $key" - logdebug "$(ssh-add -T $key)" - tokenfingerprint="$(ssh-keygen -l -D $key|tr -s ' '|awk '{print $2}')" - if [[ ${fingerprints[*]} =~ "$tokenfingerprint" ]]; then - logdebug "token: $key ($tokenfingerprint) is loaded" + + #tokenfingerprint="$(ssh-keygen -l -D $key|tr -s ' '|awk '{print $2}')" + +# if [[ ${fingerprints[*]} =~ "$tokenfingerprint" ]]; then +# logdebug "token: $key ($tokenfingerprint) is loaded" check-pubkeysonly if $readd || $remove ; then $readd && logdebug "re-add token $key" @@ -297,11 +298,11 @@ agent-load-identity-keys () { logdebug "$(ssh-runinagent $agentfile ssh-add ${SSH_ADD_OPTIONS} -e ${key} 2>&1)" $remove || logdebug "$(ssh-runinagent $agentfile ssh-add ${SSH_ADD_OPTIONS} -s ${key} 2>&1)" fi - else - logdebug "token: $key is not loaded -> load it" - logdebug "$(ssh-runinagent $agentfile ssh-add ${SSH_ADD_OPTIONS} -e ${key} 2>&1)" - $remove || logdebug "$(ssh-runinagent $agentfile ssh-add ${SSH_ADD_OPTIONS} -s ${key} 2>&1)" - fi +# else +# logdebug "token: $key is not loaded -> load it" +# logdebug "$(ssh-runinagent $agentfile ssh-add ${SSH_ADD_OPTIONS} -e ${key} 2>&1)" +# $remove || logdebug "$(ssh-runinagent $agentfile ssh-add ${SSH_ADD_OPTIONS} -s ${key} 2>&1)" +# fi done fi loginfo "currently loaded keys after action: $(ssh-runinagent $agentfile ssh-add -l|wc -l)" From 3a0aec576a6eb0b555e10add4c7e72f9c321578e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Tue, 11 May 2021 12:26:59 +0200 Subject: [PATCH 097/187] remove empty lines --- functions.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/functions.sh b/functions.sh index c644bb5..3695fc3 100755 --- a/functions.sh +++ b/functions.sh @@ -842,7 +842,6 @@ token(){ loginfo "$(ssh-add -s $P11M || { ssh-add -e $P11M; ssh-add -s $P11M; } )" loginfo "$(ssh-add -l)" - } From b41477288c0d056738b2f887cce9132581d51a93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 12 May 2021 09:08:37 +0200 Subject: [PATCH 098/187] reset startagent --- bin/startagent | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/bin/startagent b/bin/startagent index 538de0e..a7eab8b 100755 --- a/bin/startagent +++ b/bin/startagent @@ -287,22 +287,22 @@ agent-load-identity-keys () { [ "$(readlink - f $key)" == "$P11M" ] || key="$P11M" logdebug "P11M: $P11M - key: $key" - #tokenfingerprint="$(ssh-keygen -l -D $key|tr -s ' '|awk '{print $2}')" + tokenfingerprint="$(ssh-keygen -l -D $key|tr -s ' '|awk '{print $2}')" -# if [[ ${fingerprints[*]} =~ "$tokenfingerprint" ]]; then -# logdebug "token: $key ($tokenfingerprint) is loaded" + if [[ ${fingerprints[*]} =~ "$tokenfingerprint" ]]; then + logdebug "token: $key ($tokenfingerprint) is loaded" check-pubkeysonly if $readd || $remove ; then $readd && logdebug "re-add token $key" $remove && logdebug "remove token $key" - logdebug "$(ssh-runinagent $agentfile ssh-add ${SSH_ADD_OPTIONS} -e ${key} 2>&1)" - $remove || logdebug "$(ssh-runinagent $agentfile ssh-add ${SSH_ADD_OPTIONS} -s ${key} 2>&1)" + logdebug "$(ssh-runinagent $agentfile ssh-add ${SSH_ADD_OPTIONS} -e "${key}" 2>&1)" + $remove || logdebug "$(ssh-runinagent $agentfile ssh-add ${SSH_ADD_OPTIONS} -s "${key}" 2>&1)" fi -# else -# logdebug "token: $key is not loaded -> load it" -# logdebug "$(ssh-runinagent $agentfile ssh-add ${SSH_ADD_OPTIONS} -e ${key} 2>&1)" -# $remove || logdebug "$(ssh-runinagent $agentfile ssh-add ${SSH_ADD_OPTIONS} -s ${key} 2>&1)" -# fi + else + logdebug "token: $key is not loaded -> load it" + logdebug "$(ssh-runinagent $agentfile ssh-add ${SSH_ADD_OPTIONS} -e ${key} 2>&1)" + $remove || logdebug "$(ssh-runinagent $agentfile ssh-add ${SSH_ADD_OPTIONS} -s ${key} 2>&1)" + fi done fi loginfo "currently loaded keys after action: $(ssh-runinagent $agentfile ssh-add -l|wc -l)" From b85250cd1188669229387fc700bc6d2d431ed40f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 19 May 2021 23:31:28 +0200 Subject: [PATCH 099/187] add certificate validity check in startagent --- bin/startagent | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/startagent b/bin/startagent index a7eab8b..f23b83f 100755 --- a/bin/startagent +++ b/bin/startagent @@ -277,6 +277,9 @@ agent-load-identity-keys () { echo "pubkey without privkey: $pubkey" pubkeysonly+=($pubkey) fi + [ -e "${pubkey%.pub}-cert.pub" ] && \ + [ $(date +%s -d $(ssh-keygen -L -f "${pubkey%.pub}-cert.pub"|awk '$1 == "Valid:"{print $5}')) -le $(date +%s -d NOW) ] \ + || logwarn "CERTIFICATE IS NOT VALID ANYMORE: ${pubkey%.pub}-cert.pub" done loginfo "pubkeysonly: ${pubkeysonly[@]} (count: ${#pubkeysonly[*]})" From 125976716b619e8fab6a7d126982b1a9189a9019 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 20 May 2021 00:04:54 +0200 Subject: [PATCH 100/187] fix logic for timestamp --- bin/startagent | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bin/startagent b/bin/startagent index f23b83f..5f3d9e4 100755 --- a/bin/startagent +++ b/bin/startagent @@ -277,9 +277,12 @@ agent-load-identity-keys () { echo "pubkey without privkey: $pubkey" pubkeysonly+=($pubkey) fi - [ -e "${pubkey%.pub}-cert.pub" ] && \ - [ $(date +%s -d $(ssh-keygen -L -f "${pubkey%.pub}-cert.pub"|awk '$1 == "Valid:"{print $5}')) -le $(date +%s -d NOW) ] \ + if [ -e "${pubkey%.pub}-cert.pub" ]; then + #logwarn "${pubkey%.pub}-cert.pub: $(date +%s -d $(ssh-keygen -L -f "${pubkey%.pub}-cert.pub"|awk '$1 == "Valid:"{print $5}'))" + #logwarn "now: $(date +%s -d NOW)" + [ $(date +%s -d $(ssh-keygen -L -f "${pubkey%.pub}-cert.pub"|awk '$1 == "Valid:"{print $5}')) -gt $(date +%s -d NOW) ] \ || logwarn "CERTIFICATE IS NOT VALID ANYMORE: ${pubkey%.pub}-cert.pub" + fi done loginfo "pubkeysonly: ${pubkeysonly[@]} (count: ${#pubkeysonly[*]})" From 7ca1143c4b9693154757da7a39ca646305fcbd3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 23 Jun 2021 15:03:36 +0200 Subject: [PATCH 101/187] change minor changes --- bin/startagent | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/bin/startagent b/bin/startagent index 5f3d9e4..dc670a6 100755 --- a/bin/startagent +++ b/bin/startagent @@ -117,16 +117,16 @@ while :; do done SCRIPTENTRY -[ -z "${SSH_IDENTITIES_DIR+x}" ] && { SSH_IDENTITIES_DIR="${SSH_IDENTITIES_DEFAULT_DIR-${HOME}/.ssh/identities}"; export SSH_IDENTITIES_DIR; } -[ -z "${SSH_AGENTS_DIR+x}" ] && { SSH_AGENTS_DIR=${SSH_AGENTS_DEFAULT_DIR-~/.ssh/agents}; export SSH_AGENTS_DIR; } +[ -z "${SSH_IDENTITIES_DIR+x}" ] && { SSH_IDENTITIES_DIR="${SSH_IDENTITIES_DEFAULT_DIR-${HOME}/.ssh/identities}"; export SSH_IDENTITIES_DIR; } +[ -z "${SSH_AGENTS_DIR+x}" ] && { SSH_AGENTS_DIR=${SSH_AGENTS_DEFAULT_DIR-~/.ssh/agents}; export SSH_AGENTS_DIR; } [ -z "${SSH_AGENT_SOCKETS_DIR+x}" ] && { SSH_AGENT_SOCKETS_DIR=${SSH_AGENT_SOCKETS_DEFAULT_DIR-~/.ssh/agents}; export SSH_AGENT_SOCKETS_DIR; } -[ -z "${SSH_AGENT_OPTIONS+x}" ] && { SSH_AGENT_OPTIONS=${SSH_AGENT_DEFAULT_OPTIONS--t 7200 }; export SSH_AGENT_OPTIONS; } -logtrace "SSH_AGENTS_DIR: $SSH_AGENTS_DIR" +[ -z "${SSH_AGENT_OPTIONS+x}" ] && { SSH_AGENT_OPTIONS=${SSH_AGENT_DEFAULT_OPTIONS--t 7200 }; export SSH_AGENT_OPTIONS; } +logtrace " SSH_AGENTS_DIR: $SSH_AGENTS_DIR" logtrace "SSH_AGENT_SOCKETS_DIR: $SSH_AGENT_SOCKETS_DIR" -logtrace "SSH_IDENTITIES_DIR: $SSH_IDENTITIES_DIR" -[ -z "${SSH_AGENTS_DIR-x}" ] || mkdir -vp "$SSH_AGENTS_DIR" -[ -z "${SSH_AGENT_SOCKETS_DIR-x}" ] || mkdir -vp "$SSH_AGENT_SOCKETS_DIR" -[ -z "${SSH_IDENTITIES_DIR-x}" ] || mkdir -vp "$SSH_IDENTITIES_DIR" +logtrace " SSH_IDENTITIES_DIR: $SSH_IDENTITIES_DIR" +[ -z "${SSH_AGENTS_DIR-x}" ] || mkdir -vp "$SSH_AGENTS_DIR" +[ -z "${SSH_AGENT_SOCKETS_DIR-x}" ] || mkdir -vp "$SSH_AGENT_SOCKETS_DIR" +[ -z "${SSH_IDENTITIES_DIR-x}" ] || mkdir -vp "$SSH_IDENTITIES_DIR" agent-start-or-restart () { @@ -287,11 +287,12 @@ agent-load-identity-keys () { loginfo "pubkeysonly: ${pubkeysonly[@]} (count: ${#pubkeysonly[*]})" - for key in $(ls ${SSH_IDENTITIES_DIR}/${ssh_identity}/*|grep "\.so$"); do - logdebug "P11M: $P11M - key: $key" + logdebug "P11M: ${P11M:-not set} - key: $key" + #[ -e "${P11M-x}" ] || [ "$(readlink - f $key)" == "$P11M" ] || key="$P11M" [ "$(readlink - f $key)" == "$P11M" ] || key="$P11M" - logdebug "P11M: $P11M - key: $key" + logdebug "P11M: ${P11M:-not set} - key: $key" + echo "P11M: ${P11M:-not set} - key: $key" tokenfingerprint="$(ssh-keygen -l -D $key|tr -s ' '|awk '{print $2}')" @@ -301,12 +302,14 @@ agent-load-identity-keys () { if $readd || $remove ; then $readd && logdebug "re-add token $key" $remove && logdebug "remove token $key" + echo agentfile1 $agentfile \$SSH_ADD_OPTIONS $key >&2 logdebug "$(ssh-runinagent $agentfile ssh-add ${SSH_ADD_OPTIONS} -e "${key}" 2>&1)" + ssh-runinagent $agentfile echo $SSH_AUTH_SOCK >&2 $remove || logdebug "$(ssh-runinagent $agentfile ssh-add ${SSH_ADD_OPTIONS} -s "${key}" 2>&1)" fi else logdebug "token: $key is not loaded -> load it" - logdebug "$(ssh-runinagent $agentfile ssh-add ${SSH_ADD_OPTIONS} -e ${key} 2>&1)" + logdebug "$(ssh-runinagent $agentfile ssh-add -v ${SSH_ADD_OPTIONS} -e ${key} 2>&1)" $remove || logdebug "$(ssh-runinagent $agentfile ssh-add ${SSH_ADD_OPTIONS} -s ${key} 2>&1)" fi done From 2b97122a66003bd725f96ac72dc6cbb785b1a65d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 7 Jul 2021 15:45:29 +0200 Subject: [PATCH 102/187] fix token ask for PIN, if available --- functions.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/functions.sh b/functions.sh index 3695fc3..2fb19b8 100755 --- a/functions.sh +++ b/functions.sh @@ -834,12 +834,14 @@ token(){ [ -z "${P11M+x}" ] && { P11M=/usr/lib64/p11-kit-proxy.so; export P11M; } + tmppubkey="${XDG_RUNTIME_DIR}/token.pub" + loginfo "$(ssh-keygen -D $P11M >$tmppubkey)" # Usage: # token will load token in agent. does nothing, if token is already loaded # token -r|-f|--reload-token will remove token from agent and add it again (if plugged off and plugged in again # startagent -t $@ # loadagent $@ - loginfo "$(ssh-add -s $P11M || { ssh-add -e $P11M; ssh-add -s $P11M; } )" + loginfo "$(ssh-add -T ${tmppubkey} || { ssh-add -e $P11M; ssh-add -s $P11M; } )" loginfo "$(ssh-add -l)" } From f6628e7dde1b6feaad85b587a9c2434103c5ce66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 7 Jul 2021 16:25:44 +0200 Subject: [PATCH 103/187] find and set P11M and PKCS11_MODULE local and remote --- bashrc_add | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bashrc_add b/bashrc_add index 309200d..db326f7 100755 --- a/bashrc_add +++ b/bashrc_add @@ -68,8 +68,12 @@ if [[ $- = *i* ]] ; then . ${MSC_BASE}/logging # P11M for etoken/smartcard authentification - [ -z "${P11M+x}" ] && [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && P11M=$(whereis p11-kit-proxy.so|awk '{print $2}') - export P11M + +# which dnf >/dev/null 2>&1 [ -z "${P11M+x}" ] && P11M="$(dnf repoquery --installed -l p11-kit | grep \/p11-kit-proxy.so\$ | head -1)" +# which dpkg >/dev/null 2>&1 && [ -z "${P11M+x}" ] && P11M="$(dpkg -L p11-kit-modules|grep \/p11-kit-proxy.so\$ | head -1)" + + [ -z "${PKCS11_MODULE+x}" ] && [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && export PKCS11_MODULE=$(whereis p11-kit-proxy.so|awk '{print $2}' || { echo "p11-kit-proxy not installed, unset KCS11_MODULE"; unset PKCS11_MODULE; }) + [ -z "${P11M+x}" ] && [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && export P11M=$(whereis p11-kit-proxy.so|awk '{print $2}' || { echo "p11-kit-proxy not forwarded by ssh or installed, unset P11M"; unset P11M; }) # Basics [ -z "${VISUAL+x}" ] && export VISUAL=vim From 4234d1d6b521ea9d1a9c48e9baf4fab4b60ef99a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 7 Jul 2021 16:26:58 +0200 Subject: [PATCH 104/187] set variable --- bin/ssh-init-pkcs11 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/ssh-init-pkcs11 b/bin/ssh-init-pkcs11 index 605d939..e5b88cb 100755 --- a/bin/ssh-init-pkcs11 +++ b/bin/ssh-init-pkcs11 @@ -2,7 +2,9 @@ set -eu set -x -[ -z "${P11M+x}" ] && P11M="$(dnf repoquery --installed -l p11-kit | grep \/p11-kit-proxy.so\$ | head -1)" +which dnf >/dev/null 2>&1 [ -z "${P11M+x}" ] && P11M="$(dnf repoquery --installed -l p11-kit | grep \/p11-kit-proxy.so\$ | head -1)" +which dpkg >/dev/null 2>&1 && [ -z "${P11M+x}" ] && P11M="$(dpkg -L p11-kit-modules|grep \/p11-kit-proxy.so\$ | head -1)" + echo SSH_AGENT_PID before: $SSH_AGENT_PID From 540e75f56f49464233b579a50447a860f3d53e6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 7 Jul 2021 16:36:50 +0200 Subject: [PATCH 105/187] fix ask for empty variable --- bashrc_add | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bashrc_add b/bashrc_add index db326f7..97ca255 100755 --- a/bashrc_add +++ b/bashrc_add @@ -72,8 +72,8 @@ if [[ $- = *i* ]] ; then # which dnf >/dev/null 2>&1 [ -z "${P11M+x}" ] && P11M="$(dnf repoquery --installed -l p11-kit | grep \/p11-kit-proxy.so\$ | head -1)" # which dpkg >/dev/null 2>&1 && [ -z "${P11M+x}" ] && P11M="$(dpkg -L p11-kit-modules|grep \/p11-kit-proxy.so\$ | head -1)" - [ -z "${PKCS11_MODULE+x}" ] && [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && export PKCS11_MODULE=$(whereis p11-kit-proxy.so|awk '{print $2}' || { echo "p11-kit-proxy not installed, unset KCS11_MODULE"; unset PKCS11_MODULE; }) - [ -z "${P11M+x}" ] && [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && export P11M=$(whereis p11-kit-proxy.so|awk '{print $2}' || { echo "p11-kit-proxy not forwarded by ssh or installed, unset P11M"; unset P11M; }) + [ -z "${PKCS11_MODULE:+x}" ] && [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && export PKCS11_MODULE=$(whereis p11-kit-proxy.so|awk '{print $2}' || { echo "p11-kit-proxy not installed, unset KCS11_MODULE"; unset PKCS11_MODULE; }) + [ -z "${P11M:+x}" ] && [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && export P11M=$(whereis p11-kit-proxy.so|awk '{print $2}' || { echo "p11-kit-proxy not forwarded by ssh or installed, unset P11M"; unset P11M; }) # Basics [ -z "${VISUAL+x}" ] && export VISUAL=vim From c0b72390c18b40e4db19e231ad16dde28541fc5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 7 Jul 2021 16:38:20 +0200 Subject: [PATCH 106/187] fix P11M -> PKCS11_MODULE for function token --- functions.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/functions.sh b/functions.sh index 2fb19b8..417f2dd 100755 --- a/functions.sh +++ b/functions.sh @@ -817,7 +817,8 @@ utoken () { ENTRY ssh_identity=$1 - [ -z "${P11M+x}" ] && { P11M=/usr/lib64/p11-kit-proxy.so; export P11M; } + #[ -z "${P11M+x}" ] && { P11M=/usr/lib64/p11-kit-proxy.so; export P11M; } + [ -z "${P11M+x}" ] && { P11M=$PKCS11_MODULE; export P11M; } if [ -n "${ssh_identity+x}" ]; then agentfile="${HOME}/.ssh/agents/agent-${ssh_identity}-$(hostname)" @@ -832,10 +833,11 @@ utoken () { token(){ - [ -z "${P11M+x}" ] && { P11M=/usr/lib64/p11-kit-proxy.so; export P11M; } + #[ -z "${P11M+x}" ] && { P11M=/usr/lib64/p11-kit-proxy.so; export P11M; } + [ -z "${P11M+x}" ] && { P11M=$PKCS11_MODULE; export P11M; } tmppubkey="${XDG_RUNTIME_DIR}/token.pub" - loginfo "$(ssh-keygen -D $P11M >$tmppubkey)" + loginfo "$(ssh-keygen -D $PKCS11_MODULE >$tmppubkey)" # Usage: # token will load token in agent. does nothing, if token is already loaded # token -r|-f|--reload-token will remove token from agent and add it again (if plugged off and plugged in again From 4ad1733bf97860fcd6d512c727cc0ffc7293e47d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 7 Jul 2021 17:03:12 +0200 Subject: [PATCH 107/187] fix test empty variable --- functions.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/functions.sh b/functions.sh index 417f2dd..775e66b 100755 --- a/functions.sh +++ b/functions.sh @@ -834,10 +834,11 @@ utoken () { token(){ #[ -z "${P11M+x}" ] && { P11M=/usr/lib64/p11-kit-proxy.so; export P11M; } - [ -z "${P11M+x}" ] && { P11M=$PKCS11_MODULE; export P11M; } + [ -z "${P11M:+x}" ] && { P11M=$PKCS11_MODULE; export P11M; } tmppubkey="${XDG_RUNTIME_DIR}/token.pub" - loginfo "$(ssh-keygen -D $PKCS11_MODULE >$tmppubkey)" + loginfo "$(ssh-add -L > $tmppubkey)" + # Usage: # token will load token in agent. does nothing, if token is already loaded # token -r|-f|--reload-token will remove token from agent and add it again (if plugged off and plugged in again From dd858058c5f09aa6a34e96d6b27b1921d8a87258 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 8 Jul 2021 10:33:59 +0200 Subject: [PATCH 108/187] add expiry-warning X days before expiry. configuration via default-file --- bin/startagent | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bin/startagent b/bin/startagent index dc670a6..4c818df 100755 --- a/bin/startagent +++ b/bin/startagent @@ -280,8 +280,13 @@ agent-load-identity-keys () { if [ -e "${pubkey%.pub}-cert.pub" ]; then #logwarn "${pubkey%.pub}-cert.pub: $(date +%s -d $(ssh-keygen -L -f "${pubkey%.pub}-cert.pub"|awk '$1 == "Valid:"{print $5}'))" #logwarn "now: $(date +%s -d NOW)" - [ $(date +%s -d $(ssh-keygen -L -f "${pubkey%.pub}-cert.pub"|awk '$1 == "Valid:"{print $5}')) -gt $(date +%s -d NOW) ] \ + cert_exp_date=$(ssh-keygen -L -f "${pubkey%.pub}-cert.pub"|awk '$1 == "Valid:"{print $5}') + #[ $(date +%s -d $(ssh-keygen -L -f "${pubkey%.pub}-cert.pub"|awk '$1 == "Valid:"{print $5}')) -gt $(date +%s -d NOW) ] \ + [ $(date +%s -d $cert_exp_date) -gt $(date +%s -d NOW) ] \ || logwarn "CERTIFICATE IS NOT VALID ANYMORE: ${pubkey%.pub}-cert.pub" + #[ $(date +%s -d $(ssh-keygen -L -f "${pubkey%.pub}-cert.pub"|awk '$1 == "Valid:"{print $5}')) -lt $(date +%s -d "$SSH_CERT_VALIDITY_WARN_SEC") ] \ + [ $(date +%s -d $cert_exp_date) -lt $(date +%s -d "$SSH_CERT_VALIDITY_WARN_SEC") ] \ + && logwarn "CERTIFICATE expires in $(echo "scale=0; ( `date -d $cert_exp_date +%s` - `date -d now +%s`) / (24*3600)" | bc -l) days: ${pubkey%.pub}-cert.pub" fi done loginfo "pubkeysonly: ${pubkeysonly[@]} (count: ${#pubkeysonly[*]})" From 133f8bbdd681fa95772f2f7b9994217cf0e66fbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Fri, 9 Jul 2021 10:45:12 +0200 Subject: [PATCH 109/187] add SSH_CERT_WARN_SEC to defaults --- defaults.conf | 2 ++ defaults.conf.sample | 2 ++ 2 files changed, 4 insertions(+) diff --git a/defaults.conf b/defaults.conf index 86b29b5..51af897 100644 --- a/defaults.conf +++ b/defaults.conf @@ -22,3 +22,5 @@ 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 + +export SSH_CERT_VALIDITY_WARN_SEC="14 days" diff --git a/defaults.conf.sample b/defaults.conf.sample index 16ef84d..dfdc060 100644 --- a/defaults.conf.sample +++ b/defaults.conf.sample @@ -22,3 +22,5 @@ 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 + +export SSH_CERT_VALIDITY_WARN_SEC="14 days" From 18bd1a019aa86a407f7e665e17d0676b2f6ab9a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Sat, 10 Jul 2021 03:10:10 +0200 Subject: [PATCH 110/187] add UMASK=002 for creating new files --- bin/exif-fixdatetime | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bin/exif-fixdatetime b/bin/exif-fixdatetime index 1824fe8..b5927ce 100755 --- a/bin/exif-fixdatetime +++ b/bin/exif-fixdatetime @@ -236,6 +236,7 @@ run_fix () { case $move in true) + export UMASK=002 echo move to ${dest}/${MIMEDEST}/%Y/%Y_%m if $movecreatedate ; then loginfo "$(exiftool '-Directory&1 |tee -a ${LOGFILE})" @@ -244,6 +245,7 @@ run_fix () { fi ;; copy) + export UMASK=002 echo copy to ${dest}/${MIMEDEST}/%Y/%Y_%m if $movecreatedate ; then loginfo "$(exiftool -o . '-Directory&1 |tee -a ${LOGFILE})" @@ -262,6 +264,7 @@ run_fix () { fi ;; rename) + export UMASK=002 echo move to ${dest}/${MIMEDEST}/%Y/%Y_%m if $movecreatedate ; then loginfo "$(exiftool -v '-FileName&1 | tee -a ${LOGFILE})" @@ -270,6 +273,7 @@ run_fix () { fi ;; copyrename) + export UMASK=002 echo move to ${dest}/${MIMEDEST}/%Y/%Y_%m if $movecreatedate ; then loginfo "$(exiftool -o . '-FileName&1 | tee -a ${LOGFILE})" From 0b6f6f2a2e749d9f23dae3e033621d47de8b4479 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Mon, 12 Jul 2021 05:03:30 +0200 Subject: [PATCH 111/187] move variabledefinition --- bin/exif-fixdatetime | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/exif-fixdatetime b/bin/exif-fixdatetime index b5927ce..c5a664c 100755 --- a/bin/exif-fixdatetime +++ b/bin/exif-fixdatetime @@ -2,8 +2,6 @@ [ type loginfo > /dev/null 2>&1 ] || . $(dirname $0)/../logging -export SCRIPT_LOG=./$(basename $0).log -export LOGFILE=./$(basename $0).move.log [ -z "${move+x}" ] && move=false [ -z "${forcedate+x}" ] && forcedate=false [ -z "${setdate+x}" ] && setdate=true @@ -331,6 +329,8 @@ else all=$(find ${maxdepth:+-maxdepth} ${maxdepth:+$maxdepth} -type f |grep -i ".jpg$\|.jpeg$\|.mp4$\|.mov$\|.png$\|.3gp$\|.gif$"|wc -l) find ${maxdepth:+-maxdepth} ${maxdepth:+$maxdepth} -type f |grep -i ".jpg$\|.jpeg$\|.mp4$\|.mov$\|.png$\|.3gp$\|.gif$"|while read file; do let "i=i+1" + export SCRIPT_LOG=./$(basename $0).log + export LOGFILE=./$(basename $0).move.log loginfo "$i/$all" run_fix "$file" done From e3d5b777f382c93486b674f4f80328595a335bc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Tue, 13 Jul 2021 09:27:20 +0200 Subject: [PATCH 112/187] add alias umountshared --- aliases | 1 + vim/pack/plugins/start/fzf | 2 +- vim/pack/plugins/start/fzf.vim | 2 +- vim/pack/plugins/start/vim-airline | 2 +- vim/pack/plugins/start/vim-fugitive | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/aliases b/aliases index afb345a..9f26d1d 100644 --- a/aliases +++ b/aliases @@ -14,6 +14,7 @@ alias cdlastfiledir='cd $(history -p \!\!:$:h)' alias s='sshs $(history -p \!ssh:$:t)' alias sexit='ssh -O exit $(history -p \!ssh:$:t)' alias remountshared='sudo systemctl restart media-remote-sharefs-userdata.mount' +alias umountshared='sudo systemctl stop media-remote-sharefs-userdata.mount' diff --git a/vim/pack/plugins/start/fzf b/vim/pack/plugins/start/fzf index 4cd621e..6e3a2fe 160000 --- a/vim/pack/plugins/start/fzf +++ b/vim/pack/plugins/start/fzf @@ -1 +1 @@ -Subproject commit 4cd621e877cb3a8e44b12ba3a7ce58709862922f +Subproject commit 6e3a2fe0bf5d53434b41e868c501d9f63c6328aa diff --git a/vim/pack/plugins/start/fzf.vim b/vim/pack/plugins/start/fzf.vim index 75c7e87..ee91c93 160000 --- a/vim/pack/plugins/start/fzf.vim +++ b/vim/pack/plugins/start/fzf.vim @@ -1 +1 @@ -Subproject commit 75c7e87de1ed7ff41183d479b1a23023070bfe54 +Subproject commit ee91c93d4cbc6f29cf82877ca39f3ce23d5c5b7b diff --git a/vim/pack/plugins/start/vim-airline b/vim/pack/plugins/start/vim-airline index f7cbf8c..30f8ada 160000 --- a/vim/pack/plugins/start/vim-airline +++ b/vim/pack/plugins/start/vim-airline @@ -1 +1 @@ -Subproject commit f7cbf8c42959689461e6dfcc92b4e453cb4ae17c +Subproject commit 30f8ada1d6021d89228092b3c51840916c75a542 diff --git a/vim/pack/plugins/start/vim-fugitive b/vim/pack/plugins/start/vim-fugitive index 32b0d62..8f4a23e 160000 --- a/vim/pack/plugins/start/vim-fugitive +++ b/vim/pack/plugins/start/vim-fugitive @@ -1 +1 @@ -Subproject commit 32b0d6266361614a6a07cfe850750e900cd50575 +Subproject commit 8f4a23e6639ff67c0efd7242870d4beed47b5d37 From cd0c0b27ddaf865d5e1bdb7d28722df8d0afc5c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Mon, 9 Aug 2021 12:45:52 +0200 Subject: [PATCH 113/187] update submodules --- tmux/plugins/tmux-sensible | 2 +- tmux/plugins/tpm | 2 +- vim/pack/plugins/start/fzf | 2 +- vim/pack/plugins/start/fzf.vim | 2 +- vim/pack/plugins/start/nerdtree | 2 +- vim/pack/plugins/start/nerdtree-git-plugin | 2 +- vim/pack/plugins/start/syntastic | 2 +- vim/pack/plugins/start/vim-airline | 2 +- vim/pack/plugins/start/vim-airline-themes | 2 +- vim/pack/plugins/start/vim-fugitive | 2 +- vim/pack/plugins/start/vim-gitgutter | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tmux/plugins/tmux-sensible b/tmux/plugins/tmux-sensible index 44af8d8..989d092 160000 --- a/tmux/plugins/tmux-sensible +++ b/tmux/plugins/tmux-sensible @@ -1 +1 @@ -Subproject commit 44af8d8eff820eedd9702704d832ceda6732b34c +Subproject commit 989d09249e9389604a68d281c999978f6231431b diff --git a/tmux/plugins/tpm b/tmux/plugins/tpm index 2afeff1..108f76b 160000 --- a/tmux/plugins/tpm +++ b/tmux/plugins/tpm @@ -1 +1 @@ -Subproject commit 2afeff1529ec85d0c5ced5ece3714c2220b646a5 +Subproject commit 108f76b628a0df927df142036f1fdec829a5ff00 diff --git a/vim/pack/plugins/start/fzf b/vim/pack/plugins/start/fzf index 6e3a2fe..7191ebb 160000 --- a/vim/pack/plugins/start/fzf +++ b/vim/pack/plugins/start/fzf @@ -1 +1 @@ -Subproject commit 6e3a2fe0bf5d53434b41e868c501d9f63c6328aa +Subproject commit 7191ebb615f5d6ebbf51d598d8ec853a65e2274d diff --git a/vim/pack/plugins/start/fzf.vim b/vim/pack/plugins/start/fzf.vim index ee91c93..e34f6c1 160000 --- a/vim/pack/plugins/start/fzf.vim +++ b/vim/pack/plugins/start/fzf.vim @@ -1 +1 @@ -Subproject commit ee91c93d4cbc6f29cf82877ca39f3ce23d5c5b7b +Subproject commit e34f6c129d39b90db44df1107c8b7dfacfd18946 diff --git a/vim/pack/plugins/start/nerdtree b/vim/pack/plugins/start/nerdtree index 81f3eab..2c14ed0 160000 --- a/vim/pack/plugins/start/nerdtree +++ b/vim/pack/plugins/start/nerdtree @@ -1 +1 @@ -Subproject commit 81f3eaba295b3fceb2d032db57e5eae99ae480f8 +Subproject commit 2c14ed0e153cdcd0a1c7d1eabec6820bb6b3f8a2 diff --git a/vim/pack/plugins/start/nerdtree-git-plugin b/vim/pack/plugins/start/nerdtree-git-plugin index 73da028..ff9b14f 160000 --- a/vim/pack/plugins/start/nerdtree-git-plugin +++ b/vim/pack/plugins/start/nerdtree-git-plugin @@ -1 +1 @@ -Subproject commit 73da0283ead8fa2bbce83d219fcab3ba1e8cf0dd +Subproject commit ff9b14f14dceecb6c08cb05053ad649c3b6ac250 diff --git a/vim/pack/plugins/start/syntastic b/vim/pack/plugins/start/syntastic index a739985..7414f30 160000 --- a/vim/pack/plugins/start/syntastic +++ b/vim/pack/plugins/start/syntastic @@ -1 +1 @@ -Subproject commit a739985ef9fbb9888bdeea2f442d0574a9db0565 +Subproject commit 7414f30365a342e1d89072d474a35913643b6eec diff --git a/vim/pack/plugins/start/vim-airline b/vim/pack/plugins/start/vim-airline index 30f8ada..0cfd829 160000 --- a/vim/pack/plugins/start/vim-airline +++ b/vim/pack/plugins/start/vim-airline @@ -1 +1 @@ -Subproject commit 30f8ada1d6021d89228092b3c51840916c75a542 +Subproject commit 0cfd829c92a6fd208bfdcbdd2881105462224636 diff --git a/vim/pack/plugins/start/vim-airline-themes b/vim/pack/plugins/start/vim-airline-themes index 0f9995d..97cf3e6 160000 --- a/vim/pack/plugins/start/vim-airline-themes +++ b/vim/pack/plugins/start/vim-airline-themes @@ -1 +1 @@ -Subproject commit 0f9995d5996adf613297896c744415cd9e6b7a80 +Subproject commit 97cf3e6e638f936187d5f6e9b5eb1bdf0a4df256 diff --git a/vim/pack/plugins/start/vim-fugitive b/vim/pack/plugins/start/vim-fugitive index 8f4a23e..4adf054 160000 --- a/vim/pack/plugins/start/vim-fugitive +++ b/vim/pack/plugins/start/vim-fugitive @@ -1 +1 @@ -Subproject commit 8f4a23e6639ff67c0efd7242870d4beed47b5d37 +Subproject commit 4adf054a3f6f6ecad303e3e90c169cdf37f6c0e9 diff --git a/vim/pack/plugins/start/vim-gitgutter b/vim/pack/plugins/start/vim-gitgutter index f4bdaa4..549fb96 160000 --- a/vim/pack/plugins/start/vim-gitgutter +++ b/vim/pack/plugins/start/vim-gitgutter @@ -1 +1 @@ -Subproject commit f4bdaa4e9cf07f62ce1161a3d0ff70c8aad25bc5 +Subproject commit 549fb96d5890d5225afda070ca041468c2c770e5 From 259a65705e6ae2ba67ac4497ec676cbf9c10ba87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Mon, 9 Aug 2021 12:46:09 +0200 Subject: [PATCH 114/187] update submodules --- tmux/plugins/tmux-sensible | 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 +- vim/pack/plugins/start/nerdtree-git-plugin | 2 +- vim/pack/plugins/start/syntastic | 2 +- vim/pack/plugins/start/vim-airline | 2 +- vim/pack/plugins/start/vim-airline-themes | 2 +- vim/pack/plugins/start/vim-fugitive | 2 +- vim/pack/plugins/start/vim-gitgutter | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tmux/plugins/tmux-sensible b/tmux/plugins/tmux-sensible index 44af8d8..e91b178 160000 --- a/tmux/plugins/tmux-sensible +++ b/tmux/plugins/tmux-sensible @@ -1 +1 @@ -Subproject commit 44af8d8eff820eedd9702704d832ceda6732b34c +Subproject commit e91b178ff832b7bcbbf4d99d9f467f63fd1b76b5 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 2afeff1..108f76b 160000 --- a/tmux/plugins/tpm +++ b/tmux/plugins/tpm @@ -1 +1 @@ -Subproject commit 2afeff1529ec85d0c5ced5ece3714c2220b646a5 +Subproject commit 108f76b628a0df927df142036f1fdec829a5ff00 diff --git a/vim/pack/plugins/start/fzf b/vim/pack/plugins/start/fzf index 6e3a2fe..7191ebb 160000 --- a/vim/pack/plugins/start/fzf +++ b/vim/pack/plugins/start/fzf @@ -1 +1 @@ -Subproject commit 6e3a2fe0bf5d53434b41e868c501d9f63c6328aa +Subproject commit 7191ebb615f5d6ebbf51d598d8ec853a65e2274d diff --git a/vim/pack/plugins/start/fzf.vim b/vim/pack/plugins/start/fzf.vim index ee91c93..e34f6c1 160000 --- a/vim/pack/plugins/start/fzf.vim +++ b/vim/pack/plugins/start/fzf.vim @@ -1 +1 @@ -Subproject commit ee91c93d4cbc6f29cf82877ca39f3ce23d5c5b7b +Subproject commit e34f6c129d39b90db44df1107c8b7dfacfd18946 diff --git a/vim/pack/plugins/start/nerdtree b/vim/pack/plugins/start/nerdtree index 81f3eab..2c14ed0 160000 --- a/vim/pack/plugins/start/nerdtree +++ b/vim/pack/plugins/start/nerdtree @@ -1 +1 @@ -Subproject commit 81f3eaba295b3fceb2d032db57e5eae99ae480f8 +Subproject commit 2c14ed0e153cdcd0a1c7d1eabec6820bb6b3f8a2 diff --git a/vim/pack/plugins/start/nerdtree-git-plugin b/vim/pack/plugins/start/nerdtree-git-plugin index 73da028..ff9b14f 160000 --- a/vim/pack/plugins/start/nerdtree-git-plugin +++ b/vim/pack/plugins/start/nerdtree-git-plugin @@ -1 +1 @@ -Subproject commit 73da0283ead8fa2bbce83d219fcab3ba1e8cf0dd +Subproject commit ff9b14f14dceecb6c08cb05053ad649c3b6ac250 diff --git a/vim/pack/plugins/start/syntastic b/vim/pack/plugins/start/syntastic index a739985..7414f30 160000 --- a/vim/pack/plugins/start/syntastic +++ b/vim/pack/plugins/start/syntastic @@ -1 +1 @@ -Subproject commit a739985ef9fbb9888bdeea2f442d0574a9db0565 +Subproject commit 7414f30365a342e1d89072d474a35913643b6eec diff --git a/vim/pack/plugins/start/vim-airline b/vim/pack/plugins/start/vim-airline index 30f8ada..0cfd829 160000 --- a/vim/pack/plugins/start/vim-airline +++ b/vim/pack/plugins/start/vim-airline @@ -1 +1 @@ -Subproject commit 30f8ada1d6021d89228092b3c51840916c75a542 +Subproject commit 0cfd829c92a6fd208bfdcbdd2881105462224636 diff --git a/vim/pack/plugins/start/vim-airline-themes b/vim/pack/plugins/start/vim-airline-themes index 0f9995d..97cf3e6 160000 --- a/vim/pack/plugins/start/vim-airline-themes +++ b/vim/pack/plugins/start/vim-airline-themes @@ -1 +1 @@ -Subproject commit 0f9995d5996adf613297896c744415cd9e6b7a80 +Subproject commit 97cf3e6e638f936187d5f6e9b5eb1bdf0a4df256 diff --git a/vim/pack/plugins/start/vim-fugitive b/vim/pack/plugins/start/vim-fugitive index 8f4a23e..4adf054 160000 --- a/vim/pack/plugins/start/vim-fugitive +++ b/vim/pack/plugins/start/vim-fugitive @@ -1 +1 @@ -Subproject commit 8f4a23e6639ff67c0efd7242870d4beed47b5d37 +Subproject commit 4adf054a3f6f6ecad303e3e90c169cdf37f6c0e9 diff --git a/vim/pack/plugins/start/vim-gitgutter b/vim/pack/plugins/start/vim-gitgutter index f4bdaa4..549fb96 160000 --- a/vim/pack/plugins/start/vim-gitgutter +++ b/vim/pack/plugins/start/vim-gitgutter @@ -1 +1 @@ -Subproject commit f4bdaa4e9cf07f62ce1161a3d0ff70c8aad25bc5 +Subproject commit 549fb96d5890d5225afda070ca041468c2c770e5 From 2bcce60cf89d63e95769f0e14d8de3ee48dc0a1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 26 Aug 2021 07:17:50 +0200 Subject: [PATCH 115/187] update submodules --- tmux/plugins/tpm | 2 +- vim/pack/plugins/start/fzf | 2 +- vim/pack/plugins/start/fzf.vim | 2 +- vim/pack/plugins/start/nerdtree | 2 +- vim/pack/plugins/start/nerdtree-git-plugin | 2 +- vim/pack/plugins/start/vim-airline | 2 +- vim/pack/plugins/start/vim-fugitive | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tmux/plugins/tpm b/tmux/plugins/tpm index 108f76b..693e5a2 160000 --- a/tmux/plugins/tpm +++ b/tmux/plugins/tpm @@ -1 +1 @@ -Subproject commit 108f76b628a0df927df142036f1fdec829a5ff00 +Subproject commit 693e5a2a0f6acfd2666882655d5dfd32e8c6c50b diff --git a/vim/pack/plugins/start/fzf b/vim/pack/plugins/start/fzf index 7191ebb..3f90fb4 160000 --- a/vim/pack/plugins/start/fzf +++ b/vim/pack/plugins/start/fzf @@ -1 +1 @@ -Subproject commit 7191ebb615f5d6ebbf51d598d8ec853a65e2274d +Subproject commit 3f90fb42d8871920138ace9878502f22a4d91e85 diff --git a/vim/pack/plugins/start/fzf.vim b/vim/pack/plugins/start/fzf.vim index e34f6c1..b1afeca 160000 --- a/vim/pack/plugins/start/fzf.vim +++ b/vim/pack/plugins/start/fzf.vim @@ -1 +1 @@ -Subproject commit e34f6c129d39b90db44df1107c8b7dfacfd18946 +Subproject commit b1afeca8cc02030f450bf1feee015d40988f86e3 diff --git a/vim/pack/plugins/start/nerdtree b/vim/pack/plugins/start/nerdtree index 2c14ed0..0e71462 160000 --- a/vim/pack/plugins/start/nerdtree +++ b/vim/pack/plugins/start/nerdtree @@ -1 +1 @@ -Subproject commit 2c14ed0e153cdcd0a1c7d1eabec6820bb6b3f8a2 +Subproject commit 0e71462f90fb4bd09121eeba829512cc24ab5c97 diff --git a/vim/pack/plugins/start/nerdtree-git-plugin b/vim/pack/plugins/start/nerdtree-git-plugin index ff9b14f..e1fe727 160000 --- a/vim/pack/plugins/start/nerdtree-git-plugin +++ b/vim/pack/plugins/start/nerdtree-git-plugin @@ -1 +1 @@ -Subproject commit ff9b14f14dceecb6c08cb05053ad649c3b6ac250 +Subproject commit e1fe727127a813095854a5b063c15e955a77eafb diff --git a/vim/pack/plugins/start/vim-airline b/vim/pack/plugins/start/vim-airline index 0cfd829..0de4c9d 160000 --- a/vim/pack/plugins/start/vim-airline +++ b/vim/pack/plugins/start/vim-airline @@ -1 +1 @@ -Subproject commit 0cfd829c92a6fd208bfdcbdd2881105462224636 +Subproject commit 0de4c9df21abf9256091d205148601f718d3a12c diff --git a/vim/pack/plugins/start/vim-fugitive b/vim/pack/plugins/start/vim-fugitive index 4adf054..7e21d41 160000 --- a/vim/pack/plugins/start/vim-fugitive +++ b/vim/pack/plugins/start/vim-fugitive @@ -1 +1 @@ -Subproject commit 4adf054a3f6f6ecad303e3e90c169cdf37f6c0e9 +Subproject commit 7e21d414a878e5271d4b26f81dd45cfe0f39522d From 0b4b32db5bc9fbe60cff277bb22a34da5c6e90da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Fri, 27 Aug 2021 11:00:50 +0200 Subject: [PATCH 116/187] install submodules --- .gitmodules | 3 +++ vim/pack/plugins/start/vim-fugitive | 2 +- vim/pack/plugins/start/vim-soa | 1 + vimplugins | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) create mode 160000 vim/pack/plugins/start/vim-soa diff --git a/.gitmodules b/.gitmodules index 713f487..4e5fc65 100644 --- a/.gitmodules +++ b/.gitmodules @@ -58,3 +58,6 @@ [submodule "vim/pack/plugins/start/vim-gnupg"] path = vim/pack/plugins/start/vim-gnupg url = https://github.com/jamessan/vim-gnupg +[submodule "vim/pack/plugins/start/vim-soa"] + path = vim/pack/plugins/start/vim-soa + url = git@git.schuerz.at:/public/vim-soa.git diff --git a/vim/pack/plugins/start/vim-fugitive b/vim/pack/plugins/start/vim-fugitive index 7e21d41..4ff2c8c 160000 --- a/vim/pack/plugins/start/vim-fugitive +++ b/vim/pack/plugins/start/vim-fugitive @@ -1 +1 @@ -Subproject commit 7e21d414a878e5271d4b26f81dd45cfe0f39522d +Subproject commit 4ff2c8ce3080bdd5c576bc035bba881fb3d69a32 diff --git a/vim/pack/plugins/start/vim-soa b/vim/pack/plugins/start/vim-soa new file mode 160000 index 0000000..429a874 --- /dev/null +++ b/vim/pack/plugins/start/vim-soa @@ -0,0 +1 @@ +Subproject commit 429a874ac32d6e3c3cf117b2d83ed70212380ad9 diff --git a/vimplugins b/vimplugins index f787501..a8f8fe5 100644 --- a/vimplugins +++ b/vimplugins @@ -17,3 +17,4 @@ install plugins https://github.com/junegunn/fzf.vim.git install plugins https://github.com/airblade/vim-gitgutter.git remove plugins https://github.com/Lokaltog/powerline.git install plugins https://github.com/jamessan/vim-gnupg +install plugins git@git.schuerz.at:/public/vim-soa.git From 71e8cb9ea7fafea32400a2fb4b084d078d2754b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz=20=28admin=29?= Date: Fri, 27 Aug 2021 11:01:43 +0200 Subject: [PATCH 117/187] update submodules --- tmux/plugins/tmux-themepack | 2 +- tmux/plugins/tpm | 2 +- vim/pack/plugins/start/ctrlp.vim | 2 +- vim/pack/plugins/start/fzf | 2 +- vim/pack/plugins/start/fzf.vim | 2 +- vim/pack/plugins/start/nerdtree | 2 +- vim/pack/plugins/start/nerdtree-git-plugin | 2 +- vim/pack/plugins/start/syntastic | 2 +- vim/pack/plugins/start/vim-airline | 2 +- vim/pack/plugins/start/vim-airline-themes | 2 +- vim/pack/plugins/start/vim-fugitive | 2 +- vim/pack/plugins/start/vim-gitgutter | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) 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..693e5a2 160000 --- a/tmux/plugins/tpm +++ b/tmux/plugins/tpm @@ -1 +1 @@ -Subproject commit 60a36d6f7adddfb68d68349dce3081e7d5c4d4ab +Subproject commit 693e5a2a0f6acfd2666882655d5dfd32e8c6c50b diff --git a/vim/pack/plugins/start/ctrlp.vim b/vim/pack/plugins/start/ctrlp.vim index 971c4d4..f68f4d0 160000 --- a/vim/pack/plugins/start/ctrlp.vim +++ b/vim/pack/plugins/start/ctrlp.vim @@ -1 +1 @@ -Subproject commit 971c4d41880b72dbbf1620b3ad91418a6a6f6b9c +Subproject commit f68f4d00b9c99d0d711bfde3b071f0dafd249901 diff --git a/vim/pack/plugins/start/fzf b/vim/pack/plugins/start/fzf index af48b3d..3f90fb4 160000 --- a/vim/pack/plugins/start/fzf +++ b/vim/pack/plugins/start/fzf @@ -1 +1 @@ -Subproject commit af48b3df29a0c9658e95a109141f4a3c168b40a0 +Subproject commit 3f90fb42d8871920138ace9878502f22a4d91e85 diff --git a/vim/pack/plugins/start/fzf.vim b/vim/pack/plugins/start/fzf.vim index d43df0e..b1afeca 160000 --- a/vim/pack/plugins/start/fzf.vim +++ b/vim/pack/plugins/start/fzf.vim @@ -1 +1 @@ -Subproject commit d43df0ea2f099836c2e3499756101e87bcbd3e25 +Subproject commit b1afeca8cc02030f450bf1feee015d40988f86e3 diff --git a/vim/pack/plugins/start/nerdtree b/vim/pack/plugins/start/nerdtree index aaa946f..0e71462 160000 --- a/vim/pack/plugins/start/nerdtree +++ b/vim/pack/plugins/start/nerdtree @@ -1 +1 @@ -Subproject commit aaa946fb6bd79b9af86fbaf4b6b63fd81d839bd9 +Subproject commit 0e71462f90fb4bd09121eeba829512cc24ab5c97 diff --git a/vim/pack/plugins/start/nerdtree-git-plugin b/vim/pack/plugins/start/nerdtree-git-plugin index 5fa0e3e..e1fe727 160000 --- a/vim/pack/plugins/start/nerdtree-git-plugin +++ b/vim/pack/plugins/start/nerdtree-git-plugin @@ -1 +1 @@ -Subproject commit 5fa0e3e1487b17f8a23fc2674ebde5f55ce6a816 +Subproject commit e1fe727127a813095854a5b063c15e955a77eafb diff --git a/vim/pack/plugins/start/syntastic b/vim/pack/plugins/start/syntastic index d97a664..7414f30 160000 --- a/vim/pack/plugins/start/syntastic +++ b/vim/pack/plugins/start/syntastic @@ -1 +1 @@ -Subproject commit d97a664b9adbd1a0a9cba6c1c3baf071a1059d1e +Subproject commit 7414f30365a342e1d89072d474a35913643b6eec diff --git a/vim/pack/plugins/start/vim-airline b/vim/pack/plugins/start/vim-airline index c7a633c..0de4c9d 160000 --- a/vim/pack/plugins/start/vim-airline +++ b/vim/pack/plugins/start/vim-airline @@ -1 +1 @@ -Subproject commit c7a633ce8f4547e680377efe8ea70493fcce1349 +Subproject commit 0de4c9df21abf9256091d205148601f718d3a12c diff --git a/vim/pack/plugins/start/vim-airline-themes b/vim/pack/plugins/start/vim-airline-themes index 8f1aa2c..97cf3e6 160000 --- a/vim/pack/plugins/start/vim-airline-themes +++ b/vim/pack/plugins/start/vim-airline-themes @@ -1 +1 @@ -Subproject commit 8f1aa2c7fa44bf33b1fd4678f9c7b40c126b0e2b +Subproject commit 97cf3e6e638f936187d5f6e9b5eb1bdf0a4df256 diff --git a/vim/pack/plugins/start/vim-fugitive b/vim/pack/plugins/start/vim-fugitive index bebe504..4ff2c8c 160000 --- a/vim/pack/plugins/start/vim-fugitive +++ b/vim/pack/plugins/start/vim-fugitive @@ -1 +1 @@ -Subproject commit bebe504e38d0a20c30d6dd666c4c793b3cc66104 +Subproject commit 4ff2c8ce3080bdd5c576bc035bba881fb3d69a32 diff --git a/vim/pack/plugins/start/vim-gitgutter b/vim/pack/plugins/start/vim-gitgutter index 512e299..549fb96 160000 --- a/vim/pack/plugins/start/vim-gitgutter +++ b/vim/pack/plugins/start/vim-gitgutter @@ -1 +1 @@ -Subproject commit 512e2999ed7ff367580e0d6bc4d2daa81663221f +Subproject commit 549fb96d5890d5225afda070ca041468c2c770e5 From e47d0550628c839466b42c46c063511f6cd0fd4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz=20=28admin=29?= Date: Fri, 27 Aug 2021 11:44:53 +0200 Subject: [PATCH 118/187] add git submodule-fix --- bin/git-submodule-fix | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100755 bin/git-submodule-fix diff --git a/bin/git-submodule-fix b/bin/git-submodule-fix new file mode 100755 index 0000000..889575a --- /dev/null +++ b/bin/git-submodule-fix @@ -0,0 +1,7 @@ +#!/bin/bash + +for arg +do + echo $arg + find . -name "`basename $arg`" | grep "$arg\$" | xargs rm -fr +done From a69aa106965c523fae9b4bcb5fab927b75c8e1d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Sun, 29 Aug 2021 00:33:00 +0200 Subject: [PATCH 119/187] update submodules --- vim/pack/plugins/start/vim-fugitive | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/pack/plugins/start/vim-fugitive b/vim/pack/plugins/start/vim-fugitive index 4ff2c8c..d523fee 160000 --- a/vim/pack/plugins/start/vim-fugitive +++ b/vim/pack/plugins/start/vim-fugitive @@ -1 +1 @@ -Subproject commit 4ff2c8ce3080bdd5c576bc035bba881fb3d69a32 +Subproject commit d523feebe99bb93a9309ef83cbac2b71ac408c36 From 9c09f14f71f222fbcc82c7aaecef2db51c7c5896 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz=20=28admin=29?= Date: Thu, 9 Sep 2021 08:33:05 +0200 Subject: [PATCH 120/187] add rule for bind-db --- vimrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vimrc b/vimrc index 672475c..172f7d1 100644 --- a/vimrc +++ b/vimrc @@ -539,3 +539,5 @@ let g:fzf_layout = { 'window': { 'width': 0.9, 'height': 0.6 } } " Configure Gitgutter nmap hn (GitGutterNextHunk) nmap hp (GitGutterPrevHunk) + +autocmd BufWritePre /etc/bind/vpn/db.* Soa From e1021fee1d05c431d96898ed13c75d76c345db6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 9 Sep 2021 16:01:16 +0200 Subject: [PATCH 121/187] fix failed checkout --- 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 92ed232..8faca2d 100755 --- a/bin/git-myshellconfig-checkout +++ b/bin/git-myshellconfig-checkout @@ -90,7 +90,8 @@ fi #echo $SGIT fetch ${MSC_GIT_REMOTE_NAME} -p 1>&2 if $dorepoupdate; then loginfo "fetch repo${dosubmodupdate:+ and submodules}" - $SGIT fetch ${dosubmodupdate:+--recurse-submodules} ${MSC_GIT_REMOTE_NAME} -p 2>>"${MSC_LOGFILE}"|| { logwarn fetch failed; gitupdateend; exit 1; } + #$SGIT fetch ${dosubmodupdate:+--recurse-submodules} ${MSC_GIT_REMOTE_NAME} -p 2>>"${MSC_LOGFILE}"|| { logwarn fetch failed; gitupdateend; exit 1; } + $SGIT fetch ${dosubmodupdate:+--recurse-submodules} ${MSC_GIT_BRANCH} -p 2>>"${MSC_LOGFILE}"|| { logwarn fetch failed; gitupdateend; exit 1; } if ${dosubmodupdate:-false}; then lastupdatesubmodules fi From ee97299c41d933b05f97cee0a559cd9b7e6c5e3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 9 Sep 2021 16:06:16 +0200 Subject: [PATCH 122/187] try fix checkout-issue --- 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 8faca2d..068204c 100755 --- a/bin/git-myshellconfig-checkout +++ b/bin/git-myshellconfig-checkout @@ -18,7 +18,7 @@ #MSC_LOGFILE="${MSC_LOGDIR}/git.log" [ -d "${MSC_LOGDIR}" ] || mkdir -p "${MSC_LOGDIR}" [ -z "${MSC_GIT_REMOTE_NAME+x}" ] && export MSC_GIT_REMOTE_NAME=origin -[ -z "${MSC_GIT_BRANCH+x}" ] && export MSC_GIT_BRANCH=master +[ -z "${MSC_GIT_BRANCH:+x}" ] && export MSC_GIT_BRANCH=master @@ -100,7 +100,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 ${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 3833bc13c9e6eb530303a991e2f19f8dd680e568 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 9 Sep 2021 16:08:04 +0200 Subject: [PATCH 123/187] try fix checkout-issue --- bin/git-myshellconfig-checkout | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/git-myshellconfig-checkout b/bin/git-myshellconfig-checkout index 068204c..05297d9 100755 --- a/bin/git-myshellconfig-checkout +++ b/bin/git-myshellconfig-checkout @@ -91,7 +91,7 @@ fi if $dorepoupdate; then loginfo "fetch repo${dosubmodupdate:+ and submodules}" #$SGIT fetch ${dosubmodupdate:+--recurse-submodules} ${MSC_GIT_REMOTE_NAME} -p 2>>"${MSC_LOGFILE}"|| { logwarn fetch failed; gitupdateend; exit 1; } - $SGIT fetch ${dosubmodupdate:+--recurse-submodules} ${MSC_GIT_BRANCH} -p 2>>"${MSC_LOGFILE}"|| { logwarn fetch failed; gitupdateend; exit 1; } + $SGIT fetch ${dosubmodupdate:+--recurse-submodules} ${MSC_GIT_REMOTE_NAME} -p 2>>"${MSC_LOGFILE}"|| { logwarn fetch failed; gitupdateend; exit 1; } if ${dosubmodupdate:-false}; then lastupdatesubmodules fi From ab7e47c57a71ac817474a6441b155b97333a7fa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Fri, 10 Sep 2021 13:58:40 +0200 Subject: [PATCH 124/187] add function cporig cporig makes a copy of a file $FILENAME and names ist $FILENAME.orig --- functions.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/functions.sh b/functions.sh index 775e66b..3e2248b 100755 --- a/functions.sh +++ b/functions.sh @@ -996,5 +996,11 @@ convert_to_subvolume () { set +x return 0 +} + +cporig () { + + cp -b -i "${1}" "${1}.orig" + } #EOF From b72233944632c8337ad5d0f47cfc15b21fd62e56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz=20=28admin=29?= Date: Sat, 11 Sep 2021 23:30:04 +0200 Subject: [PATCH 125/187] change logging --- bin/exif-fixdatetime | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/exif-fixdatetime b/bin/exif-fixdatetime index 1824fe8..8ae4ed5 100755 --- a/bin/exif-fixdatetime +++ b/bin/exif-fixdatetime @@ -100,7 +100,7 @@ parsedatetime() { # 2020.04.02_15-32-20+02:00.jpg # 2020.04.13_10-59-14+02:00.jpg # WhatsApp Image 2019-07-29 at 12.45.02.jpeg - echo fn: $filename >&2 + loginfo "fn: $filename" if [[ $filename =~ ^.*([0-9]{4})(\.|-)([0-9]{2})(\.|-)([0-9]{2})( |_|-|" at ")([0-9]{2})(\.|-|:)([0-9]{2})(\.|-|:)([0-9]{2})(\.|-|\+|\(| ).*$ ]]; then result="$(printf "%04d:%02d:%02d %02d:%02d:%02d" "${BASH_REMATCH[1]#0}" "${BASH_REMATCH[3]#0}" "${BASH_REMATCH[5]#0}" "${BASH_REMATCH[7]#0}" "${BASH_REMATCH[9]#0}" "${BASH_REMATCH[11]#0}")" fi From f0769c0f07f4ef28fc5ff5cbd7fb8eaea78a7314 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz=20=28admin=29?= Date: Sat, 11 Sep 2021 23:34:28 +0200 Subject: [PATCH 126/187] update git alias --- .gitconfig | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitconfig b/.gitconfig index b3881f9..af89f94 100755 --- a/.gitconfig +++ b/.gitconfig @@ -35,15 +35,13 @@ sdiff = !"git diff && git submodule foreach 'git diff'" spush = push --recurse-submodules=on-demand supdate = submodule update --remote --merge + pushup = "!gitbranchname() { git symbolic-ref --short HEAD; }; gitpushupstream() { git push --set-upstream origin `gitbranchname`; }; gitpushupstream" + permission-reset = !git diff -p -R --no-ext-diff --no-color | grep -E \"^(diff|(old|new) mode)\" --color=never | git apply [merge] conflictstyle = diff3 tool = vimdiff [mergetool] prompt = false - -[alias] - pushup = "!gitbranchname() { git symbolic-ref --short HEAD; }; gitpushupstream() { git push --set-upstream origin `gitbranchname`; }; gitpushupstream" - [include] path = ~/.gitconfig_local [status] From e6602d341026eea2d35a38a35917ce053f6ba2a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 15 Sep 2021 11:41:19 +0200 Subject: [PATCH 127/187] remove old commented code --- functions.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/functions.sh b/functions.sh index 3e2248b..7b9ca7e 100755 --- a/functions.sh +++ b/functions.sh @@ -817,7 +817,6 @@ utoken () { ENTRY ssh_identity=$1 - #[ -z "${P11M+x}" ] && { P11M=/usr/lib64/p11-kit-proxy.so; export P11M; } [ -z "${P11M+x}" ] && { P11M=$PKCS11_MODULE; export P11M; } if [ -n "${ssh_identity+x}" ]; then @@ -833,7 +832,6 @@ utoken () { token(){ - #[ -z "${P11M+x}" ] && { P11M=/usr/lib64/p11-kit-proxy.so; export P11M; } [ -z "${P11M:+x}" ] && { P11M=$PKCS11_MODULE; export P11M; } tmppubkey="${XDG_RUNTIME_DIR}/token.pub" From a2a54e6d9e7fee58bd26da3dceb15689db558eec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 15 Sep 2021 13:55:20 +0200 Subject: [PATCH 128/187] transfer function to shellscript --- bin/git-mergedetachedheadtomaster | 7 +++++++ functions.sh | 23 +++++++++++++---------- 2 files changed, 20 insertions(+), 10 deletions(-) create mode 100644 bin/git-mergedetachedheadtomaster diff --git a/bin/git-mergedetachedheadtomaster b/bin/git-mergedetachedheadtomaster new file mode 100644 index 0000000..a721473 --- /dev/null +++ b/bin/git-mergedetachedheadtomaster @@ -0,0 +1,7 @@ +#!/bin/bash + +git checkout -b tmp +git branch -f master tmp +git checkout master +git branch -d tmp +git commit -m "Merged detached head into master" . diff --git a/functions.sh b/functions.sh index 7b9ca7e..f29cb6d 100755 --- a/functions.sh +++ b/functions.sh @@ -279,16 +279,17 @@ unsetproxy () { EXIT } -git-mergedetachedheadtomaster () { - ENTRY - git checkout -b tmp - git branch -f master tmp - git checkout master - git branch -d tmp - git commit -m "Merged detached head into master" . - #git push origin master - EXIT -} +# transfered to bin +#git-mergedetachedheadtomaster () { +# ENTRY +# git checkout -b tmp +# git branch -f master tmp +# git checkout master +# git branch -d tmp +# git commit -m "Merged detached head into master" . +# #git push origin master +# EXIT +#} pathmunge () { ENTRY @@ -835,6 +836,7 @@ token(){ [ -z "${P11M:+x}" ] && { P11M=$PKCS11_MODULE; export P11M; } tmppubkey="${XDG_RUNTIME_DIR}/token.pub" + # Write public keys of all in agent stored keys to a temporary file loginfo "$(ssh-add -L > $tmppubkey)" # Usage: @@ -842,6 +844,7 @@ token(){ # token -r|-f|--reload-token will remove token from agent and add it again (if plugged off and plugged in again # startagent -t $@ # loadagent $@ + # Check if public-keys in tmppubkey are working. They are not working, if you removed and add back hardware-token. loginfo "$(ssh-add -T ${tmppubkey} || { ssh-add -e $P11M; ssh-add -s $P11M; } )" loginfo "$(ssh-add -l)" From 9f58b5d427ff41435ca964243ee4e82c78e2f064 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 15 Sep 2021 13:56:16 +0200 Subject: [PATCH 129/187] make script executable --- bin/git-mergedetachedheadtomaster | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 bin/git-mergedetachedheadtomaster diff --git a/bin/git-mergedetachedheadtomaster b/bin/git-mergedetachedheadtomaster old mode 100644 new mode 100755 From 5f72fea881bc352711d373b34590009692786655 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Fri, 17 Sep 2021 12:44:18 +0200 Subject: [PATCH 130/187] 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/syntastic | 2 +- vim/pack/plugins/start/vim-airline | 2 +- vim/pack/plugins/start/vim-fugitive | 2 +- vim/pack/plugins/start/vim-gitgutter | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/vim/pack/plugins/start/fzf b/vim/pack/plugins/start/fzf index 3f90fb4..0f02fc0 160000 --- a/vim/pack/plugins/start/fzf +++ b/vim/pack/plugins/start/fzf @@ -1 +1 @@ -Subproject commit 3f90fb42d8871920138ace9878502f22a4d91e85 +Subproject commit 0f02fc0c77356a7b72b05131edf6c99d8efa6d33 diff --git a/vim/pack/plugins/start/fzf.vim b/vim/pack/plugins/start/fzf.vim index b1afeca..bd703a7 160000 --- a/vim/pack/plugins/start/fzf.vim +++ b/vim/pack/plugins/start/fzf.vim @@ -1 +1 @@ -Subproject commit b1afeca8cc02030f450bf1feee015d40988f86e3 +Subproject commit bd703a7a7d7afd113634a346290acc27dd314bfc diff --git a/vim/pack/plugins/start/nerdtree b/vim/pack/plugins/start/nerdtree index 0e71462..7eee457 160000 --- a/vim/pack/plugins/start/nerdtree +++ b/vim/pack/plugins/start/nerdtree @@ -1 +1 @@ -Subproject commit 0e71462f90fb4bd09121eeba829512cc24ab5c97 +Subproject commit 7eee457efae1bf9b96d7a266ac097639720a68fe diff --git a/vim/pack/plugins/start/syntastic b/vim/pack/plugins/start/syntastic index 7414f30..97bf9ec 160000 --- a/vim/pack/plugins/start/syntastic +++ b/vim/pack/plugins/start/syntastic @@ -1 +1 @@ -Subproject commit 7414f30365a342e1d89072d474a35913643b6eec +Subproject commit 97bf9ec720662af51ae403b6dfe720d4a24bfcbc diff --git a/vim/pack/plugins/start/vim-airline b/vim/pack/plugins/start/vim-airline index 0de4c9d..2e29ab9 160000 --- a/vim/pack/plugins/start/vim-airline +++ b/vim/pack/plugins/start/vim-airline @@ -1 +1 @@ -Subproject commit 0de4c9df21abf9256091d205148601f718d3a12c +Subproject commit 2e29ab965625d1315f0ad070c928794baea3d66f diff --git a/vim/pack/plugins/start/vim-fugitive b/vim/pack/plugins/start/vim-fugitive index d523fee..a67e1f8 160000 --- a/vim/pack/plugins/start/vim-fugitive +++ b/vim/pack/plugins/start/vim-fugitive @@ -1 +1 @@ -Subproject commit d523feebe99bb93a9309ef83cbac2b71ac408c36 +Subproject commit a67e1f8189938c44f295fc97e6c9dd13b727b1e3 diff --git a/vim/pack/plugins/start/vim-gitgutter b/vim/pack/plugins/start/vim-gitgutter index 549fb96..256702d 160000 --- a/vim/pack/plugins/start/vim-gitgutter +++ b/vim/pack/plugins/start/vim-gitgutter @@ -1 +1 @@ -Subproject commit 549fb96d5890d5225afda070ca041468c2c770e5 +Subproject commit 256702dd1432894b3607d3de6cd660863b331818 From c48e08e9c2700a4e8283f932f2d3f96ef763dd4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Mon, 20 Sep 2021 08:49:25 +0200 Subject: [PATCH 131/187] revert changes (don't know why they are there..) --- functions.sh | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/functions.sh b/functions.sh index f29cb6d..d61b0bb 100755 --- a/functions.sh +++ b/functions.sh @@ -170,7 +170,7 @@ mencfs () { logdebug "DESTDIR: $DESTDIR" [ -d "$DESTDIR" ] || mkdir -p "$DESTDIR" $PASS "${PKEY}" 1>/dev/null 2>&1 || { logerror "entry $PKEY does not exist in passwordsotre"; return 5; } - local ENCFS_PASSWORD=$($PASS "${PKEY}" | head -n1) + local ENCFS_PASSWORD=$($PASS show "${PKEY}") if [ -z ${ENCDIR+x} -a -d ${ENCDIR} ];then logerror "no encrypted directory found -> exit" @@ -246,7 +246,7 @@ kinit-custom () { [ -z ${PKEY+x} ] && return 3 $PASS "${PKEY}" 1>/dev/null 2>&1 || return 3 - local KERBEROS_PASSWORD=$($PASS "${PKEY}" | head -n1) + local KERBEROS_PASSWORD=$($PASS show "${PKEY}") local KERBEROS_USER=$($PASS "${PKEY}" | grep login | sed -e 's/^login: //' ) #echo KERBEROS_PASSWORD: $KERBEROS_PASSWORD loginfo "Get kerberos-ticket for: $KERBEROS_USER@$REALM" @@ -576,14 +576,17 @@ cat << EOF EOF } -function pdsh-update-hetzner() +function update-hetzner-serverlist() { - curl -s -H "Authorization: Bearer $(pass hetzner.com/api-token | head -n1)" \ - https://api.hetzner.cloud/v1/servers \ - | /usr/bin/jq '.servers[].public_net.ipv4.ip'|sed -e 's/\"//g' \ - |while read i; do - dig -x $i | awk '$0 !~ /^;/ && $4 == "PTR" {print $5}' - done |sed -s -e 's/\.$//' > ~/.dsh/group/hetzner-servers + for i in basic-services sc xe tu; do + curl -s -H "Authorization: Bearer $(pass show hetzner.com/projects/${i}/api-token)" \ + https://api.hetzner.cloud/v1/servers \ + | /usr/bin/jq '.servers[].public_net.ipv4.ip'|sed -e 's/\"//g' \ + |while read i; do + dig -x $i | awk '$0 !~ /^;/ && $4 == "PTR" {print $5}' + done |sed -s -e 's/\.$//' > ~/.dsh/group/hetzner-servers-${i} + done + cat ~/.dsh/group/hetzner-servers-* > ~/.dsh/group/hetzner-servers } function tmuxx() { @@ -727,12 +730,14 @@ gnome-shell-extensions-make-actual-permanent-systemwide() { sudo mkdir -p "/etc/dconf/profile/" local line='user-db:user' if [ -e "${file}" ] ; then + command="grep -xqF -- ${line} ${file} || echo $line >> $file" logtrace "$command" sudo sh -c "$command" fi local line='system-db:local' if [ -e "${file}" ] ; then command="grep -xqF -- ${line} ${file} || echo $line >> $file" + logtrace "$command" sudo sh -c "$command" fi local line='enabled-extensions=' @@ -997,6 +1002,7 @@ convert_to_subvolume () { set +x return 0 + } cporig () { From 01f532546866fa7e56ede05ba17ec80c0bf44ca3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Mon, 20 Sep 2021 16:01:34 +0200 Subject: [PATCH 132/187] change function --- functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions.sh b/functions.sh index d61b0bb..96027c9 100755 --- a/functions.sh +++ b/functions.sh @@ -858,7 +858,7 @@ token(){ token-extract-pubkey() { if pkcs11-tool --module $P11M --list-token-slots >&2 ;then - ssh-keygen -i -m pkcs8 -f <(pkcs11-tool --module $P11M -r --type pubkey $1 $2 |openssl rsa -pubin -inform DER ) + ssh-keygen -i -m pkcs8 -f <(pkcs11-tool --module $P11M -r --type pubkey ${1:---label} ${1} |openssl rsa -pubin -inform DER ) if [ $? -gt 0 ] ; then token-list-objects fi From 1e741f9f953ee295c1caccafb4e99248d004d8c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Sat, 25 Sep 2021 21:41:01 +0200 Subject: [PATCH 133/187] add debug --- bin/git-myshellconfig-checkout | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/git-myshellconfig-checkout b/bin/git-myshellconfig-checkout index 05297d9..15593b3 100755 --- a/bin/git-myshellconfig-checkout +++ b/bin/git-myshellconfig-checkout @@ -37,6 +37,7 @@ EOF set -- $(getopt -u -o hrs --long headless,force-repo-update,force-submodules-update -- "$@" ) +loginfo "git checkout-options: $@" while [ $# -gt 0 ]; do case $1 in -h|--headless) From 0e5483bc50fb9b5f5fe8f98c421b0b4d7ac26f1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Sat, 25 Sep 2021 21:41:36 +0200 Subject: [PATCH 134/187] change alias vi from vim to vimx to activate copy --- aliases | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aliases b/aliases index 9f26d1d..27e0538 100644 --- a/aliases +++ b/aliases @@ -124,7 +124,7 @@ alias nedit='LC_ALL=ISO-8850-15;export LC_ALL;nedit -fn win8x15 -xrm "*fontList: alias o='less -r' alias totem='VDPAU_DRIVER=va_gl totem' alias unetbootin='export QT_X11_NO_MITSHM=1 unetbootin' -alias vi='/usr/bin/vim' +alias vi='/usr/bin/vimx' alias vlc='VDPAU_DRIVER=va_gl vlc' alias tmux='tmux -f ~/.tmux.conf' alias youtube-dl-whole-video="youtube-dl -i --no-overwrites --write-description --write-info-json --write-annotations --write-all-thumbnails -f 'mp4' -o '%(title)s-%(id)s.%(ext)s' -w -c " From 535e7e644b8e7658f9b39ae2007d39cfe7913fb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Sun, 26 Sep 2021 21:49:03 +0200 Subject: [PATCH 135/187] update submodules --- vim/pack/plugins/start/fzf | 2 +- vim/pack/plugins/start/nerdtree | 2 +- vim/pack/plugins/start/vim-airline | 2 +- vim/pack/plugins/start/vim-fugitive | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vim/pack/plugins/start/fzf b/vim/pack/plugins/start/fzf index 0f02fc0..f4f47f5 160000 --- a/vim/pack/plugins/start/fzf +++ b/vim/pack/plugins/start/fzf @@ -1 +1 @@ -Subproject commit 0f02fc0c77356a7b72b05131edf6c99d8efa6d33 +Subproject commit f4f47f5fe32db500765b47d937f5eb8fa27be130 diff --git a/vim/pack/plugins/start/nerdtree b/vim/pack/plugins/start/nerdtree index 7eee457..e731b84 160000 --- a/vim/pack/plugins/start/nerdtree +++ b/vim/pack/plugins/start/nerdtree @@ -1 +1 @@ -Subproject commit 7eee457efae1bf9b96d7a266ac097639720a68fe +Subproject commit e731b845590017493224dfcb7403c2332105b700 diff --git a/vim/pack/plugins/start/vim-airline b/vim/pack/plugins/start/vim-airline index 2e29ab9..26f9227 160000 --- a/vim/pack/plugins/start/vim-airline +++ b/vim/pack/plugins/start/vim-airline @@ -1 +1 @@ -Subproject commit 2e29ab965625d1315f0ad070c928794baea3d66f +Subproject commit 26f922753a288df639b8d05d13ed62b9b04a26bc diff --git a/vim/pack/plugins/start/vim-fugitive b/vim/pack/plugins/start/vim-fugitive index a67e1f8..7b05afd 160000 --- a/vim/pack/plugins/start/vim-fugitive +++ b/vim/pack/plugins/start/vim-fugitive @@ -1 +1 @@ -Subproject commit a67e1f8189938c44f295fc97e6c9dd13b727b1e3 +Subproject commit 7b05afd548bd5e3f45e61fee3defc024a762adfd From 119a2f99d1956c76359001fe9cd18f7adfcf324c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 30 Sep 2021 17:40:22 +0200 Subject: [PATCH 136/187] change alias for vi to use vimx if here --- aliases | 1 + 1 file changed, 1 insertion(+) diff --git a/aliases b/aliases index 27e0538..adda632 100644 --- a/aliases +++ b/aliases @@ -125,6 +125,7 @@ alias o='less -r' alias totem='VDPAU_DRIVER=va_gl totem' alias unetbootin='export QT_X11_NO_MITSHM=1 unetbootin' alias vi='/usr/bin/vimx' +alias vi='which vimx > /dev/null && vimx || vim' alias vlc='VDPAU_DRIVER=va_gl vlc' alias tmux='tmux -f ~/.tmux.conf' alias youtube-dl-whole-video="youtube-dl -i --no-overwrites --write-description --write-info-json --write-annotations --write-all-thumbnails -f 'mp4' -o '%(title)s-%(id)s.%(ext)s' -w -c " From 05ced7bc0ea671dda958fc3737376c25316b68d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 30 Sep 2021 17:42:56 +0200 Subject: [PATCH 137/187] revert alias vi to vim --- aliases | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/aliases b/aliases index adda632..0d5339d 100644 --- a/aliases +++ b/aliases @@ -124,8 +124,9 @@ alias nedit='LC_ALL=ISO-8850-15;export LC_ALL;nedit -fn win8x15 -xrm "*fontList: alias o='less -r' alias totem='VDPAU_DRIVER=va_gl totem' alias unetbootin='export QT_X11_NO_MITSHM=1 unetbootin' -alias vi='/usr/bin/vimx' -alias vi='which vimx > /dev/null && vimx || vim' +alias vi='/usr/bin/vim' +#alias vi='/usr/bin/vimx' +#alias vi='which vimx > /dev/null && vimx || vim' alias vlc='VDPAU_DRIVER=va_gl vlc' alias tmux='tmux -f ~/.tmux.conf' alias youtube-dl-whole-video="youtube-dl -i --no-overwrites --write-description --write-info-json --write-annotations --write-all-thumbnails -f 'mp4' -o '%(title)s-%(id)s.%(ext)s' -w -c " From 9f166a277f9f529ee825912e44cc4524394a3bdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Sun, 3 Oct 2021 23:09:57 +0200 Subject: [PATCH 138/187] fix always checkout headless --- myshell_git_sync | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/myshell_git_sync b/myshell_git_sync index d349aaf..871f6a0 100644 --- a/myshell_git_sync +++ b/myshell_git_sync @@ -79,7 +79,9 @@ 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"; } + loginfo "MSC_GIT_CHECKOUTSCRIPT_OPTIONS: $MSC_GIT_CHECKOUTSCRIPT_OPTIONS" + [ -z "${MSC_GIT_TAG:+x}" ] || { export MSC_GIT_BRANCH=${MSC_GIT_TAG}; export MSC_GIT_CHECKOUTSCRIPT_OPTIONS="-h"; } + loginfo "MSC_GIT_CHECKOUTSCRIPT_OPTIONS after: $MSC_GIT_CHECKOUTSCRIPT_OPTIONS" #GIT_SSH_PATH="/srv/repos" From 0653501a28e3967e328999708739c517e9c51a69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Sun, 3 Oct 2021 23:10:31 +0200 Subject: [PATCH 139/187] fix failing start for x2go_wrapper --- bin/startagent | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/startagent b/bin/startagent index 4c818df..e0e0507 100755 --- a/bin/startagent +++ b/bin/startagent @@ -7,7 +7,7 @@ for f in logerror logwarn loginfo logdebug logtrace ENTRY EXIT SCRIPTENTRY SCRIP : else fx=${f//log/} - echo create function $f for $fx + echo create function $f for $fx >&2 eval "$f () { \ local loglevels; \ declare -a loglevels; \ From 35460dab6dc8d76b0977318cae73c4e41b0e4d16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Mon, 4 Oct 2021 14:16:37 +0200 Subject: [PATCH 140/187] fix wrong parameter expansion --- functions.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/functions.sh b/functions.sh index 96027c9..9fe02c3 100755 --- a/functions.sh +++ b/functions.sh @@ -858,12 +858,12 @@ token(){ token-extract-pubkey() { if pkcs11-tool --module $P11M --list-token-slots >&2 ;then - ssh-keygen -i -m pkcs8 -f <(pkcs11-tool --module $P11M -r --type pubkey ${1:---label} ${1} |openssl rsa -pubin -inform DER ) + ssh-keygen -i -m pkcs8 -f <(pkcs11-tool --module $P11M -r --type pubkey ${1:+--label} ${1} |openssl rsa -pubin -inform DER ) if [ $? -gt 0 ] ; then - token-list-objects + token-list-objects >&2 fi else - echo "Please insert token. Exit" + echo "Please insert token. Exit" >&2 return 1 fi } From c0c105450a2f2bb7f9e247f46154c4d6f65ef6db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Tue, 5 Oct 2021 23:21:17 +0200 Subject: [PATCH 141/187] remove Debug --- myshell_git_sync | 2 -- 1 file changed, 2 deletions(-) diff --git a/myshell_git_sync b/myshell_git_sync index 871f6a0..2694e95 100644 --- a/myshell_git_sync +++ b/myshell_git_sync @@ -79,9 +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. - loginfo "MSC_GIT_CHECKOUTSCRIPT_OPTIONS: $MSC_GIT_CHECKOUTSCRIPT_OPTIONS" [ -z "${MSC_GIT_TAG:+x}" ] || { export MSC_GIT_BRANCH=${MSC_GIT_TAG}; export MSC_GIT_CHECKOUTSCRIPT_OPTIONS="-h"; } - loginfo "MSC_GIT_CHECKOUTSCRIPT_OPTIONS after: $MSC_GIT_CHECKOUTSCRIPT_OPTIONS" #GIT_SSH_PATH="/srv/repos" From 370a156ebe78e8a73f5f134ae99f4339b26b5e6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Fri, 8 Oct 2021 15:53:26 +0200 Subject: [PATCH 142/187] fix git checkout options --- bashrc_add | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bashrc_add b/bashrc_add index 97ca255..3a98406 100755 --- a/bashrc_add +++ b/bashrc_add @@ -131,7 +131,7 @@ EOF if which git >/dev/null; then loginfo -n "Sync config with ${MSC_GIT_SERVER}: " # MSC_GITCHECKOUTSCRIPT_OPTIONS are options for bin/git-myshellconfig-checkout - ${MSC_BASE}/bin/git-myshellconfig-checkout ${MSC_GIT_CHECKOUTSCRIPT_OPTIONS:=${MSC_GIT_CHECKOUTSCRIPT_OPTIONS_DEFAULT}}|| nok="not " 1>>"${MSC_LOGFILE}" 2>&1 + ${MSC_BASE}/bin/git-myshellconfig-checkout ${MSC_GIT_CHECKOUTSCRIPT_OPTIONS=${MSC_GIT_CHECKOUTSCRIPT_OPTIONS_DEFAULT}}|| nok="not " 1>>"${MSC_LOGFILE}" 2>&1 loginfo "$(printf '%s\n' "${nok}synced" )" [ -z "$nok" ] && mkdir -pv "${MSC_LOGDIR}" From c809860cd54193cdf703ab36de111fbd02238033 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Fri, 8 Oct 2021 15:54:38 +0200 Subject: [PATCH 143/187] 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-fugitive | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vim/pack/plugins/start/fzf b/vim/pack/plugins/start/fzf index f4f47f5..179993f 160000 --- a/vim/pack/plugins/start/fzf +++ b/vim/pack/plugins/start/fzf @@ -1 +1 @@ -Subproject commit f4f47f5fe32db500765b47d937f5eb8fa27be130 +Subproject commit 179993f0cd79c6d1ec88981084ed04090e4f77f2 diff --git a/vim/pack/plugins/start/fzf.vim b/vim/pack/plugins/start/fzf.vim index bd703a7..a4ce66d 160000 --- a/vim/pack/plugins/start/fzf.vim +++ b/vim/pack/plugins/start/fzf.vim @@ -1 +1 @@ -Subproject commit bd703a7a7d7afd113634a346290acc27dd314bfc +Subproject commit a4ce66d72508ce7c626dd7fe1ada9c3273fb5313 diff --git a/vim/pack/plugins/start/nerdtree b/vim/pack/plugins/start/nerdtree index e731b84..9310f91 160000 --- a/vim/pack/plugins/start/nerdtree +++ b/vim/pack/plugins/start/nerdtree @@ -1 +1 @@ -Subproject commit e731b845590017493224dfcb7403c2332105b700 +Subproject commit 9310f91476a94ee9c2f3a587171893743a343e26 diff --git a/vim/pack/plugins/start/vim-fugitive b/vim/pack/plugins/start/vim-fugitive index 7b05afd..bcf7478 160000 --- a/vim/pack/plugins/start/vim-fugitive +++ b/vim/pack/plugins/start/vim-fugitive @@ -1 +1 @@ -Subproject commit 7b05afd548bd5e3f45e61fee3defc024a762adfd +Subproject commit bcf7478e6be9c8e425c0f9fb224821748132d4c3 From bfce13a6093c9d853c57f22d16d49365d8533588 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Mon, 11 Oct 2021 07:59:34 +0200 Subject: [PATCH 144/187] remove comments and fix typo --- functions.sh | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/functions.sh b/functions.sh index 9fe02c3..b1da67c 100755 --- a/functions.sh +++ b/functions.sh @@ -20,7 +20,7 @@ promptcommandmunge () { esac EXIT } -## this function updates in combination with PROMPT_COMMAND the shell-environment-variables in tmus-sessions, +## this function updates in combination with PROMPT_COMMAND the shell-environment-variables in tmux-sessions, # every time prompt is called. It does it only, when called from tmux (Environment TMUX is set) function _tmux_hook() { # [ -z "${TMUX+x}" ] || eval "$(tmux show-environment -s)" @@ -31,10 +31,6 @@ function _tmux_hook() { } -# Append `;` if PROMPT_COMMAND is not empty -#PROMPT_COMMAND="${PROMPT_COMMAND:+$PROMPT_COMMAND;}_tmux_hook" - - # To make the code more reliable on detecting the default umask function _umask_hook { # Record the default umask value on the 1st run @@ -47,9 +43,6 @@ function _umask_hook { fi } -# Append `;` if PROMPT_COMMAND is not empty -#PROMPT_COMMAND="${PROMPT_COMMAND:+$PROMPT_COMMAND;}_umask_hook" - cpb() { scp "$1" ${SSH_CLIENT%% *}:~/Work } From 02202dd66c00473290369182dfffa913b2b7e84b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Mon, 11 Oct 2021 08:00:04 +0200 Subject: [PATCH 145/187] remove old code --- PS1 | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/PS1 b/PS1 index 4a9dddb..b6457d5 100644 --- a/PS1 +++ b/PS1 @@ -18,23 +18,12 @@ set_label() { # Labels: remote, tmpconfig, screen... if [ ! -z ${SSH_TTY:+x} ]; then - # oritinal - #LABEL="${LABEL} \[$On_IRed\]\[$BBlack\]remote\[$Color_Off\]" - # use with echo ${LABEL@P} - #LABEL="${LABEL} \[$On_IRed\]remote\[$Color_Off\]" - # use with echo -e ${LABEL} LABEL="${LABEL} ${On_IRed}${BBlack}remote${Color_Off}" fi if $SSHS ; then - # oritinal - #LABEL="${LABEL} \[$On_IWhite\]\[$BBlack\]tmpconfig\[$Color_Off\]" - # use with echo ${LABEL@P} - #LABEL="${LABEL} \[$On_IWhite\]\[$BBlack\]tmpconfig\[$Color_Off\]" - # use with echo -e ${LABEL} LABEL="${LABEL} ${On_IWhite}${BBlack}tmpconfig${Color_Off}" fi echo -e ${LABEL} - #echo ${LABEL@P} } if [ -x "/usr/bin/getsyssubvol" ]; then @@ -138,20 +127,7 @@ case "$TERM" in *) SCREEN="";; esac - # Labels: remote, tmpconfig, screen... -# if [ ! -z ${SSH_TTY:+x} ]; then -# LABEL="${LABEL} \[$On_IRed\]\[$BBlack\]remote\[$Color_Off\]" -# fi -# if $SSHS ; then -# LABEL="${LABEL} \[$On_IWhite\]\[$BBlack\]tmpconfig\[$Color_Off\]" -# fi - # Base prompt -# if [ "`id -u`" -eq 0 ]; then -# PS1="\[$BRed\]$SCREEN\u@\h \[$BRed\]\[\e[m\]\[$IPurple\](\A)\[\e[m\]$LABEL\n\[$BRed\]${SYSSUBVOL}\w:\$(parse_git_branch) \[\e[m\]\[$BRed\]# " -# else -# PS1="\[$BIBlue\]$SCREEN\u@\h \[$BIBlue\]\[\e[m\]\[$IPurple\](\A)\[\e[m\]$LABEL\n\[$BIBlue\]${SYSSUBVOL}\w:\$(parse_git_branch) \[\e[m\]\[$BIBlue\]\$ " -# fi if [ "`id -u`" -eq 0 ]; then PS1="\[$BRed\]$SCREEN\u@\h \[$BRed\]\[\e[m\]\[$IPurple\](\A)\[\e[m\]\$(set_label)\n\[$BRed\]${SYSSUBVOL}\w:\$(parse_git_branch) \[\e[m\]\[$BRed\]# " else @@ -161,14 +137,6 @@ case "$TERM" in RETVALN0="\342\234\227 " ;; *) - # Labels: remote, tmpconfig, screen... -# if [ ! -z ${SSH_TTY:+x} ]; then -# LABEL="${LABEL} \[$On_Red\]\[$BWhite\]remote\[$Color_Off\]" -# fi -# if $SSHS ; then -# LABEL="${LABEL} \[$On_White\]\[$BBlack\]tmpconfig\[$Color_Off\]" -# fi - # Base prompt if [ "`id -u`" -eq 0 ]; then PS1="\[$BRed\][$SYSSUBVOL]\u@\h \[$BIBlue\]\[\e[m\]\[$BIPurple\](\A)\[\e[m\]\[$BBlue\]\$(set_label)\n\[$BRed\]${SYSSUBVOL}\w:\$(parse_git_branch) \$ \[\e[m\]\[$Blue\]" From 992da95715fa85880c6d6adaf1b605060dd10587 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Mon, 11 Oct 2021 08:00:27 +0200 Subject: [PATCH 146/187] run only local not in remote shell --- bin/startagent | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/bin/startagent b/bin/startagent index e0e0507..3d94215 100755 --- a/bin/startagent +++ b/bin/startagent @@ -368,7 +368,14 @@ ssh-runinagent () { } -agent-start-or-restart $ssh_identity -! $createonly && agent-load-identity-keys $ssh_identity +if [ $SSH_TTY ] ; then + echo remote >&2 + res=1 +else + echo local >&2 + agent-start-or-restart $ssh_identity + ! $createonly && agent-load-identity-keys $ssh_identity + res=0 +fi SCRIPTEXIT -exit $? +exit $res From 056b63220469a0409a5f6c5b03a56099ed75c488 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Mon, 11 Oct 2021 20:40:39 +0200 Subject: [PATCH 147/187] add mergestrategie --- .gitconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitconfig b/.gitconfig index af89f94..7d67ca6 100755 --- a/.gitconfig +++ b/.gitconfig @@ -46,3 +46,5 @@ path = ~/.gitconfig_local [status] submodulesummary = 1 +[pull] + rebase = false From 938130bc23fb8346653805882116fbe041e29f7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 13 Oct 2021 11:42:27 +0200 Subject: [PATCH 148/187] update submodules --- tmux/plugins/tmux-sensible | 2 +- tmux/plugins/tmux-themepack | 2 +- vim/pack/plugins/start/fzf | 2 +- vim/pack/plugins/start/fzf.vim | 2 +- vim/pack/plugins/start/vim-fugitive | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tmux/plugins/tmux-sensible b/tmux/plugins/tmux-sensible index e91b178..5d089e4 160000 --- a/tmux/plugins/tmux-sensible +++ b/tmux/plugins/tmux-sensible @@ -1 +1 @@ -Subproject commit e91b178ff832b7bcbbf4d99d9f467f63fd1b76b5 +Subproject commit 5d089e418efb1a00f47654014ed085deb3d0c878 diff --git a/tmux/plugins/tmux-themepack b/tmux/plugins/tmux-themepack index 1b1b809..7c59902 160000 --- a/tmux/plugins/tmux-themepack +++ b/tmux/plugins/tmux-themepack @@ -1 +1 @@ -Subproject commit 1b1b8098419daacb92ca401ad6ee0ca6894a40ca +Subproject commit 7c59902f64dcd7ea356e891274b21144d1ea5948 diff --git a/vim/pack/plugins/start/fzf b/vim/pack/plugins/start/fzf index 179993f..5fc78e4 160000 --- a/vim/pack/plugins/start/fzf +++ b/vim/pack/plugins/start/fzf @@ -1 +1 @@ -Subproject commit 179993f0cd79c6d1ec88981084ed04090e4f77f2 +Subproject commit 5fc78e4584eface9f2055ee7c31c2ae8c5cedc87 diff --git a/vim/pack/plugins/start/fzf.vim b/vim/pack/plugins/start/fzf.vim index a4ce66d..0452b71 160000 --- a/vim/pack/plugins/start/fzf.vim +++ b/vim/pack/plugins/start/fzf.vim @@ -1 +1 @@ -Subproject commit a4ce66d72508ce7c626dd7fe1ada9c3273fb5313 +Subproject commit 0452b71830b1a219b8cdc68141ee58ec288ea711 diff --git a/vim/pack/plugins/start/vim-fugitive b/vim/pack/plugins/start/vim-fugitive index bcf7478..2e66b3a 160000 --- a/vim/pack/plugins/start/vim-fugitive +++ b/vim/pack/plugins/start/vim-fugitive @@ -1 +1 @@ -Subproject commit bcf7478e6be9c8e425c0f9fb224821748132d4c3 +Subproject commit 2e66b3ad05d85f09d870f82671b8503cf8fa4297 From 86a9254b25c4d7d10914a71a6db2deea2103531f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 14 Oct 2021 08:20:27 +0200 Subject: [PATCH 149/187] change debug to logging --- bin/startagent | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/startagent b/bin/startagent index 3d94215..8721343 100755 --- a/bin/startagent +++ b/bin/startagent @@ -369,10 +369,10 @@ ssh-runinagent () { } if [ $SSH_TTY ] ; then - echo remote >&2 + logdebug "run with forwarded ssh-agent" res=1 else - echo local >&2 + logdebug "run with local ssh-agent" agent-start-or-restart $ssh_identity ! $createonly && agent-load-identity-keys $ssh_identity res=0 From c4e01b78db3fb25cff7bf1ba00a3bbd1d8ac58e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Sun, 17 Oct 2021 23:32:04 +0200 Subject: [PATCH 150/187] update submodules --- vim/pack/plugins/start/fzf | 2 +- vim/pack/plugins/start/fzf.vim | 2 +- vim/pack/plugins/start/vim-fugitive | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vim/pack/plugins/start/fzf b/vim/pack/plugins/start/fzf index 179993f..4138333 160000 --- a/vim/pack/plugins/start/fzf +++ b/vim/pack/plugins/start/fzf @@ -1 +1 @@ -Subproject commit 179993f0cd79c6d1ec88981084ed04090e4f77f2 +Subproject commit 4138333f5cfb6e21b0f8d63a43add4c70c25cdaf diff --git a/vim/pack/plugins/start/fzf.vim b/vim/pack/plugins/start/fzf.vim index a4ce66d..0452b71 160000 --- a/vim/pack/plugins/start/fzf.vim +++ b/vim/pack/plugins/start/fzf.vim @@ -1 +1 @@ -Subproject commit a4ce66d72508ce7c626dd7fe1ada9c3273fb5313 +Subproject commit 0452b71830b1a219b8cdc68141ee58ec288ea711 diff --git a/vim/pack/plugins/start/vim-fugitive b/vim/pack/plugins/start/vim-fugitive index bcf7478..93f41ac 160000 --- a/vim/pack/plugins/start/vim-fugitive +++ b/vim/pack/plugins/start/vim-fugitive @@ -1 +1 @@ -Subproject commit bcf7478e6be9c8e425c0f9fb224821748132d4c3 +Subproject commit 93f41ace7dc068cf89314bcea23bdf8da686407a From 7e2ab392fb9d4d3943708c2bc0a3b4cb6b839e83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Tue, 19 Oct 2021 10:27:12 +0200 Subject: [PATCH 151/187] add function to rename lvm vg and dependencies --- functions.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/functions.sh b/functions.sh index b1da67c..a648267 100755 --- a/functions.sh +++ b/functions.sh @@ -1003,4 +1003,17 @@ cporig () { cp -b -i "${1}" "${1}.orig" } + +vgrename_full () { + + altevolumegroup="$1" + neuevolumegroup="$2" + + vgrename ${altevolumegroup} ${neuevolumegroup} + sed -i "s/${altevolumegroup}/${neuevolumegroup}/g" /etc/fstab + sed -i "s/${altevolumegroup}/${neuevolumegroup}/g" /boot/grub/grub.cfg + sed -i "s/${altevolumegroup}/${neuevolumegroup}/g" /boot/grub/menu.lst + sed -i "s/${altevolumegroup}/${neuevolumegroup}/g" /etc/initramfs-tools/conf.d/resume + update-initramfs -c -k all +} #EOF From 1d09e7368dc61e5ce439df04bc7274068bc1b42f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Tue, 19 Oct 2021 11:49:51 +0200 Subject: [PATCH 152/187] add function for test ip adresses --- functions.sh | 20 ++++++++++++++++++++ sshs_addfiles.conf | 1 + 2 files changed, 21 insertions(+) diff --git a/functions.sh b/functions.sh index a648267..09b548b 100755 --- a/functions.sh +++ b/functions.sh @@ -1016,4 +1016,24 @@ vgrename_full () { sed -i "s/${altevolumegroup}/${neuevolumegroup}/g" /etc/initramfs-tools/conf.d/resume update-initramfs -c -k all } + +getfreeip () { + + local N=$1 + + sudo nmap -v -sn -n $1 -oG - | awk '/Status: Down/{print $2}' + +} + +getusedip () { + + local N=$1 + local DNS=$2 + + sudo nmap -v -sn -n $1 -oG - | awk '!/Status: Down/{print $2}'|while read i;do + echo "$i: $(dig "${DNS:+@}${DNS}" -x $i +short +search)" + + done + +} #EOF diff --git a/sshs_addfiles.conf b/sshs_addfiles.conf index f4722b0..e16158d 100644 --- a/sshs_addfiles.conf +++ b/sshs_addfiles.conf @@ -5,3 +5,4 @@ $(getbashrcfile) ~/.aliases ${MSC_BASE}/aliases ${MSC_BASE}/PS1 ${MSC_BASE}/bash_completion.d/* +${MSC_BASE}/bin/getfreeip From 2f4b96a93919b7c93b1bfb029a13c92b2f985481 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Mon, 20 Sep 2021 08:43:28 +0200 Subject: [PATCH 153/187] update submodules --- bin/getfreeip | 5 +++++ bin/getusedip | 9 +++++++++ sshs_addfiles.conf | 1 - vim/pack/color/start/Zenburn | 2 +- vim/pack/plugins/start/vim-bracketed-paste | 2 +- vim/pack/plugins/start/vim-fugitive | 2 +- vim/pack/plugins/start/vim-nerdtree-tabs | 2 +- vim/pack/syntax/start/indentpython.vim | 2 +- 8 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 bin/getfreeip create mode 100644 bin/getusedip diff --git a/bin/getfreeip b/bin/getfreeip new file mode 100644 index 0000000..141425b --- /dev/null +++ b/bin/getfreeip @@ -0,0 +1,5 @@ +#!/bin/bash + +N=$1 + +sudo nmap -v -sn -n $1 -oG - | awk '/Status: Down/{print $2}' diff --git a/bin/getusedip b/bin/getusedip new file mode 100644 index 0000000..309126e --- /dev/null +++ b/bin/getusedip @@ -0,0 +1,9 @@ +#!/bin/bash + +N=$1 +DNS=$1 + +sudo nmap -v -sn -n $1 -oG - | awk '!/Status: Down/{print $2}'|while read i;do + echo "$i: $(dig "$DNS" -x $i +short +search)" + +done diff --git a/sshs_addfiles.conf b/sshs_addfiles.conf index e16158d..f4722b0 100644 --- a/sshs_addfiles.conf +++ b/sshs_addfiles.conf @@ -5,4 +5,3 @@ $(getbashrcfile) ~/.aliases ${MSC_BASE}/aliases ${MSC_BASE}/PS1 ${MSC_BASE}/bash_completion.d/* -${MSC_BASE}/bin/getfreeip diff --git a/vim/pack/color/start/Zenburn b/vim/pack/color/start/Zenburn index 33e67af..bdd9f58 160000 --- a/vim/pack/color/start/Zenburn +++ b/vim/pack/color/start/Zenburn @@ -1 +1 @@ -Subproject commit 33e67af2418e4775c2a7abc6e8fef401e697e1eb +Subproject commit bdd9f58b969b153a586d22435c987a846da2922b diff --git a/vim/pack/plugins/start/vim-bracketed-paste b/vim/pack/plugins/start/vim-bracketed-paste index c4c639f..1b32008 160000 --- a/vim/pack/plugins/start/vim-bracketed-paste +++ b/vim/pack/plugins/start/vim-bracketed-paste @@ -1 +1 @@ -Subproject commit c4c639f3cacd1b874ed6f5f196fac772e089c932 +Subproject commit 1b320083dc0892b8a874a17c75abfea86c801434 diff --git a/vim/pack/plugins/start/vim-fugitive b/vim/pack/plugins/start/vim-fugitive index 93f41ac..4d29c1d 160000 --- a/vim/pack/plugins/start/vim-fugitive +++ b/vim/pack/plugins/start/vim-fugitive @@ -1 +1 @@ -Subproject commit 93f41ace7dc068cf89314bcea23bdf8da686407a +Subproject commit 4d29c1d6a0def18923b4762c8f85ca3ee5ae6c83 diff --git a/vim/pack/plugins/start/vim-nerdtree-tabs b/vim/pack/plugins/start/vim-nerdtree-tabs index 07d19f0..8eadb5b 160000 --- a/vim/pack/plugins/start/vim-nerdtree-tabs +++ b/vim/pack/plugins/start/vim-nerdtree-tabs @@ -1 +1 @@ -Subproject commit 07d19f0299762669c6f93fbadb8249da6ba9de62 +Subproject commit 8eadb5bd8fead8594d201f7cd78aed912243fd9f diff --git a/vim/pack/syntax/start/indentpython.vim b/vim/pack/syntax/start/indentpython.vim index 6aaddfd..3c6d80f 160000 --- a/vim/pack/syntax/start/indentpython.vim +++ b/vim/pack/syntax/start/indentpython.vim @@ -1 +1 @@ -Subproject commit 6aaddfde21fe9e7acbe448b92b3cbb67f2fe1fc1 +Subproject commit 3c6d80fc59d57ed2fbef14333c0efef02cbcf2f8 From 894445f7005d5f7367403ee59eff09a566ebf254 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Sun, 3 Oct 2021 23:18:54 +0200 Subject: [PATCH 154/187] make other keys in token chooseable by label --- functions.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/functions.sh b/functions.sh index 09b548b..ced721e 100755 --- a/functions.sh +++ b/functions.sh @@ -998,6 +998,11 @@ convert_to_subvolume () { } +getfreeip () { + local N=$1 + sudo nmap -v -sn -n $1 -oG - | awk '/Status: Down/{print $2}' +} + cporig () { cp -b -i "${1}" "${1}.orig" From bd86707429d0cf2f6da4cdc2553447d7d81f93ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Sun, 3 Oct 2021 23:28:13 +0200 Subject: [PATCH 155/187] set pull strategy to rebase --- .gitconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitconfig b/.gitconfig index 7d67ca6..a79c6dc 100755 --- a/.gitconfig +++ b/.gitconfig @@ -47,4 +47,4 @@ [status] submodulesummary = 1 [pull] - rebase = false + rebase = true From 7d575a5c4f1529b3bb3d623301ff4f2a88154ba7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 20 Oct 2021 16:04:11 +0200 Subject: [PATCH 156/187] change echo to logger --- myshell_load_defaults | 4 ++-- myshell_load_x2go_tokenforward | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/myshell_load_defaults b/myshell_load_defaults index c928b3a..a29bd1c 100644 --- a/myshell_load_defaults +++ b/myshell_load_defaults @@ -28,7 +28,7 @@ if ! $SSHS; then ####################################################################################### # User specific aliases and function - echo "notmpconf" + logdebug "notmpconf" if [ -e ${MSC_BASE}/functions.sh ]; then . ${MSC_BASE}/functions.sh else @@ -112,7 +112,7 @@ if ! $SSHS; then else # run with temporary config - echo "tmpconf" + logdebug "tmpconf" case $TERM in *screen*) loginfo BASHRC: $BASHRC -> source it diff --git a/myshell_load_x2go_tokenforward b/myshell_load_x2go_tokenforward index 7285937..0110571 100644 --- a/myshell_load_x2go_tokenforward +++ b/myshell_load_x2go_tokenforward @@ -14,7 +14,7 @@ if [ -n "$SSH_AUTH_SOCK" ] && \ chmod 600 ~/.x2go/agentsocket chown $USER ~/.x2go/agentsocket # write file name of agent socket into file - loginfo "old agentsock $( cat ~/.x2go/agentsocket)" + logdebug "old agentsock $( cat ~/.x2go/agentsocket)" echo $SSH_AUTH_SOCK > ~/.x2go/agentsocket #rm ~/.x2go/agentsocket #ln -s $SSH_AUTH_SOCK ~/.x2go/agentsocket From 6d8e79c8bc45ad56ec31a3b1bc61d1ce7459702e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Fri, 22 Oct 2021 08:25:01 +0200 Subject: [PATCH 157/187] add jira/confluence specific database function --- functions.sh | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/functions.sh b/functions.sh index ced721e..a0b0a89 100755 --- a/functions.sh +++ b/functions.sh @@ -1041,4 +1041,74 @@ getusedip () { done } + +function getdbcreds_jra () { + case $# in + 0) + gojirahome + DB_FILE=dbconfig.xml + cd - + ;; + 1) + DB_FILE=$1 + ;; + *) + echo "wrong number of arguments" + return 1 + ;; + esac + + DB_URL="$(grep -oPm1 "(?<=)[^<]+" ${DB_FILE})" + DB_USER="$(grep -oPm1 "(?<=)[^<]+" ${DB_FILE})" + DB_PWD="$(grep -oPm1 "(?<=)[^<]+" ${DB_FILE})" + DB_HOST="$(echo $DB_URL|sed 's@^.*//@@;s@\(^.*\):\(.*\)/\(.*\)$@\1@')" + DB_PORT="$(echo $DB_URL|sed 's@^.*//@@;s@\(^.*\):\(.*\)/\(.*\)$@\2@')" + DB_NAME="$(echo $DB_URL|sed 's@^.*//@@;s@\(^.*\):\(.*\)/\(.*\)$@\3@')" + + return 0 +} + +function getdbcreds_cnf () { + case $# in + 0) + gocnfhome + DB_FILE=confluence.cfg.xml + ;; + 1) + DB_FILE=$1 + ;; + *) + echo "wrong number of arguments" + cd - + return 1 + ;; + esac + + DB_URL="$(grep -oPm1 "(?<=)[^<]+" ${DB_FILE})" + DB_USER="$(grep -oPm1 "(?<=)[^<]+" ${DB_FILE})" + DB_PWD="$(grep -oPm1 "(?<=)[^<]+" ${DB_FILE})" + DB_HOST="$(echo $DB_URL|sed 's@^.*//@@;s@\(^.*\):\(.*\)/\(.*\)$@\1@')" + DB_PORT="$(echo $DB_URL|sed 's@^.*//@@;s@\(^.*\):\(.*\)/\(.*\)$@\2@')" + DB_NAME="$(echo $DB_URL|sed 's@^.*//@@;s@\(^.*\):\(.*\)/\(.*\)$@\3@')" + + cd - + return 0 +} +function connectdb () { + + case $1 in + jra|jira) + getdbcreds_jra + ;; + cnf|conf|confluence) + getdbcreds_cnf + ;; + *) + echo "wrong argument" + return 1 + ;; + esac + + PGPASSWORD=$DB_PWD psql -h $DB_HOST -p $DB_PORT -U $DB_USER $DB_NAME +} #EOF From bc9c77215d8ded150c18a73e7af7a6a7ead90177 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Sun, 24 Oct 2021 12:05:30 +0200 Subject: [PATCH 158/187] add targetmail and bash completion for trashmail --- bash_completion.d/trashmail | 14 ++++++++++++++ bin/trashmail | 9 +++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 bash_completion.d/trashmail diff --git a/bash_completion.d/trashmail b/bash_completion.d/trashmail new file mode 100644 index 0000000..5636f26 --- /dev/null +++ b/bash_completion.d/trashmail @@ -0,0 +1,14 @@ +#!/bin/bash + +function _trashmail() { + COMPREPLY=() + local CUR KEYS + CUR="${COMP_WORDS[COMP_CWORD]}" + KEYS=$(ldapsearch -LLL -Z -H ldap://${LDAP_HOST_DEFAULT} -D ${LDAP_ADMIN_BIND_DN} -x -w $(pass ${PASS_ID_LDAP_ADMIN}|head -n 1) -b ou=mailaccounts,dc=schuerz,dc=at '(&(dcAccountStatus=active)(objectClass=dcExternalMailAccount))' dcSubMailAddress|grep "^dcSubMailAddress"|awk '{print $2}') + COMPREPLY=( $(compgen -W "${KEYS}" -- ${CUR}) ) + return 0 +} +complete -F _trashmail trashmail + + + diff --git a/bin/trashmail b/bin/trashmail index 10a1d5b..c9d03dd 100755 --- a/bin/trashmail +++ b/bin/trashmail @@ -34,6 +34,7 @@ show_help () { --help show this help/usage -l|--length |full cut hashed part of username to characters from start (default: ${HASHLENGHT_DEFAULT}) -n|--not-hashed do not hash username from targetdomain and linux-login-user + -t|--target-mail Emailadress for which trashmail is created -w|--full-hash do not cut hash (same as »-l full«) -y|--symbols same option as in pwgen. Include at least one special character in the password. @@ -43,8 +44,8 @@ EOF } # TODO: how exit main-shell from error in subshell??? -getopt -u -o dfhl:nwy --long delete,force,hashed,help,not-hashed,hashlength:,whole-hash,symblols -- "$@" || exit $? -set -- $(getopt -u -o dfhl:nwy --long delete,force,hashed,help,not-hashed,hashlength:,whole-hash,symblols -- "$@"|| exit $?) +getopt -u -o dfhl:nt:wy --long delete,force,hashed,help,not-hashed,hashlength:,whole-hash,symblols,target-mail: -- "$@" || exit $? +set -- $(getopt -u -o dfhl:nt:wy --long delete,force,hashed,help,not-hashed,hashlength:,whole-hash,symblols,target-mail: -- "$@"|| exit $?) echo @: $@ while : ; do @@ -77,6 +78,10 @@ while : ; do HASHED=false shift ;; + -t|--target-mail) + TARGET_MAIL=$2 + shift; shift; + ;; -w|--full-hash) HASHLENGTH=full shift; From 5ea9128a28e4ff52425491e022576e9746fbb477 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Fri, 29 Oct 2021 14:57:58 +0200 Subject: [PATCH 159/187] fix some small problems * change options for sshs * run sshs only when server is reachable * change echo to logging * fix loadagent to abort, when af is empty --- functions.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/functions.sh b/functions.sh index a0b0a89..e285075 100755 --- a/functions.sh +++ b/functions.sh @@ -346,6 +346,7 @@ EOF sshs() { ENTRY + local LOGLEVEL="WARN" # MKTMPCMD='mktemp $(echo ${XDG_RUNTIME_DIR}/bashrc.XXXXXXXX.conf)' # VIMMKTMPCMD="mktemp ${XDG_RUNTIME_DIR}/vimrc.XXXXXXXX.conf" @@ -363,9 +364,10 @@ sshs() { done fi logdebug "FILELIST: $FILELIST" - local SSH_OPTS="-o VisualHostKey=no -o ControlMaster=auto -o ControlPersist=15s -o ControlPath=~/.ssh/ssh-%C" + local SSH_OPTS="-o VisualHostKey=no -o ControlMaster=auto -o ControlPersist=2s -o ControlPath=~/.ssh/master-%C" #local SSH_OPTS="-o VisualHostKey=no -o ControlMaster=yes -o ControlPersist=10s -o ControlPath=~/.ssh/ssh-%C" # Read /etc/bashrc or /etc/bash.bashrc (depending on distribution) and /etc/profile.d/*.sh first + ssh -T ${SSH_OPTS} $@ "pwd" >/dev/null 2>/dev/null || { logerror "Server $@ not reachable -> exit"; return 1; } cat << EOF >> "${TMPBASHCONFIG}" [ -e /etc/bashrc ] && BASHRC=/etc/bashrc [ -e /etc/bash.bashrc ] && BASHRC=/etc/bash.bashrc @@ -490,7 +492,7 @@ vim-repair-vundle () { getbashrcfile () { ENTRY if [ -z ${BASHRC+x} ] ; then - echo "bash uses default" >&2 + loginfo "bash uses default" else cat /proc/$$/cmdline | xargs -0 echo|awk '{print $3}' fi @@ -500,7 +502,7 @@ getbashrcfile () { catbashrcfile () { ENTRY if [ -z ${BASHRC+x} ] ; then - echo "bash uses default" >&2 + loginfo "bash uses default" else #cat $(cat /proc/$$/cmdline | xargs -0 echo|awk '{print $3}') cat $(getbashrcfile) @@ -879,7 +881,7 @@ loadagent() { af=$(startagent --create-only $1 ) loginfo "Load agent from $af" unset SSH_AUTH_SOCKET SSH_AGENT_PID - eval $(<$af) + [ -n "${af+x}" ] && eval $(<$af) logdebug "SSH_AUTH_SOCK: ${SSH_AUTH_SOCK-not set}" logdebug "SSH_AGENT_PID: ${SSH_AGENT_PID-not set}" loginfo "currently loaded keys in agent: From 6f1b7270cd413592938ccc4a555a1a51a75a866d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Sun, 31 Oct 2021 10:17:49 +0100 Subject: [PATCH 160/187] add comment about target_adress in pass-entry --- bin/trashmail | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/trashmail b/bin/trashmail index c9d03dd..2ae0c65 100755 --- a/bin/trashmail +++ b/bin/trashmail @@ -217,6 +217,7 @@ email: ${TRASHMAIL} login: ${TRASHUSER} url: ${URL} comment: trashemail autogenerated md5-hash from »${host}${USER}« cut to ${HASHLENGTH}. Delete email, when account deleted!!! +targetmail for this trashmail is ${TARGET_MAIL} EOF fi #set +x From f58c4783af4183033c57d5f057c0a137a50fdfc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 3 Nov 2021 08:20:17 +0100 Subject: [PATCH 161/187] submodule commits from upstream --- tmux/plugins/tmux-sensible | 2 +- tmux/plugins/tmux-themepack | 2 +- vim/pack/color/start/Zenburn | 2 +- vim/pack/color/start/vim-colors-solarized | 2 +- vim/pack/plugins/start/SimpylFold | 2 +- vim/pack/plugins/start/ctrlp.vim | 2 +- vim/pack/plugins/start/fzf | 2 +- vim/pack/plugins/start/fzf.vim | 2 +- vim/pack/plugins/start/syntastic | 2 +- vim/pack/plugins/start/vim-airline | 2 +- vim/pack/plugins/start/vim-airline-themes | 2 +- vim/pack/plugins/start/vim-bracketed-paste | 2 +- vim/pack/plugins/start/vim-fugitive | 2 +- vim/pack/plugins/start/vim-gitgutter | 2 +- vim/pack/plugins/start/vim-nerdtree-tabs | 2 +- vim/pack/syntax/start/indentpython.vim | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/tmux/plugins/tmux-sensible b/tmux/plugins/tmux-sensible index 5d089e4..e91b178 160000 --- a/tmux/plugins/tmux-sensible +++ b/tmux/plugins/tmux-sensible @@ -1 +1 @@ -Subproject commit 5d089e418efb1a00f47654014ed085deb3d0c878 +Subproject commit e91b178ff832b7bcbbf4d99d9f467f63fd1b76b5 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/vim/pack/color/start/Zenburn b/vim/pack/color/start/Zenburn index bdd9f58..33e67af 160000 --- a/vim/pack/color/start/Zenburn +++ b/vim/pack/color/start/Zenburn @@ -1 +1 @@ -Subproject commit bdd9f58b969b153a586d22435c987a846da2922b +Subproject commit 33e67af2418e4775c2a7abc6e8fef401e697e1eb diff --git a/vim/pack/color/start/vim-colors-solarized b/vim/pack/color/start/vim-colors-solarized index 528a59f..399b12c 160000 --- a/vim/pack/color/start/vim-colors-solarized +++ b/vim/pack/color/start/vim-colors-solarized @@ -1 +1 @@ -Subproject commit 528a59f26d12278698bb946f8fb82a63711eec21 +Subproject commit 399b12c7577f974c792ec28fcaebf1aa99352d1a diff --git a/vim/pack/plugins/start/SimpylFold b/vim/pack/plugins/start/SimpylFold index 0459df8..4da7579 160000 --- a/vim/pack/plugins/start/SimpylFold +++ b/vim/pack/plugins/start/SimpylFold @@ -1 +1 @@ -Subproject commit 0459df8a0bbfc8ef1bfd88db889e881626f65914 +Subproject commit 4da7579d1b82cfa99b0ee9405015ba72bddb2ff6 diff --git a/vim/pack/plugins/start/ctrlp.vim b/vim/pack/plugins/start/ctrlp.vim index f68f4d0..61e964f 160000 --- a/vim/pack/plugins/start/ctrlp.vim +++ b/vim/pack/plugins/start/ctrlp.vim @@ -1 +1 @@ -Subproject commit f68f4d00b9c99d0d711bfde3b071f0dafd249901 +Subproject commit 61e964f2d168f52cb8e80e67d26605b52d726b16 diff --git a/vim/pack/plugins/start/fzf b/vim/pack/plugins/start/fzf index 4138333..dd882d5 160000 --- a/vim/pack/plugins/start/fzf +++ b/vim/pack/plugins/start/fzf @@ -1 +1 @@ -Subproject commit 4138333f5cfb6e21b0f8d63a43add4c70c25cdaf +Subproject commit dd882d5c3c24e0da9cb5deea2f592da1de0dd112 diff --git a/vim/pack/plugins/start/fzf.vim b/vim/pack/plugins/start/fzf.vim index 0452b71..33a1069 160000 --- a/vim/pack/plugins/start/fzf.vim +++ b/vim/pack/plugins/start/fzf.vim @@ -1 +1 @@ -Subproject commit 0452b71830b1a219b8cdc68141ee58ec288ea711 +Subproject commit 33a1069dbdf22419637000ae83df7501266be364 diff --git a/vim/pack/plugins/start/syntastic b/vim/pack/plugins/start/syntastic index 97bf9ec..d086f49 160000 --- a/vim/pack/plugins/start/syntastic +++ b/vim/pack/plugins/start/syntastic @@ -1 +1 @@ -Subproject commit 97bf9ec720662af51ae403b6dfe720d4a24bfcbc +Subproject commit d086f49d389e1c2d58211b1f92cf20c9f63dc325 diff --git a/vim/pack/plugins/start/vim-airline b/vim/pack/plugins/start/vim-airline index 26f9227..0e6b9c3 160000 --- a/vim/pack/plugins/start/vim-airline +++ b/vim/pack/plugins/start/vim-airline @@ -1 +1 @@ -Subproject commit 26f922753a288df639b8d05d13ed62b9b04a26bc +Subproject commit 0e6b9c3e7b4bfe5d1919cdcce3fdbc085d2ee0c4 diff --git a/vim/pack/plugins/start/vim-airline-themes b/vim/pack/plugins/start/vim-airline-themes index 97cf3e6..6f409ca 160000 --- a/vim/pack/plugins/start/vim-airline-themes +++ b/vim/pack/plugins/start/vim-airline-themes @@ -1 +1 @@ -Subproject commit 97cf3e6e638f936187d5f6e9b5eb1bdf0a4df256 +Subproject commit 6f409ca4d62a1b599879b5aef950bd7278f39616 diff --git a/vim/pack/plugins/start/vim-bracketed-paste b/vim/pack/plugins/start/vim-bracketed-paste index 1b32008..c4c639f 160000 --- a/vim/pack/plugins/start/vim-bracketed-paste +++ b/vim/pack/plugins/start/vim-bracketed-paste @@ -1 +1 @@ -Subproject commit 1b320083dc0892b8a874a17c75abfea86c801434 +Subproject commit c4c639f3cacd1b874ed6f5f196fac772e089c932 diff --git a/vim/pack/plugins/start/vim-fugitive b/vim/pack/plugins/start/vim-fugitive index 4d29c1d..8336330 160000 --- a/vim/pack/plugins/start/vim-fugitive +++ b/vim/pack/plugins/start/vim-fugitive @@ -1 +1 @@ -Subproject commit 4d29c1d6a0def18923b4762c8f85ca3ee5ae6c83 +Subproject commit 83363307551a3149ba530607c3394c72e4554209 diff --git a/vim/pack/plugins/start/vim-gitgutter b/vim/pack/plugins/start/vim-gitgutter index 256702d..01959a0 160000 --- a/vim/pack/plugins/start/vim-gitgutter +++ b/vim/pack/plugins/start/vim-gitgutter @@ -1 +1 @@ -Subproject commit 256702dd1432894b3607d3de6cd660863b331818 +Subproject commit 01959a0e6fdc172bf05268acc8bf37afd4e09c65 diff --git a/vim/pack/plugins/start/vim-nerdtree-tabs b/vim/pack/plugins/start/vim-nerdtree-tabs index 8eadb5b..e559300 160000 --- a/vim/pack/plugins/start/vim-nerdtree-tabs +++ b/vim/pack/plugins/start/vim-nerdtree-tabs @@ -1 +1 @@ -Subproject commit 8eadb5bd8fead8594d201f7cd78aed912243fd9f +Subproject commit e559300af0508b3f02b760db68e9a9f5f022428c diff --git a/vim/pack/syntax/start/indentpython.vim b/vim/pack/syntax/start/indentpython.vim index 3c6d80f..6aaddfd 160000 --- a/vim/pack/syntax/start/indentpython.vim +++ b/vim/pack/syntax/start/indentpython.vim @@ -1 +1 @@ -Subproject commit 3c6d80fc59d57ed2fbef14333c0efef02cbcf2f8 +Subproject commit 6aaddfde21fe9e7acbe448b92b3cbb67f2fe1fc1 From 25556749578b3e5e3968f58a2b9001759e4d927d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 4 Nov 2021 15:28:00 +0100 Subject: [PATCH 162/187] update submodules --- vim/pack/color/start/vim-colors-solarized | 2 +- vim/pack/plugins/start/SimpylFold | 2 +- 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-airline-themes | 2 +- vim/pack/plugins/start/vim-fugitive | 2 +- vim/pack/plugins/start/vim-gitgutter | 2 +- vim/pack/plugins/start/vim-nerdtree-tabs | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/vim/pack/color/start/vim-colors-solarized b/vim/pack/color/start/vim-colors-solarized index 399b12c..528a59f 160000 --- a/vim/pack/color/start/vim-colors-solarized +++ b/vim/pack/color/start/vim-colors-solarized @@ -1 +1 @@ -Subproject commit 399b12c7577f974c792ec28fcaebf1aa99352d1a +Subproject commit 528a59f26d12278698bb946f8fb82a63711eec21 diff --git a/vim/pack/plugins/start/SimpylFold b/vim/pack/plugins/start/SimpylFold index 4da7579..0459df8 160000 --- a/vim/pack/plugins/start/SimpylFold +++ b/vim/pack/plugins/start/SimpylFold @@ -1 +1 @@ -Subproject commit 4da7579d1b82cfa99b0ee9405015ba72bddb2ff6 +Subproject commit 0459df8a0bbfc8ef1bfd88db889e881626f65914 diff --git a/vim/pack/plugins/start/fzf b/vim/pack/plugins/start/fzf index dd882d5..e4c3ecc 160000 --- a/vim/pack/plugins/start/fzf +++ b/vim/pack/plugins/start/fzf @@ -1 +1 @@ -Subproject commit dd882d5c3c24e0da9cb5deea2f592da1de0dd112 +Subproject commit e4c3ecc57e99f4037199f11b384a7f8758d1a0ff diff --git a/vim/pack/plugins/start/fzf.vim b/vim/pack/plugins/start/fzf.vim index 33a1069..d6aa214 160000 --- a/vim/pack/plugins/start/fzf.vim +++ b/vim/pack/plugins/start/fzf.vim @@ -1 +1 @@ -Subproject commit 33a1069dbdf22419637000ae83df7501266be364 +Subproject commit d6aa21476b2854694e6aa7b0941b8992a906c5ec diff --git a/vim/pack/plugins/start/nerdtree b/vim/pack/plugins/start/nerdtree index 9310f91..eed488b 160000 --- a/vim/pack/plugins/start/nerdtree +++ b/vim/pack/plugins/start/nerdtree @@ -1 +1 @@ -Subproject commit 9310f91476a94ee9c2f3a587171893743a343e26 +Subproject commit eed488b1cd1867bd25f19f90e10440c5cc7d6424 diff --git a/vim/pack/plugins/start/vim-airline b/vim/pack/plugins/start/vim-airline index 0e6b9c3..17f7dff 160000 --- a/vim/pack/plugins/start/vim-airline +++ b/vim/pack/plugins/start/vim-airline @@ -1 +1 @@ -Subproject commit 0e6b9c3e7b4bfe5d1919cdcce3fdbc085d2ee0c4 +Subproject commit 17f7dff748c188eb511ff831c4ea1803418f2b42 diff --git a/vim/pack/plugins/start/vim-airline-themes b/vim/pack/plugins/start/vim-airline-themes index 6f409ca..97cf3e6 160000 --- a/vim/pack/plugins/start/vim-airline-themes +++ b/vim/pack/plugins/start/vim-airline-themes @@ -1 +1 @@ -Subproject commit 6f409ca4d62a1b599879b5aef950bd7278f39616 +Subproject commit 97cf3e6e638f936187d5f6e9b5eb1bdf0a4df256 diff --git a/vim/pack/plugins/start/vim-fugitive b/vim/pack/plugins/start/vim-fugitive index 8336330..a6b823b 160000 --- a/vim/pack/plugins/start/vim-fugitive +++ b/vim/pack/plugins/start/vim-fugitive @@ -1 +1 @@ -Subproject commit 83363307551a3149ba530607c3394c72e4554209 +Subproject commit a6b823b8d0a8959e81876fd4857ba822495c028a diff --git a/vim/pack/plugins/start/vim-gitgutter b/vim/pack/plugins/start/vim-gitgutter index 01959a0..256702d 160000 --- a/vim/pack/plugins/start/vim-gitgutter +++ b/vim/pack/plugins/start/vim-gitgutter @@ -1 +1 @@ -Subproject commit 01959a0e6fdc172bf05268acc8bf37afd4e09c65 +Subproject commit 256702dd1432894b3607d3de6cd660863b331818 diff --git a/vim/pack/plugins/start/vim-nerdtree-tabs b/vim/pack/plugins/start/vim-nerdtree-tabs index e559300..07d19f0 160000 --- a/vim/pack/plugins/start/vim-nerdtree-tabs +++ b/vim/pack/plugins/start/vim-nerdtree-tabs @@ -1 +1 @@ -Subproject commit e559300af0508b3f02b760db68e9a9f5f022428c +Subproject commit 07d19f0299762669c6f93fbadb8249da6ba9de62 From b38d44b5625a0acdcfd0bd0f8dc85b40199e8bd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Fri, 5 Nov 2021 08:55:45 +0100 Subject: [PATCH 163/187] change url from git to http protocol in case proxy --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 4e5fc65..bfc2a0d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -60,4 +60,4 @@ url = https://github.com/jamessan/vim-gnupg [submodule "vim/pack/plugins/start/vim-soa"] path = vim/pack/plugins/start/vim-soa - url = git@git.schuerz.at:/public/vim-soa.git + url = https://git.schuerz.at/public/vim-soa.git From dd2545c06b5ab356ec657f6b34b360f30dd57a7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Fri, 5 Nov 2021 09:00:40 +0100 Subject: [PATCH 164/187] update submodules --- tmux/plugins/tmux-sensible | 2 +- tmux/plugins/tmux-themepack | 2 +- vim/pack/color/start/Zenburn | 2 +- vim/pack/plugins/start/ctrlp.vim | 2 +- vim/pack/plugins/start/fzf | 2 +- vim/pack/plugins/start/fzf.vim | 2 +- vim/pack/plugins/start/nerdtree | 2 +- vim/pack/plugins/start/syntastic | 2 +- vim/pack/plugins/start/vim-airline | 2 +- vim/pack/plugins/start/vim-bracketed-paste | 2 +- vim/pack/plugins/start/vim-fugitive | 2 +- vim/pack/plugins/start/vim-nerdtree-tabs | 2 +- vim/pack/syntax/start/indentpython.vim | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tmux/plugins/tmux-sensible b/tmux/plugins/tmux-sensible index e91b178..5d089e4 160000 --- a/tmux/plugins/tmux-sensible +++ b/tmux/plugins/tmux-sensible @@ -1 +1 @@ -Subproject commit e91b178ff832b7bcbbf4d99d9f467f63fd1b76b5 +Subproject commit 5d089e418efb1a00f47654014ed085deb3d0c878 diff --git a/tmux/plugins/tmux-themepack b/tmux/plugins/tmux-themepack index 1b1b809..7c59902 160000 --- a/tmux/plugins/tmux-themepack +++ b/tmux/plugins/tmux-themepack @@ -1 +1 @@ -Subproject commit 1b1b8098419daacb92ca401ad6ee0ca6894a40ca +Subproject commit 7c59902f64dcd7ea356e891274b21144d1ea5948 diff --git a/vim/pack/color/start/Zenburn b/vim/pack/color/start/Zenburn index 33e67af..bdd9f58 160000 --- a/vim/pack/color/start/Zenburn +++ b/vim/pack/color/start/Zenburn @@ -1 +1 @@ -Subproject commit 33e67af2418e4775c2a7abc6e8fef401e697e1eb +Subproject commit bdd9f58b969b153a586d22435c987a846da2922b diff --git a/vim/pack/plugins/start/ctrlp.vim b/vim/pack/plugins/start/ctrlp.vim index 61e964f..f68f4d0 160000 --- a/vim/pack/plugins/start/ctrlp.vim +++ b/vim/pack/plugins/start/ctrlp.vim @@ -1 +1 @@ -Subproject commit 61e964f2d168f52cb8e80e67d26605b52d726b16 +Subproject commit f68f4d00b9c99d0d711bfde3b071f0dafd249901 diff --git a/vim/pack/plugins/start/fzf b/vim/pack/plugins/start/fzf index e4c3ecc..4138333 160000 --- a/vim/pack/plugins/start/fzf +++ b/vim/pack/plugins/start/fzf @@ -1 +1 @@ -Subproject commit e4c3ecc57e99f4037199f11b384a7f8758d1a0ff +Subproject commit 4138333f5cfb6e21b0f8d63a43add4c70c25cdaf diff --git a/vim/pack/plugins/start/fzf.vim b/vim/pack/plugins/start/fzf.vim index d6aa214..0452b71 160000 --- a/vim/pack/plugins/start/fzf.vim +++ b/vim/pack/plugins/start/fzf.vim @@ -1 +1 @@ -Subproject commit d6aa21476b2854694e6aa7b0941b8992a906c5ec +Subproject commit 0452b71830b1a219b8cdc68141ee58ec288ea711 diff --git a/vim/pack/plugins/start/nerdtree b/vim/pack/plugins/start/nerdtree index eed488b..9310f91 160000 --- a/vim/pack/plugins/start/nerdtree +++ b/vim/pack/plugins/start/nerdtree @@ -1 +1 @@ -Subproject commit eed488b1cd1867bd25f19f90e10440c5cc7d6424 +Subproject commit 9310f91476a94ee9c2f3a587171893743a343e26 diff --git a/vim/pack/plugins/start/syntastic b/vim/pack/plugins/start/syntastic index d086f49..97bf9ec 160000 --- a/vim/pack/plugins/start/syntastic +++ b/vim/pack/plugins/start/syntastic @@ -1 +1 @@ -Subproject commit d086f49d389e1c2d58211b1f92cf20c9f63dc325 +Subproject commit 97bf9ec720662af51ae403b6dfe720d4a24bfcbc diff --git a/vim/pack/plugins/start/vim-airline b/vim/pack/plugins/start/vim-airline index 17f7dff..26f9227 160000 --- a/vim/pack/plugins/start/vim-airline +++ b/vim/pack/plugins/start/vim-airline @@ -1 +1 @@ -Subproject commit 17f7dff748c188eb511ff831c4ea1803418f2b42 +Subproject commit 26f922753a288df639b8d05d13ed62b9b04a26bc diff --git a/vim/pack/plugins/start/vim-bracketed-paste b/vim/pack/plugins/start/vim-bracketed-paste index c4c639f..1b32008 160000 --- a/vim/pack/plugins/start/vim-bracketed-paste +++ b/vim/pack/plugins/start/vim-bracketed-paste @@ -1 +1 @@ -Subproject commit c4c639f3cacd1b874ed6f5f196fac772e089c932 +Subproject commit 1b320083dc0892b8a874a17c75abfea86c801434 diff --git a/vim/pack/plugins/start/vim-fugitive b/vim/pack/plugins/start/vim-fugitive index a6b823b..4d29c1d 160000 --- a/vim/pack/plugins/start/vim-fugitive +++ b/vim/pack/plugins/start/vim-fugitive @@ -1 +1 @@ -Subproject commit a6b823b8d0a8959e81876fd4857ba822495c028a +Subproject commit 4d29c1d6a0def18923b4762c8f85ca3ee5ae6c83 diff --git a/vim/pack/plugins/start/vim-nerdtree-tabs b/vim/pack/plugins/start/vim-nerdtree-tabs index 07d19f0..8eadb5b 160000 --- a/vim/pack/plugins/start/vim-nerdtree-tabs +++ b/vim/pack/plugins/start/vim-nerdtree-tabs @@ -1 +1 @@ -Subproject commit 07d19f0299762669c6f93fbadb8249da6ba9de62 +Subproject commit 8eadb5bd8fead8594d201f7cd78aed912243fd9f diff --git a/vim/pack/syntax/start/indentpython.vim b/vim/pack/syntax/start/indentpython.vim index 6aaddfd..3c6d80f 160000 --- a/vim/pack/syntax/start/indentpython.vim +++ b/vim/pack/syntax/start/indentpython.vim @@ -1 +1 @@ -Subproject commit 6aaddfde21fe9e7acbe448b92b3cbb67f2fe1fc1 +Subproject commit 3c6d80fc59d57ed2fbef14333c0efef02cbcf2f8 From e9d3abbeeebf2cd041209024b97dc1ff966f8d29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 11 Nov 2021 08:32:27 +0100 Subject: [PATCH 165/187] add choose db-file and better logging --- functions.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/functions.sh b/functions.sh index e285075..c1ca385 100755 --- a/functions.sh +++ b/functions.sh @@ -355,7 +355,7 @@ sshs() { local TMPBASHCONFIG=$(mktemp -p ${XDG_RUNTIME_DIR} -t bashrc.XXXXXXXX --suffix=.conf) local FILELIST=( "${MSC_BASE}/functions.sh" "${MSC_BASE}/logging" "${MSC_BASE}/myshell_load_fortmpconfig" $(getbashrcfile) ~/.aliases "${MSC_BASE}/aliases" "${MSC_BASE}/PS1" "${MSC_BASE}/bash_completion.d/*" ) - logdebug "FILELIST: $FILELIST" + logdebug "FILELIST: ${FILELIST[@]}" if [ -e "${HOME}/.config/myshellconfig/sshs_addfiles.conf" ] ; then for f in $(cat "${HOME}/.config/myshellconfig/sshs_addfiles.conf");do [ -e "$f" ] && {\ @@ -363,7 +363,7 @@ sshs() { FILELIST+=("$f"); } done fi - logdebug "FILELIST: $FILELIST" + logdebug "FILELIST1: ${FILELIST[@]}" local SSH_OPTS="-o VisualHostKey=no -o ControlMaster=auto -o ControlPersist=2s -o ControlPath=~/.ssh/master-%C" #local SSH_OPTS="-o VisualHostKey=no -o ControlMaster=yes -o ControlPersist=10s -o ControlPath=~/.ssh/ssh-%C" # Read /etc/bashrc or /etc/bash.bashrc (depending on distribution) and /etc/profile.d/*.sh first @@ -1049,7 +1049,7 @@ function getdbcreds_jra () { 0) gojirahome DB_FILE=dbconfig.xml - cd - + #cd - ;; 1) DB_FILE=$1 @@ -1100,10 +1100,10 @@ function connectdb () { case $1 in jra|jira) - getdbcreds_jra + getdbcreds_jra $2 ;; cnf|conf|confluence) - getdbcreds_cnf + getdbcreds_cnf $2 ;; *) echo "wrong argument" From df25f73fdbd39f5c1952594da926f433ca1a0e1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Fri, 12 Nov 2021 10:15:41 +0100 Subject: [PATCH 166/187] improve setproxy * add function urlencode * urlencode credentials * make socks5-proxy possible * add no_proxy --- functions.sh | 45 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 39 insertions(+), 6 deletions(-) diff --git a/functions.sh b/functions.sh index c1ca385..abc6281 100755 --- a/functions.sh +++ b/functions.sh @@ -107,6 +107,7 @@ setproxy () { return 1 else CONFIG=$(find ${SETPROXY_CREDS_DIRS[*]} -mindepth 1 -name "$1.conf" -print -quit 2>/dev/null ) + NO_PROXY=$(find ${SETPROXY_CREDS_DIRS[*]} -mindepth 1 -name "no_proxy.conf" -print -quit 2>/dev/null ) fi ;; esac @@ -114,16 +115,25 @@ setproxy () { logwarn "CONFIG: ${CONFIG}" if [ -e ${CONFIG} ]; then - loginfo -n "${CONFIG} existing: " + logdebug -n "${CONFIG} existing: " source "${CONFIG}" - loginfo "sourced" - export PROXY_CREDS="${PROXY_USER}:${PROXY_PASS}@" + loginfo "read $CONFIG" + export PROXY_CREDS="$(urlencode ${PROXY_USER})${PROXY_PASS:+:}$(urlencode ${PROXY_PASS})" else loginfo "${CONFIG} not existing" - export PROXY_CREDS="" +# 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}" + export {http,https,ftp}_proxy="${PROXY_PROTO:-http}://${PROXY_CREDS}${PROXY_CREDS:+@}${PROXY_SERVER}${PROXY_PORT:+:}${PROXY_PORT}" + export {HTTP,HTTPS,FTP}_PROXY="${PROXY_PROTO:-http}://${PROXY_CREDS}${PROXY_CREDS:+@}${PROXY_SERVER}${PROXY_PORT:+:}${PROXY_PORT}" + no_proxy="127.0.0.1,localhost" + #no_proxy=$no_proxy,$(echo 10.{0..255}.{0..255}.{0..255}|tr ' ' ',') + #no_proxy=$no_proxy,$(echo 172.{16..31}.{0..255}.{0..255}|tr ' ' ',') + #no_proxy=$no_proxy,$(echo 192.168.{0..255}.{0..255}|tr ' ' ',') + no_proxy=${no_proxy}${PROXY_IGNORE:+,}${PROXY_IGNORE} + . $NO_PROXY + + export no_proxy + EXIT } @@ -1113,4 +1123,27 @@ function connectdb () { PGPASSWORD=$DB_PWD psql -h $DB_HOST -p $DB_PORT -U $DB_USER $DB_NAME } + + +urlencode() { + # urlencode + + local LANG=C + local length="${#1}" + for (( i = 0; i < length; i++ )); do + local c="${1:i:1}" + case $c in + [a-zA-Z0-9.~_-]) printf "$c" ;; + *) printf '%%%02X' "'$c" ;; + esac + done +} + +urldecode() { + # urldecode + + local url_encoded="${1//+/ }" + printf '%b' "${url_encoded//%/\\x}" +} + #EOF From 650efae7ed7426f2b654534cdf17236743ce7afd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Fri, 12 Nov 2021 12:05:01 +0100 Subject: [PATCH 167/187] rework setproxy --- functions.sh | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/functions.sh b/functions.sh index abc6281..e6de780 100755 --- a/functions.sh +++ b/functions.sh @@ -94,6 +94,7 @@ create_symlinks() { setproxy () { + # https://gist.github.com/yougg/5d2b3353fc5e197a0917aae0b3287d64 ENTRY local CONFIG case $# in @@ -123,8 +124,8 @@ setproxy () { loginfo "${CONFIG} not existing" # export PROXY_CREDS="" fi - export {http,https,ftp}_proxy="${PROXY_PROTO:-http}://${PROXY_CREDS}${PROXY_CREDS:+@}${PROXY_SERVER}${PROXY_PORT:+:}${PROXY_PORT}" - export {HTTP,HTTPS,FTP}_PROXY="${PROXY_PROTO:-http}://${PROXY_CREDS}${PROXY_CREDS:+@}${PROXY_SERVER}${PROXY_PORT:+:}${PROXY_PORT}" + export {http,https,ftp,rsync,all}_proxy="${PROXY_PROTO:-http}://${PROXY_CREDS}${PROXY_CREDS:+@}${PROXY_SERVER}${PROXY_PORT:+:}${PROXY_PORT}" + export {HTTP,HTTPS,FTP,RSYNC,ALL}_PROXY="${PROXY_PROTO:-http}://${PROXY_CREDS}${PROXY_CREDS:+@}${PROXY_SERVER}${PROXY_PORT:+:}${PROXY_PORT}" no_proxy="127.0.0.1,localhost" #no_proxy=$no_proxy,$(echo 10.{0..255}.{0..255}.{0..255}|tr ' ' ',') #no_proxy=$no_proxy,$(echo 172.{16..31}.{0..255}.{0..255}|tr ' ' ',') @@ -134,9 +135,32 @@ setproxy () { export no_proxy + git config -f ~/.gitconfig_local http.sslverify false + git config -f ~/.gitconfig_local http.proxy $http_proxy + git config -f ~/.gitconfig_local https.proxy $http_proxy + + # only for 'github.com' + git config -f ~/.gitconfig_local http.https://github.com.proxy $http_proxy EXIT } + +unsetproxy () { + ENTRY + unset {HTTP,HTTPS,FTP,RSYNC,ALL}_PROXY + unset PROXY_{CREDS,USER,PASS,SERVER,PORT,PROTO,IGNORE} + unset {http,https,ftp,rsync,all}_proxy + unset proxy_{creds,user,pass,server,port} + unset no_proxy NO_PROXY + + + git config -f ~/.gitconfig_local --unset http.proxy + git config -f ~/.gitconfig_local --unset https.proxy +# git config -f ~/.gitconfig_local --unset core.sshCommand + + git config -f ~/.gitconfig_local --unset http.https://github.com.proxy + EXIT +} mencfs () { ENTRY @@ -273,15 +297,6 @@ ${KERBEROS_PASSWORD} EXIT } -unsetproxy () { - ENTRY - unset {HTTP,HTTPS,FTP}_PROXY - unset PROXY_{CREDS,USER,PASS,SERVER,PORT} - unset {http,https,ftp}_proxy - unset proxy_{creds,user,pass,server,port} - EXIT -} - # transfered to bin #git-mergedetachedheadtomaster () { # ENTRY From cf1183895b22ef4656cb1c3fcb2f0efb47000ffe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Fri, 12 Nov 2021 12:59:48 +0100 Subject: [PATCH 168/187] unset proxy functions --- functions.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/functions.sh b/functions.sh index e6de780..db02453 100755 --- a/functions.sh +++ b/functions.sh @@ -155,6 +155,7 @@ unsetproxy () { git config -f ~/.gitconfig_local --unset http.proxy + git config -f ~/.gitconfig_local --unset http.sslverify false git config -f ~/.gitconfig_local --unset https.proxy # git config -f ~/.gitconfig_local --unset core.sshCommand From 34aef601c0fbca5e8055c2667a6d4a4fb05d80d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Sat, 13 Nov 2021 11:40:47 +0100 Subject: [PATCH 169/187] update submodules --- tmux/plugins/tmux-sensible | 2 +- tmux/plugins/tmux-themepack | 2 +- vim/pack/color/start/Zenburn | 2 +- vim/pack/plugins/start/SimpylFold | 2 +- vim/pack/plugins/start/ctrlp.vim | 2 +- vim/pack/plugins/start/fzf | 2 +- vim/pack/plugins/start/fzf.vim | 2 +- vim/pack/plugins/start/nerdtree | 2 +- vim/pack/plugins/start/syntastic | 2 +- vim/pack/plugins/start/vim-airline | 2 +- vim/pack/plugins/start/vim-bracketed-paste | 2 +- vim/pack/plugins/start/vim-fugitive | 2 +- vim/pack/plugins/start/vim-nerdtree-tabs | 2 +- vim/pack/syntax/start/indentpython.vim | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tmux/plugins/tmux-sensible b/tmux/plugins/tmux-sensible index 5d089e4..e91b178 160000 --- a/tmux/plugins/tmux-sensible +++ b/tmux/plugins/tmux-sensible @@ -1 +1 @@ -Subproject commit 5d089e418efb1a00f47654014ed085deb3d0c878 +Subproject commit e91b178ff832b7bcbbf4d99d9f467f63fd1b76b5 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/vim/pack/color/start/Zenburn b/vim/pack/color/start/Zenburn index bdd9f58..33e67af 160000 --- a/vim/pack/color/start/Zenburn +++ b/vim/pack/color/start/Zenburn @@ -1 +1 @@ -Subproject commit bdd9f58b969b153a586d22435c987a846da2922b +Subproject commit 33e67af2418e4775c2a7abc6e8fef401e697e1eb diff --git a/vim/pack/plugins/start/SimpylFold b/vim/pack/plugins/start/SimpylFold index 0459df8..b4a87e5 160000 --- a/vim/pack/plugins/start/SimpylFold +++ b/vim/pack/plugins/start/SimpylFold @@ -1 +1 @@ -Subproject commit 0459df8a0bbfc8ef1bfd88db889e881626f65914 +Subproject commit b4a87e509c3d873238a39d1c85d0b97d6819f283 diff --git a/vim/pack/plugins/start/ctrlp.vim b/vim/pack/plugins/start/ctrlp.vim index f68f4d0..61e964f 160000 --- a/vim/pack/plugins/start/ctrlp.vim +++ b/vim/pack/plugins/start/ctrlp.vim @@ -1 +1 @@ -Subproject commit f68f4d00b9c99d0d711bfde3b071f0dafd249901 +Subproject commit 61e964f2d168f52cb8e80e67d26605b52d726b16 diff --git a/vim/pack/plugins/start/fzf b/vim/pack/plugins/start/fzf index 4138333..e4c3ecc 160000 --- a/vim/pack/plugins/start/fzf +++ b/vim/pack/plugins/start/fzf @@ -1 +1 @@ -Subproject commit 4138333f5cfb6e21b0f8d63a43add4c70c25cdaf +Subproject commit e4c3ecc57e99f4037199f11b384a7f8758d1a0ff diff --git a/vim/pack/plugins/start/fzf.vim b/vim/pack/plugins/start/fzf.vim index 0452b71..d6aa214 160000 --- a/vim/pack/plugins/start/fzf.vim +++ b/vim/pack/plugins/start/fzf.vim @@ -1 +1 @@ -Subproject commit 0452b71830b1a219b8cdc68141ee58ec288ea711 +Subproject commit d6aa21476b2854694e6aa7b0941b8992a906c5ec diff --git a/vim/pack/plugins/start/nerdtree b/vim/pack/plugins/start/nerdtree index 9310f91..eed488b 160000 --- a/vim/pack/plugins/start/nerdtree +++ b/vim/pack/plugins/start/nerdtree @@ -1 +1 @@ -Subproject commit 9310f91476a94ee9c2f3a587171893743a343e26 +Subproject commit eed488b1cd1867bd25f19f90e10440c5cc7d6424 diff --git a/vim/pack/plugins/start/syntastic b/vim/pack/plugins/start/syntastic index 97bf9ec..2c4b33f 160000 --- a/vim/pack/plugins/start/syntastic +++ b/vim/pack/plugins/start/syntastic @@ -1 +1 @@ -Subproject commit 97bf9ec720662af51ae403b6dfe720d4a24bfcbc +Subproject commit 2c4b33f6e6679fb5f3824d9cd38d4813c71a19a3 diff --git a/vim/pack/plugins/start/vim-airline b/vim/pack/plugins/start/vim-airline index 26f9227..4b96f58 160000 --- a/vim/pack/plugins/start/vim-airline +++ b/vim/pack/plugins/start/vim-airline @@ -1 +1 @@ -Subproject commit 26f922753a288df639b8d05d13ed62b9b04a26bc +Subproject commit 4b96f58902a34abda87fd3105e9d47a08801a891 diff --git a/vim/pack/plugins/start/vim-bracketed-paste b/vim/pack/plugins/start/vim-bracketed-paste index 1b32008..c4c639f 160000 --- a/vim/pack/plugins/start/vim-bracketed-paste +++ b/vim/pack/plugins/start/vim-bracketed-paste @@ -1 +1 @@ -Subproject commit 1b320083dc0892b8a874a17c75abfea86c801434 +Subproject commit c4c639f3cacd1b874ed6f5f196fac772e089c932 diff --git a/vim/pack/plugins/start/vim-fugitive b/vim/pack/plugins/start/vim-fugitive index 4d29c1d..2e4ee0b 160000 --- a/vim/pack/plugins/start/vim-fugitive +++ b/vim/pack/plugins/start/vim-fugitive @@ -1 +1 @@ -Subproject commit 4d29c1d6a0def18923b4762c8f85ca3ee5ae6c83 +Subproject commit 2e4ee0b5d6e61c6b3bc48e844343f89615dfc6e0 diff --git a/vim/pack/plugins/start/vim-nerdtree-tabs b/vim/pack/plugins/start/vim-nerdtree-tabs index 8eadb5b..07d19f0 160000 --- a/vim/pack/plugins/start/vim-nerdtree-tabs +++ b/vim/pack/plugins/start/vim-nerdtree-tabs @@ -1 +1 @@ -Subproject commit 8eadb5bd8fead8594d201f7cd78aed912243fd9f +Subproject commit 07d19f0299762669c6f93fbadb8249da6ba9de62 diff --git a/vim/pack/syntax/start/indentpython.vim b/vim/pack/syntax/start/indentpython.vim index 3c6d80f..6aaddfd 160000 --- a/vim/pack/syntax/start/indentpython.vim +++ b/vim/pack/syntax/start/indentpython.vim @@ -1 +1 @@ -Subproject commit 3c6d80fc59d57ed2fbef14333c0efef02cbcf2f8 +Subproject commit 6aaddfde21fe9e7acbe448b92b3cbb67f2fe1fc1 From 2b2f110e064da77200d259b8a394173c826ad26c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 18 Nov 2021 00:47:59 +0100 Subject: [PATCH 170/187] change to usage --- bin/trashmail | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/trashmail b/bin/trashmail index 2ae0c65..ef47712 100755 --- a/bin/trashmail +++ b/bin/trashmail @@ -18,7 +18,7 @@ HASHLENGTH_DEFAULT=8 PWOPTS_DEFAULT="-c -n -s" PWLENGTH_DEFAULT=50 -show_help () { +usage () { cat << EOF usage: ${0} [] @@ -67,7 +67,7 @@ while : ; do shift ;; --help) - show_help + usage exit 0 ;; -l|--hashlength) @@ -96,7 +96,7 @@ while : ; do ;; *) echo wrong argument $1 >&2 - show_help + usage exit 1 ;; esac From ba495c6b05548f10664615bfc7d8bd7d943f01aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 18 Nov 2021 17:39:34 +0100 Subject: [PATCH 171/187] add signpubkey for ssh-ca --- bin/signpubkey | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100755 bin/signpubkey diff --git a/bin/signpubkey b/bin/signpubkey new file mode 100755 index 0000000..bbe7bd4 --- /dev/null +++ b/bin/signpubkey @@ -0,0 +1,95 @@ +#!/bin/bash + + +usage() { + cat << EOF + + Usage: $(dirname $0) [-n|--principals] [,[,[,...]]] [-V|--valid-time]