From 18bef8fc53f63f166ca3c826ce8dd7ea8ab91459 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Tue, 1 Dec 2015 10:09:38 -0700
Subject: [PATCH 1/4] allow setting of FETCH_CMD to get archives, use z option
 for tar

---
 cli/bootstrap.sh | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/cli/bootstrap.sh b/cli/bootstrap.sh
index c9702e4..6ae222d 100755
--- a/cli/bootstrap.sh
+++ b/cli/bootstrap.sh
@@ -10,63 +10,67 @@ ASUM_DB="http://geolite.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat
 NETSPEED_DB="http://www.maxmind.com/sample/GeoIP-171_20040418.tar.gz"
 SPEEDCELL_DB="https://www.dropbox.com/s/7hv3rqzbw30th8y/GeoIP-177it_20120221.tar.gz"
 
+if [ -z $FETCH_CMD ]; then
+    FETCH_CMD=$FETCH_CMD
+fi
+
 mkdir -p ./database || return 1
 cd ./database || return 1
 
 # Country
 if [ ! -e "GeoIP.dat" ]; then
-    wget $COUNTRY_DB || return 1
+    $FETCH_CMD $COUNTRY_DB || return 1
     gunzip GeoIP.dat.gz
 fi
 
 # Country6
 if [ ! -e "GeoIPv6.dat" ]; then
-    wget $COUNTRY6_DB || return 1
+    $FETCH_CMD $COUNTRY6_DB || return 1
     gunzip GeoIPv6.dat.gz
 fi
 
 # City
 if [ ! -e "GeoLiteCity.dat" ]; then
-  wget $CITY_DB || return 1
+  $FETCH_CMD $CITY_DB || return 1
   gunzip GeoLiteCity.dat.gz
 fi
 
 # City6
 if [ ! -e "GeoLiteCityv6.dat" ]; then
-  wget $CITY6_DB || return 1
+  $FETCH_CMD $CITY6_DB || return 1
   gunzip GeoLiteCityv6.dat.gz
 fi
 
 # Org
 if [ ! -e "GeoIPOrg-111.dat" ]; then
-    wget $ORG_DB || return 1
-    tar -xvf GeoIP-111_20030603.tar.gz
+    $FETCH_CMD $ORG_DB || return 1
+    tar -zxvf GeoIP-111_20030603.tar.gz
     mv GeoIP-111_20030603/*.dat .
 fi
 
 if [ ! -e "GeoIPASNum.dat" ]; then
-    wget $ASUM_DB || return 1
+    $FETCH_CMD $ASUM_DB || return 1
     gunzip GeoIPASNum.dat.gz
 fi
 
 # Region
 if [ ! -e "GeoIPRegion-515.dat" ]; then
-    wget $REGION_DB || return 1
-    tar -xvf GeoIPRegion-515_20050401.tar.gz
+    $FETCH_CMD $REGION_DB || return 1
+    tar -zxvf GeoIPRegion-515_20050401.tar.gz
     mv GeoIPRegion-515_20050401/*.dat .
 fi
 
 # Netspeed
 if [ ! -e "GeoIP-171_20040418.dat" ]; then
-    wget $NETSPEED_DB || return 1
-    tar -xvf GeoIP-171_20040418.tar.gz
+    $FETCH_CMD $NETSPEED_DB || return 1
+    tar -zxvf GeoIP-171_20040418.tar.gz
     mv GeoIP-171_20040418/*.dat .
 fi
 
 # Speedcell
 if [ ! -e "GeoIP-177it_20120221.tar.gz" ]; then
-    wget $SPEEDCELL_DB || return 1
-    tar -xvf GeoIP-177it_20120221.tar.gz
+    $FETCH_CMD $SPEEDCELL_DB || return 1
+    tar -zxvf GeoIP-177it_20120221.tar.gz
     mv GeoIP-177it_20120221/*.dat .
 fi
 

From e5bad0cff5a9897a598cbe20424faa7f549514e9 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Tue, 1 Dec 2015 10:09:55 -0700
Subject: [PATCH 2/4] add openbsd as a supported host

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index b2a0bc9..98e3995 100644
--- a/package.json
+++ b/package.json
@@ -65,6 +65,7 @@
   },
   "os": [
     "linux",
+    "openbsd",
     "darwin"
   ],
   "engines": {

From b8c5714eb56a528017bafab2fd9f918c72e2c3a3 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Tue, 1 Dec 2015 10:23:44 -0700
Subject: [PATCH 3/4] use wget when FETCH_CMD is not set

---
 cli/bootstrap.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cli/bootstrap.sh b/cli/bootstrap.sh
index 6ae222d..2ca6cc8 100755
--- a/cli/bootstrap.sh
+++ b/cli/bootstrap.sh
@@ -10,8 +10,10 @@ ASUM_DB="http://geolite.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat
 NETSPEED_DB="http://www.maxmind.com/sample/GeoIP-171_20040418.tar.gz"
 SPEEDCELL_DB="https://www.dropbox.com/s/7hv3rqzbw30th8y/GeoIP-177it_20120221.tar.gz"
 
-if [ -z $FETCH_CMD ]; then
+if [ ! -z $FETCH_CMD ]; then
     FETCH_CMD=$FETCH_CMD
+else
+    FETCH_CMD=wget
 fi
 
 mkdir -p ./database || return 1

From 9aa66a20b0b2971d9c6dc3ee23182baf7af132b9 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Tue, 1 Dec 2015 10:35:21 -0700
Subject: [PATCH 4/4] simplify FETCH_CMD check

---
 cli/bootstrap.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/cli/bootstrap.sh b/cli/bootstrap.sh
index 2ca6cc8..ec7303f 100755
--- a/cli/bootstrap.sh
+++ b/cli/bootstrap.sh
@@ -10,9 +10,7 @@ ASUM_DB="http://geolite.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat
 NETSPEED_DB="http://www.maxmind.com/sample/GeoIP-171_20040418.tar.gz"
 SPEEDCELL_DB="https://www.dropbox.com/s/7hv3rqzbw30th8y/GeoIP-177it_20120221.tar.gz"
 
-if [ ! -z $FETCH_CMD ]; then
-    FETCH_CMD=$FETCH_CMD
-else
+if [ -z $FETCH_CMD ]; then
     FETCH_CMD=wget
 fi