LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

[verify-commits] Fix gpg.sh's echoing for commits with '\n'

Browse source
This commit is contained in:
Matt Corallo 2017-12-05 15:21:23 -05:00
parent 91eeaa0335
commit a38686cea0
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
contrib/verify-commits/gpg.sh
View file

@ -9,7 +9,7 @@ REVSIG=false
IFS=' IFS='
' '
if [ "$BITCOIN_VERIFY_COMMITS_ALLOW_SHA1" = 1 ]; then if [ "$BITCOIN_VERIFY_COMMITS_ALLOW_SHA1" = 1 ]; then
GPG_RES="$(echo "$INPUT" | gpg --trust-model always "$@" 2>/dev/null)" GPG_RES="$(printf '%s\n' "$INPUT" | gpg --trust-model always "$@" 2>/dev/null)"
else else
# Note how we've disabled SHA1 with the --weak-digest option, disabling # Note how we've disabled SHA1 with the --weak-digest option, disabling
# signatures - including selfsigs - that use SHA1. While you might think that # signatures - including selfsigs - that use SHA1. While you might think that
@ -24,7 +24,7 @@ else
case "$LINE" in case "$LINE" in
"gpg (GnuPG) 1.4.1"*|"gpg (GnuPG) 2.0."*) "gpg (GnuPG) 1.4.1"*|"gpg (GnuPG) 2.0."*)
echo "Please upgrade to at least gpg 2.1.10 to check for weak signatures" > /dev/stderr echo "Please upgrade to at least gpg 2.1.10 to check for weak signatures" > /dev/stderr
GPG_RES="$(echo "$INPUT" | gpg --trust-model always "$@" 2>/dev/null)" GPG_RES="$(printf '%s\n' "$INPUT" | gpg --trust-model always "$@" 2>/dev/null)"
;; ;;
# We assume if you're running 2.1+, you're probably running 2.1.10+ # We assume if you're running 2.1+, you're probably running 2.1.10+
# gpg will fail otherwise # gpg will fail otherwise
@ -32,7 +32,7 @@ else
# gpg will fail otherwise # gpg will fail otherwise
esac esac
done done
[ "$GPG_RES" = "" ] && GPG_RES="$(echo "$INPUT" | gpg --trust-model always --weak-digest sha1 "$@" 2>/dev/null)" [ "$GPG_RES" = "" ] && GPG_RES="$(printf '%s\n' "$INPUT" | gpg --trust-model always --weak-digest sha1 "$@" 2>/dev/null)"
fi fi
for LINE in $(echo "$GPG_RES"); do for LINE in $(echo "$GPG_RES"); do
case "$LINE" in case "$LINE" in
@ -57,8 +57,8 @@ if ! $VALID; then
exit 1 exit 1
fi fi
if $VALID && $REVSIG; then if $VALID && $REVSIG; then
echo "$INPUT" | gpg --trust-model always "$@" 2>/dev/null | grep "\[GNUPG:\] \(NEWSIG\|SIG_ID\|VALIDSIG\)" printf '%s\n' "$INPUT" | gpg --trust-model always "$@" 2>/dev/null | grep "\[GNUPG:\] \(NEWSIG\|SIG_ID\|VALIDSIG\)"
echo "$GOODREVSIG" echo "$GOODREVSIG"
else else
echo "$INPUT" | gpg --trust-model always "$@" 2>/dev/null printf '%s\n' "$INPUT" | gpg --trust-model always "$@" 2>/dev/null
fi fi