X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=modulemanager;h=1d9f42b8807c17929cbcc05281b82b5a642d608f;hb=1485387c6580a787c4f9124216b65bab0b38c310;hp=0d5d1fd163c32b573fd439d319ca15400f5e7880;hpb=76d8c58f091b5a2c2250e6b1e507f604632a2da6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/modulemanager b/modulemanager
index 0d5d1fd16..1d9f42b88 100755
--- a/modulemanager
+++ b/modulemanager
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 use strict;
 use warnings FATAL => qw(all);
 use LWP::Simple;
@@ -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 (<SRC>)
+	{
+		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 (<SRC>) {
 	next if /^\s*#/;
@@ -72,10 +96,23 @@ while (<SRC>) {
 }
 close SRC;
 
-getmodules();
+getmodules(1);
 
+# determine core version
 `./src/version.sh` =~ /InspIRCd-([0-9.]+)/ or die "Cannot determine inspircd version";
 $installed{core} = $1;
+for my $mod (keys %modules) {
+	MODVER: for my $mver (keys %{$modules{$mod}}) {
+		for my $dep (@{$modules{$mod}{$mver}{depends}}) {
+			next unless $dep =~ /^core (.*)/;
+			if (!ver_in_range($installed{core}, $1)) {
+				delete $modules{$mod}{$mver};
+				next MODVER;
+			}
+		}
+	}
+	delete $modules{$mod} unless %{$modules{$mod}};
+}
 $modules{core}{$1} = {
 	url => 'NONE',
 	depends => [],
@@ -83,10 +120,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,10 +140,18 @@ my %todo = %installed;
 
 sub ver_cmp {
 	($a,$b) = @_ if @_;
+
+	if ($a !~ /^[0-9.]+$/ or $b !~ /^[0-9.]+$/)
+	{
+		# not a valid version number, don't try to sort
+		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;
-	push @b, 0 while $#b < $#a;
+	push @b, ($_[2] || 0) while $#b < $#a;
 	for my $i (0..$#a) {
 		my $d = $a[$i] <=> $b[$i];
 		return $d if $d;
@@ -116,13 +162,13 @@ sub ver_cmp {
 sub ver_in_range {
 	my($ver, $range) = @_;
 	return 1 unless defined $range;
+	my($l,$h) = ($range, $range);
 	if ($range =~ /(.*)-(.*)/) {
-		my($l,$h) = ($1,$2);
-		return 0 if $l && ver_cmp($ver, $l) < 0;
-		return 0 if $h && ver_cmp($ver, $h) > 0;
-		return 1;
+		($l,$h) = ($1,$2);
 	}
-	return !ver_cmp($ver, $range);
+	return 0 if $l && ver_cmp($ver, $l) < 0;
+	return 0 if $h && ver_cmp($ver, $h, 9999) > 0;
+	return 1;
 }
 
 sub find_mod_in_range {
@@ -150,7 +196,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
@@ -163,7 +209,7 @@ 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.
@@ -243,11 +289,15 @@ 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};
@@ -261,6 +311,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";
@@ -268,3 +320,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";