From 1d0480c473954a86d33b327a467fc1e942b052e8 Mon Sep 17 00:00:00 2001
From: icenine451 <benjamin.r.shelton@protonmail.com>
Date: Fri, 18 Nov 2022 21:28:05 -0500
Subject: [PATCH] Fix Unzips, removed redundant conf_write

---
 functions.sh                | 11 ++++++-----
 net.retrodeck.retrodeck.yml |  4 ++--
 retrodeck.sh                |  2 --
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/functions.sh b/functions.sh
index 7e0203dc..7b564d2c 100644
--- a/functions.sh
+++ b/functions.sh
@@ -577,13 +577,14 @@ xemu_init() {
   echo "Initializing XEMU"
   echo "------------------------"
   mkdir -pv $rdhome/saves/xbox/xemu/
+  mkdir -pv /var/data/xemu/
   cp -fv $emuconfigs/xemu.toml /var/data/xemu/xemu.toml
   sed -i 's#/home/deck/retrodeck#'$rdhome'#g' /var/data/xemu/xemu.toml
   # Preparing HD dummy Image if the image is not found
   if [ ! -f $rdhome/bios/xbox_hdd.qcow2 ]
   then
     wget "https://github.com/mborgerson/xemu-hdd-image/releases/latest/download/xbox_hdd.qcow2.zip" -P $rdhome/bios/
-    unzip -q $rdhome/bios/xbox_hdd.qcow2.zip $rdhome/bios/
+    unzip -q $rdhome/bios/xbox_hdd.qcow2.zip -d $rdhome/bios/
     rm -rfv $rdhome/bios/xbox_hdd.qcow2.zip
   fi
 }
@@ -603,7 +604,7 @@ duckstation_init() {
   echo "------------------------"
   mkdir -p /var/config/duckstation/
   cp -fv $emuconfigs/duckstation/* /var/config/duckstation
-  sed -i 's#/home/deck/retrodeck/bios#'$rdhome/bios'#g' /var/config/ppsspp/PSP/SYSTEM/settings.ini
+  sed -i 's#/home/deck/retrodeck/bios#'$rdhome/bios'#g' /var/config/duckstation/settings.ini
 }
 
 standalones_init() {
@@ -728,7 +729,7 @@ ra_init() {
   echo "Initializing MSX / SVI / ColecoVision / SG-1000 LIBRETRO"
   echo "-----------------------------------------------------------"
   wget "http://bluemsx.msxblue.com/rel_download/blueMSXv282full.zip" -P $rdhome/bios/MSX
-  unzip -q "$rdhome/bios/MSX/blueMSXv282full.zip" $rdhome/bios/MSX
+  unzip -q "$rdhome/bios/MSX/blueMSXv282full.zip" -d $rdhome/bios/MSX
   mv -rfv $rdhome/bios/MSX/Databases $rdhome/bios/Databases
   mv -rfv $rdhome/bios/MSX/Machines $rdhome/bios/Machines
   rm -rfv $rdhome/bios/MSX
@@ -868,8 +869,8 @@ finit() {
   ) |
   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 Finishing Upgrade" \
-  --text="RetroDECK is finishing the upgrade process, please wait."
+  --title "RetroDECK Finishing Initialization" \
+  --text="RetroDECK is finishing the initial setup process, please wait."
   create_lock
 
   zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap \
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 2d8dfa67..c9c822c5 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -1004,5 +1004,5 @@ modules:
 
     sources:
       - type: git
-        url: https://github.com/XargonWan/RetroDECK.git
-        branch: cooker-0.6.0b
\ No newline at end of file
+        url: https://github.com/icenine451/RetroDECK.git
+        branch: cooker-configurator
\ No newline at end of file
diff --git a/retrodeck.sh b/retrodeck.sh
index 79e582a7..a3362b2f 100644
--- a/retrodeck.sh
+++ b/retrodeck.sh
@@ -75,7 +75,6 @@ then
   then
       echo "Config file's version is $version but the actual version is $hard_version"
       post_update       # Executing post update script
-      conf_write        # Writing variables in the config file (sourced from global.sh)
       start_retrodeck
       exit 0
   fi
@@ -84,7 +83,6 @@ then
 else
   echo "Lockfile not found"
   finit             # Executing First/Force init
-  conf_write        # Writing variables in the config file (sourced from global.sh)
 	exit 0
 fi