From e8d9dbb925572db3c137b80565bae1df9ffbe1ab Mon Sep 17 00:00:00 2001
From: MonkeyX <tim@monkeyx.net>
Date: Sun, 22 Dec 2024 15:31:13 +0000
Subject: [PATCH] Cooker (#1003)

* Fix features.json, add srm launcher

* Logging

* Set correct logging levels

* Bob makes it nexy year already!

* full splash screen dates

* Alpha version of post build check

* Bob makes a comeback, by adding a cli argument

* test build

* json update?

* Stop multi press of SRM button

* If error then just carry on :)

* Allow ES-DE to overwrite files
---
 net.retrodeck.retrodeck.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index ef9bab01..2ddcdc76 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -400,7 +400,7 @@ modules:
       - rm -rf "files/lib/pkgconfig"
       - cp -rnL "files/lib/debug" "${FLATPAK_DEST}/retrodeck/tmplib"
       - rm -rf "files/lib/debug"
-      - "if ! cp -rnL files/lib/* ${FLATPAK_DEST}/retrodeck/tmplib 2>/dev/null; then echo 'Warning: Some files could not be copied, but the build will continue.'; fi"
+      - "cp -rnL files/lib/* ${FLATPAK_DEST}/retrodeck/tmplib 2>/dev/null || echo 'Warning: Some files could not be copied, but the build will continue.'"
       - rm -rf "files/lib"
       - chmod +x "files/bin/"*
       - cp -r files/* "${FLATPAK_DEST}"
@@ -452,7 +452,7 @@ modules:
     build-commands:
       - rm -f "files/manifest.json"
       - mkdir -p "${FLATPAK_DEST}/retrodeck/tmplib/"
-      - cp -rnL "files/lib/"* "${FLATPAK_DEST}/retrodeck/tmplib/"
+      - "cp -rnL files/lib/* ${FLATPAK_DEST}/retrodeck/tmplib 2>/dev/null || echo 'Warning: Some files could not be copied, but the build will continue.'"
       - rm -rf "files/lib"
       - chmod +x "files/bin/"*
       - cp -r files/* "${FLATPAK_DEST}/"
@@ -539,7 +539,7 @@ modules:
       #- cp -r "files/lib/debug/lib/*" "${FLATPAK_DEST}/retrodeck/tmplib/debug/"
       - rm -rf "files/lib/debug" "files/lib/pkgconfig"
       - chmod +x "files/bin/"*
-      - cp -rnL files/* "${FLATPAK_DEST}"
+      - "cp -rnL files/lib/* ${FLATPAK_DEST}/retrodeck/tmplib 2>/dev/null || echo 'Warning: Some files could not be copied, but the build will continue.'"
     sources:
       - type: archive
         url: https://github.com/RetroDECK/org.solarus_games.solarus.Launcher/releases/latest/download/RetroDECK-solarus-Artifact.tar.gz
@@ -650,7 +650,7 @@ modules:
     build-commands:
       - rm -f "files/manifest.json"
       - mkdir -p "${FLATPAK_DEST}/retrodeck/tmplib" "${FLATPAK_DEST}/retrodeck/tmplib/debug"
-      - "cp -rnL files/lib/* ${FLATPAK_DEST}/retrodeck/tmplib 2>/dev/null || echo 'Warning: Some files could not be copied, but the build will continue.'"
+      - cp -rfL files/lib/* ${FLATPAK_DEST}/retrodeck/tmplib
       - rm -rf "files/lib"
       - chmod +x "files/bin/"*
       - cp -r files/* "${FLATPAK_DEST}"