From 95df121221cf8c66b75617569c99ce8625e2baf1 Mon Sep 17 00:00:00 2001
From: Grische <2787581+grische@users.noreply.github.com>
Date: Wed, 22 Nov 2023 19:41:07 +0100
Subject: [PATCH] firmware-legacy-merger: also merge non-sysupgrades

Currently, the firmware-legacy-merger does not merge packages and factory
files of either.
Do not merge those, but use the ones from the latest version available.
---
 github-downloader/firmware-legacy-merger | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/github-downloader/firmware-legacy-merger b/github-downloader/firmware-legacy-merger
index 37e9398..98b78b1 100755
--- a/github-downloader/firmware-legacy-merger
+++ b/github-downloader/firmware-legacy-merger
@@ -113,3 +113,8 @@ rm -r "$TEMP_DIR"
 merge_sysupgrade_files "${FIRMWARE_DIR_LEGACY}" "${FIRMWARE_DIR_STABLE}" "${FIRMWARE_DIR_MERGED}"
 
 echo "Finishing merging sysupgrade folders of ${LEGACY_VERSION} and ${STABLE_VERSION} in ${FIRMWARE_DIR_MERGED}"
+
+# Hardlink all other folders as well
+shopt -s extglob
+cp -lR "${FIRMWARE_DIR_STABLE}"/!(sysupgrade) "${FIRMWARE_DIR_MERGED}/"
+shopt -u extglob # disable extglob to avoid inintentional globbing further down