testing

entrypoint.sh

@@ -1,8 +1,5 @@
 #!/bin/bash
-set -eu
+set -eux
-
-# Polling interval
-SLEEP_INTERVAL=${SLEEP_INTERVAL:-2}
 
 # GID/UID
 USER_ID=${GUID:-1000}
@@ -23,18 +20,19 @@ if [ ! -e /home/rtorrent/.rtorrent.rc ]; then
     chown rtorrent:rtorrent /home/rtorrent/.rtorrent.rc
 fi
 
+# Trap for graceful shutdown
+trap 'su - rtorrent -c "screen -S rtorrent -X stuff \"^Q\015\""; wait $SCREEN_PID' SIGTERM
+
 # Start rtorrent in a detached screen session
 su - rtorrent -c "screen -dmS rtorrent rtorrent" &
 
 # Wait for the su process to finish
 wait $!
 
-# Find rtorrent PID and monitor it
+# Find screen PID and monitor it
-RTORRENT_PID="$(pgrep -f "^rtorrent$")"
+SCREEN_PID=$(pgrep -f "SCREEN -dmS rtorrent")
 
-# Trap for graceful shutdown
+# Keep the script running until the screen session ends
-trap 'su - rtorrent -c "kill -15 $RTORRENT_PID"' SIGTERM SIGINT
+tail --pid="$SCREEN_PID" -f /dev/null
 
-# Wait for PID
-while kill -0 "$RTORRENT_PID" 2>/dev/null; do sleep "$SLEEP_INTERVAL"; done
 exit 0