diff --git a/automation_tools/cooker_flatpak_portal_add.sh b/automation_tools/cooker_flatpak_portal_add.sh index c3c3557a..f139c1d1 100755 --- a/automation_tools/cooker_flatpak_portal_add.sh +++ b/automation_tools/cooker_flatpak_portal_add.sh @@ -1,7 +1,7 @@ #!/bin/bash # COOKER ONLY -# This script is adding the update portal (permission) to the ooker flatpak. +# This script is adding the update portal (permission) to the cooker flatpak. # This is ran by the cooker pipeline. sed -i '/finish-args:/a \ \ - --talk-name=org.freedesktop.Flatpak' net.retrodeck.retrodeck.yml \ No newline at end of file diff --git a/es-configs/es_settings.xml b/es-configs/es_settings.xml index 93de24b3..1b15f6b8 100644 --- a/es-configs/es_settings.xml +++ b/es-configs/es_settings.xml @@ -3,6 +3,7 @@ <bool name="ApplicationUpdaterPrereleases" value="false" /> <bool name="CollectionShowSystemInfo" value="true" /> <bool name="CustomEventScripts" value="false" /> +<bool name="DebugMode" value="false" /> <bool name="DebugSkipInputLogging" value="false" /> <bool name="DebugSkipMissingThemeFiles" value="false" /> <bool name="DebugSkipMissingThemeFilesCustomCollections" value="true" /> @@ -69,6 +70,7 @@ <bool name="ScraperOverwriteData" value="false" /> <bool name="ScraperRegionFallback" value="true" /> <bool name="ScraperRespectExclusions" value="true" /> +<bool name="ScraperSearchFileHash" value="true" /> <bool name="ScraperSearchMetadataName" value="true" /> <bool name="ScraperSemiautomatic" value="true" /> <bool name="ScraperUseAccountScreenScraper" value="true" /> @@ -101,6 +103,7 @@ <int name="ScraperConnectionTimeout" value="30" /> <int name="ScraperRetryOnErrorCount" value="3" /> <int name="ScraperRetryOnErrorTimer" value="3" /> +<int name="ScraperSearchFileHashMaxSize" value="384" /> <int name="ScraperTransferTimeout" value="120" /> <int name="ScreenRotate" value="0" /> <int name="ScreensaverSwapImageTimeout" value="10000" /> @@ -113,7 +116,7 @@ <string name="CollectionCustomGrouping" value="unthemed" /> <string name="CollectionSystemsAuto" value="recent" /> <string name="CollectionSystemsCustom" value="" /> -<string name="DefaultSortOrder" value="filename, ascending" /> +<string name="DefaultSortOrder" value="name, ascending" /> <string name="GamelistViewStyle" value="automatic" /> <string name="InputControllerType" value="xbox" /> <string name="KeyboardQuitShortcut" value="AltF4" /> @@ -144,11 +147,13 @@ <string name="ScreensaverSlideshowImageDir" value="~/.emulationstation/slideshow/custom_images" /> <string name="ScreensaverType" value="video" /> <string name="StartupSystem" value="" /> +<string name="SystemsSorting" value="default" /> +<string name="Theme" value="art-book-next-es-de" /> <string name="ThemeAspectRatio" value="automatic" /> <string name="ThemeColorScheme" value="art-book-next" /> <string name="ThemeSet" value="art-book-next-es-de" /> <string name="ThemeTransitions" value="automatic" /> -<string name="ThemeVariant" value="" /> +<string name="ThemeVariant" value="system-multi-gamelist-list" /> <string name="UIMode" value="full" /> <string name="UIMode_passkey" value="uuddlrlrba" /> <string name="UserThemeDirectory" value="" /> \ No newline at end of file diff --git a/functions/post_update.sh b/functions/post_update.sh index 69194993..bbc06539 100644 --- a/functions/post_update.sh +++ b/functions/post_update.sh @@ -229,6 +229,11 @@ post_update() { set_setting_value "$ppssppcontrolsconf" "R" "1-51,10-192" "ppsspp" "ControlMapping" fi + if [[ $prev_version -le "073" ]]; then + # In version 0.7.3b, there was a bug that prevented the correct creations of the roms/system folders, so we force recreate them. + emulationstation --home /var/config/emulationstation --create-system-dirs + fi + # The following commands are run every time. if [[ -d "/var/data/dolphin-emu/Load/DynamicInputTextures" ]]; then # Refresh installed textures if they have been enabled diff --git a/net.retrodeck.retrodeck.Configurator.desktop b/net.retrodeck.retrodeck.Configurator.desktop index 89c01fff..1d45d4a4 100644 --- a/net.retrodeck.retrodeck.Configurator.desktop +++ b/net.retrodeck.retrodeck.Configurator.desktop @@ -4,7 +4,7 @@ GenericName=RetroDECK Configuration Utility Type=Application Comment=A handy tool to change common RetroDECK settings Icon=net.retrodeck.retrodeck -Exec=/app/tools/configurator.sh +Exec=/bin/bash /app/tools/configurator.sh Terminal=false StartupNotify=false Keywords=multi;engine;emulator;standalone;steam;deck diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index d369cb73..ac02275a 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1257,6 +1257,7 @@ modules: # Desktop entries - 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 + - chmod +x net.retrodeck.retrodeck*desktop # Initializing default emulator configs - cp -r emu-configs ${FLATPAK_DEST}/retrodeck/emu-configs/ @@ -1272,6 +1273,10 @@ modules: - mkdir -p ${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: - type: git url: https://github.com/XargonWan/RetroDECK.git