summaryrefslogtreecommitdiff
path: root/make/directive.pm
diff options
context:
space:
mode:
authorSadie Powell <sadie@witchery.services>2021-01-29 13:39:13 +0000
committerSadie Powell <sadie@witchery.services>2021-01-29 13:39:13 +0000
commit3e557e85d3ae1ef6d09ed2fdda379d8833a4400d (patch)
tree7cb0712740fc1ce9c0ddac1982c46a6a4de0d410 /make/directive.pm
parentad1ad11067ab089710305c030b00e966f3f10d17 (diff)
Purge all remaining uses of print_format.
Diffstat (limited to 'make/directive.pm')
-rw-r--r--make/directive.pm22
1 files changed, 11 insertions, 11 deletions
diff --git a/make/directive.pm b/make/directive.pm
index 25e61160e..cd1aff426 100644
--- a/make/directive.pm
+++ b/make/directive.pm
@@ -145,7 +145,7 @@ sub __function_execute {
# Try to execute the command...
chomp(my $result = `$command ${\DIRECTIVE_ERROR_PIPE}`);
unless ($?) {
- print_format "Execution of `<|GREEN $command|>` succeeded: <|BOLD $result|>\n";
+ say console_format "Execution of `<|GREEN $command|>` succeeded: <|BOLD $result|>";
return $result;
}
@@ -153,14 +153,14 @@ sub __function_execute {
if (defined $environment && $environment ne '') {
$environment = __environment 'INSPIRCD_', $environment;
if (defined $ENV{$environment}) {
- print_format "Execution of `<|GREEN $command|>` failed; using the environment: <|BOLD $ENV{$environment}|>\n";
+ say console_format "Execution of `<|GREEN $command|>` failed; using the environment: <|BOLD $ENV{$environment}|>";
return $ENV{$environment};
}
}
# If all else fails then look for the defaults..
if (defined $defaults) {
- print_format "Execution of `<|GREEN $command|>` failed; using the defaults: <|BOLD $defaults|>\n";
+ say console_format "Execution of `<|GREEN $command|>` failed; using the defaults: <|BOLD $defaults|>";
return $defaults;
}
@@ -174,20 +174,20 @@ sub __function_find_compiler_flags {
# Try to look up the compiler flags with pkg-config...
chomp(my $flags = `pkg-config --cflags $name ${\DIRECTIVE_ERROR_PIPE}`);
unless ($?) {
- print_format "Found the <|GREEN $name|> compiler flags for <|GREEN ${\module_shrink $file}|> using pkg-config: <|BOLD $flags|>\n";
+ say console_format "Found the <|GREEN $name|> compiler flags for <|GREEN ${\module_shrink $file}|> using pkg-config: <|BOLD $flags|>";
return $flags;
}
# If looking up with pkg-config fails then check the environment...
my $key = __environment 'INSPIRCD_CXXFLAGS_', $name;
if (defined $ENV{$key}) {
- print_format "Found the <|GREEN $name|> compiler flags for <|GREEN ${\module_shrink $file}|> using the environment: <|BOLD $ENV{$key}|>\n";
+ say console_format "Found the <|GREEN $name|> compiler flags for <|GREEN ${\module_shrink $file}|> using the environment: <|BOLD $ENV{$key}|>";
return $ENV{$key};
}
# If all else fails then look for the defaults..
if (defined $defaults) {
- print_format "Using the default <|GREEN $name|> compiler flags for <|GREEN ${\module_shrink $file}|>: <|BOLD $defaults|>\n";
+ say console_format "Using the default <|GREEN $name|> compiler flags for <|GREEN ${\module_shrink $file}|>: <|BOLD $defaults|>";
return $defaults;
}
@@ -201,20 +201,20 @@ sub __function_find_linker_flags {
# Try to look up the linker flags with pkg-config...
chomp(my $flags = `pkg-config --libs $name ${\DIRECTIVE_ERROR_PIPE}`);
unless ($?) {
- print_format "Found the <|GREEN $name|> linker flags for <|GREEN ${\module_shrink $file}|> using pkg-config: <|BOLD $flags|>\n";
+ say console_format "Found the <|GREEN $name|> linker flags for <|GREEN ${\module_shrink $file}|> using pkg-config: <|BOLD $flags|>";
return $flags;
}
# If looking up with pkg-config fails then check the environment...
my $key = __environment 'INSPIRCD_CXXFLAGS_', $name;
if (defined $ENV{$key}) {
- print_format "Found the <|GREEN $name|> linker flags for <|GREEN ${\module_shrink $file}|> using the environment: <|BOLD $ENV{$key}|>\n";
+ say console_format "Found the <|GREEN $name|> linker flags for <|GREEN ${\module_shrink $file}|> using the environment: <|BOLD $ENV{$key}|>";
return $ENV{$key};
}
# If all else fails then look for the defaults..
if (defined $defaults) {
- print_format "Using the default <|GREEN $name|> linker flags for <|GREEN ${\module_shrink $file}|>: <|BOLD $defaults|>\n";
+ say console_format "Using the default <|GREEN $name|> linker flags for <|GREEN ${\module_shrink $file}|>: <|BOLD $defaults|>";
return $defaults;
}
@@ -287,13 +287,13 @@ sub __function_vendor_directory {
# Try to look the directory up in the environment...
my $key = __environment 'INSPIRCD_VENDOR_', $name;
if (defined $ENV{$key}) {
- print_format "Found the <|GREEN $name|> vendor directory for <|GREEN ${\module_shrink $file}|> using the environment: <|BOLD $ENV{$key}|>\n";
+ say console_format "Found the <|GREEN $name|> vendor directory for <|GREEN ${\module_shrink $file}|> using the environment: <|BOLD $ENV{$key}|>";
return $ENV{$key};
}
my $directory = catdir(VENDOR_DIRECTORY, $name);
if (-d $directory) {
- print_format "Using the default <|GREEN $name|> vendor directory for <|GREEN ${\module_shrink $file}|>: <|BOLD $directory|>\n";
+ say console_format "Using the default <|GREEN $name|> vendor directory for <|GREEN ${\module_shrink $file}|>: <|BOLD $directory|>";
return $directory;
}