From 4f487eee37e479212247d88e8bb6e5caae4883ae Mon Sep 17 00:00:00 2001
From: Zeno Zeng <zenoofzeng@gmail.com>
Date: Tue, 30 Sep 2014 20:34:58 +0800
Subject: [PATCH] build.sh for openwrt & debian

---
 .gitignore             |  2 +-
 build/build.sh         | 12 ++++++++++++
 build/debian/build.sh  | 21 ++++++++++++++++++---
 build/debian/control   | 10 ----------
 build/openwrt/build.sh | 26 +++++++++++++-------------
 5 files changed, 44 insertions(+), 27 deletions(-)
 create mode 100755 build/build.sh
 delete mode 100644 build/debian/control

diff --git a/.gitignore b/.gitignore
index 0e98eef..ce32291 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 *.deb
-*.ipk
\ No newline at end of file
+*.opk
\ No newline at end of file
diff --git a/build/build.sh b/build/build.sh
new file mode 100755
index 0000000..ddc6d5c
--- /dev/null
+++ b/build/build.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+VERSION=0.1.0-7
+
+cd debian
+./build.sh $VERSION > /dev/null
+
+cd ../openwrt
+./build.sh $VERSION > /dev/null
+
+cd ..
+find . -regextype posix-egrep -regex ".*\.(opk|deb)$"
diff --git a/build/debian/build.sh b/build/debian/build.sh
index afd6ce1..ae4c125 100755
--- a/build/debian/build.sh
+++ b/build/debian/build.sh
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+rm -rf *.deb
+
+VERSION=$1
+
 # lib
 mkdir -p ./debian/usr/lib/zjunet
 cp ../../lib/* ./debian/usr/lib/zjunet
@@ -11,12 +15,23 @@ chmod +x ./debian/usr/bin/zjunet
 
 # contorl file
 mkdir -p debian/DEBIAN
-find ./debian -type d | xargs chmod 755
-cp control debian/DEBIAN
+cat > debian/DEBIAN/control <<EOF
+Package: zjunet
+Version: $VERSION
+Section: net
+Priority: optional
+Architecture: all
+Depends: xl2tpd (>= 1.3.1), curl
+Maintainer: Zeno Zeng <zenoofzeng@gmail.com>
+Description: Command Line Scripts for ZJU
+ This script provides a VPN / WLAN / NEXTHOP for ZJUer.
+EOF
 
 # dpkg-deb
+find ./debian -type d | xargs chmod 755
 dpkg-deb --build debian
-mv debian.deb zjunet_0.1-2_all.deb
+mv debian.deb zjunet_${VERSION}_all.deb
 
 # remove debian/
 rm -rf ./debian
+rm -f control
diff --git a/build/debian/control b/build/debian/control
deleted file mode 100644
index 2f78de6..0000000
--- a/build/debian/control
+++ /dev/null
@@ -1,10 +0,0 @@
-Package: zjunet
-Version: 0.1-2
-Section: base
-Priority: optional
-Architecture: all
-Depends: xl2tpd (>= 1.3.2), curl, libc-bin
-Maintainer: Zeno Zeng <zenoofzeng@gmail.com>
-Description: Command Line Scripts for ZJU
- This script provides a VPN / WLAN / NEXTHOP for ZJUer.
-
diff --git a/build/openwrt/build.sh b/build/openwrt/build.sh
index 2c5d46c..d1e1646 100755
--- a/build/openwrt/build.sh
+++ b/build/openwrt/build.sh
@@ -1,12 +1,21 @@
 #!/bin/sh
 
-VERSION=0.1-6
+rm -rf *.opk
+
+VERSION=$1
 
 # lib
 mkdir -p ./debian/usr/lib/zjunet
 cp ../../lib/* ./debian/usr/lib/zjunet
 
-cat > control <<EOF
+# bin
+mkdir -p ./debian/usr/bin
+echo '/usr/lib/zjunet/zjunet.sh "$@"' >> ./debian/usr/bin/zjunet
+chmod +x ./debian/usr/bin/zjunet
+
+# contorl file
+mkdir -p debian/DEBIAN
+cat > debian/DEBIAN/control <<EOF
 Package: zjunet
 Version: $VERSION
 Section: net
@@ -18,19 +27,10 @@ Description: Command Line Scripts for ZJU
  This script provides a VPN / WLAN / NEXTHOP for ZJUer.
 EOF
 
-# bin
-mkdir -p ./debian/usr/bin
-echo '/usr/lib/zjunet/zjunet.sh "$@"' >> ./debian/usr/bin/zjunet
-chmod +x ./debian/usr/bin/zjunet
-
-# contorl file
-mkdir -p debian/DEBIAN
-find ./debian -type d | xargs chmod 755
-cp control debian/DEBIAN
-
 # dpkg-deb
+find ./debian -type d | xargs chmod 755
 dpkg-deb -Zgzip --build debian
-mv debian.deb zjunet_${VERSION}_all.deb
+mv debian.deb zjunet_${VERSION}_all.opk
 
 # remove debian/
 rm -rf ./debian