From 985698bbc3ab110b89b713226080c3be280a5340 Mon Sep 17 00:00:00 2001 From: Sam Detweiler Date: Sun, 27 Oct 2019 09:13:44 -0500 Subject: [PATCH] fix for no 'Xorg' process on MacOS --- css/custom.css | 14 -------------- run-start.sh | 6 ++++-- 2 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 css/custom.css diff --git a/css/custom.css b/css/custom.css deleted file mode 100644 index 7d0d0681..00000000 --- a/css/custom.css +++ /dev/null @@ -1,14 +0,0 @@ -/***************************************************** - * Magic Mirror * - * Custom CSS * - * * - * By Michael Teeuw http://michaelteeuw.nl * - * MIT Licensed. * - * * - * Add any custom CSS below. * - * Changes to this files will be ignored by GIT. * - *****************************************************/ - - body { - - } diff --git a/run-start.sh b/run-start.sh index a6c07520..c9cf80ad 100755 --- a/run-start.sh +++ b/run-start.sh @@ -13,12 +13,14 @@ serveronly=$(grep -i serveronly: config/config.js | awk '{print tolower($2)}' | serveronly="${serveronly:=false}" # check for xwindows running xorg=$(pgrep Xorg) +#check for macOS +mac=$(uname) # # if the user requested serveronly OR # electron support for armv6l has been dropped OR # system is in text mode # -if [ "$serveronly." != "false." -o "$arch" == "armv6l" -o "$xorg." == "." ]; then +if [ "$serveronly." != "false." -o "$arch" == "armv6l" ] || [ "$xorg." == "." -a $mac != 'Darwin' ]; then # if user explicitly configured to run server only (no ui local) # OR there is no xwindows running, so no support for browser graphics @@ -59,4 +61,4 @@ if [ "$serveronly." != "false." -o "$arch" == "armv6l" -o "$xorg." == "." ]; t else # we can use electron directly `electron js/electron.js $1`; -fi \ No newline at end of file +fi