From 35be97ffcbb1de8ac8676412bb0dc450d6e2a1a2 Mon Sep 17 00:00:00 2001
From: ruki <waruqi@gmail.com>
Date: Thu, 10 Sep 2020 22:49:49 +0800
Subject: support ppa on linux ci

---
 scripts/makeppa | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

(limited to 'scripts')

diff --git a/scripts/makeppa b/scripts/makeppa
index 8615f916c..0af565bc9 100755
--- a/scripts/makeppa
+++ b/scripts/makeppa
@@ -50,7 +50,7 @@ echo "making template .."
 if [ -d debian ]; then
     rm -rf debian
 fi
-export USER=ruki
+export USER=`id -u -n`
 dh_make -e waruqi@gmail.com -c apache -y -s -f ../$basename.tar.gz
 
 # copy debian
@@ -74,26 +74,16 @@ echo "checking package .."
 lintian ../xmake_$version+$patch$serie.dsc
 
 # upload package
+echo "uploading package .."
 source=xmake_$version+"$patch$serie"_source
-while true; do
-    read -p "Do you wish to upload this package? (y/n)" yn
-    case $yn in
-        [Yy]* ) if [ -f ../$source.ppa.upload ]; then rm ../$source.ppa.upload; fi ; dput ppa:xmake-io/xmake ../$source.changes; break;;
-        [Nn]* ) exit;;
-        * ) echo "Please answer y or n.";;
-    esac
-done
+if [ -f ../$source.ppa.upload ]; then 
+    rm ../$source.ppa.upload
+fi
+dput ppa:xmake-io/xmake ../$source.changes
 
 # remove workdir
 cd ../..
-while true; do
-    read -p "Do you wish to remove working directory? (y/n)" yn
-    case $yn in
-        [Yy]* ) rm -rf xmake-ppa; break;;
-        [Nn]* ) exit;;
-        * ) echo "Please answer y or n.";;
-    esac
-done
+rm -rf xmake-ppa
 
 # install dh-make and gpg
 # sudo apt install dh-make rng-tools
-- 
cgit v1.3.1