#
# 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
use make::console;
our @EXPORT = qw(create_directory
+ execute
get_cpu_count
get_version
read_config_file
} // 0;
}
+sub execute(@) {
+ print_format "<|BOLD \$|> @_\n";
+ return system @_;
+}
+
sub get_version {
state %version;
return %version if %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;
# 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