From 37decbc6cb045f3800b7bff7edb0e935dd796bc2 Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Wed, 16 Apr 2025 03:11:23 +0200
Subject: [PATCH] Fix.

---
 bookworm/scripts/lib/constants_repopaths      | 1 +
 bookworm/scripts/lib/ensure_homefiles_of_tags | 4 ++--
 bookworm/scripts/lib/ensure_packages_of_tags  | 4 ++--
 bookworm/scripts/lib/init_packages            | 4 ++--
 bookworm/scripts/lib/setup_users              | 6 +++---
 bookworm/scripts/setup_server.sh              | 4 ++--
 testing/scripts/init_server_access.sh         | 1 +
 7 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/bookworm/scripts/lib/constants_repopaths b/bookworm/scripts/lib/constants_repopaths
index dc13533..54bcb5f 100644
--- a/bookworm/scripts/lib/constants_repopaths
+++ b/bookworm/scripts/lib/constants_repopaths
@@ -1,2 +1,3 @@
 PATH_SCRIPTS="$(pwd)"
 PATH_CONF="$(dirname ${PATH_SCRIPTS})"
+PATH_CONF_HOME="${PATH_CONF}/home"
diff --git a/bookworm/scripts/lib/ensure_homefiles_of_tags b/bookworm/scripts/lib/ensure_homefiles_of_tags
index 476695a..72e8449 100644
--- a/bookworm/scripts/lib/ensure_homefiles_of_tags
+++ b/bookworm/scripts/lib/ensure_homefiles_of_tags
@@ -1,8 +1,8 @@
 . lib/chown_to_user
 . lib/constants_user  # PATH_USER_HOME
-. lib/constants_repopaths  # PATH_CONF
+. lib/constants_repopaths  # PATH_CONF_HOME
 
 ensure_homefiles_of_tags() {
-    _TO_CHOWN=$(copy_dirtree "${_PATH_CONF_HOME}" "${PATH_USER_HOME}" $@ | sed "s/.*' -> //g")
+    _TO_CHOWN=$(copy_dirtree "${PATH_CONF_HOME}" "${PATH_USER_HOME}" $@ | sed "s/.*' -> //g")
     chown_to_user ${_TO_CHOWN}
 }
diff --git a/bookworm/scripts/lib/ensure_packages_of_tags b/bookworm/scripts/lib/ensure_packages_of_tags
index 6e7f3f5..c43e54a 100644
--- a/bookworm/scripts/lib/ensure_packages_of_tags
+++ b/bookworm/scripts/lib/ensure_packages_of_tags
@@ -6,13 +6,13 @@ ensure_packages_of_tags() {
         if [ ! -f "${_PATH_APTMARK_TAG}" ]; then
             continue
         fi
-        printf 'Ensuring installation of: '
+        printf 'For tag "%s", ensuring installation of: ' "${_TAG}"
         cat "${_PATH_APTMARK_TAG}" | while read _LINE; do
             if [ ! $(echo "${_LINE}" | cut -c1) = "#" ]; then
                 echo -n "${_LINE} "
                 apt-get -y -o Dpkg::Options::="--force-confnew" install "${_LINE}" > /dev/null
             fi
         done
-        echo ''
+        echo '\n'
     done
 }
diff --git a/bookworm/scripts/lib/init_packages b/bookworm/scripts/lib/init_packages
index 295a0fa..e00c5a4 100644
--- a/bookworm/scripts/lib/init_packages
+++ b/bookworm/scripts/lib/init_packages
@@ -22,7 +22,7 @@ init_packages() {
     # before purging, ensure tagged packages installed
     ensure_packages_of_tags $@ 
     echo "Autoremove and purge …"
-    apt -y --purge autoremove > /dev/null
+    apt-get -y --purge autoremove > /dev/null
     echo "And now: dist-upgrade …"
-    apt -y dist-upgrade > /dev/null
+    apt-get -y dist-upgrade > /dev/null
 }
diff --git a/bookworm/scripts/lib/setup_users b/bookworm/scripts/lib/setup_users
index 83488d6..59df47f 100644
--- a/bookworm/scripts/lib/setup_users
+++ b/bookworm/scripts/lib/setup_users
@@ -1,5 +1,6 @@
 . lib/chown_to_user
 . lib/copy_dirtree
+. lib/constants_repopaths  # PATH_CONF_HOME
 . lib/constants_user  # PATH_USER_HOME, USERNAME
 . lib/ensure_homefiles_of_tags
 . lib/mkdir_p_print_top
@@ -7,17 +8,16 @@
 setup_users() {
     _MIN_TAGS="$1"
     _TAGS_USER="$2"
-    _PATH_CONF_HOME=../home
     _PATH_USER_BIN="${PATH_USER_HOME}/.local/bin"
 
     echo "\nSetting up root user's home directory."
-    copy_dirtree "${_PATH_CONF_HOME}" '/root' ${_MIN_TAGS} root
+    copy_dirtree "${PATH_CONF_HOME}" '/root' ${_MIN_TAGS} root
 
     echo "\nSetting up user ${USERNAME}."
     adduser --disabled-password --gecos "" "${USERNAME}"
     usermod -a -G sudo "${USERNAME}"
     ensure_homefiles_of_tags ${_MIN_TAGS} ${_TAGS_USER}
-    copy_dirtree "${_PATH_CONF_HOME}" "${PATH_USER_HOME}" ${_MIN_TAGS} ${_TAGS_USER}
+    copy_dirtree "${PATH_CONF_HOME}" "${PATH_USER_HOME}" ${_MIN_TAGS} ${_TAGS_USER}
     _TO_CHOWN=$(mkdir_p_print_top "${_PATH_USER_BIN}")
     cd "${_PATH_USER_BIN}"
     ln -s ../../.plomlib lib
diff --git a/bookworm/scripts/setup_server.sh b/bookworm/scripts/setup_server.sh
index a4c0a2d..191ffcd 100755
--- a/bookworm/scripts/setup_server.sh
+++ b/bookworm/scripts/setup_server.sh
@@ -23,9 +23,9 @@ PATH_CADDYFILE="${PATH_ETC}/caddy/Caddyfile"
 
 echo '\nPreparing caddy install.'
 PATH_CADDY_REPO='https://dl.cloudsmith.io/public/caddy/stable'
-apt -y install curl > /dev/null
+apt-get -y install curl > /dev/null
 curl -1Lf "${PATH_CADDY_REPO}/gpg.key" | gpg --dearmor -o /usr/share/keyrings/caddy-stable-archive-keyring.gpg
-curl -1Lf "${PATH_CADDY_REPO}/debian.deb.txt" | tee /etc/apt/sources.list.d/caddy-stable.list
+curl -1Lf "${PATH_CADDY_REPO}/debian.deb.txt" > /etc/apt/sources.list.d/caddy-stable.list
 
 init_packages "${MIN_TAGS}"
 
diff --git a/testing/scripts/init_server_access.sh b/testing/scripts/init_server_access.sh
index 90a3a4c..97ac66c 100755
--- a/testing/scripts/init_server_access.sh
+++ b/testing/scripts/init_server_access.sh
@@ -17,6 +17,7 @@ ssh-keyscan "${SERVER}" >> "${PATH_KNOWN_HOSTS}"
 RESULT=$?
 echo "DEBUG (why does script sometimes stop here if 'set -e' a bit earlier?): ${RESULT}"
 if [ "${RESULT}" != "0" ]; then
+    ssh-keyscan -v "${SERVER}"
     exit 1 
 fi
 set -e
-- 
2.30.2