Update copyright headers.

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

diff --git a/make/common.pm b/make/common.pm
index f0174e0b3bd8ab79b7af95a79c924001417d9ead..4d4cd397ce956555a68e62c84d4d865aebd1f836 100644 (file)
--- a/make/common.pm
+++ b/make/common.pm
@@ -1,7 +1,7 @@
 #
 # InspIRCd -- Internet Relay Chat Daemon
 #
-#   Copyright (C) 2013-2017 Peter Powell <petpow@saberuk.com>
+#   Copyright (C) 2014-2017, 2019-2020 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
@@ -34,11 +34,11 @@ use File::Spec::Functions qw(rel2abs);
 use make::console;
 
 our @EXPORT = qw(create_directory
+                 execute
                  get_cpu_count
                  get_version
                  read_config_file
-                 write_config_file
-                 module_installed);
+                 write_config_file);
 
 sub create_directory($$) {
        my ($location, $permissions) = @_;
@@ -48,6 +48,11 @@ sub create_directory($$) {
        } // 0;
 }
 
+sub execute(@) {
+       print_format "<|BOLD \$|> @_\n";
+       return system @_;
+}
+
 sub get_version {
        state %version;
        return %version if %version;
@@ -60,7 +65,7 @@ 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+))?$/) {
+       if ($gr =~ /^v([0-9]+)\.([0-9]+)\.([0-9]+)(?:[a-z]+\d+)?(?:-\d+-g(\w+))?$/) {
                $version{MAJOR} //= $1;
                $version{MINOR} //= $2;
                $version{PATCH} //= $3;
@@ -69,6 +74,7 @@ sub get_version {
 
        # 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
@@ -90,12 +96,6 @@ sub get_version {
        return %version;
 }
 
-sub module_installed($) {
-       my $module = shift;
-       eval("use $module;");
-       return !$@;
-}
-
 sub get_cpu_count {
        my $count = 1;
        if ($^O =~ /bsd/) {