diff options
| author | James Mills <prologic@shortcircuit.net.au> | 2020-03-26 09:44:08 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-26 09:44:08 +1000 |
| commit | 7cdb949d299b841d213aa682e6428a67380d12fd (patch) | |
| tree | 450ddafed37bea6f7a9f22053d9d9285f35885a7 /packaging/installer | |
| parent | e6c7dfa950325fea0561c23a220895cdde5ffcd9 (diff) | |
Fix erroneous \n printed in uninstaller (#8446)
* Fix erroneous \n printed in uninstaller
* Fixed shellcheck errors
Diffstat (limited to 'packaging/installer')
| -rwxr-xr-x | packaging/installer/netdata-uninstaller.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/packaging/installer/netdata-uninstaller.sh b/packaging/installer/netdata-uninstaller.sh index f39a686d8e..e92520dbac 100755 --- a/packaging/installer/netdata-uninstaller.sh +++ b/packaging/installer/netdata-uninstaller.sh @@ -119,11 +119,11 @@ setup_terminal() { setup_terminal || echo > /dev/null run_ok() { - printf >&2 "%s OK %s %s \n\n" "${TPUT_BGGREEN}${TPUT_WHITE}${TPUT_BOLD}" "${TPUT_RESET}" "${*}" + printf >&2 "%s OK %s\n\n" "${TPUT_BGGREEN}${TPUT_WHITE}${TPUT_BOLD}" "${TPUT_RESET}" } run_failed() { - printf >&2 "%s FAILED %s %s \n\n" "${TPUT_BGRED}${TPUT_WHITE}${TPUT_BOLD}" "${TPUT_RESET}" "${*}" + printf >&2 "%s FAILED %s\n\n" "${TPUT_BGRED}${TPUT_WHITE}${TPUT_BOLD}" "${TPUT_RESET}" } ESCAPED_PRINT_METHOD= @@ -159,16 +159,16 @@ run() { printf "%s" "${info_console}${TPUT_BOLD}${TPUT_YELLOW}" >&2 escaped_print >&2 "${@}" - printf "%s" "${TPUT_RESET}\n" >&2 + printf "%s\n" "${TPUT_RESET}" >&2 "${@}" local ret=$? if [ ${ret} -ne 0 ]; then - run_failed "${*}" + run_failed printf >> "${run_logfile}" "FAILED with exit code %s\n" "${ret}" else - run_ok "${*}" + run_ok printf >> "${run_logfile}" "OK\n" fi @@ -187,7 +187,7 @@ portable_del_group() { run groupdel "${groupname}" && return 0 else echo >&2 "Group ${groupname} already removed in a previous step." - run_ok "${*}" + run_ok fi fi |