From 89a684f6929316f1bf176eab284600931321a172 Mon Sep 17 00:00:00 2001 From: Override-6 Date: Sun, 5 Feb 2023 17:14:43 +0100 Subject: [PATCH] fix drone --- drone/deploy.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drone/deploy.sh b/drone/deploy.sh index ba24c8b..cd7646e 100644 --- a/drone/deploy.sh +++ b/drone/deploy.sh @@ -11,15 +11,15 @@ find_pid() { ps -aux | tr -s " " | grep -E "\bjava -jar .*$1\b" | cut -d " " -f2 } -SERVER_PROD_PID=$(prod_pid $PROD_SERVER_JAR_NAME) -EMITTER_PROD_PID=$(prod_pid $PROD_EMITTER_JAR_NAME) +SERVER_PROD_PID=$(find_pid $PROD_SERVER_JAR_NAME) +EMITTER_PROD_PID=$(find_pid $PROD_EMITTER_JAR_NAME) try_shutdown() { if [ "$1" ]; then #will cause the old server to gracefully shutdown echo "shutting down old $2 version ..." kill "$PROD_PID" - while [ ! "$(prod_pid $2)" ]; do sleep 1; done #sleep until process ends + while [ ! "$(find_pid $2)" ]; do sleep 1; done #sleep until process ends echo "$2 shut down" fi } @@ -39,5 +39,6 @@ if ! screen -ls | grep -q -E "\b[0-9]+\.$SCREEN\b"; then screen -S "$SCREEN" -d -m fi +chmod 755 /run/screen screen -d -r "$SCREEN" -X stuff $"$DIR/start.sh\n" echo "server is started into $SCREEN screen."