SOURCES: gnupg-agent.sh - launch seahorse if specified

patrys patrys at pld-linux.org
Sat Aug 4 21:02:51 CEST 2007


Author: patrys                       Date: Sat Aug  4 19:02:51 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- launch seahorse if specified

---- Files affected:
SOURCES:
   gnupg-agent.sh (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SOURCES/gnupg-agent.sh
diff -u SOURCES/gnupg-agent.sh:1.7 SOURCES/gnupg-agent.sh:1.8
--- SOURCES/gnupg-agent.sh:1.7	Sat Aug  4 20:53:41 2007
+++ SOURCES/gnupg-agent.sh	Sat Aug  4 21:02:45 2007
@@ -7,9 +7,10 @@
 fi
 
 X11=no
+seahorse=no
 if [ -r "${HOME}/.gnupg/gpg-agent.conf" ]; then
     grep -qE "^[[:blank:]]*pinentry-program[[:blank:]]*.*pinentry-(qt|gtk)" "${HOME}/.gnupg/gpg-agent.conf" && X11=yes
-    grep -qE "^[[:blank:]]*pinentry-program[[:blank:]]*.*seahorse-agent" "${HOME}/.gnupg/gpg-agent.conf" && X11=yes
+    grep -qE "^[[:blank:]]*pinentry-program[[:blank:]]*.*seahorse-agent" "${HOME}/.gnupg/gpg-agent.conf" && X11=yes && seahorse=yes
 fi
 
 if grep -q "^[[:blank:]]*use-agent" ${CFG} 2>/dev/null; then
@@ -17,7 +18,11 @@
 	export GPG_AGENT_INFO="$(cat ${HOME}/.gnupg/GPG_AGENT_INFO)"
     else
 	if [ -n "$DISPLAY" -a "$X11" = "yes" ] || [ -z "$DISPLAY" -a "$X11" = "no" ]; then
-	    eval "$(gpg-agent --daemon)"
+            if [ "$seahorse" = "no" ]; then
+                eval "$(gpg-agent --daemon)"
+            else
+                eval "$(seahorse-agent --variables)"
+            fi
 	    echo $GPG_AGENT_INFO > ~/.gnupg/GPG_AGENT_INFO
 	    export GPG_AGENT_INFO
 	fi
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/gnupg-agent.sh?r1=1.7&r2=1.8&f=u



More information about the pld-cvs-commit mailing list