From 9600e054f4a3cb336da2482eb715f1e90ee71df1 Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Thu, 21 Aug 2025 06:49:55 +0200
Subject: [PATCH] Fixes.

---
 trixie/aptmark/all                            | 26 ++++++++++++++++++-
 trixie/scripts/lib/ensure_packages_of_tags.sh |  4 +--
 trixie/scripts/make_writable_installer.sh     |  4 ++-
 3 files changed, 30 insertions(+), 4 deletions(-)
 mode change 120000 => 100644 trixie/aptmark/all

diff --git a/trixie/aptmark/all b/trixie/aptmark/all
deleted file mode 120000
index 1913f5e..0000000
--- a/trixie/aptmark/all
+++ /dev/null
@@ -1 +0,0 @@
-../../bookworm/aptmark/all
\ No newline at end of file
diff --git a/trixie/aptmark/all b/trixie/aptmark/all
new file mode 100644
index 0000000..63a9230
--- /dev/null
+++ b/trixie/aptmark/all
@@ -0,0 +1,25 @@
+# connectivity: ifupdown seems necessary everyhwere, isc-dhcp-client unpredictably so
+ifupdown
+isc-dhcp-client
+# git for the setup directory; cloning works with ca-certificates
+ca-certificates
+git
+# to avoid constant warnings about no locale being found
+locales
+# extremely useful for basic network debugging; missed these more than once in an emergency
+netcat-traditional
+iputils-ping
+# to set the time
+ntpsec-ntpdate
+# generally useful for debugging, so necessary
+vim
+ack
+# not scrictly necessary except apt really likes to complain if nothing like this
+dialog
+# you'll notice when you can't reboot anymore
+systemd-sysv
+# general apt goodness
+apt-utils
+# lots of little trouble if this missing
+dbus
+#
diff --git a/trixie/scripts/lib/ensure_packages_of_tags.sh b/trixie/scripts/lib/ensure_packages_of_tags.sh
index c4495f6..53a1ee3 100644
--- a/trixie/scripts/lib/ensure_packages_of_tags.sh
+++ b/trixie/scripts/lib/ensure_packages_of_tags.sh
@@ -12,7 +12,7 @@ for _TAG in $@; do
         printf 'checking if installed … '
         if dpkg-query -Wf '${Package}\n' | grep '^'"${_PACKAGE}"'$' > /dev/null; then
             echo 'yup, keeping!'
-            apt_digested "${_APT_ARG} ${_PACKAGE}"
+            apt_digested ${_APT_ARG} ${_PACKAGE}
         else
             echo 'nope, nothing to keep.'
         fi
@@ -28,7 +28,7 @@ for _TAG in $@; do
         echo 'nothing to install.'
     else
         echo "ensuring installation of: ${_PACKAGES}"
-        apt_digested "${_APT_ARG} ${_PACKAGES}"
+        apt_digested ${_APT_ARG} ${_PACKAGES}
     fi
 done
 prefixed_msg_exit
diff --git a/trixie/scripts/make_writable_installer.sh b/trixie/scripts/make_writable_installer.sh
index 8e0ecd0..5aecd7a 100755
--- a/trixie/scripts/make_writable_installer.sh
+++ b/trixie/scripts/make_writable_installer.sh
@@ -90,8 +90,10 @@ if [ "${RESULT}" != "0" ]; then
     prefixed_msg '\nrsync encountered errors, see above – continue? (Y/N)'
     read -r ANSWER
     FIRST_CHAR=$(echo "${ANSWER}" | cut -c1)
-    if ! [ "${FIRST_CHAR}" = 'y' ] || [ "${FIRST_CHAR}" = 'Y' ]; then
+    if [ ! "${FIRST_CHAR}" = 'y' ] && [ ! "${FIRST_CHAR}" = 'Y' ]; then
         abort 'as requested'
+    else
+        echo 'continuing'
     fi
 fi
 
-- 
2.30.2