From 3d3e1534271f8cebc16ba29227cecf1179cbbf38 Mon Sep 17 00:00:00 2001
From: Jeroen Boersma <jeroen@srcode.nl>
Date: Tue, 31 Jul 2018 21:57:49 +0200
Subject: [PATCH] Show message if people didn't run dev setup

---
 bin/dev_command/build |  6 +++---
 bin/dev_command/setup | 18 ++++++++++++------
 bin/dev_command/up    |  5 +++++
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/bin/dev_command/build b/bin/dev_command/build
index 4e05f94..c47e387 100644
--- a/bin/dev_command/build
+++ b/bin/dev_command/build
@@ -1,8 +1,8 @@
 
 cd ${DEV_DIR};
 
-if [ -n "$@" ]; then
-    services="$@";
+if [ -n "$*" ]; then
+    services="$*";
 else
     services=`./${DEV_SELF} config --services`;
 fi
@@ -19,7 +19,7 @@ fi
 
 dc yml_all;
 dc mode build;
-dc cmd "${userarg} ${grouparg} $@";
+dc cmd "${userarg} ${grouparg}"
 
 for a in ${services}; do
     cmd="`dc show` $a";
diff --git a/bin/dev_command/setup b/bin/dev_command/setup
index 5eb1417..dd6a661 100644
--- a/bin/dev_command/setup
+++ b/bin/dev_command/setup
@@ -21,19 +21,25 @@ setup() {
 
         echo 'Starting regular database user, waiting for db to become ready';
         ./${DEV_SELF} up db;
-        ./${DEV_SELF} logs -f db 2>&1 | grep -m1 'ready for connections';
+        while true; do
+            ./${DEV_SELF} logs db 2>&1 | grep 'port: 3306  Percona' > /dev/null && break;
+            echo -n '.';
+            sleep 1;
+        done
+        echo '';
 
         local user=${USER};
 
         # Check if already exists
-        echo "select * from mysql.user where user='${user}';" | dev myroot | grep "${user}" >/dev/null && return 1;
+        echo "select * from mysql.user where user='${user}';" | dev myroot 2>/dev/null| grep "${user}" >/dev/null && return 1;
 
         echo 'Database user has access to databases "'${user}'_*"';
         echo '';
-        echo "create user '${user}'" | ./${DEV_SELF} myroot;
-        echo "grant all on ${user}.* to '${user}'" | ./${DEV_SELF} myroot;
-        echo "update mysql.db set db = '${user}\_%' where user = '${user}';" | ./${DEV_SELF} myroot;
-        echo 'flush privileges;' | ./${DEV_SELF} myroot;
+        echo "\
+create user '${user}';\
+grant all on ${user}.* to '${user}';\
+update mysql.db set db = '${user}\_%' where user = '${user}';\
+flush privileges;" | ./${DEV_SELF} myroot 2>/dev/null;
 
         return 0;
     }
diff --git a/bin/dev_command/up b/bin/dev_command/up
index 0e0854c..f931fbd 100644
--- a/bin/dev_command/up
+++ b/bin/dev_command/up
@@ -1,4 +1,9 @@
 
+if [ -z "`docker volume ls -q -f 'name=dockerdev-mysql-volume'`" ]; then
+    echo 'No MySQL volume file found, first time here? Run "bin/dev setup" to setup the most important stuff';
+    exit 1;
+fi
+
 
 if [ -z "${DOMAINSUFFIX}" ]; then
     dc yml build/dist/docker-compose-suffix.yml;