fix one-shot init

root/etc/services.d/setup/finish

@@ -1,10 +0,0 @@
-#!/usr/bin/with-contenv sh
-# shellcheck shell=sh
-
-SUPERVISED_DIR=/var/run/s6/services
-
-# hack: this is run-once service
-# stop the s6-supervise process and ensure that its not started again
-s6-svc -x ${SUPERVISED_DIR}/setup
-rm -rf ${SUPERVISED_DIR}/setup
-s6-svscanctl -a ${SUPERVISED_DIR}

root/etc/services.d/setup/run

@@ -1,6 +1,19 @@
 #!/usr/bin/with-contenv sh
 # shellcheck shell=sh
 
+# One-shot service
+# https://github.com/just-containers/s6-overlay/issues/86
+
+s6-svc -O /var/run/service/setup
+
+echo "
+----------------------------------------------------------------------
+SETUP
+----------------------------------------------------------------------
+AUTOCONFIG=$AUTOCONFIG
+----------------------------------------------------------------------
+"
+
 url="http://localhost:8686"
 urlPlugin="https://github.com/ta264/Lidarr.Plugin.Deemix"
 
@@ -41,6 +54,9 @@ if [ "$(stat -c '%g' /downloads)" != "$PGUID" ]; then
     chown "$PUID:$PGID" /downloads
 fi
 
+if [ "$AUTOCONFIG" != "true" ]; then
+    exit
+fi
 
 echo "
 ----------------------------------------------------------------------
@@ -49,7 +65,6 @@ LIDARR SETUP
 PluginSource=$urlPlugin
 ----------------------------------------------------------------------
 "
-if [ "$AUTOCONFIG" = "true" ]; then
 echo "[autoconfig] Waiting Lidarr to launch on 8686..."
 while ! nc -z localhost 8686; do
     sleep 0.1
@@ -97,7 +112,6 @@ if [ "$AUTOCONFIG" = "true" ]; then
         '{"enable":true,"protocol":"DeemixDownloadProtocol","priority":1,"removeCompletedDownloads":true,"removeFailedDownloads":true,"name":"Deemix","fields":[{"name":"host","value":"localhost"},{"name":"port","value":6595},{"name":"urlBase"},{"name":"useSsl","value":false},{"name":"arl","value":"'"$arl"'"}],"implementationName":"Deemix","implementation":"Deemix","configContract":"DeemixSettings","infoLink":"https://wiki.servarr.com/lidarr/supported#deemix","tags":[]}'
 fi
 echo "[autoconfig] Configuration is up to date"
-fi
 
 echo "
 ----------------------------------------------------------------------
@@ -109,7 +123,6 @@ FLAC2CUSTOM_ARGS=$FLAC2CUSTOM_ARGS
 ----------------------------------------------------------------------
 "
 
-if [ "$AUTOCONFIG" = "true" ]; then
 if [ -n "$FLAC2CUSTOM_ARGS" ]; then
     echo "[autoconfig] FLAC2CUSTOM_ARGS is set"
     if ! isPresent "flac2" "notification"; then
@@ -117,19 +130,20 @@ if [ "$AUTOCONFIG" = "true" ]; then
         apiCall "POST" "notification" '{"onGrab":false,"onReleaseImport":true,"onUpgrade":true,"onRename":false,"onHealthIssue":false,"onDownloadFailure":false,"onImportFailure":false,"onTrackRetag":false,"onApplicationUpdate":false,"supportsOnGrab":true,"supportsOnReleaseImport":true,"supportsOnUpgrade":true,"supportsOnRename":true,"supportsOnHealthIssue":true,"includeHealthWarnings":false,"supportsOnDownloadFailure":false,"supportsOnImportFailure":false,"supportsOnTrackRetag":true,"supportsOnApplicationUpdate":true,"name":"Flac2Custom","fields":[{"name":"path","value":"/usr/local/bin/flac2custom.sh"},{"name":"arguments"}],"implementationName":"Custom Script","implementation":"CustomScript","configContract":"CustomScriptSettings","infoLink":"","message":{"message":"","type":"warning"},"tags":[]}'
     fi
 fi
-fi
 
 echo "
 ----------------------------------------------------------------------
 Utilities SETUP
 ----------------------------------------------------------------------
-AUTOCONFIG=$AUTOCONFIG
-----------------------------------------------------------------------
 "
 
-if [ "$AUTOCONFIG" = "true" ]; then
 if ! isPresent "Clean Downloads" "notification"; then
     echo "[autoconfig] Configuring flac2custom.sh custom script"
     apiCall "POST" "notification" '{"onGrab":false,"onReleaseImport":true,"onUpgrade":true,"onRename":false,"onHealthIssue":false,"onDownloadFailure":false,"onImportFailure":false,"onTrackRetag":false,"onApplicationUpdate":false,"supportsOnGrab":true,"supportsOnReleaseImport":true,"supportsOnUpgrade":true,"supportsOnRename":true,"supportsOnHealthIssue":true,"includeHealthWarnings":false,"supportsOnDownloadFailure":false,"supportsOnImportFailure":false,"supportsOnTrackRetag":true,"supportsOnApplicationUpdate":true,"name":"Clean Downloads","fields":[{"name":"path","value":"/usr/local/bin/clean-downloads.sh"},{"name":"arguments"}],"implementationName":"Custom Script","implementation":"CustomScript","configContract":"CustomScriptSettings","infoLink":"","message":{"message":"","type":"warning"},"tags":[]}'
 fi
-fi
+
+echo "
+----------------------------------------------------------------------
+AUTOCONFIG COMPLETE
+----------------------------------------------------------------------
+"