X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=5d4520f31066e85ab9bedf009b3ef1ab589a6b71;hb=05fe4bdd1dbe3162abb6efe830bc21bb94c73fa8;hp=223fc4d14c5720ca2af1edfe67a42c1980c47814;hpb=2145cc3f947dc84c2ea006917b27cd525ac311b8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/configure b/configure
index 223fc4d14..5d4520f31 100755
--- a/configure
+++ b/configure
@@ -30,11 +30,7 @@
 #
 
 
-BEGIN {
-	require 5.10.0;
-}
-
-use feature ':5.10';
+use v5.10.0;
 use strict;
 use warnings FATAL => qw(all);
 
@@ -66,6 +62,7 @@ my ($opt_binary_dir,
     $opt_module_dir,
     $opt_portable,
     $opt_prefix,
+    $opt_runtime_dir,
     $opt_script_dir,
     $opt_socketengine,
     $opt_system,
@@ -99,6 +96,7 @@ exit 1 unless GetOptions(
 	'module-dir=s'         => \$opt_module_dir,
 	'portable'             => \$opt_portable,
 	'prefix=s'             => \$opt_prefix,
+	'runtime-dir=s'        => \$opt_runtime_dir,
 	'script-dir=s'         => \$opt_script_dir,
 	'socketengine=s'       => \$opt_socketengine,
 	'system'               => \$opt_system,
@@ -137,6 +135,7 @@ our $interactive = !(
 	defined $opt_module_dir ||
 	defined $opt_portable ||
 	defined $opt_prefix ||
+	defined $opt_runtime_dir ||
 	defined $opt_script_dir ||
 	defined $opt_socketengine ||
 	defined $opt_system ||
@@ -144,7 +143,7 @@ our $interactive = !(
 );
 
 my %version = get_version $opt_distribution_label;
-print_format "<|BOLD Configuring InspIRCd $version{FULL} on $^O.|>\n";
+say console_format "<|BOLD Configuring InspIRCd $version{FULL} on $^O.|>";
 
 my %config;
 if ($interactive) {
@@ -203,6 +202,7 @@ if (defined $opt_portable) {
 	$config{LOG_DIR}     = $opt_log_dir     // 'logs';
 	$config{MANUAL_DIR}  = $opt_manual_dir  // 'manuals';
 	$config{MODULE_DIR}  = $opt_module_dir  // 'modules';
+	$config{RUNTIME_DIR} = $opt_runtime_dir // $config{DATA_DIR};
 	$config{SCRIPT_DIR}  = $opt_script_dir  // $config{BASE_DIR};
 } elsif (defined $opt_system) {
 	$config{BASE_DIR}    = $opt_prefix      // '/var/lib/inspircd';
@@ -213,7 +213,8 @@ if (defined $opt_portable) {
 	$config{LOG_DIR}     = $opt_log_dir     // '/var/log/inspircd';
 	$config{MANUAL_DIR}  = $opt_manual_dir  // '/usr/share/man/man1';
 	$config{MODULE_DIR}  = $opt_module_dir  // '/usr/lib/inspircd';
-	$config{SCRIPT_DIR}  = $opt_script_dir  // '/usr/share/inspircd'
+	$config{RUNTIME_DIR} = $opt_runtime_dir // '/var/run';
+	$config{SCRIPT_DIR}  = $opt_script_dir  // '/usr/share/inspircd';
 } else {
 	$config{BASE_DIR}    = rel2abs $opt_prefix // $config{BASE_DIR}    // catdir $RealDir,            'run';
 	$config{BINARY_DIR}  = $opt_binary_dir     // $config{BINARY_DIR}  // catdir $config{BASE_DIR},   'bin';
@@ -223,6 +224,7 @@ if (defined $opt_portable) {
 	$config{LOG_DIR}     = $opt_log_dir        // $config{LOG_DIR}     // catdir $config{BASE_DIR},   'logs';
 	$config{MANUAL_DIR}  = $opt_manual_dir     // $config{MANUAL_DIR}  // catdir $config{BASE_DIR},   'manuals';
 	$config{MODULE_DIR}  = $opt_module_dir     // $config{MODULE_DIR}  // catdir $config{BASE_DIR},   'modules';
+	$config{RUNTIME_DIR} = $opt_runtime_dir    // $config{RUNTIME_DIR} // $config{DATA_DIR};
 	$config{SCRIPT_DIR}  = $opt_script_dir     // $config{SCRIPT_DIR}  // $config{BASE_DIR};
 }
 
@@ -345,6 +347,7 @@ if (prompt_bool $interactive, $question, 0) {
 	$config{MODULE_DIR} = prompt_dir $interactive, 'In what directory are modules to be placed?',             $config{MODULE_DIR};
 	$config{SCRIPT_DIR} = prompt_dir $interactive, 'In what directory are scripts to be placed?',             $config{SCRIPT_DIR};
 	$config{EXAMPLE_DIR} = $config{CONFIG_DIR} . '/examples';
+	$config{RUNTIME_DIR} = $config{DATA_DIR};
 }
 
 # Configure module settings.
@@ -430,7 +433,7 @@ $config{DISTRIBUTION} = $opt_distribution_label if $opt_distribution_label;
 write_configure_cache %config;
 parse_templates \%config, \%compiler, \%version;
 
-print_format <<"EOM";
+print console_format <<"EOM";
 
 Configuration is complete! You have chosen to build with the following settings:
 
@@ -450,7 +453,7 @@ my @makeargs;
 push @makeargs, "-C${\abs2rel $RealDir}" unless getcwd eq $RealDir;
 push @makeargs, "-j${\(get_cpu_count() + 1)}";
 
-print_format <<"EOM";
+say console_format <<"EOM";
 
 <|GREEN Paths:|>
   <|GREEN Base:|>    $config{BASE_DIR}
@@ -461,6 +464,7 @@ print_format <<"EOM";
   <|GREEN Log:|>     $config{LOG_DIR}
   <|GREEN Manual:|>  $config{MANUAL_DIR}
   <|GREEN Module:|>  $config{MODULE_DIR}
+  <|GREEN Runtime:|> $config{RUNTIME_DIR}
   <|GREEN Script:|>  $config{SCRIPT_DIR}
 
 <|GREEN Execution Group:|> $config{GROUP} ($config{GID})
@@ -592,7 +596,7 @@ sub enable_extras(@) {
 		if (-e $modulepath) {
 			print_error "unable to symlink <|GREEN ${\abs2rel $modulepath}|> to <|GREEN ${\abs2rel $extrapath}|>: the target exists and is not a symlink.";
 		} else {
-			print_format "Enabling the <|GREEN $shortname|> module ...\n";
+			say console_format "Enabling the <|GREEN $shortname|> module ...";
 			symlink $extrapath, $modulepath or print_error "unable to symlink <|GREEN ${\abs2rel $modulepath}|> to <|GREEN ${\abs2rel $extrapath}|>: $!";
 		}
 	}
@@ -615,7 +619,7 @@ sub disable_extras(@) {
 		} elsif ((-e $modulepath && !-e $extrapath) || !-l $modulepath) {
 			print_error "the <|GREEN $shortname|> module is not an extra module!";
 		} else {
-			print_format "Disabling the <|GREEN $shortname|> module ...\n";
+			say console_format "Disabling the <|GREEN $shortname|> module ...";
 			unlink $modulepath or print_error "unable to unlink <|GREEN $extrapath|>: $!";
 		}
 	}