Merge remote branch 'dkg/master'

[monkeysphere.git] / packaging / debian / 70monkeysphere_use-validation-agent

diff --git a/packaging/debian/70monkeysphere_use-validation-agent b/packaging/debian/70monkeysphere_use-validation-agent
index 1335458ce0bc812bb829415b6f29b3d1a6ceaa1a..c3135a82886f368d62f6b3e1380079ecc39fb022 100644 (file)
--- a/packaging/debian/70monkeysphere_use-validation-agent
+++ b/packaging/debian/70monkeysphere_use-validation-agent
@@ -1,4 +1,4 @@
-# /etc/X11/Xsession.d/70monkeysphere_use_validation_agent
+# /etc/X11/Xsession.d/70monkeysphere_use-validation-agent
 
 # This is a script to be sourced by Xsession.  It wraps the session
 # startup argument with a monkeysphere-validation-agent nested
@@ -18,20 +18,21 @@
 # So this is placed at position 70 -- *before* the dbus Xsession
 # startup script, which is at 75 as of 2010-03-12, when i wrote this.
 
+# this is also good, because it means that the MSVA will learn about
+# the dbus session parameters, in case we want the agent to use dbus
+# to communicate with the user.
+
 # Author: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
 
-STARTMSVA=
 MSVAGENT=/usr/bin/monkeysphere-validation-agent
 MSSYSCONFIG=/etc/monkeysphere/monkeysphere.conf
 MSUSERCONFIG="$HOME/.monkeysphere/monkeysphere.conf"
 
 if [ -x "$MSVAGENT" ] ; then
-    USEMSVAGENT=$(sh -c "USE_VALIDATION_AGENT=
-. '$MSSYSCONFIG' 2>/dev/null
-. '$MSUSERCONFIG' 2>/dev/null || :
-printf '%s' "'"$USE_VALIDATION_AGENT"')
-    
-    if [ "$USEMSVAGENT" == "true" ] ; then
+   if [ "$(USE_VALIDATION_AGENT=
+. "$MSSYSCONFIG" 2>/dev/null
+. "$MSUSERCONFIG" 2>/dev/null || :
+printf '%s' "$USE_VALIDATION_AGENT")" = "true" ] ; then
         STARTUP="$MSVAGENT $STARTUP"
     fi
 fi