From adf123604688046302445f6b02fd7830090b1624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Sat, 7 Nov 2020 20:43:47 +0100 Subject: [PATCH 1/6] 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 7418a4b559301318688c195e5b878889b8c99f14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Fri, 13 Nov 2020 07:36:12 +0100 Subject: [PATCH 2/6] remove unneeded lines --- functions.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/functions.sh b/functions.sh index f0dcd09..774f622 100755 --- a/functions.sh +++ b/functions.sh @@ -560,7 +560,6 @@ function checkbkp-full() { $CMD /bin/bash << EOF sudo find /srv/nfs/backup -mindepth 1 -maxdepth 1|grep -v -e "git$\|git-backup-repos"|while read i;do printf "%-30s%s\\n" "\$i" \$(ls \$i|tail -n1);done|sort -k 2.1 -r EOF - #which pdsh 1>/dev/null 2>&1 && pdsh -g hetzner-servers sudo systemctl status backup.service which pdsh 1>/dev/null 2>&1 && pdsh -g vpn sudo systemctl status backup.service else @@ -799,7 +798,6 @@ loadagent() { loginfo "Load agent from $af" unset SSH_AUTH_SOCKET SSH_AGENT_PID eval $(<$af) -# . $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 e9a0844824e8a982c0e0dbd0312f4e0c4e9eb20a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Sun, 15 Nov 2020 11:35:31 +0100 Subject: [PATCH 3/6] update submodules --- vim/pack/plugins/start/fzf | 2 +- vim/pack/plugins/start/vim-airline | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vim/pack/plugins/start/fzf b/vim/pack/plugins/start/fzf index 75b8cca..7bd99a2 160000 --- a/vim/pack/plugins/start/fzf +++ b/vim/pack/plugins/start/fzf @@ -1 +1 @@ -Subproject commit 75b8cca3b3d0663ea4102f08c763cf2b0b999f88 +Subproject commit 7bd99a22eeba74c88ad60f860111247a052f5586 diff --git a/vim/pack/plugins/start/vim-airline b/vim/pack/plugins/start/vim-airline index 731bdb1..5366671 160000 --- a/vim/pack/plugins/start/vim-airline +++ b/vim/pack/plugins/start/vim-airline @@ -1 +1 @@ -Subproject commit 731bdb11d2f57365e02bdb8adaeb59a8b93db27d +Subproject commit 536667191d5bdc0afa3a18d7df229731e778815e From b7414ca285f3cf1e465d8adc030f964dcde9e9f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Sun, 15 Nov 2020 22:10:29 +0100 Subject: [PATCH 4/6] parse all arguments in git-myshellconfig-checkout --- bin/git-myshellconfig-checkout | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/bin/git-myshellconfig-checkout b/bin/git-myshellconfig-checkout index bc84c9e..81ee9a4 100755 --- a/bin/git-myshellconfig-checkout +++ b/bin/git-myshellconfig-checkout @@ -33,18 +33,25 @@ cat << EOF >> "${MYSHELLCONFIG_LOGFILE}" +-----BEGINN git update repo $(date) -------------------------------+ EOF -case $1 in - -h) - # Headless repo local - PRE="${MYSHELLCONFIG_GIT_REMOTE_NAME}" - ;; - -s) - dosubmodupdate="true" - ;; - *) - PRE="" - ;; -esac +set -- $(getopt -u -o hs --long headless,submodules-update -- "$@" ) + +while [ $# -gt 0 ]; do + case $1 in + -h|--headless) + # Headless repo local + PRE="${MYSHELLCONFIG_GIT_REMOTE_NAME}" + shift + ;; + -s|--submodules-update) + dosubmodupdate="true" + shift + ;; + *) + PRE="" + shift + ;; + esac +done # If TAG is set, checkout is always headless. [ -z "${MYSHELLCONFIG_GIT_TAG:+x}" ] || { export MYSHELLCONFIG_GIT_BRANCH=${MYSHELLCONFIG_GIT_TAG}; export PRE=""; } From aad6c0529e15a6d0337e8d6c9f5a7e4cd6e593f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Sun, 15 Nov 2020 22:19:57 +0100 Subject: [PATCH 5/6] Merged detached head into master --- bashrc_add | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bashrc_add b/bashrc_add index 9849fcb..482a42e 100755 --- a/bashrc_add +++ b/bashrc_add @@ -139,6 +139,11 @@ EOF export PATH fi + if [ -d "${HOME}/.local/bin" ] ; then + pathmunge "${HOME}/.local/bin" + export PATH + fi + # Check for interactive bash and that we haven't already been sourced. if [ -n "${BASH_VERSION-}" -a -n "${PS1-}" -a -z "${BASH_COMPLETION_VERSINFO-}" ]; then From fb5cea172b7b2022eafb2ac0d1c5cf32296086f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Mon, 16 Nov 2020 08:08:59 +0100 Subject: [PATCH 6/6] improve output, set several dirs in variables --- bin/publishpvp | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/bin/publishpvp b/bin/publishpvp index 700b254..0235908 100755 --- a/bin/publishpvp +++ b/bin/publishpvp @@ -1,8 +1,9 @@ #!/bin/bash RESTART=true - -set -- $(getopt -u -o n --long no-restart -- "$@" ) +CONFDIR="${HOME}/.local/$(basename $0)" +TIMESTAMP=$(date "+%x-%X") +set -- $(getopt -u -o ng: --long no-restart,gvapplid: -- "$@" ) while [ $# -gt 0 ]; do @@ -13,6 +14,10 @@ do shift continue ;; + -g|--gvapplid) + GVAPPLID=$2 + shift; shift; + ;; --) shift DESTS=($@) @@ -25,17 +30,24 @@ done for DEST in ${DESTS[*]} do - file="$(find ${HOME}/.local/$(basename $0)/ -name ${DEST})" + file="$(find ${CONFDIR%/}/ -name ${DEST})" + gvapplid=$(awk -v hostname="$(ssh ${DEST} hostname)" '$0 ~ hostname {print $1}' ${CONFDIR%/}/gvapplid) case ${DEST} in *cnf*|*conf*) - [ -z "${file-x}" ] && file="${HOME}/.local/$(basename $0)/confluence" - libdir=/opt/atlassian/confluence/confluence/WEB-INF/lib + [ -z "${file-x}" ] && file="${CONFDIR%/}/confluence" + homedir=/var/atlassian/application-data/confluence + installdir=/opt/atlassian/confluence + libdir=${installdir%/}${installdir:+/}confluence/WEB-INF/lib + classesdir=${installdir%/}${installdir:+/}confluence/WEB-INF/classes app=confluence appuser=confluence ;; *jra*|*jira*) - [ -z "${file-x}" ] && file="${HOME}/.local/$(basename $0)/jira" - libdir=/opt/atlassian/jira/atlassian-jira/WEB-INF/lib + [ -z "${file-x}" ] && file="${CONFDIR%/}/jira" + homedir=/var/atlassian/application-data/jira + installdir=/opt/atlassian/jira + libdir=${installdir%/}${installdir:+/}atlassian-jira/WEB-INF/lib + classesdir=${installdir%/}${installdir:+/}atlassian-jira/WEB-INF/classes app=jira appuser=jira ;; @@ -46,8 +58,7 @@ do esac echo "Using configfile $file" - runtime=$(date "+%x-%X") - UNINSTALLDIR="${HOME}/UNINSTALL/${runtime}/" + UNINSTALLDIR="\${HOME}/UNINSTALL/${TIMESTAMP}/" if stat "${file}" >/dev/null 2>/dev/null ; then echo "Stop $app on ${DEST}" @@ -103,8 +114,9 @@ EOF esac unset cmd pkg version done - echo "Start $app on ${DEST}" - ssh ${DEST} systemctl start ${app}.service