From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 10 Jan 2017 13:08:57 +0000 (+0100)
Subject: Fix upload of Debian/Ubuntu packages
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=693d7f15ade94b65c12d64e39d554a9e14ec5a57;p=git-tools-moved-to-github.git

Fix upload of Debian/Ubuntu packages
---

diff --git a/id-deb-build/docker-build.sh b/id-deb-build/docker-build.sh
index 9340adb..30cee07 100755
--- a/id-deb-build/docker-build.sh
+++ b/id-deb-build/docker-build.sh
@@ -164,7 +164,7 @@ if $upload; then
 	if test -n "${DEBIAN_DIST}"; then
 	    for dist in ${DEBIAN_DIST}; do
 		ssh ${UPLOAD_HOST} "mkdir -p ${UPLOAD_PATH}/${PRODUCT}/debian/${dist}"
-		if ! scp build/debian/${dist}/${PRODUCT}_* ${UPLOAD_URI}/debian/${dist}; then
+		if ! scp build/debian/${dist}/*_${VERSION}* ${UPLOAD_URI}/debian/${dist}; then
 		    echo "Upload failed for $dist"
 		    exit 1
 		fi
@@ -173,7 +173,7 @@ if $upload; then
 	if test -n "${UBUNTU_DIST}"; then
 	    for dist in ${UBUNTU_DIST}; do
 		ssh ${UPLOAD_HOST} "mkdir -p ${UPLOAD_PATH}/${PRODUCT}/ubuntu/${dist}"
-		if ! scp build/ubuntu/${dist}/${PRODUCT}_* ${UPLOAD_URI}/ubuntu/${dist}; then
+		if ! scp build/ubuntu/${dist}/*_${VERSION}* ${UPLOAD_URI}/ubuntu/${dist}; then
 		    echo "Upload failed for $dist"
 		    exit 1
 		fi