Merge pull request #143 from grische/feature/legacy-merger-factory-files

firmware-legacy-merger: merge non-sysupgrade files
freifunkMUC · Nov 27, 2023 · 1f99f2b · 1f99f2b
2 parents 17922cb + 3904a53
commit 1f99f2b
Showing 1 changed file with 5 additions and 0 deletions.
diff --git 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