From e1c3bf43759c858bc3662432b47fe765743a8854 Mon Sep 17 00:00:00 2001
From: Zeno Zeng <zenoofzeng@gmail.com>
Date: Sat, 22 Nov 2014 17:21:02 +0800
Subject: [PATCH] use lib/version

---
 build/build.sh | 2 +-
 lib/version    | 1 +
 lib/xl2tpd.sh  | 6 +++---
 lib/zjunet.sh  | 3 ++-
 4 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 lib/version

diff --git a/build/build.sh b/build/build.sh
index 3b192a3..37e8e38 100755
--- a/build/build.sh
+++ b/build/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=0.2.2-0
+VERSION=$(cat ../lib/version)
 
 cd debian
 ./build.sh $VERSION > /dev/null
diff --git a/lib/version b/lib/version
new file mode 100644
index 0000000..ee8854a
--- /dev/null
+++ b/lib/version
@@ -0,0 +1 @@
+0.2.3-0
\ No newline at end of file
diff --git a/lib/xl2tpd.sh b/lib/xl2tpd.sh
index 5ca072e..2d4145a 100755
--- a/lib/xl2tpd.sh
+++ b/lib/xl2tpd.sh
@@ -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
diff --git a/lib/zjunet.sh b/lib/zjunet.sh
index c732b67..f5b0487 100755
--- a/lib/zjunet.sh
+++ b/lib/zjunet.sh
@@ -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