From e96cdb2a80d1932c5c6e6f77ce3d369fcfd8149b Mon Sep 17 00:00:00 2001
From: Patrick McGuire <mcguirepr89@gmail.com>
Date: Thu, 4 Nov 2021 11:31:40 -0400
Subject: [PATCH] added a section to reconfigure /etc/hosts/ better

---
 scripts/install_services.sh | 17 ++++++++++++++---
 scripts/update_services.sh  | 17 ++++++++++++++---
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/scripts/install_services.sh b/scripts/install_services.sh
index 2df922c..93ceb82 100755
--- a/scripts/install_services.sh
+++ b/scripts/install_services.sh
@@ -112,7 +112,7 @@ create_necessary_dirs() {
 
   sudo -u ${USER} ln -fs $(dirname ${my_dir})/homepage/* ${EXTRACTED}  
   if [ ! -z ${BIRDNETLOG_URL} ];then
-    BIRDNETLOG_URL="$(echo ${BIRDNETLOG_URL} | sed 's/\/\//\\\/\\\//g')"
+    #BIRDNETLOG_URL="$(echo ${BIRDNETLOG_URL} | sed 's/\/\//\\\/\\\//g')"
     sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local:8080/"${BIRDNETLOG_URL}"/g" $(dirname ${my_dir})/homepage/*.html
     phpfiles="$(grep -l "birdnetpi.local:8080" ${my_dir}/*.php)"
     for i in "${phpfiles[@]}";do
@@ -120,7 +120,7 @@ create_necessary_dirs() {
     done
   fi
   if [ ! -z ${EXTRACTIONLOG_URL} ];then
-    EXTRACTIONLOG_URL="$(echo ${EXTRACTIONLOG_URL} | sed 's/\/\//\\\/\\\//g')"
+    #EXTRACTIONLOG_URL="$(echo ${EXTRACTIONLOG_URL} | sed 's/\/\//\\\/\\\//g')"
     sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local:8888/"${EXTRACTIONLOG_URL}"/g" $(dirname ${my_dir})/homepage/*.html
     phpfiles="$(grep -l "birdnetpi.local:8888" ${my_dir}/*.php)"
     for i in "${phpfiles[@]}";do
@@ -130,7 +130,7 @@ create_necessary_dirs() {
 
   sudo -u ${USER} ln -fs $(dirname ${my_dir})/scripts ${EXTRACTED}
   if [ ! -z ${BIRDNETPI_URL} ];then
-    BIRDNETPI_URL="$(echo ${BIRDNETPI_URL} | sed 's/\/\//\\\/\\\//g')"
+    #BIRDNETPI_URL="$(echo ${BIRDNETPI_URL} | sed 's/\/\//\\\/\\\//g')"
     sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local/"${BIRDNETPI_URL}"/g" $(dirname ${my_dir})/homepage/*.html
     phpfiles="$(grep -l birdnetpi.local ${my_dir}/*.php)"
     for i in "${phpfiles[@]}";do
@@ -249,6 +249,16 @@ EOF
   systemctl reload caddy
 }
 
+update_etc_hosts() {
+  BIRDNETPI_URL=https://birdnetpi.pmcgui.xyz
+  BIRDNETPI_URL="$(echo ${BIRDNETPI_URL} | sed 's/\/\//\\\/\\\//g')"
+  EXTRACTIONLOG_URL=https://extractionlog.pmcgui.xyz
+  EXTRACTIONLOG_URL="$(echo ${EXTRACTIONLOG_URL} | sed 's/\/\//\\\/\\\//g')"
+  BIRDNETLOG_URL=https://birdnetlog.pmcgui.xyz
+  BIRDNETLOG_URL="$(echo ${BIRDNETLOG_URL} | sed 's/\/\//\\\/\\\//g')"
+  sed -ie s/'birdnetpi.local$'/"birdnetpi.local ${BIRDNETPI_URL} ${EXTRACTIONLOG_URL} ${BIRDNETLOG_URL}"/g /etc/hosts
+}
+
 install_avahi_aliases() {
   echo "Installing Avahi Services"
   if ! which avahi-publish &> /dev/null; then
@@ -470,6 +480,7 @@ install_selected_services() {
 
     install_caddy
     install_Caddyfile
+    update_etc_hosts
     install_avahi_aliases
     install_gotty_logs
     install_sox
diff --git a/scripts/update_services.sh b/scripts/update_services.sh
index 1e5c4b0..b8b46b7 100755
--- a/scripts/update_services.sh
+++ b/scripts/update_services.sh
@@ -111,7 +111,7 @@ create_necessary_dirs() {
 
   sudo -u ${USER} ln -fs $(dirname ${my_dir})/homepage/* ${EXTRACTED}  
   if [ ! -z ${BIRDNETLOG_URL} ];then
-    BIRDNETLOG_URL="$(echo ${BIRDNETLOG_URL} | sed 's/\/\//\\\/\\\//g')"
+    #BIRDNETLOG_URL="$(echo ${BIRDNETLOG_URL} | sed 's/\/\//\\\/\\\//g')"
     sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local:8080/"${BIRDNETLOG_URL}"/g" $(dirname ${my_dir})/homepage/*.html
     phpfiles="$(grep -l "birdnetpi.local:8080" ${my_dir}/*.php)"
     for i in "${phpfiles[@]}";do
@@ -119,7 +119,7 @@ create_necessary_dirs() {
     done
   fi
   if [ ! -z ${EXTRACTIONLOG_URL} ];then
-    EXTRACTIONLOG_URL="$(echo ${EXTRACTIONLOG_URL} | sed 's/\/\//\\\/\\\//g')"
+    #EXTRACTIONLOG_URL="$(echo ${EXTRACTIONLOG_URL} | sed 's/\/\//\\\/\\\//g')"
     sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local:8888/"${EXTRACTIONLOG_URL}"/g" $(dirname ${my_dir})/homepage/*.html
     phpfiles="$(grep -l "birdnetpi.local:8888" ${my_dir}/*.php)"
     for i in "${phpfiles[@]}";do
@@ -129,7 +129,7 @@ create_necessary_dirs() {
 
   sudo -u ${USER} ln -fs $(dirname ${my_dir})/scripts ${EXTRACTED}
   if [ ! -z ${BIRDNETPI_URL} ];then
-    BIRDNETPI_URL="$(echo ${BIRDNETPI_URL} | sed 's/\/\//\\\/\\\//g')"
+    #BIRDNETPI_URL="$(echo ${BIRDNETPI_URL} | sed 's/\/\//\\\/\\\//g')"
     sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local/"${BIRDNETPI_URL}"/g" $(dirname ${my_dir})/homepage/*.html
     phpfiles="$(grep -l birdnetpi.local ${my_dir}/*.php)"
     for i in "${phpfiles[@]}";do
@@ -247,6 +247,16 @@ EOF
   systemctl reload caddy
 }
 
+update_etc_hosts() {
+  BIRDNETPI_URL=https://birdnetpi.pmcgui.xyz
+  BIRDNETPI_URL="$(echo ${BIRDNETPI_URL} | sed 's/\/\//\\\/\\\//g')"
+  EXTRACTIONLOG_URL=https://extractionlog.pmcgui.xyz
+  EXTRACTIONLOG_URL="$(echo ${EXTRACTIONLOG_URL} | sed 's/\/\//\\\/\\\//g')"
+  BIRDNETLOG_URL=https://birdnetlog.pmcgui.xyz
+  BIRDNETLOG_URL="$(echo ${BIRDNETLOG_URL} | sed 's/\/\//\\\/\\\//g')"
+  sed -ie s/'birdnetpi.local$'/"birdnetpi.local ${BIRDNETPI_URL} ${EXTRACTIONLOG_URL} ${BIRDNETLOG_URL}"/g /etc/hosts
+}
+
 install_avahi_aliases() {
   echo "Installing Avahi Services"
   if ! which avahi-publish &> /dev/null; then
@@ -467,6 +477,7 @@ install_selected_services() {
 
     install_caddy
     install_Caddyfile
+    update_etc_hosts
     install_avahi_aliases
     install_gotty_logs
     install_sox