As suggested by exg, include the einfon code inside einfo instead of using the FUNCNA...

svn path=/main/trunk/; revision=3607

diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 0bb4fa6d52a588f4088ef6935a96ab46ca84dd3a..94ff1c983810b7f9686c4d349b6e91f5a68eb8d6 100644 (file)
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -49,7 +49,9 @@ esyslog() {
 }
 
 einfo() {
-       einfon "$*"
+       elog_base INFO "$*"
+       [[ ${RC_ENDCOL} != "yes" && ${LAST_E_CMD} == "ebegin" ]] && echo
+       echo -e " ${GOOD}*${NORMAL} $*"
        LAST_E_CMD="einfo"
        return 0
 }
@@ -57,11 +59,7 @@ einfo() {
 einfon() {
        elog_base INFO "$*"
        [[ ${RC_ENDCOL} != "yes" && ${LAST_E_CMD} == "ebegin" ]] && echo
-       if [ "${FUNCNAME[1]}" == "einfo" ]; then
-               echo -e " ${GOOD}*${NORMAL} $*"
-       else
-               echo -ne " ${GOOD}*${NORMAL} $*"
-       fi
+       echo -ne " ${GOOD}*${NORMAL} $*"
        LAST_E_CMD="einfon"
        return 0
 }