X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Fcommon.pm;h=7046b878fe10324c3cde6f2b9e0629397393afa5;hb=e94b673532f7833aaa4789f834e61d68e0b4fc56;hp=ea4c2a50cb003e1f0345ff9a1b1febc39bddb2e5;hpb=8a545d0044db581616f265f6e55e51ed83a23eba;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/make/common.pm b/make/common.pm
index ea4c2a50c..7046b878f 100644
--- a/make/common.pm
+++ b/make/common.pm
@@ -1,7 +1,7 @@
 #
 # InspIRCd -- Internet Relay Chat Daemon
 #
-#   Copyright (C) 2013-2014 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);
 
@@ -31,10 +27,14 @@ use Exporter              qw(import);
 use File::Path            qw(mkpath);
 use File::Spec::Functions qw(rel2abs);
 
+use make::console;
+
 our @EXPORT = qw(create_directory
+                 execute
                  get_cpu_count
                  get_version
-                 module_installed);
+                 read_config_file
+                 write_config_file);
 
 sub create_directory($$) {
 	my ($location, $permissions) = @_;
@@ -44,28 +44,34 @@ sub create_directory($$) {
 	} // 0;
 }
 
+sub execute(@) {
+	say console_format "<|BOLD \$|> @_";
+	return system @_;
+}
+
 sub get_version {
 	state %version;
 	return %version if %version;
 
 	# Attempt to retrieve version information from src/version.sh
 	chomp(my $vf = `sh src/version.sh 2>/dev/null`);
-	if ($vf =~ /^InspIRCd-([0-9]+)\.([0-9]+)\.([0-9]+)(?:\+(\w+))?$/) {
+	if ($vf =~ /^InspIRCd-([0-9]+)\.([0-9]+)\.([0-9]+)(?:-(\w+))?$/) {
 		%version = ( MAJOR => $1, MINOR => $2, PATCH => $3, LABEL => $4 );
 	}
 
 	# 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;
 		$version{LABEL} = $4 if defined $4;
 	}
 
-	# The user is using a stable release which does not have
-	# a label attached.
-	$version{LABEL} //= 'release';
+	# 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
 	# version file and is not running from Git. Fill in the fields with
@@ -74,13 +80,16 @@ sub get_version {
 	$version{MINOR} //= '0';
 	$version{PATCH} //= '0';
 
-	return %version;
-}
+	# If there is no label then the user is using a stable release which
+	# does not have a label attached.
+	if (defined $version{LABEL}) {
+		$version{FULL} = "$version{MAJOR}.$version{MINOR}.$version{PATCH}-$version{LABEL}"
+	} else {
+		$version{LABEL} = 'release';
+		$version{FULL} = "$version{MAJOR}.$version{MINOR}.$version{PATCH}"
+	}
 
-sub module_installed($) {
-	my $module = shift;
-	eval("use $module;");
-	return !$@;
+	return %version;
 }
 
 sub get_cpu_count {
@@ -98,4 +107,28 @@ sub get_cpu_count {
 	return $count;
 }
 
+sub read_config_file($) {
+	my $path = shift;
+	my %config;
+	open(my $fh, $path) or return %config;
+	while (my $line = <$fh>) {
+		next if $line =~ /^\s*($|\#)/;
+		my ($key, $value) = ($line =~ /^(\S+)(?:\s(.*))?$/);
+		$config{$key} = $value;
+	}
+	close $fh;
+	return %config;
+}
+
+sub write_config_file($%) {
+	my $path = shift;
+	my %config = @_;
+	open(my $fh, '>', $path) or print_error "unable to write to $path: $!";
+	while (my ($key, $value) = each %config) {
+		$value //= '';
+		say $fh "$key $value";
+	}
+	close $fh;
+}
+
 1;