From efb72e57c1d6036a6b47bc1189e3907ec55a3f03 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Sat, 5 Oct 2024 10:06:12 +0200
Subject: [PATCH] Leaner code

---
 .../etc/cont-init.d/81-modifications.sh       | 85 +++++++++++--------
 1 file changed, 49 insertions(+), 36 deletions(-)

diff --git a/birdnet-pi/rootfs/etc/cont-init.d/81-modifications.sh b/birdnet-pi/rootfs/etc/cont-init.d/81-modifications.sh
index 0b8372cfc..ffe2fe8ab 100755
--- a/birdnet-pi/rootfs/etc/cont-init.d/81-modifications.sh
+++ b/birdnet-pi/rootfs/etc/cont-init.d/81-modifications.sh
@@ -6,61 +6,74 @@ set -e
 # MODIFY WEBUI #
 ################
 
-echo " "
 bashio::log.info "Adapting webui"
 
-# Remove services tab
+# Remove services tab from webui
 echo "... removing System Controls from webui as should be used from HA"
-sed -i '/>System Controls/d' "$HOME"/BirdNET-Pi/homepage/views.php
+sed -i '/>System Controls/d' "$HOME/BirdNET-Pi/homepage/views.php"
 
-# Remove services tab
+# Remove Ram drive option from webui
 echo "... removing Ram drive from webui as it is handled from HA"
-sed -i '/Ram drive/{n;s/center"/center" style="display: none;"/;}' "$HOME"/BirdNET-Pi/scripts/service_controls.php
-sed -i '/Ram drive/d' "$HOME"/BirdNET-Pi/scripts/service_controls.php
+sed -i '/Ram drive/{n;s/center"/center" style="display: none;"/;}' "$HOME/BirdNET-Pi/scripts/service_controls.php"
+sed -i '/Ram drive/d' "$HOME/BirdNET-Pi/scripts/service_controls.php"
 
 # Correct services to start as user pi
-echo "... correct services to start as pi"
-for file in $(find "$HOME"/BirdNET-Pi/templates/birdnet*.service -print0 | xargs -0 basename -a) livestream.service chart_viewer.service chart_viewer.service spectrogram_viewer.service; do
-    if [[ "$file" != "birdnet_log.service" ]]; then
-        sed -i "s|ExecStart=|ExecStart=/usr/bin/sudo -u pi |g" "$HOME/BirdNET-Pi/templates/$file"
+echo "... updating services to start as user pi"
+while IFS= read -r file; do
+    if [[ "$(basename "$file")" != "birdnet_log.service" ]]; then
+        sed -i "s|ExecStart=|ExecStart=/usr/bin/sudo -u pi |g" "$file"
     fi
-done
+done < <(find "$HOME/BirdNET-Pi/templates/" -name "birdnet*.service" -print) 
 
 # Send services log to container logs
-echo "... send services log to container logs"
-for file in $(find "$HOME"/BirdNET-Pi/templates/birdnet*.service -print0 | xargs -0 basename -a) livestream.service chart_viewer.service chart_viewer.service spectrogram_viewer.service; do
-    sed -i "/Service/a StandardError=append:/proc/1/fd/1" "$HOME/BirdNET-Pi/templates/$file"
-    sed -i "/Service/a StandardOutput=append:/proc/1/fd/1" "$HOME/BirdNET-Pi/templates/$file"
-done
+echo "... redirecting services logs to container logs"
+while IFS= read -r file; do
+    sed -i "/Service/a StandardError=append:/proc/1/fd/1" "$file"
+    sed -i "/Service/a StandardOutput=append:/proc/1/fd/1" "$file"
+done < <(find "$HOME/BirdNET-Pi/templates/" -name "birdnet*.service" -print) 
 
 # Avoid preselection in include and exclude lists
-echo "... avoid preselecting options in include and exclude lists"
-sed -i "s|option selected|option disabled|g" "$HOME"/BirdNET-Pi/scripts/include_list.php
-sed -i "s|option selected|option disabled|g" "$HOME"/BirdNET-Pi/scripts/exclude_list.php
+echo "... disabling preselecting options in include and exclude lists"
+sed -i "s|option selected|option disabled|g" "$HOME/BirdNET-Pi/scripts/include_list.php"
+sed -i "s|option selected|option disabled|g" "$HOME/BirdNET-Pi/scripts/exclude_list.php"
 
 # Correct log services to show /proc/1/fd/1
-echo "... show container logs in /logs"
+echo "... redirecting birdnet_log service output to /logs"
 sed -i "/User=pi/d" "$HOME/BirdNET-Pi/templates/birdnet_log.service"
 sed -i "s|birdnet_log.sh|cat /proc/1/fd/1|g" "$HOME/BirdNET-Pi/templates/birdnet_log.service"
 
-# Make sure config is correctly formatted.
-echo "... caddyfile modifications"
-#Correct instructions
+# Caddyfile modifications
+echo "... modifying Caddyfile configurations"
 caddy fmt --overwrite /etc/caddy/Caddyfile
 #Change port to leave 80 free for certificate requests
 sed -i "s|http://|http://:8081|g" /etc/caddy/Caddyfile
-sed -i "s|http://|http://:8081|g" "$HOME"/BirdNET-Pi/scripts/update_caddyfile.sh
-#Remove default file that blocks 80
-if [ -f /etc/caddy/Caddyfile.original ]; then rm /etc/caddy/Caddyfile.original; fi
-
-# Improve webui paths to facilitate ingress
-echo "... correcting webui paths"
-sed -i "s|/stats|/stats/|g" "$HOME"/BirdNET-Pi/homepage/views.php
-sed -i "s|/log|/log/|g" "$HOME"/BirdNET-Pi/homepage/views.php
-
-# If port 80 is enabled, make sure it is still 80
-if [ -n "$(bashio::addon.port 80)" ] && [ "$(bashio::addon.port 80)" != 80 ]; then
-    bashio::log.fatal "The port 80 is enabled, but should still be 80 if you want the automatic ssl certificates generation to work"
+sed -i "s|http://|http://:8081|g" "$HOME/BirdNET-Pi/scripts/update_caddyfile.sh"
+if [ -f /etc/caddy/Caddyfile.original ]; then 
+    rm /etc/caddy/Caddyfile.original
 fi
 
-echo " "
+# Correct webui paths
+echo "... correcting webui paths"
+sed -i "s|/stats|/stats/|g" "$HOME/BirdNET-Pi/homepage/views.php"
+sed -i "s|/log|/log/|g" "$HOME/BirdNET-Pi/homepage/views.php"
+
+# Check if port 80 is correctly configured
+if [ -n "$(bashio::addon.port 80)" ] && [ "$(bashio::addon.port 80)" != 80 ]; then
+    bashio::log.fatal "The port 80 is enabled, but should still be 80 if you want automatic SSL certificates generation to work."
+fi
+
+# Correct systemctl path
+echo "... updating systemctl path"
+mv /helpers/systemctl3.py /bin/systemctl
+chmod a+x /bin/systemctl
+
+# Correct timedatectl path
+echo "updating timedatectl path"
+mv /helpers/timedatectl /usr/bin/timedatectl
+chmod a+x /usr/bin/timedatectl
+
+# Correct language labels according to birdnet.conf
+echo "... adapting labels according to birdnet.conf"
+export "$(grep "^DATABASE_LANG" /config/birdnet.conf)" || bashio::log.warning "DATABASE_LANG not found in configuration. Using default labels."
+bashio::log.info "Setting language to $DATABASE_LANG"
+"$HOME/BirdNET-Pi/scripts/install_language_label_nm.sh" -l "$DATABASE_LANG" &>/dev/null || bashio::log.warning "Failed to update language labels"