fix(system:destroy): restructure file

whatwedo · May 8, 2024 · fe5c447 · fe5c447
1 parent 1b8bc78
commit fe5c447
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/commands/system/destroy.sh b/commands/system/destroy.sh
@@ -5,16 +5,17 @@
 #    system-destroy
 
 function system:destroy() {
+    if [ -z $(docker network ls --filter=name=${NETWORK_NAME} -q) ]; then
+        _logRed "Already destroyed"
+        exit 0
+    fi
+
     _logRed "Removing containers"
-    docker rm -f $(docker network inspect -f '{{ range $key, $value := .Containers }}{{ printf "%s\n" $key }}{{ end }}' ${NETWORK_NAME}) &>/dev/null
-    cd ${ROOT_DIR}
-    ${DOCKER_COMPOSE} down --remove-orphans
+    ${DOCKER_COMPOSE} --project-directory ${ROOT_DIR} down --remove-orphans
+    docker rm -f $(docker network inspect -f '{{ range $key, $value := .Containers }}{{ printf "%s\n" $key }}{{ end }}' ${NETWORK_NAME}) &>/dev/null || true
 
-    _logRed "Removing network if created"
-    if [ "$(docker network ls --filter=name=${NETWORK_NAME} -q)" != "" ]; then
-        _logRed "Remove network ${NETWORK_NAME}"
-        docker network rm ${NETWORK_NAME}
-    fi
+    _logRed "Remove network ${NETWORK_NAME}"
+    docker network rm ${NETWORK_NAME}
 
     _logGreen "Finished destroying successfully"
 }