Fix.

diff --git a/trixie/scripts/lib/apt_digested.sh b/trixie/scripts/lib/apt_digested.sh
index a6abe64a1d650999a36e489b17a6c31288598ee4..4288aac3b7d9cc500b7ab95303f0070e3fde1f44 100644 (file)
--- a/trixie/scripts/lib/apt_digested.sh
+++ b/trixie/scripts/lib/apt_digested.sh
@@ -140,7 +140,7 @@ apt_digested() {
             local FIRST_FIELD
             FIRST_FIELD=$(echo "${APT_LINE}" | cut -d' ' -f1)
             if [ "${FIRST_FIELD}" = "${FINISH_LINE}" ]; then
-                printf '%s' "${OUR_NEWLINE}"
+                echo -n "${OUR_NEWLINE}"
                 local EXIT_CODE
                 EXIT_CODE=$(echo "${APT_LINE}" | cut -d' ' -f2)
                 if [ "${EXIT_CODE}" != "0" ]; then
@@ -159,7 +159,7 @@ apt_digested() {
         local IFS
         IFS=$(printf '\n\r')
         for LINE in ${apt_digested_SEDS}; do
-            I=$((1 + "$I")) 
+            I=$((1 + $I))
             if   [ "$I" -eq 1 ]; then
                 PREFIX="${LINE}" 
                 continue
@@ -187,12 +187,12 @@ apt_digested() {
         if [ "${COMPRESSED_ITEM}" = 'IGNORE' ]; then
             continue
         elif [ -z "${COMPRESSED_ITEM}" ]; then
-            printf '%s' "${OUR_NEWLINE}"
+            echo -n "${OUR_NEWLINE}"
             prefixed_msg_no_nl "${APT_LINE}"
             LAST_PREFIX=
         else
             if [ "${PREFIX}" != "${LAST_PREFIX}" ]; then
-                printf '%s' "${OUR_NEWLINE}"
+                echo -n "${OUR_NEWLINE}"
                 prefixed_msg_no_nl "# ${PREFIX}"
                 LAST_PREFIX="${PREFIX}"
             fi

diff --git a/trixie/scripts/setup_desktop.sh b/trixie/scripts/setup_desktop.sh
index a74343e8daa0dc308a7dc8442cc65aa9c48a148d..d77138235765518cb4d60724e45a15cc4a00b2e6 100755 (executable)
--- a/trixie/scripts/setup_desktop.sh
+++ b/trixie/scripts/setup_desktop.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env dash
-set -eu
+set -e
 ROOT=$(dirname "$0")
 cd "${ROOT}"
 . lib/abort.sh
@@ -64,7 +64,7 @@ adopt_wifi_connection() {
 }
 
 # NB: This needs to come before steps potentially overwriting /etc/network/interfaces.
-apt_digested '-q -q install network-manager'
+apt_digested -q -q install network-manager
 if [ "$(nmcli -f TYPE conn | grep -c 'wifi')" = "0" ]; then
     prefixed_msg "Checking for existing wifi config in ${PATH_NETWORK_INTERFACES} …"
     adopt_wifi_connection