From dfa5c8d00a9d81b410beb45d5e79f5224146f4e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 4 Nov 2020 06:33:29 +0100 Subject: [PATCH 01/25] update submodules --- tmux/plugins/tmux-themepack | 2 +- vim/pack/plugins/start/fzf | 2 +- vim/pack/plugins/start/fzf.vim | 2 +- 3 files changed, 3 insertions(+), 3 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 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 5a70538f0b91c72f4d47f402a6a0d346e30383c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 5 Nov 2020 08:15:21 +0100 Subject: [PATCH 02/25] update submodules --- vim/pack/plugins/start/syntastic | 2 +- vim/pack/plugins/start/vim-airline-themes | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 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 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 03/25] 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 04/25] 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 05/25] 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 06/25] 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 From 5ff7f25f0c25a5ef95b7939b76b45f6a70a86381 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Tue, 10 Nov 2020 16:16:09 +0100 Subject: [PATCH 07/25] ignore comment-lines --- bin/publishpvp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/publishpvp b/bin/publishpvp index 1ab110c..700b254 100755 --- a/bin/publishpvp +++ b/bin/publishpvp @@ -52,7 +52,7 @@ do if stat "${file}" >/dev/null 2>/dev/null ; then echo "Stop $app on ${DEST}" ssh ${DEST} systemctl stop ${app}.service - cat ${file}|sort -r |while read cmd pkg version ; do + cat ${file}|sort -r |grep -v " *#"|while read cmd pkg version ; do case $cmd in install) if [ -z "${version}" ]; then From 395e0d845e5927546f532865f082ff1f6d6b96c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Tue, 10 Nov 2020 17:26:25 +0100 Subject: [PATCH 08/25] Merged detached head into master --- bin/exif-fixdatetime | 71 +++++++++++++++++++++++ vim/pack/plugins/start/vim-airline-themes | 2 +- 2 files changed, 72 insertions(+), 1 deletion(-) create mode 100755 bin/exif-fixdatetime diff --git a/bin/exif-fixdatetime b/bin/exif-fixdatetime new file mode 100755 index 0000000..e172d8f --- /dev/null +++ b/bin/exif-fixdatetime @@ -0,0 +1,71 @@ +#!/bin/bash +export FILELOGLEVEL=ERROR + +datetime_v1 () { + branch="$(basename $1)" + if [[ $branch =~ ^([0-9]{4})(\.|-)([0-9]{2})(\.|-)([0-9]{2})( |_)([0-9]{2})(\.|-)([0-9]{2})(\.|-)([0-9]{2}).*$ ]]; then + 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 +} + +datetime_v2 () { + branch="$(basename $1)" + if [[ $branch =~ ^([0-9]{4})([0-9]{2})([0-9]{2})(_)([0-9]{2})([0-9]{2})([0-9]{2}).*$ ]]; then + printf "%04d:%02d:%02d %02d:%02d:%02d" "${BASH_REMATCH[1]#0}" "${BASH_REMATCH[2]#0}" "${BASH_REMATCH[3]#0}" "${BASH_REMATCH[5]#0}" "${BASH_REMATCH[6]#0}" "${BASH_REMATCH[7]#0}" + fi +} + +datetime_v3 () { + branch="$(basename $1)" + if [[ $branch =~ ^(IMG-)([0-9]{4})([0-9]{2})([0-9]{2})(-WA)([0-9]{2})([0-9]{2}).*$ ]]; then + printf "%04d:%02d:%02d %02d:%02d:%02d" "${BASH_REMATCH[2]#0}" "${BASH_REMATCH[3]#0}" "${BASH_REMATCH[4]#0}" "${BASH_REMATCH[6]#0}" "${BASH_REMATCH[7]#0}" "00" + fi +} + +parsedatetime() { + filename="$(basename "${@}")" + if [[ $filename =~ ^([0-9]{4})(\.|-)([0-9]{2})(\.|-)([0-9]{2})( |_)([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 + + if [[ $filename =~ ^([0-9]{4})([0-9]{2})([0-9]{2})(_)([0-9]{2})([0-9]{2})([0-9]{2}).*$ ]]; then + result="$(printf "%04d:%02d:%02d %02d:%02d:%02d" "${BASH_REMATCH[1]#0}" "${BASH_REMATCH[2]#0}" "${BASH_REMATCH[3]#0}" "${BASH_REMATCH[5]#0}" "${BASH_REMATCH[6]#0}" "${BASH_REMATCH[7]#0}")" + fi + + # Whatsapp-Bilder + if [[ $filename =~ ^(IMG-)([0-9]{4})([0-9]{2})([0-9]{2})(-WA)([0-9]{2})([0-9]{2}).*$ ]]; then + result="$(printf "%04d:%02d:%02d %02d:%02d:%02d" "${BASH_REMATCH[2]#0}" "${BASH_REMATCH[3]#0}" "${BASH_REMATCH[4]#0}" "${BASH_REMATCH[6]#0}" "${BASH_REMATCH[7]#0}" "00")" + fi + + echo "$result" + return 0 +} + +fix_datetime () { + file="${@}" + loginfo "file: $file " + newDateTimeOriginal="$(parsedatetime "$file")" + loginfo "newDateTimeOriginal: $newDateTimeOriginal" +# logdebug "INFO: DateTimeOrigin and DateCreated set in file +#$(exiftool -DateTimeOriginal -CreateDate "$file")" + if [ -n "$newDateTimeOriginal" ]; then + exiftool "-DateTimeOriginal=$newDateTimeOriginal" -if '(not $datetimeoriginal)' "$file" + exiftool '-createdate Date: Tue, 10 Nov 2020 17:30:13 +0100 Subject: [PATCH 09/25] improve output --- bin/exif-fixdatetime | 35 ++++++----------------------------- 1 file changed, 6 insertions(+), 29 deletions(-) diff --git a/bin/exif-fixdatetime b/bin/exif-fixdatetime index e172d8f..f27d4b2 100755 --- a/bin/exif-fixdatetime +++ b/bin/exif-fixdatetime @@ -1,27 +1,6 @@ #!/bin/bash export FILELOGLEVEL=ERROR -datetime_v1 () { - branch="$(basename $1)" - if [[ $branch =~ ^([0-9]{4})(\.|-)([0-9]{2})(\.|-)([0-9]{2})( |_)([0-9]{2})(\.|-)([0-9]{2})(\.|-)([0-9]{2}).*$ ]]; then - 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 -} - -datetime_v2 () { - branch="$(basename $1)" - if [[ $branch =~ ^([0-9]{4})([0-9]{2})([0-9]{2})(_)([0-9]{2})([0-9]{2})([0-9]{2}).*$ ]]; then - printf "%04d:%02d:%02d %02d:%02d:%02d" "${BASH_REMATCH[1]#0}" "${BASH_REMATCH[2]#0}" "${BASH_REMATCH[3]#0}" "${BASH_REMATCH[5]#0}" "${BASH_REMATCH[6]#0}" "${BASH_REMATCH[7]#0}" - fi -} - -datetime_v3 () { - branch="$(basename $1)" - if [[ $branch =~ ^(IMG-)([0-9]{4})([0-9]{2})([0-9]{2})(-WA)([0-9]{2})([0-9]{2}).*$ ]]; then - printf "%04d:%02d:%02d %02d:%02d:%02d" "${BASH_REMATCH[2]#0}" "${BASH_REMATCH[3]#0}" "${BASH_REMATCH[4]#0}" "${BASH_REMATCH[6]#0}" "${BASH_REMATCH[7]#0}" "00" - fi -} - parsedatetime() { filename="$(basename "${@}")" if [[ $filename =~ ^([0-9]{4})(\.|-)([0-9]{2})(\.|-)([0-9]{2})( |_)([0-9]{2})(\.|-)([0-9]{2})(\.|-)([0-9]{2}).*$ ]]; then @@ -46,16 +25,14 @@ fix_datetime () { loginfo "file: $file " newDateTimeOriginal="$(parsedatetime "$file")" loginfo "newDateTimeOriginal: $newDateTimeOriginal" -# logdebug "INFO: DateTimeOrigin and DateCreated set in file -#$(exiftool -DateTimeOriginal -CreateDate "$file")" - if [ -n "$newDateTimeOriginal" ]; then - exiftool "-DateTimeOriginal=$newDateTimeOriginal" -if '(not $datetimeoriginal)' "$file" - exiftool '-createdate Date: Tue, 10 Nov 2020 21:10:31 +0100 Subject: [PATCH 10/25] 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 11/25] 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 12/25] 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 13/25] 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 14/25] 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}" From f69868faa17769a7f6f32f9b88411d4c4bc20e1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Thu, 12 Nov 2020 18:33:49 +0100 Subject: [PATCH 15/25] add modus for png --- bin/exif-fixdatetime | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/bin/exif-fixdatetime b/bin/exif-fixdatetime index f27d4b2..e0002f5 100755 --- a/bin/exif-fixdatetime +++ b/bin/exif-fixdatetime @@ -1,5 +1,6 @@ #!/bin/bash -export FILELOGLEVEL=ERROR +export FILELOGLEVEL=WARN +export SCRIPT_LOG=~/logs/exif.log parsedatetime() { filename="$(basename "${@}")" @@ -16,6 +17,11 @@ parsedatetime() { result="$(printf "%04d:%02d:%02d %02d:%02d:%02d" "${BASH_REMATCH[2]#0}" "${BASH_REMATCH[3]#0}" "${BASH_REMATCH[4]#0}" "${BASH_REMATCH[6]#0}" "${BASH_REMATCH[7]#0}" "00")" fi + # eYe20130323123316.jpg + if [[ $filename =~ ^(eYe)([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2}).*$ ]]; then + result="$(printf "%04d:%02d:%02d %02d:%02d:%02d" "${BASH_REMATCH[2]#0}" "${BASH_REMATCH[3]#0}" "${BASH_REMATCH[4]#0}" "${BASH_REMATCH[5]#0}" "${BASH_REMATCH[6]#0}" "${BASH_REMATCH[7]#0}")" + fi + echo "$result" return 0 } @@ -25,12 +31,24 @@ fix_datetime () { loginfo "file: $file " newDateTimeOriginal="$(parsedatetime "$file")" loginfo "newDateTimeOriginal: $newDateTimeOriginal" + mime="$(file --mime-type "$file" | awk '{print $NF}')" if [ -n "$newDateTimeOriginal" ]; then - exiftool "-DateTimeOriginal=$newDateTimeOriginal" -if '(not $datetimeoriginal)' "$file" - exiftool '-createdate Date: Thu, 12 Nov 2020 23:48:03 +0100 Subject: [PATCH 16/25] update submodules --- 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-git-plugin | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vim/pack/plugins/start/ctrlp.vim b/vim/pack/plugins/start/ctrlp.vim index 3866ae1..971c4d4 160000 --- a/vim/pack/plugins/start/ctrlp.vim +++ b/vim/pack/plugins/start/ctrlp.vim @@ -1 +1 @@ -Subproject commit 3866ae170a342fb40d83e1538c37c81c7977b821 +Subproject commit 971c4d41880b72dbbf1620b3ad91418a6a6f6b9c diff --git a/vim/pack/plugins/start/fzf b/vim/pack/plugins/start/fzf index 722d66e..75b8cca 160000 --- a/vim/pack/plugins/start/fzf +++ b/vim/pack/plugins/start/fzf @@ -1 +1 @@ -Subproject commit 722d66e85abde02518214edd1ab186d321c0170c +Subproject commit 75b8cca3b3d0663ea4102f08c763cf2b0b999f88 diff --git a/vim/pack/plugins/start/fzf.vim b/vim/pack/plugins/start/fzf.vim index 61c4b6d..53b3aea 160000 --- a/vim/pack/plugins/start/fzf.vim +++ b/vim/pack/plugins/start/fzf.vim @@ -1 +1 @@ -Subproject commit 61c4b6d1ed30287edcbfd3dbaed4e43b5c251c93 +Subproject commit 53b3aea0da5e3581e224c958dbc13558cbe5daee diff --git a/vim/pack/plugins/start/nerdtree-git-plugin b/vim/pack/plugins/start/nerdtree-git-plugin index 01b84c6..9e33a3f 160000 --- a/vim/pack/plugins/start/nerdtree-git-plugin +++ b/vim/pack/plugins/start/nerdtree-git-plugin @@ -1 +1 @@ -Subproject commit 01b84c63b9ba48628285779fbdfd046dd2bc2970 +Subproject commit 9e33a3fe8aa90f5ece2439f3b1b3a98fe7e35f85 From f72211f9aec32ada321365e21437c761788f4d80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Fri, 13 Nov 2020 00:21:47 +0100 Subject: [PATCH 17/25] include copying file --- bin/exif-fixdatetime | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/bin/exif-fixdatetime b/bin/exif-fixdatetime index e0002f5..ee8321e 100755 --- a/bin/exif-fixdatetime +++ b/bin/exif-fixdatetime @@ -1,4 +1,7 @@ #!/bin/bash + +[ -z "${move+x}" ] && move=false + export FILELOGLEVEL=WARN export SCRIPT_LOG=~/logs/exif.log @@ -47,7 +50,11 @@ fix_datetime () { ;; esac fi + [ $move == true ] || echo nomove loginfo "$(exiftool -filename -createdate -datetimeoriginal "$file")" + [ $move == true ] && echo move + [ $move == true ] && loginfo "$(exiftool -o . '-Directory Date: Fri, 13 Nov 2020 14:55:07 +0100 Subject: [PATCH 18/25] make able to choose move or copy --- bin/exif-fixdatetime | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/bin/exif-fixdatetime b/bin/exif-fixdatetime index ee8321e..5371a09 100755 --- a/bin/exif-fixdatetime +++ b/bin/exif-fixdatetime @@ -50,12 +50,22 @@ fix_datetime () { ;; esac fi - [ $move == true ] || echo nomove - loginfo "$(exiftool -filename -createdate -datetimeoriginal "$file")" - [ $move == true ] && echo move - [ $move == true ] && loginfo "$(exiftool -o . '-Directory Date: Fri, 13 Nov 2020 14:56:46 +0100 Subject: [PATCH 19/25] update submodules --- 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-git-plugin | 2 +- vim/pack/plugins/start/vim-togglebg/README.md | 19 +++++++ .../start/vim-togglebg/autoload/togglebg.vim | 55 +++++++++++++++++++ 6 files changed, 78 insertions(+), 4 deletions(-) create mode 100644 vim/pack/plugins/start/vim-togglebg/README.md create mode 100644 vim/pack/plugins/start/vim-togglebg/autoload/togglebg.vim diff --git a/vim/pack/plugins/start/ctrlp.vim b/vim/pack/plugins/start/ctrlp.vim index 3866ae1..971c4d4 160000 --- a/vim/pack/plugins/start/ctrlp.vim +++ b/vim/pack/plugins/start/ctrlp.vim @@ -1 +1 @@ -Subproject commit 3866ae170a342fb40d83e1538c37c81c7977b821 +Subproject commit 971c4d41880b72dbbf1620b3ad91418a6a6f6b9c diff --git a/vim/pack/plugins/start/fzf b/vim/pack/plugins/start/fzf index 722d66e..75b8cca 160000 --- a/vim/pack/plugins/start/fzf +++ b/vim/pack/plugins/start/fzf @@ -1 +1 @@ -Subproject commit 722d66e85abde02518214edd1ab186d321c0170c +Subproject commit 75b8cca3b3d0663ea4102f08c763cf2b0b999f88 diff --git a/vim/pack/plugins/start/fzf.vim b/vim/pack/plugins/start/fzf.vim index 61c4b6d..53b3aea 160000 --- a/vim/pack/plugins/start/fzf.vim +++ b/vim/pack/plugins/start/fzf.vim @@ -1 +1 @@ -Subproject commit 61c4b6d1ed30287edcbfd3dbaed4e43b5c251c93 +Subproject commit 53b3aea0da5e3581e224c958dbc13558cbe5daee diff --git a/vim/pack/plugins/start/nerdtree-git-plugin b/vim/pack/plugins/start/nerdtree-git-plugin index 01b84c6..9e33a3f 160000 --- a/vim/pack/plugins/start/nerdtree-git-plugin +++ b/vim/pack/plugins/start/nerdtree-git-plugin @@ -1 +1 @@ -Subproject commit 01b84c63b9ba48628285779fbdfd046dd2bc2970 +Subproject commit 9e33a3fe8aa90f5ece2439f3b1b3a98fe7e35f85 diff --git a/vim/pack/plugins/start/vim-togglebg/README.md b/vim/pack/plugins/start/vim-togglebg/README.md new file mode 100644 index 0000000..9a2bf04 --- /dev/null +++ b/vim/pack/plugins/start/vim-togglebg/README.md @@ -0,0 +1,19 @@ +## Toggle Background Function + +Solarized comes with a Toggle Background plugin that by default will map to if that mapping is available. If it is not available you will need to either map the function manually or change your current mapping to something else. + +To set your own mapping in your .vimrc file, simply add the following line to support normal, insert and visual mode usage, changing the "" value to the key or key combination you wish to use: + +``` +call togglebg#map("") +``` + +Note that you'll want to use a single function key or equivalent if you want the plugin to work in all modes (normal, insert, visual). + +## Note + +This script has been developed by Ethan Schoonover for his Solarized color scheme. + +Original work can be found here: [Original Script] + +[Original Script]:https://github.com/altercation/vim-colors-solarized diff --git a/vim/pack/plugins/start/vim-togglebg/autoload/togglebg.vim b/vim/pack/plugins/start/vim-togglebg/autoload/togglebg.vim new file mode 100644 index 0000000..108511f --- /dev/null +++ b/vim/pack/plugins/start/vim-togglebg/autoload/togglebg.vim @@ -0,0 +1,55 @@ +" Toggle Background +" Modified: 2011 Apr 29 +" Maintainer: Ethan Schoonover +" License: OSI approved MIT license + +if exists("g:loaded_togglebg") + finish +endif +let g:loaded_togglebg = 1 + +" noremap is a bit misleading here if you are unused to vim mapping. +" in fact, there is remapping, but only of script locally defined remaps, in +" this case TogBG. The