more useful run wrapper

.github/workflows/server.yml

@@ -202,7 +202,7 @@ jobs:
         run: cp -r ./webui-dist-downloaded "run-wrapper-out/app/Webui"
 
       - name: Copy run wrapper
-        run: cp -r ./run-wrapper/run.sh "run-wrapper-out/app/"
+        run: cp -r ./run-wrapper/* "run-wrapper-out/app/"
 
       - uses: actions/upload-artifact@v3
         with:

run-wrapper/run.sh

@@ -2,7 +2,16 @@
 
 SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
 
-exec java \
+PIDFILE="$SCRIPT_DIR"/.pid
+
+if [ -f "$PIDFILE" ]; then
+    if kill -0 $(cat "$PIDFILE") >/dev/null; then
+        echo "Already running: "$(cat "$PIDFILE")
+        exit 2
+    fi
+fi
+
+java \
     -Xmx256M -Ddhfs.objects.writeback.limit=134217728 \
     --add-exports java.base/sun.nio.ch=ALL-UNNAMED \
     -Ddhfs.objects.persistence.files.root="$SCRIPT_DIR"/../data/objects \
@@ -10,4 +19,10 @@ exec java \
     -Ddhfs.fuse.root="$SCRIPT_DIR"/../fuse \
     -Dquarkus.http.host=0.0.0.0 \
     -Ddhfs.webui.root="$SCRIPT_DIR"/Webui \
-    -jar "$SCRIPT_DIR"/"DHFS Package"/quarkus-run.jar
+    -jar "$SCRIPT_DIR"/"DHFS Package"/quarkus-run.jar >quarkus.log 2>&1 &
+
+echo "Started $!"
+
+echo $! >"$PIDFILE"
+
+disown

run-wrapper/stop.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
+
+PIDFILE="$SCRIPT_DIR"/.pid
+
+if [ ! -f "$PIDFILE" ]; then
+    echo "Not running"
+    exit 2
+fi
+
+if ! kill -0 $(cat "$PIDFILE") >/dev/null; then
+    echo "Not running"
+    rm .pid
+    exit 2
+fi
+
+PID=$(cat "$PIDFILE")
+
+echo "Killing $PID"
+kill "$PID"
+
+rm .pid