From 88216c520c8fb9afec9b56bf71a2105985e5675d Mon Sep 17 00:00:00 2001 From: Joe Rayhawk Date: Mon, 3 Dec 2018 14:13:08 -0800 Subject: configure: local config should be before overrides --- configure.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.sh b/configure.sh index a506394..9d9d156 100644 --- a/configure.sh +++ b/configure.sh @@ -14,6 +14,10 @@ export OPENSSL_CONFIG="openssl.cnf" # For advanced customization (not suggested) export EMAIL_DEFAULT_DOMAIN="omgwallhack.org" # ./mailcert.sh uses this as a user's domain if nothing more obvious is available +if [ -e ./local.cfg ]; then + . ./local.cfg # dash is finnicky about how paths for sourcing work +fi + if [ $SUPPLEMENTARY_CONFIG ]; then if [ -e ./"$SUPPLEMENTARY_CONFIG" ]; then . ./"$SUPPLEMENTARY_CONFIG" # dash is finnicky about how paths for sourcing work @@ -24,7 +28,3 @@ if [ $SUPPLEMENTARY_CONFIG ]; then exit 1 fi fi - -if [ -e ./local.cfg ]; then - . ./local.cfg # dash is finnicky about how paths for sourcing work -fi -- cgit v1.2.3