diff options
| -rwxr-xr-x | contrib/logging.hook | 1 | ||||
| -rw-r--r-- | src/globals | 13 | ||||
| -rw-r--r-- | src/hooks/arch | 1 |
3 files changed, 10 insertions, 5 deletions
diff --git a/contrib/logging.hook b/contrib/logging.hook index b314dd1..8a9f75f 100755 --- a/contrib/logging.hook +++ b/contrib/logging.hook @@ -82,6 +82,7 @@ function report_fail { function report_success { if [[ -n "$*" ]]; then stat_append "- $*" + REPORT_TRYING= fi report_log notice "${*:-succeeded}" stat_done diff --git a/src/globals b/src/globals index 318c9d9..c55d038 100644 --- a/src/globals +++ b/src/globals @@ -1,5 +1,4 @@ - -# /etc/network.d/hooks directory +# /usr/lin/networks/globals # # any +x files in /usr/lib/network/hooks and /etc/network.d/hooks # will be sourced when this file is. @@ -48,14 +47,16 @@ function report_debug { } function report_try { - echo ":: $*" + # JP: this needs -n option + echo -n ":: $*" REPORT_TRYING=1 } function report_fail { if [[ -n "$*" ]]; then if [[ -n "$REPORT_TRYING" ]]; then - echo "- $*" + # JP: this needs -n option + echo -n "- $*" REPORT_TRYING= echo "[fail]" else @@ -69,7 +70,9 @@ function report_fail { function report_success { if [[ -n "$*" ]]; then - echo "- $*" + # JP: this needs -n option + echo -n "- $*" + REPORT_TRYING= fi echo "[done]" } diff --git a/src/hooks/arch b/src/hooks/arch index 6bf6a41..5dc7168 100644 --- a/src/hooks/arch +++ b/src/hooks/arch @@ -34,6 +34,7 @@ function report_fail { function report_success { if [[ -n "$*" ]]; then stat_append "- $*" + REPORT_TRYING= fi stat_done } |