From 77ded34137f8937e0133572518c22f8e40459ad9 Mon Sep 17 00:00:00 2001
From: Trihedraf <forrest@mailfsh.com>
Date: Wed, 16 Nov 2022 19:17:30 -0800
Subject: [PATCH] Fix locations for OnionOS 4

---
 Packaging/miyoo_mini/build.sh                       |  10 +++++-----
 .../PORTS/Binaries/Diablo.port/launch.sh            |   0
 .../{Emu/PORTS => Roms}/PORTS/Diablo.port           |   0
 .../{Emu/PORTS => Roms}/PORTS/Imgs/Diablo.png       | Bin
 Packaging/miyoo_mini/skeleton_OnionOS/readme.txt    |   4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename Packaging/miyoo_mini/skeleton_OnionOS/{Emu => Roms}/PORTS/Binaries/Diablo.port/launch.sh (100%)
 rename Packaging/miyoo_mini/skeleton_OnionOS/{Emu/PORTS => Roms}/PORTS/Diablo.port (100%)
 rename Packaging/miyoo_mini/skeleton_OnionOS/{Emu/PORTS => Roms}/PORTS/Imgs/Diablo.png (100%)

diff --git a/Packaging/miyoo_mini/build.sh b/Packaging/miyoo_mini/build.sh
index e8ce9c349..0451d70a5 100755
--- a/Packaging/miyoo_mini/build.sh
+++ b/Packaging/miyoo_mini/build.sh
@@ -45,7 +45,7 @@ build_custom_sdl() {
 
 	# change back to devilutionx root
 	cd "$PACKAGING_DIR/../.."
-	cp -rfL "$BUILD_DIR/CustomSDL/build/.libs/libSDL-1.2.so.0" "$BUILD_DIR/OnionOS/Emu/PORTS/Binaries/Diablo.port/lib/libSDL-1.2.so.0"
+	cp -rfL "$BUILD_DIR/CustomSDL/build/.libs/libSDL-1.2.so.0" "$BUILD_DIR/OnionOS/Roms/PORTS/Binaries/Diablo.port/lib/libSDL-1.2.so.0"
 }
 
 prepare_onion_skeleton() {
@@ -55,10 +55,10 @@ prepare_onion_skeleton() {
 	cp -rf  Packaging/miyoo_mini/skeleton_OnionOS/* $BUILD_DIR/OnionOS
 
 	# ensure devilutionx asset dir
-	mkdir -p $BUILD_DIR/OnionOS/Emu/PORTS/Binaries/Diablo.port/assets
+	mkdir -p $BUILD_DIR/OnionOS/Roms/PORTS/Binaries/Diablo.port/assets
 
 	# ensure lib dir for custom SDL
-	mkdir -p $BUILD_DIR/OnionOS/Emu/PORTS/Binaries/Diablo.port/lib
+	mkdir -p $BUILD_DIR/OnionOS/Roms/PORTS/Binaries/Diablo.port/lib
 
 	# ensure config dir
 	mkdir -p $BUILD_DIR/OnionOS/Saves/CurrentProfile/config/DevilutionX
@@ -71,9 +71,9 @@ package_onion() {
 	prepare_onion_skeleton
 	build_custom_sdl
 	# copy assets
-	cp -rf $BUILD_DIR/assets/* $BUILD_DIR/OnionOS/Emu/PORTS/Binaries/Diablo.port/assets
+	cp -rf $BUILD_DIR/assets/* $BUILD_DIR/OnionOS/Roms/PORTS/Binaries/Diablo.port/assets
 	# copy executable
-	cp -f $BUILD_DIR/devilutionx $BUILD_DIR/OnionOS/Emu/PORTS/Binaries/Diablo.port/devilutionx
+	cp -f $BUILD_DIR/devilutionx $BUILD_DIR/OnionOS/Roms/PORTS/Binaries/Diablo.port/devilutionx
 
 	rm -f $BUILD_DIR/onion.zip
 
diff --git a/Packaging/miyoo_mini/skeleton_OnionOS/Emu/PORTS/Binaries/Diablo.port/launch.sh b/Packaging/miyoo_mini/skeleton_OnionOS/Roms/PORTS/Binaries/Diablo.port/launch.sh
similarity index 100%
rename from Packaging/miyoo_mini/skeleton_OnionOS/Emu/PORTS/Binaries/Diablo.port/launch.sh
rename to Packaging/miyoo_mini/skeleton_OnionOS/Roms/PORTS/Binaries/Diablo.port/launch.sh
diff --git a/Packaging/miyoo_mini/skeleton_OnionOS/Emu/PORTS/PORTS/Diablo.port b/Packaging/miyoo_mini/skeleton_OnionOS/Roms/PORTS/Diablo.port
similarity index 100%
rename from Packaging/miyoo_mini/skeleton_OnionOS/Emu/PORTS/PORTS/Diablo.port
rename to Packaging/miyoo_mini/skeleton_OnionOS/Roms/PORTS/Diablo.port
diff --git a/Packaging/miyoo_mini/skeleton_OnionOS/Emu/PORTS/PORTS/Imgs/Diablo.png b/Packaging/miyoo_mini/skeleton_OnionOS/Roms/PORTS/Imgs/Diablo.png
similarity index 100%
rename from Packaging/miyoo_mini/skeleton_OnionOS/Emu/PORTS/PORTS/Imgs/Diablo.png
rename to Packaging/miyoo_mini/skeleton_OnionOS/Roms/PORTS/Imgs/Diablo.png
diff --git a/Packaging/miyoo_mini/skeleton_OnionOS/readme.txt b/Packaging/miyoo_mini/skeleton_OnionOS/readme.txt
index d3a65c85f..ba9e06297 100644
--- a/Packaging/miyoo_mini/skeleton_OnionOS/readme.txt
+++ b/Packaging/miyoo_mini/skeleton_OnionOS/readme.txt
@@ -8,12 +8,12 @@ Installation
 
 For the full game:
   - Get the DIABDAT.MPQ from either the CD or GOG release (https://github.com/diasurgical/devilutionX/wiki/Extracting-the-.MPQs-from-the-GoG-installer)
-  - Copy the DIABDAT.MPQ into Emu/PORTS/Binaries/Diablo.port/FILES_HERE
+  - Copy the DIABDAT.MPQ into Roms/PORTS/Binaries/Diablo.port/FILES_HERE
   - Optional: If you want to also play the Hellfire expansion, copy hellfire.mpq, hfmonk.mpq, hfmusic.mpq, hfvoice.mpq into the same folder
 
 For the free shareware version:
   - Get the spawn.mpq (https://github.com/diasurgical/devilutionx-assets/releases/download/v2/spawn.mpq)
-  - Copy the spawn.mpq into Emu/PORTS/Binaries/Diablo.port/FILES_HERE
+  - Copy the spawn.mpq into Roms/PORTS/Binaries/Diablo.port/FILES_HERE
 
 Controls
 --------