diff --git a/scripts/birdnet_log.sh b/scripts/birdnet_log.sh index 9c26d3e..c170b91 100755 --- a/scripts/birdnet_log.sh +++ b/scripts/birdnet_log.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -journalctl --no-hostname -o short -fu birdnet_analysis -u birdnet_server | sed "s/$(date "+%b %d ")//g" +journalctl --no-hostname -o short -fu birdnet_analysis -ubirdnet_server -uextraction | sed "s/$(date "+%b %d ")//g" diff --git a/scripts/clear_all_data.php b/scripts/clear_all_data.php deleted file mode 100644 index b0be43d..0000000 --- a/scripts/clear_all_data.php +++ /dev/null @@ -1,4 +0,0 @@ - diff --git a/scripts/extract_new_birdsounds.sh b/scripts/extract_new_birdsounds.sh index 1fac41e..6a90a8d 100755 --- a/scripts/extract_new_birdsounds.sh +++ b/scripts/extract_new_birdsounds.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # Exit when any command fails -set -x +#set -x set -e # Keep track of the last executed command #trap 'last_command=$current_command; current_command=$BASH_COMMAND' DEBUG diff --git a/scripts/reboot_system.php b/scripts/reboot_system.php deleted file mode 100644 index e7f56d8..0000000 --- a/scripts/reboot_system.php +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/scripts/reboot_system.sh b/scripts/reboot_system.sh deleted file mode 100755 index e45727e..0000000 --- a/scripts/reboot_system.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash -sudo reboot diff --git a/scripts/reconfigure_birdnet.sh b/scripts/reconfigure_birdnet.sh deleted file mode 100755 index a362fa9..0000000 --- a/scripts/reconfigure_birdnet.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash -# Reconfigure the BirdNET-Pi -source /etc/birdnet/birdnet.conf -uninstall.sh -${HOME}/BirdNET-Pi/scripts/install_config.sh -USER=${USER} HOME=${HOME} sudo ${HOME}/BirdNET-Pi/scripts/install_services.sh -echo "BirdNET-Pi has now been reconfigured." diff --git a/scripts/reconfigure_birdnet_gui.sh b/scripts/reconfigure_birdnet_gui.sh deleted file mode 100755 index 4f76522..0000000 --- a/scripts/reconfigure_birdnet_gui.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/usr/bin/bash -# Writes variables to config file -set -x -birdnetpi_dir=/home/pi/BirdNET-Pi -source ${birdnetpi_dir}/scripts/welcome_wizard.sh -birdnet_conf=${birdnetpi_dir}/birdnet.conf - -rearview() { - zenity --title="Configuration Complete!!" --width=300 --ok-label="Finished" --window-icon=/usr/share/pixmaps/red-cardinal32.png \ - --info --text=" -Caddy is reloading and the passwords are being updated. - -When the system is updated with your new information, -the main web page will open automatically" --no-wrap --icon-name=red-cardinal -} -rearview & - -if ! [ -z ${new_lat} ];then -sed -i s/'^LATITUDE=.*'/"LATITUDE=${new_lat}"/g ${birdnet_conf} -fi - -if ! [ -z ${new_lon} ];then -sed -i s/'^LONGITUDE=.*'/"LONGITUDE=${new_lon}"/g ${birdnet_conf} -fi - -if ! [ -z ${caddy_pwd} ];then -sed -i s/'^CADDY_PWD=.*'/"CADDY_PWD=${caddy_pwd}"/g ${birdnet_conf} -hash_pwd=$(caddy hash-password -plaintext ${caddy_pwd}) -sudo sed -i s/'birdnet\ .*'/"birdnet ${hash_pwd}"/g /etc/caddy/Caddyfile -sudo systemctl reload caddy -fi - -if ! [ -z ${db_pwd} ];then -sed -i s/'^DB_PWD=.*'/"DB_PWD=${db_pwd}"/g ${birdnet_conf} -${birdnetpi_dir}/scripts/update_db_pwd_bullseye.sh -fi - -if ! [ -z ${birdnetpi_url} ];then -sed -i s/'^BIRDNETPI_URL=.*'/"BIRDNETPI_URL=${birdnetpi_url/\/\//\\\/\\\/}"/g ${birdnet_conf} -sed -i s/'^WEBTERMINAL_URL=.*'/"WEBTERMINAL_URL=${extractionlog_url/\/\//\\\/\\\/}"/g ${birdnet_conf} -sed -i s/'^BIRDNETLOG_URL=.*'/"BIRDNETLOG_URL=${birdnetlog_url/\/\//\\\/\\\/}"/g ${birdnet_conf} -fi - -if ! [ -z ${new_sensitivity} ];then -sed -i s/'^SENSITIVITY=.*'/"SENSITIVITY=${new_sensitivity}"/g ${birdnet_conf} -fi - -if ! [ -z ${new_confidence} ];then -sed -i s/'^CONFIDENCE=.*'/"CONFIDENCE=${new_confidence}"/g ${birdnet_conf} -fi - -${birdnetpi_dir}/scripts/update_birdnet.sh -sudo apt install -y --reinstall icecast2 -xdg-open http://birdnetpi.local -systemctl --user disable birdnet-pi-welcome-wizard.service diff --git a/scripts/restart_birdnet_analysis.php b/scripts/restart_birdnet_analysis.php deleted file mode 100644 index f381d8b..0000000 --- a/scripts/restart_birdnet_analysis.php +++ /dev/null @@ -1,4 +0,0 @@ - diff --git a/scripts/restart_birdnet_analysis.sh b/scripts/restart_birdnet_analysis.sh deleted file mode 100755 index c40b3e8..0000000 --- a/scripts/restart_birdnet_analysis.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash -# Restars the main BirdNET analysis service -sudo systemctl restart birdnet_analysis.service diff --git a/scripts/restart_birdnet_recording.php b/scripts/restart_birdnet_recording.php deleted file mode 100644 index 1712058..0000000 --- a/scripts/restart_birdnet_recording.php +++ /dev/null @@ -1,4 +0,0 @@ - diff --git a/scripts/restart_birdnet_recording.sh b/scripts/restart_birdnet_recording.sh deleted file mode 100755 index bc9f5b8..0000000 --- a/scripts/restart_birdnet_recording.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash -# Restars the BirdNET Recording service -sudo systemctl restart birdnet_recording.service diff --git a/scripts/restart_caddy.php b/scripts/restart_caddy.php deleted file mode 100644 index fa9f6d2..0000000 --- a/scripts/restart_caddy.php +++ /dev/null @@ -1,4 +0,0 @@ - diff --git a/scripts/restart_caddy.sh b/scripts/restart_caddy.sh deleted file mode 100755 index 43edcca..0000000 --- a/scripts/restart_caddy.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash -# Restars the caddy webserver -sudo systemctl restart caddy diff --git a/scripts/restart_extraction.php b/scripts/restart_extraction.php deleted file mode 100644 index f52aa58..0000000 --- a/scripts/restart_extraction.php +++ /dev/null @@ -1,4 +0,0 @@ - diff --git a/scripts/restart_extraction.sh b/scripts/restart_extraction.sh deleted file mode 100755 index 81aadf0..0000000 --- a/scripts/restart_extraction.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash -# Restars the BirdNET Extraction service -sudo systemctl restart extraction.service diff --git a/scripts/restart_services.php b/scripts/restart_services.php deleted file mode 100644 index ba15664..0000000 --- a/scripts/restart_services.php +++ /dev/null @@ -1,4 +0,0 @@ - diff --git a/scripts/service_controls.php b/scripts/service_controls.php index 33c6f86..348c957 100644 --- a/scripts/service_controls.php +++ b/scripts/service_controls.php @@ -59,24 +59,39 @@ a {
-
+ +
-
+ +
-
+ +
-
+ +
-
- -
-
+ +
+
+Executed $command"; +shell_exec("$command"); +} +?> +
diff --git a/scripts/shutdown_system.php b/scripts/shutdown_system.php deleted file mode 100644 index 74ce980..0000000 --- a/scripts/shutdown_system.php +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/scripts/shutdown_system.sh b/scripts/shutdown_system.sh deleted file mode 100755 index d2eff34..0000000 --- a/scripts/shutdown_system.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash -sudo shutdown now diff --git a/scripts/stop_core_services.php b/scripts/stop_core_services.php deleted file mode 100644 index 28c09ad..0000000 --- a/scripts/stop_core_services.php +++ /dev/null @@ -1,4 +0,0 @@ - diff --git a/scripts/system_controls.php b/scripts/system_controls.php index 16f419f..2034dc0 100644 --- a/scripts/system_controls.php +++ b/scripts/system_controls.php @@ -59,17 +59,30 @@ a {
-
+ +
-
+ +
-
+ +
-
+ +
+
+Executing $command"; + shell_exec("$command"); +} +?> +
diff --git a/scripts/update_birdnet.php b/scripts/update_birdnet.php deleted file mode 100644 index 413b337..0000000 --- a/scripts/update_birdnet.php +++ /dev/null @@ -1,4 +0,0 @@ - /tmp/phpupdate.log 2&>1"); -header('Location: update_inprogress.php'); -?>