From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 10 Aug 2010 18:05:33 +0000 (-0400)
Subject: test for presence of config files before sourcing them (works with both dash and... 
X-Git-Tag: monkeysphere_0.32-1~6
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d4ce22c795e0d69ede8abf2375fb33f2d0c3d743;p=monkeysphere.git

test for presence of config files before sourcing them (works with both dash and bash, and resolves MS #2471)
---

diff --git a/debian/70monkeysphere_use-validation-agent b/debian/70monkeysphere_use-validation-agent
index eec1ff6..894de12 100644
--- a/debian/70monkeysphere_use-validation-agent
+++ b/debian/70monkeysphere_use-validation-agent
@@ -30,8 +30,8 @@ MSUSERCONFIG="$HOME/.monkeysphere/monkeysphere.conf"
 
 if [ -x "$MSVAGENT" ] ; then
    if [ "$(USE_VALIDATION_AGENT=
-. "$MSSYSCONFIG" 2>/dev/null || :
-. "$MSUSERCONFIG" 2>/dev/null || :
+[ -r "$MSSYSCONFIG" ]  && . "$MSSYSCONFIG" 2>/dev/null || :
+[ -r "$MSUSERCONFIG" ] && . "$MSUSERCONFIG" 2>/dev/null || :
 printf '%s' "$USE_VALIDATION_AGENT")" = "true" ] ; then
         STARTUP="$MSVAGENT $STARTUP"
     fi
diff --git a/debian/changelog b/debian/changelog
index a3cc235..66d9fcc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+monkeysphere (0.31-2~pre) UNRELEASED; urgency=low
+
+  * fix X11 session initialization script for systems with dash as /bin/sh
+    (resolves MS #2471)
+
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Tue, 10 Aug 2010 14:07:45 -0400
+
 monkeysphere (0.31-1) unstable; urgency=low
 
   * New Upstream Release