From 2d2cd148127668b4a1f5a9cc1aedff2c2db7c844 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Sat, 12 Feb 2022 19:45:53 +0000 Subject: [PATCH] Formatting --- root/etc/cont-init.d/30-dbus | 4 ++-- root/etc/cont-init.d/40-config | 36 +++++++++++++++++----------------- root/etc/services.d/avahi/run | 2 +- root/etc/services.d/dbus/run | 2 +- root/etc/services.d/forked/run | 4 ++-- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/root/etc/cont-init.d/30-dbus b/root/etc/cont-init.d/30-dbus index 7717944..acb99d2 100644 --- a/root/etc/cont-init.d/30-dbus +++ b/root/etc/cont-init.d/30-dbus @@ -2,11 +2,11 @@ # make our folders mkdir -p \ - /var/run/dbus + /var/run/dbus [[ -e /var/run/dbus.pid ]] && \ - rm -f /var/run/dbus.pid + rm -f /var/run/dbus.pid dbus-uuidgen --ensure sleep 1 diff --git a/root/etc/cont-init.d/40-config b/root/etc/cont-init.d/40-config index d566fd8..35e2c69 100644 --- a/root/etc/cont-init.d/40-config +++ b/root/etc/cont-init.d/40-config @@ -2,36 +2,36 @@ # make folders mkdir -p \ - /config/dbase_and_logs \ - /daapd-pidfolder + /config/dbase_and_logs \ + /daapd-pidfolder # configure defaults copy of conf if [ ! -e "/defaults/owntone.conf" ]; then cp /etc/owntone.conf.orig /defaults/owntone.conf sed -i \ - -e '/cache_path\ =/ s/# *//' \ - -e '/db_path\ =/ s/# *//' \ - -e s#ipv6\ =\ yes#ipv6\ =\ no#g \ - -e s#My\ Music\ on\ %h#LS.IO\ Music#g \ - -e s#/srv/music#/music#g \ - -e 's/\(uid.*=\).*/\1 \"abc\"/g' \ - -e s#/var/cache/owntone/cache.db#/config/dbase_and_logs/cache.db#g \ - -e s#/var/cache/owntone/songs3.db#/config/dbase_and_logs/songs3.db#g \ - -e s#/var/log/owntone.log#/config/dbase_and_logs/owntone.log#g \ - /defaults/owntone.conf + -e '/cache_path\ =/ s/# *//' \ + -e '/db_path\ =/ s/# *//' \ + -e s#ipv6\ =\ yes#ipv6\ =\ no#g \ + -e s#My\ Music\ on\ %h#LS.IO\ Music#g \ + -e s#/srv/music#/music#g \ + -e 's/\(uid.*=\).*/\1 \"abc\"/g' \ + -e s#/var/cache/owntone/cache.db#/config/dbase_and_logs/cache.db#g \ + -e s#/var/cache/owntone/songs3.db#/config/dbase_and_logs/songs3.db#g \ + -e s#/var/log/owntone.log#/config/dbase_and_logs/owntone.log#g \ + /defaults/owntone.conf fi # symlink conf to /conf [[ ! -f /config/owntone.conf ]] && \ - cp /defaults/owntone.conf /config/owntone.conf + cp /defaults/owntone.conf /config/owntone.conf [[ ! -L /etc/owntone.conf && -f /etc/owntone.conf ]] && \ - rm /etc/owntone.conf + rm /etc/owntone.conf [[ ! -L /etc/owntone.conf ]] && \ - ln -s /config/owntone.conf /etc/owntone.conf + ln -s /config/owntone.conf /etc/owntone.conf # permissions chown -R abc:abc \ - /app \ - /config \ - /daapd-pidfolder + /app \ + /config \ + /daapd-pidfolder diff --git a/root/etc/services.d/avahi/run b/root/etc/services.d/avahi/run index ea59603..926d36d 100644 --- a/root/etc/services.d/avahi/run +++ b/root/etc/services.d/avahi/run @@ -5,4 +5,4 @@ sleep 1s done exec \ - avahi-daemon --no-chroot + avahi-daemon --no-chroot diff --git a/root/etc/services.d/dbus/run b/root/etc/services.d/dbus/run index 5027a82..9ddc7e1 100644 --- a/root/etc/services.d/dbus/run +++ b/root/etc/services.d/dbus/run @@ -1,6 +1,6 @@ #!/usr/bin/with-contenv bash exec \ - dbus-daemon --system --nofork + dbus-daemon --system --nofork diff --git a/root/etc/services.d/forked/run b/root/etc/services.d/forked/run index 1cf3852..e2b1dfb 100644 --- a/root/etc/services.d/forked/run +++ b/root/etc/services.d/forked/run @@ -1,5 +1,5 @@ #!/usr/bin/with-contenv bash exec \ - s6-setuidgid abc /usr/sbin/owntone -f \ - -P /daapd-pidfolder/owntone.pid + s6-setuidgid abc /usr/sbin/owntone -f \ + -P /daapd-pidfolder/owntone.pid