dilim/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-08-07 16:42:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Meta/RelSign: adjust to GnuPG v2

Browse Source
This commit is contained in:
Junio C Hamano
2017-12-06 12:23:17 -08:00
parent 77d249b13b
commit ff1e38d73d
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
RelSign
View File

@@ -3,10 +3,18 @@
# Use agent
GPG_TTY=$(tty) &&
export GPG_TTY &&
eval $(gpg-agent --daemon) &&
GPG_AGENT_PID=$(expr "$GPG_AGENT_INFO" : ".*:\([1-9][0-9]*\):[1-9][0-9]*$") &&
trap 'kill -0 2>/dev/null $GPG_AGENT_PID && kill $GPG_AGENT_PID' 0 1 2 3 15 &&
kill -0 "$GPG_AGENT_PID" &&
if AGENT=$(gpg-agent --daemon 2>/dev/null)
then
eval "$AGENT" &&
GPG_AGENT_PID=$(expr "$GPG_AGENT_INFO" : ".*:\([1-9][0-9]*\):[1-9][0-9]*$") &&
trap 'kill -0 2>/dev/null $GPG_AGENT_PID && kill $GPG_AGENT_PID' 0 1 2 3 15 &&
kill -0 "$GPG_AGENT_PID"
else
# agent is always on
gpgconf --kill gpg-agent
GPG_AGENT_PID=
fi &&
gpg="gpg --use-agent --local-user 96AFE6CB!" || exit
formats='htmldocs manpages'
@@ -106,4 +114,9 @@ do
report "$version"
done
kill $GPG_AGENT_PID
if test -n "$GPG_AGENT_PID"
then
kill "$GPG_AGENT_PID"
else
gpgconf --kill gpg-agent
fi