From 095cdb484e607909dbaea734753b0e06f0e3c0b0 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Wed, 30 Jul 2014 16:19:14 +0200
Subject: Fix declare package removals after installs, to beat recommendations.

---
 bin/pkglist2preseed | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'bin/pkglist2preseed')

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;
-- 
cgit v1.2.3