X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Fcommon.pm;h=7046b878fe10324c3cde6f2b9e0629397393afa5;hb=e94b673532f7833aaa4789f834e61d68e0b4fc56;hp=ba6b03f87d4472d19640e98021c0f3114578cd38;hpb=b2ac8cc0a6405946a388b80df3be21bc276a61f3;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/make/common.pm b/make/common.pm index ba6b03f87..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 +# Copyright (C) 2014-2017, 2019-2021 Sadie Powell # # 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; @@ -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