X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Fcommon.pm;h=7046b878fe10324c3cde6f2b9e0629397393afa5;hb=c05f81cac83e80c7727594e3929e0709eccca689;hp=6ca280bece1f8307df33491fffca887385772e82;hpb=7851faac62d7a83c94cd5d37e0109b5d0a152bf9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/make/common.pm b/make/common.pm
index 6ca280bec..7046b878f 100644
--- 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-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,13 +17,9 @@
 #
 
 
-BEGIN {
-	require 5.10.0;
-}
-
 package make::common;
 
-use feature ':5.10';
+use v5.10.0;
 use strict;
 use warnings FATAL => qw(all);
 
@@ -34,6 +30,7 @@ use File::Spec::Functions qw(rel2abs);
 use make::console;
 
 our @EXPORT = qw(create_directory
+                 execute
                  get_cpu_count
                  get_version
                  read_config_file
@@ -47,6 +44,11 @@ sub create_directory($$) {
 	} // 0;
 }
 
+sub execute(@) {
+	say console_format "<|BOLD \$|> @_";
+	return system @_;
+}
+
 sub get_version {
 	state %version;
 	return %version if %version;
@@ -59,7 +61,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;
@@ -68,6 +70,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