diff options
| author | James Meyer <james.meyer@operamail.com> | 2011-09-01 15:06:57 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2011-09-01 15:06:57 (GMT) |
| commit | 1b9906de1e3b06d1c6442361200f8b1348c66152 (patch) | |
| tree | 82b3f7ffb1854d54f50b5cb541d981a344cffd24 /abs/core/runit-scripts/fbsplash-runit.sh | |
| parent | f53cccacbb7bed54f4cbba8021bc41b75a6e2e4e (diff) | |
| download | linhes_pkgbuild-1b9906de1e3b06d1c6442361200f8b1348c66152.zip linhes_pkgbuild-1b9906de1e3b06d1c6442361200f8b1348c66152.tar.gz linhes_pkgbuild-1b9906de1e3b06d1c6442361200f8b1348c66152.tar.bz2 | |
runit-scripts: Defined new print procedure for runit to use.
Convert some scripts to use the new printhlr procedure.
Cleanup of a couple scripts to stop spewing crap on the console.
Diffstat (limited to 'abs/core/runit-scripts/fbsplash-runit.sh')
| -rwxr-xr-x | abs/core/runit-scripts/fbsplash-runit.sh | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/abs/core/runit-scripts/fbsplash-runit.sh b/abs/core/runit-scripts/fbsplash-runit.sh index 90430dd..a9432d0 100755 --- a/abs/core/runit-scripts/fbsplash-runit.sh +++ b/abs/core/runit-scripts/fbsplash-runit.sh @@ -3,6 +3,9 @@ # Who is calling? # CALLER=$0 +printhlr() { + printf "${C_OTHER}${PREFIX_REG} ${C_H1}${1}${C_CLEAR} \n" + } # splash stuff # if [ -e /etc/conf.d/fbsplash.conf ] @@ -13,13 +16,19 @@ then # Redefine the stat functions # stat_runit() { - printf "${C_OTHER}${PREFIX_REG} ${C_MAIN}${1}${C_CLEAR} " - printf "${SAVE_POSITION}" - deltext - printf " ${C_OTHER}[${C_BUSY}BKGD${C_OTHER}]${C_CLEAR} " + # printf "${C_OTHER}${PREFIX_REG} ${C_MAIN}${1}${C_CLEAR} " + # printf "${SAVE_POSITION}" + # deltext + # printf " ${C_OTHER}[${C_BUSY}BKGD${C_OTHER}]${C_CLEAR} "a + + printf "" + printhlr "${C_MAIN}${1}${C_CLEAR} " + # Load variables # + var_load STEP_NR MAX_STEPS RC_MULTI RC_SYSINIT RC_SHUTDOWN # Only update the splash progress if we're in sysinit, multi, or shutdown. # + ((SPLASH_STEP_NR++)) SPLASH_PROGRESS=$((100*${SPLASH_STEP_NR}/${SPLASH_MAX_STEPS})) SPLASH_CURRENT_PROGRESS=${SPLASH_PROGRESS} @@ -29,10 +38,7 @@ then } else stat_runit(){ - - printf "${C_OTHER}${PREFIX_REG} ${C_MAIN}${1}${C_CLEAR} " - printf "${SAVE_POSITION}" - deltext - printf " ${C_OTHER}[${C_BUSY}BKGD${C_OTHER}]${C_CLEAR} " + printf "" + printhlr "${C_MAIN}${1}${C_CLEAR} " } fi |