Initialize more User and LocalUser fields using the init list

[user/henk/code/inspircd.git] / make / common.pm

diff --git a/make/common.pm b/make/common.pm
index 638cc668ae3fd9d53a2e33c4a38ba069726769c3..ea4c2a50cb003e1f0345ff9a1b1febc39bddb2e5 100644 (file)
--- a/make/common.pm
+++ b/make/common.pm
@@ -28,12 +28,22 @@ use strict;
 use warnings FATAL => qw(all);
 
 use Exporter              qw(import);
+use File::Path            qw(mkpath);
 use File::Spec::Functions qw(rel2abs);
 
-our @EXPORT = qw(get_cpu_count
+our @EXPORT = qw(create_directory
+                 get_cpu_count
                  get_version
                  module_installed);
 
+sub create_directory($$) {
+       my ($location, $permissions) = @_;
+       return eval {
+               mkpath($location, 0, $permissions);
+               return 1;
+       } // 0;
+}
+
 sub get_version {
        state %version;
        return %version if %version;
@@ -76,13 +86,13 @@ sub module_installed($) {
 sub get_cpu_count {
        my $count = 1;
        if ($^O =~ /bsd/) {
-               $count = `sysctl -n hw.ncpu`;
+               $count = `sysctl -n hw.ncpu 2>/dev/null` || 1;
        } elsif ($^O eq 'darwin') {
-               $count = `sysctl -n hw.activecpu`;
+               $count = `sysctl -n hw.activecpu 2>/dev/null` || 1;
        } elsif ($^O eq 'linux') {
-               $count = `getconf _NPROCESSORS_ONLN`;
+               $count = `getconf _NPROCESSORS_ONLN 2>/dev/null` || 1;
        } elsif ($^O eq 'solaris') {
-               $count = `psrinfo -p`;
+               $count = `psrinfo -p 2>/dev/null` || 1;
        }
        chomp($count);
        return $count;