From: tierno <alfonso.tiernosepulveda@telefonica.com>
Date: Mon, 24 Apr 2017 16:37:49 +0000 (+0200)
Subject: fix issue at install-db-server.sh
X-Git-Tag: v2.0.0~2
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=3c4b2bfa612353fab5e6531468483e6bed6ee98b;p=osm%2Fopenvim.git

fix issue at install-db-server.sh

Change-Id: I80474cce8ea2572a3532e8c4479b20f45f2a185c
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
---

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