Merge pull request #15 from viktorhaid/master

Switch from mysql to mariadb tools because of deprecation

Author: runningman84

create-mysql-database.sh

@@ -27,5 +27,5 @@ else
   echo "using host $MYSQL_HOST"
   echo "using user $MYSQL_ROOT_USER"
   echo "using database name $MYSQL_DATABASE"
-  mysql -u"$MYSQL_ROOT_USER" -p"$MYSQL_ROOT_PASSWORD" -h"$MYSQL_HOST" -se"CREATE DATABASE IF NOT EXISTS $MYSQL_DATABASE;"
+  mariadb -u"$MYSQL_ROOT_USER" -p"$MYSQL_ROOT_PASSWORD" -h"$MYSQL_HOST" -se"CREATE DATABASE IF NOT EXISTS $MYSQL_DATABASE;"
 fi

create-mysql-user.sh

@@ -27,6 +27,6 @@ else
   echo "using host $MYSQL_HOST"
   echo "using user $MYSQL_ROOT_USER"
   echo "using database name $MYSQL_DATABASE"
-  mysql -u"$MYSQL_ROOT_USER" -p"$MYSQL_ROOT_PASSWORD" -h"$MYSQL_HOST" -se"CREATE USER IF NOT EXISTS '$MYSQL_USER' IDENTIFIED BY '$MYSQL_PASSWORD';"
-  mysql -u"$MYSQL_ROOT_USER" -p"$MYSQL_ROOT_PASSWORD" -h"$MYSQL_HOST" -se"GRANT ALL PRIVILEGES ON $MYSQL_DATABASE.* To '$MYSQL_USER';"
+  mariadb -u"$MYSQL_ROOT_USER" -p"$MYSQL_ROOT_PASSWORD" -h"$MYSQL_HOST" -se"CREATE USER IF NOT EXISTS '$MYSQL_USER' IDENTIFIED BY '$MYSQL_PASSWORD';"
+  mariadb -u"$MYSQL_ROOT_USER" -p"$MYSQL_ROOT_PASSWORD" -h"$MYSQL_HOST" -se"GRANT ALL PRIVILEGES ON $MYSQL_DATABASE.* To '$MYSQL_USER';"
 fi

import-mysql-database-multisite.sh

@@ -48,4 +48,4 @@ cat $TMPFILE >> $OUTFILE
 
 echo "importing into database"
 
-mysql -u$MYSQL_USER -p$MYSQL_PASSWORD -h$MYSQL_HOST --default_character_set utf8 < $OUTFILE
+mariadb -u$MYSQL_USER -p$MYSQL_PASSWORD -h$MYSQL_HOST --default_character_set utf8 < $OUTFILE

import-mysql-database.sh

@@ -41,4 +41,4 @@ cat $TMPFILE >> $OUTFILE
 
 echo "importing dump file into mysql"
 
-mysql -u$MYSQL_USER -p$MYSQL_PASSWORD -h$MYSQL_HOST --default_character_set utf8 < $OUTFILE
+mariadb -u$MYSQL_USER -p$MYSQL_PASSWORD -h$MYSQL_HOST --default_character_set utf8 < $OUTFILE

wait-for-mysql-root.sh

@@ -28,7 +28,7 @@ else
   echo "using host $MYSQL_HOST"
   echo "using user $MYSQL_ROOT_USER"
   i=0
-  while ! mysqladmin status -h"$MYSQL_HOST" -u"$MYSQL_ROOT_USER" -p"$MYSQL_ROOT_PASSWORD" ; do
+  while ! mariadb-admin status -h"$MYSQL_HOST" -u"$MYSQL_ROOT_USER" -p"$MYSQL_ROOT_PASSWORD" ; do
     sleep 1
     echo -n .
     ((i++))

wait-for-mysql-user.sh

@@ -35,7 +35,7 @@ echo "using host $MYSQL_HOST"
 echo "using user $MYSQL_USER"
 
 i=0
-while ! mysqladmin status -h"$MYSQL_HOST" -u"$MYSQL_USER" -p"$MYSQL_PASSWORD" ; do
+while ! mariadb-admin status -h"$MYSQL_HOST" -u"$MYSQL_USER" -p"$MYSQL_PASSWORD" ; do
   sleep 1
   echo -n .
   ((i++))