update makeppa

3 files changed, 18 insertions, 13 deletions

diff --git a/scripts/archive-all b/scripts/archive-all
index 9051f37e2..c15e44876 100755
--- a/scripts/archive-all
+++ b/scripts/archive-all
@@ -25,6 +25,7 @@ cd $tmpdir/repo || exit
 cp -r ./core $tmpdir/xmake
 cp -r ./xmake $tmpdir/xmake/xmake
 cp ./scripts/*.sh $tmpdir/xmake/scripts
+cp -r ./scripts/debian $tmpdir/xmake/scripts
 cp ./*.md $tmpdir/xmake
 cp makefile $tmpdir/xmake
 cd $tmpdir/xmake || exit
diff --git a/scripts/debian/control b/scripts/debian/control
index 6230cfb19..426663a22 100644
--- a/scripts/debian/control
+++ b/scripts/debian/control
@@ -11,9 +11,11 @@ Homepage: http://xmake.io
 Package: xmake
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: A make-like build utility based on Lua
- xmake focuses on making development and building easier and
- provides many features (e.g. package, install, plugin, macro, 
- action, option, task ...), so that any developer can quickly 
- pick it up and enjoy the productivity boost when developing 
- and building project.
+Description: A cross-platform build utility based on Lua 
+xmake is a lightweight cross-platform build utility based on Lua. 
+It uses xmake.lua to maintain project builds. Compared with makefile/CMakeLists.txt, 
+the configuration syntax is more concise and intuitive. 
+It is very friendly to novices and can quickly get started in a short time. 
+Let users focus more on actual project development.
+
+ 
diff --git a/scripts/makeppa b/scripts/makeppa
index 2a8897567..cb4fbe60f 100755
--- a/scripts/makeppa
+++ b/scripts/makeppa
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
 # check
-if [ $# -lt 1 ]; then
-    echo "Usage: ./scripts/makeppa [version] [patch]"
+if [ $# -lt 0 ]; then
+    echo "Usage: ./scripts/makeppa [patch]"
     exit
 fi
 
@@ -13,10 +13,10 @@ if [ ! -d $workdir ]; then
 fi
 
 # version
-version=$1
+version=`cat ./core/xmake.lua | grep -E "^set_version" | grep -oE "[0-9]*\.[0-9]*\.[0-9]*"`
 
 # patch number
-patch="$2"
+patch="$1"
 if [ -z $patch ]; then
     patch=1
 fi
@@ -24,13 +24,15 @@ fi
 # tarball
 tarball=$workdir/xmake-$version.tar.gz
 if [ ! -f $tarball ]; then
-    wget https://github.com/xmake-io/xmake/archive/v$version.tar.gz -O $workdir/xmake-$version.tar.gz
+    ./scripts/archive-all
+    cp ./artifacts/xmake.tar.gz $tarball
 fi
 
 # extract tarball
 cd $workdir
 if [ ! -d xmake-$version ]; then
-    tar -xvf xmake-$version.tar.gz
+    mkdir xmake-$version
+    tar -xvf xmake-$version.tar.gz -C xmake-$version
 fi
 
 # enter project directory
@@ -41,7 +43,7 @@ echo "making template .."
 if [ -d debian ]; then
     rm -rf debian
 fi
-dh_make -e [email protected] -c apache -y -s -f ../xmake-$version.tar.gz
+USER=ruki dh_make -e [email protected] -c apache -y -s -f ../xmake-$version.tar.gz
 
 # copy debian
 echo "instaling debian .."