pkgmeek: handle errors more flexibly in make_signature()
This commit is contained in:
parent
01bba80566
commit
b690906b27
@ -182,10 +182,10 @@ if [ "$pkg_utd" = 0 ] || [[ "$PKGMK_FORCE $PKGMK_EXTRACT_ONLY" =~ yes ]]; then
|
|||||||
# Check the footprint of the built package, unless '-if' was given
|
# Check the footprint of the built package, unless '-if' was given
|
||||||
[ "$PKGMK_IGNORE_FOOTPRINT" = "yes" ] || check_footprint
|
[ "$PKGMK_IGNORE_FOOTPRINT" = "yes" ] || check_footprint
|
||||||
|
|
||||||
fi # Continue from here if extract and build were skipped
|
# Create signature if it doesn't already exist
|
||||||
|
[ -e "$PKGMK_ROOT/.signature" ] || make_signature new
|
||||||
|
|
||||||
[ "$PKGMK_IGNORE_SIG" = "yes" ] || [ -e "$PKGMK_ROOT/.signature" ] \
|
fi # Continue from here if extract and build were skipped
|
||||||
|| make_signature new
|
|
||||||
|
|
||||||
# Clean up the work directory.
|
# Clean up the work directory.
|
||||||
find . -maxdepth 1 -mindepth 1 -type l -delete; cleanup_work
|
find . -maxdepth 1 -mindepth 1 -type l -delete; cleanup_work
|
||||||
@ -492,9 +492,11 @@ make_signature() {
|
|||||||
[ -n "$PKGMK_PRIVATEKEY" ] || PKGMK_PRIVATEKEY="$(get_repo_key secret)"
|
[ -n "$PKGMK_PRIVATEKEY" ] || PKGMK_PRIVATEKEY="$(get_repo_key secret)"
|
||||||
if [ -n "$PKGMK_PRIVATEKEY" ]; then
|
if [ -n "$PKGMK_PRIVATEKEY" ]; then
|
||||||
pub="/etc/ports/$(basename -s .sec "$PKGMK_PRIVATEKEY").pub"
|
pub="/etc/ports/$(basename -s .sec "$PKGMK_PRIVATEKEY").pub"
|
||||||
else
|
elif [[ "$PKGMK_UPDATE_SIG$PKGMK_REFRESH_SIG" =~ yes ]]; then
|
||||||
error "No suitable secret key found. Specify one explicitly with '-sk'."
|
error "No suitable secret key found. Specify one explicitly with '-sk'."
|
||||||
return $E_SIGNATURE
|
return $E_SIGNATURE
|
||||||
|
else
|
||||||
|
return 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# create a new .signature, or refresh an existing manifest?
|
# create a new .signature, or refresh an existing manifest?
|
||||||
@ -526,7 +528,7 @@ make_signature() {
|
|||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
[ "$1" = "new" ] && echo "signature created." || echo "signature updated."
|
[ "$1" = "new" ] && info "signature created." || info "signature updated."
|
||||||
}
|
}
|
||||||
|
|
||||||
interrupted() {
|
interrupted() {
|
||||||
|
Loading…
Reference in New Issue
Block a user