|
Lines 26-32
Link Here
|
| 26 |
|
26 |
|
| 27 |
elog() { |
27 |
elog() { |
| 28 |
elog_base LOG "$*" |
28 |
elog_base LOG "$*" |
| 29 |
echo -e " ${GOOD}*${NORMAL} $*" |
29 |
echo -e " ${GOOD}*${NORMAL} $*" >&2 |
| 30 |
return 0 |
30 |
return 0 |
| 31 |
} |
31 |
} |
| 32 |
|
32 |
|
|
Lines 56-79
Link Here
|
| 56 |
|
56 |
|
| 57 |
einfon() { |
57 |
einfon() { |
| 58 |
elog_base INFO "$*" |
58 |
elog_base INFO "$*" |
| 59 |
[[ ${RC_ENDCOL} != "yes" && ${LAST_E_CMD} == "ebegin" ]] && echo |
59 |
[[ ${RC_ENDCOL} != "yes" && ${LAST_E_CMD} == "ebegin" ]] && echo >&2 |
| 60 |
echo -ne " ${GOOD}*${NORMAL} $*" |
60 |
echo -ne " ${GOOD}*${NORMAL} $*" >&2 |
| 61 |
LAST_E_CMD="einfon" |
61 |
LAST_E_CMD="einfon" |
| 62 |
return 0 |
62 |
return 0 |
| 63 |
} |
63 |
} |
| 64 |
|
64 |
|
| 65 |
ewarn() { |
65 |
ewarn() { |
| 66 |
elog_base WARN "$*" |
66 |
elog_base WARN "$*" |
| 67 |
[[ ${RC_ENDCOL} != "yes" && ${LAST_E_CMD} == "ebegin" ]] && echo |
67 |
[[ ${RC_ENDCOL} != "yes" && ${LAST_E_CMD} == "ebegin" ]] && echo >&2 |
| 68 |
echo -e " ${WARN}*${NORMAL} ${RC_INDENTATION}$*" |
68 |
echo -e " ${WARN}*${NORMAL} ${RC_INDENTATION}$*" >&2 |
| 69 |
LAST_E_CMD="ewarn" |
69 |
LAST_E_CMD="ewarn" |
| 70 |
return 0 |
70 |
return 0 |
| 71 |
} |
71 |
} |
| 72 |
|
72 |
|
| 73 |
eerror() { |
73 |
eerror() { |
| 74 |
elog_base ERROR "$*" |
74 |
elog_base ERROR "$*" |
| 75 |
[[ ${RC_ENDCOL} != "yes" && ${LAST_E_CMD} == "ebegin" ]] && echo |
75 |
[[ ${RC_ENDCOL} != "yes" && ${LAST_E_CMD} == "ebegin" ]] && echo >&2 |
| 76 |
echo -e " ${BAD}*${NORMAL} ${RC_INDENTATION}$*" |
76 |
echo -e " ${BAD}*${NORMAL} ${RC_INDENTATION}$*" >&2 |
| 77 |
LAST_E_CMD="eerror" |
77 |
LAST_E_CMD="eerror" |
| 78 |
return 0 |
78 |
return 0 |
| 79 |
} |
79 |
} |
|
Lines 88-94
Link Here
|
| 88 |
msg="${msg} ..." |
88 |
msg="${msg} ..." |
| 89 |
fi |
89 |
fi |
| 90 |
einfon "${msg}" |
90 |
einfon "${msg}" |
| 91 |
[[ ${RC_ENDCOL} == "yes" ]] && echo |
91 |
[[ ${RC_ENDCOL} == "yes" ]] && echo >&2 |
| 92 |
LAST_E_LEN=$(( 3 + ${#RC_INDENTATION} + ${#msg} )) |
92 |
LAST_E_LEN=$(( 3 + ${#RC_INDENTATION} + ${#msg} )) |
| 93 |
LAST_E_CMD="ebegin" |
93 |
LAST_E_CMD="ebegin" |
| 94 |
return 0 |
94 |
return 0 |
|
Lines 108-117
Link Here
|
| 108 |
fi |
108 |
fi |
| 109 |
|
109 |
|
| 110 |
if [[ ${RC_ENDCOL} == "yes" ]] ; then |
110 |
if [[ ${RC_ENDCOL} == "yes" ]] ; then |
| 111 |
echo -e "${ENDCOL} ${msg}" |
111 |
echo -e "${ENDCOL} ${msg}" >&2 |
| 112 |
else |
112 |
else |
| 113 |
[[ ${LAST_E_CMD} == ebegin ]] || LAST_E_LEN=0 |
113 |
[[ ${LAST_E_CMD} == ebegin ]] || LAST_E_LEN=0 |
| 114 |
printf "%$(( COLS - LAST_E_LEN - 6 ))s%b\n" '' "${msg}" |
114 |
printf "%$(( COLS - LAST_E_LEN - 6 ))s%b\n" '' "${msg}" >&2 |
| 115 |
fi |
115 |
fi |
| 116 |
|
116 |
|
| 117 |
return ${retval} |
117 |
return ${retval} |
