Remove extra 'i'.. oopsie :P

[user/henk/code/inspircd.git] / modulemanager

diff --git a/modulemanager b/modulemanager
index 18a169f9be72922ea70e09c973daae1a5326016d..ec5e7dd94081386adc9117bcd1bcc85c92772452 100755 (executable)
--- a/modulemanager
+++ b/modulemanager
@@ -72,7 +72,7 @@ while (<SRC>) {
 }
 close SRC;
 
-getmodules();
+getmodules(1);
 
 `./src/version.sh` =~ /InspIRCd-([0-9.]+)/ or die "Cannot determine inspircd version";
 $installed{core} = $1;
@@ -118,8 +118,8 @@ sub ver_in_range {
        return 1 unless defined $range;
        if ($range =~ /(.*)-(.*)/) {
                my($l,$h) = ($1,$2);
-               return 0 unless ver_cmp($ver, $l) >= 0;
-               return 0 unless ver_cmp($ver, $h) <= 0;
+               return 0 if $l && ver_cmp($ver, $l) < 0;
+               return 0 if $h && ver_cmp($ver, $h) > 0;
                return 1;
        }
        return !ver_cmp($ver, $range);
@@ -137,6 +137,7 @@ sub find_mod_in_range {
 }
 
 sub resolve_deps {
+       my($trial) = @_;
        my $tries = 100;
        my $changes = 'INIT';
        my $fail = undef;
@@ -166,10 +167,13 @@ sub resolve_deps {
                                my($depmod, $depvers) = ($1,$2);
                                next unless $todo{$depmod} && ver_in_range($todo{$depmod}, $depvers);
                                # if there are changes this round, maybe the conflict won't come up after they are resolved.
-                               $fail ||= "Cannot install: module $mod ($ver) conflicts with versions $depmod version $todo{depmod}";
+                               $fail ||= "Cannot install: module $mod ($ver) conflicts with $depmod version $todo{$depmod}";
                        }
                }
        }
+       if ($trial) {
+               return !($changes || $fail);
+       }
        if ($changes) {
                print "Infinite dependency loop:$changes\n";
                exit 1;
@@ -198,15 +202,44 @@ if ($action eq 'install') {
                $todo{$mod} = $ver;
        }
 } elsif ($action eq 'upgrade') {
-       for my $mod (keys %installed) {
+       my @installed = sort keys %installed;
+       for my $mod (@installed) {
                next unless $mod =~ /^m_/;
+               my %saved = %todo;
                $todo{$mod} = find_mod_in_range($mod);
+               if (!resolve_deps(1)) {
+                       %todo = %saved;
+               }
+       }
+} elsif ($action eq 'list') {
+       my @all = sort keys %modules;
+       for my $mod (@all) {
+               my @vers = sort { ver_cmp() } keys %{$modules{$mod}};
+               my $desc = '';
+               for my $ver (@vers) {
+                       # latest defined description wins
+                       $desc = $modules{$mod}{$ver}{description} || $desc;
+               }
+               next if @vers == 1 && $modules{$mod}{$vers[0]}{url} eq 'NONE';
+               my $instver = $installed{$mod} || '';
+               my $vers = join ' ', map { $_ eq $instver ? "\e[1m$_\e[m" : $_ } @vers;
+               print "$mod ($vers) - $desc\n";
        }
 } else {
-       die "Unknown action $action"
+       print <<ENDUSAGE
+Use: $0 <action> <args>
+Action is one of the following
+ install   install new modules
+ upgrade   upgrade installed modules
+ list      lists available modules
+
+For installing a package, specify its name or name=version to force the
+installation of a specific version.
+ENDUSAGE
+;exit 1;
 }
 
-resolve_deps();
+resolve_deps(0);
 
 $| = 1; # immediate print of lines without \n