From a6cb606892a9fa8f9e1b354e6c58e24e767d893c Mon Sep 17 00:00:00 2001 From: root Date: Fri, 25 Oct 2024 19:32:05 +0000 Subject: [PATCH] Took out verbose of service not installed on start and stop scripts --- bin/start | 6 +++--- bin/stop | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/start b/bin/start index 8227165..1893cdc 100755 --- a/bin/start +++ b/bin/start @@ -63,7 +63,7 @@ startservice() { startservice_all() { for SERVICE in "${SERVICES[@]}"; do # If app isn't installed then skip - [ ! -d "/federated/apps/$SERVICE" ] && echo "* $SERVICE not installed, skipping." && continue + [ ! -d "/federated/apps/$SERVICE" ] && continue FAILED="no" if [ "$SERVICE" = "jitsi" ]; then @@ -127,14 +127,14 @@ elif [ "$SERVICE" = "all" ]; then # Starting all apps # First start the CORE_APPS one by one for i in "${CORE_APPS[@]}"; do - [ ! -d "/federated/apps/$i" ] && echo "* $i not installed, skipping." && continue + [ ! -d "/federated/apps/$i" ] && continue [ "$(docker container inspect -f '{{.State.Status}}' $i 2>/dev/null)" = "running" ] && echo "* $i is already started." && continue startservice_coreapp "$i" done # Next start EXTRA_APPS in parallel for i in "${EXTRA_APPS[@]}"; do - [ ! -d "/federated/apps/$i" ] && echo "* $i not installed, skipping." && continue + [ ! -d "/federated/apps/$i" ] && continue [ "$(docker container inspect -f '{{.State.Status}}' $i 2>/dev/null)" = "running" ] && echo "* $i is already started." && continue [ "$i" = "jitsi" ] && [ "$(docker container inspect -f '{{.State.Status}}' jitsi_web_1 2>/dev/null)" = "running" ] && echo "* $i is already started." && continue startservice_all_new "$i" & diff --git a/bin/stop b/bin/stop index 5a3e3fa..1961faa 100755 --- a/bin/stop +++ b/bin/stop @@ -23,7 +23,7 @@ stopservice() { stopservice_all_old() { for i in "${SERVICES[@]}"; do # If app isn't installed then skip - [ ! -d "/federated/apps/$i" ] && echo "* $i not installed, skipping." && continue + [ ! -d "/federated/apps/$i" ] && continue echo "* Stopping $i.." cd /federated/apps/$i && docker-compose -f docker-compose.yml -p $i down @@ -41,7 +41,7 @@ SERVICE=$1 if [ "$SERVICE" = "all" ]; then for i in "${SERVICES[@]}"; do # If app isn't installed then skip - [ ! -d "/federated/apps/$i" ] && echo "* $i not installed, skipping." && continue + [ ! -d "/federated/apps/$i" ] && continue # If app is already stopped then skip [ ! "$(docker ps -f "name=$i" -f "status=running" -q)" ] && echo "* $i is already stopped." && continue