Changeset 7928
- Timestamp:
- 02/22/07 15:29:24 (1 year ago)
- Files:
-
- trunk/bootscripts/ChangeLog (modified) (1 diff)
- trunk/bootscripts/lfs/init.d/console (modified) (1 diff)
- trunk/bootscripts/lfs/init.d/functions (modified) (10 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/bootscripts/ChangeLog
r7911 r7928 1 2007-02-22 Dan Nicholson <dnicholson@linuxfromscratch.org> 2 * lfs/init.d/functions: In order to provide an `echo' which provides 3 handles the -e and -n options for all POSIX shells, a feature test 4 is added which stores its result in $ECHO. /bin/echo will be used 5 if the default echo is not capable. Changed the existing functions 6 to reference $ECHO when needed. 7 * lfs/init.d/console: Use $ECHO when -en is needed. 8 1 9 2007-02-03 Bryan Kadzban <bryan@linuxfromscratch.org> 2 10 * ChangeLog: Rename from CHANGELOG, start using GNU style entries. trunk/bootscripts/lfs/init.d/console
r7655 r7928 43 43 # desired mode 44 44 is_true "${UNICODE}" && 45 MODE_COMMAND=" echo-en '\033%G' && kbd_mode -u" ||46 MODE_COMMAND=" echo-en '\033%@\033(K' && kbd_mode -a"45 MODE_COMMAND="${ECHO} -en '\033%G' && kbd_mode -u" || 46 MODE_COMMAND="${ECHO} -en '\033%@\033(K' && kbd_mode -a" 47 47 48 48 # On framebuffer consoles, font has to be set for each vt in trunk/bootscripts/lfs/init.d/functions
r7446 r7928 41 41 WCOL=$((${COL} - 2)) 42 42 43 ## Set Cursor Position Commands, used via echo -e 43 ## Provide an echo that supports -e and -n 44 # If formatting is needed, $ECHO should be used 45 case "`echo -e -n test`" in 46 -[en]*) 47 ECHO=/bin/echo 48 ;; 49 *) 50 ECHO=echo 51 ;; 52 esac 53 54 ## Set Cursor Position Commands, used via $ECHO 44 55 SET_COL="\\033[${COL}G" # at the $COL char 45 56 SET_WCOL="\\033[${WCOL}G" # at the $WCOL char 46 57 CURS_UP="\\033[1A\\033[0G" # Up one line, at the 0'th char 47 58 48 ## Set color commands, used via echo -e59 ## Set color commands, used via $ECHO 49 60 # Please consult `man console_codes for more information 50 61 # under the "ECMA-48 Set Graphics Rendition" section … … 105 116 106 117 # Print the message to the screen 107 echo${ECHOPARM} -e "${2}${1}"118 ${ECHO} ${ECHOPARM} -e "${2}${1}" 108 119 109 120 } … … 118 129 { 119 130 # Left in for backwards compatibility 120 echo -n ""131 : 121 132 } 122 133 123 134 echo_ok() 124 135 { 125 echo-n -e "${CURS_UP}${SET_COL}${BRACKET}[${SUCCESS} OK ${BRACKET}]"126 echo-e "${NORMAL}"136 ${ECHO} -n -e "${CURS_UP}${SET_COL}${BRACKET}[${SUCCESS} OK ${BRACKET}]" 137 ${ECHO} -e "${NORMAL}" 127 138 boot_mesg_flush 128 139 } … … 130 141 echo_failure() 131 142 { 132 echo-n -e "${CURS_UP}${SET_COL}${BRACKET}[${FAILURE} FAIL ${BRACKET}]"133 echo-e "${NORMAL}"143 ${ECHO} -n -e "${CURS_UP}${SET_COL}${BRACKET}[${FAILURE} FAIL ${BRACKET}]" 144 ${ECHO} -e "${NORMAL}" 134 145 boot_mesg_flush 135 146 } … … 137 148 echo_warning() 138 149 { 139 echo-n -e "${CURS_UP}${SET_COL}${BRACKET}[${WARNING} WARN ${BRACKET}]"140 echo-e "${NORMAL}"150 ${ECHO} -n -e "${CURS_UP}${SET_COL}${BRACKET}[${WARNING} WARN ${BRACKET}]" 151 ${ECHO} -e "${NORMAL}" 141 152 boot_mesg_flush 142 153 } … … 210 221 case "${2}" in 211 222 running) 212 echo-e -n "${CURS_UP}"213 echo-e -n "\\033[${STRING_LENGTH}G "223 ${ECHO} -e -n "${CURS_UP}" 224 ${ECHO} -e -n "\\033[${STRING_LENGTH}G " 214 225 boot_mesg "Already running." ${WARNING} 215 226 echo_warning 216 227 ;; 217 228 not_running) 218 echo-e -n "${CURS_UP}"219 echo-e -n "\\033[${STRING_LENGTH}G "229 ${ECHO} -e -n "${CURS_UP}" 230 ${ECHO} -e -n "\\033[${STRING_LENGTH}G " 220 231 boot_mesg "Not running." ${WARNING} 221 232 echo_warning 222 233 ;; 223 234 not_available) 224 echo-e -n "${CURS_UP}"225 echo-e -n "\\033[${STRING_LENGTH}G "235 ${ECHO} -e -n "${CURS_UP}" 236 ${ECHO} -e -n "\\033[${STRING_LENGTH}G " 226 237 boot_mesg "Not available." ${WARNING} 227 238 echo_warning … … 279 290 280 291 if [ -n "${pidlist}" ]; then 281 echo-e "${INFO}${base} is running with Process"\292 ${ECHO} -e "${INFO}${base} is running with Process"\ 282 293 "ID(s) ${pidlist}.${NORMAL}" 283 294 else 284 295 if [ -n "${base}" -a -e "/var/run/${base}.pid" ]; then 285 echo-e "${WARNING}${1} is not running but"\296 ${ECHO} -e "${WARNING}${1} is not running but"\ 286 297 "/var/run/${base}.pid exists.${NORMAL}" 287 298 else 288 299 if [ -n "${PIDFILE}" -a -e "${PIDFILE}" ]; then 289 echo-e "${WARNING}${1} is not running"\300 ${ECHO} -e "${WARNING}${1} is not running"\ 290 301 "but ${PIDFILE} exists.${NORMAL}" 291 302 else 292 echo-e "${INFO}${1} is not running.${NORMAL}"303 ${ECHO} -e "${INFO}${1} is not running.${NORMAL}" 293 304 fi 294 305 fi … … 635 646 log_success_msg() 636 647 { 637 echo-n -e "${BOOTMESG_PREFIX}${@}"638 echo-e "${SET_COL}""${BRACKET}""[""${SUCCESS}"" OK ""${BRACKET}""]""${NORMAL}"648 ${ECHO} -n -e "${BOOTMESG_PREFIX}${@}" 649 ${ECHO} -e "${SET_COL}""${BRACKET}""[""${SUCCESS}"" OK ""${BRACKET}""]""${NORMAL}" 639 650 return 0 640 651 } … … 655 666 #******************************************************************************* 656 667 log_failure_msg() { 657 echo-n -e "${BOOTMESG_PREFIX}${@}"658 echo-e "${SET_COL}""${BRACKET}""[""${FAILURE}"" FAIL ""${BRACKET}""]""${NORMAL}"668 ${ECHO} -n -e "${BOOTMESG_PREFIX}${@}" 669 ${ECHO} -e "${SET_COL}""${BRACKET}""[""${FAILURE}"" FAIL ""${BRACKET}""]""${NORMAL}" 659 670 return 0 660 671 } … … 675 686 #******************************************************************************* 676 687 log_warning_msg() { 677 echo-n -e "${BOOTMESG_PREFIX}${@}"678 echo-e "${SET_COL}""${BRACKET}""[""${WARNING}"" WARN ""${BRACKET}""]""${NORMAL}"688 ${ECHO} -n -e "${BOOTMESG_PREFIX}${@}" 689 ${ECHO} -e "${SET_COL}""${BRACKET}""[""${WARNING}"" WARN ""${BRACKET}""]""${NORMAL}" 679 690 return 0 680 691 }
