From 482a17f046f244995b0810b27b50a647a8e657cc Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Wed, 26 Jun 2024 14:09:31 +0200 Subject: [PATCH] Add new PR --- .../rootfs/etc/cont-init.d/71-newfeatures.sh | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) 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 4ad3666db..c744233a9 100755 --- a/birdnet-pi/rootfs/etc/cont-init.d/71-newfeatures.sh +++ b/birdnet-pi/rootfs/etc/cont-init.d/71-newfeatures.sh @@ -9,6 +9,30 @@ 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 + # Add species conversion system ############################### if bashio::config.true "SPECIES_CONVERTER_ENABLED"; then