X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=modulemanager;h=7471dcc77cab66c188b9e5dcad7ae9c2dafc9fd4;hb=61e299c2c90baf0f1f5da992fd7e9dd96cf56472;hp=ee281d7fac0bd1a3c6efe07977910ceeb3827897;hpb=35d80008d6cb55160d06dda51aebc716c4d6511b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/modulemanager b/modulemanager
index ee281d7fa..7471dcc77 100755
--- a/modulemanager
+++ b/modulemanager
@@ -3,6 +3,7 @@
 #
 # InspIRCd -- Internet Relay Chat Daemon
 #
+#   Copyright (C) 2012-2017 Peter Powell <petpow@saberuk.com>
 #   Copyright (C) 2008-2009 Robin Burchell <robin+git@viroteck.net>
 #
 # This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -19,23 +20,26 @@
 #
 
 
-use strict;
-use warnings FATAL => qw(all);
-
-use make::common;
-
 BEGIN {
-	unless (module_installed("LWP::Simple")) {
+	require 5.10.0;
+	unless (eval "use LWP::Simple; 1") {
 		die "Your system is missing the LWP::Simple Perl module!";
 	}
-	unless (module_installed("Crypt::SSLeay") || module_installed("IO::Socket::SSL")) {
+	unless (eval "use Crypt::SSLeay; 1" || eval "use IO::Socket::SSL; 1") {
 		die "Your system is missing the Crypt::SSLeay or IO::Socket::SSL Perl modules!";
 	}
-
 }
 
-use File::Basename;
-use LWP::Simple;
+use feature ':5.10';
+use strict;
+use warnings FATAL => qw(all);
+
+use File::Basename qw(basename);
+use FindBin        qw($RealDir);
+
+use lib $RealDir;
+use make::common;
+use make::console;
 
 my %installed;
 # $installed{name} = $version
@@ -102,7 +106,7 @@ sub parse_url {
 }
 
 # hash of installed module versions from our mini-database, key (m_foobar) to version (00abacca..).
-my %mod_versions;
+my %mod_versions = read_config_file '.modulemanager';
 
 # useless helper stub
 sub getmodversion {
@@ -110,19 +114,6 @@ sub getmodversion {
 	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>) {
@@ -262,10 +253,8 @@ sub resolve_deps {
 	}
 }
 
-my $action = $#ARGV >= 0 ? lc shift @ARGV : 'help';
-
-if ($action eq 'install') {
-	for my $mod (@ARGV) {
+command 'install', 'Install a third-party module', sub {
+	for my $mod (@_) {
 		my $vers = $mod =~ s/=([-0-9.]+)// ? $1 : undef;
 		$mod = lc $mod;
 		unless ($modules{$mod}) {
@@ -279,7 +268,9 @@ if ($action eq 'install') {
 		}
 		$todo{$mod} = $ver;
 	}
-} elsif ($action eq 'upgrade') {
+};
+
+command 'upgrade', 'Upgrade a third-party module', sub {
 	my @installed = sort keys %installed;
 	for my $mod (@installed) {
 		next unless $mod =~ /^m_/;
@@ -289,7 +280,9 @@ if ($action eq 'install') {
 			%todo = %saved;
 		}
 	}
-} elsif ($action eq 'list') {
+};
+
+command 'list', 'List available third-party modules', sub {
 	my @all = sort keys %modules;
 	for my $mod (@all) {
 		my @vers = sort { ver_cmp() } keys %{$modules{$mod}};
@@ -303,25 +296,16 @@ if ($action eq 'install') {
 		my $vers = join ' ', map { $_ eq $instver ? "\e[1m$_\e[m" : $_ } @vers;
 		print "$mod ($vers) - $desc\n";
 	}
-} else {
-	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;
-}
+	exit 0;
+};
+
+execute_command @ARGV;
 
 resolve_deps(0);
 
 $| = 1; # immediate print of lines without \n
 
-print "Processing changes for $action...\n";
+print "Processing changes...\n";
 for my $mod (keys %installed) {
 	next if $todo{$mod};
 	print "Uninstalling $mod $installed{$mod}\n";
@@ -345,20 +329,20 @@ for my $mod (sort keys %todo) {
 	}
 	$mod_versions{$mod} = $ver;
 
-	my $stat = getstore($url, "src/modules/$mod.cpp");
-	if ($stat == 200) {
+	my $ua = LWP::UserAgent->new(ssl_opts => { verify_hostname => 0 });
+	my $response = $ua->get($url);
+
+	if ($response->is_success) {
+		open(MF, ">src/modules/$mod.cpp") or die "\nFilesystem not writable: $!";
+		print MF $response->decoded_content;
+		close(MF);
 		print " - done\n";
 	} else {
-		print " - HTTP $stat\n";
+		printf "\nHTTP %s: %s\n", $response->code, $response->message;
 	}
 }
 
 # 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;
+write_config_file '.modulemanager', %mod_versions;
 
 print "Finished!\n";