mirror of
https://github.com/alexbelgium/hassio-addons.git
synced 2026-05-28 19:34:05 +02:00
Update 71-newfeatures.sh
This commit is contained in:
@@ -7,31 +7,7 @@ set -e
|
|||||||
################
|
################
|
||||||
|
|
||||||
echo " "
|
echo " "
|
||||||
bashio::log.info "Adding new features"
|
bashio::log.info "Adding optional 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
|
# Add species conversion system
|
||||||
###############################
|
###############################
|
||||||
|
|||||||
Reference in New Issue
Block a user