From 77f71aab59532458a52293413ddb68a3209269f9 Mon Sep 17 00:00:00 2001
From: otavepto <153766569+otavepto@users.noreply.github.com>
Date: Sun, 16 Jun 2024 19:43:29 +0300
Subject: [PATCH] hopefully fixes packages paths

---
 .github/workflows/release.yml | 8 ++++----
 package_win.bat               | 6 ++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8fc2dd0d..c5fca5d4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -90,7 +90,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: "release-emu-win-release-${{ github.sha }}"
-          path: "build/package/win/vs2022/release/*"
+          path: "build/package/win/vs2022/*release*"
           if-no-files-found: 'error'
           compression-level: 0
           retention-days: 1
@@ -99,7 +99,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: "release-emu-win-debug-${{ github.sha }}"
-          path: "build/package/win/vs2022/debug/*"
+          path: "build/package/win/vs2022/*debug*"
           if-no-files-found: 'error'
           compression-level: 0
           retention-days: 1
@@ -180,7 +180,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: "release-emu-linux-release-${{ github.sha }}"
-          path: "build/package/linux/gmake2/release/*"
+          path: "build/package/linux/gmake2/*release*"
           if-no-files-found: 'error'
           compression-level: 0
           retention-days: 1
@@ -189,7 +189,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: "release-emu-linux-debug-${{ github.sha }}"
-          path: "build/package/linux/gmake2/debug/*"
+          path: "build/package/linux/gmake2/*debug*"
           if-no-files-found: 'error'
           compression-level: 0
           retention-days: 1
diff --git a/package_win.bat b/package_win.bat
index 66c2bb02..6b2a500b 100644
--- a/package_win.bat
+++ b/package_win.bat
@@ -70,10 +70,12 @@ if exist "%archive_dir%\" (
 )
 set "archive_file="
 for %%A in ("%archive_dir%") do (
-  set "archive_file=%archive_dir%\emu-win-%%~nxA.7z"
+  set "archive_file=%%~dpAemu-win-%%~nxA.7z"
 )
 
-mkdir "%archive_dir%"
+for %%A in ("%archive_dir%") do (
+  mkdir "%%~dpA"
+)
 "%packager%" a "%archive_file%" ".\%target_src_dir%" -t7z -slp -ssw -mx -myx -mmemuse=p%MEM_PERCENT% -ms=on -mqs=off -mf=on -mhc+ -mhe- -m0=LZMA2:d=%DICT_SIZE_MB%m -mmt=%THREAD_COUNT% -mmtf+ -mtm- -mtc- -mta- -mtr+