Merge pull request #269 from icenine451/cooker-0.6.3b-icenine451

Cooker 0.6.3b icenine451

emu-configs/PCSX2-QT/PCSX2.ini

@@ -14,11 +14,11 @@ Theme = darkfusion
 
 
 [Folders]
-Bios = ~/retrodeck/roms/bios
+Bios = RETRODECKHOMEDIR/roms/bios
-Snapshots = ~/retrodeck/screenshots
+Snapshots = RETRODECKHOMEDIR/screenshots
-Savestates = ~/retrodeck/states/ps2/pcsx2
+Savestates = RETRODECKHOMEDIR/states/ps2/pcsx2
-MemoryCards = ~/retrodeck/saves/ps2/memcards
+MemoryCards = RETRODECKHOMEDIR/saves/ps2/memcards
-Logs = ~/retrodeck/.logs
+Logs = RETRODECKHOMEDIR/.logs
 Cheats = /var/config/PCSX2/cheats
 CheatsWS = /var/config/PCSX2/cheats_ws
 CheatsNI = cheats_ni

emu-configs/PCSX2/PCSX2.ini

@@ -296,10 +296,10 @@ Multitap2_Slot4_Filename = Mcd-Multitap2-Slot04.ps2
 
 
 [Folders]
-Bios = ~/retrodeck/bios
+Bios = RETRODECKHOMEDIR/bios
-Snapshots = ~/retrodeck/screenshots
+Snapshots = RETRODECKHOMEDIR/screenshots
-SaveStates = ~/retrodeck/states/ps2/pcsx2
+SaveStates = RETRODECKHOMEDIR/states/ps2/pcsx2
-MemoryCards = ~/retrodeck/saves/ps2/pcsx2/memcards
+MemoryCards = RETRODECKHOMEDIR/saves/ps2/pcsx2/memcards
 Logs = logs
 Cheats = cheats
 CheatsWS = cheats_ws
@@ -447,4 +447,4 @@ PressureModifier = 0.500000
 
 
 [GameList]
-RecursivePaths = ~/retrodeck/roms/ps2
+RecursivePaths = RETRODECKHOMEDIR/roms/ps2

emu-configs/PCSX2/PCSX2_ui.ini

@@ -40,11 +40,11 @@ UseDefaultLangs=enabled
 UseDefaultCheats=enabled
 UseDefaultCheatsWS=enabled
 UseDefaultTextures=enabled
-Bios=~/retrodeck/roms/bios
+Bios=RETRODECKHOMEDIR/roms/bios
-Snapshots=~/retrodeck/screenshots
+Snapshots=RETRODECKHOMEDIR/screenshots
-Savestates=~/retrodeck/states/ps2/pcsx2
+Savestates=RETRODECKHOMEDIR/states/ps2/pcsx2
-MemoryCards=~/retrodeck/saves/ps2/memcards
+MemoryCards=RETRODECKHOMEDIR/saves/ps2/memcards
-Logs=~/retrodeck/.logs
+Logs=RETRODECKHOMEDIR/.logs
 Langs=/app/share/PCSX2/resources/locale
 Cheats=/var/config/PCSX2/cheats
 CheatsWS=/var/config/PCSX2/cheats_ws

emu-configs/dolphin/Dolphin.ini

@@ -24,19 +24,19 @@ DSPHLE = True
 Fullscreen = True
 DisableScreenSaver = True
 [GBA]
-BIOS = ~/retrodeck/bios
+BIOS = RETRODECKHOMEDIR/bios
 Rom1 =
 Rom2 =
 Rom3 =
 Rom4 =
 SavesInRomPath = False
-SavesPath = ~/retrodeck/saves/gba
+SavesPath = RETRODECKHOMEDIR/saves/gba
 Threads = True
 [General]
-ISOPath0 = ~/retrodeck/roms/wii
+ISOPath0 = RETRODECKHOMEDIR/roms/wii
-ISOPath1 = ~/retrodeck/roms/gc
+ISOPath1 = RETRODECKHOMEDIR/roms/gc
 ISOPaths = 2
-WiiSDCardPath = ~/retrodeck/saves/wii/dolphin/sd.raw
+WiiSDCardPath = RETRODECKHOMEDIR/saves/wii/dolphin/sd.raw
 WirelessMac = 00:17:ab:83:9b:d4
 HotkeysRequireFocus = True
 RecursiveISOPaths = True

emu-configs/melonDS.ini

@@ -75,9 +75,9 @@ JIT_BranchOptimisations=1
 JIT_LiteralOptimisations=1
 JIT_FastMemory=1
 ExternalBIOSEnable=1
-BIOS9Path=~/retrodeck/bios/bios9.bin
+BIOS9Path=RETRODECKHOMEDIR/bios/bios9.bin
-BIOS7Path=~/retrodeck/bios/bios7.bin
+BIOS7Path=RETRODECKHOMEDIR/bios/bios7.bin
-FirmwarePath=~/retrodeck/bios/firmware.bin
+FirmwarePath=RETRODECKHOMEDIR/bios/firmware.bin
 DSiBIOS9Path=
 DSiBIOS7Path=
 DSiFirmwarePath=
@@ -123,8 +123,8 @@ RecentROM_6=
 RecentROM_7=
 RecentROM_8=
 RecentROM_9=
-SaveFilePath=~/retrodeck/saves/nds/melonds
+SaveFilePath=RETRODECKHOMEDIR/saves/nds/melonds
-SavestatePath=~/retrodeck/states/nds/melonds
+SavestatePath=RETRODECKHOMEDIR/states/nds/melonds
 CheatFilePath=
 EnableCheats=0
 MouseHide=0

emu-configs/retroarch/retroarch.cfg

@@ -3036,12 +3036,12 @@ run_ahead_hide_warnings = "false"
 run_ahead_secondary_instance = "true"
 runtime_log_directory = "default"
 save_file_compression = "false"
-savefile_directory = "~/retrodeck/saves"
+savefile_directory = "RETRODECKHOMEDIR/saves"
 savefiles_in_content_dir = "false"
 savestate_auto_index = "false"
 savestate_auto_load = "true"
 savestate_auto_save = "true"
-savestate_directory = "~/retrodeck/states"
+savestate_directory = "RETRODECKHOMEDIR/states"
 savestate_file_compression = "true"
 savestate_max_keep = "0"
 savestate_thumbnail_enable = "false"
@@ -3049,7 +3049,7 @@ savestates_in_content_dir = "false"
 scan_without_core_match = "false"
 screen_brightness = "100"
 screen_orientation = "0"
-screenshot_directory = "~/retrodeck/screenshots"
+screenshot_directory = "RETRODECKHOMEDIR/screenshots"
 screenshots_in_content_dir = "false"
 settings_show_accessibility = "true"
 settings_show_achievements = "true"

es-configs/es_systems.xml

@@ -1613,7 +1613,7 @@
     <system>
         <name>tools</name>
         <fullname>RetroDECK Tools</fullname>
-        <path>/var/config/retrodeck/tools</path>
+        <path>/app/bin/tools</path>
         <extension>.sh .SH</extension>
         <command>bash %ROM%</command>
         <platform>tools</platform>

es-configs/tools-gamelist.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <gameList>
 	<game>
-		<path>/app/bin/configurator.sh</path>
+		<path>./configurator.sh</path>
 		<name>RetroDECK Configurator</name>
 		<desc>Change settings, move folders and more!</desc>
 		<nogamecount>true</nogamecount>

functions.sh

@@ -763,7 +763,7 @@ yuzu_init() {
   rm -rf /var/config/yuzu
   mkdir -pv /var/config/yuzu/
   cp -fvr $emuconfigs/yuzu/* /var/config/yuzu/
-  sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/yuzu/qt-config.ini
+  sed -i 's#RETRODECKHOMEDIR#'$rdhome'#g' /var/config/yuzu/qt-config.ini
   dir_prep "$rdhome/screenshots" "/var/data/yuzu/screenshots"
 }
 
@@ -775,7 +775,7 @@ dolphin_init() {
   rm -rf /var/config/dolphin-emu
   mkdir -pv /var/config/dolphin-emu/
   cp -fvr "$emuconfigs/dolphin/"* /var/config/dolphin-emu/
-  sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/dolphin-emu/Dolphin.ini
+  sed -i 's#RETRODECKHOMEDIR#'$rdhome'#g' /var/config/dolphin-emu/Dolphin.ini
   dir_prep "$rdhome/saves/gc/dolphin/EUR" "/var/data/dolphin-emu/GC/EUR"
   dir_prep "$rdhome/saves/gc/dolphin/USA" "/var/data/dolphin-emu/GC/USA"
   dir_prep "$rdhome/saves/gc/dolphin/JAP" "/var/data/dolphin-emu/GC/JAP"
@@ -793,7 +793,7 @@ primehack_init() {
   rm -rf /var/config/primehack
   mkdir -pv /var/config/primehack/
   cp -fvr "$emuconfigs/primehack/"* /var/config/primehack/
-  sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/primehack/Dolphin.ini
+  sed -i 's#RETRODECKHOMEDIR#'$rdhome'#g' /var/config/primehack/Dolphin.ini
   dir_prep "$rdhome/saves/gc/primehack/EUR" "/var/data/primehack/GC/EUR"
   dir_prep "$rdhome/saves/gc/primehack/USA" "/var/data/primehack/GC/USA"
   dir_prep "$rdhome/saves/gc/primehack/JAP" "/var/data/primehack/GC/JAP"
@@ -813,8 +813,8 @@ pcsx2_init() {
   mkdir -pv "$rdhome/saves/ps2/pcsx2/memcards"
   mkdir -pv "$rdhome/states/ps2/pcsx2"
   cp -fvr $emuconfigs/PCSX2/* /var/config/PCSX2/inis/
-  sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/PCSX2/inis/PCSX2_ui.ini
+  sed -i 's#RETRODECKHOMEDIR#'$rdhome'#g' /var/config/PCSX2/inis/PCSX2_ui.ini
-  sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/PCSX2/inis/PCSX2.ini
+  sed -i 's#RETRODECKHOMEDIR#'$rdhome'#g' /var/config/PCSX2/inis/PCSX2.ini
   #dir_prep "$rdhome/states/ps2/pcsx2" "/var/config/PCSX2/sstates"
   #dir_prep "$rdhome/screenshots" "/var/config/PCSX2/snaps"
   #dir_prep "$rdhome/.logs" "/var/config/PCSX2/logs"
@@ -832,8 +832,7 @@ melonds_init() {
   mkdir -pv "$rdhome/states/nds/melonds"
   dir_prep "$rdhome/bios" "/var/config/melonDS/bios"
   cp -fvr $emuconfigs/melonDS.ini /var/config/melonDS/
-  # Replace ~/retrodeck with $rdhome as ~ cannot be understood by MelonDS
+  sed -i 's#RETRODECKHOMEDIR#'$rdhome'#g' /var/config/melonDS/melonDS.ini
-  sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/melonDS/melonDS.ini
 }
 
 citra_init() {
@@ -848,7 +847,7 @@ citra_init() {
   dir_prep "$rdhome/bios/citra/sysdata" "/var/data/citra-emu/sysdata"
   dir_prep "$rdhome/.logs/citra" "/var/data/citra-emu/log"
   cp -fv $emuconfigs/citra/qt-config.ini /var/config/citra-emu/qt-config.ini
-  sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/citra-emu/qt-config.ini
+  sed -i 's#RETRODECKHOMEDIR#'$rdhome'#g' /var/config/citra-emu/qt-config.ini
 }
 
 rpcs3_init() {
@@ -953,7 +952,7 @@ ra_init() {
   mkdir -pv /var/config/retroarch/config/
   cp -rf $emuconfigs/retroarch/core-overrides/* /var/config/retroarch/config
   #rm -rf $rdhome/bios/bios # in some situations a double bios symlink is created
-  sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/retroarch/retroarch.cfg
+  sed -i 's#RETRODECKHOMEDIR#'$rdhome'#g' /var/config/retroarch/retroarch.cfg
 
   # PPSSPP
   echo "--------------------------------"
@@ -1054,6 +1053,7 @@ emulators_post_move() {
   dir_prep "$rdhome/bios" "/var/config/retroarch/system"
   dir_prep "$rdhome/.logs/retroarch" "/var/config/retroarch/logs"
   dir_prep "$rdhome/shaders/retroarch" "/var/config/retroarch/shaders"
+  sed -i 's#RETRODECKHOMEDIR#'$rdhome'#g' /var/config/retroarch/retroarch.cfg
 
   # Yuzu section
   dir_prep "$rdhome/bios/switch/keys" "/var/data/yuzu/keys"
@@ -1062,10 +1062,10 @@ emulators_post_move() {
   dir_prep "$rdhome/saves/switch/yuzu/sdmc" "/var/data/yuzu/sdmc"
   dir_prep "$rdhome/.logs/yuzu" "/var/data/yuzu/log"
   dir_prep "$rdhome/screenshots" "/var/data/yuzu/screenshots"
-  sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/yuzu/qt-config.ini
+  sed -i 's#RETRODECKHOMEDIR#'$rdhome'#g' /var/config/yuzu/qt-config.ini
 
   # Dolphin section
-  sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/dolphin-emu/Dolphin.ini
+  sed -i 's#RETRODECKHOMEDIR#'$rdhome'#g' /var/config/dolphin-emu/Dolphin.ini
   dir_prep "$rdhome/saves/gc/dolphin/EUR" "/var/data/dolphin-emu/GC/EUR"
   dir_prep "$rdhome/saves/gc/dolphin/USA" "/var/data/dolphin-emu/GC/USA"
   dir_prep "$rdhome/saves/gc/dolphin/JAP" "/var/data/dolphin-emu/GC/JAP"
@@ -1074,7 +1074,7 @@ emulators_post_move() {
   dir_prep "$rdhome/saves/wii/dolphin" "/var/data/dolphin-emu/Wii/"
 
   # Primehack section
-  sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/primehack/Dolphin.ini
+  sed -i 's#RETRODECKHOMEDIR#'$rdhome'#g' /var/config/primehack/Dolphin.ini
   dir_prep "$rdhome/saves/gc/primehack/EUR" "/var/data/primehack/GC/EUR"
   dir_prep "$rdhome/saves/gc/primehack/USA" "/var/data/primehack/GC/USA"
   dir_prep "$rdhome/saves/gc/primehack/JAP" "/var/data/primehack/GC/JAP"
@@ -1083,17 +1083,17 @@ emulators_post_move() {
   dir_prep "$rdhome/saves/wii/primehack" "/var/data/primehack/Wii/"
 
   # PCSX2 section
-  sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/PCSX2/inis/PCSX2_ui.ini
+  sed -i 's#RETRODECKHOMEDIR#'$rdhome'#g' /var/config/PCSX2/inis/PCSX2_ui.ini
-  sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/PCSX2/inis/PCSX2.ini
+  sed -i 's#RETRODECKHOMEDIR#'$rdhome'#g' /var/config/PCSX2/inis/PCSX2.ini
 
   # MelonDS section
   dir_prep "$rdhome/bios" "/var/config/melonDS/bios"
-  sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/melonDS/melonDS.ini
+  sed -i 's#RETRODECKHOMEDIR#'$rdhome'#g' /var/config/melonDS/melonDS.ini
 
   # Citra section
   dir_prep "$rdhome/bios/citra/sysdata" "/var/data/citra-emu/sysdata"
   dir_prep "$rdhome/.logs/citra" "/var/data/citra-emu/log"
-  sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/citra-emu/qt-config.ini
+  sed -i 's#RETRODECKHOMEDIR#'$rdhome'#g' /var/config/citra-emu/qt-config.ini
 
   # RPCS3 section
   sed -i 's#/home/deck/retrodeck#'$rdhome'#g' /var/config/rpcs3/vfs.yml

net.retrodeck.retrodeck.yml

@@ -1061,14 +1061,15 @@ modules:
       - cp -f res/splash.svg ${FLATPAK_DEST}/emulationstation/graphics/splash-orig.svg
       - cp -f res/icon.svg /app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg
 
-      # Tools
+      # RetroDECK core script
-      - mv -f es-configs/tools-gamelist.xml ${FLATPAK_DEST}/retrodeck/
-
-      # Launchable scripts
       - cp retrodeck.sh /app/bin/retrodeck.sh
       - chmod +x /app/bin/retrodeck.sh
-      - cp tools/configurator.sh /app/bin/configurator.sh
+
+      # Tools
+      - mkdir -p /app/bin/tools
+      - cp tools/configurator.sh /app/bin/tools/configurator.sh
       - chmod +x /app/bin/configurator.sh
+      - cp es-configs/tools-gamelist.xml /app/bin/tools/tools-gamelist.xml
 
       # Function libraries
       - mkdir -p /app/libexec

post_update.sh

@@ -212,9 +212,9 @@ post_update() {
     dir_prep "$bios_folder/pico-8" "$HOME/.lexaloffle/pico-8" # Store binary and config files together. The .lexaloffle directory is a hard-coded location for the PICO-8 config file, cannot be changed
 
     cp -fv $emuconfigs/citra/qt-config.ini /var/config/citra-emu/qt-config.ini
-    sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/citra-emu/qt-config.ini
+    sed -i 's#RETRODECKHOMEDIR#'$rdhome'#g' /var/config/citra-emu/qt-config.ini
     cp -fvr $emuconfigs/yuzu/* /var/config/yuzu/
-    sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/yuzu/qt-config.ini
+    sed -i 's#RETRODECKHOMEDIR#'$rdhome'#g' /var/config/yuzu/qt-config.ini
   fi
 
   # The following commands are run every time.

rd-submodules/retroarch

@@ -1 +1 @@
-Subproject commit 717b78093797270877ec416e58082f1c71d435d8
+Subproject commit 0b1cfb79e591e10488a3262d6b38db843c39a409