From: Philip Prindeville <philipp@xxxxxxxxxxxxxxxxxxxxx>
Conceivably someone might want to run a refresh of the geoip database
from within a script, particularly an unattended script such as a cron
job. Don't generate output in that case.
Signed-off-by: Philip Prindeville <philipp@xxxxxxxxxxxxxxxxxxxxx>
---
geoip/xt_geoip_build | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/geoip/xt_geoip_build b/geoip/xt_geoip_build
index e7ad9bfdcc1e3b617ada77872f9be87e126b885f..84333892e61e463269790580b08ac5c33d994018 100644
--- a/geoip/xt_geoip_build
+++ b/geoip/xt_geoip_build
@@ -17,11 +17,14 @@ my $csv = Text::CSV_XS->new({
binary => 1,
eol => $/,
}); # or Text::CSV
+
+my $quiet = 0;
my $source_dir = ".";
my $target_dir = ".";
&Getopt::Long::Configure(qw(bundling));
&GetOptions(
+ "q" => \$quiet,
"D=s" => \$target_dir,
"S=s" => \$source_dir,
);
@@ -63,12 +66,12 @@ sub collect
$country{$cc}->{pool_v6}->add_range($range);
}
- if ($. % 4096 == 0) {
+ if (!$quiet && $. % 4096 == 0) {
print STDERR "\r\e[2K$. entries";
}
}
- print STDERR "\r\e[2K$. entries total\n";
+ print STDERR "\r\e[2K$. entries total\n" unless ($quiet);
close($fh);
@@ -106,7 +109,7 @@ sub writeCountry
printf "%5u IPv%s ranges for %s\n",
scalar(@ranges),
($family == AF_INET ? '4' : '6'),
- $iso_code;
+ $iso_code unless ($quiet);
my $file = "$target_dir/".uc($iso_code).".iv".($family == AF_INET ? '4' : '6');
if (!open($fh, '>', $file)) {
--
2.17.2
