From 25c45699c4ec48edfa5edc87e8b95434cd43ab1e Mon Sep 17 00:00:00 2001
From: XargonWan <xargonwan@gmail.com>
Date: Tue, 29 Mar 2022 23:48:17 +0900
Subject: [PATCH] - Bumped RA cores to 1.10.2 - Cores info added - Bumped ES-DE
 to 1.2.1 - Fixed savestate issue (core info) - Removed splash on game loading

---
 com.xargon.retrodeck.yml | 10 +++++-----
 es_find_rules.xml        |  9 +++++++++
 es_settings.xml          |  6 +++---
 retrodeck-retroarch.cfg  |  4 ++--
 retrodeck.sh             | 19 +++++++++++--------
 tools-gamelist.xml       |  2 +-
 6 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml
index 026a3987..6949c613 100644
--- a/com.xargon.retrodeck.yml
+++ b/com.xargon.retrodeck.yml
@@ -163,7 +163,7 @@ modules:
     sources:
       - type: git
         url: https://github.com/libretro/RetroArch.git
-        branch: 60fab1c4a169beb46b7b79d2ae549e12f05c53fc
+        branch: de4e56ecf28a09057734f8624af6d62f3088734f
       - type: file
         path: org.libretro.RetroArch.appdata.xml
       - type: file
@@ -202,7 +202,7 @@ modules:
     sources:
       - type: git
         url: https://github.com/libretro/RetroArch.git
-        commit: 60fab1c4a169beb46b7b79d2ae549e12f05c53fc
+        commit: de4e56ecf28a09057734f8624af6d62f3088734f
   - name: retroarch-filers-audio
     subdir: libretro-common/audio/dsp_filters
     make-install-args:
@@ -210,7 +210,7 @@ modules:
     sources:
       - type: git
         url: https://github.com/libretro/RetroArch.git
-        commit: 60fab1c4a169beb46b7b79d2ae549e12f05c53fc
+        commit: de4e56ecf28a09057734f8624af6d62f3088734f
   - name: retroarch-assets
     make-install-args:
       - PREFIX=${FLATPAK_DEST}
@@ -280,8 +280,8 @@ modules:
         - RetroArch_cores.7z
     sources:
       - type: archive
-        url: https://buildbot.libretro.com/stable/1.10.1/linux/x86_64/RetroArch_cores.7z
-        sha256: 3467de291c0849947993a535b0f32e7c211878dcaf6a37a9f864cf50cbe824fd
+        url: https://buildbot.libretro.com/stable/1.10.2/linux/x86_64/RetroArch_cores.7z
+        sha256: 0c59f99534a1ae3a2d34b1747c40398325e53db69acfab35b99c8fa8d76430e5
 
   # Yuzu - https://github.com/flathub/org.yuzu_emu.yuzu
 
diff --git a/es_find_rules.xml b/es_find_rules.xml
index 8b8c4c08..783df691 100644
--- a/es_find_rules.xml
+++ b/es_find_rules.xml
@@ -178,4 +178,13 @@
             <entry>~/bin/yuzu*.AppImage</entry>
         </rule>
     </emulator>
+    <emulator name="tools">
+        <!-- Linux shell-->
+        <rule type="systempath">
+            <entry>bash</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>/bin/bash</entry>
+        </rule>
+    </emulator>
 </ruleList>
diff --git a/es_settings.xml b/es_settings.xml
index faee5d05..303d5802 100644
--- a/es_settings.xml
+++ b/es_settings.xml
@@ -57,8 +57,8 @@
 <bool name="ScraperExcludeRecursively" value="true" />
 <bool name="ScraperHaltOnInvalidMedia" value="true" />
 <bool name="ScraperIncludeFolders" value="false" />
-<bool name="ScraperInteractive" value="true" />
-<bool name="ScraperOverwriteData" value="true" />
+<bool name="ScraperInteractive" value="false" />
+<bool name="ScraperOverwriteData" value="false" />
 <bool name="ScraperRespectExclusions" value="true" />
 <bool name="ScraperRetryPeerVerification" value="false" />
 <bool name="ScraperSearchMetadataName" value="true" />
@@ -91,7 +91,7 @@
 <int name="ScreensaverTimer" value="300000" />
 <int name="SoundVolumeNavigation" value="70" />
 <int name="SoundVolumeVideos" value="80" />
-<string name="ApplicationVersion" value="1.2.0" />
+<string name="ApplicationVersion" value="1.2.1" />
 <string name="CollectionSystemsAuto" value="all" />
 <string name="CollectionSystemsCustom" value="" />
 <string name="DefaultSortOrder" value="filename, ascending" />
diff --git a/retrodeck-retroarch.cfg b/retrodeck-retroarch.cfg
index b533d7ec..0586a9f6 100644
--- a/retrodeck-retroarch.cfg
+++ b/retrodeck-retroarch.cfg
@@ -2767,7 +2767,7 @@ keyboard_gamepad_mapping_type = "1"
 kiosk_mode_enable = "false"
 kiosk_mode_password = ""
 led_driver = "null"
-libretro_directory = "~/.var/app/com.xargon.retrodeck/config/retroarch/cores"
+libretro_directory = "/app/share/libretro/cores"
 libretro_info_path = "/app/share/libretro/info"
 libretro_log_level = "1"
 load_dummy_on_core_shutdown = "true"
@@ -2830,7 +2830,7 @@ menu_show_information = "true"
 menu_show_latency = "true"
 menu_show_legacy_thumbnail_updater = "false"
 menu_show_load_content = "true"
-menu_show_load_content_animation = "true"
+menu_show_load_content_animation = "false"
 menu_show_load_core = "true"
 menu_show_load_disc = "true"
 menu_show_online_updater = "true"
diff --git a/retrodeck.sh b/retrodeck.sh
index 5255ba83..5123f7b2 100644
--- a/retrodeck.sh
+++ b/retrodeck.sh
@@ -4,20 +4,23 @@
 if [ ! -f ~/retrodeck/.lock ]
 then
     mkdir -p ~/retrodeck/.emulationstation
-    mkdir -p ~/retrodeck/saves
-    mkdir -p ~/retrodeck/states
-    mkdir -p ~/retrodeck/screenshots
-    mkdir -p ~/retrodeck/tools
-    mkdir -p /var/config/retroarch/system
-    
-    ln -s ~/.var/app/com.xargon.retrodeck/config/retroarch/system/ ~/retrodeck/bios
     rm -rf ~/retrodeck/.emulationstation/es_settings.xml
     rm -rf ~/retrodeck/.emulationstation/es_input.xml
     cp /app/retrodeck/es_settings.xml ~/retrodeck/.emulationstation/es_settings.xml
     cp /app/retrodeck/es_settings.xml ~/retrodeck/.emulationstation/es_input.xml
-    cp /app/retrodeck/retrodeck-retroarch.cfg /var/config/retroarch/retroarch.cfg
+
+    mkdir -p ~/retrodeck/saves
+    mkdir -p ~/retrodeck/states
+    mkdir -p ~/retrodeck/screenshots
+
+    mkdir -p ~/retrodeck/tools
     cp -r /app/retrodeck/tools/* ~/retrodeck/tools/
 
+    mkdir -p /var/config/retroarch/system
+    ln -s ~/.var/app/com.xargon.retrodeck/config/retroarch/system/ ~/retrodeck/bios
+        
+    cp /app/retrodeck/retrodeck-retroarch.cfg /var/config/retroarch/retroarch.cfg
+    
     mkdir -p ~/retrodeck/.emulationstation/gamelists/tools/
     cp /app/retrodeck/tools-gamelist.xml ~/retrodeck/.emulationstation/gamelists/tools/gamelist.xml
     
diff --git a/tools-gamelist.xml b/tools-gamelist.xml
index eda35c81..272ee9eb 100644
--- a/tools-gamelist.xml
+++ b/tools-gamelist.xml
@@ -11,7 +11,7 @@ It enables you to run classic games on a wide range of computers and consoles th
 In addition to this, you are able to run original game discs (CDs) from RetroArch.
 
 RetroArch has advanced features like shaders, netplay, rewinding, next-frame response times, runahead, machine translation, blind accessibility features, and more!</desc>
-		<releasedate>19990101T000000</releasedate>
+		<releasedate>20100525T000000</releasedate>
 		<developer>Libretro</developer>
 		<publisher>Libretro</publisher>
 		<genre>Emulator</genre>