From dc5c5a08b1d4be7b95fb2cf8b6f5e1cd246d56c8 Mon Sep 17 00:00:00 2001
From: glasseyes <dglassey@gmail.com>
Date: Wed, 26 Sep 2018 22:30:39 +0700
Subject: [PATCH] [linux] put correct VERSION into source tarballs

LAUNCHPAD_ID not needed, use group id instead
---
 linux/scripts/dist.sh      |  9 +++++++--
 linux/scripts/launchpad.sh | 12 +++---------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/linux/scripts/dist.sh b/linux/scripts/dist.sh
index 8a1b16a84c..970c4f32f5 100755
--- a/linux/scripts/dist.sh
+++ b/linux/scripts/dist.sh
@@ -47,14 +47,19 @@ mkdir -p dist
 
 # configure and make dist for autotool projects
 for proj in ${autotool_projects}; do
-	cd $proj
+    echo "configure $proj"
+    cd $proj
+    oldvers=`cat VERSION`
+    vers=`./configure -version|grep kmfl|grep -Po "${proj} configure \K[^a-z]*"`
+    echo "$vers" > VERSION
     rm -rf ../build-$proj
     mkdir -p ../build-$proj
     cd ../build-$proj
     ../$proj/configure
     make dist
     mv *.tar.gz ../dist
-	cd $BASEDIR
+    cd $BASEDIR
+    echo "$oldvers" > VERSION
 done
 
 
diff --git a/linux/scripts/launchpad.sh b/linux/scripts/launchpad.sh
index 98cb75175c..dca3cfc2ae 100755
--- a/linux/scripts/launchpad.sh
+++ b/linux/scripts/launchpad.sh
@@ -4,9 +4,8 @@
 
 # must be run from linux dir
 
-# parameters: [UPLOAD="yes"] [LAUNCHPAD_ID="<me>"] [PROJECT="<project>"] [DIST="<dist>"] ./scripts/launchpad.sh
+# parameters: [UPLOAD="yes"] [PROJECT="<project>"] [DIST="<dist>"] ./scripts/launchpad.sh
 # UPLOAD="yes" do the dput for real
-# LAUNCHPAD_ID="<me>" to set the launchpad id to dput to
 # PROJECT="<project>" only upload this project
 # DIST="<dist>" only upload for this distribution
 
@@ -14,16 +13,11 @@
 set -e
 
 if [ "${UPLOAD}" == "yes" ]; then
-    SIM=
+    SIM=""
 else
     SIM="-s -u"
 fi
 
-if [ "${LAUNCHPAD_ID}" == "" ]; then
-    echo "you must set your LAUNCHPAD_ID in the enviroment for dputting"
-    exit 1
-fi
-
 if [ ! `which xmllint` ]; then
     echo "you must install xmllint (libxml2-utils package) to use this script"
     exit 1
@@ -71,7 +65,7 @@ for proj in ${projects}; do
     done
     cd ..
     for dist in ${distributions}; do
-        dput ${SIM} ppa:${LAUNCHPAD_ID}/keyman-daily ${proj}_${version}-1~${dist}_source.changes
+        dput ${SIM} ppa:keymanapp/keyman-daily ${proj}_${version}-1~${dist}_source.changes
     done
     cd ${BASEDIR}
 done