--- /usr/bin/keychain.orig	2003-12-04 01:39:05.001000000 -0500
+++ keychain	2004-04-01 21:05:04.832580800 -0500
@@ -219,12 +219,12 @@
 cshpidf="${keydir}/${hostname}-csh"
 lockf="${keydir}/${hostname}-lock"
 
-if [ -f ${keydir} ]
+if [ -f "${keydir}" ]
 then
 	echo "$0: ${keydir} is a file (it should be a directory;) please fix."
 	exit 1
 #Solaris 9 doesn't have -e; using -d....
-elif [ ! -d ${keydir} ]
+elif [ ! -d "${keydir}" ]
 then
 	mkdir ${keydir} || exit 1
 	chmod 0700 ${keydir}
@@ -301,9 +301,9 @@
 fi
 
 SSH_AGENT_PID="NULL"
-if [ -f $pidf ]
+if [ -f "$pidf" ]
 then
-	. $pidf	
+	. "$pidf"	
 fi
 
 # Copy application-specific environment variables into generic local variables.