X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=database_utils%2Finstall-db-server.sh;h=0599b57147fd334a87f3e374a302a4d4920e98c2;hb=refs%2Fchanges%2F66%2F1666%2F1;hp=24116b5734a35f4a3448bb153d1241d2aac95470;hpb=fdbdb09960fdf66bb37330d804a2a909c1f987e4;p=osm%2Fopenvim.git diff --git a/database_utils/install-db-server.sh b/database_utils/install-db-server.sh index 24116b5..0599b57 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