diff --git a/make_db b/make_db index 58aca1786414d809a0022c4d34d6a3af33fd170f..bb92bfc5c84d43e12a33cfb33e831636a121bf30 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() {