Ticket #2646: lfs-bootscripts-20100124-no_echo-0.1.patch

lfs-bootscripts-20100124

@@ -41 +41 @@
                 # Figure out the command to set the console into the
                 # desired mode
                 is_true "${UNICODE}" &&
-                        MODE_COMMAND="${ECHO} -en '\033%G' && kbd_mode -u" ||
-                        MODE_COMMAND="${ECHO} -en '\033%@\033(K' && kbd_mode -a"
+                        MODE_COMMAND="printf %b '\033%G' && kbd_mode -u" ||
+                        MODE_COMMAND="printf %b '\033%@\033(K' && kbd_mode -a"
                 
                 # On framebuffer consoles, font has to be set for each vt in
                 # UTF-8 mode. This doesn't hurt in non-UTF-8 mode also.

lfs-bootscripts-20100124

@@ -47 +47 @@
 
                 # Print the value
                 if [ -n "$level" ]; then
-                        ${ECHO} -e "${INFO}The current console log level" \
-                                "is ${level}${NORMAL}"
+                        printf %b "${INFO}The current console log level " \
+                                "is ${level}${NORMAL}\n"
                 fi
                 ;;
 

lfs-bootscripts-20100124

@@ -40 +40 @@
 COL=$((${COLUMNS} - 8))
 WCOL=$((${COL} - 2))
 
-## Provide an echo that supports -e and -n
-# If formatting is needed, $ECHO should be used
-case "`echo -e -n test`" in
-        -[en]*)
-                ECHO=/bin/echo
-                ;;
-        *)
-                ECHO=echo
-                ;;
-esac
-
-## Set Cursor Position Commands, used via $ECHO
+## Set Cursor Position Commands, used via printf
 SET_COL="\\033[${COL}G"      # at the $COL char
 SET_WCOL="\\033[${WCOL}G"    # at the $WCOL char
 CURS_UP="\\033[1A\\033[0G"   # Up one line, at the 0'th char
 
-## Set color commands, used via $ECHO
+## Set color commands, used via printf
 # Please consult `man console_codes for more information
 # under the "ECMA-48 Set Graphics Rendition" section
 #
@@ -90 +79 @@
 #*******************************************************************************
 boot_mesg()
 {
-        local ECHOPARM=""
+        local PARM="\n"
 
         while true
         do
                 case "${1}" in
                         -n)
-                                ECHOPARM=" -n "
+                                PARM=""
                                 shift 1
                                 ;;
                         -*)
@@ -114 +103 @@
         STRING_LENGTH=$((${#1} + 1))
 
         # Print the message to the screen
-        ${ECHO} ${ECHOPARM} -e "${2}${1}"
+        printf "%b${PARM}" "${2}${1}"
         
 }
 
@@ -132 +121 @@
 
 echo_ok()
 {
-        ${ECHO} -n -e "${CURS_UP}${SET_COL}${BRACKET}[${SUCCESS}  OK  ${BRACKET}]"
-        ${ECHO} -e "${NORMAL}"
+        printf %b "${CURS_UP}${SET_COL}${BRACKET}[${SUCCESS}  OK  ${BRACKET}]"
+        printf %b\\n "${NORMAL}"
         boot_mesg_flush
 }
 
 echo_failure()
 {
-        ${ECHO} -n -e "${CURS_UP}${SET_COL}${BRACKET}[${FAILURE} FAIL ${BRACKET}]"
-        ${ECHO} -e "${NORMAL}"
+        printf %b "${CURS_UP}${SET_COL}${BRACKET}[${FAILURE} FAIL ${BRACKET}]"
+        printf %b\\n "${NORMAL}"
         boot_mesg_flush
 }
 
 echo_warning()
 {
-        ${ECHO} -n -e "${CURS_UP}${SET_COL}${BRACKET}[${WARNING} WARN ${BRACKET}]"
-        ${ECHO} -e "${NORMAL}"
+        printf %b "${CURS_UP}${SET_COL}${BRACKET}[${WARNING} WARN ${BRACKET}]"
+        printf %b\\n "${NORMAL}"
         boot_mesg_flush
 }
 
@@ -219 +208 @@
                         # may call it this way.
                         case "${2}" in
                                 running)
-                                        ${ECHO} -e -n "${CURS_UP}"
-                                        ${ECHO} -e -n "\\033[${STRING_LENGTH}G   "
+                                        printf %b "${CURS_UP}"
+                                        printf %b "\\033[${STRING_LENGTH}G   "
                                         boot_mesg "Already running." ${WARNING}
                                         echo_warning
                                         ;;
                                 not_running)
-                                        ${ECHO} -e -n "${CURS_UP}"
-                                        ${ECHO} -e -n "\\033[${STRING_LENGTH}G   "
+                                        printf %b "${CURS_UP}"
+                                        printf %b "\\033[${STRING_LENGTH}G   "
                                         boot_mesg "Not running." ${WARNING}
                                         echo_warning
                                         ;;
                                 not_available)
-                                        ${ECHO} -e -n "${CURS_UP}"
-                                        ${ECHO} -e -n "\\033[${STRING_LENGTH}G   "
+                                        printf %b "${CURS_UP}"
+                                        printf %b "\\033[${STRING_LENGTH}G   "
                                         boot_mesg "Not available." ${WARNING}
                                         echo_warning
                                         ;;
@@ -360 +349 @@
         ret=$?
 
         if [ -n "${pidlist}" ]; then
-                ${ECHO} -e "${INFO}${base} is running with Process"\
-                        "ID(s) ${pidlist}.${NORMAL}"
+                printf %b "${INFO}${base} is running with Process "\
+                        "ID(s) ${pidlist}.${NORMAL}\n"
         else
                 if [ -n "${base}" -a -e "/var/run/${base}.pid" ]; then
-                        ${ECHO} -e "${WARNING}${1} is not running but"\
-                                "/var/run/${base}.pid exists.${NORMAL}"
+                        printf %b "${WARNING}${1} is not running but "\
+                                "/var/run/${base}.pid exists.${NORMAL}\n"
                 else
                         if [ -n "${pidfile}" -a -e "${pidfile}" ]; then
-                                ${ECHO} -e "${WARNING}${1} is not running"\
-                                        "but ${pidfile} exists.${NORMAL}"
+                                printf %b "${WARNING}${1} is not running "\
+                                        "but ${pidfile} exists.${NORMAL}\n"
                         else
-                                ${ECHO} -e "${INFO}${1} is not running.${NORMAL}"
+                                printf %b "${INFO}${1} is not running.${NORMAL}\n"
                         fi
                 fi
         fi
@@ -723 +712 @@
 #*******************************************************************************
 log_success_msg()
 {
-        ${ECHO} -n -e "${BOOTMESG_PREFIX}${@}"
-        ${ECHO} -e "${SET_COL}""${BRACKET}""[""${SUCCESS}""  OK  ""${BRACKET}""]""${NORMAL}"
+        printf %b "${BOOTMESG_PREFIX}${@}"
+        printf %b\\n "${SET_COL}""${BRACKET}""[""${SUCCESS}""  OK  ""${BRACKET}""]""${NORMAL}"
         return 0
 }
 
@@ -743 +732 @@
 #
 #*******************************************************************************
 log_failure_msg() {
-        ${ECHO} -n -e "${BOOTMESG_PREFIX}${@}"
-        ${ECHO} -e "${SET_COL}""${BRACKET}""[""${FAILURE}"" FAIL ""${BRACKET}""]""${NORMAL}"
+        printf %b "${BOOTMESG_PREFIX}${@}"
+        printf %b\\n "${SET_COL}""${BRACKET}""[""${FAILURE}"" FAIL ""${BRACKET}""]""${NORMAL}"
         return 0
 }
 
@@ -763 +752 @@
 #
 #*******************************************************************************
 log_warning_msg() {
-        ${ECHO} -n -e "${BOOTMESG_PREFIX}${@}"
-        ${ECHO} -e "${SET_COL}""${BRACKET}""[""${WARNING}"" WARN ""${BRACKET}""]""${NORMAL}"
+        printf %b "${BOOTMESG_PREFIX}${@}"
+        printf %b\\n "${SET_COL}""${BRACKET}""[""${WARNING}"" WARN ""${BRACKET}""]""${NORMAL}"
         return 0
 }