From d39ddd9a72f8bf7703c2134713cd666b0415911d Mon Sep 17 00:00:00 2001
From: Luke Murphy <lukewm@riseup.net>
Date: Sun, 29 Mar 2020 10:26:15 +0200
Subject: [PATCH] Drop commands out onto lines

---
 sbin/entrypoint.sh | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/sbin/entrypoint.sh b/sbin/entrypoint.sh
index e2a4f21..91f48b7 100755
--- a/sbin/entrypoint.sh
+++ b/sbin/entrypoint.sh
@@ -11,11 +11,27 @@ setup_root_user() {
       return
     fi
 
-    user_count=$(mysql -u"${DB_USER}" -p"${DB_PASSWD}" -h "${DOKKU_MARIADB_GITEA_PORT_3306_TCP_ADDR}" --database="${DB_NAME}" -N -B -e "SELECT count(*) FROM user;")
+    user_count=$(mysql \
+      -u"${DB_USER}" \
+      -p"${DB_PASSWD}" \
+      -h "${DOKKU_MARIADB_GITEA_PORT_3306_TCP_ADDR}" \
+      --database="${DB_NAME}" \
+      -N -B -e "SELECT count(*) FROM user;" \
+    )
 
     if [[ "${user_count}" == "0" ]]; then
         echo "-----> Setting up root user for initial deployment"
-        if gitea admin create-user --username "$ADMIN_USER" --password "$ADMIN_PASS" --email "$ADMIN_MAIL" --admin; then
+
+        create_user=$(gitea \
+          admin \
+          create-user \
+          --username "$ADMIN_USER" \
+          --password "$ADMIN_PASS" \
+          --email "$ADMIN_MAIL" \
+          --admin \
+        )
+
+        if "$create_user"; then
             echo "-----> root user added"
         else
             echo "-----> Failed to add root user"