From c77cd588afbd20fe0158b17dd84ba78d4342b1c9 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Mon, 18 Sep 2006 12:49:00 +0000
Subject: [PATCH] - fix "syntax error in gpg-agent-startup.sh" (#206887)

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

diff --git a/gnupg2.spec b/gnupg2.spec
index 500180e..dc1c90c 100644
--- a/gnupg2.spec
+++ b/gnupg2.spec
@@ -16,7 +16,7 @@
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
 Version: 1.9.22
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPL
 Group:   Applications/System
@@ -170,7 +170,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon Sep 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.22-4
+* Mon Sep 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.22-5
 - fix "syntax error in gpg-agent-startup.sh" (#206887)
 
 * Thu Sep 07 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.22-3
diff --git a/gpg-agent-startup.sh b/gpg-agent-startup.sh
index 993c152..1533645 100755
--- a/gpg-agent-startup.sh
+++ b/gpg-agent-startup.sh
@@ -2,12 +2,12 @@
 
 GPG_AGENT=/usr/bin/gpg-agent
 ## Run gpg-agent only if not already running, and available
-if [ -z "${GPG_AGENT_INFO}" -a -x ${GPG_AGENT} ] ; then
+if [ -z "${GPG_AGENT_INFO}" -a -x "${GPG_AGENT}" ] ; then
 
   # check validity of GPG_SOCKET (in case of session crash)
   if [ -f ${HOME}/.gpg-agent-info ]; then
     GPG_SOCKET=$(cat .gpg-agent-info |cut -f1 -d:)
-    if ! test -S ${GPG_SOCKET} -o ! -O ${GPG_SOCKET} ; then
+    if ! test -S "${GPG_SOCKET}" -o ! -O "${GPG_SOCKET}" ; then
       rm -f ${HOME}/.gpg-agent-info 2>&1 >/dev/null
     fi
   fi
@@ -17,7 +17,7 @@ if [ -z "${GPG_AGENT_INFO}" -a -x ${GPG_AGENT} ] ; then
     export GPG_TTY=$(tty)
   else
     eval "$(${GPG_AGENT} -s --daemon ${GPG_OPTIONS})"
-    echo ${GPG_AGENT_INFO} > ${HOME}/.gpg-agent-info
+    echo ${GPG_AGENT_INFO} > "${HOME}/.gpg-agent-info"
   fi
 
 fi