diff --git a/patches/utils/patch_header.sh b/patches/utils/patch_header.sh index 10237bb80f2707cd85aa43031fbe944e7058a6c1..8a30bf94110ab2a06c221870194845d8b393108c 100644 --- a/patches/utils/patch_header.sh +++ b/patches/utils/patch_header.sh @@ -102,7 +102,15 @@ while test $# -gt 0; do done echo "HERE header1" -[[ -n "$ENV_FILE" ]] && source "$ENV_FILE" +if [ -n "$ENV_FILE" ] ; then + if [ -f "$ENV_FILE" ] ; then + . "$ENV_FILE" ; + else + echo "$ENV_FILE does not exist" + exit 1 + fi +fi + echo "HERE header2" if [[ -z "$DATABASE_NAME" && -z "$MYSQL_CONNECTION" ]] @@ -111,24 +119,24 @@ then exit 1 fi -if [ "$LOGIN_PATH" ]; then +if [ -n "$LOGIN_PATH" ]; then MYSQL_CONNECTION="--login-path=$LOGIN_PATH" MYSQL_CONNECTION_NO_DB="$MYSQL_CONNECTION" MYSQL_CONNECTION="$MYSQL_CONNECTION --database=$DATABASE_NAME" -elif [[ -z "$MYSQL_CONNECTION" ]]; then +elif [ -z "$MYSQL_CONNECTION" ]; then MYSQL_CONNECTION="" - if [ "$DATABASE_USER" ] + if [ -n "$DATABASE_USER" ] then MYSQL_CONNECTION="--user=$DATABASE_USER" fi - if [ "$DATABASE_USER_PW" ] + if [ -n "$DATABASE_USER_PW" ] then MYSQL_CONNECTION="$MYSQL_CONNECTION --password=$DATABASE_USER_PW" fi if [[ "$MYSQL_HOST" && ( "$MYSQL_HOST" != "localhost" ) ]]; then MYSQL_CONNECTION="$MYSQL_CONNECTION --host=$MYSQL_HOST" - if [ "$MYSQL_PORT" ]; then + if [ -n "$MYSQL_PORT" ]; then MYSQL_CONNECTION="$MYSQL_CONNECTION --port=$MYSQL_PORT" fi fi diff --git a/update_sql_procedures.sh b/update_sql_procedures.sh index 7b0b457f07456663645c383703e8c1c7ec962291..30a2a016b96767365554d8c4e7da9e472604bf2e 100755 --- a/update_sql_procedures.sh +++ b/update_sql_procedures.sh @@ -26,7 +26,7 @@ source patches/utils/patch_header.sh -echo -n "updating rules ... " +echo -n "updating rules ... $CMD_MYSQL $MYSQL_CONNECTION" set -e mysql_execute "$(sed s/db_2_0/$DATABASE_NAME/g rules.sql)"