"- Fixed some scripts

- Added xmlstarlet

com.xargon.retrodeck.yml

@@ -35,6 +35,23 @@ cleanup:
 
 modules:
 
+  - name: xmlstarlet
+    config-opts:
+      - --disable-static-libs
+      - --with-libxml-libs-prefix=/usr/lib
+      - --with-libxml-include-prefix=/usr/include/libxml2
+    sources:
+      - type: archive
+        url: https://downloads.sourceforge.net/xmlstar/xmlstarlet-1.6.1.tar.gz
+        sha256: 15d838c4f3375332fd95554619179b69e4ec91418a3a5296e7c631b7ed19e7ca
+      - type: shell
+        commands:
+          - cp -p /usr/share/automake-*/config.{sub,guess} .;
+          - autoreconf -vfi;
+    post-install:
+      - ln -s "xml" "${FLATPAK_DEST}/bin/xmlstarlet" ||:;
+    cleanup: ["*"]
+
   - name: kdialog
     buildsystem: cmake
     sources:

es_find_rules.xml

@@ -59,16 +59,6 @@
             <entry>~/bin/Dolphin_Emulator*.AppImage</entry>
         </rule>
     </emulator>
-    <emulator name="DOSBOX-STAGING">
-        <!-- DOS emulator DOSBox Staging -->
-        <rule type="systempath">
-            <entry>dosbox-staging</entry>
-            <entry>io.github.dosbox-staging</entry>
-        </rule>
-        <rule type="staticpath">
-            <entry>/var/lib/flatpak/exports/bin/io.github.dosbox-staging</entry>
-        </rule>
-    </emulator>
     <emulator name="FS-UAE">
         <!-- Commodore Amiga emulator FS-UAE -->
         <rule type="systempath">
@@ -178,13 +168,4 @@
             <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>

es_systems.xml

@@ -313,15 +313,6 @@
         <platform>daphne</platform>
         <theme>daphne</theme>
     </system>
-    <system>
-        <name>desktop</name>
-        <fullname>Desktop Applications</fullname>
-        <path>%ROMPATH%/desktop</path>
-        <extension>.sh</extension>
-        <command>bash %ROM%</command>
-        <platform>pc</platform>
-        <theme>desktop</theme>
-    </system>
     <system>
         <name>doom</name>
         <fullname>Doom</fullname>
@@ -333,13 +324,10 @@
     </system>
     <system>
         <name>dos</name>
-        <fullname>DOS (PC)</fullname>
+        <fullname>DOS</fullname>
         <path>%ROMPATH%/dos</path>
-        <extension>.bat .BAT .com .COM .conf .CONF .cue .CUE .exe .EXE .iso .ISO .7z .7Z .zip .ZIP</extension>
+        <extension>.dosz .DOSZ</extension>
-        <command label="DOSBox-Core">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_core_libretro.so %ROM%</command>
         <command label="DOSBox-Pure">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_pure_libretro.so %ROM%</command>
-        <command label="DOSBox-SVN">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_svn_libretro.so %ROM%</command>
-        <command label="DOSBox Staging (Standalone)">%EMULATOR_DOSBOX-STAGING% %ROM%</command>
         <platform>dos</platform>
         <theme>dos</theme>
     </system>
@@ -361,15 +349,6 @@
         <platform>dreamcast</platform>
         <theme>dreamcast</theme>
     </system>
-    <system>
-        <name>epic</name>
-        <fullname>Epic Games Store</fullname>
-        <path>%ROMPATH%/epic</path>
-        <extension>.sh</extension>
-        <command>bash %ROM%</command>
-        <platform>pc</platform>
-        <theme>epic</theme>
-    </system>
     <system>
         <name>famicom</name>
         <fullname>Nintendo Family Computer</fullname>
@@ -525,15 +504,6 @@
         <platform>android</platform>
         <theme>j2me</theme>
     </system>
-    <system>
-        <name>kodi</name>
-        <fullname>Kodi Home Theatre Software</fullname>
-        <path>%ROMPATH%/kodi</path>
-        <extension>.sh</extension>
-        <command>bash %ROM%</command>
-        <platform>pc</platform>
-        <theme>kodi</theme>
-    </system>
     <system>
         <name>lutris</name>
         <fullname>Lutris Open Gaming Platform</fullname>
@@ -862,18 +832,6 @@
         <platform>palm</platform>
         <theme>palm</theme>
     </system>
-    <system>
-        <name>pc</name>
-        <fullname>IBM PC</fullname>
-        <path>%ROMPATH%/pc</path>
-        <extension>.bat .BAT .com .COM .conf .CONF .cue .CUE .exe .EXE .iso .ISO .7z .7Z .zip .ZIP</extension>
-        <command label="DOSBox-Core">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_core_libretro.so %ROM%</command>
-        <command label="DOSBox-Pure">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_pure_libretro.so %ROM%</command>
-        <command label="DOSBox-SVN">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_svn_libretro.so %ROM%</command>
-        <command label="DOSBox Staging (Standalone)">%EMULATOR_DOSBOX-STAGING% %ROM%</command>
-        <platform>pc</platform>
-        <theme>pc</theme>
-    </system>
     <system>
         <name>pc88</name>
         <fullname>NEC PC-8800 Series</fullname>
@@ -931,15 +889,6 @@
         <platform>pokemini</platform>
         <theme>pokemini</theme>
     </system>
-    <system>
-        <name>ports</name>
-        <fullname>Ports</fullname>
-        <path>%ROMPATH%/ports</path>
-        <extension>.sh</extension>
-        <command>bash %ROM%</command>
-        <platform>pc</platform>
-        <theme>ports</theme>
-    </system>
     <system>
         <name>ps2</name>
         <fullname>Sony PlayStation 2</fullname>
@@ -1150,15 +1099,6 @@
         <platform>spectravideo</platform>
         <theme>spectravideo</theme>
     </system>
-    <system>
-        <name>steam</name>
-        <fullname>Valve Steam</fullname>
-        <path>%ROMPATH%/steam</path>
-        <extension>.sh</extension>
-        <command>%RUNINBACKGROUND% bash %ROM%</command>
-        <platform>steam</platform>
-        <theme>steam</theme>
-    </system>
     <system>
         <name>stratagus</name>
         <fullname>Stratagus Game Engine</fullname>
@@ -1423,7 +1363,7 @@
         <fullname>RetroDECK Tools</fullname>
         <path>/var/config/retrodeck/tools</path>
         <extension>.sh .SH</extension>
-        <command>./%ROM%</command>
+        <command>bash %ROM%</command>
         <platform>tools</platform>
         <theme>tools</theme>
     </system>

retrodeck.sh

@@ -9,8 +9,8 @@ is_mounted() {
 # if we got the .lock file it means that it's not a first run
 if [ ! -f ~/retrodeck/.lock ]
 then
-    internal=`kdialog --title "RetroDECK" -- yes-label "Internal" --no-label "SD Card" --yesno "Where do you want your rom folder to be located?"`
+    kdialog --title "RetroDECK" --yes-label "Internal" --no-label "SD Card" --yesno "Where do you want your rom folder to be located?"
-    if $internal #yes - Internal
+    if [ $? == 0 ] #yes - Internal
     then
         roms_folder=~/retrodeck/roms
     else #no - SD Card
@@ -22,11 +22,14 @@ then
             exit 0
         fi
     fi
+
+    kdialog --title "RetroDECK" --msgbox "RetroDECK will initialize the system, please wait a few minutes, a popup will tell you when the process is finished."
+
     mkdir -p $roms_folder
     rm -rf /var/config/.emulationstation/ROMs
     rm -rf /var/config/.emulationstation/roms
+    mkdir -p /var/config/.emulationstation
     ln -s $roms_folder /var/config/.emulationstation/roms
-    kdialog --Title "RetroDECK" --msgbox "Done, please put your roms in: $roms_folder. In order to change location you may use the tool provided in the tools section of RetroDECK."
 
     mkdir -p /var/config/.emulationstation
     rm -rf /var/config/.emulationstation/es_settings.xml
@@ -42,7 +45,7 @@ then
     cp -r /app/retrodeck/tools/* /var/config/retrodeck/tools
 
     mkdir -p /var/config/retroarch/system
-    ln -s ~/.var/app/com.xargon.retrodeck/config/retroarch/system/ ~/retrodeck/bios
+    ln -s ~/.var/app/com.xargon.retrodeck/config/retroarch/system ~/retrodeck/bios
         
     cp /app/retrodeck/retrodeck-retroarch.cfg /var/config/retroarch/retroarch.cfg
     
@@ -53,6 +56,8 @@ then
     cp /app/share/libretro/cores/* /var/config/retroarch/cores/
     
     touch ~/retrodeck/.lock
+
+    kdialog --title "RetroDECK" --msgbox "Initialization completed, please put your roms in: $roms_folder.\nIf you wish to change the roms location you may use the tool located the tools section of RetroDECK."
 fi
 
 #numFields=$(xmlstarlet sel -t -m '//system' -o "." /app/share/emulationstation/resources/systems/unix/es_systems.xml | wc -c)

tools-gamelist.xml

@@ -1,16 +1,10 @@
 <?xml version="1.0"?>
 <gameList>
 	<game>
-		<path>start-retroarch.sh</path>
+		<path>./start-retroarch.sh</path>
 		<name>Start RetroArch</name>
 		<sortname>RetroArch</sortname>
-		<desc>RetroArch is a frontend for emulators, game engines and media players.
+		<desc>Start RetroArch to manually tweak your settings.</desc>
-
-It enables you to run classic games on a wide range of computers and consoles through its slick graphical interface. Settings are also unified so configuration is done once and for all.
-
-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>20100525T000000</releasedate>
 		<developer>Libretro</developer>
 		<publisher>Libretro</publisher>

tools/start-retroarch.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
-yousure=kdialog --title "RetroDECK" --warningyesno "Doing some changes in the RetroArch configuration may create serious issues, please continue only if you know what you're doing. Are you sure do you want to continue?"
+kdialog --title "RetroDECK" --warningyesno "Doing some changes in the RetroArch configuration may create serious issues, please continue only if you know what you're doing. Are you sure do you want to continue?"
-if $yousure then
+if [ $? == 0 ]; then
     retroarch