summaryrefslogtreecommitdiff
path: root/packaging/debian
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2010-03-12 17:06:39 -0500
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>2010-03-12 17:06:39 -0500
commit166f4db3b70b4eb491ea27bbb569dde098f6aa63 (patch)
tree8948c93c35bddf927dbee42bd2cc2e748d8f5d2a /packaging/debian
parent8a85f739799a73c1f866a5aa6abee70b8bd029df (diff)
further consolidating Xsession script
Diffstat (limited to 'packaging/debian')
-rw-r--r--packaging/debian/70monkeysphere_use-validation-agent7
1 files changed, 2 insertions, 5 deletions
diff --git a/packaging/debian/70monkeysphere_use-validation-agent b/packaging/debian/70monkeysphere_use-validation-agent
index d6758c8..c3135a8 100644
--- 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