[packages/gnupg2] - use readlink from coreutils instead of our own resolvesymlink; handle "gpg-agent (deleted)" symlin

arekm arekm at pld-linux.org
Tue Aug 2 15:15:30 CEST 2016


commit 055da82fd15fc5b7c4a55e5421998095f9509f44
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Aug 2 15:15:24 2016 +0200

    - use readlink from coreutils instead of our own resolvesymlink; handle "gpg-agent (deleted)" symlink case

 gnupg-agent.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/gnupg-agent.sh b/gnupg-agent.sh
index 100ad8b..72dda0c 100644
--- a/gnupg-agent.sh
+++ b/gnupg-agent.sh
@@ -14,7 +14,7 @@ fi
 if grep -q "^[[:blank:]]*use-agent" ${CFG} 2>/dev/null; then
 	if [ -f "${HOME}/.gnupg/GPG_AGENT_INFO" ] && \
 			pid="$(cut -d: -f2 $HOME/.gnupg/GPG_AGENT_INFO)" && \
-			agent="$(resolvesymlink "/proc/$pid/exe")" && \
+			agent="$(readlink -n "/proc/$pid/exe")" && agent=${agent%% *} && \
 			[ "$agent" = "/usr/bin/gpg-agent" -o "$agent" = "/usr/bin/seahorse-agent" ]; then
 		export GPG_AGENT_INFO="$(cat ${HOME}/.gnupg/GPG_AGENT_INFO)"
 	else
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gnupg2.git/commitdiff/055da82fd15fc5b7c4a55e5421998095f9509f44



More information about the pld-cvs-commit mailing list