X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=modulemanager;h=0e978977abdc098d17f1b202c8af2e31ff450dba;hb=507e9554d69df3e2cee60fe52b02dc160c6e1602;hp=18a169f9be72922ea70e09c973daae1a5326016d;hpb=5217069a0e1e10211f7fd1f34a2548dc3f2c44e1;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/modulemanager b/modulemanager index 18a169f9b..0e978977a 100755 --- a/modulemanager +++ b/modulemanager @@ -24,6 +24,7 @@ my %url_seen; sub parse_url; +# retrieve and parse entries from sources.list sub parse_url { my $src = shift; return if $url_seen{$src}; @@ -36,7 +37,7 @@ sub parse_url { for (split /\n+/, $doc) { s/^\s+//; # ignore whitespace at start next if /^#/; - if (/^module (\S+) ([0-9.]+) (\S+)/) { + if (/^module (\S+) (\S+) (\S+)/) { my($name, $ver, $url) = ($1,$2,$3); if ($modules{$name}{$ver}) { my $origsrc = $modules{$name}{$ver}{from}; @@ -65,6 +66,29 @@ sub parse_url { } } +# hash of installed module versions from our mini-database, key (m_foobar) to version (00abacca..). +my %mod_versions; + +# useless helper stub +sub getmodversion { + my ($file) = @_; + return $mod_versions{$file}; +} + +# read in installed versions +if (-e '.modulemanager') +{ + open SRC, '.modulemanager' or die ".modulemanager exists but i can't read it: $!"; + while () + { + s/\n//; + (my $mod, my $ver) = split(/ /, $_); + $mod_versions{$mod} = $ver; + } + close SRC; +} + +# read in external URL sources open SRC, 'sources.list' or die "Could not open sources.list: $!"; while () { next if /^\s*#/; @@ -72,8 +96,9 @@ while () { } close SRC; -getmodules(); +getmodules(1); +# determine core version `./src/version.sh` =~ /InspIRCd-([0-9.]+)/ or die "Cannot determine inspircd version"; $installed{core} = $1; $modules{core}{$1} = { @@ -83,10 +108,11 @@ $modules{core}{$1} = { from => 'local file', }; +# set up core module list for my $modname (@modlist) { my $mod = "m_$modname"; my $modfile = "src/modules/$mod.cpp"; - my $ver = getmodversion($modfile) || '0.0'; + my $ver = getmodversion($mod) || '0.0'; $ver =~ s/\$Rev: (.*) \$/$1/; # for storing revision in SVN $installed{$mod} = $ver; next if $modules{$mod}{$ver}; @@ -102,6 +128,15 @@ my %todo = %installed; sub ver_cmp { ($a,$b) = @_ if @_; + + # string versions first, git IDs + if ($a =~ /[a-z0-9]{40}/ or $b =~ /[a-z0-9]{40}/) + { + # it's a string version. compare them as such. + return $a ne $b; + } + + # else it's probably a numerical type version.. i.e. 1.0 my @a = split /\./, $a; my @b = split /\./, $b; push @a, 0 while $#a < $#b; @@ -118,8 +153,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 +172,7 @@ sub find_mod_in_range { } sub resolve_deps { + my($trial) = @_; my $tries = 100; my $changes = 'INIT'; my $fail = undef; @@ -149,7 +185,7 @@ sub resolve_deps { my $ver = $todo{$mod}; my $info = $modules{$mod}{$ver} or die "no dependency information on $mod $ver"; for my $dep (@{$info->{depends}}) { - $dep =~ /^(\S+)(?: ([-0-9.]+))?/ or die "Bad dependency $dep from $info->{from}"; + $dep =~ /^(\S+)(?: (\S+))?/ or die "Bad dependency $dep from $info->{from}"; my($depmod, $depvers) = ($1,$2); next if $todo{$depmod} && ver_in_range($todo{$depmod}, $depvers); # need to install a dependency @@ -162,14 +198,17 @@ sub resolve_deps { } } for my $dep (@{$info->{conflicts}}) { - $dep =~ /^(\S+)(?: ([-0-9.]+))?/ or die "Bad dependency $dep from $info->{from}"; + $dep =~ /^(\S+)(?: (\S+))?/ or die "Bad dependency $dep from $info->{from}"; 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,23 +237,56 @@ 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 < +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 +print "Processing changes for $action...\n"; for my $mod (keys %installed) { next if $todo{$mod}; print "Uninstalling $mod $installed{$mod}\n"; unlink "src/modules/$mod.cpp"; } + +my $count = scalar keys %todo; +print "Checking $count items...\n"; for my $mod (sort keys %todo) { my $ver = $todo{$mod}; my $oldver = $installed{$mod}; @@ -228,6 +300,8 @@ for my $mod (sort keys %todo) { } else { print "Installing $mod $ver from $url"; } + $mod_versions{$mod} = $ver; + my $stat = getstore($url, "src/modules/$mod.cpp"); if ($stat == 200) { print " - done\n"; @@ -235,3 +309,13 @@ for my $mod (sort keys %todo) { print " - HTTP $stat\n"; } } + +# write database of installed versions +open SRC, '>.modulemanager' or die "can't write installed versions to .modulemanager, won't be able to track upgrades properly: $!"; +foreach my $key (keys %mod_versions) +{ + print SRC "$key $mod_versions{$key}\n"; +} +close SRC; + +print "Finished!\n";