Fix.

diff --git a/testing/scripts/lib/trapp b/testing/scripts/lib/trapp
index fb550f7ba17310393fda6926d62f04d01b255d94..727a51c9b77bd64e89c38e16b0bf79fe03484fda 100644 (file)
--- 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 18018d9482fb9a9f8db9b9c3957deef7f86c31e0..91765e718203abe79871f7380667c43bf084254b 100755 (executable)
--- 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