Skip to content
Snippets Groups Projects
Unverified Commit b17caf4b authored by Daniel's avatar Daniel
Browse files

Revert "MAINT: Move "set -e"", and mode variable setting to top.

This reverts commit 9e13c094.
parent 9e13c094
Branches
Tags
No related merge requests found
...@@ -22,12 +22,14 @@ ...@@ -22,12 +22,14 @@
# #
# ** end header # ** end header
# To fail fast, but beware https://mywiki.wooledge.org/BashFAQ/105 INSTALL_SQL_FILE="db_2_0.sql"
set -e
source utils/load_settings.sh source utils/load_settings.sh
source .config || true source .config || true
# To fail fast, but beware https://mywiki.wooledge.org/BashFAQ/105
set -e
if [ -z $LOGIN_PATH ] ; then if [ -z $LOGIN_PATH ] ; then
MYSQL_CONNECTION="--host=${MYSQL_HOST} --port=${MYSQL_PORT} MYSQL_CONNECTION="--host=${MYSQL_HOST} --port=${MYSQL_PORT}
--user=${MYSQL_USER} --user=${MYSQL_USER}
...@@ -36,8 +38,6 @@ else ...@@ -36,8 +38,6 @@ else
MYSQL_CONNECTION="--login-path=$LOGIN_PATH" MYSQL_CONNECTION="--login-path=$LOGIN_PATH"
fi fi
INSTALL_SQL_FILE="db_2_0.sql"
SQL="$MYSQL_CMD $MYSQL_CONNECTION" SQL="$MYSQL_CMD $MYSQL_CONNECTION"
function fail() { function fail() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment