fix: build shell script
This commit is contained in:
20
bin/build.sh
20
bin/build.sh
@@ -8,6 +8,8 @@ BERootDir=${GitRootDir}/be.wfc
|
|||||||
FERootDir=${GitRootDir}/fe.wfc
|
FERootDir=${GitRootDir}/fe.wfc
|
||||||
FEUserRootDir=${GitRootDir}/fe.wfc.user
|
FEUserRootDir=${GitRootDir}/fe.wfc.user
|
||||||
BuildRootDir=${GitRootDir}/build.wfc
|
BuildRootDir=${GitRootDir}/build.wfc
|
||||||
|
LicenseBuildDir=${GitRootDir}/license.build.wfc
|
||||||
|
LicenseRootDir=${GitRootDir}/license.wfc
|
||||||
|
|
||||||
WFCWorkDir=/opt/wfc
|
WFCWorkDir=/opt/wfc
|
||||||
BuildDockerDir=${BuildRootDir}/build/docker
|
BuildDockerDir=${BuildRootDir}/build/docker
|
||||||
@@ -82,6 +84,14 @@ pre-git-pull(){
|
|||||||
git pull
|
git pull
|
||||||
cd ${BuildRootDir}
|
cd ${BuildRootDir}
|
||||||
git pull
|
git pull
|
||||||
|
if [ -d ${LicenseRootDir} ]; then
|
||||||
|
cd ${LicenseRootDir}
|
||||||
|
git pull
|
||||||
|
fi
|
||||||
|
if [ -d ${LicenseBuildDir} ]; then
|
||||||
|
cd ${LicenseBuildDir}
|
||||||
|
git pull
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
pre-build-deb(){
|
pre-build-deb(){
|
||||||
@@ -188,6 +198,8 @@ create-src-tar(){
|
|||||||
FeRelativeDir=${WFCRelativeDir}/fe.wfc
|
FeRelativeDir=${WFCRelativeDir}/fe.wfc
|
||||||
FeUserRelativeDir=${WFCRelativeDir}/fe.wfc.user
|
FeUserRelativeDir=${WFCRelativeDir}/fe.wfc.user
|
||||||
BuildRelativeDir=${WFCRelativeDir}/build.wfc
|
BuildRelativeDir=${WFCRelativeDir}/build.wfc
|
||||||
|
LicenseSrcDir=${WFCRelativeDir}/license.wfc
|
||||||
|
LicenseBuildDir=${WFCRelativeDir}/license.build.wfc
|
||||||
cd ${HOME}
|
cd ${HOME}
|
||||||
tar cvfz ${ReleseDir}/src-tars/${SrcTarFileName} \
|
tar cvfz ${ReleseDir}/src-tars/${SrcTarFileName} \
|
||||||
--exclude=${WFCRelativeDir}/.vscode \
|
--exclude=${WFCRelativeDir}/.vscode \
|
||||||
@@ -219,6 +231,14 @@ create-src-tar(){
|
|||||||
--exclude=${BuildRelativeDir}/bin/cpto205.sh \
|
--exclude=${BuildRelativeDir}/bin/cpto205.sh \
|
||||||
--exclude=${BuildRelativeDir}/docs/99-reference \
|
--exclude=${BuildRelativeDir}/docs/99-reference \
|
||||||
--exclude=${BuildRelativeDir}/docs/100-images \
|
--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
|
${WFCRelativeDir} 1>/dev/null
|
||||||
echo "done"
|
echo "done"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
Package=WFC
|
Package=WFC
|
||||||
RelVersion=1.0.18
|
RelVersion=1.0.18
|
||||||
Architecture=amd64
|
Architecture=amd64
|
||||||
Description='WANFi Control and Billing System'
|
Description='MacroHub Control and Billing System'
|
||||||
|
|||||||
Reference in New Issue
Block a user