From b165562c2a76d963f730234bd684bb0384185cbe Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 16 May 2025 11:03:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=89=93=E5=8C=85=E5=89=8D=E8=BF=98?=
 =?UTF-8?q?=E5=8E=9F=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg-copy-front.sh     | 17 ++++++++++-------
 pkg-docker.sh         | 13 ++++++++-----
 pkg-remove-chinese.sh | 17 ++++++++++-------
 pkg.sh                | 13 ++++++++-----
 4 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/pkg-copy-front.sh b/pkg-copy-front.sh
index 14c5f6c..7a06973 100644
--- a/pkg-copy-front.sh
+++ b/pkg-copy-front.sh
@@ -32,6 +32,14 @@ while [[ $# -gt 0 ]]; do
   esac
 done
 
+# =================== build branch
+echo
+cd $BuildDir
+git checkout .
+git pull
+git checkout $BuildBranch
+git pull
+
 # =================== Web
 echo
 # Determine if --web is passed in
@@ -48,12 +56,7 @@ fi
 
 # =================== deb/rpm
 echo
-cd $BuildDir
-git checkout .
-git pull
-git checkout $BuildBranch
-git pull
 bash $BuildDir/pkg.sh --api -apiBranch $ApiBranch -v $VERSION
 
-# bash pkg-front.sh --web -v 2.2503.2
-# bash pkg-front.sh -v 2.2503.2
+# bash pkg-copy-front.sh --web -v 2.2503.2
+# bash pkg-copy-front.sh -v 2.2503.2
diff --git a/pkg-docker.sh b/pkg-docker.sh
index e5eae1d..7eb50f7 100644
--- a/pkg-docker.sh
+++ b/pkg-docker.sh
@@ -37,6 +37,14 @@ done
 # clear tmp dir
 rm -rf ${BuildTmpDir} && mkdir -p ${BuildTmpDir}
 
+# =================== build branch
+echo
+cd $BuildDir
+git checkout .
+git pull
+git checkout $BuildBranch
+git pull
+
 # =================== Web
 echo
 cd $WebDir
@@ -91,11 +99,6 @@ echo "===> vendor data copy to $output"
 
 # =================== build docker image
 echo
-cd $BuildDir
-git checkout .
-git pull
-git checkout $BuildBranch
-git pull
 bash $BuildDir/build-docker.sh --version $VERSION --platform linux/amd64 --system ubuntu22.04
 
 # Compile the front-end and back-end and then package the version
diff --git a/pkg-remove-chinese.sh b/pkg-remove-chinese.sh
index 51ea25c..f87c312 100644
--- a/pkg-remove-chinese.sh
+++ b/pkg-remove-chinese.sh
@@ -36,6 +36,14 @@ while [[ $# -gt 0 ]]; do
   esac
 done
 
+# =================== build branch
+echo
+cd $BuildDir
+git checkout .
+git pull
+git checkout $BuildBranch
+git pull
+
 # =================== Web
 echo
 # Determine if --web is passed in
@@ -107,14 +115,9 @@ fi
 
 # =================== deb/rpm
 echo
-cd $BuildDir
-git checkout .
-git pull
-git checkout $BuildBranch
-git pull
 bash $BuildDir/build.sh -v $VERSION
 
 # Compile the front-end and back-end and then package the version
-# bash pkg-en.sh --web --api -v 2.2503.2
+# bash pkg-remove-chinese.sh --web --api -v 2.2503.2
 # Packaged version of just the last compiled file/build directory
-# bash pkg-en.sh -v 2.2503.2
+# bash pkg-remove-chinese.sh -v 2.2503.2
diff --git a/pkg.sh b/pkg.sh
index 6fbbbb4..c436c9a 100644
--- a/pkg.sh
+++ b/pkg.sh
@@ -40,6 +40,14 @@ while [[ $# -gt 0 ]]; do
   esac
 done
 
+# =================== build branch
+echo
+cd $BuildDir
+git checkout .
+git pull
+git checkout $BuildBranch
+git pull
+
 # =================== Web
 echo
 # Determine if --web is passed in
@@ -94,11 +102,6 @@ fi
 
 # =================== deb/rpm
 echo
-cd $BuildDir
-git checkout .
-git pull
-git checkout $BuildBranch
-git pull
 bash $BuildDir/build.sh -v $VERSION
 
 # Compile the front-end and back-end and then package the version