summaryrefslogtreecommitdiff
path: root/maynard.in
diff options
context:
space:
mode:
authorMarco Barisione <marco.barisione@collabora.co.uk>2014-04-14 15:06:12 +0100
committerMarco Barisione <marco.barisione@collabora.co.uk>2014-04-14 15:07:46 +0100
commit698abf2aab938186cf66a2ce377ee122a334c6ea (patch)
tree44d541d08f4444b1b719a57ce49a95bec21c85a5 /maynard.in
parentba1fac989b8242634d5d4fc74891f0588ec410b0 (diff)
downloadgraynard-698abf2aab938186cf66a2ce377ee122a334c6ea.tar.gz
graynard-698abf2aab938186cf66a2ce377ee122a334c6ea.zip
maynard.in: don't try to run weston under X on Raspbian
Diffstat (limited to 'maynard.in')
-rw-r--r--maynard.in10
1 files changed, 8 insertions, 2 deletions
diff --git a/maynard.in b/maynard.in
index 4de517d..ad5f1b6 100644
--- a/maynard.in
+++ b/maynard.in
@@ -23,8 +23,14 @@ xdpyinfo > /dev/null 2>&1
if [ "$?" = "0" ]; then
# We are running under X, so let's assume this is a development
# installation.
- check_install
- XDG_DATA_DIRS=$XDG_DATA_DIRS:$PREFIX/share/ $PREFIX/bin/weston
+ if ! cat /etc/os-release 2> /dev/null | grep 'ID=raspbian' > /dev/null; then
+ # Non-Raspbian, we can launch weston under X.
+ check_install
+ XDG_DATA_DIRS=$XDG_DATA_DIRS:$PREFIX/share/ $PREFIX/bin/weston
+ else
+ echo "You cannot run Maynard under X." >&2
+ exit 1
+ fi
else
weston-launch
fi