From: Daniel Kahn Gillmor Date: Fri, 12 Mar 2010 22:06:39 +0000 (-0500) Subject: further consolidating Xsession script X-Git-Tag: monkeysphere_0.29~19 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=166f4db3b70b4eb491ea27bbb569dde098f6aa63;p=monkeysphere.git further consolidating Xsession script --- 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 -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