From 60f94b2d5fda5c8c1c567f02d5b904c0cd06c546 Mon Sep 17 00:00:00 2001
From: Ark74 <ark@switnet.org>
Date: Tue, 26 Aug 2025 01:16:48 -0600
Subject: [PATCH] apt-setup: change approach

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

diff --git a/helpers/DATA/apt-setup/99deb822-breadcrumb-trim b/helpers/DATA/apt-setup/99deb822-breadcrumb-trim
index fcf18bb..12433cd 100755
--- a/helpers/DATA/apt-setup/99deb822-breadcrumb-trim
+++ b/helpers/DATA/apt-setup/99deb822-breadcrumb-trim
@@ -1,5 +1,5 @@
 #!/bin/sh
 set -e
 LEGACY_SF=/target/etc/apt/sources.list
-# If first line is empy / only spaces, delete it.
-sed -i '1{/^[[:space:]]*$/d;}' "$LEGACY_SF"
+MSG="# Trisquel sources have moved to /etc/apt/sources.list.d/trisquel.sources"
+printf '%s\n' "$MSG" > "$LEGACY_SF"
diff --git a/helpers/make-apt-setup b/helpers/make-apt-setup
index 78ba9c4..9b19213 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.7
+VERSION=4.8
 EXTERNAL='deb-src http://ftp.debian.org/debian trixie main'
 REPOKEY=78DBA3BC47EF2265
 NETINST=true
@@ -80,11 +80,14 @@ rm generators/9[1-9]* generators/50mirror
 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
+EOF
+
 cat << EOF > debian/apt-mirror-setup.install
 generators/50mirror.trisquel usr/lib/apt-setup/generators
 generators/99deb822-breadcrumb usr/lib/apt-setup/generators
 release-files/archive.trisquel.org usr/share/apt-setup/release-files
-finish-install.d/99deb822-breadcrumb-trim usr/lib/finish-install.d
 EOF
 
 cp $DATA/50mirror.trisquel generators/