Use IsCTCP in blockcolor for ignoring CTCPs.

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

diff --git a/make/common.pm b/make/common.pm
index 638cc668ae3fd9d53a2e33c4a38ba069726769c3..7046b878fe10324c3cde6f2b9e0629397393afa5 100644 (file)
--- a/make/common.pm
+++ b/make/common.pm
@@ -1,7 +1,7 @@
 #
 # InspIRCd -- Internet Relay Chat Daemon
 #
-#   Copyright (C) 2013-2014 Peter Powell <petpow@saberuk.com>
+#   Copyright (C) 2014-2017, 2019-2021 Sadie Powell <sadie@witchery.services>
 #
 # This file is part of InspIRCd.  InspIRCd is free software: you can
 # redistribute it and/or modify it under the terms of the GNU General Public
@@ -17,22 +17,37 @@
 #
 
 
-BEGIN {
-       require 5.10.0;
-}
-
 package make::common;
 
-use feature ':5.10';
+use v5.10.0;
 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
+use make::console;
+
+our @EXPORT = qw(create_directory
+                 execute
+                 get_cpu_count
                  get_version
-                 module_installed);
+                 read_config_file
+                 write_config_file);
+
+sub create_directory($$) {
+       my ($location, $permissions) = @_;
+       return eval {
+               mkpath($location, 0, $permissions);
+               return 1;
+       } // 0;
+}
+
+sub execute(@) {
+       say console_format "<|BOLD \$|> @_";
+       return system @_;
+}
 
 sub get_version {
        state %version;
@@ -40,22 +55,23 @@ sub get_version {
 
        # Attempt to retrieve version information from src/version.sh
        chomp(my $vf = `sh src/version.sh 2>/dev/null`);
-       if ($vf =~ /^InspIRCd-([0-9]+)\.([0-9]+)\.([0-9]+)(?:\+(\w+))?$/) {
+       if ($vf =~ /^InspIRCd-([0-9]+)\.([0-9]+)\.([0-9]+)(?:-(\w+))?$/) {
                %version = ( MAJOR => $1, MINOR => $2, PATCH => $3, LABEL => $4 );
        }
 
        # 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+))?$/) {
+       if ($gr =~ /^v([0-9]+)\.([0-9]+)\.([0-9]+)(?:[a-z]+\d+)?(?:-\d+-g(\w+))?$/) {
                $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';
+       # If the user has specified a distribution label then we use it in
+       # place of the label from src/version.sh or Git.
+       $version{REAL_LABEL} = $version{LABEL};
+       $version{LABEL} = shift // $version{LABEL};
 
        # 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
@@ -64,28 +80,55 @@ sub get_version {
        $version{MINOR} //= '0';
        $version{PATCH} //= '0';
 
-       return %version;
-}
+       # If there is no label then the user is using a stable release which
+       # does not have a label attached.
+       if (defined $version{LABEL}) {
+               $version{FULL} = "$version{MAJOR}.$version{MINOR}.$version{PATCH}-$version{LABEL}"
+       } else {
+               $version{LABEL} = 'release';
+               $version{FULL} = "$version{MAJOR}.$version{MINOR}.$version{PATCH}"
+       }
 
-sub module_installed($) {
-       my $module = shift;
-       eval("use $module;");
-       return !$@;
+       return %version;
 }
 
 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;
 }
 
+sub read_config_file($) {
+       my $path = shift;
+       my %config;
+       open(my $fh, $path) or return %config;
+       while (my $line = <$fh>) {
+               next if $line =~ /^\s*($|\#)/;
+               my ($key, $value) = ($line =~ /^(\S+)(?:\s(.*))?$/);
+               $config{$key} = $value;
+       }
+       close $fh;
+       return %config;
+}
+
+sub write_config_file($%) {
+       my $path = shift;
+       my %config = @_;
+       open(my $fh, '>', $path) or print_error "unable to write to $path: $!";
+       while (my ($key, $value) = each %config) {
+               $value //= '';
+               say $fh "$key $value";
+       }
+       close $fh;
+}
+
 1;