kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-07-01 21:43:26 +00:00
Code Issues Projects Releases Wiki Activity

add support for commented lines in config.js

Browse Source
This commit is contained in:
Sam Detweiler 2019-11-22 06:22:21 -06:00
parent 985698bbc3
commit caaeff5cb7
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
run-start.sh
View File

@ -7,20 +7,20 @@ if [ -z "$DISPLAY" ]; then #If not set DISPLAY is SSH remote or tty
fi fi
# get the processor architecture # get the processor architecture
arch=$(uname -m) arch=$(uname -m)
# got the config option, if any false='false'
serveronly=$(grep -i serveronly: config/config.js | awk '{print tolower($2)}' | tr -d ,\"\') # 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 ,\"\')
# set default if not defined in config # set default if not defined in config
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" ] || [ "$xorg." == "." -a $mac != 'Darwin' ]; then if [ "$serveronly." != "false." -o "$arch" == "armv6l" -o "$xorg." == "." ]; 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
@ -60,5 +60,5 @@ if [ "$serveronly." != "false." -o "$arch" == "armv6l" ] || [ "$xorg." == "."
fi fi
else else
# we can use electron directly # we can use electron directly
`electron js/electron.js $1`; electron js/electron.js $1;
fi fi