From 3c53f1d876073410f96501ec9d412df8449cc64f Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Thu, 8 May 2025 03:25:48 +0200
Subject: [PATCH] Fix.

---
 bookworm/scripts/lib/abort        |  4 ++--
 testing/scripts/update_preseed.sh | 20 ++++++++++++++++----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/bookworm/scripts/lib/abort b/bookworm/scripts/lib/abort
index d71c1e1..73f1f77 100644
--- a/bookworm/scripts/lib/abort
+++ b/bookworm/scripts/lib/abort
@@ -1,6 +1,6 @@
 . lib/prefixed_msg
-abort() {
 
-    prefixed_msg "$1"
+abort() {
+    prefixed_msg "$1" >&2
     exit 1
 }
diff --git a/testing/scripts/update_preseed.sh b/testing/scripts/update_preseed.sh
index bf3da3a..947b5eb 100755
--- a/testing/scripts/update_preseed.sh
+++ b/testing/scripts/update_preseed.sh
@@ -5,30 +5,42 @@ cd $(dirname "$0")
 . lib/constants_installer  # FILENAME_PRESEED_CFG, PATH_PRESEED_CFG
 . lib/expect_n_args
 . lib/get_mountable_device_path
+. lib/prefixed_msg
 . lib/trapp
 
+prefixed_msg_init
+
+abort_if_command_unknown pmount
+
 expect_n_args 4 4 'DEVICE (e.g. "sdb1") ROOT_PASSWORD WIFI_ESSID WIFI_PASSWORD' $@
 DEVICE_NAME="$1"
 ROOT_PASSWORD="$2"
 WIFI_ESSID="$3"
 WIFI_PASSWORD="$4"
-abort_if_command_unknown pmount
 
+prefixed_msg "Checking some mountability criteria for ${PATH_DEVICE} …"
 PATH_DEVICE="$(get_mountable_device_path ${DEVICE_NAME})"
 PATH_MOUNTED="/media/$1"
-echo "Mounting ${PATH_DEVICE} …"
+
+prefixed_msg "Mounting ${PATH_DEVICE} …"
 pmount "${DEVICE_NAME}"
-trapp "echo 'Unmounting '${PATH_DEVICE}; pumount ${DEVICE_NAME}"
-echo "Copying ${PATH_PRESEED_CFG} …"
+UMOUNT_MSG=$(prefixed_msg "Unmounting ${PATH_DEVICE} …")
+trapp "echo '${UMOUNT_MSG}'; pumount ${DEVICE_NAME}"
+
+prefixed_msg "Copying ${PATH_PRESEED_CFG} …"
 PATH_MOUNTED_PRESEED_CFG="${PATH_MOUNTED}/${FILENAME_PRESEED_CFG}"
 cp "${PATH_PRESEED_CFG}" "${PATH_MOUNTED_PRESEED_CFG}"
+
 replace_if_provided() {
     _VAR_NAME="$1"
     val_of_var_of_name() { eval printf '"%s"' '"${'"$1"'}"'; }
     if [ ! -z "$(val_of_var_of_name ${_VAR_NAME})" ]; then
+        prefixed_msg "Replacing ${_VAR_NAME} …"
         sed -i "s/REPLACE_WITH_${_VAR_NAME}/$(val_of_var_of_name ${_VAR_NAME})/g" "${PATH_MOUNTED_PRESEED_CFG}"
     fi
 }
 replace_if_provided ROOT_PASSWORD
 replace_if_provided WIFI_ESSID
 replace_if_provided WIFI_PASSWORD
+
+prefixed_msg_exit
-- 
2.30.2