From 5e2b5e8091d1a167b77a6acf7e1f14a54e5b4e45 Mon Sep 17 00:00:00 2001
From: Roy Qu <royqh1979@gmail.com>
Date: Thu, 7 Jul 2022 19:33:25 +0800
Subject: [PATCH] update windows package scripts

---
 packages/msys/build-i686.sh | 11 +++++++++--
 packages/msys/build-x64.sh  | 13 +++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/packages/msys/build-i686.sh b/packages/msys/build-i686.sh
index 8e4f1865..34f6f777 100644
--- a/packages/msys/build-i686.sh
+++ b/packages/msys/build-i686.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+TARGET_DIR="/r/"
 BUILD_DIR="${TEMP}/redpandacpp-build"
 PACKAGE_DIR="${TEMP}/RedPanda-CPP"
 GCC_DIR="/mingw32"
@@ -39,11 +40,14 @@ rm -f redpanda-i686-nocompiler.nsi
 
 SETUP_NAME=`ls *.Setup.exe`
 PORTABLE_NAME=`echo $SETUP_NAME | sed 's/Setup.exe/Portable.7z/'`
-mv "$SETUP_NAME" "${SOURCE_DIR}"
+mv "$SETUP_NAME" "${TARGET_DIR}"
 popd
 
+pushd .
+cd "${TARGET_DIR}"
 echo "Making no-compiler Portable Package..."
 7z a -mmt8 -mx9  "${PORTABLE_NAME}" "${PACKAGE_DIR}"
+popd
 
 # we need reinstall config32.nsh
 pushd .
@@ -68,12 +72,15 @@ rm -f redpanda-i686.nsi
 
 SETUP_NAME=`ls *.Setup.exe`
 PORTABLE_NAME=`echo $SETUP_NAME | sed 's/Setup.exe/Portable.7z/'`
-mv "$SETUP_NAME" "${SOURCE_DIR}"
+mv "$SETUP_NAME" "${TARGET_DIR}"
 
 popd
 
+pushd .
+cd "${TARGET_DIR}"
 echo "Making Portable Package..."
 7z a -mmt8 -mx9  "${PORTABLE_NAME}" "${PACKAGE_DIR}"
+popd
 
 echo "Clean up..."
 rm -rf "${PACKAGE_DIR}"
diff --git a/packages/msys/build-x64.sh b/packages/msys/build-x64.sh
index c201ce02..8aa73cd3 100644
--- a/packages/msys/build-x64.sh
+++ b/packages/msys/build-x64.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+TARGET_DIR="/r/"
 BUILD_DIR="${TEMP}/redpandacpp-build"
 PACKAGE_DIR="${TEMP}/RedPanda-CPP"
 GCC_DIR="/mingw64"
@@ -39,11 +40,14 @@ rm -f redpanda-nocompiler.nsi
 
 SETUP_NAME=`ls *.Setup.exe`
 PORTABLE_NAME=`echo $SETUP_NAME | sed 's/Setup.exe/Portable.7z/'`
-mv "$SETUP_NAME" "${SOURCE_DIR}"
+mv "$SETUP_NAME" "${TARGET_DIR}"
 popd
 
+pushd .
+cd "${TARGET_DIR}"
 echo "Making no-compiler Portable Package..."
 7z a -mmt8 -mx9  "${PORTABLE_NAME}" "${PACKAGE_DIR}"
+popd
 
 # we need reinstall config.nsh
 pushd .
@@ -68,13 +72,18 @@ rm -f redpanda-x64.nsi
 
 SETUP_NAME=`ls *.Setup.exe`
 PORTABLE_NAME=`echo $SETUP_NAME | sed 's/Setup.exe/Portable.7z/'`
-mv "$SETUP_NAME" "${SOURCE_DIR}"
+mv "$SETUP_NAME" "${TARGET_DIR}"
 
 popd
 
+pushd .
+
+cd "${TARGET_DIR}"
 echo "Making Portable Package..."
 7z a -mmt8 -mx9  "${PORTABLE_NAME}" "${PACKAGE_DIR}"
 
 echo "Clean up..."
 rm -rf "${PACKAGE_DIR}"
 
+popd
+