convert to s6 services

zzz_draft_birdnet-pi/Dockerfile

@@ -27,7 +27,7 @@ ENV DEBIAN_FRONTEND="noninteractive" \
 
 # hadolint ignore=DL3015
 RUN \
-    # Install dependencies 
+    # Install dependencies
     apt-get update -y && apt-get install gcc python3-dev git jq sudo -y && \
     \
     # Ensure permissions
@@ -50,9 +50,11 @@ RUN \
     sed -i '1a for file in $(grep -srl "sudo" $HOME/BirdNET-Pi/scripts); do sed -i "s|sudo ||" "$file"; done' /newinstaller.sh && \
     sed -i '1a for file in $(grep -srl "my_dir" $HOME/BirdNET-Pi/scripts); do sed -i "s|\$my_dir|/config|" "$file"; done' /newinstaller.sh && \
     sed -i '1a for file in $(grep -srl "install_services.sh" $HOME/BirdNET-Pi/scripts); do sed -i "/install_services.sh/c ./install_services.sh" "$file"; done' /newinstaller.sh && \
+    # Avoid systemctl
+    sed -i '/git clone/a sed -i "s|systemctl enable|#systemctl enable|g" $HOME/BirdNET-Pi/scripts/install_services.sh' /newinstaller.sh && \
     \
     /./newinstaller.sh && \
-    
+
     \
     # Adapt for lsio
     if [ -d /app ]; then rm -r /app; fi && \
@@ -72,7 +74,7 @@ RUN \
 #USER root
     #sudo -E -u birdnet -s /bin/bash -c "/newinstaller.sh"
     # Correct script
-    #sed -i "s|== 0|== 7|g" /newinstaller.sh && \ 
+    #sed -i "s|== 0|== 7|g" /newinstaller.sh && \
     #sed -i "s|sudo -n true|true|g" /newinstaller.sh && \
     #sed -i "s|sudo -K|true|g" /newinstaller.sh && \
     #for file in $(grep -srl "sudo" $HOME/BirdNET-Pi/scripts); do \sed -i "s|sudo ||" "$file"; done && \

zzz_draft_birdnet-pi/config.json

@@ -90,5 +90,5 @@
   },
   "slug": "birdnet-pi",
   "url": "https://github.com/alexbelgium/hassio-addons/tree/master/birdnet-pi",
-  "version": "0.7"
+  "version": "0.8"
 }

zzz_draft_birdnet-pi/rootfs/etc/disabled_service/svc-custom_recording/finish

@@ -0,0 +1,4 @@
+#!/bin/execlineb -P
+
+if { sleep 3 }
+s6-svc -u /etc/s6-overlay/s6-rc.d/svc-custom_recording

zzz_draft_birdnet-pi/rootfs/etc/disabled_service/svc-custom_recording/run

@@ -0,0 +1,5 @@
+#!/bin/execlineb -P
+with-contenv
+s6-envdir /run/user/1000
+s6-setuidgid ${USER}
+/usr/local/bin/custom_recording.sh

zzz_draft_birdnet-pi/rootfs/etc/disabled_service/svc-custom_recording/type

@@ -0,0 +1 @@
+longrun

zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-avahi-alias/finish

@@ -0,0 +1,4 @@
+#!/bin/execlineb -P
+
+if { sleep 3 }
+s6-svc -u /etc/s6-overlay/s6-rc.d/svc-avahi_alias

zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-avahi-alias/run

@@ -0,0 +1,4 @@
+#!/bin/execlineb -P
+with-contenv
+s6-setuidgid ${USER}
+/bin/bash -c "/usr/bin/avahi-publish -a -R %I $(hostname -I |cut -d' ' -f1)"

zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-avahi-alias/type

@@ -0,0 +1 @@
+longrun

zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_analysis/finish

@@ -0,0 +1,4 @@
+#!/bin/execlineb -P
+
+if { sleep 3 }
+s6-svc -u /etc/s6-overlay/s6-rc.d/svc-birdnet_analysis

zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_analysis/run

@@ -0,0 +1,4 @@
+#!/bin/execlineb -P
+with-contenv
+s6-setuidgid ${USER}
+$PYTHON_VIRTUAL_ENV /usr/local/bin/birdnet_analysis.py

zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_analysis/type

@@ -0,0 +1 @@
+longrun

zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_log/finish

@@ -0,0 +1,4 @@
+#!/bin/execlineb -P
+
+if { sleep 3 }
+s6-svc -u /etc/s6-overlay/s6-rc.d/svc-birdnet_log

zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_log/run

@@ -0,0 +1,8 @@
+#!/bin/execlineb -P
+with-contenv
+s6-envdir /run/user/1000
+s6-setuidgid ${USER}
+/usr/local/bin/gotty --address localhost -p 8080 --path log --title-format "BirdNET-Pi Log" birdnet_log.sh
+
+#!/bin/sh
+exec /usr/local/bin/gotty --address localhost -p 8080 --path log --title-format "BirdNET-Pi Log" birdnet_log.sh

zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_log/type

@@ -0,0 +1 @@
+longrun

zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_recording/finish

@@ -0,0 +1,4 @@
+#!/bin/execlineb -P
+
+if { sleep 6 }
+s6-svc -u /etc/s6-overlay/s6-rc.d/svc-birdnet_recording

zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_recording/run

@@ -0,0 +1,5 @@
+#!/bin/execlineb -P
+with-contenv
+s6-envdir /run/user/1000
+s6-setuidgid ${USER}
+/usr/local/bin/birdnet_recording.sh

zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_recording/type

@@ -0,0 +1 @@
+longrun

zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_stats/finish

@@ -0,0 +1,4 @@
+#!/bin/execlineb -P
+
+if { sleep 5 }
+s6-svc -u /etc/s6-overlay/s6-rc.d/svc-birdnet_stats

zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_stats/run

@@ -0,0 +1,4 @@
+#!/bin/execlineb -P
+with-contenv
+s6-setuidgid ${USER}
+$HOME/BirdNET-Pi/birdnet/bin/streamlit run $HOME/BirdNET-Pi/scripts/plotly_streamlit.py --browser.gatherUsageStats false --server.address localhost --server.baseUrlPath "/stats"

zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_stats/type

@@ -0,0 +1 @@
+longrun

zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-caddy/finish

@@ -0,0 +1,4 @@
+#!/bin/execlineb -P
+
+if { sleep 3 }
+s6-svc -u /etc/s6-overlay/s6-rc.d/svc-caddy

zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-caddy/run

@@ -0,0 +1,4 @@
+#!/bin/execlineb -P
+with-contenv
+s6-setuidgid ${USER}
+/usr/local/bin/caddy run --config /etc/caddy/Caddyfile

zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-caddy/type

@@ -0,0 +1 @@
+longrun

zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-chart_viewer/finish

@@ -0,0 +1,4 @@
+#!/bin/execlineb -P
+
+if { sleep 120 }
+s6-svc -u /etc/s6-overlay/s6-rc.d/svc-chart_viewer

zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-chart_viewer/run

@@ -0,0 +1,4 @@
+#!/bin/execlineb -P
+with-contenv
+s6-setuidgid ${USER}
+$PYTHON_VIRTUAL_ENV /usr/local/bin/daily_plot.py --daemon --sleep 2

zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-chart_viewer/type

@@ -0,0 +1 @@
+longrun

zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-getty/finish

@@ -0,0 +1,4 @@
+#!/bin/execlineb -P
+
+if { sleep 3 }
+s6-svc -u /etc/s6-overlay/s6-rc.d/svc-getty

zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-getty/run

@@ -0,0 +1,5 @@
+#!/bin/execlineb -P
+
+with-contenv
+s6-setuidgid ${USER}
+/sbin/agetty --autologin ${USER} --noclear %I \$TERM

zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-getty/type

@@ -0,0 +1 @@
+longrun

zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-livestream/finish

@@ -0,0 +1,4 @@
+#!/bin/execlineb -P
+
+if { sleep 3 }
+s6-svc -u /etc/s6-overlay/s6-rc.d/svc-livestream

zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-livestream/run

@@ -0,0 +1,4 @@
+#!/bin/execlineb -P
+with-contenv
+s6-envdir /run/user/1000
+/usr/local/bin/livestream.sh

zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-livestream/type

@@ -0,0 +1 @@
+longrun

zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-spectrogram_viewer/finish

@@ -0,0 +1,4 @@
+#!/bin/execlineb -P
+
+if { sleep 10 }
+s6-svc -u /etc/s6-overlay/s6-rc.d/svc-spectrogram_viewer

zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-spectrogram_viewer/run

@@ -0,0 +1,4 @@
+#!/bin/execlineb -P
+with-contenv
+s6-setuidgid ${USER}
+/usr/local/bin/spectrogram.sh

zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-spectrogram_viewer/type

@@ -0,0 +1 @@
+longrun

zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-web_terminal/finish

@@ -0,0 +1,4 @@
+#!/bin/execlineb -P
+
+if { sleep 3 }
+s6-svc -u /etc/s6-overlay/s6-rc.d/svc-web_terminal

zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-web_terminal/run

@@ -0,0 +1,4 @@
+#!/bin/execlineb -P
+with-contenv
+s6-envdir /run/user/1000
+/usr/local/bin/gotty --address localhost -w -p 8888 --path terminal --title-format "BirdNET-Pi Terminal" login

zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-web_terminal/type

@@ -0,0 +1 @@
+longrun