Switch to gpg2

cygwin · Jan 15, 2024 · 5e8d334 · 5e8d334
1 parent d389eaa
commit 5e8d334
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/pkg_pkg.cygpart b/lib/pkg_pkg.cygpart
@@ -505,7 +505,7 @@ __gpg_sign() {
 	echo "${2} signature needs to be updated";
 	rm -f ${1}.sig;
 	# we 'check_prog gpg' in __pkg_srcpkg()
-	gpg --detach-sign ${1};
+	gpg2 --detach-sign ${1};
 }
 
 __squeeze_whitespace() {
@@ -563,7 +563,7 @@ __pkg_srcpkg() {
 
 	if __arg_bool SIG
 	then
-		if check_prog gpg
+		if check_prog gpg2
 		then
 			__gpg_sign ${spkgdir}/${cygportfile} "CYGPORT SCRIPT";
 

diff --git a/lib/src_prep.cygpart b/lib/src_prep.cygpart
@@ -181,7 +181,7 @@ __gpg_verify() {
 	local _filetype=${2};
 	local _sigext=${3:-sig};
 
-	if ! check_prog gpg
+	if ! check_prog gpg2
 	then
 		# display notice only once
 		if ! defined _gpg_not_found_
@@ -196,7 +196,7 @@ __gpg_verify() {
 	if [ -f ${_file}.${_sigext} ]
 	then
 		inform "${_filetype} signature follows:";
-		gpg --verify ${_file}.${_sigext} ${_file} || true;
+		gpg2 --verify ${_file}.${_sigext} ${_file} || true;
 	fi
 }