From 736834824c52dba0080f912b7855e6afbdcd2c2a Mon Sep 17 00:00:00 2001 From: Brandon Date: Sat, 24 Aug 2019 03:37:50 -0500 Subject: [PATCH] Bump --- root/usr/local/bin/entrypoint.sh | 13 +++++++------ root/usr/local/bin/run.sh | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/root/usr/local/bin/entrypoint.sh b/root/usr/local/bin/entrypoint.sh index f55326b..ccd5eff 100644 --- a/root/usr/local/bin/entrypoint.sh +++ b/root/usr/local/bin/entrypoint.sh @@ -2,28 +2,29 @@ set -euo pipefail -if [ ! -r /data/.config/mopidy.conf ]; then +if [ ! -r /data/.config ]; then mkdir -p /data/.config +fi + +if [ ! -r /data/.config/mopidy.conf ]; then cp /defaults/mopidy.conf /data/.config fi if [ ! -r /data/.config/icecast.xml ]; then - mkdir -p /data/.config cp /defaults/icecast.xml /data/.config fi -if [ ! -r /data/icecast ]; then - mkdir -p /data/icecast/web /data/icecast/logs /data/icecast/admin +if [ ! -r /data/icecast/web ] || [ ! -r /data/icecast/admin ]; then + mkdir -p /data/icecast/web /data/icecast/admin /data/icecast/logs cp -r /usr/share/icecast /data/icecast cp /defaults/silence.mp3 /data/icecast/web/silence.mp3 fi if [ ! -r /tmp/snapfifo ]; then touch /tmp/snapfifo - chown mopidy:mopidy /tmp/snapfifo fi -chown -R mopidy:mopidy /data +chown -R mopidy:mopidy /data /tmp/snapfifo su-exec mopidy mopidy --config /data/.config/mopidy.conf local scan exec "${@}" diff --git a/root/usr/local/bin/run.sh b/root/usr/local/bin/run.sh index 5497285..9c0156c 100755 --- a/root/usr/local/bin/run.sh +++ b/root/usr/local/bin/run.sh @@ -1,7 +1,7 @@ #!/bin/sh trap "kill $PID" HUP INT TERM -su-exec mopidy snapserver -s pipe:///tmp/snapfifo?name=Mopidy&sampleformat=48000:16:2 -d & +su-exec mopidy snapserver -d -s pipe:///tmp/snapfifo?name=Mopidy&sampleformat=48000:16:2 & su-exec mopidy icecast -c /data/.config/icecast.xml -b & su-exec mopidy mopidy --config /data/.config/mopidy.conf "${@}" & PID=$!