From f9fdc06dd94b3c023e2262e3775495a16026eaeb Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Wed, 13 Aug 2025 05:08:04 +0200 Subject: [PATCH] Various fixes. --- bookworm/scripts/lib/apt_get_digested | 8 ++++---- testing/preseed.cfg | 1 - trixie/scripts/make_writable_installer.sh | 2 +- trixie/scripts/setup_desktop.sh | 20 +++++++++---------- {testing => trixie}/scripts/update_preseed.sh | 2 +- 5 files changed, 15 insertions(+), 18 deletions(-) delete mode 120000 testing/preseed.cfg rename {testing => trixie}/scripts/update_preseed.sh (95%) diff --git a/bookworm/scripts/lib/apt_get_digested b/bookworm/scripts/lib/apt_get_digested index eaabbb7..2550327 100644 --- a/bookworm/scripts/lib/apt_get_digested +++ b/bookworm/scripts/lib/apt_get_digested @@ -30,7 +30,7 @@ dpkg warns: unable to delete old directories (not empty):|dpkg: warning: unable update-alternatives: providing in auto mode:|update-alternatives: using ([[:print:]]+) to provide ([[:print:]]+) \(([[:print:]]+)\) in auto mode| [\1 → \2 (\3)]' print_nl_if_started_printing() { - if [ ! -z "${STARTED_PRINTING}" ]; then + if [ -n "${STARTED_PRINTING}" ]; then printf '\n' fi printf '\r' @@ -38,9 +38,9 @@ print_nl_if_started_printing() { local LAST_PREFIX='' local STARTED_PRINTING= local LEADER_PREFIX= -local APT_GET_EXIT_CODE -local APT_LINE -eval "set +e; DEBIAN_FRONTEND=noninteractive apt-get -y $1; APT_GET_EXIT_CODE=\$?; set -e; echo ${FINISH_LINE} \${APT_GET_EXIT_CODE}" 2>&1 | while read APT_LINE; do +local APT_GET_EXIT_CODE= +local APT_LINE= +eval "set +e; DEBIAN_FRONTEND=noninteractive apt install -y $1; APT_GET_EXIT_CODE=\$?; set -e; echo ${FINISH_LINE} \${APT_GET_EXIT_CODE}" 2>&1 | while read APT_LINE; do APT_LINE=$(printf '%s' "${APT_LINE}" | tr -d '\r') if [ -z "${APT_LINE}" ]; then continue diff --git a/testing/preseed.cfg b/testing/preseed.cfg deleted file mode 120000 index 71c2003..0000000 --- a/testing/preseed.cfg +++ /dev/null @@ -1 +0,0 @@ -../bookworm/preseed.cfg \ No newline at end of file diff --git a/trixie/scripts/make_writable_installer.sh b/trixie/scripts/make_writable_installer.sh index 844d1f7..bd04512 100755 --- a/trixie/scripts/make_writable_installer.sh +++ b/trixie/scripts/make_writable_installer.sh @@ -1,6 +1,6 @@ #!/bin/sh # based on -set -e +set -eu cd $(dirname "$0") . lib/INSTALLER_VERSION . lib/abort diff --git a/trixie/scripts/setup_desktop.sh b/trixie/scripts/setup_desktop.sh index 7820dff..9e95dae 100755 --- a/trixie/scripts/setup_desktop.sh +++ b/trixie/scripts/setup_desktop.sh @@ -1,6 +1,7 @@ -#!/bin/sh -set -e -cd $(dirname "$0") +#!/usr/bin/env dash +set -eu +ROOT=$(dirname "$0") +cd "${ROOT}" . lib/abort . lib/abort_if_offline . lib/apt_get_digested @@ -38,21 +39,21 @@ abort_if_illegal_system_name() { done abort 'Need legal system name.' } -expect_n_args 2 2 "SYSTEM_NAME, USER_PW" $@ +expect_n_args 2 2 "SYSTEM_NAME, USER_PW" "$@" SYSTEM_NAME="$1" USER_PW="$2" abort_if_illegal_system_name "${SYSTEM_NAME}" -SYSTEM_CLASS_NAME="$(get_system_class_for ${SYSTEM_NAME})" +SYSTEM_CLASS_NAME=$(get_system_class_for "${SYSTEM_NAME}") INSTALL_TAGS="all ${SYSTEM_CLASS_NAME} ${SYSTEM_NAME} user desktop" adopt_wifi_connection() { get_network_interfaces_last_wpa_value() { REGEX="^\s+wpa-${1}\s+" - cat "${PATH_NETWORK_INTERFACES}" | grep -E "${REGEX}" | sed -E "s/${REGEX}//g" | tail -1 + grep -E "${REGEX}" "${PATH_NETWORK_INTERFACES}" | sed -E "s/${REGEX}//g" | tail -1 } WLAN_SSID=$(get_network_interfaces_last_wpa_value 'ssid') WLAN_PSK=$(get_network_interfaces_last_wpa_value 'psk') - if [ ! -z "${WLAN_SSID}" ]; then + if [ -n "${WLAN_SSID}" ]; then prefixed_msg_no_nl "Found, adding to NetworkManager: " if [ -z "${WLAN_PSK}" ]; then nmcli connection add type wifi wifi.ssid "${WLAN_SSID}" @@ -62,12 +63,9 @@ adopt_wifi_connection() { fi } -../../trixie/scripts/from_older_upgrade.sh desktop -./from_older_upgrade.sh desktop - # NB: This needs to come before steps potentially overwriting /etc/network/interfaces. apt_get_digested '-q -q install network-manager' -if [ "$(nmcli -f TYPE conn | grep 'wifi' | wc -l)" = "0" ]; then +if [ "$(nmcli -f TYPE conn | grep -c 'wifi')" = "0" ]; then prefixed_msg "Checking for existing wifi config in ${PATH_NETWORK_INTERFACES} …" adopt_wifi_connection else diff --git a/testing/scripts/update_preseed.sh b/trixie/scripts/update_preseed.sh similarity index 95% rename from testing/scripts/update_preseed.sh rename to trixie/scripts/update_preseed.sh index 8f82f02..743bb5c 100755 --- a/testing/scripts/update_preseed.sh +++ b/trixie/scripts/update_preseed.sh @@ -12,7 +12,7 @@ prefixed_msg_init abort_if_command_unknown pmount -expect_n_args 4 4 'DEVICE (e.g. "sdb1") ROOT_PASSWORD WIFI_ESSID WIFI_PASSWORD' $@ +expect_n_args 1 4 'DEVICE (e.g. "sdb1") ROOT_PASSWORD WIFI_ESSID WIFI_PASSWORD' $@ DEVICE_NAME="$1" ROOT_PASSWORD="$2" WIFI_ESSID="$3" -- 2.30.2