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

functions.sh

@@ -47,14 +47,14 @@ file_browse() {
   while [ $file_selected == false ]
   do
     local target="$(zenity --file-selection --title="Choose $1")"
-    if [ ! -z $target ] #yes
+    if [ ! -z "$target" ] #yes
     then
       zenity --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --cancel-label="No" --ok-label "Yes" \
       --text="File $target chosen, is this correct?"
       if [ $? == 0 ]
       then
         file_selected=true
-        echo $target
+        echo "$target"
         break
       fi
     else
@@ -129,15 +129,16 @@ validate_for_chd () {
   # USAGE: validate_for_chd $input_file
 
 	local file="$1"
+  local normalized_filename=$(echo "$file" | tr '[:upper:]' '[:lower:]')
   local file_validated="false"
 	current_run_log_file="chd_compression_$(basename "$file").log"
 	echo "Validating file:" "$file" > "$logs_folder/$current_run_log_file"
-	if [[ "$file" == *".cue" ]] || [[ "$file" == *".gdi" ]] || [[ "$file" == *".iso" ]]; then
+	if [[ "$normalized_filename" == *".cue" ]] || [[ "$normalized_filename" == *".gdi" ]] || [[ "$normalized_filename" == *".iso" ]]; then
 		echo ".cue/.iso/.gdi file detected" >> "$logs_folder/$current_run_log_file"
 		local file_path=$(dirname "$(realpath "$file")")
 		local file_base_name=$(basename "$file")
 		local file_name=${file_base_name%.*}
-		if [[ "$file" == *".cue" ]]; then # Validate .cue file
+		if [[ "$normalized_filename" == *".cue" ]]; then # Validate .cue file
 			echo "Validating .cue associated .bin files" >> "$logs_folder/$current_run_log_file"
 			local cue_bin_files=$(grep -o -P "(?<=FILE \").*(?=\".*$)" "$file")
 			echo "Associated bin files read:" >> "$logs_folder/$current_run_log_file"

net.retrodeck.retrodeck.appdata.xml

@@ -66,17 +66,31 @@
    <project_license>GPL-3.0</project_license>
    <metadata_license>CC0-1.0</metadata_license>
    <releases>
-      <release version="0.6.3b" date="2023-03-22">
+      <release version="0.6.3b" date="2023-03-24">
          <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.6.3b</url>
          <description>
+            <p>New features - General:</p>
             <ul>
                <li>Added support support for multiple file compression via CLI.</li>
+            </ul>
+            <p>RetroDECK Configurator:</p>
+            <ul>
                <li>Added support support for multiple file compression in the Configurator.</li>
+               <li>Added safety y/n prompts to the reset functions.</li>
                <li>Fixed some missing layout changes.</li>
-               <li>Removed the reset tools command.</li>
+               <li>Renamed "Reset All" to "Reset RetroDECK".</li>
+               <li>Moved configurator into the RO partition for futher enhancements.</li>
+            </ul>
+            <p>Bug fixes and other changes:</p>
+            <ul>
                <li>Fixed a bug in the compression tool with certain filenames with spaces.</li>
+               <li>Fixed a bug where some folders were recursively symlinked.</li>
+               <li>Fixed a bug where some emulator configs were not correctly deployed.</li>
+               <li>Fixed the Configurator BIOS tool looking in the wrong location (Thanks sofauxboho for the report!).</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>
+               <li>Implemented new configurations for Yuzu and Citra thanks to the big config file changes in the latest emulator updates in both emulators.</li>
+               <li>Removed leftover files from Legacy PCSX2.</li>
+               <li>Removed the legacy "Reset Tools" command from Configurator and CLI.</li>
             </ul>
          </description>
       </release>

rd-submodules/retroarch

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

tools/configurator.sh

@@ -530,6 +530,8 @@ configurator_compress_multi_game_dialog() {
     zenity --icon-name=net.retrodeck.retrodeck --progress --no-cancel --pulsate --auto-close \
       --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
       --title "RetroDECK Configurator Utility - Compression in Progress"
+      configurator_generic_dialog "The compression process is complete!"
+      configurator_compress_games_dialog
   else
     if [[ ! -z $choice ]]; then # User clicked "Compress All"
       local post_compression_cleanup=$(configurator_compression_cleanup_dialog)