Fixed CI/CD

Created by: mbarbero

bin/maxmind.sh

-#/bin/bash
+#! /usr/bin/env bash
+
+# Bash strict-mode
+set -o errexit
+set -o nounset
+set -o pipefail
+
+IFS=$'\n\t'
## Required due to JVM busybox usage
IS_BB=0
agnostic_cp () {
if [ $IS_BB == 1 ]; then
-		cp -f $2 $1
+		cp -f "${2}" "${1}"
else
-		cp -ut $1 $2
+		cp -ut "${1}" "${2}"
fi
}
## Check sys + args
-if [ -z "$1" ]; then
-  echo "An argument for location of DB files needs to be set" 
+if [ -z "${1}" ]; then
+  echo "An argument for location of DB files needs to be set"
exit 1
fi
-if [[ `busybox --help`=~"command not found" ]]; then
-	IS_BB=0
-else
-	IS_BB=1
-fi
-
-## Start
-echo "Starting MaxMind data retrieval!"
-BINARY_BIN="$1/bin"
+mkdir -p "${1}/bin"
+mkdir -p "${1}/db"
+pushd "${1:-"."}" || exit 1
echo "Getting data from MaxMind"
-wget "https://geolite.maxmind.com/download/geoip/database/GeoLite2-Country-CSV.zip"
-wget "https://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.tar.gz"
-wget "https://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz"
-echo "Extracting CSV data"
+curl -sSL "https://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.tar.gz" | tar zxv -C bin --wildcards '*.mmdb'
+curl -sSL "https://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz" | tar zxv -C bin --wildcards '*.mmdb'
+curl -sSL "https://geolite.maxmind.com/download/geoip/database/GeoLite2-Country-CSV.zip" -o GeoLite2-Country-CSV.zip
+unzip GeoLite2-Country-CSV.zip
+rm -vf GeoLite2-Country-CSV.zip
## Copy the Country CSV data to a location on the drive
-unzip -o GeoLite2-Country-CSV.zip
-echo "Copying data to $1/db to be uploaded"
-DIR=$(pwd)
-COUNTRY_DIR=$(find $DIR -maxdepth 1 -type d -name "GeoLite2-Country*")
-mkdir -p $1/db
-agnostic_cp "$1/db" "$COUNTRY_DIR/GeoLite2-Country-Locations-en.csv $COUNTRY_DIR/GeoLite2-Country-Blocks*"
-
-echo "Extracting MaxMind GeoIP binaries"
+echo "Moving MaxMind GeoIP databases"
+cp -vf GeoLite2-Country**/GeoLite2-Country-Locations-en.csv db/
+cp -vf GeoLite2-Country**/GeoLite2-Country-Blocks* db/
+rm -rvf GeoLite2-Country*
+
+echo "Moving MaxMind GeoIP binaries"
## Extract the binary geoIP databases
-mkdir -p $BINARY_BIN
-tar -C $BINARY_BIN -xzvf  GeoLite2-Country.tar.gz --wildcards '*.mmdb'
-tar -C $BINARY_BIN -xzvf  GeoLite2-City.tar.gz --wildcards '*.mmdb'
-(cd $BINARY_BIN && find . -mindepth 1 -type f -exec mv -f {} $BINARY_BIN \; && find . -mindepth 1 -type d -exec rm -rf {} \;)
-
-echo "Cleaning up extra files"
-## Cleanup
-rm -rf $COUNTRY_DIR
-rm GeoLite2-Country-CSV.zip
-rm GeoLite2-Country.tar.gz
-rm GeoLite2-City.tar.gz
+mv -vf bin/GeoLite2-**/GeoLite2-C*.mmdb bin/
+rm -rvf bin/GeoLite2-City_*
+rm -rvf bin/GeoLite2-Country_*
+
+popd || exit 1
\ No newline at end of file