Always use for in Perl modules.

[user/henk/code/inspircd.git] / configure

diff --git a/configure b/configure
index 724970cade2a85f124398a8eabc90b2b897ac0f7..2e19228ba13ab216c8dd58c6d60890777f406b24 100755 (executable)
--- 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);
 
@@ -147,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) {
@@ -340,7 +336,7 @@ EOQ
 if (prompt_bool $interactive, $question, 0) {
        my $original_base_dir = $config{BASE_DIR};
        $config{BASE_DIR} = prompt_dir $interactive, 'In what directory do you wish to install the InspIRCd base?', $config{BASE_DIR};
-       foreach my $key (qw(BINARY_DIR CONFIG_DIR DATA_DIR LOG_DIR MANUAL_DIR MODULE_DIR SCRIPT_DIR)) {
+       for my $key (qw(BINARY_DIR CONFIG_DIR DATA_DIR LOG_DIR MANUAL_DIR MODULE_DIR SCRIPT_DIR)) {
                $config{$key} =~ s/^\Q$original_base_dir\E/$config{BASE_DIR}/;
        }
        $config{BINARY_DIR} = prompt_dir $interactive, 'In what directory should the InspIRCd binary be placed?', $config{BINARY_DIR};
@@ -361,7 +357,7 @@ Currently, InspIRCd is configured to automatically enable all available extra mo
 Would you like to enable extra modules manually?
 EOQ
 if (prompt_bool $interactive, $question, 0) {
-       foreach my $extra (<$RealDir/src/modules/extra/m_*.cpp>) {
+       for my $extra (<$RealDir/src/modules/extra/m_*.cpp>) {
                my $module_name = module_shrink $extra;
                if (prompt_bool $interactive, "Would you like to enable the <|BOLD $module_name|> module?", 0) {
                        enable_extras $module_name;
@@ -437,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:
 
@@ -457,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}
@@ -600,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}|>: $!";
                }
        }
@@ -623,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|>: $!";
                }
        }