peter/spectre-meltdown-checker
peter/spectre-meltdown-checker
1
0
Fork 0
mirror of https://github.com/speed47/spectre-meltdown-checker.git synced 2024-12-21 18:48:03 +01:00
Code Issues Projects Releases Wiki Activity

fix(batch): fix regression introduced by acf12a6

Browse Source 
In batch mode, $echo_cmd was not initialized early
enough, and caused this error:
./spectre-meltdown-checker.sh: 899: ./spectre-meltdown-checker.sh: -ne: not found
Fix it by initing echo_cmd unconditionally at the start
This commit is contained in:
Stéphane Lesimple 2018-01-24 17:55:36 +01:00
parent acf12a6d2d
commit d1c1f0f0f0
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
spectre-meltdown-checker.sh
View File

@ -99,14 +99,6 @@ global_critical=0
global_unknown=0 global_unknown=0
nrpe_vuln="" nrpe_vuln=""
echo_cmd=''
__echo()
{
opt="$1"
shift
_msg="$@"
if [ -z "$echo_cmd" ]; then
# find a sane `echo` command # find a sane `echo` command
# we'll try to avoid using shell builtins that might not take options # we'll try to avoid using shell builtins that might not take options
if which echo >/dev/null 2>&1; then if which echo >/dev/null 2>&1; then
@ -117,7 +109,11 @@ __echo()
fi fi
# still empty ? fallback to builtin # still empty ? fallback to builtin
[ -z "$echo_cmd" ] && echo_cmd=echo [ -z "$echo_cmd" ] && echo_cmd=echo
fi __echo()
{
opt="$1"
shift
_msg="$@"
if [ "$opt_no_color" = 1 ] ; then if [ "$opt_no_color" = 1 ] ; then
# strip ANSI color codes # strip ANSI color codes