tools/pkgutils
3
0
Fork 2
Code Issues 1 Pull Requests Projects Releases Wiki Activity

pkgmk: call signify with absolute path

Browse Source
This commit is contained in:
Juergen Daubert 2021-10-05 10:41:04 +02:00
parent 8976af7afe
commit 65b585fe25
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgmk.in
View File

@ -329,9 +329,9 @@ check_signature() {
done
if [ "$PKGMK_PUBLICKEY" ]; then
err=$(signify -q -C -p "$PKGMK_PUBLICKEY" -x "$PKGMK_ROOT/$PKGMK_SIGNATURE" 2>&1)
err=$($PKGMK_SIGNIFY -q -C -p "$PKGMK_PUBLICKEY" -x "$PKGMK_ROOT/$PKGMK_SIGNATURE" 2>&1)
else
err=$(signify -q -C -x "$PKGMK_ROOT/$PKGMK_SIGNATURE" 2>&1)
err=$($PKGMK_SIGNIFY -q -C -x "$PKGMK_ROOT/$PKGMK_SIGNATURE" 2>&1)
fi
RESULT=$?
@ -412,7 +412,7 @@ make_signature() {
fi
sha256sum --tag $LOCAL_FILENAMES | sed 's|^SHA256 (.*/\(.*\))\(.* = .*\)|SHA256 (\1)\2|' | \
signify -S -e -x - -q -s "$PKGMK_PRIVATEKEY" -m - > ${PKGMK_SIGNATURE}.tmp
$PKGMK_SIGNIFY -S -e -x - -q -s "$PKGMK_PRIVATEKEY" -m - > ${PKGMK_SIGNATURE}.tmp
if [ $? -ne 0 ]; then
rm ${PKGMK_SIGNATURE}.tmp
@ -435,7 +435,7 @@ refresh_signature() {
fi
tail -n +3 ${PKGMK_SIGNATURE} | \
signify -S -e -x - -q -s "$PKGMK_PRIVATEKEY" -m - > ${PKGMK_SIGNATURE}.tmp
$PKGMK_SIGNIFY -S -e -x - -q -s "$PKGMK_PRIVATEKEY" -m - > ${PKGMK_SIGNATURE}.tmp
if [ $? -ne 0 ]; then
rm ${PKGMK_SIGNATURE}.tmp
@ -964,6 +964,7 @@ export LC_ALL=POSIX
readonly PKGMK_VERSION="#VERSION#"
readonly PKGMK_COMMAND="$0"
readonly PKGMK_ROOT="$PWD"
readonly PKGMK_SIGNIFY="/usr/bin/signify"
PKGMK_CONFFILE="/etc/pkgmk.conf"
PKGMK_PKGFILE="Pkgfile"