From 135612ed881ea1524e11b786ed74c6d3147df9ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@bmi.gv.at>
Date: Wed, 29 Mar 2023 11:10:11 +0200
Subject: [PATCH] fix adding file to sshs via config-file

---
 sshs               | 22 +++++++++++-----------
 sshs_addfiles.conf |  5 +++--
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/sshs b/sshs
index 88d6274..c616d5c 100644
--- a/sshs
+++ b/sshs
@@ -5,23 +5,23 @@ sshs() {
     if [ -n "${TMUX}" ]; then
         tmux set-environment sshcon "$@"
     fi
-    local LOGLEVEL="WARN"
+#    local LOGLEVEL="WARN"
 #    MKTMPCMD='mktemp $(echo ${XDG_RUNTIME_DIR}/bashrc.XXXXXXXX.conf)'
 #    VIMMKTMPCMD="mktemp ${XDG_RUNTIME_DIR}/vimrc.XXXXXXXX.conf"
 
     local f
     local TMPBASHCONFIG=$(mktemp -p ${XDG_RUNTIME_DIR} -t bashrc.XXXXXXXX --suffix=.conf)
-#    local FILELIST=( "${MSC_BASE}/functions.sh" "${MSC_BASE}/logging" "${MSC_BASE}/myshell_load_fortmpconfig" $(getbashrcfile) ~/.bash_aliases "${MSC_BASE}/aliases" "${MSC_BASE}/PS1" "${MSC_BASE}/bash_completion.d/*" )
+    local FILELIST=()
 
-    logdebug "FILELIST: ${FILELIST[@]}"
-    if [ -e "${HOME}/.config/myshellconfig/sshs_addfiles.conf" ] ; then
-        for f in $(cat "${HOME}/.config/myshellconfig/sshs_addfiles.conf");do
-            [ -e "$f" ] && {\
-                logdebug "add $f to FILELIST"; \
-                FILELIST+=("$f"); } 
+    if [ -e "${MSC_BASE}/sshs_addfiles.conf" ] ; then
+        for f in $(envsubst < ${MSC_BASE}/sshs_addfiles.conf);do
+            logdebug "add to FILELIST: ${f}";
+            FILELIST+=("${f}"); 
         done
+    else
+        loginfo "Filelist for sshs not found: ${MSC_BASE}/sshs_addfiles.conf"
     fi
-    logdebug "FILELIST1: ${FILELIST[@]}"
+#    logdebug "FILELIST1: ${FILELIST[@]}"
     local SSH_OPTS="-o VisualHostKey=no -o ControlMaster=auto -o ControlPersist=20s"
     #local SSH_OPTS="-o VisualHostKey=no -o ControlMaster=auto -o ControlPersist=20s -o ControlPath=~/.ssh/master-%C"
     #local SSH_OPTS="-o VisualHostKey=no -o ControlMaster=yes -o ControlPersist=10s -o ControlPath=~/.ssh/ssh-%C"
@@ -59,9 +59,9 @@ done
 unset i
 EOF
 
-    for f in ${FILELIST[*]}; do
+    for f in ${FILELIST[@]}; do
         if [ -e $f ]; then
-            logdebug "add $f to tmpconfig"
+            logdebug "add to tmpconfig: $f"
             cat "$f" >> "${TMPBASHCONFIG}";
         fi
     done
diff --git a/sshs_addfiles.conf b/sshs_addfiles.conf
index 173b5cc..cc54a57 100644
--- a/sshs_addfiles.conf
+++ b/sshs_addfiles.conf
@@ -1,8 +1,9 @@
 ${MSC_BASE}/functions.sh
 ${MSC_BASE}/logging
 ${MSC_BASE}/myshell_load_fortmpconfig
-$(getbashrcfile) ~/.aliases
-$(getbashrcfile) ~/.bash_aliases
+$(getbashrcfile)
+${HOME}/.aliases
+${HOME}/.bash_aliases
 ${MSC_BASE}/aliases
 ${MSC_BASE}/PS1
 ${MSC_BASE}/bash_completion.d/*