From b17caf4b3172a5325e323aae62357b584eaa4d8f Mon Sep 17 00:00:00 2001 From: Daniel <daniel@harvey> Date: Tue, 24 Mar 2020 16:13:45 +0100 Subject: [PATCH] Revert "MAINT: Move "set -e"", and mode variable setting to top. This reverts commit 9e13c0944156ee4ea8f4423849b88cdb9dc630ba. --- make_db | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/make_db b/make_db index 58aca17..bb92bfc 100755 --- a/make_db +++ b/make_db @@ -22,12 +22,14 @@ # # ** end header -# To fail fast, but beware https://mywiki.wooledge.org/BashFAQ/105 -set -e +INSTALL_SQL_FILE="db_2_0.sql" source utils/load_settings.sh source .config || true +# To fail fast, but beware https://mywiki.wooledge.org/BashFAQ/105 +set -e + if [ -z $LOGIN_PATH ] ; then MYSQL_CONNECTION="--host=${MYSQL_HOST} --port=${MYSQL_PORT} --user=${MYSQL_USER} @@ -36,8 +38,6 @@ else MYSQL_CONNECTION="--login-path=$LOGIN_PATH" fi -INSTALL_SQL_FILE="db_2_0.sql" - SQL="$MYSQL_CMD $MYSQL_CONNECTION" function fail() { -- GitLab