Extract directory creation code to its own subroutine.

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

diff --git a/make/common.pm b/make/common.pm
index 24ef599ce9ced47ce617f453d8db44aa18980b22..ea4c2a50cb003e1f0345ff9a1b1febc39bddb2e5 100644 (file)
--- a/make/common.pm
+++ b/make/common.pm
@@ -18,24 +18,34 @@
 
 
 BEGIN {
-       require 5.8.0;
+       require 5.10.0;
 }
 
 package make::common;
 
+use feature ':5.10';
 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);
 
-my %version;
+sub create_directory($$) {
+       my ($location, $permissions) = @_;
+       return eval {
+               mkpath($location, 0, $permissions);
+               return 1;
+       } // 0;
+}
 
 sub get_version {
+       state %version;
        return %version if %version;
 
        # Attempt to retrieve version information from src/version.sh
@@ -47,22 +57,22 @@ sub get_version {
        # Attempt to retrieve missing version information from Git
        chomp(my $gr = `git describe --tags 2>/dev/null`);
        if ($gr =~ /^v([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\d+-g(\w+))?$/) {
-               $version{MAJOR} = $1 unless defined $version{MAJOR};
-               $version{MINOR} = $2 unless defined $version{MINOR};
-               $version{PATCH} = $3 unless defined $version{PATCH};
+               $version{MAJOR} //= $1;
+               $version{MINOR} //= $2;
+               $version{PATCH} //= $3;
                $version{LABEL} = $4 if defined $4;
        }
 
        # The user is using a stable release which does not have
        # a label attached.
-       $version{LABEL} = 'release' unless defined $version{LABEL};
+       $version{LABEL} //= 'release';
 
        # If any of these fields are missing then the user has deleted the
        # version file and is not running from Git. Fill in the fields with
        # dummy data so we don't get into trouble with undef values later.
-       $version{MAJOR} = '0' unless defined $version{MAJOR};
-       $version{MINOR} = '0' unless defined $version{MINOR};
-       $version{PATCH} = '0' unless defined $version{PATCH};
+       $version{MAJOR} //= '0';
+       $version{MINOR} //= '0';
+       $version{PATCH} //= '0';
 
        return %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;