From 8147a64cd8c30adfaa230b8161de59daed0158df Mon Sep 17 00:00:00 2001
From: icenine451 <59938822+icenine451@users.noreply.github.com>
Date: Mon, 20 Mar 2023 17:47:49 -0400
Subject: [PATCH] Move Configurator to RO space

---
 es-configs/tools-gamelist.xml | 4 ++--
 net.retrodeck.retrodeck.yml   | 9 +++++----
 retrodeck.sh                  | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/es-configs/tools-gamelist.xml b/es-configs/tools-gamelist.xml
index 23af3195..3e2cad3c 100644
--- a/es-configs/tools-gamelist.xml
+++ b/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> 
\ No newline at end of file
+</gameList>
\ No newline at end of file
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index af12b23c..20dd2214 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/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
diff --git a/retrodeck.sh b/retrodeck.sh
index 1db93be5..27af932c 100644
--- a/retrodeck.sh
+++ b/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*)