apt-setup: yet another fix on finish-install.d

This commit is contained in:
Luis Guzmán 2025-08-27 21:24:44 -06:00
parent c6b9260780
commit b0b9f1a548
4 changed files with 19 additions and 12 deletions

View file

@ -0,0 +1,11 @@
#!/bin/sh
set -e
LEGACY=/target/etc/apt/sources.list
SD=/target/etc/apt/sources.list.d
if ls "$SD"/*.sources >/dev/null 2>&1; then
MSG="# Trisquel sources have moved to /etc/apt/sources.list.d/trisquel.sources"
printf '%s\n' "$MSG" > "$LEGACY"
fi
exit 0

View file

@ -12,7 +12,7 @@ SAVETO="$ROOT/etc/apt/sources.list.new"
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á
printf '%s\n' "$MSG" > "$file"
fi
exit 0

View file

@ -1,5 +0,0 @@
#!/bin/sh
set -e
LEGACY_SF=/target/etc/apt/sources.list
MSG="# Trisquel sources have moved to /etc/apt/sources.list.d/trisquel.sources"
printf '%s\n' "$MSG" > "$LEGACY_SF"

View file

@ -18,7 +18,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=4.9.1
VERSION=4.10
EXTERNAL='deb-src http://ftp.debian.org/debian trixie main'
REPOKEY=78DBA3BC47EF2265
NETINST=true
@ -80,8 +80,13 @@ 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
# Set custom scripts
cp $DATA/50mirror.trisquel generators/
cp $DATA/99deb822-breadcrumb generators/
cp $DATA/93trisquel-sources-clean finish-install.d/
cat << EOF >> debian/apt-setup-udeb.install
post-base-installer.d/99deb822-breadcrumb-trim usr/lib/post-base-installer.d
finish-install.d/93trisquel-sources-clean usr/lib/finish-install.d
EOF
cat << EOF > debian/apt-mirror-setup.install
@ -90,10 +95,6 @@ generators/99deb822-breadcrumb usr/lib/apt-setup/generators
release-files/archive.trisquel.org usr/share/apt-setup/release-files
EOF
cp $DATA/50mirror.trisquel generators/
cp $DATA/99deb822-breadcrumb generators/
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