diff --git a/Makefile b/Makefile index dafecafed7..c3e693b374 100644 --- a/Makefile +++ b/Makefile @@ -319,6 +319,7 @@ osx-dependencies: cli-dependencies dependencies: $(os-dependencies) @./thirdparty/fetch-geoip-db.sh + @ $(CP) thirdparty/download/GeoLite2-Country.mmdb.gz . all-dependencies: cli-dependencies windows-dependencies osx-dependencies diff --git a/make.ps1 b/make.ps1 index 53b175c40c..b567149355 100644 --- a/make.ps1 +++ b/make.ps1 @@ -116,6 +116,7 @@ elseif ($command -eq "dependencies") cd thirdparty ./fetch-thirdparty-deps.ps1 cp download/*.dll .. + cp download/GeoLite2-Country.mmdb.gz .. cp download/windows/*.dll .. cd .. echo "Dependencies copied." diff --git a/thirdparty/fetch-geoip-db.sh b/thirdparty/fetch-geoip-db.sh index b490bb828c..4e694f02eb 100755 --- a/thirdparty/fetch-geoip-db.sh +++ b/thirdparty/fetch-geoip-db.sh @@ -14,6 +14,5 @@ if [[ ! -e $filename ]] || [[ -n $(find . -name $filename -mtime +30 -print) ]]; rm -f $filename echo "Updating GeoIP country database from MaxMind." curl -s -L -O http://geolite.maxmind.com/download/geoip/database/$filename - cp $filename ../.. fi diff --git a/thirdparty/fetch-thirdparty-deps.ps1 b/thirdparty/fetch-thirdparty-deps.ps1 index c57d8dfdf8..c80badfb00 100644 --- a/thirdparty/fetch-thirdparty-deps.ps1 +++ b/thirdparty/fetch-thirdparty-deps.ps1 @@ -135,7 +135,6 @@ if (!(Test-Path "GeoLite2-Country.mmdb.gz") -Or (((get-date) - (get-item "GeoLit echo "Updating GeoIP country database from MaxMind." $target = Join-Path $pwd.ToString() "GeoLite2-Country.mmdb.gz" (New-Object System.Net.WebClient).DownloadFile("http://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.mmdb.gz", $target) - cp GeoLite2-Country.mmdb.gz ..\.. } cd ..