Merge remote-tracking branch 'upstream/cooker-0.6.3b' into cooker-0.7.0b-icenine451

This commit is contained in:
icenine451 2023-03-23 14:19:18 -04:00
commit 8d35c97ade
19 changed files with 264 additions and 188 deletions

View file

@ -17,9 +17,10 @@ jobs:
runs-on: self-hosted runs-on: self-hosted
steps: steps:
# - name: Remove stuck mounts # Circumventing this bug: https://github.com/flatpak/flatpak-builder/issues/317
# run: sudo umount -f /home/administrator/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/* - name: Remove stuck mounts
# continue-on-error: true run: sudo umount -f /home/ubuntu/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/*
continue-on-error: true
- name: Generate build ID - name: Generate build ID
id: generating_buildid id: generating_buildid
@ -80,7 +81,8 @@ jobs:
artifacts: "RetroDECK.flatpak,RetroDECK-Artifact.tar.gz" artifacts: "RetroDECK.flatpak,RetroDECK-Artifact.tar.gz"
allowUpdates: true allowUpdates: true
#prerelease: true #prerelease: true
draft: false makeLatest: true
#draft: true
token: ${{ secrets.TRIGGER_BUILD_TOKEN }} token: ${{ secrets.TRIGGER_BUILD_TOKEN }}
repo: RetroDECK-cooker repo: RetroDECK-cooker
continue-on-error: true continue-on-error: true

View file

@ -17,9 +17,10 @@ jobs:
runs-on: self-hosted runs-on: self-hosted
steps: steps:
# - name: Remove stuck mounts # Circumventing this bug: https://github.com/flatpak/flatpak-builder/issues/317
# run: sudo umount -f /home/administrator/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/* - name: Remove stuck mounts
# continue-on-error: true run: sudo umount -f /home/ubuntu/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/*
continue-on-error: true
- name: Generate build ID - name: Generate build ID
id: generating_buildid id: generating_buildid
@ -81,7 +82,8 @@ jobs:
bodyFile: "body.md" bodyFile: "body.md"
artifacts: "RetroDECK.flatpak,RetroDECK-Artifact.tar.gz" artifacts: "RetroDECK.flatpak,RetroDECK-Artifact.tar.gz"
allowUpdates: true allowUpdates: true
prerelease: true #prerelease: true
makeLatest: true
token: ${{ secrets.TRIGGER_BUILD_TOKEN }} token: ${{ secrets.TRIGGER_BUILD_TOKEN }}
repo: RetroDECK repo: RetroDECK
continue-on-error: true continue-on-error: true

View file

@ -14,11 +14,11 @@ Theme = darkfusion
[Folders] [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 Cheats = /var/config/PCSX2/cheats
CheatsWS = /var/config/PCSX2/cheats_ws CheatsWS = /var/config/PCSX2/cheats_ws
CheatsNI = cheats_ni CheatsNI = cheats_ni

View file

@ -296,10 +296,10 @@ Multitap2_Slot4_Filename = Mcd-Multitap2-Slot04.ps2
[Folders] [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 Logs = logs
Cheats = cheats Cheats = cheats
CheatsWS = cheats_ws CheatsWS = cheats_ws
@ -447,4 +447,4 @@ PressureModifier = 0.500000
[GameList] [GameList]
RecursivePaths = ~/retrodeck/roms/ps2 RecursivePaths = RETRODECKHOMEDIR/roms/ps2

View file

@ -40,11 +40,11 @@ UseDefaultLangs=enabled
UseDefaultCheats=enabled UseDefaultCheats=enabled
UseDefaultCheatsWS=enabled UseDefaultCheatsWS=enabled
UseDefaultTextures=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 Langs=/app/share/PCSX2/resources/locale
Cheats=/var/config/PCSX2/cheats Cheats=/var/config/PCSX2/cheats
CheatsWS=/var/config/PCSX2/cheats_ws CheatsWS=/var/config/PCSX2/cheats_ws

View file

@ -104,9 +104,9 @@ use_cpu_jit=true
use_cpu_jit\default=true use_cpu_jit\default=true
[Data%20Storage] [Data%20Storage]
nand_directory=/home/deck/retrodeck/saves/n3ds/citra/nand/ nand_directory=RETRODECKHOMEDIR/saves/n3ds/citra/nand/
nand_directory\default=false nand_directory\default=false
sdmc_directory=/home/deck/retrodeck/saves/n3ds/citra/sdmc/ sdmc_directory=RETRODECKHOMEDIR/saves/n3ds/citra/sdmc/
sdmc_directory\default=false sdmc_directory\default=false
use_custom_storage=true use_custom_storage=true
use_custom_storage\default=false use_custom_storage\default=false
@ -335,7 +335,7 @@ Paths\gamedirs\3\deep_scan=false
Paths\gamedirs\3\deep_scan\default=true Paths\gamedirs\3\deep_scan\default=true
Paths\gamedirs\3\expanded=true Paths\gamedirs\3\expanded=true
Paths\gamedirs\3\expanded\default=true Paths\gamedirs\3\expanded\default=true
Paths\gamedirs\3\path=/home/deck/retrodeck/roms/n3ds Paths\gamedirs\3\path=RETRODECKHOMEDIR/roms/n3ds
Paths\gamedirs\size=3 Paths\gamedirs\size=3
Paths\language=en Paths\language=en
Paths\language\default=false Paths\language\default=false
@ -343,7 +343,7 @@ Paths\moviePlaybackPath=
Paths\movieRecordPath= Paths\movieRecordPath=
Paths\recentFiles=@Invalid() Paths\recentFiles=@Invalid()
Paths\romsPath= Paths\romsPath=
Paths\screenshotPath=/home/deck/retrodeck/screenshots Paths\screenshotPath=RETRODECKHOMEDIR/screenshots
Paths\screenshotPath\default=false Paths\screenshotPath\default=false
Paths\symbolsPath= Paths\symbolsPath=
Paths\videoDumpingPath= Paths\videoDumpingPath=
@ -369,8 +369,8 @@ Shortcuts\Main%20Window\Decrease%20Speed%20Limit\KeySeq=-
Shortcuts\Main%20Window\Decrease%20Speed%20Limit\KeySeq\default=true Shortcuts\Main%20Window\Decrease%20Speed%20Limit\KeySeq\default=true
Shortcuts\Main%20Window\Exit%20Citra\Context=1 Shortcuts\Main%20Window\Exit%20Citra\Context=1
Shortcuts\Main%20Window\Exit%20Citra\Context\default=true Shortcuts\Main%20Window\Exit%20Citra\Context\default=true
Shortcuts\Main%20Window\Exit%20Citra\KeySeq=T Shortcuts\Main%20Window\Exit%20Citra\KeySeq=Ctrl+Q
Shortcuts\Main%20Window\Exit%20Citra\KeySeq\default=false Shortcuts\Main%20Window\Exit%20Citra\KeySeq\default=true
Shortcuts\Main%20Window\Exit%20Fullscreen\Context=1 Shortcuts\Main%20Window\Exit%20Fullscreen\Context=1
Shortcuts\Main%20Window\Exit%20Fullscreen\Context\default=true Shortcuts\Main%20Window\Exit%20Fullscreen\Context\default=true
Shortcuts\Main%20Window\Exit%20Fullscreen\KeySeq=Y Shortcuts\Main%20Window\Exit%20Fullscreen\KeySeq=Y
@ -425,8 +425,8 @@ Shortcuts\Main%20Window\Stop%20Emulation\KeySeq=F5
Shortcuts\Main%20Window\Stop%20Emulation\KeySeq\default=true Shortcuts\Main%20Window\Stop%20Emulation\KeySeq\default=true
Shortcuts\Main%20Window\Swap%20Screens\Context=1 Shortcuts\Main%20Window\Swap%20Screens\Context=1
Shortcuts\Main%20Window\Swap%20Screens\Context\default=true Shortcuts\Main%20Window\Swap%20Screens\Context\default=true
Shortcuts\Main%20Window\Swap%20Screens\KeySeq=F9 Shortcuts\Main%20Window\Swap%20Screens\KeySeq=T
Shortcuts\Main%20Window\Swap%20Screens\KeySeq\default=true Shortcuts\Main%20Window\Swap%20Screens\KeySeq\default=false
Shortcuts\Main%20Window\Toggle%203D\Context=2 Shortcuts\Main%20Window\Toggle%203D\Context=2
Shortcuts\Main%20Window\Toggle%203D\Context\default=true Shortcuts\Main%20Window\Toggle%203D\Context\default=true
Shortcuts\Main%20Window\Toggle%203D\KeySeq=Ctrl+3 Shortcuts\Main%20Window\Toggle%203D\KeySeq=Ctrl+3

View file

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

View file

@ -75,9 +75,9 @@ JIT_BranchOptimisations=1
JIT_LiteralOptimisations=1 JIT_LiteralOptimisations=1
JIT_FastMemory=1 JIT_FastMemory=1
ExternalBIOSEnable=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= DSiBIOS9Path=
DSiBIOS7Path= DSiBIOS7Path=
DSiFirmwarePath= DSiFirmwarePath=
@ -123,8 +123,8 @@ RecentROM_6=
RecentROM_7= RecentROM_7=
RecentROM_8= RecentROM_8=
RecentROM_9= RecentROM_9=
SaveFilePath=~/retrodeck/saves/nds/melonds SaveFilePath=RETRODECKHOMEDIR/saves/nds/melonds
SavestatePath=~/retrodeck/states/nds/melonds SavestatePath=RETRODECKHOMEDIR/states/nds/melonds
CheatFilePath= CheatFilePath=
EnableCheats=0 EnableCheats=0
MouseHide=0 MouseHide=0

View file

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

View file

@ -805,7 +805,7 @@ cpuopt_unsafe_unfuse_fma=true
cpuopt_unsafe_unfuse_fma\default=true cpuopt_unsafe_unfuse_fma\default=true
[Data%20Storage] [Data%20Storage]
dump_directory=/home/deck/.var/app/net.retrodeck.retrodeck/data/yuzu/dump dump_directory=/var/data/yuzu/dump
dump_directory\default=true dump_directory\default=true
gamecard_current_game=false gamecard_current_game=false
gamecard_current_game\default=true gamecard_current_game\default=true
@ -813,13 +813,13 @@ gamecard_inserted=false
gamecard_inserted\default=true gamecard_inserted\default=true
gamecard_path= gamecard_path=
gamecard_path\default=true gamecard_path\default=true
load_directory=/home/deck/.var/app/net.retrodeck.retrodeck/data/yuzu/load load_directory=/var/data/yuzu/load
load_directory\default=true load_directory\default=true
nand_directory=/home/deck/retrodeck/saves/switch/yuzu/nand nand_directory=RETRODECKHOMEDIR/saves/switch/yuzu/nand
nand_directory\default=true nand_directory\default=true
sdmc_directory=/home/deck/retrodeck/saves/switch/yuzu/sdmc sdmc_directory=RETRODECKHOMEDIR/saves/switch/yuzu/sdmc
sdmc_directory\default=true sdmc_directory\default=true
tas_directory=/home/deck/.var/app/net.retrodeck.retrodeck/data/yuzu/tas tas_directory=/var/data/yuzu/tas
tas_directory\default=true tas_directory\default=true
use_virtual_sd=true use_virtual_sd=true
use_virtual_sd\default=true use_virtual_sd\default=true
@ -995,7 +995,7 @@ Paths\gamedirs\4\deep_scan=false
Paths\gamedirs\4\deep_scan\default=true Paths\gamedirs\4\deep_scan\default=true
Paths\gamedirs\4\expanded=true Paths\gamedirs\4\expanded=true
Paths\gamedirs\4\expanded\default=true Paths\gamedirs\4\expanded\default=true
Paths\gamedirs\4\path=/home/deck/retrodeck/roms/switch Paths\gamedirs\4\path=RETRODECKHOMEDIR/roms/switch
Paths\gamedirs\size=4 Paths\gamedirs\size=4
Paths\language=en Paths\language=en
Paths\language\default=false Paths\language\default=false
@ -1004,7 +1004,7 @@ Paths\romsPath=
Paths\symbolsPath= Paths\symbolsPath=
Screenshots\enable_screenshot_save_as=true Screenshots\enable_screenshot_save_as=true
Screenshots\enable_screenshot_save_as\default=true Screenshots\enable_screenshot_save_as\default=true
Screenshots\screenshot_path=/home/deck/retrodeck/screenshots/ Screenshots\screenshot_path=RETRODECKHOMEDIR/screenshots/
Shortcuts\Main%20Window\Audio%20Mute\Unmute\Context=1 Shortcuts\Main%20Window\Audio%20Mute\Unmute\Context=1
Shortcuts\Main%20Window\Audio%20Mute\Unmute\Context\default=true Shortcuts\Main%20Window\Audio%20Mute\Unmute\Context\default=true
Shortcuts\Main%20Window\Audio%20Mute\Unmute\Controller_KeySeq=Home+Dpad_Right Shortcuts\Main%20Window\Audio%20Mute\Unmute\Controller_KeySeq=Home+Dpad_Right

View file

@ -327,18 +327,6 @@
<entry>~/bin/pcsx2*-Qt.AppImage</entry> <entry>~/bin/pcsx2*-Qt.AppImage</entry>
</rule> </rule>
</emulator> </emulator>
<emulator name="PCSX2-LEGACY">
<!-- Sony PlayStation 2 emulator PCSX2 (legacy) -->
<rule type="systempath">
<entry>PCSX2</entry>
<entry>pcsx2</entry>
<entry>net.pcsx2.PCSX2</entry>
</rule>
<rule type="staticpath">
<entry>/var/lib/flatpak/exports/bin/net.pcsx2.PCSX2</entry>
<entry>~/.local/share/flatpak/exports/bin/net.pcsx2.PCSX2</entry>
</rule>
</emulator>
<emulator name="PICO-8"> <emulator name="PICO-8">
<!-- PICO-8 Fantasy Console (game engine) --> <!-- PICO-8 Fantasy Console (game engine) -->
<rule type="systempath"> <rule type="systempath">

View file

@ -824,7 +824,7 @@
<fullname>Nintendo 3DS</fullname> <fullname>Nintendo 3DS</fullname>
<path>%ROMPATH%/n3ds</path> <path>%ROMPATH%/n3ds</path>
<extension>.3ds .3DS .3dsx .3DSX .app .APP .axf .AXF .cci .CCI .cxi .CXI .elf .ELF .7z .7Z .zip .ZIP</extension> <extension>.3ds .3DS .3dsx .3DSX .app .APP .axf .AXF .cci .CCI .cxi .CXI .elf .ELF .7z .7Z .zip .ZIP</extension>
<command label="Citra (Standalone)">%EMULATOR_CITRA% -f %ROM%</command> <command label="Citra (Standalone)">%EMULATOR_CITRA% %ROM%</command>
<command label="Citra">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/citra_libretro.so %ROM%</command> <command label="Citra">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/citra_libretro.so %ROM%</command>
<command label="Citra 2018">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/citra2018_libretro.so %ROM%</command> <command label="Citra 2018">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/citra2018_libretro.so %ROM%</command>
<platform>n3ds</platform> <platform>n3ds</platform>
@ -1071,7 +1071,6 @@
<command label="PCSX2 (Standalone)">%EMULATOR_PCSX2% -batch %ROM%</command> <command label="PCSX2 (Standalone)">%EMULATOR_PCSX2% -batch %ROM%</command>
<extension>.bin .BIN .chd .CHD .ciso .CISO .cso .CSO .dump .DUMP .elf .ELF .gz .GZ .m3u .M3U .mdf .MDF .img .IMG .iso .ISO .isz .ISZ .ngr .NRG</extension> <extension>.bin .BIN .chd .CHD .ciso .CISO .cso .CSO .dump .DUMP .elf .ELF .gz .GZ .m3u .M3U .mdf .MDF .img .IMG .iso .ISO .isz .ISZ .ngr .NRG</extension>
<command label="PCSX2">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pcsx2_libretro.so %ROM%</command> <command label="PCSX2">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pcsx2_libretro.so %ROM%</command>
<!-- <command label="PCSX2 Legacy (Standalone)">%EMULATOR_PCSX2-LEGACY% -REMOVEME-nogui %ROM%</command> -->
<!-- <command label="Play! (Standalone)">%EMULATOR_PLAY!% &#45;&#45;disc %ROM%</command> --> <!-- <command label="Play! (Standalone)">%EMULATOR_PLAY!% &#45;&#45;disc %ROM%</command> -->
<platform>ps2</platform> <platform>ps2</platform>
<theme>ps2</theme> <theme>ps2</theme>
@ -1614,7 +1613,7 @@
<system> <system>
<name>tools</name> <name>tools</name>
<fullname>RetroDECK Tools</fullname> <fullname>RetroDECK Tools</fullname>
<path>/var/config/retrodeck/tools</path> <path>/app/tools</path>
<extension>.sh .SH</extension> <extension>.sh .SH</extension>
<command>bash %ROM%</command> <command>bash %ROM%</command>
<platform>tools</platform> <platform>tools</platform>

View file

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

View file

@ -868,6 +868,13 @@ dir_prep() {
echo -e "\n[DIR PREP]\nMoving $symlink in $real" #DEBUG echo -e "\n[DIR PREP]\nMoving $symlink in $real" #DEBUG
# if the symlink dir is already a symlink, unlink it first, to prevent recursion
if [ -L "$symlink" ];
then
echo "$symlink is already a symlink, unlinking to prevent recursives" #DEBUG
unlink "$symlink"
fi
# if the dest dir exists we want to backup it # if the dest dir exists we want to backup it
if [ -d "$symlink" ]; if [ -d "$symlink" ];
then then
@ -878,6 +885,7 @@ dir_prep() {
# if the real dir is already a symlink, unlink it first # if the real dir is already a symlink, unlink it first
if [ -L "$real" ]; if [ -L "$real" ];
then then
echo "$real is already a symlink, unlinking to prevent recursives" #DEBUG
unlink "$real" unlink "$real"
fi fi
@ -926,7 +934,7 @@ yuzu_init() {
rm -rf /var/config/yuzu rm -rf /var/config/yuzu
mkdir -pv /var/config/yuzu/ mkdir -pv /var/config/yuzu/
cp -fvr $emuconfigs/yuzu/* /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" dir_prep "$rdhome/screenshots" "/var/data/yuzu/screenshots"
dir_prep "$mods_folder/Yuzu" "/var/data/yuzu/load" dir_prep "$mods_folder/Yuzu" "/var/data/yuzu/load"
} }
@ -939,7 +947,7 @@ dolphin_init() {
rm -rf /var/config/dolphin-emu rm -rf /var/config/dolphin-emu
mkdir -pv /var/config/dolphin-emu/ mkdir -pv /var/config/dolphin-emu/
cp -fvr "$emuconfigs/dolphin/"* /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/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/USA" "/var/data/dolphin-emu/GC/USA"
dir_prep "$rdhome/saves/gc/dolphin/JAP" "/var/data/dolphin-emu/GC/JAP" dir_prep "$rdhome/saves/gc/dolphin/JAP" "/var/data/dolphin-emu/GC/JAP"
@ -959,7 +967,7 @@ primehack_init() {
rm -rf /var/config/primehack rm -rf /var/config/primehack
mkdir -pv /var/config/primehack/ mkdir -pv /var/config/primehack/
cp -fvr "$emuconfigs/primehack/"* /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/EUR" "/var/data/primehack/GC/EUR"
dir_prep "$rdhome/saves/gc/primehack/USA" "/var/data/primehack/GC/USA" dir_prep "$rdhome/saves/gc/primehack/USA" "/var/data/primehack/GC/USA"
dir_prep "$rdhome/saves/gc/primehack/JAP" "/var/data/primehack/GC/JAP" dir_prep "$rdhome/saves/gc/primehack/JAP" "/var/data/primehack/GC/JAP"
@ -981,8 +989,8 @@ pcsx2_init() {
mkdir -pv "$rdhome/saves/ps2/pcsx2/memcards" mkdir -pv "$rdhome/saves/ps2/pcsx2/memcards"
mkdir -pv "$rdhome/states/ps2/pcsx2" mkdir -pv "$rdhome/states/ps2/pcsx2"
cp -fvr $emuconfigs/PCSX2/* /var/config/PCSX2/inis/ 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/states/ps2/pcsx2" "/var/config/PCSX2/sstates"
#dir_prep "$rdhome/screenshots" "/var/config/PCSX2/snaps" #dir_prep "$rdhome/screenshots" "/var/config/PCSX2/snaps"
#dir_prep "$rdhome/.logs" "/var/config/PCSX2/logs" #dir_prep "$rdhome/.logs" "/var/config/PCSX2/logs"
@ -1000,8 +1008,7 @@ melonds_init() {
mkdir -pv "$rdhome/states/nds/melonds" mkdir -pv "$rdhome/states/nds/melonds"
dir_prep "$rdhome/bios" "/var/config/melonDS/bios" dir_prep "$rdhome/bios" "/var/config/melonDS/bios"
cp -fvr $emuconfigs/melonDS.ini /var/config/melonDS/ 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() { citra_init() {
@ -1016,7 +1023,7 @@ citra_init() {
dir_prep "$rdhome/bios/citra/sysdata" "/var/data/citra-emu/sysdata" dir_prep "$rdhome/bios/citra/sysdata" "/var/data/citra-emu/sysdata"
dir_prep "$rdhome/.logs/citra" "/var/data/citra-emu/log" dir_prep "$rdhome/.logs/citra" "/var/data/citra-emu/log"
cp -fv $emuconfigs/citra/qt-config.ini /var/config/citra-emu/qt-config.ini 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
dir_prep "$mods_folder/Citra" "/var/data/citra-emu/load/mods/" dir_prep "$mods_folder/Citra" "/var/data/citra-emu/load/mods/"
dir_prep "$texture_packs_folder/Citra" "/var/data/citra-emu/load/textures/" dir_prep "$texture_packs_folder/Citra" "/var/data/citra-emu/load/textures/"
} }
@ -1039,9 +1046,10 @@ xemu_init() {
mkdir -pv $rdhome/saves/xbox/xemu/ mkdir -pv $rdhome/saves/xbox/xemu/
# removing config directory to wipe legacy files # removing config directory to wipe legacy files
rm -rf /var/config/xemu rm -rf /var/config/xemu
mkdir -pv /var/data/xemu/ rm -rf /var/data/xemu
cp -fv $emuconfigs/xemu.toml /var/data/xemu/xemu.toml dir_prep "/var/config/xemu" "/var/data/xemu" # Creating config folder in /var/config for consistentcy and linking back to original location where emulator will look
sed -i 's#/home/deck/retrodeck#'$rdhome'#g' /var/data/xemu/xemu.toml cp -fv $emuconfigs/xemu.toml /var/config/xemu/xemu.toml
sed -i 's#/home/deck/retrodeck#'$rdhome'#g' /var/config/xemu/xemu.toml
# Preparing HD dummy Image if the image is not found # Preparing HD dummy Image if the image is not found
if [ ! -f $rdhome/bios/xbox_hdd.qcow2 ] if [ ! -f $rdhome/bios/xbox_hdd.qcow2 ]
then then
@ -1122,7 +1130,7 @@ ra_init() {
mkdir -pv /var/config/retroarch/config/ mkdir -pv /var/config/retroarch/config/
cp -rf $emuconfigs/retroarch/core-overrides/* /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 #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 # PPSSPP
echo "--------------------------------" echo "--------------------------------"
@ -1215,15 +1223,6 @@ cli_emulator_reset() {
esac esac
} }
tools_init() {
rm -rfv /var/config/retrodeck/tools/
mkdir -pv /var/config/retrodeck/tools/
cp -rfv /app/retrodeck/tools/* /var/config/retrodeck/tools/
mkdir -pv /var/config/emulationstation/.emulationstation/custom_systems/tools/
rm -rfv /var/config/retrodeck/tools/gamelist.xml
cp -fv /app/retrodeck/tools-gamelist.xml /var/config/retrodeck/tools/gamelist.xml
}
update_splashscreens() { update_splashscreens() {
# This script will purge any existing ES graphics and reload them from RO space into somewhere ES will look for it # This script will purge any existing ES graphics and reload them from RO space into somewhere ES will look for it
# USAGE: update_splashscreens # USAGE: update_splashscreens
@ -1244,6 +1243,7 @@ emulators_post_move() {
dir_prep "$rdhome/bios" "/var/config/retroarch/system" dir_prep "$rdhome/bios" "/var/config/retroarch/system"
dir_prep "$rdhome/.logs/retroarch" "/var/config/retroarch/logs" dir_prep "$rdhome/.logs/retroarch" "/var/config/retroarch/logs"
dir_prep "$rdhome/shaders/retroarch" "/var/config/retroarch/shaders" dir_prep "$rdhome/shaders/retroarch" "/var/config/retroarch/shaders"
sed -i 's#RETRODECKHOMEDIR#'$rdhome'#g' /var/config/retroarch/retroarch.cfg
# Yuzu section # Yuzu section
dir_prep "$rdhome/bios/switch/keys" "/var/data/yuzu/keys" dir_prep "$rdhome/bios/switch/keys" "/var/data/yuzu/keys"
@ -1252,10 +1252,10 @@ emulators_post_move() {
dir_prep "$rdhome/saves/switch/yuzu/sdmc" "/var/data/yuzu/sdmc" dir_prep "$rdhome/saves/switch/yuzu/sdmc" "/var/data/yuzu/sdmc"
dir_prep "$rdhome/.logs/yuzu" "/var/data/yuzu/log" dir_prep "$rdhome/.logs/yuzu" "/var/data/yuzu/log"
dir_prep "$rdhome/screenshots" "/var/data/yuzu/screenshots" 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 # 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/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/USA" "/var/data/dolphin-emu/GC/USA"
dir_prep "$rdhome/saves/gc/dolphin/JAP" "/var/data/dolphin-emu/GC/JAP" dir_prep "$rdhome/saves/gc/dolphin/JAP" "/var/data/dolphin-emu/GC/JAP"
@ -1264,7 +1264,7 @@ emulators_post_move() {
dir_prep "$rdhome/saves/wii/dolphin" "/var/data/dolphin-emu/Wii/" dir_prep "$rdhome/saves/wii/dolphin" "/var/data/dolphin-emu/Wii/"
# Primehack section # 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/EUR" "/var/data/primehack/GC/EUR"
dir_prep "$rdhome/saves/gc/primehack/USA" "/var/data/primehack/GC/USA" dir_prep "$rdhome/saves/gc/primehack/USA" "/var/data/primehack/GC/USA"
dir_prep "$rdhome/saves/gc/primehack/JAP" "/var/data/primehack/GC/JAP" dir_prep "$rdhome/saves/gc/primehack/JAP" "/var/data/primehack/GC/JAP"
@ -1273,17 +1273,17 @@ emulators_post_move() {
dir_prep "$rdhome/saves/wii/primehack" "/var/data/primehack/Wii/" dir_prep "$rdhome/saves/wii/primehack" "/var/data/primehack/Wii/"
# PCSX2 section # 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 # MelonDS section
dir_prep "$rdhome/bios" "/var/config/melonDS/bios" 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 # Citra section
dir_prep "$rdhome/bios/citra/sysdata" "/var/data/citra-emu/sysdata" dir_prep "$rdhome/bios/citra/sysdata" "/var/data/citra-emu/sysdata"
dir_prep "$rdhome/.logs/citra" "/var/data/citra-emu/log" 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 # RPCS3 section
sed -i 's#/home/deck/retrodeck#'$rdhome'#g' /var/config/rpcs3/vfs.yml sed -i 's#/home/deck/retrodeck#'$rdhome'#g' /var/config/rpcs3/vfs.yml
@ -1477,7 +1477,6 @@ finit() {
# Recreating the folder # Recreating the folder
rm -rfv /var/config/emulationstation/ rm -rfv /var/config/emulationstation/
rm -rfv /var/config/retrodeck/tools/
mkdir -pv /var/config/emulationstation/ mkdir -pv /var/config/emulationstation/
# Initializing ES-DE # Initializing ES-DE
@ -1485,8 +1484,6 @@ finit() {
emulationstation --home /var/config/emulationstation --create-system-dirs emulationstation --home /var/config/emulationstation --create-system-dirs
update_splashscreens update_splashscreens
mkdir -pv /var/config/retrodeck/tools/
#zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --text="RetroDECK will now install the needed files.\nPlease wait up to one minute,\nanother message will notify when the process will be finished.\n\nPress OK to continue." #zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --text="RetroDECK will now install the needed files.\nPlease wait up to one minute,\nanother message will notify when the process will be finished.\n\nPress OK to continue."
# Initializing ROMs folder - Original in retrodeck home (or SD Card) # Initializing ROMs folder - Original in retrodeck home (or SD Card)
@ -1510,12 +1507,11 @@ finit() {
# PICO-8 # PICO-8
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 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
dir_prep "$roms_folder/pico8" "$bios_folder/pico-8/carts" # Symlink default game location to RD roms for cleanliness (this location is overridden anyway by the --root_path launch argument anyway) dir_prep "$roms_folder/pico8" "$bios_folder/pico-8/carts" # Symlink default game location to RD roms for cleanliness (this location is overridden anyway by the --root_path launch argument anyway)
dir_prep "$bios_folder/pico-8/cdata" "$saves_folder/pico-8" # PICO-8 saves folder dir_prep "$saves_folder/pico-8" "$bios_folder/pico-8/cdata" # PICO-8 saves folder
( (
ra_init ra_init
standalones_init standalones_init
tools_init
) | ) |
zenity --icon-name=net.retrodeck.retrodeck --progress --no-cancel --pulsate --auto-close \ zenity --icon-name=net.retrodeck.retrodeck --progress --no-cancel --pulsate --auto-close \
--window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
@ -1749,3 +1745,17 @@ configurator_destination_choice_dialog() {
echo $choice echo $choice
} }
configurator_reset_confirmation_dialog() {
# This dialog provides a confirmation for any reset functions, before the reset is actually performed.
# USAGE: $(configurator_reset_confirmation_dialog "emulator being reset" "action text")
# This function will return a "true" if the user clicks Confirm, and "false" if they click Cancel.
choice=$(zenity --title "RetroDECK Configurator Utility - Reset $1" --question --no-wrap --cancel-label="Cancel" --ok-label="Confirm" \
--window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
--text="$2")
if [[ $? == "0" ]]; then
echo "true"
else
echo "false"
fi
}

View file

@ -36,15 +36,15 @@
</screenshot> </screenshot>
</screenshots> </screenshots>
<description> <description>
<p>What is Retrodeck? <p>What is Retrodeck?</p>
RetroDECK is an emulation and retro gaming solution to catalog and play your game collection directly from Linux in one unified application. <p>RetroDECK is an emulation and retro gaming solution to catalog and play your game collection directly from Linux in one unified application.
It's inspired by other embedded emulation systems like AmberELEC, EmuELEC, CoreELEC, Lakka, and Batocera. It's inspired by other embedded emulation systems like AmberELEC, EmuELEC, CoreELEC, Lakka, and Batocera.
RetroDECK is powered by EmulationStation Desktop Edition, that uses RetroArch and other standalone emulators to allow you to import and play your favorite games in a tidy environment. RetroDECK is powered by EmulationStation Desktop Edition, that uses RetroArch and other standalone emulators to allow you to import and play your favorite games in a tidy environment.
No other software is needed as everything it's already included in one package!</p> No other software is needed as everything it's already included in one package!</p>
<p>BETA NOTICE: RetroDECK is still in Beta and the team is actively developing and adding more features.</p> <p>BETA NOTICE: RetroDECK is still in Beta and the team is actively developing and adding more features.</p>
<p>About the Beta: <p>About the Beta:
The primary focus during the beta period is on SteamOS and the Steam Deck but we hope to expand to more devices and general Linux desktop in the future (NOTE: It can be run on Linux desktop right now but there will be some manual configurations needed for input, storage location and other tiny hickups).</p> The primary focus during the beta period is on SteamOS and the Steam Deck but we hope to expand to more devices and general Linux desktop in the future</p>
<p>NOTE: Albeit RetroDECK could possibily work on every distro, it's supported only on Steam Deck.</p> <p>NOTE: It can be run on Linux desktop right now but there will be some manual configurations needed for input, storage location and other tiny hickups.</p>
<p> <p>
INSTALLATION INSTRUCTIONS FOR THE STEAM DECK: INSTALLATION INSTRUCTIONS FOR THE STEAM DECK:
<ul> <ul>
@ -54,18 +54,32 @@
<li>4. [OPTIONAL] Download Steam Grids graphics for RetroDECK with BoilR</li> <li>4. [OPTIONAL] Download Steam Grids graphics for RetroDECK with BoilR</li>
</ul> </ul>
</p> </p>
<p>For more detailed information check our wiki: <p>For more detailed information check our wiki:</p>
https://github.com/XargonWan/RetroDECK/wiki</p> <p>https://github.com/XargonWan/RetroDECK/wiki</p>
<p>If you want to sponsor the project: <p>If you want to sponsor the project:</p>
https://www.patreon.com/RetroDECK</p> <p>https://www.patreon.com/RetroDECK</p>
<p>If you want to join the RetroDECK community check our: <p>If you want to join the RetroDECK community check our:</p>
Discord: https://discord.gg/Dz3szYsP8g <p>Discord: https://discord.gg/Dz3szYsP8g</p>
Reddit: https://www.reddit.com/r/RetroDECK/</p> <p>Reddit: https://www.reddit.com/r/RetroDECK/</p>
<p>If you want to help out with the project join the "i-want-to-help" channel on our Discord.</p> <p>If you want to help out with the project join the "i-want-to-help" channel on our Discord.</p>
</description> </description>
<project_license>GPL-3.0</project_license> <project_license>GPL-3.0</project_license>
<metadata_license>CC0-1.0</metadata_license> <metadata_license>CC0-1.0</metadata_license>
<releases> <releases>
<release version="0.6.3b" date="2023-03-22">
<url>https://github.com/XargonWan/RetroDECK/releases/tag/0.6.3b</url>
<description>
<ul>
<li>Added support support for multiple file compression via CLI.</li>
<li>Added support support for multiple file compression in the Configurator.</li>
<li>Fixed some missing layout changes.</li>
<li>Removed the reset tools command.</li>
<li>Fixed a bug in the compression tool with certain filenames with spaces.</li>
<li>Fixed a manifest bug that caused a conflict between Dolphin and Primehack in certain scenarios.</li>
<li>Shipped a new configuration to account for the config format changes made by Yuzu and Citra in the latest updates.</li>
</ul>
</description>
</release>
<release version="0.6.2b" date="2023-03-15"> <release version="0.6.2b" date="2023-03-15">
<url>https://github.com/XargonWan/RetroDECK/releases/tag/0.6.2b</url> <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.6.2b</url>
<description> <description>

View file

@ -1068,14 +1068,15 @@ modules:
- cp -rf res/extra-splashes/ ${FLATPAK_DEST}/retrodeck/graphics - cp -rf res/extra-splashes/ ${FLATPAK_DEST}/retrodeck/graphics
- cp -f res/icon.svg /app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.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 - cp retrodeck.sh /app/bin/retrodeck.sh
- chmod +x /app/bin/retrodeck.sh - chmod +x /app/bin/retrodeck.sh
- cp tools/configurator.sh /app/bin/configurator.sh
- chmod +x /app/bin/configurator.sh # Tools
- mkdir -p /app/tools
- cp tools/configurator.sh /app/tools/configurator.sh
- chmod +x /app/tools/configurator.sh
- cp es-configs/tools-gamelist.xml /app/tools/gamelist.xml
# Function libraries # Function libraries
- mkdir -p /app/libexec - mkdir -p /app/libexec

View file

@ -35,12 +35,23 @@ post_update() {
# In version 0.6.2b, the following changes were made that required config file updates/reset: # In version 0.6.2b, the following changes were made that required config file updates/reset:
# - Put Dolphin and Primehack save states in different folders inside $rd_home/states # - Put Dolphin and Primehack save states in different folders inside $rd_home/states
# - Fix symlink to hard-coded PICO-8 config folder (dir_prep doesn't like ~) # - Fix symlink to hard-coded PICO-8 config folder (dir_prep doesn't like ~)
# - Overwrite Citra and Yuzu configs, as controller mapping was broken due to emulator updates.
dir_prep "$rdhome/states/dolphin" "/var/data/dolphin-emu/StateSaves" dir_prep "$rdhome/states/dolphin" "/var/data/dolphin-emu/StateSaves"
dir_prep "$rdhome/states/primehack" "/var/data/primehack/StateSaves" dir_prep "$rdhome/states/primehack" "/var/data/primehack/StateSaves"
rm -rf "$HOME/~/" # Remove old incorrect location from 0.6.2b rm -rf "$HOME/~/" # Remove old incorrect location from 0.6.2b
rm -f "$HOME/.lexaloffle/pico-8" # Remove old symlink to prevent recursion
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 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
dir_prep "$saves_folder/pico-8" "$bios_folder/pico-8/cdata" # PICO-8 saves folder structure was backwards, fixing for consistency.
cp -fv $emuconfigs/citra/qt-config.ini /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#RETRODECKHOMEDIR#'$rdhome'#g' /var/config/yuzu/qt-config.ini
# Remove unneeded tools folder, as location has changed to RO space
rm -rfv /var/config/retrodeck/tools/
fi fi
if [[ $prev_version -le "070" ]]; then if [[ $prev_version -le "070" ]]; then
# In version 0.7.0b, the following changes were made that required config file updates/reset or other changes to the filesystem: # In version 0.7.0b, the following changes were made that required config file updates/reset or other changes to the filesystem:
@ -62,7 +73,6 @@ post_update() {
# The following commands are run every time. # The following commands are run every time.
tools_init
update_splashscreens update_splashscreens
update_rd_conf update_rd_conf
) | ) |

View file

@ -20,7 +20,6 @@ Arguments:
--configurator Starts the RetroDECK Configurator --configurator Starts the RetroDECK Configurator
--compress <file> Compresses target file to .chd format. Supports .cue, .iso and .gdi formats --compress <file> Compresses target file to .chd format. Supports .cue, .iso and .gdi formats
--reset-emulator <emulator> Reset one or more emulator configs to the default values --reset-emulator <emulator> Reset one or more emulator configs to the default values
--reset-tools Reset the RetroDECK Tools section
--reset-retrodeck Starts the initial RetroDECK installer (backup your data first!) --reset-retrodeck Starts the initial RetroDECK installer (backup your data first!)
For flatpak run specific options please run: flatpak run -h For flatpak run specific options please run: flatpak run -h
@ -45,7 +44,7 @@ https://retrodeck.net
exit exit
;; ;;
--configurator*) --configurator*)
sh /app/bin/configurator.sh sh /app/tools/configurator.sh
exit exit
;; ;;
--reset-emulator*) --reset-emulator*)
@ -67,18 +66,6 @@ https://retrodeck.net
exit exit
fi fi
;; ;;
--reset-tools*)
echo "You are about to reset the RetroDECK tools."
read -p "Enter 'y' to continue, 'n' to stop: " response
if [[ $response == [yY] ]]; then
tools_init
read -p "The process has been completed, press Enter key to start RetroDECK."
shift # Continue launch after previous command is finished
else
read -p "The process has been cancelled, press Enter key to exit."
exit
fi
;;
--reset-retrodeck*) --reset-retrodeck*)
echo "You are about to reset RetroDECK completely!" echo "You are about to reset RetroDECK completely!"
read -p "Enter 'y' to continue, 'n' to stop: " response read -p "Enter 'y' to continue, 'n' to stop: " response

View file

@ -87,6 +87,7 @@ configurator_reset_dialog() {
case $emulator_to_reset in case $emulator_to_reset in
"RetroArch" ) "RetroArch" )
if [[ $(configurator_reset_confirmation_dialog "RetroArch" "Are you sure you want to reset the RetroArch emulator to default settings?\n\nThis process cannot be undone.") == "true" ]]; then
if [[ check_network_connectivity == "true" ]]; then if [[ check_network_connectivity == "true" ]]; then
ra_init ra_init
configurator_process_complete_dialog "resetting $emulator_to_reset" configurator_process_complete_dialog "resetting $emulator_to_reset"
@ -94,49 +95,94 @@ configurator_reset_dialog() {
configurator_generic_dialog "You do not appear to be connected to a network with internet access.\n\nThe RetroArch reset process requires some files from the internet to function properly.\n\nPlease retry this process once a network connection is available." configurator_generic_dialog "You do not appear to be connected to a network with internet access.\n\nThe RetroArch reset process requires some files from the internet to function properly.\n\nPlease retry this process once a network connection is available."
configurator_reset_dialog configurator_reset_dialog
fi fi
else
configurator_generic_dialog "Reset process cancelled."
configurator_reset_dialog
fi
;; ;;
"Citra" ) "Citra" )
if [[ $(configurator_reset_confirmation_dialog "Citra" "Are you sure you want to reset the Citra emulator to default settings?\n\nThis process cannot be undone.") == "true" ]]; then
citra_init citra_init
configurator_process_complete_dialog "resetting $emulator_to_reset" configurator_process_complete_dialog "resetting $emulator_to_reset"
else
configurator_generic_dialog "Reset process cancelled."
configurator_reset_dialog
fi
;; ;;
"Dolphin" ) "Dolphin" )
if [[ $(configurator_reset_confirmation_dialog "Dolphin" "Are you sure you want to reset the Dolphin emulator to default settings?\n\nThis process cannot be undone.") == "true" ]]; then
dolphin_init dolphin_init
configurator_process_complete_dialog "resetting $emulator_to_reset" configurator_process_complete_dialog "resetting $emulator_to_reset"
else
configurator_generic_dialog "Reset process cancelled."
configurator_reset_dialog
fi
;; ;;
"Duckstation" ) "Duckstation" )
if [[ $(configurator_reset_confirmation_dialog "Duckstation" "Are you sure you want to reset the Duckstation emulator to default settings?\n\nThis process cannot be undone.") == "true" ]]; then
duckstation_init duckstation_init
configurator_process_complete_dialog "resetting $emulator_to_reset" configurator_process_complete_dialog "resetting $emulator_to_reset"
else
configurator_generic_dialog "Reset process cancelled."
configurator_reset_dialog
fi
;; ;;
"MelonDS" ) "MelonDS" )
if [[ $(configurator_reset_confirmation_dialog "MelonDS" "Are you sure you want to reset the MelonDS emulator to default settings?\n\nThis process cannot be undone.") == "true" ]]; then
melonds_init melonds_init
configurator_process_complete_dialog "resetting $emulator_to_reset" configurator_process_complete_dialog "resetting $emulator_to_reset"
else
configurator_generic_dialog "Reset process cancelled."
configurator_reset_dialog
fi
;; ;;
"PCSX2" ) "PCSX2" )
if [[ $(configurator_reset_confirmation_dialog "PCSX2" "Are you sure you want to reset the PCSX2 emulator to default settings?\n\nThis process cannot be undone.") == "true" ]]; then
pcsx2_init pcsx2_init
configurator_process_complete_dialog "resetting $emulator_to_reset" configurator_process_complete_dialog "resetting $emulator_to_reset"
else
configurator_generic_dialog "Reset process cancelled."
configurator_reset_dialog
fi
;; ;;
"PPSSPP" ) "PPSSPP" )
if [[ $(configurator_reset_confirmation_dialog "PPSSPP" "Are you sure you want to reset the PPSSPP emulator to default settings?\n\nThis process cannot be undone.") == "true" ]]; then
ppssppsdl_init ppssppsdl_init
configurator_process_complete_dialog "resetting $emulator_to_reset" configurator_process_complete_dialog "resetting $emulator_to_reset"
else
configurator_generic_dialog "Reset process cancelled."
configurator_reset_dialog
fi
;; ;;
"Primehack" ) "Primehack" )
if [[ $(configurator_reset_confirmation_dialog "Primehack" "Are you sure you want to reset the Primehack emulator to default settings?\n\nThis process cannot be undone.") == "true" ]]; then
primehack_init primehack_init
configurator_process_complete_dialog "resetting $emulator_to_reset" configurator_process_complete_dialog "resetting $emulator_to_reset"
else
configurator_generic_dialog "Reset process cancelled."
configurator_reset_dialog
fi
;; ;;
"RPCS3" ) "RPCS3" )
if [[ $(configurator_reset_confirmation_dialog "RPCS3" "Are you sure you want to reset the RPCS3 emulator to default settings?\n\nThis process cannot be undone.") == "true" ]]; then
rpcs3_init rpcs3_init
configurator_process_complete_dialog "resetting $emulator_to_reset" configurator_process_complete_dialog "resetting $emulator_to_reset"
else
configurator_generic_dialog "Reset process cancelled."
configurator_reset_dialog
fi
;; ;;
"XEMU" ) "XEMU" )
if [[ $(configurator_reset_confirmation_dialog "XEMU" "Are you sure you want to reset the XEMU emulator to default settings?\n\nThis process cannot be undone.") == "true" ]]; then
if [[ check_network_connectivity == "true" ]]; then if [[ check_network_connectivity == "true" ]]; then
xemu_init xemu_init
configurator_process_complete_dialog "resetting $emulator_to_reset" configurator_process_complete_dialog "resetting $emulator_to_reset"
@ -144,11 +190,20 @@ configurator_reset_dialog() {
configurator_generic_dialog "You do not appear to be connected to a network with internet access.\n\nThe Xemu reset process requires some files from the internet to function properly.\n\nPlease retry this process once a network connection is available." configurator_generic_dialog "You do not appear to be connected to a network with internet access.\n\nThe Xemu reset process requires some files from the internet to function properly.\n\nPlease retry this process once a network connection is available."
configurator_reset_dialog configurator_reset_dialog
fi fi
else
configurator_generic_dialog "Reset process cancelled."
configurator_reset_dialog
fi
;; ;;
"Yuzu" ) "Yuzu" )
if [[ $(configurator_reset_confirmation_dialog "Yuzu" "Are you sure you want to reset the Yuzu emulator to default settings?\n\nThis process cannot be undone.") == "true" ]]; then
yuzu_init yuzu_init
configurator_process_complete_dialog "resetting $emulator_to_reset" configurator_process_complete_dialog "resetting $emulator_to_reset"
else
configurator_generic_dialog "Reset process cancelled."
configurator_reset_dialog
fi
;; ;;
"" ) # No selection made or Back button clicked "" ) # No selection made or Back button clicked
@ -159,7 +214,7 @@ configurator_reset_dialog() {
;; ;;
"Reset All Emulators" ) "Reset All Emulators" )
if [[ $(configurator_reset_confirmation_dialog "all emulators" "Are you sure you want to reset all emulators to default settings?\n\nThis process cannot be undone.") == "true" ]]; then
if [[ check_network_connectivity == "true" ]]; then if [[ check_network_connectivity == "true" ]]; then
ra_init ra_init
standalones_init standalones_init
@ -168,9 +223,14 @@ configurator_reset_dialog() {
configurator_generic_dialog "You do not appear to be connected to a network with internet access.\n\nThe all-emulator reset process requires some files from the internet to function properly.\n\nPlease retry this process once a network connection is available." configurator_generic_dialog "You do not appear to be connected to a network with internet access.\n\nThe all-emulator reset process requires some files from the internet to function properly.\n\nPlease retry this process once a network connection is available."
configurator_reset_dialog configurator_reset_dialog
fi fi
else
configurator_generic_dialog "Reset process cancelled."
configurator_reset_dialog
fi
;; ;;
"Reset RetroDECK" ) "Reset RetroDECK" )
if [[ $(configurator_reset_confirmation_dialog "RetroDECK" "Are you sure you want to reset RetroDECK entirely?\n\nThis process cannot be undone.") == "true" ]]; then
zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap \ zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap \
--window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
--title "RetroDECK Configurator Utility - Reset RetroDECK" \ --title "RetroDECK Configurator Utility - Reset RetroDECK" \
@ -178,6 +238,10 @@ configurator_reset_dialog() {
rm -f "$lockfile" rm -f "$lockfile"
rm -f "$rd_conf" rm -f "$rd_conf"
configurator_process_complete_dialog "resetting RetroDECK" configurator_process_complete_dialog "resetting RetroDECK"
else
configurator_generic_dialog "Reset process cancelled."
configurator_reset_dialog
fi
;; ;;
"" ) # No selection made or Back button clicked "" ) # No selection made or Back button clicked
@ -567,11 +631,11 @@ configurator_check_bios_files_basic() {
do do
bios_file_found="No" bios_file_found="No"
bios_hash_matched="No" bios_hash_matched="No"
if [[ -f "$bios_dir/$bios_subdir$bios_file" ]]; then if [[ -f "$bios_folder/$bios_subdir$bios_file" ]]; then
bios_file_found="Yes" bios_file_found="Yes"
if [[ $bios_hash == "Unknown" ]]; then if [[ $bios_hash == "Unknown" ]]; then
bios_hash_matched="Unknown" bios_hash_matched="Unknown"
elif [[ $(md5sum "$bios_dir/$bios_subdir$bios_file" | awk '{ print $1 }') == "$bios_hash" ]]; then elif [[ $(md5sum "$bios_folder/$bios_subdir$bios_file" | awk '{ print $1 }') == "$bios_hash" ]]; then
bios_hash_matched="Yes" bios_hash_matched="Yes"
fi fi
fi fi
@ -594,11 +658,11 @@ configurator_check_bios_files_advanced() {
do do
bios_file_found="No" bios_file_found="No"
bios_hash_matched="No" bios_hash_matched="No"
if [[ -f "$bios_dir/$bios_subdir$bios_file" ]]; then if [[ -f "$bios_folder/$bios_subdir$bios_file" ]]; then
bios_file_found="Yes" bios_file_found="Yes"
if [[ $bios_hash == "Unknown" ]]; then if [[ $bios_hash == "Unknown" ]]; then
bios_hash_matched="Unknown" bios_hash_matched="Unknown"
elif [[ $(md5sum "$bios_dir/$bios_subdir$bios_file" | awk '{ print $1 }') == "$bios_hash" ]]; then elif [[ $(md5sum "$bios_folder/$bios_subdir$bios_file" | awk '{ print $1 }') == "$bios_hash" ]]; then
bios_hash_matched="Yes" bios_hash_matched="Yes"
fi fi
fi fi
@ -621,6 +685,7 @@ configurator_troubleshooting_tools_dialog() {
choice=$(zenity --list --title="RetroDECK Configurator Utility - Change Options" --cancel-label="Back" \ choice=$(zenity --list --title="RetroDECK Configurator Utility - Change Options" --cancel-label="Back" \
--window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --width=1200 --height=720 \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --width=1200 --height=720 \
--column="Choice" --column="Action" \ --column="Choice" --column="Action" \
"Move RetroDECK" "Move RetroDECK files between internal/SD card or to a custom location" \
"Multi-file game structure check" "Verify the proper structure of multi-file or multi-disc games" \ "Multi-file game structure check" "Verify the proper structure of multi-file or multi-disc games" \
"Basic BIOS file check" "Show a list of systems that BIOS files are found for" \ "Basic BIOS file check" "Show a list of systems that BIOS files are found for" \
"Advanced BIOS file check" "Show advanced information about common BIOS files" \ "Advanced BIOS file check" "Show advanced information about common BIOS files" \
@ -628,6 +693,11 @@ configurator_troubleshooting_tools_dialog() {
case $choice in case $choice in
"Move RetroDECK" )
configurator_generic_dialog "This option will move the RetroDECK data folder (ROMs, saves, BIOS etc.) to a new location.\n\nPlease choose where to move the RetroDECK data folder."
configurator_move_dialog
;;
"Multi-file game structure check" ) "Multi-file game structure check" )
configurator_check_multifile_game_structure configurator_check_multifile_game_structure
;; ;;
@ -880,17 +950,15 @@ configurator_developer_dialog() {
configurator_welcome_dialog() { configurator_welcome_dialog() {
if [[ $developer_options == "true" ]]; then if [[ $developer_options == "true" ]]; then
welcome_menu_options=("Move RetroDECK" "Move RetroDECK files between internal/SD card or to a custom location" \ welcome_menu_options=("RetroArch Presets" "Change RetroArch presets, log into RetroAchievements etc." \
"RetroArch Presets" "Change RetroArch presets, log into RetroAchievements etc." \
"Emulator Options" "Launch and configure each emulators settings (for advanced users)" \ "Emulator Options" "Launch and configure each emulators settings (for advanced users)" \
"Tools and Troubleshooting" "Run RetroDECK troubleshooting tools for common issues" \ "Tools and Troubleshooting" "Move RetroDECK to a new location, compress games and perform basic troubleshooting" \
"Reset" "Reset specific parts or all of RetroDECK" \ "Reset" "Reset specific parts or all of RetroDECK" \
"Developer Options" "Welcome to the DANGER ZONE") "Developer Options" "Welcome to the DANGER ZONE")
else else
welcome_menu_options=("Move RetroDECK" "Move RetroDECK files between internal/SD card or to a custom location" \ welcome_menu_options=("RetroArch Presets" "Change RetroArch presets, log into RetroAchievements etc." \
"RetroArch Presets" "Change RetroArch presets, log into RetroAchievements etc." \
"Emulator Options" "Launch and configure each emulators settings (for advanced users)" \ "Emulator Options" "Launch and configure each emulators settings (for advanced users)" \
"Tools and Troubleshooting" "Run RetroDECK troubleshooting tools for common issues" \ "Tools and Troubleshooting" "Move RetroDECK to a new location, compress games and perform basic troubleshooting" \
"Reset" "Reset specific parts or all of RetroDECK" ) "Reset" "Reset specific parts or all of RetroDECK" )
fi fi
@ -901,11 +969,6 @@ configurator_welcome_dialog() {
case $choice in case $choice in
"Move RetroDECK" )
configurator_generic_dialog "This option will move the RetroDECK data folder (ROMs, saves, BIOS etc.) to a new location.\n\nPlease choose where to move the RetroDECK data folder."
configurator_move_dialog
;;
"RetroArch Presets" ) "RetroArch Presets" )
configurator_retroarch_options_dialog configurator_retroarch_options_dialog
;; ;;