mirror of
https://github.com/MichMich/MagicMirror.git
synced 2025-06-30 04:59:32 +00:00
watch out for commented lines in config
This commit is contained in:
parent
cb7ccd7854
commit
cb28e5fddc
12
run-start.sh
12
run-start.sh
@ -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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user