From 8685fb562670f475f8e4b8e14ab21f09e68b0741 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Tue, 19 Aug 2025 20:44:54 +0200
Subject: [PATCH] Fix open PR merging in BirdNET-Pi installer

---
 birdnet-pi/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/birdnet-pi/Dockerfile b/birdnet-pi/Dockerfile
index 9acd339dc..782dfdfd6 100644
--- a/birdnet-pi/Dockerfile
+++ b/birdnet-pi/Dockerfile
@@ -87,7 +87,7 @@ RUN \
     # Use my repository
     sed -i "s|Nachtzuster|alexbelgium|g" /newinstaller.sh && \
     # Install open PR
-    sed -i '/^git clone/a for pr in $(curl -s https://api.github.com/repos/alexbelgium/BirdNET-Pi/pulls?state=open | jq -r ".[].number"); do echo "Merging PR #$pr" && git fetch origin pull/$pr/merge:pr-$pr && git merge --no-ff -m "Merge PR #$pr" pr-$pr || { echo "Skipping PR #$pr"; git merge --abort || true; }; done' /newinstaller.sh && \
+    sed -i '/^git clone/a for pr in $(curl -s https://api.github.com/repos/alexbelgium/BirdNET-Pi/pulls?state=open | jq -r ".[].number"); do echo "Merging PR #$pr" && git -C "$HOME/BirdNET-Pi" fetch origin pull/$pr/merge:pr-$pr && git -C "$HOME/BirdNET-Pi" merge --no-ff -m "Merge PR #$pr" pr-$pr || { echo "Skipping PR #$pr"; git -C "$HOME/BirdNET-Pi" merge --abort || true; }; done' /newinstaller.sh && \
     # Avoid rebooting at end of installation
     sed -i "/reboot/d" /newinstaller.sh && \
     # Use apt-get as without user action