Date: Monday, April 30, 2012 @ 11:07:24
Author: andrea
Revision: 157982
upgpkg: kde-agent 20120430-1
Take care of already running agent
Modified:
kde-agent/trunk/PKGBUILD
kde-agent/trunk/gpg-agent-startup.sh
----------------------+
PKGBUILD | 6 +++---
gpg-agent-startup.sh | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-04-30 14:18:17 UTC (rev 157981)
+++ PKGBUILD 2012-04-30 15:07:24 UTC (rev 157982)
@@ -3,16 +3,16 @@
# Contributor: Tobias Powalowski <tp...@archlinux.org>
pkgname=kde-agent
-pkgver=20110922
+pkgver=20120430
pkgrel=1
pkgdesc="Startup and shutdown scripts for gpg-agent and ssh-agent in KDE"
arch=('any')
-url='http://www.kde.org'
+url='http://www.archlinux.org/'
license=('GPL' 'LGPL' 'FDL')
depends=('pinentry' 'openssh' 'qt')
source=('gpg-agent-startup.sh' 'gpg-agent-shutdown.sh'
'ssh-agent-startup.sh' 'ssh-agent-shutdown.sh')
-md5sums=('1c8096c611904bdd4222c01b3b33d925'
+md5sums=('baf5135003f0a406dac85c2719fbed49'
'6838aa08aaf27962e3f833d25daa086a'
'8b8c4f60aa66660670db20dd1beccf88'
'a5d2f2191f31c4f869c98067010395d4')
Modified: gpg-agent-startup.sh
===================================================================
--- gpg-agent-startup.sh 2012-04-30 14:18:17 UTC (rev 157981)
+++ gpg-agent-startup.sh 2012-04-30 15:07:24 UTC (rev 157982)
@@ -7,12 +7,12 @@
# check validity of GPG_SOCKET (in case of session crash)
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_AGENT_PID=`cat ${GPG_AGENT_INFO_FILE} | grep GPG_AGENT_INFO | cut -f2
-d:`
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
- GPG_SOCKET=`cat "${GPG_AGENT_INFO_FILE}" | cut -f1 -d: | cut -f2 -d=`
+ GPG_SOCKET=`cat "${GPG_AGENT_INFO_FILE}" | grep GPG_AGENT_INFO | cut
-f1 -d: | cut -f2 -d=`
if ! test -S "${GPG_SOCKET}" -a -O "${GPG_SOCKET}" ; then
rm -f "${GPG_AGENT_INFO_FILE}" 2>&1 >/dev/null
fi
