Xargon/RetroDECK
1
0
Fork 0
mirror of https://github.com/RetroDECK/RetroDECK.git synced 2024-11-26 15:55:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'cooker-0.6.0b' of https://github.com/XargonWan/RetroDECK into cooker-0.6.0b

Browse source
This commit is contained in:
XargonWan 2022-12-12 09:10:43 +00:00
parent dc3767f067 7f69e857ef
commit 6aab1096db
2 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
functions.sh
View file

@ -661,7 +661,7 @@ ryujinx_init() {
mkdir -p /var/config/Ryujinx/system mkdir -p /var/config/Ryujinx/system
cp -fv $emuconfigs/ryujinx/* /var/config/Ryujinx cp -fv $emuconfigs/ryujinx/* /var/config/Ryujinx
sed -i 's#/home/deck/retrodeck#'$rdhome'#g' /var/config/Ryujinx/Config.json sed -i 's#/home/deck/retrodeck#'$rdhome'#g' /var/config/Ryujinx/Config.json
ln -s $rdhome/bios/switch/keys /var/config/Ryujinx/system dir_prep "$rdhome/bios/switch/keys" "/var/config/Ryujinx/system"
} }
standalones_init() { standalones_init() {
@ -737,6 +737,10 @@ emulators_post_move() {
# Duckstation section # Duckstation section
sed -i 's#/home/deck/retrodeck/bios#'$rdhome/bios'#g' /var/config/duckstation/settings.ini sed -i 's#/home/deck/retrodeck/bios#'$rdhome/bios'#g' /var/config/duckstation/settings.ini
# Ryujinx section
sed -i 's#/home/deck/retrodeck#'$rdhome'#g' /var/config/Ryujinx/Config.json
dir_prep "$rdhome/bios/switch/keys" "/var/config/Ryujinx/system"
} }
#========================= #=========================
@ -862,8 +866,8 @@ start_retrodeck() {
emulationstation --home /var/config/emulationstation emulationstation --home /var/config/emulationstation
} }
old_browse() { finit_browse() {
# Function for browsing the sd card # Function for choosing data directory location during first/forced init
path_selected=false path_selected=false
while [ $path_selected == false ] while [ $path_selected == false ]
do do
@ -938,7 +942,7 @@ finit() {
--title "RetroDECK" \ --title "RetroDECK" \
--ok-label "Browse" \ --ok-label "Browse" \
--text="SD Card was not find in the default location.\nPlease choose the SD Card root.\nA retrodeck folder will be created starting from the directory that you selected." --text="SD Card was not find in the default location.\nPlease choose the SD Card root.\nA retrodeck folder will be created starting from the directory that you selected."
rdhome=$(old_browse) # Calling the browse function rdhome=$(finit_browse) # Calling the browse function
if [[ -z $rdhome ]]; then # If user hit the cancel button if [[ -z $rdhome ]]; then # If user hit the cancel button
exit 2 exit 2
fi fi
@ -976,7 +980,7 @@ finit() {
--title "RetroDECK" \ --title "RetroDECK" \
--ok-label "Browse" \ --ok-label "Browse" \
--text="Please choose the root folder for the RetroDECK data.\nA retrodeck folder will be created starting from the directory that you selected." --text="Please choose the root folder for the RetroDECK data.\nA retrodeck folder will be created starting from the directory that you selected."
rdhome=$(old_browse) # Calling the browse function rdhome=$(finit_browse) # Calling the browse function
if [[ -z $rdhome ]]; then # If user hit the cancel button if [[ -z $rdhome ]]; then # If user hit the cancel button
exit 2 exit 2
fi fi

14
tools/configurator.sh
View file

@ -29,6 +29,7 @@ source /app/libexec/functions.sh # uncomment for flatpak testing
# - Reset MelonDS # - Reset MelonDS
# - Reset Citra # - Reset Citra
# - Reset RPCS3 # - Reset RPCS3
# - Reset Ryujinx
# - Reset XEMU # - Reset XEMU
# - Reset PPSSPP # - Reset PPSSPP
# - Reset Duckstation # - Reset Duckstation
@ -113,13 +114,13 @@ configurator_reset_dialog() {
configurator_process_complete_dialog "resetting $emulator_to_reset" configurator_process_complete_dialog "resetting $emulator_to_reset"
;; ;;
"Ryujinx" ) "RPCS3" )
ryujinx_init rpcs3_init
configurator_process_complete_dialog "resetting $emulator_to_reset" configurator_process_complete_dialog "resetting $emulator_to_reset"
;; ;;
"RPCS3" ) "Ryujinx" )
rpcs3_init ryujinx_init
configurator_process_complete_dialog "resetting $emulator_to_reset" configurator_process_complete_dialog "resetting $emulator_to_reset"
;; ;;
@ -216,6 +217,7 @@ configurator_power_user_changes_dialog() {
"PCSX2-Legacy" \ "PCSX2-Legacy" \
"PPSSPP" \ "PPSSPP" \
"RPCS3" \ "RPCS3" \
"Ryujinx" \
"XEMU" \ "XEMU" \
"Yuzu") "Yuzu")
@ -257,6 +259,10 @@ configurator_power_user_changes_dialog() {
rpcs3 rpcs3
;; ;;
"Ryujinx" )
ryujinx-wrapper
;;
"XEMU" ) "XEMU" )
xemu xemu
;; ;;