fix issues at installation scripts. Change at initopenvim
Change-Id: I9837ada6b892fbcaa58a64bd1601593064b16b57
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 7f5c9eb..c3a0248 100755
--- a/database_utils/install-db-server.sh
+++ b/database_utils/install-db-server.sh
@@ -156,8 +156,8 @@
function db_exists(){ # (db_name, credential_file)
# check credentials
mysqlshow --defaults-extra-file="$2" >/dev/null || exit 1
- RESULT=`mysqlshow --defaults-extra-file="$2" | grep -v Wildcard | grep -w $1`
- if [ "$RESULT" == "$1" ]; then
+ if mysqlshow --defaults-extra-file="$2" | grep -v Wildcard | grep -w -q $1
+ then
# echo " DB $1 exists"
return 0
fi
@@ -231,6 +231,12 @@
# 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
@@ -262,12 +268,6 @@
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