Meta/RelSign: adjust to GnuPG v2
Junio C Hamano committed
Dec 6, 2017 at 12:23 UTC
ff1e38d73d66af128aea5f4a137f1395c14e47e6
1 file changed
+18
-5
RelSign
+18
-5
@@ -3,10 +3,18 @@
3
# Use agent
4
GPG_TTY=$(tty) &&
5
export GPG_TTY &&
6
-eval $(gpg-agent --daemon) &&
7
-GPG_AGENT_PID=$(expr "$GPG_AGENT_INFO" : ".*:\([1-9][0-9]*\):[1-9][0-9]*$") &&
8
-trap 'kill -0 2>/dev/null $GPG_AGENT_PID && kill $GPG_AGENT_PID' 0 1 2 3 15 &&
9
-kill -0 "$GPG_AGENT_PID" &&
6
+
7
+if AGENT=$(gpg-agent --daemon 2>/dev/null)
8
+then
9
+ eval "$AGENT" &&
10
+ GPG_AGENT_PID=$(expr "$GPG_AGENT_INFO" : ".*:\([1-9][0-9]*\):[1-9][0-9]*$") &&
11
+ trap 'kill -0 2>/dev/null $GPG_AGENT_PID && kill $GPG_AGENT_PID' 0 1 2 3 15 &&
12
+ kill -0 "$GPG_AGENT_PID"
13
+else
14
+ # agent is always on
15
+ gpgconf --kill gpg-agent
16
+ GPG_AGENT_PID=
17
+fi &&
18
gpg="gpg --use-agent --local-user 96AFE6CB!" || exit
19
20
formats='htmldocs manpages'
@@ -106,4 +114,9 @@ do
114
report "$version"
115
done
116
109
-kill $GPG_AGENT_PID
117
+if test -n "$GPG_AGENT_PID"
118
+then
119
+ kill "$GPG_AGENT_PID"
120
+else
121
+ gpgconf --kill gpg-agent
122
+fi