From 47d5b184c421beb19ee61b7ceb96bde165f8262b Mon Sep 17 00:00:00 2001
From: Martin Harris <martin.harris@cloudsoftcorp.com>
Date: Tue, 28 Jan 2020 16:37:03 +0000
Subject: [PATCH 1/2] Adds support for both gpg and gpg2 when verifying

---
 .../release-process/verify-release-artifacts.md          | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/developers/committers/release-process/verify-release-artifacts.md b/developers/committers/release-process/verify-release-artifacts.md
index 01b82abc..9da7814d 100644
--- a/developers/committers/release-process/verify-release-artifacts.md
+++ b/developers/committers/release-process/verify-release-artifacts.md
@@ -98,9 +98,16 @@ Verify the hashes and signatures of artifacts
 Then check the hashes and signatures, ensuring you get a positive message from each one:
 
 {% highlight bash %}
+GPG_COMMAND=$((which gpg >> /dev/null && echo gpg) || (which gpg2 >> /dev/null && echo gpg2))
+
+if [ -z "${GPG_COMMAND}" ]; then
+    echo "gpg or gpg2 must be installed, exiting"
+    exit
+fi
+
 for artifact in $(find * -type f ! \( -name '*.asc' -o -name '*.sha256' \) ); do
     shasum -a256 -c ${artifact}.sha256 && \
-    gpg2 --verify ${artifact}.asc ${artifact} \
+    $GPG_COMMAND --verify ${artifact}.asc ${artifact} \
       || { echo "Invalid signature for $artifact. Aborting!"; break; }
 done
 {% endhighlight %}

From 3f55f9f7a69096576ebb2f112c74e9cd76cbb9a0 Mon Sep 17 00:00:00 2001
From: Martin Harris <martin.harris@cloudsoftcorp.com>
Date: Tue, 28 Jan 2020 16:22:15 +0000
Subject: [PATCH 2/2] Adds .deb support, and fixes .rpm support in release
 artifact verification

---
 .../committers/release-process/verify-release-artifacts.md  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/developers/committers/release-process/verify-release-artifacts.md b/developers/committers/release-process/verify-release-artifacts.md
index 9da7814d..7a7c2920 100644
--- a/developers/committers/release-process/verify-release-artifacts.md
+++ b/developers/committers/release-process/verify-release-artifacts.md
@@ -79,7 +79,11 @@ for ARCHIVE in $(find * -type f ! \( -name '*.asc' -o -name '*.sha256' \) ); do
       ;;
     *.rpm)
       LIST="rpm -qlp"
-      PREFIX="/opt/brooklyn"
+      PREFIX="/opt/brooklyn-${VERSION_NAME}"
+      ;;
+    *.deb)
+      LIST="dpkg -c"
+      PREFIX="/opt/brooklyn-${VERSION_NAME}"
       ;;
     *)
       echo "Unrecognized file type $ARCHIVE. Aborting!"