Commit 999eba20 authored by KatolaZ's avatar KatolaZ

fixing #190

parent 353d85c8
apt-setup (1:0.127+devuan1.1) ascii; urgency=medium
* closed #190 (non-free included in sources.list)
-- Vincenzo (KatolaZ) Nicosia <katolaz@freaknet.org> Tue, 10 Apr 2018 21:52:43 +0100
apt-setup (1:0.127+devuan1) ascii; urgency=medium
[ KatolaZ ]
......
......@@ -30,15 +30,29 @@ fi
# To determine if non-free and contrib should be included, grep
# the file to see if they are listed in it.
##for dist in contrib non-free; do
## if grep -q '^[^#]* '$dist $ROOT/etc/apt/sources.list.new; then
## dists="$dists $dist"
## fi
##done
##
## Check if the user has chosen to use non-free and contrib (The right
## way through...)
dists="main"
for dist in contrib non-free; do
if grep -q '^[^#]* '$dist $ROOT/etc/apt/sources.list.new; then
dists="$dists $dist"
fi
done
db_get apt-setup/non-free
if [ "$RET" = true ]; then
dists="$dists non-free"
fi
db_get apt-setup/contrib
if [ "$RET" = true ]; then
dists="$dists contrib"
fi
# Don't test mirror if no network selected in netcfg
echo "# ${codename}-security, previously known as 'volatile'" >> $file
#echo "# ${codename}-security, previously known as 'volatile'" >> $file
if [ -n "$protocol" ] && [ -n "$host" ]; then
echo "deb $protocol://${host}${directory} ${codename}-security $dists" >> $file
......
......@@ -30,15 +30,27 @@ fi
# To determine if non-free and contrib should be included, grep
# the file to see if they are listed in it.
##dists="main"
##for dist in contrib non-free; do
## if grep -q '^[^#]* '$dist $ROOT/etc/apt/sources.list.new; then
## dists="$dists $dist"
## fi
##done
dists="main"
for dist in contrib non-free; do
if grep -q '^[^#]* '$dist $ROOT/etc/apt/sources.list.new; then
dists="$dists $dist"
fi
done
db_get apt-setup/non-free
if [ "$RET" = true ]; then
dists="$dists non-free"
fi
db_get apt-setup/contrib
if [ "$RET" = true ]; then
dists="$dists contrib"
fi
# Don't test mirror if no network selected in netcfg
echo "# ${codename}-updates, previously known as 'volatile'" >> $file
##echo "# ${codename}-updates, previously known as 'volatile'" >> $file
if [ -n "$protocol" ] && [ -n "$host" ]; then
echo "deb $protocol://${host}${directory} ${codename}-updates $dists" >> $file
......
......@@ -30,14 +30,25 @@ fi
# To determine if non-free and contrib should be included, grep
# the file to see if they are listed in it.
##dists="main"
##for dist in contrib non-free; do
## if grep -q '^[^#]* '$dist $ROOT/etc/apt/sources.list.new; then
## dists="$dists $dist"
## fi
##done
dists="main"
for dist in contrib non-free; do
if grep -q '^[^#]* '$dist $ROOT/etc/apt/sources.list.new; then
dists="$dists $dist"
fi
done
db_get apt-setup/non-free
if [ "$RET" = true ]; then
dists="$dists non-free"
fi
db_get apt-setup/contrib
if [ "$RET" = true ]; then
dists="$dists contrib"
fi
echo "# ${codename}-backports, previously on backports.debian.org" >> $file
##echo "# ${codename}-backports, previously on backports.debian.org" >> $file
# Don't test mirror if no network selected in netcfg
if [ -n "$protocol" ] && [ -n "$host" ]; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment