From 8c468d7ade09b5483c5b5da6dd074214b7e64f7c Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Tue, 19 Aug 2025 21:03:54 +0200
Subject: [PATCH] Update Dockerfile

---
 birdnet-pi/Dockerfile | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/birdnet-pi/Dockerfile b/birdnet-pi/Dockerfile
index 12df51827..244b0f06f 100644
--- a/birdnet-pi/Dockerfile
+++ b/birdnet-pi/Dockerfile
@@ -87,27 +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 -fsSL -H "Accept: application/vnd.github+json" \
-    "https://api.github.com/repos/alexbelgium/BirdNET-Pi/pulls?state=open&per_page=100" \
-  | jq -r ".[] | select(.draft|not) | .number" \
-); do \
-  echo "Merging PR #$pr"; \
-  # Fetch the PR HEAD into a local branch
-  if git -C "$HOME/BirdNET-Pi" fetch --depth=1 origin pull/$pr/head:pr-$pr; then \
-    # Try a non-FF merge; auto-message; no signing; temp identity
-    if git -C "$HOME/BirdNET-Pi" -c user.email=ci@local -c user.name=CI -c commit.gpgsign=false \
-         merge --no-ff --no-edit pr-$pr; then \
-      echo "Merged PR #$pr"; \
-    else \
-      echo "Conflict on PR #$pr — skipping"; \
-      git -C "$HOME/BirdNET-Pi" merge --abort || true; \
-      git -C "$HOME/BirdNET-Pi" reset --hard HEAD; \
-    fi; \
-  else \
-    echo "Fetch failed for PR #$pr — skipping"; \
-  fi; \
-done' /newinstaller.sh && \
+    sed -i '/^git clone/a for pr in $(curl -fsSL https://api.github.com/repos/alexbelgium/BirdNET-Pi/pulls?state=open\\&per_page=100 | jq -r ".[] | select(.draft|not) | .number"); do echo "Merging PR #$pr" && git -C "$HOME/BirdNET-Pi" fetch --depth=1 origin pull/$pr/head:pr-$pr && git -C "$HOME/BirdNET-Pi" -c user.email=ci@local -c user.name=CI -c commit.gpgsign=false merge --no-ff --no-edit pr-$pr || { echo "Skipping PR #$pr"; git -C "$HOME/BirdNET-Pi" merge --abort || true; git -C "$HOME/BirdNET-Pi" reset --hard HEAD; }; done' /newinstaller.sh && \
     # Avoid rebooting at end of installation
     sed -i "/reboot/d" /newinstaller.sh && \
     # Use apt-get as without user action