-
-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