From 0625e2db4f4bee3d522547752832ae1617f071b8 Mon Sep 17 00:00:00 2001
From: Alexandre <alexandre.pary@gmail.com>
Date: Sun, 28 Apr 2024 17:26:01 +0200
Subject: [PATCH] update

---
 birdnet-pi/Dockerfile                       | 12 +++++++++++-
 birdnet-pi/config.json                      |  2 +-
 birdnet-pi/rootfs/etc/cont-init.d/99-run.sh |  7 +++++--
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/birdnet-pi/Dockerfile b/birdnet-pi/Dockerfile
index e088c9da6..9ce0970d1 100644
--- a/birdnet-pi/Dockerfile
+++ b/birdnet-pi/Dockerfile
@@ -95,7 +95,17 @@ RUN \
     \
     # Cleanup
     apt-get clean all && \
-    rm -rf /var/lib/apt/lists/*
+    rm -rf /var/lib/apt/lists/* && \
+    \
+    # Change files
+    ##############
+    # Correct birds.db location to avoid symlinks
+    for location in '$HOME/BirdNET-Pi/scripts/birds.db' '~/BirdNET-Pi/scripts/birds.db' './scripts/birds.db' "userDir + '/BirdNET-Pi/scripts/birds.db'" '$home."/BirdNET-Pi/scripts/birds.db"'; do \
+    for files in $HOME/BirdNET-Pi/scripts/*.*; do sed -i "s|$location|/config/birds.db|g" "$files"; done; done && \
+    \
+    # Correct birdnet.conf location to avoid symlinks
+    for location in '/etc/birdnet/birdnet.conf' '$my_dir/birdnet.conf'; do \
+    for files in $HOME/BirdNET-Pi/scripts/*.*; do sed -i "s|$location|/config/birdnet.conf|g" "$files"; done; done
 
 ##################
 # 2 Modify Image #
diff --git a/birdnet-pi/config.json b/birdnet-pi/config.json
index de2411824..13ad02baa 100644
--- a/birdnet-pi/config.json
+++ b/birdnet-pi/config.json
@@ -95,7 +95,7 @@
   "udev": true,
   "url": "https://github.com/alexbelgium/hassio-addons/tree/master/birdnet-pi",
   "usb": true,
-  "version": "0.13-11",
+  "version": "0.13-12",
   "video": true,
   "webui": "http://[HOST]:[PORT:80]"
 }
diff --git a/birdnet-pi/rootfs/etc/cont-init.d/99-run.sh b/birdnet-pi/rootfs/etc/cont-init.d/99-run.sh
index 89cd4c0f0..5320d51d8 100755
--- a/birdnet-pi/rootfs/etc/cont-init.d/99-run.sh
+++ b/birdnet-pi/rootfs/etc/cont-init.d/99-run.sh
@@ -41,7 +41,7 @@ sudo -u pi ln -fs /tmp/StreamData "$HOME"/BirdSongs/StreamData
 
 # Permissions
 echo "... set permissions to user pi"
-chown -R 1000:1000 /config /etc/birdnet "$BIRDSONGS_FOLDER" /tmp
+chown -R pi:pi /config /etc/birdnet "$BIRDSONGS_FOLDER" /tmp
 
 # Symlink files
 for files in "$HOME/BirdNET-Pi/birdnet.conf" "$HOME/BirdNET-Pi/scripts/birds.db" "$HOME/BirdNET-Pi/apprise.txt" "$HOME/BirdNET-Pi/exclude_species_list.txt" "$HOME/BirdNET-Pi/include_species_list.txt" "$HOME/BirdNET-Pi/IdentifiedSoFar.txt"; do
@@ -49,7 +49,7 @@ for files in "$HOME/BirdNET-Pi/birdnet.conf" "$HOME/BirdNET-Pi/scripts/birds.db"
     echo "... creating symlink for $filename"
     if [ ! -f /config/"$filename" ]; then echo "... copying $filename" && sudo -u pi mv "$files" /config/; fi
     if [ -e "$files" ]; then rm "$files"; fi
-    chmod 777 /config/*
+    chmod 664 /config/*
     sudo -u pi ln -fs /config/"$filename" "$files"
     sudo -u pi ln -fs /config/"$filename" /etc/birdnet/"$filename"
 done
@@ -106,3 +106,6 @@ sed -i '/>System Controls/d' "$HOME"/BirdNET-Pi/homepage/views.php
 gottyservice="$(pgrep -l "gotty" | awk '{print $NF}' | head -n 1)"
 echo "... using $gottyservice in phpsysinfo"
 sed -i "s/,gotty,/,${gottyservice:-gotty},/g" "$HOME"/BirdNET-Pi/templates/phpsysinfo.ini
+
+# Ensure /config chown
+chown pi:pi /config