Meta/RelBuild: kill GPG agent only if it is still running

This commit is contained in:
Junio C Hamano
2013-08-27 09:36:49 -07:00
parent ec9b2631d3
commit c85809a8bb

View File

@@ -30,7 +30,7 @@ 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 $GPG_AGENT_PID && kill $GPG_AGENT_PID' 0 1 2 3 15 &&
trap 'kill -0 2>/dev/null $GPG_AGENT_PID && kill $GPG_AGENT_PID' 0 1 2 3 15 &&
kill -0 "$GPG_AGENT_PID" &&
gpg="gpg --use-agent" || exit