X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=make%2Fcommon.pm;h=638cc668ae3fd9d53a2e33c4a38ba069726769c3;hb=8f5efbc7aa33b792e02d01e3288f553e6e98ccaa;hp=24ef599ce9ced47ce617f453d8db44aa18980b22;hpb=7404ba8b66083c2fbb19c638da85c252551792a2;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/make/common.pm b/make/common.pm index 24ef599ce..638cc668a 100644 --- a/make/common.pm +++ b/make/common.pm @@ -18,11 +18,12 @@ BEGIN { - require 5.8.0; + require 5.10.0; } package make::common; +use feature ':5.10'; use strict; use warnings FATAL => qw(all); @@ -33,9 +34,8 @@ our @EXPORT = qw(get_cpu_count get_version module_installed); -my %version; - sub get_version { + state %version; return %version if %version; # Attempt to retrieve version information from src/version.sh @@ -47,22 +47,22 @@ 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+))?$/) { - $version{MAJOR} = $1 unless defined $version{MAJOR}; - $version{MINOR} = $2 unless defined $version{MINOR}; - $version{PATCH} = $3 unless defined $version{PATCH}; + $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' unless defined $version{LABEL}; + $version{LABEL} //= 'release'; # 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 # dummy data so we don't get into trouble with undef values later. - $version{MAJOR} = '0' unless defined $version{MAJOR}; - $version{MINOR} = '0' unless defined $version{MINOR}; - $version{PATCH} = '0' unless defined $version{PATCH}; + $version{MAJOR} //= '0'; + $version{MINOR} //= '0'; + $version{PATCH} //= '0'; return %version; }