From c3aeccf573753f1789d74bdd2f71ebad022dd154 Mon Sep 17 00:00:00 2001
From: Ark74 <ark@switnet.org>
Date: Wed, 27 Aug 2025 14:28:23 -0600
Subject: [PATCH] apt-setup: simplify and move slim script

---
 helpers/DATA/apt-setup/99deb822-breadcrumb | 17 +++--------------
 helpers/make-apt-setup                     |  6 +++---
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/helpers/DATA/apt-setup/99deb822-breadcrumb b/helpers/DATA/apt-setup/99deb822-breadcrumb
index 978ce92..bc5d8a7 100755
--- a/helpers/DATA/apt-setup/99deb822-breadcrumb
+++ b/helpers/DATA/apt-setup/99deb822-breadcrumb
@@ -1,18 +1,7 @@
 #!/bin/sh
 set -e
-. /usr/share/debconf/confmodule
 
-file="$1"
-ROOT="${ROOT:-/target}"
-LEGACY="$ROOT/etc/apt/sources.list"
-SD="$ROOT/etc/apt/sources.list.d"
-SAVETO="$ROOT/etc/apt/sources.list.new"
+LEGACY="/target/etc/apt/sources.list"
+MSG="# Trisquel sources have moved to /etc/apt/sources.list.d/trisquel.sources"
 
-# If .sources exist, leave sources.list reduced only as a breadcrumb
-if ls "$SD"/*.sources >/dev/null 2>&1; then
-    MSG="# Trisquel sources have moved to /etc/apt/sources.list.d/trisquel.sources"
-    : > "$SAVETO"
-    printf '%s\n' "$MSG" > "$file"    # lo que verify appenderá
-fi
-
-exit 0
+printf '%s\n' "$MSG" > "$LEGACY"
diff --git a/helpers/make-apt-setup b/helpers/make-apt-setup
index 9b19213..e580a54 100644
--- a/helpers/make-apt-setup
+++ b/helpers/make-apt-setup
@@ -18,7 +18,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=4.8
+VERSION=4.9
 EXTERNAL='deb-src http://ftp.debian.org/debian trixie main'
 REPOKEY=78DBA3BC47EF2265
 NETINST=true
@@ -81,7 +81,7 @@ find generators -name 50mirror.ubuntu | xargs -r rm
 sed -i '/generators\/9[1-9]*/d' debian/apt-setup-udeb.install
 
 cat << EOF >> debian/apt-setup-udeb.install
-finish-install.d/99deb822-breadcrumb-trim usr/lib/finish-install.d
+post-base-installer.d/99deb822-breadcrumb-trim usr/lib/post-base-installer.d
 EOF
 
 cat << EOF > debian/apt-mirror-setup.install
@@ -92,7 +92,7 @@ EOF
 
 cp $DATA/50mirror.trisquel generators/
 cp $DATA/99deb822-breadcrumb generators/
-cp $DATA/99deb822-breadcrumb-trim finish-install.d/
+cp $DATA/99deb822-breadcrumb-trim post-base-installer.d/
 
 #sed '/The partner/,/^*/d; s/services-select-ubuntu/services-select-trisquel/' -i debian/apt-setup-udeb.templates
 sed 's/services-select/services-select-trisquel/' -i debian/apt-setup-udeb.templates