Merge pull request #265 from icenine451/cooker-0.6.3b-icenine451

Cooker 0.6.3b icenine451

es-configs/tools-gamelist.xml

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

net.retrodeck.retrodeck.yml

@@ -574,7 +574,7 @@ modules:
       - --disable-avrcp
       - --disable-network
       - --disable-obex
-      - --disable-bap 
+      - --disable-bap
       - --disable-mcp
       - --with-dbusconfdir=/app/etc
       - --with-dbussessionbusdir=/app/usr/lib/system-services
@@ -1054,7 +1054,7 @@ modules:
       - cp es-configs/es_settings.xml ${FLATPAK_DEST}/retrodeck/es_settings.xml
 
       # Logo, res, move graphics directory to mutable space so splash can be changed after build
-      - mv -f -t ${FLATPAK_DEST}/emulationstation /app/share/emulationstation/resources/graphics 
+      - mv -f -t ${FLATPAK_DEST}/emulationstation /app/share/emulationstation/resources/graphics
       - ln -s ${FLATPAK_DEST}/emulationstation/graphics /app/share/emulationstation/resources/graphics
       - cp -f res/extra-splashes/* ${FLATPAK_DEST}/emulationstation/graphics
       - cp -f res/splash.svg ${FLATPAK_DEST}/emulationstation/graphics/splash.svg
@@ -1062,12 +1062,13 @@ modules:
       - cp -f res/icon.svg /app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg
 
       # Tools
-      - mkdir -p ${FLATPAK_DEST}/retrodeck/tools/
-      - cp tools/* ${FLATPAK_DEST}/retrodeck/tools/
       - mv -f es-configs/tools-gamelist.xml ${FLATPAK_DEST}/retrodeck/
 
+      # Launchable scripts
       - cp retrodeck.sh /app/bin/retrodeck.sh
       - chmod +x /app/bin/retrodeck.sh
+      - cp tools/configurator.sh /app/bin/configurator.sh
+      - chmod +x /app/bin/configurator.sh
 
       # Function libraries
       - mkdir -p /app/libexec

rd-submodules/retroarch

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

retrodeck.sh

@@ -45,7 +45,7 @@ https://retrodeck.net
       exit
       ;;
     --configurator*)
-      sh /var/config/retrodeck/tools/configurator.sh
+      sh /app/bin/configurator.sh
       exit
       ;;
     --reset-emulator*)
@@ -53,7 +53,7 @@ https://retrodeck.net
       echo "Available options are: retroarch citra dolphin duckstation melonds pcsx2 ppsspp primehack rpcs3 xemu yuzu all-emulators"
       read -p "Please enter the emulator you would like to reset: " emulator
       if [[ "$emulator" =~ ^(retroarch|citra|dolphin|duckstation|melonds|pcsx2|ppsspp|primehack|rpcs3|xemu|yuzu|all-emulators)$ ]]; then
-        read -p "You are about to reset $emulator to default settings. Press 'y' to continue, 'n' to stop: " response
+        read -p "You are about to reset $emulator to default settings. Enter 'y' to continue, 'n' to stop: " response
         if [[ $response == [yY] ]]; then
           cli_emulator_reset $emulator
           read -p "The process has been completed, press Enter key to start RetroDECK."
@@ -69,7 +69,7 @@ https://retrodeck.net
       ;;
     --reset-tools*)
       echo "You are about to reset the RetroDECK tools."
-      read -p "Press 'y' to continue, 'n' to stop: " response
+      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."
@@ -81,9 +81,10 @@ https://retrodeck.net
       ;;
     --reset-retrodeck*)
       echo "You are about to reset RetroDECK completely!"
-      read -p "Press 'y' to continue, 'n' to stop: " response
+      read -p "Enter 'y' to continue, 'n' to stop: " response
       if [[ $response == [yY] ]]; then
         rm -f "$lockfile"
+        rm -f "$rd_conf"
         read -p "The process has been completed, press Enter key to start the initial RetroDECK setup process."
         shift # Continue launch after previous command is finished
       else

tools/configurator.sh

@@ -165,8 +165,9 @@ configurator_reset_dialog() {
   zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap \
   --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
   --title "RetroDECK Configurator Utility - Reset RetroDECK" \
-  --text="You are resetting RetroDECK to its default state.\n\nAfter the process is complete you will need to exit RetroDECK and run it again, where you will go through the initial setup process again."
+  --text="You are resetting RetroDECK to its default state.\n\nAfter the process is complete you will need to exit RetroDECK and run it again, where you will go through the initial setup process."
   rm -f "$lockfile"
+  rm -f "$rd_conf"
   configurator_process_complete_dialog "resetting RetroDECK"
 ;;
 
@@ -340,7 +341,7 @@ configurator_retroarch_options_dialog() {
   ;;
 
   "" ) # No selection made or Back button clicked
-    configurator_options_dialog
+    configurator_welcome_dialog
   ;;
 
   esac