From: Charles <charlesthomasomer@gmail.com>
Date: Mon, 22 Sep 2025 23:04:42 +0000 (+0100)
Subject: Fixes and info improvements
X-Git-Tag: 5.0-post-dev~78^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0137b87a8ff2b6986cd00208fd239127cecc0a4;p=thirdparty%2Fshairport-sync.git

Fixes and info improvements
---

diff --git a/docker/classic/run.sh b/docker/classic/run.sh
index 2d562bdb..81a15ef2 100755
--- a/docker/classic/run.sh
+++ b/docker/classic/run.sh
@@ -3,18 +3,21 @@
 # exist if any command returns a non-zero result
 set -e
 
+echo "Shairport Sync Startup ($(date))"
+
 if [ -z ${ENABLE_AVAHI+x} ] || [ $ENABLE_AVAHI -eq 0 ]; then
   rm -rf /run/dbus/dbus.pid
   rm -rf /run/avahi-daemon/pid
 
-dbus-uuidgen --ensure
-dbus-daemon --system
+  dbus-uuidgen --ensure
+  dbus-daemon --system
+fi
 
 [ -z ${ENABLE_AVAHI+x} ] || [ $ENABLE_AVAHI -eq 0 ] || avahi-daemon --daemonize --no-chroot
 
 while [ ! -f /var/run/avahi-daemon/pid ]; do
-  echo "Warning: avahi is not running, sleeping for 1 second before trying to start shairport-sync"
-  sleep 1
+  echo "Warning: avahi is not running, sleeping for 5 seconds before trying to start shairport-sync"
+  sleep 5
 done
 
 # for PipeWire
@@ -24,4 +27,6 @@ export XDG_RUNTIME_DIR=/tmp
 export PULSE_SERVER=unix:/tmp/pulseaudio.socket
 export PULSE_COOKIE=/tmp/pulseaudio.cookie
 
+echo "Finished startup tasks ($(date)), starting Shairport Sync."
+
 exec /usr/local/bin/shairport-sync "$@"
diff --git a/docker/run.sh b/docker/run.sh
index 3b656e9b..be53cb73 100755
--- a/docker/run.sh
+++ b/docker/run.sh
@@ -3,6 +3,8 @@
 # exist if any command returns a non-zero result
 set -e
 
+echo "Shairport Sync Startup ($(date))"
+
 if [ -z ${ENABLE_AVAHI+x} ] || [ $ENABLE_AVAHI -eq 0 ]; then
   rm -rf /run/dbus/dbus.pid
   rm -rf /run/avahi-daemon/pid
@@ -11,13 +13,15 @@ if [ -z ${ENABLE_AVAHI+x} ] || [ $ENABLE_AVAHI -eq 0 ]; then
   dbus-daemon --system
 fi
 
+echo "Starting NQPTP ($(date))"
+
 (/usr/local/bin/nqptp > /dev/null 2>&1) &
 
 [ -z ${ENABLE_AVAHI+x} ] || [ $ENABLE_AVAHI -eq 0 ] || avahi-daemon --daemonize --no-chroot
 
 while [ ! -f /var/run/avahi-daemon/pid ]; do
-  echo "Warning: avahi is not running, sleeping for 1 second before trying to start shairport-sync"
-  sleep 1
+  echo "Warning: avahi is not running, sleeping for 5 seconds before trying to start shairport-sync"
+  sleep 5
 done
 
 # for PipeWire
@@ -27,4 +31,6 @@ export XDG_RUNTIME_DIR=/tmp
 export PULSE_SERVER=unix:/tmp/pulseaudio.socket
 export PULSE_COOKIE=/tmp/pulseaudio.cookie
 
+echo "Finished startup tasks ($(date)), starting Shairport Sync."
+
 exec /usr/local/bin/shairport-sync "$@"