Fix.

diff --git a/testing/scripts/setup_desktop.sh b/testing/scripts/setup_desktop.sh
index 6108786dbc997102d4c99594cef8adfd4502acbe..87e846ce7f1f66f48e6ebff9bc67a766d23a6daf 100755 (executable)
--- a/testing/scripts/setup_desktop.sh
+++ b/testing/scripts/setup_desktop.sh
@@ -3,18 +3,17 @@ set -e
 cd $(dirname "$0")
 . lib/abort
 . lib/abort_if_offline
-. lib/constants_etc  # PATH_ETC, PATH_REL_ETC
+. lib/constants_etc  # PATH_ETC
 . lib/constants_user  # USERNAME
 . lib/determine_ip
-. lib/expect_min_n_args
+. lib/expect_n_args
 . lib/init_packages
 . lib/put_finished_marker
 . lib/setup_user
 
-PATH_CONF_ETC="../${PATH_REL_ETC}"
 PATH_NETWORK_INTERFACES="${PATH_ETC}/network/interfaces"
-PATH_REL_APT=apt
-PATH_REL_APT_CONF=${PATH_REL_APT}/apt.conf.d
+PATH_ETC_APT="${PATH_ETC}/apt"
+PATH_ETC_APT_CONF=${PATH_ETC_APT}/apt.conf.d
 
 abort_if_offline
 
@@ -37,7 +36,7 @@ abort_if_illegal_system_name() {
     done
     abort 'Need legal system name.'
 }
-expect_min_n_args 1 "(system name)" "$@"
+expect_n_args 1 1 "(system name)" $@
 SYSTEM_NAME="$1"
 abort_if_illegal_system_name "${SYSTEM_NAME}"
 SYSTEM_CLASS_NAME="$(get_system_class_for ${SYSTEM_NAME})"
@@ -45,18 +44,19 @@ TAG_ALL=all
 MIN_TAGS="${TAG_ALL} ${SYSTEM_CLASS_NAME}"
 TAGS_USER="user desktop ${SYSTEM_NAME}"
 TAGS_PACKAGES="${MIN_TAGS} ${TAGS_USER}"
+PATH_COPY_TAG_ALL="../copy/${TAG_ALL}"
 
 upgrade_from_older_release() {
     apt_update_to_full_upgrade() {
-        apt update
-        apt -y -o Dpkg::Options::='--force-confnew' upgrade
-        apt -y -o Dpkg::Options::='--force-confnew' full-upgrade
+        apt-get -q update
+        apt-get -q -y -o Dpkg::Options::='--force-confnew' upgrade
+        apt-get -q -y -o Dpkg::Options::='--force-confnew' full-upgrade
     }
     apt_update_to_full_upgrade
-    cp "${PATH_CONF_ETC}/${TAG_ALL}/${PATH_REL_APT}/sources.list" "${PATH_ETC}/${PATH_REL_APT}/"
-    apt clean
+    cp "${PATH_COPY_TAG_ALL}${TAG_ALL}${PATH_ETC_APT}/sources.list" "${PATH_ETC_APT}/"
+    apt-get clean
     apt_update_to_full_upgrade
-    apt -y autoremove
+    apt-get -q -y --purge autoremove
 }
 
 adopt_wifi_connection() {
@@ -80,7 +80,7 @@ export DEBIAN_FRONTEND=noninteractive
 
 echo "\nUpgrading to testing."
 # For this step only very selectively prepare /etc/ files.
-cp "${PATH_CONF_ETC}/${TAG_ALL}/${PATH_REL_APT_CONF}/99_minimize_dependencies" "${PATH_ETC}/${PATH_REL_APT_CONF}/"
+cp "${PATH_COPY_TAG_ALL}${PATH_ETC_APT_CONF}/99_minimize_dependencies" "${PATH_ETC_APT_CONF}/"
 upgrade_from_older_release
 
 init_packages "${TAGS_PACKAGES}"