diff --git a/patches/applyPatches.sh b/patches/applyPatches.sh index 14cbb49581aa0c5355e2a102a4801f21aec18633..8d2decbd8ea342fe8dabf194a033027989d52bd2 100755 --- a/patches/applyPatches.sh +++ b/patches/applyPatches.sh @@ -31,6 +31,9 @@ if [ -z "$UTILSPATH" ]; then export UTILSPATH fi +source $UTILSPATH/load_settings.sh +source $UTILSPATH/helpers.sh + PATCHES="./patch*/patch.sh" for p in $PATCHES diff --git a/utils/helpers.sh b/utils/helpers.sh index 90115af6fca18f7f6d9ed4719eb6289b3db872f7..bb2337d4d62aa3073b75174fcc24a84ec51bfcf3 100644 --- a/utils/helpers.sh +++ b/utils/helpers.sh @@ -33,6 +33,7 @@ function mysql_execute { #TODO is it meaningful that here always the database user is used??? set +e + env $MYSQL_CMD $(get_db_args) -e "$1" ret=${PIPESTATUS[0]} if [ "$ret" -ne 0 ]; then