copenhagentruckwash/api
1
0
Fork 0
Code Issues Pull Requests 1 Actions 2 Packages Projects Releases Wiki Activity

Normalize line endings in install scripts and enhance service stop commands for robustness

Browse Source
This commit is contained in:
Jeppe Bundgaard
2026-06-30 11:06:33 +02:00
parent 7ccbb68ffa
commit bd87e94472
4 changed files with 47 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/nginx/app/modules/edgegateway/classes/edge_gateway_manager.php
+12 -13
View File
@@ -1959,17 +1959,16 @@ cleanup_existing_installation() {
return 1
fi
set +e
systemctl stop truckwash-edge-gateway-stack.service >/dev/null 2>&1
systemctl stop truckwash-edge-agent.service >/dev/null 2>&1
systemctl stop truckwash-edge-gateway-stack.service >/dev/null 2>&1 || true
systemctl stop truckwash-edge-agent.service >/dev/null 2>&1 || true
if [ -x "$INSTALL_DIR/gateway-launcher.sh" ]; then
TRUCKWASH_INSTALL_DIR="$INSTALL_DIR" "$INSTALL_DIR/gateway-launcher.sh" down >/dev/null 2>&1
TRUCKWASH_INSTALL_DIR="$INSTALL_DIR" "$INSTALL_DIR/gateway-launcher.sh" down >/dev/null 2>&1 || true
elif [ -f "$INSTALL_DIR/docker-compose.gateway.yml" ]; then
if docker compose version >/dev/null 2>&1; then
docker compose -f "$INSTALL_DIR/docker-compose.gateway.yml" down >/dev/null 2>&1
docker compose -f "$INSTALL_DIR/docker-compose.gateway.yml" down >/dev/null 2>&1 || true
elif command -v docker-compose >/dev/null 2>&1; then
docker-compose -f "$INSTALL_DIR/docker-compose.gateway.yml" down >/dev/null 2>&1
docker-compose -f "$INSTALL_DIR/docker-compose.gateway.yml" down >/dev/null 2>&1 || true
fi
fi
@@ -1980,17 +1979,17 @@ cleanup_existing_installation() {
truckwash-auto-updater \
truckwash-redis \
truckwash-mariadb \
truckwash-minio >/dev/null 2>&1
truckwash-minio >/dev/null 2>&1 || true
fi
systemctl disable truckwash-edge-gateway-stack.service >/dev/null 2>&1
systemctl disable truckwash-edge-agent.service >/dev/null 2>&1
systemctl disable truckwash-edge-gateway-stack.service >/dev/null 2>&1 || true
systemctl disable truckwash-edge-agent.service >/dev/null 2>&1 || true
rm -f "$STACK_SERVICE_PATH" "$LEGACY_SERVICE_PATH"
rm -rf "$INSTALL_DIR"
systemctl daemon-reload >/dev/null 2>&1
systemctl reset-failed truckwash-edge-gateway-stack.service >/dev/null 2>&1
systemctl reset-failed truckwash-edge-agent.service >/dev/null 2>&1
set -e
systemctl daemon-reload >/dev/null 2>&1 || true
systemctl reset-failed truckwash-edge-gateway-stack.service >/dev/null 2>&1 || true
systemctl reset-failed truckwash-edge-agent.service >/dev/null 2>&1 || true
return 0
}
config_has_claimed_gateway() {
local config_path="$1"