Fix default database directory for package builds

CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 5.0.3 (2023-04-15)
+
+* On 5.0.0 through 5.0.2, the default database directory was not being
+  correctly set for Debian and RPM package builds. The directory
+  `/usr/local/share/GeoIP` was being used rather than `/usr/share/GeoIP`.
+  This build restores `/usr/share/GeoIP` as the default directory for
+  these builds. Reported by Yvan. GitHub #222.
+
 ## 5.0.2 (2023-04-13)
 
 * "Database ... up to date" messages are now only shown if the verbose

cmd/geoipupdate/args.go

@@ -4,6 +4,7 @@ import (
 	"log"
 	"os"
 
+	"github.com/maxmind/geoipupdate/v5/pkg/geoipupdate/vars"
 	flag "github.com/spf13/pflag"
 )
 
@@ -20,7 +21,7 @@ func getArgs() *Args {
 	configFile := flag.StringP(
 		"config-file",
 		"f",
-		defaultConfigFile,
+		vars.DefaultConfigFile,
 		"Configuration file",
 	)
 	databaseDirectory := flag.StringP(

cmd/geoipupdate/main.go

@@ -11,16 +11,23 @@ import (
 	"github.com/maxmind/geoipupdate/v5/pkg/geoipupdate/vars"
 )
 
+// These values are set by build scripts. Changing the names of
+// the variables should be considered a breaking change.
 var (
-	version           = "unknown"
-	defaultConfigFile string
+	version                  = "unknown"
+	defaultConfigFile        string
+	defaultDatabaseDirectory string
 )
 
 func main() {
 	log.SetFlags(0)
 
-	if defaultConfigFile == "" {
-		defaultConfigFile = vars.DefaultConfigFile
+	if defaultConfigFile != "" {
+		vars.DefaultConfigFile = defaultConfigFile
+	}
+
+	if defaultDatabaseDirectory != "" {
+		vars.DefaultDatabaseDirectory = defaultDatabaseDirectory
 	}
 
 	args := getArgs()

pkg/geoipupdate/vars/version.go

@@ -2,4 +2,4 @@
 package vars
 
 // Version defines current geoipupdate version.
-const Version = "5.0.2"
+const Version = "5.0.3"