aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Kroeger <robkroeger@gmail.com>2011-11-28 10:09:26 -0500
committerRuss Cox <rsc@swtch.com>2011-11-28 10:09:26 -0500
commit83a5aba766bf2a2a84fe20df0d72d47a9105fdb2 (patch)
treebef5e0d2150d1e2c2187ce30aed4a04c447df783
parent0c9524b72197871c435464d064fdcc3dd5437581 (diff)
downloadplan9port-83a5aba766bf2a2a84fe20df0d72d47a9105fdb2.tar.gz
plan9port-83a5aba766bf2a2a84fe20df0d72d47a9105fdb2.tar.bz2
plan9port-83a5aba766bf2a2a84fe20df0d72d47a9105fdb2.zip
mac Plumb: skip loading non-existent .bashrc
R=rsc CC=plan9port.codebot http://codereview.appspot.com/5434052
-rw-r--r--CONTRIBUTORS1
-rwxr-xr-xmac/Plumb.app/Contents/MacOS/plumb4
2 files changed, 4 insertions, 1 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index e5c5eb6a..80f39ab3 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -28,6 +28,7 @@ Michael Teichgräber <mt@ib.wmipf.de>
Nikolai Saoukh <nikolai.saoukh@gmail.com>
Peter Saveliev <svinota.saveliev@gmail.com>
Richard Miller <millerresearch@gmail.com>
+Rob Kroeger <robkroeger@gmail.com>
Rob Pike <robpike@gmail.com>
Russ Cox <rsc@swtch.com>
Sean McKean <smckean83@gmail.com>
diff --git a/mac/Plumb.app/Contents/MacOS/plumb b/mac/Plumb.app/Contents/MacOS/plumb
index fc5e2c30..f98cd2e7 100755
--- a/mac/Plumb.app/Contents/MacOS/plumb
+++ b/mac/Plumb.app/Contents/MacOS/plumb
@@ -1,6 +1,8 @@
#!/bin/bash
-. ~/.bashrc
+if [ -e ~/.bashrc ] ; then
+ . ~/.bashrc
+fi
PLAN9=${PLAN9:-/usr/local/plan9}
bin=$PLAN9/bin