Merge pull request #811 from icenine451/cooker-0.8.2b-icenine451

Cooker 0.8.2b icenine451

emu-configs/defaults/retrodeck/reference_lists/pretty_system_names.cfg

@@ -1,3 +1,4 @@
+citra^Citra (Nintendo 3DS Standalone Emulator, via Ponzu)
 dolphin^Dolphin (GameCube / Wii Standalone Emulator)
 duckstation^Duckstation (Sony Playstation Standalone Emulator)
 gb^Nintendo GameBoy
@@ -11,7 +12,7 @@ ppsspp^PPSSPP (Sony PSP Standalone Emulator)
 primehack^Primehack (Metroid Prime Standalone Emulator)
 psx_ra^Sony Playstation (RetroArch Core)
 retroarch^RetroArch (Multi-emulator Frontend)
+rpcs3^RPCS3 (Sony Playstation 3 Standalone Emulator)
 ryujinx^Ryujinx (Nintendo Switch Standalone Emulator)
 snes^Nintendo Super Nintendo
 yuzu^Yuzu (Nintendo Switch Standalone Emulator, via Ponzu)
-citra^Citra (Nintendo 3DS Standalone Emulator, via Ponzu)

functions/dialogs.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-source /app/libexec/functions.sh
-
 # Dialog colors
 purple="#a864fc"
 blue="#6fbfff"

functions/global.sh

@@ -13,7 +13,7 @@ source /app/libexec/framework.sh
 source /app/libexec/post_update.sh
 source /app/libexec/prepare_component.sh
 source /app/libexec/presets.sh
-source /app/libexec/configurator_fuctions.sh
+source /app/libexec/configurator_functions.sh
 
 # Static variables
 rd_conf="/var/config/retrodeck/retrodeck.cfg"                                                                         # RetroDECK config file path

functions/other_functions.sh

@@ -153,7 +153,6 @@ update_rd_conf() {
 
   # STAGE 2: To handle presets sections that use duplicate setting names
 
-  mv -f $rd_conf $rd_conf_backup # Backup config file agiain before update but after Stage 1 expansion
   generate_single_patch $rd_defaults $rd_conf_backup $rd_update_patch retrodeck # Create a patch file for differences between defaults and current user settings
   sed -i '/change^^version/d' $rd_update_patch # Remove version line from temporary patch file
   deploy_single_patch $rd_defaults $rd_update_patch $rd_conf # Re-apply user settings to defaults file
@@ -313,7 +312,7 @@ make_name_pretty() {
   if [[ ! -z "$system" ]]; then
     IFS='^' read -r internal_name pretty_name < <(echo "$system")
   else
-    pretty_name="$system"
+    pretty_name="$1"
   fi
   echo "$pretty_name"
 }

tools/configurator.sh

@@ -591,7 +591,15 @@ configurator_retrodeck_tools_dialog() {
 
   "Tool: Remove Empty ROM Folders" )
     log i "Configurator: opening \"$choice\" menu"
-    find_empty_rom_folders
+    (
+      find_empty_rom_folders
+    ) |
+      zenity --progress --no-cancel --pulsate --auto-close \
+      --icon-name=net.retrodeck.retrodeck \
+      --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
+      --title="Finding Empty ROM Folders" \
+      --width=400 --height=200 \
+      --text="Finding empty ROM folders, please be patient.\n\n"
     
     choice=$(zenity \
         --list --width=1200 --height=720 --title "RetroDECK Configurator - RetroDECK: Remove Empty ROM Folders" \
@@ -607,16 +615,17 @@ configurator_retrodeck_tools_dialog() {
       IFS="," read -ra folders_to_remove <<< "$choice"
       for folder in "${folders_to_remove[@]}"; do
         log i "Removing empty folder $folder"
-        rm -f "$folder"
+        rm -rf "$folder"
       done
+      configurator_generic_dialog "RetroDECK Configurator - Remove Empty ROM Folders" "The removal process is complete."
     elif [[ ! -z $choice ]]; then # User clicked "Remove All"
       for folder in "${all_empty_folders[@]}"; do
         log i "Removing empty folder $folder"
-        rm -f "$folder"
+        rm -rf "$folder"
       done
+      configurator_generic_dialog "RetroDECK Configurator - Remove Empty ROM Folders" "The removal process is complete."
     fi
     
-    configurator_generic_dialog "RetroDECK Configurator - Remove Empty ROM Folders" "The removal process is complete."
     configurator_retrodeck_tools_dialog
   ;;