From: Daniel Kahn Gillmor Date: Fri, 12 Mar 2010 07:25:07 +0000 (-0500) Subject: initialize msva in Xsession based on monkeysphere.conf instead of /etc/X11/Xsession.d X-Git-Tag: monkeysphere_0.29~26 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=6a4e2466e6fb91d060c2d94717abd9922f624d35;p=monkeysphere.git initialize msva in Xsession based on monkeysphere.conf instead of /etc/X11/Xsession.d --- diff --git a/packaging/debian/70monkeysphere_use_validation_agent b/packaging/debian/70monkeysphere_use_validation_agent index 1390859..7c7a030 100644 --- a/packaging/debian/70monkeysphere_use_validation_agent +++ b/packaging/debian/70monkeysphere_use_validation_agent @@ -4,9 +4,9 @@ # startup argument with a monkeysphere-validation-agent nested # process, if available and none already exist. -# Enable this system-wide by adding a line to -# /etc/X11/Xsession.options that reads: -# use-monkeysphere-validation-agent +# Enable this system-wide by setting +# MONKEYSPHERE_USE_VALIDATION_AGENT=true in +# /etc/monkeysphere/monkeysphere.conf # Note that there is some weird interaction between this and # dbus-session at the moment: dbus-launch can start the msva just @@ -22,9 +22,16 @@ STARTMSVA= MSVAGENT=/usr/bin/monkeysphere-validation-agent - -if grep -qs ^use-monkeysphere-validation-agent "$OPTIONFILE"; then - if [ -x "$MSVAGENT" ] && [ -z "$MONKEYSPHERE_VALIDATION_AGENT_SOCKET" ]; then - STARTUP="$MSVAGENT $STARTUP" - fi +MSSYSCONFIG=/etc/monkeysphere/monkeysphere.conf +MSUSERCONFIG="$HOME/.monkeysphere/monkeysphere.conf" + +if [ -x "$MSVAGENT" ] ; then + USEMSVAGENT=$(sh -c " +. '$MSSYSCONFIG' 2>/dev/null +. '$MSUSERCONFIG' 2>/dev/null || : +printf '%s' "'"$MONKEYSPHERE_USE_VALIDATION_AGENT"') + + if [ "$USEMSVAGENT" == "true" ] ; then + STARTUP="$MSVAGENT $STARTUP" + fi fi