From fbe88869196fab23f4d0ec7850640fdeeb2cb241 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 4 Nov 2020 10:09:10 +0100 Subject: [PATCH 01/12] update submodules --- vim/pack/plugins/start/fzf | 2 +- vim/pack/plugins/start/fzf.vim | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vim/pack/plugins/start/fzf b/vim/pack/plugins/start/fzf index c144c95..e3e76fa 160000 --- a/vim/pack/plugins/start/fzf +++ b/vim/pack/plugins/start/fzf @@ -1 +1 @@ -Subproject commit c144c95cdab7dbf8a2c2430c007493813b1cad19 +Subproject commit e3e76fa8c55365bdfab785249787eb02a8bb5bf4 diff --git a/vim/pack/plugins/start/fzf.vim b/vim/pack/plugins/start/fzf.vim index bd3a021..61c4b6d 160000 --- a/vim/pack/plugins/start/fzf.vim +++ b/vim/pack/plugins/start/fzf.vim @@ -1 +1 @@ -Subproject commit bd3a021ec11617c56e6aa95578fee619445b029d +Subproject commit 61c4b6d1ed30287edcbfd3dbaed4e43b5c251c93 From 01b2e01d73d925e79c1bb6babe83e5a6e11f8f6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 4 Nov 2020 16:28:07 +0100 Subject: [PATCH 02/12] update submodules --- vim/pack/plugins/start/syntastic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/pack/plugins/start/syntastic b/vim/pack/plugins/start/syntastic index dd22667..5788b1c 160000 --- a/vim/pack/plugins/start/syntastic +++ b/vim/pack/plugins/start/syntastic @@ -1 +1 @@ -Subproject commit dd226673063b189683b98133d7a2243c1316e71e +Subproject commit 5788b1c6df63bc31ae93d6c1a3523e0602c60901 From 87e27408a43e2449c2de019b21748b785aebc078 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 4 Nov 2020 23:50:18 +0100 Subject: [PATCH 03/12] fix filename --- 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 8667b67..cc95de8 100755 --- a/bin/git-myshellconfig-checkout +++ b/bin/git-myshellconfig-checkout @@ -97,7 +97,7 @@ if ${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE-${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE_D if [ $updated -lt $(date --date="${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE_INTERVALL} hours ago" "+%s") ]; then logdebug "$($SGIT submodule update --remote)" logdebug "$($SGIT commit -a -m 'update submodules')" - date "+%s" > ${MYSHELLCONFIG_BASE%/}${MYSHELLCONFIG_BASE:+/}.last_udate_submodules + date "+%s" > ${MYSHELLCONFIG_BASE%/}${MYSHELLCONFIG_BASE:+/}.last_update_submodules fi else loginfo -n ", submodules not synced" From 4e2cef723f878d8690f80dd3eb5b2bab5a030114 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 5 Nov 2020 00:00:40 +0100 Subject: [PATCH 04/12] fix filename in .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9ca20d6..ce0f4eb 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,4 @@ serverconfig.local.conf bashrc_local .local_scripts .git-token -.last_udate_submodules +.last_update_submodules From 7b0bb8c6fa1717f5ae0f34a3d889aa32b9b3b76f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 5 Nov 2020 11:33:45 +0100 Subject: [PATCH 05/12] update submodules --- vim/pack/plugins/start/fzf | 2 +- vim/pack/plugins/start/vim-airline | 2 +- vim/pack/plugins/start/vim-airline-themes | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vim/pack/plugins/start/fzf b/vim/pack/plugins/start/fzf index e3e76fa..d099941 160000 --- a/vim/pack/plugins/start/fzf +++ b/vim/pack/plugins/start/fzf @@ -1 +1 @@ -Subproject commit e3e76fa8c55365bdfab785249787eb02a8bb5bf4 +Subproject commit d099941360e061587bf7d42cd029c91650ef5a44 diff --git a/vim/pack/plugins/start/vim-airline b/vim/pack/plugins/start/vim-airline index 44b7b72..d64e5f8 160000 --- a/vim/pack/plugins/start/vim-airline +++ b/vim/pack/plugins/start/vim-airline @@ -1 +1 @@ -Subproject commit 44b7b729381738cef0fc28a35fbe78fc2abe4d48 +Subproject commit d64e5f8dd7ac0b094f0caacc63453a0418b37fdb diff --git a/vim/pack/plugins/start/vim-airline-themes b/vim/pack/plugins/start/vim-airline-themes index 5307367..3dafdfc 160000 --- a/vim/pack/plugins/start/vim-airline-themes +++ b/vim/pack/plugins/start/vim-airline-themes @@ -1 +1 @@ -Subproject commit 5307367693f770a6b06d1a498c9bc9bf4cf9a884 +Subproject commit 3dafdfc0424716bae21f5340314f7d90a9ddf4f2 From 38c330be363906a9f7fb940d19024326d94c162c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 5 Nov 2020 21:15:28 +0100 Subject: [PATCH 06/12] update submodules --- vim/pack/plugins/start/vim-gitgutter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/pack/plugins/start/vim-gitgutter b/vim/pack/plugins/start/vim-gitgutter index 696a6ed..987a333 160000 --- a/vim/pack/plugins/start/vim-gitgutter +++ b/vim/pack/plugins/start/vim-gitgutter @@ -1 +1 @@ -Subproject commit 696a6ed389e5b54c8bf480f44ee4e8fc59e6f903 +Subproject commit 987a33355ef424161fdbc4e5d625b5b5aed9704c From f0d5c2b718414292aed110111db5026d130d6cff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 5 Nov 2020 21:57:41 +0100 Subject: [PATCH 07/12] change output, cleanup code --- bin/git-myshellconfig-checkout | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/bin/git-myshellconfig-checkout b/bin/git-myshellconfig-checkout index cc95de8..dab6236 100755 --- a/bin/git-myshellconfig-checkout +++ b/bin/git-myshellconfig-checkout @@ -39,7 +39,7 @@ case $1 in PRE="${MYSHELLCONFIG_GIT_REMOTE_NAME}" ;; -s) - GIT_FETCH_OPTIONS="--recurse-submodules" + dosubmodupdate="true" ;; *) PRE="" @@ -54,11 +54,14 @@ esac # Check for updates in submodules only if last check was INTERVALL hours in the past updated=$(cat ${MYSHELLCONFIG_BASE%/}${MYSHELLCONFIG_BASE:+/}.last_update_submodules 2>/dev/null || echo 0 ) if [ $updated -lt $(date --date="${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE_INTERVALL} hours ago" "+%s") ]; then - GIT_FETCH_OPTIONS="--recurse-submodules" + dosubmodupdate="true" fi #echo $SGIT fetch ${MYSHELLCONFIG_GIT_REMOTE_NAME} -p 1>&2 -$SGIT fetch ${GIT_FETCH_OPTIONS} ${MYSHELLCONFIG_GIT_REMOTE_NAME} -p 2>>"${MYSHELLCONFIG_LOGFILE}"|| { logwarn fetch failed; gitupdateend; exit 1; } +$SGIT fetch ${dosubmodupdate:+--recurse-submodules} ${MYSHELLCONFIG_GIT_REMOTE_NAME} -p 2>>"${MYSHELLCONFIG_LOGFILE}"|| { logwarn fetch failed; gitupdateend; exit 1; } +if ${dosubmodupdate:-false}; then + date "+%s" > ${MYSHELLCONFIG_BASE%/}${MYSHELLCONFIG_BASE:+/}.last_update_submodules +fi echo "Check for local changes:" >> "${MYSHELLCONFIG_LOGFILE}" if $SGIT diff-index --ignore-submodules --exit-code HEAD -- >> "${MYSHELLCONFIG_LOGFILE}" ; then @@ -92,12 +95,14 @@ EOF fi +logwarn " repo synced" if ${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE-${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE_DEFAULT-true}}; then - if [ $updated -lt $(date --date="${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE_INTERVALL} hours ago" "+%s") ]; then + if ${dosubmodupdate:-false}; then logdebug "$($SGIT submodule update --remote)" logdebug "$($SGIT commit -a -m 'update submodules')" date "+%s" > ${MYSHELLCONFIG_BASE%/}${MYSHELLCONFIG_BASE:+/}.last_update_submodules + logwarn " submodules synced" fi else loginfo -n ", submodules not synced" From 667b9d2ff0a2295b91d1fe887698eba3dde85ff1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 5 Nov 2020 21:58:50 +0100 Subject: [PATCH 08/12] improve output --- bin/git-myshellconfig-checkout | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/git-myshellconfig-checkout b/bin/git-myshellconfig-checkout index dab6236..e8bdba6 100755 --- a/bin/git-myshellconfig-checkout +++ b/bin/git-myshellconfig-checkout @@ -95,14 +95,16 @@ EOF fi -logwarn " repo synced" +logwarn " +repo synced" if ${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE-${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE_DEFAULT-true}}; then if ${dosubmodupdate:-false}; then logdebug "$($SGIT submodule update --remote)" logdebug "$($SGIT commit -a -m 'update submodules')" date "+%s" > ${MYSHELLCONFIG_BASE%/}${MYSHELLCONFIG_BASE:+/}.last_update_submodules - logwarn " submodules synced" + logwarn " +submodules synced" fi else loginfo -n ", submodules not synced" From 6f86136d90ad5485a21927b853e4ed4abded4237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Fri, 6 Nov 2020 20:53:28 +0100 Subject: [PATCH 09/12] change default fileloglevel to DEBUG --- bashrc_add | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bashrc_add b/bashrc_add index 9849fcb..4f17268 100755 --- a/bashrc_add +++ b/bashrc_add @@ -56,7 +56,7 @@ if [[ $- = *i* ]] ; then [ -z "${MYSHELLCONFIG_LOGDIR+x}" ] && export MYSHELLCONFIG_LOGDIR="${HOME}/logs" [ -z "${MYSHELLCONFIG_LOGFILE+x}" ] && export MYSHELLCONFIG_LOGFILE="${MYSHELLCONFIG_LOGDIR}/myshellconfig.log" [ -z "${MYHSELLCONFIG_LOGLEVEL_DEFAULT+x}" ] && export MYHSELLCONFIG_LOGLEVEL_DEFAULT="INFO" - [ -z "${MYHSELLCONFIG_FILELOGLEVEL_DEFAULT+x}" ] && export MYHSELLCONFIG_FILELOGLEVEL_DEFAULT="INFO" + [ -z "${MYHSELLCONFIG_FILELOGLEVEL_DEFAULT+x}" ] && export MYHSELLCONFIG_FILELOGLEVEL_DEFAULT="DEBUG" [ -z "${SCRIPT_LOG+x}" ] && export SCRIPT_LOG="${MYSHELLCONFIG_LOGFILE}" [ -z "${LOGLEVEL_DEFAULT+x}" ] && export LOGLEVEL_DEFAULT="${MYHSELLCONFIG_LOGLEVEL_DEFAULT-INFO}" [ -z "${FILELOGLEVEL_DEFAULT+x}" ] && export FILELOGLEVEL_DEFAULT="${MYHSELLCONFIG_FILELOGLEVEL_DEFAULT-INFO}" From 759736f7d8e203952ddec85e0dda34b8fd76a5a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Sat, 7 Nov 2020 01:17:35 +0100 Subject: [PATCH 10/12] update submodules --- vim/pack/plugins/start/syntastic | 2 +- vim/pack/plugins/start/vim-airline | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vim/pack/plugins/start/syntastic b/vim/pack/plugins/start/syntastic index 5788b1c..6374164 160000 --- a/vim/pack/plugins/start/syntastic +++ b/vim/pack/plugins/start/syntastic @@ -1 +1 @@ -Subproject commit 5788b1c6df63bc31ae93d6c1a3523e0602c60901 +Subproject commit 63741646a9e87bbe105674747555aded6f52c490 diff --git a/vim/pack/plugins/start/vim-airline b/vim/pack/plugins/start/vim-airline index d64e5f8..5f2421f 160000 --- a/vim/pack/plugins/start/vim-airline +++ b/vim/pack/plugins/start/vim-airline @@ -1 +1 @@ -Subproject commit d64e5f8dd7ac0b094f0caacc63453a0418b37fdb +Subproject commit 5f2421fa3952311df652d9e2994774e6b0d9c7cd From 99ded7a254c03a8ae5fe87f008b96382d8467cb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Sun, 8 Nov 2020 10:07:36 +0100 Subject: [PATCH 11/12] improve output --- bin/startagent | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/startagent b/bin/startagent index 51863e2..270bec7 100755 --- a/bin/startagent +++ b/bin/startagent @@ -283,8 +283,8 @@ agent-load-identity-keys () { fi done fi - logdebug "currently loaded keys after action: -$(ssh-runinagent $agentfile ssh-add -l)" + loginfo "currently loaded keys after action: $(ssh-runinagent $agentfile ssh-add -l|wc -l)" + logdebug "$(ssh-runinagent $agentfile ssh-add -l)" else logwarn "ssh-identity $ssh_identity is not configured. Please create $identitydir and add keys" fi From 2b7a53203c00423cce89b8ca852c483bc2f21d8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Mon, 9 Nov 2020 06:48:05 +0100 Subject: [PATCH 12/12] update submodules --- vim/pack/plugins/start/vim-airline-themes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/pack/plugins/start/vim-airline-themes b/vim/pack/plugins/start/vim-airline-themes index 3dafdfc..cd6f169 160000 --- a/vim/pack/plugins/start/vim-airline-themes +++ b/vim/pack/plugins/start/vim-airline-themes @@ -1 +1 @@ -Subproject commit 3dafdfc0424716bae21f5340314f7d90a9ddf4f2 +Subproject commit cd6f16978d5af4b9fb861be9d728732d72789df3