Changeset 3e86bb0 in freewrt

Timestamp:

Jul 3, 2007, 12:25:03 PM (18 years ago)

Author:

Christian Fischer <spaetzle@…>

Children:

9ecaaad

Parents:

e495198

Message:

prevents from entering format code into the messages

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@3099 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

package/fwifupdown

Files:

• Makefile (modified) (1 diff)
• files/mfunctions.sh (modified) (5 diffs)

package/fwifupdown/Makefile

@@ -9 +9 @@
 PKG_NAME:=                      fwifupdown
 PKG_VERSION:=                   0.2
-PKG_RELEASE:=                   30
+PKG_RELEASE:=                   31
 PKG_SRC_ROOT:=                  ${TOPDIR}/package/${PKG_NAME}
 PKG_CONFIG_WORKDIR:=            etc/network

package/fwifupdown/files/mfunctions.sh

@@ -26 +26 @@
 
 mprint() {
-        local msg logmsg color
+        local msg logmsg color le="\n"
         case $1 in
         -n)
@@ -33 +33 @@
                         msg="${FIRSTCOL}${MP_GOOD}${STARTCOL}${*}" || \
                         msg="${FIRSTCOL}${STARTCOL}${*}"
+                le=
                 logmsg="$*"
                 ;;
@@ -38 +39 @@
                 shift
                 config $FWIFUPDOWN_FANCY && \
-                        msg="${FIRSTCOL}${MP_GOOD}${STARTCOL}${*} ...\n" || \
-                        msg="${FIRSTCOL}${STARTCOL}${*} ...\n"
+                        msg="${FIRSTCOL}${MP_GOOD}${STARTCOL}${*} ..." || \
+                        msg="${FIRSTCOL}${STARTCOL}${*} ..."
                 logmsg=
                 ;;
@@ -47 +48 @@
                 0)
                         config $FWIFUPDOWN_FANCY && \
-                                msg="${FIRSTCOL}${MP_GOOD}${ME_GOOD}\n" || \
-                                msg="${MP_NONE}ok\n"
+                                msg="${FIRSTCOL}${MP_GOOD}${ME_GOOD}" || \
+                                msg="${MP_NONE}ok"
                         logmsg="ok"
                         ;;
                 *)
                         config $FWIFUPDOWN_FANCY && \
-                                msg="${FIRSTCOL}${MP_BAD}${ME_BAD}\n" || \
-                                msg="${MP_NONE}!!\n"
+                                msg="${FIRSTCOL}${MP_BAD}${ME_BAD}" || \
+                                msg="${MP_NONE}!!"
                         logmsg="!!"
                         ;;
@@ -68 +69 @@
                 shift
                 config $FWIFUPDOWN_FANCY && \
-                        msg="${FIRSTCOL}${MP_NONE}${STARTCOL}${color}${*}${NORMAL}\n" || \
-                        msg="${FIRSTCOL}${STARTCOL}${*}\n"
+                        msg="${FIRSTCOL}${MP_NONE}${STARTCOL}${color}${*}${NORMAL}" || \
+                        msg="${FIRSTCOL}${STARTCOL}${*}"
                 logmsg="$*"
                 ;;
         esac
 
-        config $FWIFUPDOWN_PRINTING_OFF || printf "${msg}"
+        config $FWIFUPDOWN_PRINTING_OFF || printf "%s$le" "$msg"
         mlogger $logmsg
 }