From 3ffca7b2b7e7307777622a19256bc03ed726246a Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Thu, 23 Jun 2016 14:51:58 -0400
Subject: Fix test for whether a package is already in the repository; other
 minor cleanup.

---
 Makefile | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index b4f03d2..1fc76a8 100644
--- a/Makefile
+++ b/Makefile
@@ -5,15 +5,8 @@ export CRYPTECH_VERSION := 2.0
 HEAD_TIME := $(shell git show -s --format=%ct HEAD)
 HEAD_HASH := $(shell git rev-parse HEAD)
 
-CRYPTECH_PACKAGE_VERSION := ${CRYPTECH_VERSION}~${HEAD_TIME}~${HEAD_HASH}
-
-# Command to generate a new changelog containing one entry.
-# Does nothing if the changelog already exists.
-
-DCH =	test -f debian/changelog || \
-	EDITOR=true VISUAL=true TZ=UTC DEBEMAIL='APT Builder Robot <aptbot@cryptech.is>' \
-	dch --create --package cryptech-alpha --newversion '${CRYPTECH_PACKAGE_VERSION}' \
-	'$(strip Version ${CRYPTECH_VERSION} of software for Cryptech Alpha development board.)'
+PACKAGE_NAME	 := cryptech-alpha
+PACKAGE_VERSION  := ${CRYPTECH_VERSION}~${HEAD_TIME}~${HEAD_HASH}
 
 export GNUPGHOME := /home/aptbot/gnupg
 
@@ -26,6 +19,14 @@ PBUILDER_TARGETS := debian/jessie/i386 debian/jessie/amd64 ubuntu/xenial/i386 ub
 REPO_UPLOAD_USER := aptbot
 REPO_UPLOAD_URI	 := rsync://apt.cryptech.is/alpha/
 
+# Command to generate a new changelog containing one entry.
+# Does nothing if the changelog already exists.
+
+DCH =	test -f debian/changelog || \
+	EDITOR=true VISUAL=true TZ=UTC DEBEMAIL='APT Builder Robot <aptbot@cryptech.is>' \
+	dch --create --package ${PACKAGE_NAME} --newversion '${PACKAGE_VERSION}' \
+	'$(strip Version ${CRYPTECH_VERSION} of software for Cryptech Alpha development board.)'
+
 all: init source pbuilder homebrew
 
 enchilada: all upload
@@ -49,9 +50,9 @@ pbuilder:
 	umask ${REPO_UMASK}; \
 	for target in ${PBUILDER_TARGETS}; do echo $$target | tr '/' ' '; done | \
 	while read dist code arch; do \
-		reprepro -b ${REPO_BASE}/$$dist -A $$arch list $$code cryptech-alpha | awk '{v = $$3} END {exit v != ${CRYPTECH_PACKAGE_VERSION}}' && continue; \
-		pbuilder-dist $$code $$arch build cryptech-alpha_${CRYPTECH_PACKAGE_VERSION}.dsc; \
-		reprepro -b ${REPO_BASE}/$$dist include $$code ${PBUILDER_BASE}/$${code}-$${arch}_result/cryptech-alpha_${CRYPTECH_PACKAGE_VERSION}_$${arch}.changes; \
+		reprepro -b ${REPO_BASE}/$$dist -A $$arch list $$code ${PACKAGE_NAME} | awk '{v = $$3} END {exit v != "${PACKAGE_VERSION}"}' && continue; \
+		pbuilder-dist $$code $$arch build ${PACKAGE_NAME}_${PACKAGE_VERSION}.dsc; \
+		reprepro -b ${REPO_BASE}/$$dist include $$code ${PBUILDER_BASE}/$${code}-$${arch}_result/${PACKAGE_NAME}_${PACKAGE_VERSION}_$${arch}.changes; \
 	done
 
 RSYNC	:= rsync --rsh 'ssh -l ${REPO_UPLOAD_USER}' --archive --itemize-changes
-- 
cgit v1.2.3