From e3e9d593ba3f9eb702a42d7fdbd6e5523447882a Mon Sep 17 00:00:00 2001
From: Niven <sieniven@gmail.com>
Date: Fri, 5 Jan 2024 15:09:35 +0800
Subject: [PATCH] CI: Clean up win-x64 package pipeline (#2755)

* Better fix

* Remove whitespace
---
 make.sh | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/make.sh b/make.sh
index 14d826cf1e..0dbe57eb49 100755
--- a/make.sh
+++ b/make.sh
@@ -225,7 +225,7 @@ package() {
     local pkg_path
     if [[ "$target" == "x86_64-w64-mingw32" ]]; then
         pkg_path="$(_canonicalize "${build_dir}/${pkg_name}.zip")"
-    else        
+    else
         pkg_path="$(_canonicalize "${build_dir}/${pkg_name}.tar.gz")"
     fi
 
@@ -241,11 +241,8 @@ package() {
     echo "> packaging: ${pkg_name} from ${versioned_build_dir}"
 
     if [[ "$target" == "x86_64-w64-mingw32" ]]; then
-        _ensure_enter_dir "${versioned_build_dir}"
-        cd ..
-        local dir_to_zip
-        dir_to_zip=$(basename "${versioned_build_dir}")
-        zip -r "${pkg_path}" "${dir_to_zip}/"
+        _ensure_enter_dir "${build_dir}"
+        zip -r "${pkg_path}" "$(basename "${versioned_build_dir}")"
     else
         _ensure_enter_dir "${versioned_build_dir}"
         _tar --transform "s,^./,${versioned_name}/," -czf "${pkg_path}" ./*