From ab7d1c7f6c168b44e965cac34b550489e14580e9 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Fri, 12 Mar 2010 16:47:58 -0500 Subject: renaming Xsession config file to match existing pattern (underscore only separates package from description) --- .../debian/70monkeysphere_use-validation-agent | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 packaging/debian/70monkeysphere_use-validation-agent (limited to 'packaging/debian/70monkeysphere_use-validation-agent') diff --git a/packaging/debian/70monkeysphere_use-validation-agent b/packaging/debian/70monkeysphere_use-validation-agent new file mode 100644 index 0000000..1335458 --- /dev/null +++ b/packaging/debian/70monkeysphere_use-validation-agent @@ -0,0 +1,37 @@ +# /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 +# process, if available and none already exist. + +# 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 +# fine, but if msva tries to start dbus-launch, dbus-launch fails +# with: + +# Failed to waitpid() for babysitter intermediate process: No child processes + +# 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. + +# 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=$(sh -c "USE_VALIDATION_AGENT= +. '$MSSYSCONFIG' 2>/dev/null +. '$MSUSERCONFIG' 2>/dev/null || : +printf '%s' "'"$USE_VALIDATION_AGENT"') + + if [ "$USEMSVAGENT" == "true" ] ; then + STARTUP="$MSVAGENT $STARTUP" + fi +fi -- cgit v1.2.3 From 6a7ea8d275687ae75c1e06e73934922ba63fe61a Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Fri, 12 Mar 2010 16:53:37 -0500 Subject: made Xsession script POSIX-compliant, simplified it --- packaging/debian/70monkeysphere_use-validation-agent | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'packaging/debian/70monkeysphere_use-validation-agent') diff --git a/packaging/debian/70monkeysphere_use-validation-agent b/packaging/debian/70monkeysphere_use-validation-agent index 1335458..4723f5c 100644 --- a/packaging/debian/70monkeysphere_use-validation-agent +++ b/packaging/debian/70monkeysphere_use-validation-agent @@ -26,12 +26,12 @@ 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"') + USEMSVAGENT=$(USE_VALIDATION_AGENT= +. "$MSSYSCONFIG" 2>/dev/null +. "$MSUSERCONFIG" 2>/dev/null || : +printf '%s' "$USE_VALIDATION_AGENT") - if [ "$USEMSVAGENT" == "true" ] ; then + if [ "$USEMSVAGENT" = "true" ] ; then STARTUP="$MSVAGENT $STARTUP" fi fi -- cgit v1.2.3 From 04793ed7a56034e5d8290385155e9960afda6a29 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Fri, 12 Mar 2010 17:01:28 -0500 Subject: add note about dbus communication for msva --- packaging/debian/70monkeysphere_use-validation-agent | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'packaging/debian/70monkeysphere_use-validation-agent') diff --git a/packaging/debian/70monkeysphere_use-validation-agent b/packaging/debian/70monkeysphere_use-validation-agent index 4723f5c..2f9a4bf 100644 --- a/packaging/debian/70monkeysphere_use-validation-agent +++ b/packaging/debian/70monkeysphere_use-validation-agent @@ -18,6 +18,10 @@ # 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 STARTMSVA= -- cgit v1.2.3 From 8a85f739799a73c1f866a5aa6abee70b8bd029df Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Fri, 12 Mar 2010 17:02:16 -0500 Subject: fixing comment in Xsession script --- packaging/debian/70monkeysphere_use-validation-agent | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packaging/debian/70monkeysphere_use-validation-agent') diff --git a/packaging/debian/70monkeysphere_use-validation-agent b/packaging/debian/70monkeysphere_use-validation-agent index 2f9a4bf..d6758c8 100644 --- 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 -- cgit v1.2.3 From 166f4db3b70b4eb491ea27bbb569dde098f6aa63 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Fri, 12 Mar 2010 17:06:39 -0500 Subject: further consolidating Xsession script --- packaging/debian/70monkeysphere_use-validation-agent | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'packaging/debian/70monkeysphere_use-validation-agent') 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 -- cgit v1.2.3