From c56e17b8b63dfd45c8b07465898452e099291059 Mon Sep 17 00:00:00 2001
From: Dominik Dzienia <dominik.dzienia@gmail.com>
Date: Wed, 19 Jul 2023 22:40:48 +0000
Subject: [PATCH] Improved order

---
 src/lib.sh   | 3 ++-
 src/setup.sh | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/lib.sh b/src/lib.sh
index 6bf1428..b4d8bff 100644
--- a/src/lib.sh
+++ b/src/lib.sh
@@ -300,8 +300,9 @@ install_containers() {
 }
 
 install_containers_progress() {
+    created=$(docker container ls -f 'status=created' -f name=ns-server -f name=ns-database | wc -l)
     current=$(docker container ls -f 'status=running' -f name=ns-server -f name=ns-database | wc -l)
-    echo $(( (($current-1)*100 / 3) )) 
+    echo $(( ((($current-1)*2 + ($created-1) )*100 / 6) )) 
 }
 
 uninstall_containers() {
diff --git a/src/setup.sh b/src/setup.sh
index 8abac41..745f254 100755
--- a/src/setup.sh
+++ b/src/setup.sh
@@ -17,9 +17,9 @@ check_git
 check_docker
 check_docker_compose
 check_jq
-check_dotenv
 setup_packages
 setup_node
+check_dotenv
 setup_users
 setup_dir_structure
 download_conf