From a7ff603ab10b24599689aa1eab96522ea9659316 Mon Sep 17 00:00:00 2001
From: Martin Polden <mpolden@mpolden.no>
Date: Fri, 9 Feb 2018 21:20:32 +0100
Subject: [PATCH] Update database URLs

Fixes #46
---
 .gitignore |  3 +--
 Makefile   | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index d5b53a6..82f0c3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/GeoLite2-Country.mmdb
-/GeoLite2-City.mmdb
+/data/
diff --git a/Makefile b/Makefile
index b851e18..ef5bffc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,8 @@
+OS := $(shell uname)
+ifeq ($(OS),Linux)
+	TAR_OPTS := --wildcards
+endif
+
 all: deps test vet install
 
 fmt:
@@ -15,6 +20,12 @@ deps:
 install:
 	go install
 
-get-geoip-dbs:
-	curl -s http://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.mmdb.gz | gunzip > GeoLite2-Country.mmdb
-	curl -s http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.mmdb.gz | gunzip > GeoLite2-City.mmdb
+databases := GeoLite2-City GeoLite2-Country
+
+$(databases):
+	mkdir -p data
+	curl -fsSL -m 30 http://geolite.maxmind.com/download/geoip/database/$@.tar.gz | tar $(TAR_OPTS) --strip-components=1 -C $(PWD)/data -xzf - '*.mmdb'
+	test ! -f data/GeoLite2-City.mmdb || mv data/GeoLite2-City.mmdb data/city.mmdb
+	test ! -f data/GeoLite2-Country.mmdb || mv data/GeoLite2-Country.mmdb data/country.mmdb
+
+geoip-download: $(databases)