From ae9c87826d084483ecfa2b842492382a7dd49b90 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Wed, 26 Jun 2024 14:11:25 +0200 Subject: [PATCH] Update 71-newfeatures.sh --- .../rootfs/etc/cont-init.d/71-newfeatures.sh | 26 +------------------ 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/birdnet-pi/rootfs/etc/cont-init.d/71-newfeatures.sh b/birdnet-pi/rootfs/etc/cont-init.d/71-newfeatures.sh index c744233a9..9dcdd94f4 100755 --- a/birdnet-pi/rootfs/etc/cont-init.d/71-newfeatures.sh +++ b/birdnet-pi/rootfs/etc/cont-init.d/71-newfeatures.sh @@ -7,31 +7,7 @@ set -e ################ echo " " -bashio::log.info "Adding new features" - -( cd $HOME/BirdNET-Pi -git reset --hard -git fetch origin pull/110/head:bb -git fetch origin pull/115/head:aa -git fetch origin pull/116/head:cc -git fetch origin pull/121/head:dd -git checkout main -git checkout -b f-merge-prs -git merge aa --no-edit -git stash -git merge bb --no-edit -git stash -git merge cc --no-edit -git stash -git merge dd --no-edit -git stash -git checkout main -git merge f-merge-prs -git branch -d aa -git branch -d bb -git branch -d cc -git branch -d dd -git branch -d f-merge-prs ) &>/dev/null +bashio::log.info "Adding optional features" # Add species conversion system ###############################