Merge pull request #609 from SaberUK/master+configure-sub-shuffle

Clean up and move various subroutines.

1 files changed, 4 insertions, 9 deletions

diff --git a/modulemanager b/modulemanager
index 7884654af..9e4670de8 100755
--- a/modulemanager
+++ b/modulemanager
@@ -22,8 +22,7 @@
 use strict;
 use warnings FATAL => qw(all);
 
-use make::configure;
-
+use make::utilities;
 
 if (!module_installed("LWP::Simple"))
 {
@@ -35,10 +34,9 @@ if (!module_installed("Crypt::SSLeay") && !module_installed("IO::Socket::SSL"))
 	die "Your system is missing the Crypt::SSLeay or IO::Socket::SSL Perl modules!";
 }
 
+use File::Basename;
 use LWP::Simple;
 
-our @modlist;
-
 my %installed;
 # $installed{name} = $version
 
@@ -128,8 +126,6 @@ while (<SRC>) {
 }
 close SRC;
 
-getmodules(1);
-
 # determine core version
 `./src/version.sh` =~ /InspIRCd-([0-9.]+)/ or die "Cannot determine inspircd version";
 $installed{core} = $1;
@@ -153,9 +149,8 @@ $modules{core}{$1} = {
 };
 
 # set up core module list
-for my $modname (@modlist) {
-	my $mod = "m_$modname";
-	my $modfile = "src/modules/$mod.cpp";
+for my $modname (<src/modules/m_*.cpp>) {
+	my $mod = basename($modname, '.cpp');
 	my $ver = getmodversion($mod) || '0.0';
 	$ver =~ s/\$Rev: (.*) \$/$1/; # for storing revision in SVN
 	$installed{$mod} = $ver;