Skip to content

Don't fail setup script if geo_data folder exists #2674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jmhooper merged 2 commits into from
Nov 28, 2018
Merged

Don't fail setup script if geo_data folder exists #2674

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0527a5
Don't fail setup script if geo_data folder exists
jmhooper Nov 27, 2018
8c1ada7
Merge branch 'master' into jmhooper-fix-setup-for-geo-data
jmhooper Nov 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Dir.chdir APP_ROOT do
run "test -L certs/saml2018.crt || cp certs/saml2018.crt.example certs/saml2018.crt"

puts "== Copying GeoLite2 City database =="
run "test -L geo_data/GeoLite2-City.mmdb || mkdir geo_data && cd geo_data && " \
run "test -L geo_data/GeoLite2-City.mmdb || mkdir -p geo_data && cd geo_data && " \
"curl http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz | tar xvz"
run "mv geo_data/GeoLite2-City_20181120/GeoLite2-City.mmdb geo_data/GeoLite2-City.mmdb"

Expand Down