From c22bf430d803dfef60e90bc963184f6ad96ec738 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Wed, 21 Sep 2022 16:22:00 +0200
Subject: [PATCH] Various fixes by RavenKilit

---
 global.sh        | 6 +++---
 retrodeck.sh     | 4 ++++
 tools/cheevos.sh | 6 +++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/global.sh b/global.sh
index 5cb2e902..b67d81f8 100755
--- a/global.sh
+++ b/global.sh
@@ -66,12 +66,12 @@ then
   version="$hard_version"                                    # if we are here means that the we are in a new installation, so the version is valorized with the hardcoded one
   rdhome="$HOME/retrodeck"                                   # the retrodeck home, aka ~/retrodeck
   roms_folder="$rdhome/roms"                                 # the default roms folder path
-  media_folder="$rdhome/retrodeck/downloaded_media"          # the media folder, where all the scraped data is downloaded into
-  themes_folder="$rdhome/retrodeck/themes"                   # the themes folder
+  media_folder="$rdhome/downloaded_media"                    # the media folder, where all the scraped data is downloaded into
+  themes_folder="$rdhome/themes"                             # the themes folder
   sdcard="$default_sd"                                       # Steam Deck SD default path
 
   # Writing the variables for the first time
-  echo "#!/bin/bash"                          >> $rd_conf
+  echo '#!/bin/bash'                          >> $rd_conf
   echo "version=$version"                     >> $rd_conf
   echo "rdhome=$rdhome"                       >> $rd_conf
   echo "roms_folder=$roms_folder"             >> $rd_conf
diff --git a/retrodeck.sh b/retrodeck.sh
index e50a7ea3..f8907030 100644
--- a/retrodeck.sh
+++ b/retrodeck.sh
@@ -383,6 +383,10 @@ finit() {
       advanced
       ;;
 
+    1 ) # X button quits
+      kill $$
+      ;;
+
     esac
 
     mkdir -pv $roms_folder
diff --git a/tools/cheevos.sh b/tools/cheevos.sh
index 877c4998..c7ec4374 100755
--- a/tools/cheevos.sh
+++ b/tools/cheevos.sh
@@ -13,6 +13,6 @@ arrIN=(${login//=SEP=/ })
 user=${arrIN[0]}
 pass=${arrIN[1]}
 
-sed -i "s%cheevos_enable =.*%cheevos_enable = \"true\"" $racfg
-sed -i "s%cheevos_username =.*%cheevos_username = \"$user\"" $racfg
-sed -i "s%cheevos_password =.*%cheevos_password = \"$pass\"" $racfg
+sed -i "s%cheevos_enable =.*%cheevos_enable = \"true\"%" $racfg
+sed -i "s%cheevos_username =.*%cheevos_username = \"$user\"%" $racfg
+sed -i "s%cheevos_password =.*%cheevos_password = \"$pass\"%" $racfg