X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=database_utils%2Finstall-db-server.sh;h=d473478dead3c9d6eef559f2759c7b6d07448797;hb=f92ee11b699f0c1f2ec146de3fc95dc4946ed8bc;hp=49ab7ead532846d104cb942a31df98f4000b3608;hpb=443c84a6e1c04347f5d14e02344a79a297401bdc;p=osm%2FRO.git

diff --git a/database_utils/install-db-server.sh b/database_utils/install-db-server.sh
index 49ab7ead..d473478d 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
@@ -218,6 +218,12 @@ fi
 # if not assuming ubuntu type
 [ -f /etc/redhat-release ] || _DISTRO=$(lsb_release -is  2>/dev/null)
 
+if [[ -z "$NO_PACKAGES" ]]
+then
+    [ "$USER" != "root" ] && echo "Needed root privileges" >&2 && exit 1
+    _install_mysql_package || exit 1
+fi
+
 # Creating temporary file for MYSQL installation and initialization"
 TEMPFILE="$(mktemp -q --tmpdir "installdb.XXXXXX")"
 trap 'rm -f "$TEMPFILE"' EXIT
@@ -249,12 +255,6 @@ then
     exit
 fi
 
-if [[ -z "$NO_PACKAGES" ]]
-then
-    [ "$USER" != "root" ] && echo "Needed root privileges" >&2 && exit 1
-    _install_mysql_package || exit 1
-fi
-
 # Create or update database
 if db_exists $DB_NAME $TEMPFILE ; then
     if [[ -n $FORCEDB ]] ; then