From 08bbd26689bad7c57ace9270fc2e6b99a130fed6 Mon Sep 17 00:00:00 2001
From: Cyrix126 <gupaxx@baermail.fr>
Date: Sun, 21 Apr 2024 18:47:32 +0200
Subject: [PATCH] fix utils release

---
 utils/create_tmp_env.sh     | 16 ++++++++--------
 utils/move_binary_inside.sh |  3 ++-
 utils/package.sh            |  4 ++--
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/utils/create_tmp_env.sh b/utils/create_tmp_env.sh
index 298925e3..2eca9fef 100755
--- a/utils/create_tmp_env.sh
+++ b/utils/create_tmp_env.sh
@@ -19,25 +19,25 @@ cp CHANGELOG.md /tmp/${FOLDER}/skel/
 # download xmrig into directory linux
 wget https://github.com/xmrig/xmrig/releases/download/v6.21.1/xmrig-6.21.1-linux-static-x64.tar.gz
 tar -xf xmrig-6.21.1-linux-static-x64.tar.gz
-mv xmrig-6.21.1/xmrig /tmp/${FOLDER}/skel/linux/xmrig/xmrig
+mv xmrig-6.21.1/xmrig /tmp/${FOLDER}/skel/linux_b/xmrig/xmrig
 rm -r xmrig-6.21.1
 rm xmrig-6.21.1-linux-static-x64.tar.gz 
 # download xmrig into directory macos-arm64
 wget https://github.com/xmrig/xmrig/releases/download/v6.21.1/xmrig-6.21.1-macos-arm64.tar.gz
 tar -xf xmrig-6.21.1-macos-arm64.tar.gz
-mv xmrig-6.21.1/xmrig /tmp/${FOLDER}/skel/macos-arm64/Gupaxx.app/Contents/MacOS/xmrig/xmrig
+mv xmrig-6.21.1/xmrig /tmp/${FOLDER}/skel/macos-arm64_b/Gupaxx.app/Contents/MacOS/xmrig/xmrig
 rm -r xmrig-6.21.1
 rm xmrig-6.21.1-macos-arm64.tar.gz
 # download xmrig into directory macos-x64
 wget https://github.com/xmrig/xmrig/releases/download/v6.21.1/xmrig-6.21.1-macos-x64.tar.gz
 tar -xf xmrig-6.21.1-macos-x64.tar.gz
-mv xmrig-6.21.1/xmrig /tmp/${FOLDER}/skel/macos-x64/Gupaxx.app/Contents/MacOS/xmrig/xmrig
+mv xmrig-6.21.1/xmrig /tmp/${FOLDER}/skel/macos-x64_b/Gupaxx.app/Contents/MacOS/xmrig/xmrig
 rm -r xmrig-6.21.1
 rm xmrig-6.21.1-macos-x64.tar.gz
 # download xmrig into directory windows
 wget https://github.com/xmrig/xmrig/releases/download/v6.21.1/xmrig-6.21.1-msvc-win64.zip
 unzip xmrig-6.21.1-msvc-win64.zip
-mv xmrig-6.21.1/xmrig.exe /tmp/${FOLDER}/skel/windows/XMRig/xmrig.exe
+mv xmrig-6.21.1/xmrig.exe /tmp/${FOLDER}/skel/windows_b/XMRig/xmrig.exe
 rm -r xmrig-6.21.1
 rm xmrig-6.21.1-msvc-win64.zip
 
@@ -45,25 +45,25 @@ rm xmrig-6.21.1-msvc-win64.zip
 # download p2pool into directory linux
 wget https://github.com/SChernykh/p2pool/releases/download/v3.10/p2pool-v3.10-linux-x64.tar.gz
 tar -xf p2pool-v3.10-linux-x64.tar.gz
-mv p2pool-v3.10-linux-x64/p2pool /tmp/${FOLDER}/skel/linux/p2pool/p2pool
+mv p2pool-v3.10-linux-x64/p2pool /tmp/${FOLDER}/skel/linux_b/p2pool/p2pool
 rm -r p2pool-v3.10-linux-x64
 rm p2pool-v3.10-linux-x64.tar.gz
 # download p2pool into directory macos-arm64
 wget https://github.com/SChernykh/p2pool/releases/download/v3.10/p2pool-v3.10-macos-aarch64.tar.gz
 tar -xf p2pool-v3.10-macos-aarch64.tar.gz
-mv p2pool-v3.10-macos-aarch64/p2pool /tmp/${FOLDER}/skel/macos-arm64/Gupaxx.app/Contents/MacOS/p2pool/p2pool
+mv p2pool-v3.10-macos-aarch64/p2pool /tmp/${FOLDER}/skel/macos-arm64_b/Gupaxx.app/Contents/MacOS/p2pool/p2pool
 rm -r p2pool-v3.10-macos-aarch64
 rm p2pool-v3.10-macos-aarch64.tar.gz
 # download p2pool into directory macos-x64
 wget https://github.com/SChernykh/p2pool/releases/download/v3.10/p2pool-v3.10-macos-x64.tar.gz
 tar -xf p2pool-v3.10-macos-x64.tar.gz
-mv p2pool-v3.10-macos-x64/p2pool /tmp/${FOLDER}/skel/macos-x64/Gupaxx.app/Contents/MacOS/p2pool/p2pool
+mv p2pool-v3.10-macos-x64/p2pool /tmp/${FOLDER}/skel/macos-x64_b/Gupaxx.app/Contents/MacOS/p2pool/p2pool
 rm -r p2pool-v3.10-macos-x64
 rm p2pool-v3.10-macos-x64.tar.gz
 # download p2pool into directory windows
 wget https://github.com/SChernykh/p2pool/releases/download/v3.10/p2pool-v3.10-windows-x64.zip
 unzip p2pool-v3.10-windows-x64.zip
-mv p2pool-v3.10-windows-x64/p2pool.exe /tmp/${FOLDER}/skel/windows/P2Pool/p2pool.exe
+mv p2pool-v3.10-windows-x64/p2pool.exe /tmp/${FOLDER}/skel/windows_b/P2Pool/p2pool.exe
 rm -r p2pool-v3.10-windows-x64
 rm p2pool-v3.10-windows-x64.zip
 
diff --git a/utils/move_binary_inside.sh b/utils/move_binary_inside.sh
index eb05394b..473d4599 100755
--- a/utils/move_binary_inside.sh
+++ b/utils/move_binary_inside.sh
@@ -6,6 +6,7 @@
 [[ -f windows.zip ]]; check "windows zip"
 [[ -f macos.zip ]]; check "macos zip"
 unzip linux.zip; unzip macos.zip; unzip windows.zip
+tar -xf windows.tar
 mv gupaxx.exe skel/windows/Gupaxx.exe
 mv gupaxx_b.exe skel/windows_b/Gupaxx.exe
 tar -xf linux.tar
@@ -26,4 +27,4 @@ rm -r Gupaxx-macos-x64.app_b
 rm -r Gupaxx-macos-arm64.app_b
 rm linux.zip; rm macos.zip; rm windows.zip
 # windows unzip only the exe so not tar to delete.
-rm linux.tar; rm macos.tar
+rm linux.tar; rm macos.tar; rm windows.tar
diff --git a/utils/package.sh b/utils/package.sh
index b36a55ac..eb612dc7 100755
--- a/utils/package.sh
+++ b/utils/package.sh
@@ -55,8 +55,8 @@ title "Tar Linux"
 # give execution permission
 chmod +x linux/gupaxx
 chmod +x linux_b/gupaxx
-chmod +x linux/p2pool/p2pool
-chmod +x linux/xmrig/xmrig
+chmod +x linux_b/p2pool/p2pool
+chmod +x linux_b/xmrig/xmrig
 mv linux_b "gupaxx-$NEW_VER-linux-x64-bundle"; check "linux -> gupaxx-$NEW_VER-linux-x64-bundle"
 tar -czpf "gupaxx-${NEW_VER}-linux-x64-bundle.tar.gz" "gupaxx-$NEW_VER-linux-x64-bundle" --owner=lm --group=lm ; check "tar linux-bundle"
 # Tar Linux Standalone