From 7fab9eaf848004fd742e0513d620ced9ee7667a2 Mon Sep 17 00:00:00 2001
From: Jouke Witteveen <j.witteveen@gmail.com>
Date: Wed, 11 Apr 2012 02:07:20 +0200
Subject: Rewrite output hook to not depend on initscripts

/etc/rc.d/functions is owned by initscripts on which netcfg does not explicitly depend.
The revised layout is inspired by systemd.
---
 src/hooks/arch  | 42 -----------------------------
 src/hooks/fancy | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+), 42 deletions(-)
 delete mode 100644 src/hooks/arch
 create mode 100755 src/hooks/fancy

(limited to 'src/hooks')

diff --git a/src/hooks/arch b/src/hooks/arch
deleted file mode 100644
index c5d0587..0000000
--- a/src/hooks/arch
+++ /dev/null
@@ -1,42 +0,0 @@
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-### Logging/Error reporting for Arch Linux
-
-function report_err {
-    printhl "$*"
-}
-
-function report_warn {
-    printhl "$*"
-}
-
-function report_try {
-    stat_busy "$*"
-    REPORT_TRYING=1
-}
-
-function report_fail {
-    if [[ -n "$*" ]]; then
-        if [[ -n "$REPORT_TRYING" ]]; then
-            stat_append "- $*"
-            REPORT_TRYING=
-            stat_fail
-        else
-            printhl "$*"
-        fi
-    elif [[ -n "$REPORT_TRYING" ]]; then
-        REPORT_TRYING=
-        stat_fail
-    fi
-}
-
-function report_success {
-    if [[ -n "$*" ]]; then
-        stat_append "- $*"
-        REPORT_TRYING=
-    fi
-    stat_done
-}
-
-# vim: ft=sh ts=4 et sw=4:
diff --git a/src/hooks/fancy b/src/hooks/fancy
new file mode 100755
index 0000000..f0ad3bb
--- /dev/null
+++ b/src/hooks/fancy
@@ -0,0 +1,84 @@
+# Fancy output is for terminal output only.
+[[ -t 1 ]] || return
+
+
+### Fancy Logging/Error reporting
+
+function report_err {
+    print_prefixed "${C_PREFIX}" "${C_HIGHLIGHT}$*"
+}
+
+function report_notice {
+    print_prefixed "${C_PREFIX}" "$*"
+}
+
+function report_try {
+    printf "${C_PREFIX}${PREFIX_BUSY}${C_NORMAL} %s " "$*"
+    report_status " BUSY " "${C_BUSY}"
+    REPORT_TRYING=1
+}
+
+function report_fail {
+    if [[ -n "$*" ]]; then
+        if [[ -n "$REPORT_TRYING" ]]; then
+            report_append "$*"
+            report_status "FAILED" "${C_FAILED}" $'\n'
+            REPORT_TRYING=
+        else
+            print_prefixed "${C_FAILED}" "${C_HIGHLIGHT}$*"
+        fi
+    elif [[ -n "$REPORT_TRYING" ]]; then
+        report_status "FAILED" "${C_FAILED}" $'\n'
+        REPORT_TRYING=
+    fi
+}
+
+function report_success {
+    if [[ -n "$*" ]]; then
+        if [[ -n "$REPORT_TRYING" ]]; then
+            report_append "$*"
+            report_status " DONE " "${C_DONE}" $'\n'
+            REPORT_TRYING=
+        else
+            print_prefixed "${C_DONE}" "$*"
+        fi
+    elif [[ -n "$REPORT_TRYING" ]]; then
+        report_status " DONE " "${C_DONE}" $'\n'
+        REPORT_TRYING=
+    fi
+}
+
+function report_append {
+    printf -- "${RESTORE_POSITION}${C_PREFIX}-${C_NORMAL} %s " "$*"
+}
+
+function report_status {
+    local status=$1 color=$2
+    shift 2
+    printf "${CURSOR_STATUS} [${color}%s${C_NORMAL}] %s" "$status" "$*"
+}
+
+function print_prefixed {
+    local c_prefix=$1
+    shift
+    printf "${c_prefix}${PREFIX_ATTENTION}${C_NORMAL} %s${C_NORMAL}\n" "$*"
+}
+
+
+SAVE_POSITION=$(tput sc)
+RESTORE_POSITION=$(tput rc)
+COLUMNS=$(tput cols)
+(( COLUMNS == 0 )) && COLUMNS=80
+CURSOR_STATUS=${SAVE_POSITION}$(tput hpa $(( COLUMNS - 10 )) )
+
+C_NORMAL=$(tput sgr0)
+C_HIGHLIGHT=${C_NORMAL}$(tput bold)
+C_PREFIX=${C_HIGHLIGHT}$(tput setaf 4) # blue
+C_BUSY=${C_NORMAL}$(tput setaf 6)      # cyan
+C_FAILED=${C_HIGHLIGHT}$(tput setaf 1) # red
+C_DONE=${C_HIGHLIGHT}$(tput setaf 2)   # green
+
+PREFIX_BUSY="::"
+PREFIX_ATTENTION=" >"
+
+# vim: ft=sh ts=4 et sw=4:
-- 
cgit v1.2.3-24-g4f1b