diff options
| author | Stéphane Lesimple <speed47_github@speed47.net> | 2018-02-02 10:59:49 +0100 |
|---|---|---|
| committer | Stéphane Lesimple <speed47_github@speed47.net> | 2018-02-02 10:59:49 +0100 |
| commit | 6346a0deaac94708d798f851c209a7b9ec38dd48 (patch) | |
| tree | 47b9305b63545868e972c2576ed3005b1aaff4c2 | |
| parent | 8106f9198102dc361f32db4db5c9fb0204be4939 (diff) | |
| download | spectre-meltdown-checker-6346a0deaac94708d798f851c209a7b9ec38dd48.tar.lz spectre-meltdown-checker-6346a0deaac94708d798f851c209a7b9ec38dd48.tar.xz spectre-meltdown-checker-6346a0deaac94708d798f851c209a7b9ec38dd48.zip | |
fix: --no-color workaround for android's sed
| -rwxr-xr-x | spectre-meltdown-checker.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/spectre-meltdown-checker.sh b/spectre-meltdown-checker.sh index 6352f06..6ee4463 100755 --- a/spectre-meltdown-checker.sh +++ b/spectre-meltdown-checker.sh @@ -8,7 +8,7 @@ # # Stephane Lesimple # -VERSION='0.34' +VERSION='0.34+' show_usage() { @@ -123,7 +123,10 @@ __echo() if [ "$opt_no_color" = 1 ] ; then # strip ANSI color codes - _msg=$($echo_cmd -e "$_msg" | sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g") + # some sed versions (i.e. toybox) can't seem to handle + # \033 aka \x1B correctly, so do it for them. + _ctrlchar=$($echo_cmd -e "\033") + _msg=$($echo_cmd -e "$_msg" | sed -r "s/$_ctrlchar\[([0-9][0-9]?(;[0-9][0-9]?)?)?m//g") fi # shellcheck disable=SC2086 $echo_cmd $opt -e "$_msg" |