From 6bce0f06f5c314a8403dfd22495b7ca01b10ecdf Mon Sep 17 00:00:00 2001
From: John McQuah <jquah@mx.sdf.org>
Date: Sat, 19 Aug 2023 16:41:28 -0400
Subject: [PATCH] pkgmeek: pass the -p flag to signify only when --public-key
 is given

---
 scripts/pkgmeek | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/pkgmeek b/scripts/pkgmeek
index ef39970..d5394bc 100755
--- a/scripts/pkgmeek
+++ b/scripts/pkgmeek
@@ -464,7 +464,6 @@ check_signature() { # called from $PKGMK_ROOT in the case "when"="pre-Pkgfile",
 	local reqfiles=(Pkgfile); local s=0; local when="$1";
 	local SIGNIFY_ARGS=(-C -x "$PKGMK_ROOT/.signature")
 
-	[ -n "$PKGMK_PUBLICKEY" ] || PKGMK_PUBLICKEY="$(get_repo_key public)"
 	if [ -f "$PKGMK_ROOT/.signature" ]; then
 		[ "$when" = "pre-Pkgfile" ] || reqfiles=(.footprint)
 		while [ "$when" = "pre-build" ] && (( s < ${#_local_[@]} )); do 
@@ -474,7 +473,8 @@ check_signature() { # called from $PKGMK_ROOT in the case "when"="pre-Pkgfile",
 		for FILE in "${reqfiles[@]}"; do
 			[ -e "$FILE" ] || ln -sf "$PKGMK_ROOT/$FILE" .
 		done
-		[ -r "$PKGMK_PUBLICKEY" ] && SIGNIFY_ARGS+=(-p "$PKGMK_PUBLICKEY")
+		[ "$PKGMK_PUBLICKEY" ] && [ -r "$PKGMK_PUBLICKEY" ] && \
+			SIGNIFY_ARGS+=(-p "$PKGMK_PUBLICKEY")
 		/usr/bin/signify "${SIGNIFY_ARGS[@]}" "${reqfiles[@]}" 2>&1
 	else
 		[ "$when" = "pre-Pkgfile" ] && echo "Pkgfile verification failed"