watch out for commented lines in config

This commit is contained in:
Sam Detweiler 2019-11-22 06:18:04 -06:00
parent cb7ccd7854
commit cb28e5fddc

View File

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