From e32471cd170b4f06f37028fe65a00b64167d4ad0 Mon Sep 17 00:00:00 2001
From: Patrick McGuire <mcguirepr89@gmail.com>
Date: Wed, 1 Dec 2021 16:22:18 -0500
Subject: [PATCH] keeping pi ownership of all files in BirdNET-Pi dir

---
 scripts/createdb_bullseye.sh | 8 ++++----
 scripts/createdb_buster.sh   | 6 ++++--
 scripts/install_services.sh  | 4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/scripts/createdb_bullseye.sh b/scripts/createdb_bullseye.sh
index fa7999e..e23f24b 100755
--- a/scripts/createdb_bullseye.sh
+++ b/scripts/createdb_bullseye.sh
@@ -39,7 +39,7 @@ GRANT ALL ON birds.* TO 'birder'@'localhost' IDENTIFIED BY '${DB_PWD}' WITH GRAN
 FLUSH PRIVILEGES;
 exit
 EOF
-sed -i "s/databasepassword/${DB_PWD}/g" /home/pi/BirdNET-Pi/analyze.py
-sed -i "s/databasepassword/${DB_PWD}/g" /home/pi/BirdNET-Pi/scripts/viewdb.php
-sed -i "s/databasepassword/${DB_PWD}/g" /home/pi/BirdNET-Pi/scripts/overview.php
-sed -i "s/databasepassword/${DB_PWD}/g" /home/pi/BirdNET-Pi/scripts/viewday.php
+sudo -u${USER} sed -i "s/databasepassword/${DB_PWD}/g" /home/pi/BirdNET-Pi/analyze.py
+sudo -u${USER} sed -i "s/databasepassword/${DB_PWD}/g" /home/pi/BirdNET-Pi/scripts/viewdb.php
+sudo -u${USER} sed -i "s/databasepassword/${DB_PWD}/g" /home/pi/BirdNET-Pi/scripts/overview.php
+sudo -u${USER} sed -i "s/databasepassword/${DB_PWD}/g" /home/pi/BirdNET-Pi/scripts/viewday.php
diff --git a/scripts/createdb_buster.sh b/scripts/createdb_buster.sh
index 8f18992..0ebcdb1 100755
--- a/scripts/createdb_buster.sh
+++ b/scripts/createdb_buster.sh
@@ -40,5 +40,7 @@ GRANT ALL ON birds.* TO 'birder'@'localhost' IDENTIFIED BY '${DB_PWD}' WITH GRAN
 FLUSH PRIVILEGES;
 exit
 EOF
-sed -i "s/databasepassword/${DB_PWD}/g" /home/pi/BirdNET-Pi/analyze.py
-sed -i "s/databasepassword/${DB_PWD}/g" /home/pi/BirdNET-Pi/scripts/viewdb.php
+sudo -u${USER} sed -i "s/databasepassword/${DB_PWD}/g" /home/pi/BirdNET-Pi/analyze.py
+sudo -u${USER} sed -i "s/databasepassword/${DB_PWD}/g" /home/pi/BirdNET-Pi/scripts/viewdb.php
+sudo -u${USER} sed -i "s/databasepassword/${DB_PWD}/g" /home/pi/BirdNET-Pi/scripts/viewday.php
+sudo -u${USER} sed -i "s/databasepassword/${DB_PWD}/g" /home/pi/BirdNET-Pi/scripts/overview.php
diff --git a/scripts/install_services.sh b/scripts/install_services.sh
index 2b0c67a..bb4d03a 100755
--- a/scripts/install_services.sh
+++ b/scripts/install_services.sh
@@ -36,9 +36,9 @@ install_mariadb() {
   echo "Initializing the database"
   source /etc/os-release
   if [[ "${VERSION_CODENAME}" == "buster" ]];then
-    ${my_dir}/createdb_buster.sh
+    USER=${USER} ${my_dir}/createdb_buster.sh
   elif [[ "${VERSION_CODENAME}" == "bullseye" ]];then
-    ${my_dir}/createdb_bullseye.sh
+    USER=${USER} ${my_dir}/createdb_bullseye.sh
   fi
 }