From 4ec4aadbd49f10fed1b69d7b9360120506a8722e Mon Sep 17 00:00:00 2001
From: Aditya Ujeniya <adityauj@gmail.com>
Date: Thu, 30 Jan 2025 14:19:17 +0100
Subject: [PATCH] Update to setupDev.sh with change in execution steps for
 cc-backend

---
 setupDev.sh | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/setupDev.sh b/setupDev.sh
index 25478cf..c0e6609 100755
--- a/setupDev.sh
+++ b/setupDev.sh
@@ -12,7 +12,7 @@ echo "| > sudo usermod -aG docker $USER
 echo "|                                                                                      |"
 echo "| This will add docker to the sudo usergroup and all the docker                        |"
 echo "| command will run as sudo by default without requiring                                |"
-echo "| 'sudo' keyword.                                                                      |"  
+echo "| 'sudo' keyword.                                                                      |"
 echo "|--------------------------------------------------------------------------------------|"
 echo ""
 
@@ -21,27 +21,6 @@ if [ ! -d cc-backend ]; then
     echo "'cc-backend' not yet prepared! Please clone cc-backend repository before starting this script."
     echo -n "Stopped."
     exit
-else
-    cd cc-backend
-    if [ ! -d var ]; then
-        wget https://hpc-mover.rrze.uni-erlangen.de/HPC-Data/0x7b58aefb/eig7ahyo6fo2bais0ephuf2aitohv1ai/job-archive-demo.tar
-        tar xf job-archive-demo.tar
-        rm ./job-archive-demo.tar
-
-        cp ./configs/env-template.txt .env
-        cp -f ../misc/config.json config.json
-
-        make
-
-        ./cc-backend -migrate-db
-        ./cc-backend --init-db --add-user demo:admin:demo
-        cd ..
-    else
-        cd ..
-        echo "'cc-backend/var' exists. Cautiously exiting."
-        echo -n "Stopped."
-        exit
-    fi
 fi
 
 # Creates data directory if it does not exists.
@@ -85,6 +64,27 @@ cd ../..
 docker-compose build
 docker-compose up -d
 
+cd cc-backend
+if [ ! -d var ]; then
+    wget https://hpc-mover.rrze.uni-erlangen.de/HPC-Data/0x7b58aefb/eig7ahyo6fo2bais0ephuf2aitohv1ai/job-archive-demo.tar
+    tar xf job-archive-demo.tar
+    rm ./job-archive-demo.tar
+
+    cp ./configs/env-template.txt .env
+    cp -f ../misc/config.json config.json
+
+    make
+
+    ./cc-backend -migrate-db
+    ./cc-backend --init-db --add-user demo:admin:demo
+    cd ..
+else
+    cd ..
+    echo "'cc-backend/var' exists. Cautiously exiting."
+    echo -n "Stopped."
+    exit
+fi
+
 echo ""
 echo "|--------------------------------------------------------------------------------------|"
 echo "| Check logs for each slurm service by using these commands:                           |"