diff --git a/install.sh b/install.sh index 0722b5e..fa81b3d 100755 --- a/install.sh +++ b/install.sh @@ -9,8 +9,7 @@ fi # Read .env for default values with a tip o' the hat to https://stackoverflow.com/a/59831605/90297 t=$(mktemp) && export -p > "$t" && set -a && . ./.env && set +a && . "$t" && rm "$t" && unset t -dc="docker-compose --no-ansi" -dcr="$dc run --rm" +source ./install/docker-aliases.sh # Thanks to https://unix.stackexchange.com/a/145654/108960 log_file="sentry_install_log-`date +'%Y-%m-%d_%H-%M-%S'`.txt" @@ -329,7 +328,7 @@ if [[ ! -f "$RELAY_CREDENTIALS_JSON" ]]; then fi -./install/geoip.sh +source ./install/geoip.sh if [[ "$MINIMIZE_DOWNTIME" ]]; then diff --git a/install/docker-aliases.sh b/install/docker-aliases.sh new file mode 100755 index 0000000..e19384b --- /dev/null +++ b/install/docker-aliases.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +dc="docker-compose --no-ansi" +dcr="$dc run --rm" diff --git a/install/geoip.sh b/install/geoip.sh index ec37b21..8d7c81a 100755 --- a/install/geoip.sh +++ b/install/geoip.sh @@ -2,9 +2,7 @@ if [ ! -f 'install.sh' ]; then echo 'Where are you?'; exit 1; fi -dc="docker-compose --no-ansi" -dcr="$dc run --rm" - +source ./install/docker-aliases.sh install_geoip() { local mmdb='geoip/GeoLite2-City.mmdb'