further consolidating Xsession script

diff --git a/packaging/debian/70monkeysphere_use-validation-agent b/packaging/debian/70monkeysphere_use-validation-agent
index d6758c833220f92f1b9564a9cc0d5bad417d6333..c3135a82886f368d62f6b3e1380079ecc39fb022 100644 (file)
--- a/packaging/debian/70monkeysphere_use-validation-agent
+++ b/packaging/debian/70monkeysphere_use-validation-agent
@@ -24,18 +24,15 @@
 
 # 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=$(USE_VALIDATION_AGENT=
+   if [ "$(USE_VALIDATION_AGENT=
 . "$MSSYSCONFIG" 2>/dev/null
 . "$MSUSERCONFIG" 2>/dev/null || :
-printf '%s' "$USE_VALIDATION_AGENT")
-    
-    if [ "$USEMSVAGENT" = "true" ] ; then
+printf '%s' "$USE_VALIDATION_AGENT")" = "true" ] ; then
         STARTUP="$MSVAGENT $STARTUP"
     fi
 fi