From 1c927b8aa20749878bc2249f7a379da6c684e502 Mon Sep 17 00:00:00 2001
From: Patrick McGuire <mcguirepr89>
Date: Fri, 29 Oct 2021 17:07:51 -0400
Subject: [PATCH] tweaking based on a new test

---
 Birders_Guide_Installer.sh | 3 ++-
 scripts/birdnet-pi-config  | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Birders_Guide_Installer.sh b/Birders_Guide_Installer.sh
index c4a5080..a32a800 100755
--- a/Birders_Guide_Installer.sh
+++ b/Birders_Guide_Installer.sh
@@ -50,7 +50,8 @@ stage_2() {
     cd ${my_dir} && git checkout ${branch}
   fi
 
-  if [ -f ${my_dir}/Birders_Guide_Installer_Configuration.txt ];then
+  source ${my_dir}/Birders_Guide_Installer_Configuration.txt
+  if [ -z ${LATITUDE} ] || [ -z ${LONGITUDE} ] || [ -z ${CADDY_PWD} ] || [ -z ${ICE_PWD} ] || [ -z ${DB_PWD} ] || [ -z ${DB_ROOT_PWD} ];then
     echo
     echo
     echo "Follow the instructions to fill out the LATITUDE and LONGITUDE variables
diff --git a/scripts/birdnet-pi-config b/scripts/birdnet-pi-config
index f99660d..db68e3a 100755
--- a/scripts/birdnet-pi-config
+++ b/scripts/birdnet-pi-config
@@ -543,13 +543,13 @@ do_get_lat() {
 }
 
 do_update_os() {
-  apt update && apt -y full-upgrade
-  ASK_TO_REBOOT=1
+  apt update && apt -y full-upgrade && \
+    ASK_TO_REBOOT=1
 }
 
 do_install_birdnet() {
-  sudo -E -upi ${birdnetpi_dir}/scripts/install_birdnet.sh
-  ASK_TO_REBOOT=1
+  sudo -E -upi ${birdnetpi_dir}/Birders_Guide_Installer.sh && \
+    ASK_TO_REBOOT=1
 }
 
 insist_on_reboot() {