From e0f42bb5cffe38489fe5fe5acb691c7c36820ada Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Mon, 7 Dec 2020 00:20:23 +0100 Subject: [PATCH 1/2] 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 2983426..00a3610 160000 --- a/vim/pack/plugins/start/fzf +++ b/vim/pack/plugins/start/fzf @@ -1 +1 @@ -Subproject commit 298342677107f19f2ef7035afcf5302fdf26aa51 +Subproject commit 00a36103316456227b5a3331e58155e43f713f79 diff --git a/vim/pack/plugins/start/vim-airline b/vim/pack/plugins/start/vim-airline index 06117a6..2cea83e 160000 --- a/vim/pack/plugins/start/vim-airline +++ b/vim/pack/plugins/start/vim-airline @@ -1 +1 @@ -Subproject commit 06117a61e1218b2a866451d2ac4d8ddcd82c8543 +Subproject commit 2cea83eb88e0a6d1461a4f081016d6ca4f1c29c8 From 411e5a2edc585118d64d0bfadfd2412d2035b848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Tue, 8 Dec 2020 19:07:54 +0100 Subject: [PATCH 2/2] set home, if XDG_RUNTIME_DIR not defined --- functions.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/functions.sh b/functions.sh index 57ab3ca..97a1f8d 100755 --- a/functions.sh +++ b/functions.sh @@ -332,6 +332,8 @@ sshmyshellconfig() { echo loginfo cleanup from old config rm -rf ~/server-config && echo rm -rf ~/server-config + loginfo git clone + git clone --recurse-submodules $MYSHELLCONFIG_GIT_REMOTE \${HOME}/${MYSHELLCONFIG_SUBPATH} EOF EXIT @@ -385,8 +387,8 @@ EOF if [ $# -ge 1 ]; then if [ -e "${TMPBASHCONFIG}" ] ; then local RCMD="/bin/bash --noprofile --norc -c " - local REMOTETMPBASHCONFIG=$(ssh -T ${SSH_OPTS} $@ "mktemp -p \${XDG_RUNTIME_DIR} -t bashrc.XXXXXXXX --suffix=.conf"| tr -d '[:space:]' ) - local REMOTETMPVIMCONFIG=$(ssh -T ${SSH_OPTS} $@ "mktemp -p \${XDG_RUNTIME_DIR} -t vimrc.XXXXXXXX --suffix=.conf"| tr -d '[:space:]') + local REMOTETMPBASHCONFIG=$(ssh -T ${SSH_OPTS} $@ "mktemp -p \${XDG_RUNTIME_DIR-~} -t bashrc.XXXXXXXX --suffix=.conf"| tr -d '[:space:]' ) + 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 cat << EOF >> "${TMPBASHCONFIG}"