update makeppa

1 files changed, 9 insertions, 7 deletions

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 .."