From 11ee1ca39bb59d4e6521f1e3518403e709e45a2b Mon Sep 17 00:00:00 2001 From: Patrick McGuire Date: Sat, 4 Dec 2021 16:05:30 -0500 Subject: [PATCH] smarter generation of BirdDB.txt headers --- scripts/clear_all_data.sh | 12 ++++-------- scripts/install_services.sh | 6 ++++-- scripts/update_services.sh | 7 ++++--- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/scripts/clear_all_data.sh b/scripts/clear_all_data.sh index 2a885a5..9e93202 100755 --- a/scripts/clear_all_data.sh +++ b/scripts/clear_all_data.sh @@ -61,14 +61,10 @@ sudo -u ${USER} cp -f $(dirname ${my_dir})/templates/index_bootstrap.html ${HOME echo "Setting Wttr.in URL to "${LATITUDE}", "${LONGITUDE}"" sudo -u${USER} sed -i "s/https:\/\/v2.wttr.in\//https:\/\/v2.wttr.in\/"${LATITUDE},${LONGITUDE}"/g" $(dirname ${my_dir})/homepage/menu.html -generate_BirdDB() { - echo "Generating BirdDB.txt" - [ -f $(dirname ${my_dir})/BirdDB.txt ] || sudo -u ${USER} touch $(dirname ${my_dir})/BirdDB.txt - if ! grep Date $(dirname ${my_dir})/BirdDB.txt;then - sudo -u ${USER} sed -i '1i Date;Time;Sci_Name;Com_Name;Confidence;Lat;Lon;Cutoff;Week;Sens;Overlap' $(dirname ${my_dir})/BirdDB.txt - fi -} -generate_BirdDB +echo "Generating BirdDB.txt" +[ -f $(dirname ${my_dir})/BirdDB.txt ] || sudo -u ${USER} touch $(dirname ${my_dir})/BirdDB.txt +echo "Date;Time;Sci_Name;Com_Name;Confidence;Lat;Lon;Cutoff;Week;Sens;Overlap" | sudo -u ${BIRDNET_USER} tee -a $(dirname ${my_dir})/BirdDB.txt + sudo -u ${BIRDNET_USER} cp -f ${HOME}/BirdNET-Pi/homepage/index.html ${EXTRACTED}/ echo "Dropping and re-creating database" sudo /home/pi/BirdNET-Pi/scripts/createdb_bullseye.sh diff --git a/scripts/install_services.sh b/scripts/install_services.sh index 899f042..0446a43 100755 --- a/scripts/install_services.sh +++ b/scripts/install_services.sh @@ -160,8 +160,10 @@ create_necessary_dirs() { generate_BirdDB() { echo "Generating BirdDB.txt" - [ -f $(dirname ${my_dir})/BirdDB.txt ] || sudo -u ${USER} touch $(dirname ${my_dir})/BirdDB.txt - if ! grep Date $(dirname ${my_dir})/BirdDB.txt;then + if ! [ -f $(dirname ${my_dir})/BirdDB.txt ];then + sudo -u ${USER} touch $(dirname ${my_dir})/BirdDB.txt + echo "Date;Time;Sci_Name;Com_Name;Confidence;Lat;Lon;Cutoff;Week;Sens;Overlap" | sudo -u ${USER} tee -a $(dirname ${my_dir})/BirdDB.txt + elif ! grep Date $(dirname ${my_dir})/BirdDB.txt;then sudo -u ${USER} sed -i '1 i\Date;Time;Sci_Name;Com_Name;Confidence;Lat;Lon;Cutoff;Week;Sens;Overlap' $(dirname ${my_dir})/BirdDB.txt fi } diff --git a/scripts/update_services.sh b/scripts/update_services.sh index c6e506a..a4f5ca2 100755 --- a/scripts/update_services.sh +++ b/scripts/update_services.sh @@ -158,13 +158,14 @@ create_necessary_dirs() { generate_BirdDB() { echo "Generating BirdDB.txt" - [ -f $(dirname ${my_dir})/BirdDB.txt ] || sudo -u ${USER} touch $(dirname ${my_dir})/BirdDB.txt - if ! grep Date $(dirname ${my_dir})/BirdDB.txt;then + if ! [ -f $(dirname ${my_dir})/BirdDB.txt ];then + sudo -u ${USER} touch $(dirname ${my_dir})/BirdDB.txt + echo "Date;Time;Sci_Name;Com_Name;Confidence;Lat;Lon;Cutoff;Week;Sens;Overlap" | sudo -u ${USER} tee -a $(dirname ${my_dir})/BirdDB.txt + elif ! grep Date $(dirname ${my_dir})/BirdDB.txt;then sudo -u ${USER} sed -i '1 i\Date;Time;Sci_Name;Com_Name;Confidence;Lat;Lon;Cutoff;Week;Sens;Overlap' $(dirname ${my_dir})/BirdDB.txt fi } - install_alsa() { echo "Checking for alsa-utils and pulseaudio" if which arecord &> /dev/null ;then