[arch-commits] Commit in kde-agent/trunk (PKGBUILD gpg-agent-startup.sh)

[Andrea Scarpino]

    Date: Thursday, September 22, 2011 @ 15:27:40
  Author: andrea
Revision: 138423

upgpkg: kde-agent 20110922-1

Fix gpg-agent start (FS#26080)

Modified:
  kde-agent/trunk/PKGBUILD
  kde-agent/trunk/gpg-agent-startup.sh

----------------------+
 PKGBUILD             |    4 ++--
 gpg-agent-startup.sh |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-09-22 15:46:05 UTC (rev 138422)
+++ PKGBUILD	2011-09-22 19:27:40 UTC (rev 138423)
@@ -3,7 +3,7 @@
 # Contributor: Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=kde-agent
-pkgver=20110602
+pkgver=20110922
 pkgrel=1
 pkgdesc="Startup and shutdown scripts for gpg-agent and ssh-agent in KDE"
 arch=('any')
@@ -12,7 +12,7 @@
 depends=('pinentry' 'openssh' 'qt')
 source=('gpg-agent-startup.sh' 'gpg-agent-shutdown.sh'
         'ssh-agent-startup.sh' 'ssh-agent-shutdown.sh')
-md5sums=('1eb1408f2adec23b6747f8f194b6ee3d'
+md5sums=('1c8096c611904bdd4222c01b3b33d925'
          '6838aa08aaf27962e3f833d25daa086a'
          '8b8c4f60aa66660670db20dd1beccf88'
          'a5d2f2191f31c4f869c98067010395d4')

Modified: gpg-agent-startup.sh
===================================================================
--- gpg-agent-startup.sh	2011-09-22 15:46:05 UTC (rev 138422)
+++ gpg-agent-startup.sh	2011-09-22 19:27:40 UTC (rev 138423)
@@ -8,7 +8,7 @@
   GPG_AGENT_INFO_FILE=${HOME}/.gpg-agent-info
   if [ -f "${GPG_AGENT_INFO_FILE}" ]; then
     GPG_AGENT_PID=`cat ${GPG_AGENT_INFO_FILE} | cut -f2 -d:`
-    GPG_PID_NAME=`ps -p ${GPG_AGENT_PID} -o comm=`
+    GPG_PID_NAME=`cat /proc/${GPG_AGENT_PID}/comm`
     if [ ! "x${GPG_PID_NAME}" = "xgpg-agent" ]; then
       rm -f "${GPG_AGENT_INFO_FILE}" 2>&1 >/dev/null
     else
@@ -21,8 +21,8 @@
   fi
 
   if [ -f "${GPG_AGENT_INFO_FILE}" ]; then
-    eval "$(cat \"${GPG_AGENT_INFO_FILE}\")"
-    eval "$(cut -d= -f 1 < \"${GPG_AGENT_INFO_FILE}\" | xargs echo export)"
+    eval "$(cat "${GPG_AGENT_INFO_FILE}")"
+    eval "$(cut -d= -f 1 "${GPG_AGENT_INFO_FILE}" | xargs echo export)"
     export GPG_TTY=$(tty)
   else
     eval "$(${GPG_AGENT} -s --daemon --pinentry-program /usr/bin/pinentry-qt4 --write-env-file)"