diff --git a/bin/build.sh b/bin/build.sh index 798c616..19d0cb9 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -1,7 +1,7 @@ #!/bin/bash ProjectL=wfc ProjectU=WFC -RelVersion=1.0.6 +#RelVersion=1.0.6 RelDate=`date +%Y%m%d` GitRootDir=${HOME}/wfc.git BERootDir=${GitRootDir}/be.wfc @@ -12,7 +12,7 @@ BuildRootDir=${GitRootDir}/build.wfc WFCWorkDir=/opt/wfc BuildDockerDir=${BuildRootDir}/build/docker ReleseDir=${BuildRootDir}/release -TarFileName=${ProjectL}-${RelVersion}-${RelDate}.tar.gz +#TarFileName=${ProjectL}-${RelVersion}-${RelDate}.tar.gz TmpDir=${BuildRootDir}/tmp TmpEnvFile=${TmpDir}/.env.tmp @@ -42,7 +42,8 @@ pre_build_deb(){ build-extras(){ cd ${BuildRootDir} git pull - source ${BuildRootDir}/bin/control.sh + source ${BuildRootDir}/bin/control.sh + TarFileName=${ProjectL}-${RelVersion}-${RelDate}.tar.gz echo -n "Begin build extras file ... " cd ${BuildRootDir}/bin javac -source 8 -target 8 -bootclasspath /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/rt.jar -extdirs "" -Xlint:-options printJarVer.java diff --git a/bin/control.sh b/bin/control.sh index 55fd430..4098065 100644 --- a/bin/control.sh +++ b/bin/control.sh @@ -1,4 +1,4 @@ Package=WFC RelVersion=1.0.7 Architecture=amd64 -Description=WANFi Control and Billing System +Description='WANFi Control and Billing System'