From cfb0a5ee744994a35bf15fe4eddc69d1dc2b2952 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sun, 22 Dec 2024 09:52:43 +0900 Subject: [PATCH] MANIFEST: do not overwrite on some copy commands and don't fail --- 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 c68d8e43..d1c7729e 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -378,7 +378,7 @@ modules: build-commands: - rm -f "files/manifest.json" - mkdir -p "${FLATPAK_DEST}/retrodeck/tmplib" "${FLATPAK_DEST}/retrodeck/tmplib/debug" - - cp -r "files/lib/debug" "${FLATPAK_DEST}/retrodeck/tmplib" + - cp -rnL "files/lib/debug" "${FLATPAK_DEST}/retrodeck/tmplib" - rm -rf "files/lib/debug" - cp -rnL "files/lib/"* "${FLATPAK_DEST}/retrodeck/tmplib" - rm -rf "files/lib" @@ -398,7 +398,7 @@ modules: - rm -f "files/manifest.json" - mkdir -p "${FLATPAK_DEST}/retrodeck/tmplib" "${FLATPAK_DEST}/retrodeck/tmplib/debug" - rm -rf "files/lib/pkgconfig" - - cp -rL "files/lib/debug" "${FLATPAK_DEST}/retrodeck/tmplib" + - cp -rnL "files/lib/debug" "${FLATPAK_DEST}/retrodeck/tmplib" - rm -rf "files/lib/debug" - cp -rnL "files/lib/"* "${FLATPAK_DEST}/retrodeck/tmplib" - rm -rf "files/lib" @@ -452,7 +452,7 @@ modules: build-commands: - rm -f "files/manifest.json" - mkdir -p "${FLATPAK_DEST}/retrodeck/tmplib/" - - cp -rL "files/lib/"* "${FLATPAK_DEST}/retrodeck/tmplib/" + - cp -rnL "files/lib/"* "${FLATPAK_DEST}/retrodeck/tmplib/" - 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 -rL files/* "${FLATPAK_DEST}" + - cp -rnL files/* "${FLATPAK_DEST}" sources: - type: archive url: https://github.com/RetroDECK/org.solarus_games.solarus.Launcher/releases/latest/download/RetroDECK-solarus-Artifact.tar.gz