From e6dc0084fcf3e948e650f2e70eef8074dde93045 Mon Sep 17 00:00:00 2001
From: gfdgd_xi <3025613752@qq.com>
Date: Fri, 30 Aug 2024 16:37:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=84=E9=94=99=E4=BB=93=E5=BA=93=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/building-deb.yml            | 24 +++++++++----------
 ...nfigure-building-enviroment-base-system.sh |  7 +++---
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/building-deb.yml b/.github/workflows/building-deb.yml
index a76e375..22fcccd 100755
--- a/.github/workflows/building-deb.yml
+++ b/.github/workflows/building-deb.yml
@@ -33,15 +33,15 @@ jobs:
 
       - name: Configure Base System
         run: |
-          bash .github/workflows/configure-building-enviroment-base-system.sh amd64 bookworm $REPOSITORY
+          bash .github/workflows/configure-building-enviroment-base-system.sh amd64 bookworm $REPOSITORY https://github.com/$GITHUB_REPOSITORY
 
       - name: Building ${{ GITHUB.repository }}
         run: |
-          env gitPath=$(basename $REPOSITORY) bash .github/workflows/run-command-in-chroot.sh dpkg-buildpackage -b
+          env gitPath=$(basename $GITHUB_REPOSITORY) bash .github/workflows/run-command-in-chroot.sh dpkg-buildpackage -b
 
       - name: Remove Debug Package
         run: |
-          env gitPath=$(basename $REPOSITORY) bash .github/workflows/run-command-in-chroot.sh rm -rfv ../*dbg*.deb
+          env gitPath=$(basename $GITHUB_REPOSITORY) bash .github/workflows/run-command-in-chroot.sh rm -rfv ../*dbg*.deb
 
       - name: Pack tar
         run: |
@@ -78,15 +78,15 @@ jobs:
 
       - name: Configure Base System
         run: |
-          bash .github/workflows/configure-building-enviroment-base-system.sh arm64 bookworm $REPOSITORY
+          bash .github/workflows/configure-building-enviroment-base-system.sh arm64 bookworm $REPOSITORY https://github.com/$GITHUB_REPOSITORY
 
       - name: Building ${{ GITHUB.repository }}
         run: |
-          env gitPath=$(basename $REPOSITORY) bash .github/workflows/run-command-in-chroot.sh dpkg-buildpackage -b
+          env env gitPath=$(basename $GITHUB_REPOSITORY) bash .github/workflows/run-command-in-chroot.sh dpkg-buildpackage -b
 
       - name: Remove Debug Package
         run: |
-          env gitPath=$(basename $REPOSITORY) bash .github/workflows/run-command-in-chroot.sh rm -rfv ../*dbg*.deb
+          env env gitPath=$(basename $GITHUB_REPOSITORY) bash .github/workflows/run-command-in-chroot.sh rm -rfv ../*dbg*.deb
 
       - name: Pack tar
         run: |
@@ -122,15 +122,15 @@ jobs:
 
       - name: Configure Base System
         run: |
-          bash .github/workflows/configure-building-enviroment-base-system.sh mips64el bookworm $REPOSITORY
+          bash .github/workflows/configure-building-enviroment-base-system.sh mips64el bookworm $REPOSITORY https://github.com/$GITHUB_REPOSITORY
 
       - name: Building ${{ GITHUB.repository }}
         run: |
-          env gitPath=$(basename $REPOSITORY) bash .github/workflows/run-command-in-chroot.sh dpkg-buildpackage -b
+          env env gitPath=$(basename $GITHUB_REPOSITORY) bash .github/workflows/run-command-in-chroot.sh dpkg-buildpackage -b
 
       - name: Remove Debug Package
         run: |
-          env gitPath=$(basename $REPOSITORY) bash .github/workflows/run-command-in-chroot.sh rm -rfv ../*dbg*.deb
+          env env gitPath=$(basename $GITHUB_REPOSITORY) bash .github/workflows/run-command-in-chroot.sh rm -rfv ../*dbg*.deb
 
       - name: Pack tar
         run: |
@@ -165,15 +165,15 @@ jobs:
 
       - name: Configure Base System
         run: |
-          bash .github/workflows/configure-building-enviroment-base-system.sh loong64 unstable $REPOSITORY https://mirror.sjtu.edu.cn/debian-ports/
+          bash .github/workflows/configure-building-enviroment-base-system.sh loong64 unstable $REPOSITORY https://github.com/$GITHUB_REPOSITORY https://mirror.sjtu.edu.cn/debian-ports/
 
       - name: Building ${{ GITHUB.repository }}
         run: |
-          env gitPath=$(basename $REPOSITORY) bash .github/workflows/run-command-in-chroot.sh dpkg-buildpackage -b
+          env env gitPath=$(basename $GITHUB_REPOSITORY) bash .github/workflows/run-command-in-chroot.sh dpkg-buildpackage -b
 
       - name: Remove Debug Package
         run: |
-          env gitPath=$(basename $REPOSITORY) bash .github/workflows/run-command-in-chroot.sh rm -rfv ../*dbg*.deb
+          env env gitPath=$(basename $GITHUB_REPOSITORY) bash .github/workflows/run-command-in-chroot.sh rm -rfv ../*dbg*.deb
 
       - name: Pack tar
         run: |
diff --git a/.github/workflows/configure-building-enviroment-base-system.sh b/.github/workflows/configure-building-enviroment-base-system.sh
index 8bbd2c2..aadc5cb 100755
--- a/.github/workflows/configure-building-enviroment-base-system.sh
+++ b/.github/workflows/configure-building-enviroment-base-system.sh
@@ -26,13 +26,14 @@ else
         useDebianPort
     fi
 fi
-sudo debootstrap --arch=$1 $2 $bottlePath $4
+sudo debootstrap --arch=$1 $2 $bottlePath $5
 sudo bash .github/workflows/pardus-chroot $bottlePath
 # 配置 git
 sudo chroot $bottlePath apt update
 sudo chroot $bottlePath apt install git -y
-sudo chroot $bottlePath git clone $3 --depth=1
+sudo chroot $bottlePath git clone $4 --depth=1
+sudo mv $bottlePath/$(basename $3)/.github $bottlePath/$(basename $4) -v
 # 修改版本号
 #sudo sed -i "s/) UNRELEASED; urgency=medium/~$2) UNRELEASED; urgency=medium/g" $bottlePath/deep-wine-runner-qemu-system/debian/changelog
-env gitPath=$(basename $3) bash .github/workflows/run-command-in-chroot.sh .github/workflows/configure-building-enviroment.sh
+env gitPath=$(basename $4) bash .github/workflows/run-command-in-chroot.sh .github/workflows/configure-building-enviroment.sh
 exit 0
\ No newline at end of file