[pkg-lighttpd] r503 - lighttpd/trunk/debian

[Olaf van der Spek]

Author: olafvdspek-guest
Date: 2010-11-17 14:33:07 +0000 (Wed, 17 Nov 2010)
New Revision: 503

Modified:
   lighttpd/trunk/debian/lighty-enable-mod
Log:
Only list modules when invoked without arguments


Modified: lighttpd/trunk/debian/lighty-enable-mod
===================================================================
--- lighttpd/trunk/debian/lighty-enable-mod	2010-11-16 11:45:59 UTC (rev 502)
+++ lighttpd/trunk/debian/lighty-enable-mod	2010-11-17 14:33:07 UTC (rev 503)
@@ -23,12 +23,9 @@
 my %available = ();
 my %enabled = ();
 my @todo = ();
-
 my %moduledeps = ();
-
 my $enabling = 1;
 
-
 #--- first check if we enabling or disabling
 if ($0 =~ /disable-mod$/) {
 	#--- disabling mode
@@ -37,27 +34,31 @@
 
 #--- list of available modules
 my @files = bsd_glob($confdir.'conf-available/*.conf');
-print "Available modules: ";
 foreach my $file (@files) {
 	if (basename($file) =~ /^\d+\-([\w\-\.]+)\.conf$/) {
 		$available{$1} = $file;
-		print qq{$1 };
 	}
 }
-print "\n";
 
 #--- list of already enabled modules
 @files = bsd_glob($confdir.'conf-enabled/*.conf');
-print "Already enabled modules: ";
 foreach my $file (@files) {
 	if (basename($file) =~ /^\d+\-([\w\-\.]+)\.conf$/) {
 		$enabled{$1} = $file;
-		print qq{$1 };
 	}
 }
-print "\n";
 
 unless (defined($ARGV[0])) {
+	print "Available modules: ";
+	foreach (sort(keys %available)) {
+		print qq{$_ };
+	}
+	print "\n";
+	print "Already enabled modules: ";
+	foreach (sort(keys %enabled)) {
+		print qq{$_ };
+	}
+	print "\n";
 	my $prompt =  $enabling ? 'Enable module: ' : 'Disable module: ';
 	my $term = new Term::ReadLine $prompt;
 	my $OUT = $term->OUT || \*STDOUT;