From a91277614e428ee82cd04bac0a672463768bfca8 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Sun, 31 Jul 2022 15:11:38 +0100
Subject: [PATCH] Miyoo mini: Rename zip files

Add "miyoo-mini" to the release archive name to make it clear what
device this is for.
---
 .github/workflows/miyoo_mini_release.yml |  8 +++----
 Packaging/miyoo_mini/build.sh            | 28 ++++++++++++------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/miyoo_mini_release.yml b/.github/workflows/miyoo_mini_release.yml
index dffeb19f8..be6ba440a 100644
--- a/.github/workflows/miyoo_mini_release.yml
+++ b/.github/workflows/miyoo_mini_release.yml
@@ -28,15 +28,15 @@ jobs:
       if: ${{ !env.ACT }}
       uses: actions/upload-artifact@v2
       with:
-        name: devilutionx-onion-os.zip
-        path: build-miyoo-mini/devilutionx-onion-os.zip
+        name: devilutionx-miyoo-mini-onion-os.zip
+        path: build-miyoo-mini/devilutionx-miyoo-mini-onion-os.zip
 
     - name: Upload-miniUI-Package
       if: ${{ !env.ACT }}
       uses: actions/upload-artifact@v2
       with:
-        name: devilutionx-miniui.zip
-        path: build-miyoo-mini/devilutionx-miniui.zip
+        name: devilutionx-miyoo-mini-miniui.zip
+        path: build-miyoo-mini/devilutionx-miyoo-mini-miniui.zip
 
     - name: Update Release
       if: ${{ github.event_name == 'release' && !env.ACT }}
diff --git a/Packaging/miyoo_mini/build.sh b/Packaging/miyoo_mini/build.sh
index bbe3e6a4b..e8ce9c349 100755
--- a/Packaging/miyoo_mini/build.sh
+++ b/Packaging/miyoo_mini/build.sh
@@ -11,7 +11,7 @@ declare -r MIYOO_CUSTOM_SDL_BRANCH="miniui-miyoomini"
 main() {
 	# ensure we are in devilutionx root
 	cd "$PACKAGING_DIR/../.."
-	
+
 	rm -f "$BUILD_DIR/CMakeCache.txt"
 	cmake_configure -DCMAKE_BUILD_TYPE=Release
 	cmake_build
@@ -37,12 +37,12 @@ build_custom_sdl() {
 	# make clean folder for custom SDL build
 	rm -rf $BUILD_DIR/CustomSDL
 	mkdir  $BUILD_DIR/CustomSDL
-	
+
 	# clone the repo and build the lib
 	cd $BUILD_DIR/CustomSDL
 	git clone $MIYOO_CUSTOM_SDL_REPO --branch $MIYOO_CUSTOM_SDL_BRANCH --single-branch .
 	./make.sh
-	
+
 	# 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"
@@ -50,16 +50,16 @@ build_custom_sdl() {
 
 prepare_onion_skeleton() {
 	mkdir -p $BUILD_DIR/OnionOS
-	
+
 	# Copy basic 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
-	
+
 	# ensure lib dir for custom SDL
 	mkdir -p $BUILD_DIR/OnionOS/Emu/PORTS/Binaries/Diablo.port/lib
-	
+
 	# ensure config dir
 	mkdir -p $BUILD_DIR/OnionOS/Saves/CurrentProfile/config/DevilutionX
 
@@ -74,20 +74,20 @@ package_onion() {
 	cp -rf $BUILD_DIR/assets/* $BUILD_DIR/OnionOS/Emu/PORTS/Binaries/Diablo.port/assets
 	# copy executable
 	cp -f $BUILD_DIR/devilutionx $BUILD_DIR/OnionOS/Emu/PORTS/Binaries/Diablo.port/devilutionx
-	
+
 	rm -f $BUILD_DIR/onion.zip
-	
+
 	cd $BUILD_DIR/OnionOS
-	zip -r ../devilutionx-onion-os.zip .
+	zip -r ../devilutionx-miyoo-mini-onion-os.zip .
 	cd "$PACKAGING_DIR/../.."
 }
 
 prepare_miniui_skeleton() {
 	mkdir -p $BUILD_DIR/MiniUI
-	
+
 	# copy basic skeleton
 	cp -rf  Packaging/miyoo_mini/skeleton_MiniUI/* $BUILD_DIR/MiniUI
-	
+
 	# ensure devilutionx asset dir
 	mkdir -p $BUILD_DIR/MiniUI/Diablo/assets
 }
@@ -98,11 +98,11 @@ package_miniui() {
 	cp -rf $BUILD_DIR/assets/* $BUILD_DIR/MiniUI/Diablo/assets
 	# copy executable
 	cp -f $BUILD_DIR/devilutionx $BUILD_DIR/MiniUI/Diablo/devilutionx
-	
+
 	rm -f $BUILD_DIR/miniui.zip
 
 	cd $BUILD_DIR/MiniUI
-	zip -r ../devilutionx-miniui.zip .
+	zip -r ../devilutionx-miyoo-mini-miniui.zip .
 	cd "$PACKAGING_DIR/../.."
 }