diff --git a/Birders_Guide_Installer.sh b/Birders_Guide_Installer.sh index 332c4dc..36998d7 100755 --- a/Birders_Guide_Installer.sh +++ b/Birders_Guide_Installer.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash set -e my_dir=${HOME}/BirdNET-Pi +branch=main trap '${my_dir}/scripts/dump_logs.sh && exit' EXIT SIGHUP SIGINT @@ -44,7 +45,7 @@ EOF echo echo "Installing stage 2 installation script now." cd ~ - curl -s -O "https://raw.githubusercontent.com/mcguirepr89/BirdNET-Pi/main/Birders_Guide_Installer.sh" + curl -s -O "https://raw.githubusercontent.com/mcguirepr89/BirdNET-Pi/${branch}/Birders_Guide_Installer.sh" chmod +x Birders_Guide_Installer.sh cat << EOF | sudo tee /etc/systemd/user/birdnet-system-installer.service &> /dev/null [Unit] @@ -106,9 +107,10 @@ stage_2() { echo if [ ! -d ${my_dir} ];then cd ~ || exit 1 - echo "Cloning the BirdNET-Pi repository in your home directory" - git clone https://github.com/mcguirepr89/BirdNET-Pi.git ~/BirdNET-Pi - cd BirdNET-Pi && git checkout main + echo "Cloning the BirdNET-Pi repository $branch branch into your home directory" + git clone -b ${branch} https://github.com/mcguirepr89/BirdNET-Pi.git ~/BirdNET-Pi + else + cd ${my_dir} && git checkout ${branch} fi if [ -f ${my_dir}/Birders_Guide_Installer_Configuration.txt ];then @@ -122,7 +124,7 @@ and then close the Mouse Pad editing window to continue." else editor=mousepad fi - $editor ${my_dir}/Birders_Guide_Installer_Configuration.txt &> /dev/null + $editor ${my_dir}/Birders_Guide_Installer_Configuration.txt while pgrep $editor &> /dev/null;do sleep 1 done @@ -410,7 +412,7 @@ SYSTEMD_MOUNT=$(echo ${RECS_DIR#/} | tr / -).mount ## VENV is the virtual environment where the the BirdNET python build is found, ## i.e, VENV is the virtual environment miniforge built for BirdNET. -VENV=${my_dir}/miniforge/envs/birdnet +VENV=${my_dir}/birdnet ################################################################################ #---------------------------------- Testing -----------------------------------# diff --git a/example/XC558716 - Soundscape.mp3 b/example/XC558716 - Soundscape.mp3 deleted file mode 100755 index 7f109df..0000000 Binary files a/example/XC558716 - Soundscape.mp3 and /dev/null differ diff --git a/example/XC563936 - Soundscape.mp3 b/example/XC563936 - Soundscape.mp3 deleted file mode 100755 index d21a238..0000000 Binary files a/example/XC563936 - Soundscape.mp3 and /dev/null differ diff --git a/example/custom_species_list.txt b/example/custom_species_list.txt deleted file mode 100755 index dd53047..0000000 --- a/example/custom_species_list.txt +++ /dev/null @@ -1,3 +0,0 @@ -Poecile atricapillus_Black-capped Chickadee -Junco hyemalis_Dark-eyed Junco -Pipilo maculatus_Spotted Towhee \ No newline at end of file diff --git a/result.csv b/result.csv deleted file mode 100644 index 94718ab..0000000 --- a/result.csv +++ /dev/null @@ -1,2 +0,0 @@ -Start (s);End (s);Scientific name;Common name;Confidence -0.0;3.0;Columba livia;Rock Pigeon;0.18658808 diff --git a/scripts/birdnet_analysis.sh b/scripts/birdnet_analysis.sh index 92674bb..d8f32c5 100755 --- a/scripts/birdnet_analysis.sh +++ b/scripts/birdnet_analysis.sh @@ -108,7 +108,7 @@ run_analysis() { --overlap "${OVERLAP}" \ --sensitivity "${SENSITIVITY}" \ --min_conf "${CONFIDENCE}"" - python3 analyze.py \ + "${VENV}"/bin/python analyze.py \ --i "${1}/${i}" \ --o "${1}/${i}.csv" \ --lat "${LATITUDE}" \ @@ -128,7 +128,7 @@ run_analysis() { --sensitivity "${SENSITIVITY}" \ --min_conf "${CONFIDENCE}" \ --custom_list "${CUSTOM_LIST}"" - python3 analyze.py \ + "${VENV}"/bin/python analyze.py \ --i "${1}/${i}" \ --o "${1}/${i}.csv" \ --lat "${LATITUDE}" \ diff --git a/scripts/install_birdnet.sh b/scripts/install_birdnet.sh index 8676205..458f99c 100755 --- a/scripts/install_birdnet.sh +++ b/scripts/install_birdnet.sh @@ -47,22 +47,27 @@ install_deps() { install_birdnet() { cd ~/BirdNET-Pi || exit 1 + echo "Establishing a python virtual environment" + python3 -m venv birdnet + source ./birdnet/bin/activate echo "Upgrading pip, wheel, and setuptools" - sudo pip3 install --upgrade pip wheel setuptools - echo "Fetching the TFLite pre-built binaries" - TFLITE_URL="https://drive.google.com/uc?export=download&id=1dlEbugFDJXs-YDBCUC6WjADVtIttWxZA" - curl -c /tmp/cookie ${TFLITE_URL} - CODE="$(awk '/_warning_/ {print $NF}' /tmp/cookie)" - TF_COOKIE="https://drive.google.com/uc?export=download&confirm=${CODE}&id=1dlEbugFDJXs-YDBCUC6WjADVtIttWxZA" - curl -Lb /tmp/cookie ${TF_COOKIE} -o tflite_runtime-2.6.0-cp37-none-linux_aarch64.whl - echo "Installing the new TFLite bin wheel" - sudo pip3 install --upgrade tflite_runtime-2.6.0-cp37-none-linux_aarch64.whl + pip3 install --upgrade pip wheel setuptools + if [ ! -f $(dirname ${my_dir})/tflite_runtime-2.6.0-cp37-none-linux_aarch64.whl ];then + echo "Fetching the TFLite pre-built binaries" + TFLITE_URL="https://drive.google.com/uc?export=download&id=1dlEbugFDJXs-YDBCUC6WjADVtIttWxZA" + curl -c /tmp/cookie ${TFLITE_URL} + CODE="$(awk '/_warning_/ {print $NF}' /tmp/cookie)" + TF_COOKIE="https://drive.google.com/uc?export=download&confirm=${CODE}&id=1dlEbugFDJXs-YDBCUC6WjADVtIttWxZA" + curl -Lb /tmp/cookie ${TF_COOKIE} -o tflite_runtime-2.6.0-cp37-none-linux_aarch64.whl + fi + echo "Installing the TFLite bin wheel" + pip3 install --upgrade tflite_runtime-2.6.0-cp37-none-linux_aarch64.whl echo "Installing colorama==0.4.4" - sudo pip3 install colorama==0.4.4 + pip3 install colorama==0.4.4 echo "Installing librosa" - sudo pip3 install librosa + pip3 install librosa echo "Installing mysql-connector-python" - sudo pip3 install mysql-connector-python + pip3 install mysql-connector-python } read -sp "\ diff --git a/scripts/install_config.sh b/scripts/install_config.sh index 1b1457e..0e1b968 100755 --- a/scripts/install_config.sh +++ b/scripts/install_config.sh @@ -435,7 +435,7 @@ SYSTEMD_MOUNT=$(echo ${RECS_DIR#/} | tr / -).mount ## VENV is the virtual environment where the the BirdNET python build is found, ## i.e, VENV is the virtual environment miniforge built for BirdNET. -VENV=$(dirname ${my_dir})/miniforge/envs/birdnet +VENV=$(dirname ${my_dir})/birdnet ################################################################################ #---------------------------------- Testing -----------------------------------# diff --git a/tflite_runtime-2.6.0-cp37-none-linux_aarch64.whl b/tflite_runtime-2.6.0-cp37-none-linux_aarch64.whl new file mode 100644 index 0000000..23019b9 Binary files /dev/null and b/tflite_runtime-2.6.0-cp37-none-linux_aarch64.whl differ