diff options
Diffstat (limited to 'scripts/live-functions')
| -rw-r--r-- | scripts/live-functions | 37 |
1 files changed, 22 insertions, 15 deletions
diff --git a/scripts/live-functions b/scripts/live-functions index 7100603..baa920c 100644 --- a/scripts/live-functions +++ b/scripts/live-functions @@ -1,35 +1,42 @@ +#!/bin/sh . /scripts/functions . /live.vars -# Override this so we don't call PROGRESS -log_end_msg() +log_end_msg () { - if [ -x /sbin/usplash_write ]; then + # Override this so we don't call PROGRESS + if [ -x /sbin/usplash_write ] + then /sbin/usplash_write "SUCCESS ok" fi + _log_msg "Done." } -# Print a message and wait for enter -log_wait_msg() +log_wait_msg () { - if [ -x /sbin/usplash_write ]; then + # Print a message and wait for enter + if [ -x /sbin/usplash_write ] + then /sbin/usplash_write "INPUTENTER $@" read nunya < /dev/.initramfs/usplash_outfifo fi + _log_msg "Waiting: $@ ..." } really_export () { - STRING="${1}" - VALUE="$(eval echo -n \${$STRING})" - - if [ -f /live.vars ] && cat /live.vars | grep -sq "export ${STRING}" ; then - sed -i -e 's/\('${STRING}'=\).*$/\1'${VALUE}'/' /live.vars - else - echo "export ${STRING}=\"${VALUE}\"" >> /live.vars - fi - eval export "${STRING}"="${VALUE}" + STRING="${1}" + VALUE="$(eval echo -n \${$STRING})" + + if [ -f /live.vars ] && cat /live.vars | grep -sq "export ${STRING}" + then + sed -i -e 's/\('${STRING}'=\).*$/\1'${VALUE}'/' /live.vars + else + echo "export ${STRING}=\"${VALUE}\"" >> /live.vars + fi + + eval export "${STRING}"="${VALUE}" } |