Merge branch 'cooker-0.8.0b' into feat/mame

This commit is contained in:
XargonWan 2023-11-16 17:58:19 +01:00
commit b690ef3dc2
4 changed files with 11 additions and 8 deletions

View file

@ -2,10 +2,8 @@
# This is building the bundle RetroDECK.flatpak after the download and build steps are done # This is building the bundle RetroDECK.flatpak after the download and build steps are done
if [[ "${GITHUB_REF##*/}" == "main" ]]; then if [ "${GITHUB_REF##*/}" = "main" ]; then
flatpak = "RetroDECK.flatpak" flatpak build-bundle ${GITHUB_WORKSPACE}/local RetroDECK.flatpak net.retrodeck.retrodeck
else else
flatpak = "RetroDECK-cooker.flatpak" flatpak build-bundle ${GITHUB_WORKSPACE}/local RetroDECK-cooker.flatpak net.retrodeck.retrodeck
fi fi
flatpak build-bundle "${GITHUB_WORKSPACE}/local" "${flatpak}" net.retrodeck.retrodeck

View file

@ -4,7 +4,7 @@ GenericName=RetroDECK Configuration Utility
Type=Application Type=Application
Comment=A handy tool to change common RetroDECK settings Comment=A handy tool to change common RetroDECK settings
Icon=net.retrodeck.retrodeck Icon=net.retrodeck.retrodeck
Exec=/app/tools/configurator.sh Exec=/bin/bash /app/tools/configurator.sh
Terminal=false Terminal=false
StartupNotify=false StartupNotify=false
Keywords=multi;engine;emulator;standalone;steam;deck Keywords=multi;engine;emulator;standalone;steam;deck

View file

@ -4,7 +4,7 @@
<id>net.retrodeck.retrodeck</id> <id>net.retrodeck.retrodeck</id>
<launchable type="desktop-id">net.retrodeck.retrodeck.desktop</launchable> <launchable type="desktop-id">net.retrodeck.retrodeck.desktop</launchable>
<name>RetroDECK</name> <name>RetroDECK</name>
<summary>RetroDECK brings an environment to catalog and play your retro games directly on your Steam Deck.</summary> <summary>RetroDECK brings an environment to catalog and play your retro games directly on your Steam Deck</summary>
<developer_name>RetroDECK Team</developer_name> <developer_name>RetroDECK Team</developer_name>
<url type="homepage">https://retrodeck.net</url> <url type="homepage">https://retrodeck.net</url>
<url type="bugtracker">https://github.com/XargonWan/RetroDECK/issues</url> <url type="bugtracker">https://github.com/XargonWan/RetroDECK/issues</url>

View file

@ -1334,6 +1334,7 @@ modules:
# Desktop entries # Desktop entries
- cp net.retrodeck.retrodeck.desktop /app/share/applications/net.retrodeck.retrodeck.desktop - cp net.retrodeck.retrodeck.desktop /app/share/applications/net.retrodeck.retrodeck.desktop
- cp net.retrodeck.retrodeck.Configurator.desktop /app/share/applications/net.retrodeck.retrodeck.Configurator.desktop - cp net.retrodeck.retrodeck.Configurator.desktop /app/share/applications/net.retrodeck.retrodeck.Configurator.desktop
- chmod +x net.retrodeck.retrodeck*desktop
# Initializing default emulator configs # Initializing default emulator configs
- cp -r emu-configs ${FLATPAK_DEST}/retrodeck/emu-configs/ - cp -r emu-configs ${FLATPAK_DEST}/retrodeck/emu-configs/
@ -1349,6 +1350,10 @@ modules:
- mkdir -p ${FLATPAK_DEST}/share/appdata - mkdir -p ${FLATPAK_DEST}/share/appdata
- cp net.retrodeck.retrodeck.appdata.xml ${FLATPAK_DEST}/share/appdata - cp net.retrodeck.retrodeck.appdata.xml ${FLATPAK_DEST}/share/appdata
# Creating symlinks for a prettier access
- ln -s /app/bin/retrodeck.sh /app/bin/retrodeck
- ln -s /app/tools/configurator.sh /app/bin/configurator
sources: sources:
- type: git - type: git
url: https://github.com/XargonWan/RetroDECK.git url: https://github.com/XargonWan/RetroDECK.git