From: Christian Heller Date: Tue, 22 Apr 2025 05:11:05 +0000 (+0200) Subject: Fix. X-Git-Url: https://plomlompom.com/repos/%7B%7Bdb.prefix%7D%7D/%22https:/validator.w3.org/tasks?a=commitdiff_plain;h=1293c5261bbb36689060f4b160cee24f454cc758;p=config Fix. --- diff --git a/testing/scripts/lib/trapp b/testing/scripts/lib/trapp index fb550f7..727a51c 100644 --- a/testing/scripts/lib/trapp +++ b/testing/scripts/lib/trapp @@ -1,8 +1,7 @@ trapp() { - if [ -z "$@" ]; then - _NEW_COMMAND='-' - else - _NEW_COMMAND="$@" + _COMMAND="$@" + if [ -z "${_COMMAND}" ]; then + _COMMAND='-' fi - trap "${_NEW_COMMAND}" EXIT TERM HUP INT + trap "${_COMMAND}" EXIT TERM HUP INT } diff --git a/testing/scripts/setup_desktop.sh b/testing/scripts/setup_desktop.sh index 18018d9..91765e7 100755 --- a/testing/scripts/setup_desktop.sh +++ b/testing/scripts/setup_desktop.sh @@ -82,7 +82,8 @@ echo "\nUpgrading to testing." cp "${PATH_COPY_TAG_ALL}${PATH_ETC_APT_CONF}/99_minimize_dependencies" "${PATH_ETC_APT_CONF}/" upgrade_from_older_release -# NB: This *needs* to come before steps potentially overwriting /etc/network/interfaces. +# NB: This needs to come before steps potentially overwriting /etc/network/interfaces. +apt -y install network-manager if [ "$(nmcli -f TYPE conn | grep 'wifi' | wc -l)" = "0" ]; then echo "\nChecking for existing wifi config in ${PATH_NETWORK_INTERFACES}." adopt_wifi_connection