kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-07-18 20:59:45 +00:00
Code Issues Projects Releases Wiki Activity

fix for no 'Xorg' process on MacOS

Browse Source
This commit is contained in:
Sam Detweiler 2019-10-27 09:13:44 -05:00
parent a4953028d0
commit 985698bbc3
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
css/custom.css
View File

@ -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 {
}

4
run-start.sh
View File

@ -13,12 +13,14 @@ serveronly=$(grep -i serveronly: config/config.js | awk '{print tolower($2)}' |
serveronly="${serveronly:=false}" serveronly="${serveronly:=false}"
# check for xwindows running # check for xwindows running
xorg=$(pgrep Xorg) xorg=$(pgrep Xorg)
#check for macOS
mac=$(uname)
# #
# if the user requested serveronly OR # if the user requested serveronly OR
# electron support for armv6l has been dropped OR # electron support for armv6l has been dropped OR
# system is in text mode # 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) # if user explicitly configured to run server only (no ui local)
# OR there is no xwindows running, so no support for browser graphics # OR there is no xwindows running, so no support for browser graphics