Merge pull request #321 from icenine451/cooker-0.7.0b-icenine451

Cooker 0.7.0b icenine451

README.md

@@ -9,7 +9,10 @@
 
 # RetroDECK on your device!
 
-**RetroDECK** brings an environment to catalog and play your retro games directly from SteamOS and it's tailored specifically for the **Steam Deck**.
+You can visit our:<br/>
+[Website](https://retrodeck.net) <br/>
+[Wiki](https://github.com/XargonWan/RetroDECK/wiki) <br/>
+[Discord](https://discord.gg/Dz3szYsP8g)
 
 ## What is RetroDECK?
 RetroDECK is a [EmulationStation Desktop Edition](https://es-de.org) powered application that builds in a variety of emulators and other software that allows you to play your favorite retro (and even not-so-retro) games in a tidy contained sandbox environment. It's inspired by embedded emulation systems like AmberELEC, EmuELEC, CoreELEC, Lakka, and Batocera.
@@ -45,7 +48,7 @@ No, partitioning or formatting is not needed at all. RetroDECK (differently from
 
 ## Do you support Windows?
 No, RetroDECK doesn't support Windows, but the project is fully open source so you can port it if you wish. 
-As an alternative you could try [Retrobat](http://www.retrobat.ovh/) that offers similar functionality.
+As an alternative you could try [Retrobat](https://www.retrobat.org/) that offers similar functionality.
 
 ## Do you support the Linux Desktop?
 We do plan to support Linux Desktop in the future. But during the BETA we are focusing on the Steam Deck. Technically it is working, but the user experience might not be that great (it could contain desktop specific bugs and other issues). If you want to try it make sure that your distribution has native flatpak support else, you might need to install it.

es-configs/es_systems.xml

@@ -1303,7 +1303,7 @@
         <command label="SwanStation">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/swanstation_libretro.so %ROM%</command>
         <command label="Beetle PSX">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_psx_libretro.so %ROM%</command>
         <command label="Beetle PSX HW">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_psx_hw_libretro.so %ROM%</command>
-        <command label="PCSX ReARMed">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pcsx_rearmed_libretro.so %ROM%</command>       
+        <command label="PCSX ReARMed">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pcsx_rearmed_libretro.so %ROM%</command>
         <command label="DuckStation (Standalone)">%EMULATOR_DUCKSTATION% -batch %ROM%</command>
         <!-- <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module psx %ROM%</command> -->
         <platform>psx</platform>
@@ -1868,4 +1868,4 @@
         <platform>tools</platform>
         <theme>tools</theme>
     </system>
-</systemList>
+</systemList>

functions.sh

@@ -1195,7 +1195,7 @@ prepare_emulator() {
           if [[ ! $current_setting_name =~ (rdhome|sdcard) ]]; then # Ignore these locations
             local current_setting_value=$(get_setting_value "$rd_conf" "$current_setting_name" "retrodeck" "paths")
             eval "$current_setting_name=$rdhome/$(basename $current_setting_value)"
-            mkdir "$rdhome/$(basename $current_setting_value)"
+            mkdir -p "$rdhome/$(basename $current_setting_value)"
           fi
         done < <(grep -v '^\s*$' $rd_conf | awk '/^\[paths\]/{f=1;next} /^\[/{f=0} f')
     fi
@@ -1870,7 +1870,8 @@ finit() {
 
   case $finit_dest_choice in
 
-  "" ) # Cancel or X button quits
+  "Back" | "" ) # Back or X button quits
+    rm -f "$rd_conf" # Cleanup unfinished retrodeck.cfg if first install is interrupted
     echo "Now quitting"
     exit 2
   ;;
@@ -1895,6 +1896,7 @@ finit() {
       --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=$(finit_browse) # Calling the browse function
       if [[ -z $rdhome ]]; then # If user hit the cancel button
+        rm -f "$rd_conf" # Cleanup unfinished retrodeck.cfg if first install is interrupted
         exit 2
       fi
     elif [ ! -w "$sdcard" ] #SD card found but not writable
@@ -1905,6 +1907,7 @@ finit() {
         --title "RetroDECK" \
         --ok-label "Quit" \
         --text="SD card was found but is not writable\nThis can happen with cards formatted on PC.\nPlease format the SD card through the Steam Deck's Game Mode and run RetroDECK again."
+        rm -f "$rd_conf" # Cleanup unfinished retrodeck.cfg if first install is interrupted
         echo "Now quitting"
         exit 2
     else
@@ -1921,6 +1924,7 @@ finit() {
       --text="Please choose the root folder for the RetroDECK data.\nA retrodeck folder will be created starting from the directory that you selected."
       rdhome=$(finit_browse) # Calling the browse function
       if [[ -z $rdhome ]]; then # If user hit the cancel button
+        rm -f "$rd_conf" # Cleanup unfinished retrodeck.cfg if first install is interrupted
         exit 2
       fi
     ;;

global.sh

@@ -97,8 +97,7 @@ then
 fi
 
 # If there is no config file I initalize the file with the the default values
-if [ ! -f "$rd_conf" ]
+if [[ ! -f "$rd_conf" ]]; then
-then
   mkdir -p /var/config/retrodeck
   echo "RetroDECK config file not found in $rd_conf"
   echo "Initializing"
@@ -126,7 +125,7 @@ then
   if grep -qF "cooker" <<< $hard_version; then # If newly-installed version is a "cooker" build
     set_setting_value $rd_conf "update_repo" "RetroDECK-cooker" retrodeck "options"
     set_setting_value $rd_conf "update_check" "true" retrodeck "options"
-    update_ignore=$(curl --silent "https://api.github.com/repos/XargonWan/$update_repo/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
+    update_ignore=$(curl --silent "https://api.github.com/repos/XargonWan/RetroDECK-cooker/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
     set_setting_value $rd_conf "update_ignore" "$update_ignore" retrodeck "options" # Store the latest online version to ignore for future checks, as internal version and online tag version may not match up.
   fi
 

net.retrodeck.retrodeck.appdata.xml

@@ -77,9 +77,9 @@
             <ul>
                <li>PLACEHOLDER</li>
             </ul>
-        </description>
+         </description>
       </release>
-      <release version="0.6.6b" date="2023-04-24">
+      <release version="0.6.6b" date="2023-04-26">
          <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.6.6b</url>
          <description>
             <p>Bug fixes:</p>
@@ -554,4 +554,4 @@
          </description>
       </release>
    </releases>
-</component>
+</component>

post_update.sh

@@ -76,7 +76,6 @@ post_update() {
     # - Update RPCS3 vfs file contents. migrate from old location if needed
     # - Disable ESDE update checks for existing installs
     # - Offer user option of installing custom controller config
-    # - Notify user of default PSX core change
 
     mkdir -p "$mods_folder"
     mkdir -p "$texture_packs_folder"
@@ -121,8 +120,6 @@ post_update() {
       rsync -a "/app/retrodeck/binding-icons/" "$HOME/.steam/steam/tenfoot/resource/images/library/controller/binding_icons/"
       cp -f "$emuconfigs/retrodeck/defaults/RetroDECK_controller_config.vdf" "$HOME/.steam/steam/controller_base/templates/RetroDECK_controller_config.vdf"
     fi
-
-    configurator_generic_dialog "As part of this update, the default PSX emulator has changed!\n\nIf you are currently playing PSX games and have not changed the default emulator on your own, you will need to switch back to the previous default emulator (Swanstation) for your existing saves to work.\nIf you have changed the default emulator yourself, please change it again to your previous choice.\n\nSee the wiki or Discord if you have more questions on this change!"
   fi
 
   # The following commands are run every time.

retrodeck.sh

@@ -106,7 +106,7 @@ then
     echo "Config file's version is $version but the actual version is $hard_version"
     if grep -qF "cooker" <<< $hard_version; then # If newly-installed version is a "cooker" build
       cooker_base_version=$(echo $hard_version | cut -d'-' -f2)
-      update_ignore=$(curl --silent "https://api.github.com/repos/XargonWan/$update_repo/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
+      update_ignore=$(curl --silent "https://api.github.com/repos/XargonWan/RetroDECK-cooker/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
       set_setting_value $rd_conf "update_ignore" "$update_ignore" retrodeck "options" # Store the latest online version to ignore for future checks, as internal version and online tag version may not match up.
       choice=$(zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap --ok-label="Upgrade" --extra-button="Don't Upgrade" --extra-button="Fresh Install" \
       --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \