summaryrefslogtreecommitdiff
authorJeremy Huddleston <jeremyhu@freedesktop.org>2008-12-18 17:14:16 (GMT)
committer Jeremy Huddleston <jeremyhu@freedesktop.org>2008-12-22 05:34:48 (GMT)
commitc3812aec973b7341a600e5d2d07d5a7f15abd609 (patch) (side-by-side diff)
tree2dda585e7717fb147675dccad681b3f3cd58b07f
parentfd6fb6a2771df152b57f9dfb159fa42a3b1d37cd (diff)
downloadxserver-c3812aec973b7341a600e5d2d07d5a7f15abd609.zip
xserver-c3812aec973b7341a600e5d2d07d5a7f15abd609.tar.gz
XQuartz: Changed X11.sh to allow use of a ~/.x11run as requested by users of alternate shells
(cherry picked from commit b62ed1f8eaf041a946bb591165bb18ee481dedbf)
Diffstat (more/less context) (ignore whitespace changes)
-rwxr-xr-xhw/xquartz/bundle/X11.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/hw/xquartz/bundle/X11.sh b/hw/xquartz/bundle/X11.sh
index 87c52b3..f6fac9f 100755
--- a/hw/xquartz/bundle/X11.sh
+++ b/hw/xquartz/bundle/X11.sh
@@ -1,3 +1,8 @@
#!/bin/bash --login
-"$(dirname $0)"/X11.bin "${@}"
+if [ -x ~/.x11run ]; then
+ exec ~/.x11run "$(dirname $0)"/X11.bin "${@}"
+else
+ exec "$(dirname $0)"/X11.bin "${@}"
+fi
+