Merge pull request #249 from linuxserver/master-ffmpeg

Check ffmepg path, use proper health endpoint
linuxserver · May 18, 2024 · 1488417 · 1488417
2 parents bdc4079 + 1c26852
commit 1488417
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-jellyfin/data/check b/root/etc/s6-overlay/s6-rc.d/svc-jellyfin/data/check
@@ -1,6 +1,8 @@
 #!/bin/bash
 
-PORT=$(xmlstarlet sel -T -t -v /NetworkConfiguration/HttpServerPortNumber /config/network.xml)
+if [[ -f "/config/network.xml" ]]; then
+    PORT=$(xmlstarlet sel -T -t -v /NetworkConfiguration/HttpServerPortNumber /config/network.xml)
+fi
 
 if [[ $(curl -sL "http://localhost:${PORT:-8096}/health" 2>/dev/null) = "Healthy" ]]; then
     exit 0

diff --git a/root/etc/s6-overlay/s6-rc.d/svc-jellyfin/run b/root/etc/s6-overlay/s6-rc.d/svc-jellyfin/run
@@ -1,6 +1,10 @@
 #!/usr/bin/with-contenv bash
 # shellcheck shell=bash
 
+if [[ -z "${FFMPEG_PATH}" ]] || [[ ! -f "${FFMPEG_PATH}" ]]; then
+    FFMPEG_PATH=/usr/lib/jellyfin-ffmpeg/ffmpeg
+fi
+
 export \
     JELLYFIN_DATA_DIR="/config/data" \
     JELLYFIN_CONFIG_DIR="/config" \
@@ -11,4 +15,4 @@ export \
 exec \
     s6-notifyoncheck -d -n 300 -w 1000 \
         s6-setuidgid abc /usr/bin/jellyfin \
-        --ffmpeg=/usr/lib/jellyfin-ffmpeg/ffmpeg
+        --ffmpeg="${FFMPEG_PATH}"