diff --git a/Flatpak/fill_release_node.sh b/Flatpak/fill_release_node.sh index 43597fa920..60c547bc18 100755 --- a/Flatpak/fill_release_node.sh +++ b/Flatpak/fill_release_node.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash DATE=$(git log -1 --pretty=%cd --date=iso8601 --date=format:'%Y-%m-%d') -sed -i -e "s/@DATE_PLACEHOLDER/${DATE}/" org.DolphinEmu.dolphin-emu.metainfo.xml +sed -i -e "s/@DATE_PLACEHOLDER/${DATE}/" ../org.DolphinEmu.dolphin-emu.metainfo.xml VERSION=$(git describe --tags | sed -E 's/^([0-9]+-[0-9]+).*/\1/') -sed -i -e "s/@VERSION_PLACEHOLDER/${VERSION}/" org.DolphinEmu.dolphin-emu.metainfo.xml +sed -i -e "s/@VERSION_PLACEHOLDER/${VERSION}/" ../org.DolphinEmu.dolphin-emu.metainfo.xml diff --git a/Flatpak/org.DolphinEmu.dolphin-emu.yml b/Flatpak/org.DolphinEmu.dolphin-emu.yml index a1266b5df5..0c2ddca8c1 100644 --- a/Flatpak/org.DolphinEmu.dolphin-emu.yml +++ b/Flatpak/org.DolphinEmu.dolphin-emu.yml @@ -52,6 +52,7 @@ modules: - name: dolphin-emu buildsystem: cmake-ninja + builddir: true config-opts: - -DCMAKE_BUILD_TYPE=Release - -DENABLE_ALSA=OFF @@ -61,9 +62,9 @@ modules: cleanup: - /share/man post-install: - - install -D -t ${FLATPAK_DEST}/bin/ dolphin-emu-wrapper + - install -D -t ${FLATPAK_DEST}/bin/ ../dolphin-emu-wrapper - "${FLATPAK_BUILDER_BUILDDIR}/Flatpak/fill_release_node.sh" - - install -Dm644 -t ${FLATPAK_DEST}/share/metainfo/ org.DolphinEmu.dolphin-emu.metainfo.xml + - install -Dm644 -t ${FLATPAK_DEST}/share/metainfo/ ../org.DolphinEmu.dolphin-emu.metainfo.xml - desktop-file-edit --set-key=Exec --set-value='/app/bin/dolphin-emu-wrapper' /app/share/applications/dolphin-emu.desktop sources: