From 53847d4c58d036c9cce5b9077e3facafba78f9d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Tue, 10 Nov 2020 21:10:31 +0100 Subject: [PATCH 1/5] update submodules --- tmux/plugins/tmux-themepack | 2 +- vim/pack/plugins/start/fzf | 2 +- vim/pack/plugins/start/vim-airline | 2 +- 3 files changed, 3 insertions(+), 3 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/vim/pack/plugins/start/fzf b/vim/pack/plugins/start/fzf index d099941..722d66e 160000 --- a/vim/pack/plugins/start/fzf +++ b/vim/pack/plugins/start/fzf @@ -1 +1 @@ -Subproject commit d099941360e061587bf7d42cd029c91650ef5a44 +Subproject commit 722d66e85abde02518214edd1ab186d321c0170c diff --git a/vim/pack/plugins/start/vim-airline b/vim/pack/plugins/start/vim-airline index 5f2421f..731bdb1 160000 --- a/vim/pack/plugins/start/vim-airline +++ b/vim/pack/plugins/start/vim-airline @@ -1 +1 @@ -Subproject commit 5f2421fa3952311df652d9e2994774e6b0d9c7cd +Subproject commit 731bdb11d2f57365e02bdb8adaeb59a8b93db27d From 990b91d1d8a47baf4b52bd41616f24babbed4ba2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Tue, 10 Nov 2020 21:14:10 +0100 Subject: [PATCH 2/5] improve output --- bin/git-myshellconfig-checkout | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/git-myshellconfig-checkout b/bin/git-myshellconfig-checkout index e8bdba6..f6a3b1c 100755 --- a/bin/git-myshellconfig-checkout +++ b/bin/git-myshellconfig-checkout @@ -58,6 +58,7 @@ if [ $updated -lt $(date --date="${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE_INTERVALL fi #echo $SGIT fetch ${MYSHELLCONFIG_GIT_REMOTE_NAME} -p 1>&2 +loginfo "update repo ${dosubmodupdate:+and submodules}" $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 @@ -95,16 +96,15 @@ EOF fi -logwarn " -repo synced" +loginfo "repo synced" if ${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE-${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE_DEFAULT-true}}; then if ${dosubmodupdate:-false}; then + loginfo "update and commit submodules" 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 ef21401b4029c87a7f0458512cf7377c8a78f20e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Tue, 10 Nov 2020 21:22:08 +0100 Subject: [PATCH 3/5] do submodupdate improve logic --- bin/git-myshellconfig-checkout | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/bin/git-myshellconfig-checkout b/bin/git-myshellconfig-checkout index f6a3b1c..06485d8 100755 --- a/bin/git-myshellconfig-checkout +++ b/bin/git-myshellconfig-checkout @@ -56,9 +56,10 @@ updated=$(cat ${MYSHELLCONFIG_BASE%/}${MYSHELLCONFIG_BASE:+/}.last_update_submod if [ $updated -lt $(date --date="${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE_INTERVALL} hours ago" "+%s") ]; then dosubmodupdate="true" fi +[ -z "${dosubmodupdate+x}" ] && dosubmodupdate=${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE-${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE_DEFAULT-true}} #echo $SGIT fetch ${MYSHELLCONFIG_GIT_REMOTE_NAME} -p 1>&2 -loginfo "update repo ${dosubmodupdate:+and submodules}" +loginfo "fetch repo${dosubmodupdate:+ and submodules}" $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 @@ -96,9 +97,9 @@ EOF fi -loginfo "repo synced" +loginfo "repo${dosubmodupdate:+ and submodules} synced" -if ${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE-${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE_DEFAULT-true}}; then +#if ${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE-${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE_DEFAULT-true}}; then if ${dosubmodupdate:-false}; then loginfo "update and commit submodules" logdebug "$($SGIT submodule update --remote)" @@ -106,10 +107,10 @@ if ${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE-${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE_D date "+%s" > ${MYSHELLCONFIG_BASE%/}${MYSHELLCONFIG_BASE:+/}.last_update_submodules logwarn "submodules synced" fi -else - loginfo -n ", submodules not synced" - logdebug "Do not update submodules. It's denied by environment MYSHELLCONFIG_GIT_UPDATE_SUBMODULES: ${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE-${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE_DEFAULT-true}}" -fi +#else +# loginfo -n ", submodules not synced" +# logdebug "Do not update submodules. It's denied by environment MYSHELLCONFIG_GIT_UPDATE_SUBMODULES: ${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE-${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE_DEFAULT-true}}" +#fi EXIT exit $rc From 959000ed19b3b60ef3e3b87e9e18c6f5cbd5b74b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Tue, 10 Nov 2020 21:31:50 +0100 Subject: [PATCH 4/5] fix logic to dosubmodupdate --- bin/git-myshellconfig-checkout | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bin/git-myshellconfig-checkout b/bin/git-myshellconfig-checkout index 06485d8..985b6e7 100755 --- a/bin/git-myshellconfig-checkout +++ b/bin/git-myshellconfig-checkout @@ -53,10 +53,11 @@ 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 - dosubmodupdate="true" +echo dosubud1: $dosubmodupdate +if [ $updated -lt $(date --date="${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE_INTERVALL} hours ago" "+%s") -a ${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE-${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE_DEFAULT-true}} ]; then + [ -z "${dosubmodupdate+x}" ] && dosubmodupdate="true" fi -[ -z "${dosubmodupdate+x}" ] && dosubmodupdate=${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE-${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE_DEFAULT-true}} +echo dosubud2: $dosubmodupdate #echo $SGIT fetch ${MYSHELLCONFIG_GIT_REMOTE_NAME} -p 1>&2 loginfo "fetch repo${dosubmodupdate:+ and submodules}" From 41091fd81583ea03d6e549b4ab77952062c227b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Tue, 10 Nov 2020 21:35:28 +0100 Subject: [PATCH 5/5] improve output, add to logtrace --- 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 985b6e7..bc84c9e 100755 --- a/bin/git-myshellconfig-checkout +++ b/bin/git-myshellconfig-checkout @@ -53,11 +53,11 @@ 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 ) -echo dosubud1: $dosubmodupdate +logtrace "dosubmodupdate before: $dosubmodupdate" if [ $updated -lt $(date --date="${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE_INTERVALL} hours ago" "+%s") -a ${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE-${MYSHELLCONFIG_GIT_SUBMODULES_UPDATE_DEFAULT-true}} ]; then [ -z "${dosubmodupdate+x}" ] && dosubmodupdate="true" fi -echo dosubud2: $dosubmodupdate +logtrace "dosubmodupdate after: $dosubmodupdate" #echo $SGIT fetch ${MYSHELLCONFIG_GIT_REMOTE_NAME} -p 1>&2 loginfo "fetch repo${dosubmodupdate:+ and submodules}"