From a786e51da5fe4b48e7bb6ed091d55ae7826700fc Mon Sep 17 00:00:00 2001
From: Jake Herbst <jmherbst@gmail.com>
Date: Wed, 18 May 2022 13:58:32 -0400
Subject: [PATCH] Updating update_birdnet.sh to make more robust and offer
 functionality to switch branches for testing remote dev branches

---
 scripts/update_birdnet.sh | 46 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 44 insertions(+), 2 deletions(-)

diff --git a/scripts/update_birdnet.sh b/scripts/update_birdnet.sh
index 9c6b865..af72fe5 100755
--- a/scripts/update_birdnet.sh
+++ b/scripts/update_birdnet.sh
@@ -2,12 +2,54 @@
 # Update BirdNET-Pi's Git Repo
 source /etc/birdnet/birdnet.conf
 trap 'exit 1' SIGINT SIGHUP
+
+usage() { echo "Usage: $0 [-r <remote name>] [-b <branch name>]" 1>&2; exit 1; }
+
+# Defaults
+remote="origin"
+branch="main"
+
+while getopts ":r:b:" o; do
+  case "${o}" in
+    r)
+      remote=${OPTARG}
+
+      # Ensure that git remote is configured
+      git remote show $remote 2&> /dev/null || {
+        echo "Error: remote '$remote' not found. Add the upstream remote to your repository and try again."
+        exit 1
+      }
+      ;;
+    b)
+      branch=${OPTARG}
+      ;;
+    *)
+      usage
+      ;;
+  esac
+done
+shift $((OPTIND-1))
+
 USER=$(awk -F: '/1000/ {print $1}' /etc/passwd)
 HOME=$(awk -F: '/1000/ {print $6}' /etc/passwd)
 my_dir=$HOME/BirdNET-Pi/scripts
 
-sudo -u$USER git -C $my_dir rm privacy_server.py
-sudo -u${USER} git -C $my_dir pull -f
+
+sudo_with_user () {
+  set -x
+  sudo -u $USER "$@"
+  set +x
+}
+
+# Reset current HEAD to remove any local changes
+sudo_with_user git reset --hard
+
+# Fetches latest changes
+sudo_with_user git fetch $remote $branch
+
+# Switches git to specified branch
+sudo_with_user git switch -C $branch --track $remote/$branch
+
 sudo systemctl daemon-reload
 sudo ln -sf $my_dir/* /usr/local/bin/