aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUruk <uruknarb20@gmail.com>2024-02-23 18:39:40 +0100
committerUruk <uruknarb20@gmail.com>2024-02-23 18:39:40 +0100
commit32002b2ed79d9461e83460d18fc422d83f2f7742 (patch)
tree4e38113afed2d057ee1d9140d77fee9d44ce1000
parentApply suggestions (diff)
downloadjellyfin-packaging-32002b2ed79d9461e83460d18fc422d83f2f7742.tar.gz
jellyfin-packaging-32002b2ed79d9461e83460d18fc422d83f2f7742.tar.bz2
jellyfin-packaging-32002b2ed79d9461e83460d18fc422d83f2f7742.zip
Apply suggestions
-rw-r--r--debian/conf/jellyfin.init5
-rw-r--r--docker/Dockerfile6
2 files changed, 5 insertions, 6 deletions
diff --git a/debian/conf/jellyfin.init b/debian/conf/jellyfin.init
index 92864a9..02c15ad 100644
--- a/debian/conf/jellyfin.init
+++ b/debian/conf/jellyfin.init
@@ -19,14 +19,13 @@ fi
. /lib/lsb/init-functions
-JELLYFIN_HOME="/etc/default/jellyfin"
PIDFILE="/run/jellyfin.pid"
case "$1" in
start)
log_daemon_msg "Starting Jellyfin Media Server" "jellyfin" || true
- if start-stop-daemon --start --quiet --oknodo --background --chdir $JELLYFIN_HOME --pidfile $PIDFILE --make-pidfile --user $JELLYFIN_USER --chuid $JELLYFIN_USER --exec /usr/bin/jellyfin -- $JELLYFIN_ARGS; then
+ if start-stop-daemon --start --quiet --oknodo --background --chdir $JELLYFIN_DATA_DIR --pidfile $PIDFILE --make-pidfile --user $JELLYFIN_USER --chuid $JELLYFIN_USER --exec /usr/bin/jellyfin -- $JELLYFIN_ARGS; then
log_end_msg 0 || true
else
log_end_msg 1 || true
@@ -45,7 +44,7 @@ case "$1" in
restart)
log_daemon_msg "Restarting Jellyfin Media Server" "jellyfin" || true
start-stop-daemon --stop --quiet --oknodo --retry 30 --pidfile $PIDFILE --remove-pidfile
- if start-stop-daemon --start --quiet --oknodo --background --chdir $JELLYFIN_HOME --pidfile $PIDFILE --make-pidfile --user $JELLYFIN_USER --chuid $JELLYFIN_USER --exec /usr/bin/jellyfin -- $JELLYFIN_ARGS; then
+ if start-stop-daemon --start --quiet --oknodo --background --chdir $JELLYFIN_DATA_DIR --pidfile $PIDFILE --make-pidfile --user $JELLYFIN_USER --chuid $JELLYFIN_USER --exec /usr/bin/jellyfin -- $JELLYFIN_ARGS; then
log_end_msg 0 || true
else
log_end_msg 1 || true
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 771ad18..b69015d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -43,13 +43,13 @@ RUN apk add \
make \
libpng-dev \
gifsicle \
- alpine-sdk\
+ alpine-sdk \
automake \
libtool \
gcc \
musl-dev \
nasm \
- python3
+ python3
WORKDIR ${SOURCE_DIR}
COPY jellyfin-web .
@@ -138,7 +138,7 @@ RUN apt-get update \
libfontconfig1 \
libfreetype6 \
&& sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && locale-gen \
- && apt-get remove gnupg apt-transport-https --yes \
+ && apt-get remove gnupg apt-transport-https --yes \
&& apt-get clean autoclean --yes \
&& apt-get autoremove --yes \
&& rm -rf /var/cache/apt/archives* /var/lib/apt/lists/*
bgstack15