X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=database_utils%2Finstall-db-server.sh;h=5f1c5633eb0d38bd3c3a69ed01cd5c65bf8673a5;hb=refs%2Fchanges%2F65%2F1665%2F2;hp=49ab7ead532846d104cb942a31df98f4000b3608;hpb=10b81cfd6b1828ff809ba2d95ac88800f71a523b;p=osm%2FRO.git diff --git a/database_utils/install-db-server.sh b/database_utils/install-db-server.sh index 49ab7ead..5f1c5633 100755 --- a/database_utils/install-db-server.sh +++ b/database_utils/install-db-server.sh @@ -141,9 +141,9 @@ echo ' } function db_exists(){ # (db_name, credential_file) - RESULT=`mysqlshow --defaults-extra-file="$2" | grep -v Wildcard | grep -o $1` \ - || ! echo "$RESULT" >&2 \ - || exit 1 + # check credentials + mysqlshow --defaults-extra-file="$2" >/dev/null || exit 1 + RESULT=`mysqlshow --defaults-extra-file="$2" | grep -v Wildcard | grep -o $1` if [ "$RESULT" == "$1" ]; then # echo " DB $1 exists" return 0