From a8435990efbd0c310f63b309c3d5ff1afa0ebcd4 Mon Sep 17 00:00:00 2001 From: MonkeyX Date: Sun, 22 Dec 2024 13:32:25 +0000 Subject: [PATCH] Fix for cp -rnL errors (#1000) * 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 :) --- net.retrodeck.retrodeck.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index d1c7729e..ef9bab01 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" + - "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}" @@ -380,7 +380,7 @@ modules: - mkdir -p "${FLATPAK_DEST}/retrodeck/tmplib" "${FLATPAK_DEST}/retrodeck/tmplib/debug" - cp -rnL "files/lib/debug" "${FLATPAK_DEST}/retrodeck/tmplib" - rm -rf "files/lib/debug" - - 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}" @@ -400,7 +400,7 @@ modules: - rm -rf "files/lib/pkgconfig" - cp -rnL "files/lib/debug" "${FLATPAK_DEST}/retrodeck/tmplib" - rm -rf "files/lib/debug" - - cp -rnL "files/lib/"* "${FLATPAK_DEST}/retrodeck/tmplib" + - "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" - 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" + - "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}" @@ -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" + - "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}" @@ -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" + - "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}"