summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2008-09-07 23:40:00 +0000
committerw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2008-09-07 23:40:00 +0000
commit28fbe778316add7688284a0612693be4a129581d (patch)
treea48b27b9485700758a59a683fffb2ba403bb6398
parent76d8c58f091b5a2c2250e6b1e507f604632a2da6 (diff)
Allow for silencing getmodules() output (is annoying when using modulemanager)
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10466 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--make/configure.pm20
-rwxr-xr-xmodulemanager2
2 files changed, 18 insertions, 4 deletions
diff --git a/make/configure.pm b/make/configure.pm
index 089842fb3..5444ca40c 100644
--- a/make/configure.pm
+++ b/make/configure.pm
@@ -154,8 +154,15 @@ sub nopedantic {
sub getmodules
{
+ my ($silent) = @_;
+
my $i = 0;
- print "Detecting modules ";
+
+ if (!$silent)
+ {
+ print "Detecting modules ";
+ }
+
opendir(DIRHANDLE, "src/modules") or die("WTF, missing src/modules!");
foreach my $name (sort readdir(DIRHANDLE))
{
@@ -163,11 +170,18 @@ sub getmodules
{
my $mod = $1;
$main::modlist[$i++] = $mod;
- print ".";
+ if (!$silent)
+ {
+ print ".";
+ }
}
}
closedir(DIRHANDLE);
- print "\nOk, $i modules.\n";
+
+ if (!$silent)
+ {
+ print "\nOk, $i modules.\n";
+ }
}
sub promptnumeric($$)
diff --git a/modulemanager b/modulemanager
index 0d5d1fd16..ec5e7dd94 100755
--- 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;