Adjust look'n'feel of testcd and improve error handling as well

[grml-autoconfig.git] / autoconfig.functions

diff --git a/autoconfig.functions b/autoconfig.functions
index c6ab133..9315172 100755 (executable)
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -597,19 +597,19 @@ if [ -n "$TESTCD" ]; then
    [ -d /live/image/GRML ] && TESTCD_PATH=/live/image/GRML
 
    if [ -n "$TESTCD_PATH" ] ; then
-      ( cd "$TESTCD_PATH" ; rm -f /tmp/md5sum.log ; md5sum -c md5sums 2>&1 | tee /tmp/md5sum.log )
+      ( cd "$TESTCD_PATH" ; rm -f /tmp/md5sum.log ; md5sum -c md5sums 2>&1 | tee /tmp/md5sum.log ; RC=$? )
    else
       echo "${RED} *** Error: Could not find md5sum file.                           ***"
    fi
 
-   if [ "$?" = "0" ]; then
-     echo " ${GREEN}Everything looks OK${NORMAL}"
-     else
-     echo "${RED} *** CHECKSUM FAILED FOR THESE FILES:                          ***"
-     egrep -v '(^md5sum:|OK$)' /tmp/md5sum.log
-     echo "${RED} *** DATA ON YOUR CD MEDIUM IS POSSIBLY INCOMPLETE OR DAMAGED, ***${NORMAL}"
-     echo "${RED} *** OR YOUR COMPUTER HAS BAD RAM.                             ***${NORMAL}"
-     echo -n "${CYAN}Hit return to contine, or press the reset button to quit.${NORMAL}"
+   if [ "$RC" = "0" ]; then
+      einfo "Everything looks OK" ; eend 0
+   else
+      eerror 'Checksum failed for theses files:' ; eend 1
+      egrep -v '(^md5sum:|OK$)' /tmp/md5sum.log
+      eerror 'Data on the grml medium is possibly incomplete/damaged or...'
+      eerror '... RAM of your computer is broken.' ; eend 1
+      einfon "Hit return to continue, or press the reset button to quit."
      read a
    fi
 
@@ -751,7 +751,7 @@ if [ -d /proc/acpi ]; then
     if ! [ -S /var/run/acpid.socket ] ; then
       if ! [ -r /var/run/dbus/pid ] ; then
         einfo "Starting acpi daemon."
-        /etc/init.d/acpid start 2>&1 1>>$DEBUG | logger ; eend $?
+        /etc/init.d/acpid start 1>>$DEBUG 2>&1 ; eend $?
       else
         eerror "acpid error: it seems you are running d-bus/hal, but acpid needs to be started before d-bus."
         eerror "Solution: please activate acpid via /etc/runlevel.conf"