Fix.

diff --git a/trixie/scripts/from_older_upgrade.sh b/trixie/scripts/from_older_upgrade.sh
index d69931871ac670620246bb22e844110aa026edd6..2c46f1037209119f7a8fef3b9121fbde73609072 100755 (executable)
--- a/trixie/scripts/from_older_upgrade.sh
+++ b/trixie/scripts/from_older_upgrade.sh
@@ -2,7 +2,7 @@
 set -e
 cd $(dirname "$0")
 . lib/abort.sh
-. lib/apt_get_digested.sh
+. lib/apt_digested.sh
 . lib/constants_etc.sh  # PATH_ETC
 . lib/constants_releases.sh  # PREV_RELEASE, THIS_RELEASE
 . lib/expect_n_args.sh
@@ -24,19 +24,19 @@ prefixed_msg 'minimizing installation first so there is less to upgrade'
 
 apt_update_to_full_upgrade() {
     prefixed_msg 'Updating package database …'
-    apt_get_digested '-q -q update'
+    apt_digested '-q -q update'
     prefixed_msg 'Autopurge!'
-    apt_get_digested '-q -q autopurge'
+    apt_digested '-q -q autopurge'
 
     prefixed_msg 'Soft-upgrading …'
-    apt_get_digested '-q -q --purge -o Dpkg::Options::=--force-confnew upgrade'
+    apt_digested '-q -q --purge -o Dpkg::Options::=--force-confnew upgrade'
     prefixed_msg 'Autopurge!'
-    apt_get_digested '-q -q autopurge'
+    apt_digested '-q -q autopurge'
 
     prefixed_msg 'Full-upgrading …'
-    apt_get_digested '-q -q --purge -o Dpkg::Options::=--force-confnew full-upgrade'
+    apt_digested '-q -q --purge -o Dpkg::Options::=--force-confnew full-upgrade'
     prefixed_msg 'Autopurge!'
-    apt_get_digested '-q -q autopurge'
+    apt_digested '-q -q autopurge'
 }
 PATH_ETC_APT="${PATH_ETC}/apt"
 PATH_ETC_APT_CONF=${PATH_ETC_APT}/apt.conf.d
@@ -59,6 +59,6 @@ cd -
 apt_update_to_full_upgrade
 
 prefixed_msg 'Autopurge!'
-apt_get_digested  '-q -q autopurge'
+apt_digested  '-q -q autopurge'
 
 prefixed_msg_exit

diff --git a/trixie/scripts/setup_desktop.sh b/trixie/scripts/setup_desktop.sh
index d4062ba2760d9c779ffa375ca55b372c47457d8a..a74343e8daa0dc308a7dc8442cc65aa9c48a148d 100755 (executable)
--- a/trixie/scripts/setup_desktop.sh
+++ b/trixie/scripts/setup_desktop.sh
@@ -4,7 +4,7 @@ ROOT=$(dirname "$0")
 cd "${ROOT}"
 . lib/abort.sh
 . lib/abort_if_offline.sh
-. lib/apt_get_digested.sh
+. lib/apt_digested.sh
 . lib/constants_etc.sh  # PATH_ETC
 . lib/constants_user.sh  # USERNAME
 . lib/copy_dirtrees_of_tags.sh
@@ -64,7 +64,7 @@ adopt_wifi_connection() {
 }
 
 # NB: This needs to come before steps potentially overwriting /etc/network/interfaces.
-apt_get_digested '-q -q install network-manager'
+apt_digested '-q -q install network-manager'
 if [ "$(nmcli -f TYPE conn | grep -c 'wifi')" = "0" ]; then
     prefixed_msg "Checking for existing wifi config in ${PATH_NETWORK_INTERFACES} …"
     adopt_wifi_connection

diff --git a/trixie/scripts/setup_reform_qemu.sh b/trixie/scripts/setup_reform_qemu.sh
index b2a74cb62686da77b4c9293f5ee91f2302b3b149..036b9d05e66c30e5c93b812f2c68a89e4923469e 100755 (executable)
--- a/trixie/scripts/setup_reform_qemu.sh
+++ b/trixie/scripts/setup_reform_qemu.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 cd $(dirname "$0")
-. lib/apt_get_digested.sh
+. lib/apt_digested.sh
 . lib/constants_ssh.sh  # PATH_REL_SSH, PATH_USER_SSH
 . lib/core_setup.sh
 . lib/expect_n_args.sh