From 23dfea7f175e617ec19df300c849806b0c3580e1 Mon Sep 17 00:00:00 2001 From: zhangsz Date: Tue, 24 Jun 2025 18:03:21 +0800 Subject: [PATCH] fix: build shell script --- bin/build.sh | 20 ++++++++++++++++++++ bin/control.sh | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/bin/build.sh b/bin/build.sh index 8d35bd7..fb1e39d 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -8,6 +8,8 @@ BERootDir=${GitRootDir}/be.wfc FERootDir=${GitRootDir}/fe.wfc FEUserRootDir=${GitRootDir}/fe.wfc.user BuildRootDir=${GitRootDir}/build.wfc +LicenseBuildDir=${GitRootDir}/license.build.wfc +LicenseRootDir=${GitRootDir}/license.wfc WFCWorkDir=/opt/wfc BuildDockerDir=${BuildRootDir}/build/docker @@ -82,6 +84,14 @@ pre-git-pull(){ git pull cd ${BuildRootDir} git pull + if [ -d ${LicenseRootDir} ]; then + cd ${LicenseRootDir} + git pull + fi + if [ -d ${LicenseBuildDir} ]; then + cd ${LicenseBuildDir} + git pull + fi } pre-build-deb(){ @@ -188,6 +198,8 @@ create-src-tar(){ FeRelativeDir=${WFCRelativeDir}/fe.wfc FeUserRelativeDir=${WFCRelativeDir}/fe.wfc.user BuildRelativeDir=${WFCRelativeDir}/build.wfc + LicenseSrcDir=${WFCRelativeDir}/license.wfc + LicenseBuildDir=${WFCRelativeDir}/license.build.wfc cd ${HOME} tar cvfz ${ReleseDir}/src-tars/${SrcTarFileName} \ --exclude=${WFCRelativeDir}/.vscode \ @@ -219,6 +231,14 @@ create-src-tar(){ --exclude=${BuildRelativeDir}/bin/cpto205.sh \ --exclude=${BuildRelativeDir}/docs/99-reference \ --exclude=${BuildRelativeDir}/docs/100-images \ + --exclude=${LicenseSrcDir}/.git \ + --exclude=${LicenseSrcDir}/.vscode \ + --exclude=${LicenseSrcDir}/target \ + --exclude=${LicenseBuildDir}/.git \ + --exclude=${LicenseBuildDir}/.vscode \ + --exclude=${LicenseBuildDir}/debbuild/opt/lic/docker/jar/*.jar \ + --exclude=${LicenseBuildDir}/debbuild/opt/lic/docs \ + --exclude=${LicenseBuildDir}/release \ ${WFCRelativeDir} 1>/dev/null echo "done" } diff --git a/bin/control.sh b/bin/control.sh index bba9f74..8eaea2b 100644 --- a/bin/control.sh +++ b/bin/control.sh @@ -1,4 +1,4 @@ Package=WFC RelVersion=1.0.18 Architecture=amd64 -Description='WANFi Control and Billing System' +Description='MacroHub Control and Billing System'