commit 89fd4ad238d9e277c20942a8bcc6a57831937178
from: the xhr <xhr@giessen.ccc.de>
date: Tue Jul 04 12:53:47 2017 UTC

Give preference to v2

commit - 1dcc939a62a2c619ea42d781cb40957c0d4b3f1d
commit + 89fd4ad238d9e277c20942a8bcc6a57831937178
blob - 09ecd4c2b4b7af091ce4a89f743497349d9ba82d
blob + 3a8f22e98439ddeeab8e0f9e68c4c288fcfdf17c
--- tpm
+++ tpm
@@ -24,7 +24,7 @@ umask 077
 ##
 
 GPG_OPTS="--quiet --yes"
-GPGB="gpg"
+GPGB="gpg2"
 TMPDIR="/tmp"
 NUKE="rm"
 PASSWORD_STORE_KEY=${PASSWORD_STORE_KEY:-""}
@@ -66,11 +66,11 @@ abort() {
 
 mygpg() {
 
-	if [ -z "$(which gpg 2> /dev/null)" ]; then
-		if [ -z "$(which gpg2 2> /dev/null)" ]; then
+	if [ -z "$(which gpg2 2> /dev/null)" ]; then
+		if [ -z "$(which gpg 2> /dev/null)" ]; then
 			abort "gpg or gpg2 not found.  Please install."
 		else
-			GPGB="gpg2"
+			GPGB="gpg"
 		fi
 	fi