--- /usr/share/cygport/lib/src_prep.cygpart.orig	2023-11-19 18:51:13.284177300 -0700
+++ /usr/share/cygport/lib/src_prep.cygpart	2023-11-19 21:00:35.754036900 -0700
@@ -181,12 +181,14 @@ __gpg_verify() {
 	local _filetype=${2};
 	local _sigext=${3:-sig};
 
-	if ! check_prog gpg && ! check_prog gpg2
+	if check_prog gpg2; then GPG=gpg2; else GPG=gpg; fi
+
+	if ! check_prog $GPG
 	then
 		# display notice only once
 		if ! defined _gpg_not_found_
 		then
-			inform "gnupg or gnupg2 must be installed in order to check signatures.";
+			inform "gnupg2 or gnupg must be installed in order to check signatures.";
 			_gpg_not_found_=1
 		fi
 
@@ -195,7 +197,6 @@ __gpg_verify() {
 
 	if [ -f ${_file}.${_sigext} ]
 	then
-	    [ check_prog gpg2 ] && GPG=gpg2 || GPG=gpg
 		inform "${_filetype} signature follows:";
 		$GPG --verify ${_file}.${_sigext} ${_file} || true;
 	fi