Fix broken etc path.

diff --git a/testing/scripts/setup_desktop.sh b/testing/scripts/setup_desktop.sh
index a5a22f3960fec17d938a8f7a40ffecebfb0d36d5..c4cc7ed25bd22b774929992f5c1d6d32a022132a 100755 (executable)
--- a/testing/scripts/setup_desktop.sh
+++ b/testing/scripts/setup_desktop.sh
@@ -8,13 +8,14 @@ get_system_name_arg "$1"
 MIN_MODULES="all ${system_class_name} ${system_name}"
 
 # For upgrading only very selectively prepare /etc/ files.
 MIN_MODULES="all ${system_class_name} ${system_name}"
 
 # For upgrading only very selectively prepare /etc/ files.

-PATH_REL_APT_CONF=apt/apt.conf.d
-PATH_REL_SOURCES_LIST=apt/sources.list
+PATH_REL_APT=apt
+PATH_REL_APT_CONF=${PATH_REL_APT}/apt.conf.d
+PATH_REL_SOURCES_LIST=${PATH_REL_APT}/sources.list

 cp ${PATH_MANY}/${PATH_REL_ETC}/all/${PATH_REL_APT_CONF}/* /${PATH_REL_ETC}/${PATH_REL_APT_CONF}/
 apt update
 apt -y -o Dpkg::Options::='--force-confnew' upgrade
 apt -y -o Dpkg::Options::='--force-confnew' full-upgrade
 cp ${PATH_MANY}/${PATH_REL_ETC}/all/${PATH_REL_APT_CONF}/* /${PATH_REL_ETC}/${PATH_REL_APT_CONF}/
 apt update
 apt -y -o Dpkg::Options::='--force-confnew' upgrade
 apt -y -o Dpkg::Options::='--force-confnew' full-upgrade

-cp ../${PATH_REL_ETC}/all/${PATH_REL_SOURCES_LIST} /${PATH_REL_ETC}/
+cp ../${PATH_REL_ETC}/all/${PATH_REL_SOURCES_LIST} /${PATH_REL_ETC}/${PATH_REL_APT}/

 apt clean
 apt update
 apt -y -o Dpkg::Options::='--force-confnew' upgrade
 apt clean
 apt update
 apt -y -o Dpkg::Options::='--force-confnew' upgrade