Rename location-query(8) to location(8)

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

.gitignore

@@ -14,10 +14,9 @@ Makefile.in
 /configure
 /libtool
 /stamp-h1
-/src/python/location-downloader
+/src/python/location
 /src/python/location-exporter
 /src/python/location-importer
-/src/python/location-query
 /src/systemd/location-update.service
 /src/systemd/location-update.timer
 /test.db

Makefile.am

@@ -238,19 +238,19 @@ uninstall-perl:
 		$(DESTDIR)/$(prefix)/man/man3/Location.3pm
 
 bin_SCRIPTS = \
+	src/python/location \
 	src/python/location-exporter \
-	src/python/location-importer \
-	src/python/location-query
+	src/python/location-importer
 
 EXTRA_DIST += \
+	src/python/location.in \
 	src/python/location-exporter.in \
-	src/python/location-importer.in \
-	src/python/location-query.in
+	src/python/location-importer.in
 
 CLEANFILES += \
+	src/python/location \
 	src/python/location-exporter \
-	src/python/location-importer \
-	src/python/location-query
+	src/python/location-importer
 
 # ------------------------------------------------------------------------------
 
@@ -374,7 +374,7 @@ src_test_signature_LDADD = \
 # ------------------------------------------------------------------------------
 
 MANPAGES = \
-	man/location-query.8
+	man/location.8
 
 MANPAGES_TXT  = $(patsubst %.8,%.txt,$(MANPAGES))
 MANPAGES_HTML = $(patsubst %.txt,%.html,$(MANPAGES_TXT))

man/location-query.txt → man/location.txt

-= location-query(8)
+= location(8)
 
 == NAME
-location-query - Query the location database
+location - Query the location database
 
 == SYNOPSIS
 [verse]
-`location-query lookup ADDRESS [ADDRESS...]`
-`location-query get-as ASN [ASN...]`
-`location-query search-as STRING`
-`location-query update`
-`location-query verify`
-`location-query list-networks-by-as ASN`
-`location-query list-networks-by-cc COUNTRY_CODE`
-`location-query list-networks-by-flags [--anonymous-proxy|--satellite-provider|--anycast]`
+`location lookup ADDRESS [ADDRESS...]`
+`location get-as ASN [ASN...]`
+`location search-as STRING`
+`location update`
+`location verify`
+`location list-networks-by-as ASN`
+`location list-networks-by-cc COUNTRY_CODE`
+`location list-networks-by-flags [--anonymous-proxy|--satellite-provider|--anycast]`
 
 == DESCRIPTION
-The `location-query` retrieves information from the location database.
+`location` retrieves information from the location database.
 This data can be used to determine someone's location on the Internet
 and for building firewall rulesets to block access from certain ASes
 or countries.
@@ -93,7 +93,7 @@ or countries.
 	Shows the program's version and exists.
 
 == EXIT CODES
-The 'location-query' command will normally exit with code zero.
+The 'location' command will normally exit with code zero.
 If there has been a problem and the requested action could not be performed,
 the exit code is unequal to zero.
 

src/python/location-query.in → src/python/location.in

@@ -248,7 +248,7 @@ class CLI(object):
 		try:
 			db = location.Database(args.database)
 		except FileNotFoundError as e:
-			sys.stderr.write("location-query: Could not open database %s: %s\n" \
+			sys.stderr.write("location: Could not open database %s: %s\n" \
 				% (args.database, e))
 			sys.exit(1)
 

src/systemd/location-update.service.in

@@ -4,4 +4,4 @@ Requires=network.target
 
 [Service]
 Type=oneshot
-ExecStart=@bindir@/location-query update
+ExecStart=@bindir@/location update