1
0
mirror of https://github.com/QSCTech/zjunet.git synced 2026-01-23 04:04:48 +08:00

use lib/version

This commit is contained in:
Zeno Zeng 2014-11-22 17:21:02 +08:00
parent e42e7f7a3a
commit e1c3bf4375
4 changed files with 7 additions and 5 deletions

View File

@ -1,6 +1,6 @@
#!/bin/bash
VERSION=0.2.2-0
VERSION=$(cat ../lib/version)
cd debian
./build.sh $VERSION > /dev/null

1
lib/version Normal file
View File

@ -0,0 +1 @@
0.2.3-0

View File

@ -115,13 +115,13 @@ EOF
xl2tpd_connect() {
echo "[INFO] try connecting $1"
xl2tpd-control connect $1
xl2tpd-control connect $1 &
echo "[INFO] xl2tpd-control done"
}
xl2tpd_disconnect() {
echo "[INFO] try disconnecting $1"
xl2tpd-control disconnect $1
xl2tpd-control disconnect $1 &
echo "[INFO] xl2tpd-control done"
}
@ -133,7 +133,7 @@ xl2tpd_waituser() {
then
echo "[INFO] Connection terminated."
echo -n > $PPP_LOG_FILE
echo "[INFO] Retrying now. (try to kick off, may take some time)"
echo "[INFO] Retrying now. "
sleep 1
xl2tpd_disconnect ${LAC_NAME}
sleep 5

View File

@ -41,7 +41,8 @@ case "$1" in
"${BASEDIR}/dns.sh"
;;
--version)
echo "zjunet version: zjunet-0.2.1"
version=$(cat "${BASEDIR}/version" | sed 's/-.*//')
echo "zjunet version: zjunet-$version"
;;
*)
cat <<EOF