From c0ff18e4d8bd63085d7b6f8f1e5713f030567568 Mon Sep 17 00:00:00 2001
From: Edward Ribeiro <eribeiro@interlegis.leg.br>
Date: Tue, 25 Apr 2017 11:22:43 -0300
Subject: [PATCH] Adiciona checagem de password e usuario admin existente

---
 create_admin.py |  4 ++--
 start.sh        | 24 +++++++++++++-----------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/create_admin.py b/create_admin.py
index d534c6696..7fe03a65c 100644
--- a/create_admin.py
+++ b/create_admin.py
@@ -13,11 +13,11 @@ def create_superuser():
     email = os.environ['ADMIN_EMAIL'] if 'ADMIN_EMAIL' in os.environ else ''
 
     if User.objects.filter(username=username).exists():
-        # print("[SUPERUSER] User %s already exists. Exiting without change." % username)
+        print("[SUPERUSER] User %s already exists. Exiting without change." % username)
         sys.exit('ADMIN_USER_EXISTS')
     else:
         if not password:
-            # print("[SUPERUSER] Environment variable $ADMIN_PASSWORD for user %s was not set. Leaving..." % username)
+            print("[SUPERUSER] Environment variable $ADMIN_PASSWORD for user %s was not set. Leaving..." % username)
             sys.exit('MISSING_ADMIN_PASSWORD')
 
         print("[SUPERUSER] Creating superuser...")
diff --git a/start.sh b/start.sh
index 893296a89..250be13ea 100755
--- a/start.sh
+++ b/start.sh
@@ -40,8 +40,6 @@ create_env() {
 
 create_env
 
-# # python3 gen-env.py
-
 python3 manage.py bower install
 
 /bin/sh busy-wait.sh $DATABASE_URL
@@ -50,18 +48,22 @@ python3 manage.py migrate
 python3 manage.py collectstatic --no-input
 python3 manage.py rebuild_index --noinput
 
-user_created=$(python3 create_admin.py)
+user_created=$(python3 create_admin.py 2>&1)
 
-echo $user_created
+cmd=$(echo $user_created | grep 'ADMIN_USER_EXISTS')
+user_exists=$?
 
-#if [ $user_created -eq "ADMIN_USER_EXISTS" ]; then
-#    echo "[SUPERUSER CREATION] User admin already exists. Not creating"
-#fi
+cmd=$(echo $user_created | grep 'MISSING_ADMIN_PASSWORD')
+lack_pwd=$?
 
-#if [ $user_created -eq "MISSING_ADMIN_PASSWORD" ]; then
-#   echo "[SUPERUSER] Environment variable $ADMIN_PASSWORD for superuser admin was not set. Leaving container"
-   # return -1 # TODO: Uncomment when in finally in prod.
-#fi
+if [ $user_exists -eq 0 ]; then
+   echo "[SUPERUSER CREATION] User admin already exists. Not creating"
+fi  
+ 
+if [ $lack_pwd -eq 0 ]; then
+   echo "[SUPERUSER] Environment variable $ADMIN_PASSWORD for superuser admin was not set. Leaving container"
+   # return -1
+fi 
 
 
 /bin/sh gunicorn_start.sh no-venv