mirror of
https://github.com/MichMich/MagicMirror.git
synced 2025-06-29 20:49:54 +00:00
regression checking for macOS
This commit is contained in:
parent
caaeff5cb7
commit
63d9904370
@ -7,7 +7,7 @@ if [ -z "$DISPLAY" ]; then #If not set DISPLAY is SSH remote or tty
|
||||
fi
|
||||
# get the processor architecture
|
||||
arch=$(uname -m)
|
||||
false='false'
|
||||
|
||||
# get the config option, if any
|
||||
# only check non comment lines
|
||||
serveronly=$(grep -v '^\s//' config/config.js | grep -i serveronly: | awk '{print tolower($2)}' | tr -d ,\"\')
|
||||
@ -15,13 +15,15 @@ serveronly=$(grep -v '^\s//' config/config.js | grep -i serveronly: | awk '{pri
|
||||
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
|
||||
if [ "$serveronly." == "true." -o "$xorg." == "." ]; then
|
||||
|
Loading…
x
Reference in New Issue
Block a user