From c6b9260780d3f1b28bdf4bfccdd6c20500775c19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= Date: Wed, 27 Aug 2025 15:05:42 -0600 Subject: [PATCH] apt-setup: rollback and actually run the right script --- helpers/DATA/apt-setup/99deb822-breadcrumb | 17 ++++++++++++++--- helpers/make-apt-setup | 2 +- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/helpers/DATA/apt-setup/99deb822-breadcrumb b/helpers/DATA/apt-setup/99deb822-breadcrumb index bc5d8a7..978ce92 100755 --- a/helpers/DATA/apt-setup/99deb822-breadcrumb +++ b/helpers/DATA/apt-setup/99deb822-breadcrumb @@ -1,7 +1,18 @@ #!/bin/sh set -e +. /usr/share/debconf/confmodule -LEGACY="/target/etc/apt/sources.list" -MSG="# Trisquel sources have moved to /etc/apt/sources.list.d/trisquel.sources" +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" -printf '%s\n' "$MSG" > "$LEGACY" +# 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 diff --git a/helpers/make-apt-setup b/helpers/make-apt-setup index e580a54..90c8bb5 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.9 +VERSION=4.9.1 EXTERNAL='deb-src http://ftp.debian.org/debian trixie main' REPOKEY=78DBA3BC47EF2265 NETINST=true