Re: [PATCH v1 1/1] xtables-addons: geoip: update scripts for DBIP names, etc.

[Jan Engelhardt <jengelh@inai.de>]

On Tuesday 2020-05-12 18:51, Philip Prindeville wrote:
>>> Also change the default destination directory to /usr/share/xt_geoip
>>> as most distros use this now.  Update the documentation.
>> 
>> Maybe there are some "nicer" approaches? I'm calling for further inspirations.
>
>I’m open to suggestions.

This has been floating around my mind.

 geoip/xt_geoip_build   | 1 +
 geoip/xt_geoip_build.1 | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/geoip/xt_geoip_build b/geoip/xt_geoip_build
index 750bf98..7bafa5f 100755
--- a/geoip/xt_geoip_build
+++ b/geoip/xt_geoip_build
@@ -24,6 +24,7 @@ my $target_dir = ".";
 &GetOptions(
 	"D=s" => \$target_dir,
 	"i=s" => \$input_file,
+	"s" => sub { $target_dir = "/usr/share/xt_geoip"; },
 );
 
 if (!-d $target_dir) {
diff --git a/geoip/xt_geoip_build.1 b/geoip/xt_geoip_build.1
index ac3e6d3..598177f 100644
--- a/geoip/xt_geoip_build.1
+++ b/geoip/xt_geoip_build.1
@@ -27,11 +27,15 @@ Specifies the target directory into which the files are to be put. Defaults to "
 \fB\-i\fP \fIinput_file\fP
 Specifies the source location of the DBIP CSV file. Defaults to
 "dbip-country-lite.csv". Use "-" to read from stdin.
+.TP
+\fB\-s\fP
+"System mode". Equivalent to \fB\-D /usr/share/xt_geoip\fP.
 .SH Application
 .PP
-Shell commands to build the databases and put them to where they are expected:
+Shell commands to build the databases and put them to where they are expected
+(usually run as root):
 .PP
-xt_geoip_build \-D /usr/share/xt_geoip
+xt_geoip_build \-s
 .SH See also
 .PP
 xt_geoip_dl(1)
-- 
2.26.2