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

This commit is contained in:
XargonWan 2024-03-08 20:36:47 +01:00
commit f7226fc864
2 changed files with 4 additions and 8 deletions

View file

@ -1,6 +1,6 @@
#!/bin/bash
cd ..
# WARNING: run this script from the project root folder, not from here!!
# TODO: FEDORA
# sudo dnf install -y flatpak flatpak-builder p7zip p7zip-plugins xmlstarlet bzip2 curl
@ -24,5 +24,3 @@ rm -f net.retrodeck.retrodeck.appdata.xml
rm -f net.retrodeck.retrodeck.yml
cp net.retrodeck.retrodeck.appdata.xml.bak net.retrodeck.retrodeck.appdata.xml
cp net.retrodeck.retrodeck.yml.bak net.retrodeck.retrodeck.yml
cd -

8
developer_toolbox/inject_framework.sh Normal file → Executable file
View file

@ -1,12 +1,12 @@
#!/bin/bash
# WARNING: run this script from the project root folder, not from here!!
# This script is used to inject framework and config files inside a RetroDECK cooker installation
# To apply the injected config you have to reset the targeted component from the Configurator
# Please know what you're doing, if you need to undo this you need to completely uninstall and reinstall RetroDECK flatpak
# Please not that this may create a dirty situation where older files are still in place as the action is add and overwrite
cd ..
flatpak_user_installation="$HOME/.local/share/flatpak/app/net.retrodeck.retrodeck/current/active/files"
flatpak_system_installation="/var/lib/flatpak/app/net.retrodeck.retrodeck/current/active/files"
@ -27,6 +27,4 @@ sudo cp -vfr "tools" "$app/tools"
sudo cp -vfr "emu-configs/"** "$app/retrodeck/emu-configs/"
sudo cp -vfr "es-configs/es_find_rules.xml" "$app/share/es-de/resources/systems/linux/"
sudo cp -vfr "es-configs/es_systems.xml" "$app/share/es-de/resources/systems/linux/"
sudo cp -vfr "res/binding_icons" "$app/retrodeck/binding_icons"
cd -
sudo cp -vfr "res/binding_icons" "$app/retrodeck/binding_icons"