From 1656851ef20c2f2aced5877fcea158fae6a786fb Mon Sep 17 00:00:00 2001
From: mcguirepr89 <mcguirepr89@gmail.com>
Date: Fri, 18 Feb 2022 16:12:57 -0500
Subject: [PATCH] consolidating

---
 requirements.txt            |  4 ++++
 scripts/install_birdnet.sh  | 30 ------------------------------
 scripts/install_services.sh |  3 ++-
 3 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index ff000e5..c211da6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,7 @@
+pip
+wheel
+setuptools
+tflite_runtime-2.6.0-cp39-none-linux_aarch64.whl
 colorama==0.4.4
 librosa
 mysql-connector-python
diff --git a/scripts/install_birdnet.sh b/scripts/install_birdnet.sh
index 1d5414a..b7f8f38 100755
--- a/scripts/install_birdnet.sh
+++ b/scripts/install_birdnet.sh
@@ -21,41 +21,11 @@ fi
 sudo ./install_services.sh || exit 1
 source /etc/birdnet/birdnet.conf
 
-apt_deps=(swig ffmpeg wget unzip curl cmake make bc)
-libs_modules=(libjpeg-dev zlib1g-dev python3-dev python3-pip python3-venv)
-
-install_deps() {
-  echo "Checking dependencies"
-  for i in "${libs_modules[@]}";do
-    if [ $(apt list --installed 2>/dev/null | grep "$i" | wc -l) -le 0 ];then
-      echo "	Installing $i"
-      sudo apt -y install ${i} &> /dev/null
-    else
-      echo "$i is installed!"
-    fi
-  done
-
-  for i in "${apt_deps[@]}";do
-    if ! which $i &>/dev/null ;then
-      echo "Installing $i"
-      sudo apt -y install ${i} &> /dev/null
-    else
-      echo "$i is installed!"
-    fi
-  done
-}
-
 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"
-  pip3 install --upgrade pip wheel setuptools
-  # TFLite Pre-built binaires from https://github.com/PINTO0309/TensorflowLite-bin
-  echo "Installing the TFLite bin wheel"
-  pip3 install --upgrade tflite_runtime-2.6.0-cp39-none-linux_aarch64.whl
-  echo "Making sure everything else is installed"
   pip3 install -U -r /home/pi/BirdNET-Pi/requirements.txt
 }
 
diff --git a/scripts/install_services.sh b/scripts/install_services.sh
index f383ebb..62c6bcb 100755
--- a/scripts/install_services.sh
+++ b/scripts/install_services.sh
@@ -18,7 +18,8 @@ install_depends() {
   echo "icecast2 icecast2/icecast-setup boolean false" | debconf-set-selections
   apt install -qqy caddy lynx ftpd sqlite3 php-sqlite3 alsa-utils \
     pulseaudio avahi-utils sox libsox-fmt-mp3 php php-fpm php-mysql php-xml \
-    php-zip icecast2 
+    php-zip icecast2 swig ffmpeg wget unzip curl cmake make bc libjpeg-dev \
+    zlib1g-dev python3-dev python3-pip python3-venv
   wget -c ${gotty_url} -O - |  tar -xz -C /usr/local/bin/
 }