From 698abf2aab938186cf66a2ce377ee122a334c6ea Mon Sep 17 00:00:00 2001 From: Marco Barisione Date: Mon, 14 Apr 2014 15:06:12 +0100 Subject: maynard.in: don't try to run weston under X on Raspbian --- maynard.in | 10 ++++++++-- 1 file 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 -- cgit v1.3.1