From cef38ed02c411785bf76c582383a2f420a15ebce Mon Sep 17 00:00:00 2001 From: MonkeyX Date: Tue, 24 Dec 2024 08:34:12 +0000 Subject: [PATCH] Don't suppress messages for cp -rnL (#1009) * 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 * Fixed debug cp -rnL issues and moved post check sh file * Don't supress messages for cp -rnL --- net.retrodeck.retrodeck.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 0d5c7b35..712c0d11 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -343,7 +343,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 -rnL files/lib/* ${FLATPAK_DEST}/retrodeck/tmplib || 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}" @@ -378,9 +378,9 @@ modules: build-commands: - rm -f "files/manifest.json" - mkdir -p "${FLATPAK_DEST}/retrodeck/tmplib" "${FLATPAK_DEST}/retrodeck/tmplib/debug" - - "cp -rnL files/lib/debug ${FLATPAK_DEST}/retrodeck/tmplib 2>/dev/null || echo 'Warning: Some files could not be copied, but the build will continue.'" + - "cp -rnL files/lib/debug ${FLATPAK_DEST}/retrodeck/tmplib || echo 'Warning: Some files could not be copied, but the build will continue.'" - rm -rf "files/lib/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 -rnL files/lib/* ${FLATPAK_DEST}/retrodeck/tmplib || 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}" @@ -398,9 +398,9 @@ modules: - rm -f "files/manifest.json" - mkdir -p "${FLATPAK_DEST}/retrodeck/tmplib" "${FLATPAK_DEST}/retrodeck/tmplib/debug" - rm -rf "files/lib/pkgconfig" - - "cp -rnL files/lib/debug ${FLATPAK_DEST}/retrodeck/tmplib 2>/dev/null || echo 'Warning: Some files could not be copied, but the build will continue.'" + - "cp -rnL files/lib/debug ${FLATPAK_DEST}/retrodeck/tmplib || echo 'Warning: Some files could not be copied, but the build will continue.'" - rm -rf "files/lib/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 -rnL files/lib/* ${FLATPAK_DEST}/retrodeck/tmplib || 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}" @@ -435,7 +435,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 -rnL files/lib/* ${FLATPAK_DEST}/retrodeck/tmplib || 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 2>/dev/null || echo 'Warning: Some files could not be copied, but the build will continue.'" + - "cp -rnL files/lib/* ${FLATPAK_DEST}/retrodeck/tmplib || 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/lib/* ${FLATPAK_DEST}/retrodeck/tmplib 2>/dev/null || echo 'Warning: Some files could not be copied, but the build will continue.'" + - "cp -rnL files/lib/* ${FLATPAK_DEST}/retrodeck/tmplib || 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 @@ -555,7 +555,7 @@ modules: - rm -f "files/manifest.json" - mkdir -p "${FLATPAK_DEST}/retrodeck/tmplib" "${FLATPAK_DEST}/retrodeck/tmplib/debug" - rm -rf "files/lib/cmake" "files/lib/pkgconfig" "files/lib/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 -rnL files/lib/* ${FLATPAK_DEST}/retrodeck/tmplib || 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}" @@ -651,6 +651,7 @@ modules: - rm -f "files/manifest.json" - mkdir -p "${FLATPAK_DEST}/retrodeck/tmplib" "${FLATPAK_DEST}/retrodeck/tmplib/debug" - cp -rfL files/lib/* ${FLATPAK_DEST}/retrodeck/tmplib + - cp -rfL files/lib/* ${FLATPAK_DEST}/retrodeck/tmplib - rm -rf "files/lib" - chmod +x "files/bin/"* - cp -r files/* "${FLATPAK_DEST}"