kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-07-03 22:36:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'newscripts' of https://github.com/sdetweil/MagicMirror into newscripts

Browse Source
This commit is contained in:
Your Name 2019-11-27 08:38:12 -06:00
commit bc912a8ea4
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
run-start.sh
View File

@ -7,10 +7,12 @@ 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)
# #
@ -58,5 +60,5 @@ if [ "$serveronly." != "false." -o "$arch" == "armv6l" -o "$xorg." == "." ]; t
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