apt-setup: simplify and move slim script

This commit is contained in:
Ark74 2025-08-27 14:28:23 -06:00
parent f9689bfb1c
commit c3aeccf573
2 changed files with 6 additions and 17 deletions

View file

@ -1,18 +1,7 @@
#!/bin/sh #!/bin/sh
set -e set -e
. /usr/share/debconf/confmodule
file="$1" LEGACY="/target/etc/apt/sources.list"
ROOT="${ROOT:-/target}"
LEGACY="$ROOT/etc/apt/sources.list"
SD="$ROOT/etc/apt/sources.list.d"
SAVETO="$ROOT/etc/apt/sources.list.new"
# 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" 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"

View file

@ -18,7 +18,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # 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' EXTERNAL='deb-src http://ftp.debian.org/debian trixie main'
REPOKEY=78DBA3BC47EF2265 REPOKEY=78DBA3BC47EF2265
NETINST=true 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 sed -i '/generators\/9[1-9]*/d' debian/apt-setup-udeb.install
cat << EOF >> 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 EOF
cat << EOF > debian/apt-mirror-setup.install cat << EOF > debian/apt-mirror-setup.install
@ -92,7 +92,7 @@ EOF
cp $DATA/50mirror.trisquel generators/ cp $DATA/50mirror.trisquel generators/
cp $DATA/99deb822-breadcrumb 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 '/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 sed 's/services-select/services-select-trisquel/' -i debian/apt-setup-udeb.templates