From 40be1933c426814d005f113fb944696a6a55933f Mon Sep 17 00:00:00 2001
From: Robert Adams <misterblue@misterblue.com>
Date: Wed, 27 Nov 2019 05:28:21 -0800
Subject: [PATCH] opensim-herbal3d/config/scripts/initializeDB.sh: wait for DB
 to be ready before trying to initialize it

---
 opensim-herbal3d/config/scripts/initializeDb.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/opensim-herbal3d/config/scripts/initializeDb.sh b/opensim-herbal3d/config/scripts/initializeDb.sh
index 712a21a..bc9eb21 100755
--- a/opensim-herbal3d/config/scripts/initializeDb.sh
+++ b/opensim-herbal3d/config/scripts/initializeDb.sh
@@ -16,9 +16,6 @@ if [[ ! -z "$MYSQL_ROOT_PASSWORD" ]] ; then
     rm -f "$SQLCMDS"
     rm -f "$SQLOPTIONS"
 
-    # If the database is started at the same time, what for it to initialize
-    sleep 10
-
     cat > "$SQLCMDS" <<EOFFFF
 CREATE DATABASE opensim;
 USE opensim;
@@ -33,6 +30,13 @@ password=$MYSQL_ROOT_PASSWORD
 host=$MYSQL_DB_SOURCE
 EOFFFF
 
+    # If the database is started at the same time, what for it to initialize
+    until mysql --defaults-extra-file=$SQLOPTIONS -e "show databases" ; do
+        echo "initializeDb.sh: Waiting on database to be ready"
+        sleep 2
+    done
+    echo "initializeDb.sh: Database is ready"
+
     HASDB=$(mysql --defaults-extra-file=$SQLOPTIONS -e "show databases" | grep "^opensim$")
 
     if [[ -z "$HASDB" ]] ; then