From ac4888711b0e9aacf16c8893df9ec4eedaef409c Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Fri, 23 Nov 2007 19:04:45 +0000
Subject: zaurus-updater: have consistent error messages

---
 packages/zaurus-updater/zaurus-updater.bb         |  2 +-
 packages/zaurus-updater/zaurus-updater/updater.sh | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'packages/zaurus-updater')

diff --git a/packages/zaurus-updater/zaurus-updater.bb b/packages/zaurus-updater/zaurus-updater.bb
index 35ad16064c..8aa86b645a 100644
--- a/packages/zaurus-updater/zaurus-updater.bb
+++ b/packages/zaurus-updater/zaurus-updater.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Encrypted shellscript for the Zaurus ROM update"
 DEPENDS = "encdec-updater-native"
 LICENSE = "zaurus-updater"
-PR = "r11"
+PR = "r12"
 
 PACKAGES = ""
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/packages/zaurus-updater/zaurus-updater/updater.sh b/packages/zaurus-updater/zaurus-updater/updater.sh
index 703a1fb457..2c99a44e39 100644
--- a/packages/zaurus-updater/zaurus-updater/updater.sh
+++ b/packages/zaurus-updater/zaurus-updater/updater.sh
@@ -20,6 +20,8 @@
 # - size check unbreak
 # - c760/c860 has bigger rootfs - use it
 #
+# 2007.11.23 Koen Kooi
+# - consistent error messages
 
 DATAPATH=$1
 TMPPATH=/tmp/update
@@ -72,7 +74,7 @@ check_for_hdd()
 {
     IDE1=`get_dev_pcmcia_slot 1`
     if [ "$IDE1" = "" ]; then
-        echo "Error!! There is no microdrive. Retrying..."
+        echo "Error: There is no microdrive. Retrying..."
         while [ "$IDE1" = "" ]; do
             IDE1=`get_dev_pcmcia_slot 1`
         done
@@ -95,7 +97,7 @@ check_for_tar()
     done
 
     if [ ! -e $TARBIN ]; then
-        echo 'ERRROR: Please place a valid copy of tar as "gnu-tar" on your card.'
+        echo 'Error: Please place a valid copy of tar as "gnu-tar" on your card.'
         echo 'Please reset'
         while true
         do
@@ -114,13 +116,13 @@ do_rootfs_extraction()
     mke2fs $MKE2FSOPT /dev/${IDE1}1 > /dev/null 2>&1
     e2fsck -p /dev/${IDE1}1 > /dev/null
     if [ "$?" != "0" ]; then
-        echo "ERROR: Unable to create filesystem on microdrive!"
+        echo "Error Unable to create filesystem on microdrive!"
         exit "$?"
     fi
 
     mount -t $LINUXFMT -o noatime /dev/${IDE1}1 /hdd1
     if [ "$?" != "0" ]; then
-        echo "ERROR: Unable to mount microdrive!"
+        echo "Error: Unable to mount microdrive!"
         exit "$?"
     fi
 
@@ -128,7 +130,7 @@ do_rootfs_extraction()
     echo 'Now extracting...'
     gzip -dc $DATAPATH/$TARGETFILE | $TARBIN xf -
     if [ "$?" != "0" ]; then
-        echo "ERROR: Unable to extract root filesystem archive!"
+        echo "Error: Unable to extract root filesystem archive!"
         exit "$?"
     fi
 
@@ -144,7 +146,7 @@ do_flashing()
 {
     if [ $DATASIZE -gt `printf "%d" $MTD_PART_SIZE` ]
     then
-        echo "ERROR: File is too big to flash!"
+        echo "Error: File is too big to flash!"
         return
     fi
 
@@ -197,7 +199,7 @@ do_flashing()
 		then
 			next_addr=`/sbin/nandcp -a $ADDR $TMPDATA $TARGET_MTD  2>/dev/null | fgrep "mtd address" | cut -d- -f2 | cut -d\( -f1`
 			if [ "$next_addr" = "" ]; then
-				echo "ERROR: flash write"
+				echo "Error: flash write"
 				rm $TMPDATA > /dev/null 2>&1
 				RESULT=3
 				break;
-- 
cgit v1.2.3