pkgmeek: pass the -p flag to signify only when --public-key is given
This commit is contained in:
parent
a34fa96166
commit
6bce0f06f5
@ -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 reqfiles=(Pkgfile); local s=0; local when="$1";
|
||||||
local SIGNIFY_ARGS=(-C -x "$PKGMK_ROOT/.signature")
|
local SIGNIFY_ARGS=(-C -x "$PKGMK_ROOT/.signature")
|
||||||
|
|
||||||
[ -n "$PKGMK_PUBLICKEY" ] || PKGMK_PUBLICKEY="$(get_repo_key public)"
|
|
||||||
if [ -f "$PKGMK_ROOT/.signature" ]; then
|
if [ -f "$PKGMK_ROOT/.signature" ]; then
|
||||||
[ "$when" = "pre-Pkgfile" ] || reqfiles=(.footprint)
|
[ "$when" = "pre-Pkgfile" ] || reqfiles=(.footprint)
|
||||||
while [ "$when" = "pre-build" ] && (( s < ${#_local_[@]} )); do
|
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
|
for FILE in "${reqfiles[@]}"; do
|
||||||
[ -e "$FILE" ] || ln -sf "$PKGMK_ROOT/$FILE" .
|
[ -e "$FILE" ] || ln -sf "$PKGMK_ROOT/$FILE" .
|
||||||
done
|
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
|
/usr/bin/signify "${SIGNIFY_ARGS[@]}" "${reqfiles[@]}" 2>&1
|
||||||
else
|
else
|
||||||
[ "$when" = "pre-Pkgfile" ] && echo "Pkgfile verification failed"
|
[ "$when" = "pre-Pkgfile" ] && echo "Pkgfile verification failed"
|
||||||
|
Loading…
Reference in New Issue
Block a user