summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2014-07-30 16:19:14 +0200
committerJonas Smedegaard <dr@jones.dk>2014-07-30 22:02:51 +0200
commit095cdb484e607909dbaea734753b0e06f0e3c0b0 (patch)
treea709f0f42f79a34c9365392169cb5de6141ca986
parent6f85dac676ef4bb4871272cc2499cb321e32c302 (diff)
Fix declare package removals after installs, to beat recommendations.
-rwxr-xr-xbin/pkglist2preseed6
1 files changed, 4 insertions, 2 deletions
diff --git a/bin/pkglist2preseed b/bin/pkglist2preseed
index 0ff94c5..8ebf711 100755
--- a/bin/pkglist2preseed
+++ b/bin/pkglist2preseed
@@ -23,7 +23,7 @@ grep { chomp } @pkglines;
grep { s/^[#]{1} (.*)/# * $1/ } @pkglines;
grep { s/^[#]{2} (.*)/# $1/ } @pkglines;
$pkgdesc = join "\n", grep { /^[#] / } @pkglines;
-@pkg = grep { /^[^#]/ } @pkglines;
+@pkg = map { split } grep { /^[^#]/ } @pkglines;
my (@tweaklines, $tweakdesc, $tweaklist);
foreach (@tweakfiles) {
@@ -36,7 +36,9 @@ grep { /^[^#]/ and s/(?<!;)$/ / } @tweaklines;
$tweakdesc = join "\n", grep { /^[#] / } @tweaklines;
$tweaklist = join "\\\n", grep { /^[^#]/ } @tweaklines;
-my $pkglist = join( ' ', @pkg );
+my $pkglist = join( ' ', sort grep { /[^-]$/ } @pkg );
+$pkglist .= " \\\n ";
+$pkglist .= join( ' ', sort grep { /-$/ } @pkg );
$outdir->mkpath;
$_ = $altinfile->slurp;