From c41ba55739c5872aada4adf7d9850d8c59f64c9f Mon Sep 17 00:00:00 2001
From: Ing <wjz304@qq.com>
Date: Sun, 8 Dec 2024 16:54:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20createvmc=20=E5=87=BD?=
 =?UTF-8?q?=E6=95=B0=EF=BC=8C=E4=BF=AE=E5=A4=8D=E7=9B=B8=E5=AF=B9=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/issues.yml |  2 +-
 scripts/func.sh              | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml
index 3a785800..45eba52a 100644
--- a/.github/workflows/issues.yml
+++ b/.github/workflows/issues.yml
@@ -297,8 +297,8 @@ jobs:
             zip -9 "rr-${MODEL}-${TAG}-${{ github.run_id }}.vmdk.zip" -j rr/rr.vmdk ${USER_CONFIG_FILE} sha256sum README.txt
           elif [ "${{ env.format }}" = "vhd" ]; then
             . scripts/func.sh "${{ secrets.RRORG }}"
-            createvmc "rr/rr.vmc"
             qemu-img convert rr/rr.img -O vpc rr/rr.vhd
+            createvmc "rr/rr.vhd" "rr/rr.vmc"
             (cd rr; sha256sum rr.vhd >../sha256sum)
             zip -9 "rr-${MODEL}-${TAG}-${{ github.run_id }}.vhd.zip" -j rr/rr.vmc rr/rr.vhd ${USER_CONFIG_FILE} sha256sum README.txt
           elif [ "${{ env.format }}" = "vhdx" ]; then
diff --git a/scripts/func.sh b/scripts/func.sh
index 24a999ae..b7e37250 100755
--- a/scripts/func.sh
+++ b/scripts/func.sh
@@ -442,8 +442,17 @@ function convertova() {
   rm -rf "VMX_${VMNAME}"
 }
 
+# createvmc
+# $1 vhd file
+# $2 vmc file
 function createvmc() {
-  cat <<_EOF_ >"${1:-rr.vmc}"
+  local BLIMAGE=${1:-rr.vhd}
+  local VMCPATH=${2:-rr.vmc}
+
+  BLIMAGE="$(basename "${BLIMAGE}")"
+  VMCPATH="$(realpath "${VMCPATH}")"
+
+  cat <<_EOF_ >"${VMCPATH}"
 <?xml version="1.0" encoding="UTF-8"?>
 <preferences>
     <version type="string">2.0</version>
@@ -457,7 +466,7 @@ function createvmc() {
                     <location id="0">
                         <drive_type type="integer">1</drive_type>
                         <pathname>
-                            <relative type="string">rr.vhd</relative>
+                            <relative type="string">${BLIMAGE}</relative>
                         </pathname>
                     </location>
                 </ide_controller>