From 957a7d83905a985c0116810cc8fb78e84f3022be Mon Sep 17 00:00:00 2001 From: mcguirepr89 Date: Fri, 25 Feb 2022 10:31:38 -0500 Subject: [PATCH] pulling sqlite changes --- scripts/update_caddyfile.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/scripts/update_caddyfile.sh b/scripts/update_caddyfile.sh index 6b8982d..20503fb 100755 --- a/scripts/update_caddyfile.sh +++ b/scripts/update_caddyfile.sh @@ -70,12 +70,14 @@ fi sudo -u${USER} git -C /home/pi/BirdNET-Pi checkout -f homepage/* sudo -u${USER} git -C /home/pi/BirdNET-Pi checkout -f scripts/* sudo -u${USER} git -C /home/pi/BirdNET-Pi checkout -f scripts/*/* -sudo -u${USER} sed -i "s/https:\/\/v2.wttr.in\//https:\/\/v2.wttr.in\/"${LATITUDE},${LONGITUDE}"/g" $(dirname ${my_dir})/homepage/menu.html +sudo -u${USER} sed -i "s/wttr.in/wttr.in\/${LATITUDE},${LONGITUDE}/g" $(dirname ${my_dir})/homepage/menu.html if [ ! -z ${BIRDNETLOG_URL} ];then BIRDNETLOG_URL="$(echo ${BIRDNETLOG_URL} | sed 's/\/\//\\\/\\\//g')" +elif [ -z ${BIRDNETPI_URL} ];then + BIRDNETLOG_URL="http:\/\/$(hostname).local:8080" else - BIRDNETLOG_URL="$(echo http://$(hostname).local:8080 | sed 's/\/\//\\\/\\\//g')" + BIRDNETLOG_URL="${BIRDNETPI_URL}:8080" fi sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local:8080/${BIRDNETLOG_URL}/g" $(dirname ${my_dir})/homepage/*.html sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local:8080/${BIRDNETLOG_URL}/g" $(dirname ${my_dir})/scripts/*.html @@ -85,8 +87,10 @@ sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local:8080/${BIRDNETLOG_URL}/g" $(di if [ ! -z ${WEBTERMINAL_URL} ];then WEBTERMINAL_URL="$(echo ${WEBTERMINAL_URL} | sed 's/\/\//\\\/\\\//g')" +elif [ -z ${BIRDNETPI_URL} ];then + WEBTERMINAL_URL="http:\/\/$(hostname).local:8080" else - WEBTERMINAL_URL="$(echo http://$(hostname).local:8888 | sed 's/\/\//\\\/\\\//g')" + WEBTERMINAL_URL="${BIRDNETPI_URL}:8888" fi sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local:8888/${WEBTERMINAL_URL}/g" $(dirname ${my_dir})/homepage/*.html sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local:8888/${WEBTERMINAL_URL}/g" $(dirname ${my_dir})/scripts/*.html @@ -110,4 +114,4 @@ else sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local/${BIRDNETPI_URL}/g" $(dirname ${my_dir})/scripts/*/*.php fi -systemctl reload caddy +sudo systemctl reload caddy