From 4b9fde09bed07abc8eba6cc1de330359c8e10a7b Mon Sep 17 00:00:00 2001 From: "rhelmer%mozilla.com" Date: Tue, 1 Aug 2006 21:25:14 +0000 Subject: [PATCH] print errors to both stderr and stdout git-svn-id: svn://10.0.0.236/trunk@206335 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/testing/release/common/download_mars.sh | 14 +++++++------- mozilla/testing/release/updates/verify_update.sh | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/mozilla/testing/release/common/download_mars.sh b/mozilla/testing/release/common/download_mars.sh index 7f07f681223..ff570fd3978 100644 --- a/mozilla/testing/release/common/download_mars.sh +++ b/mozilla/testing/release/common/download_mars.sh @@ -15,7 +15,7 @@ download_mars () { grep_rv=$? if [ 0 -ne $grep_rv ]; then - echo "FAIL: no $patch_type update found for $update_url" > /dev/stderr + echo "FAIL: no $patch_type update found for $update_url" | tee /dev/stderr return 1 fi @@ -31,16 +31,16 @@ download_mars () { actual_hash=`openssl dgst -$hashFunction update/$patch_type.mar | sed -e 's/^.*= //'` if [ $actual_size != $size ]; then - echo "FAIL: $patch_type from $update_url wrong size" > /dev/stderr - echo "FAIL: update.xml size: $size" > /dev/stderr - echo "FAIL: actual size: $actual_size" > /dev/stderr + echo "FAIL: $patch_type from $update_url wrong size" |tee /dev/stderr + echo "FAIL: update.xml size: $size" |tee /dev/stderr + echo "FAIL: actual size: $actual_size" |tee /dev/stderr return 1 fi if [ $actual_hash != $hashValue ]; then - echo "FAIL: $patch_type from $update_url wrong hash" > /dev/stderr - echo "FAIL: update.xml hash: $hashValue" > /dev/stderr - echo "FAIL: actual hash: $actual_hash" > /dev/stderr + echo "FAIL: $patch_type from $update_url wrong hash" |tee /dev/stderr + echo "FAIL: update.xml hash: $hashValue" |tee /dev/stderr + echo "FAIL: actual hash: $actual_hash" |tee /dev/stderr return 1 fi diff --git a/mozilla/testing/release/updates/verify_update.sh b/mozilla/testing/release/updates/verify_update.sh index b2f51790ba4..9fa0bc851f6 100755 --- a/mozilla/testing/release/updates/verify_update.sh +++ b/mozilla/testing/release/updates/verify_update.sh @@ -22,12 +22,12 @@ check_update () { unpack_build $platform source "$source_package" if [ "$?" != "0" ]; then - echo "FAILED: cannot unpack_build $platform source $source_package" > /dev/stderr + echo "FAILED: cannot unpack_build $platform source $source_package" |tee /dev/stderr return 1 fi unpack_build $platform target "$target_package" if [ "$?" != "0" ]; then - echo "FAILED: cannot unpack_build $platform target $target_package" > /dev/stderr + echo "FAILED: cannot unpack_build $platform target $target_package" |tee /dev/stderr return 1 fi @@ -48,7 +48,7 @@ check_update () { $HOME/bin/updater ../../update 0 cd ../.. else - echo "FAIL: no dir in source/$platform_dirname" > /dev/stderr + echo "FAIL: no dir in source/$platform_dirname" |tee /dev/stderr return 1 fi @@ -110,7 +110,7 @@ do wget -nv $PARAMS "$build_url" 2>&1 popd > /dev/null if [ $? != 0 ]; then - echo "FAIL: Could not download source $source_file from $build_url" > /dev/stderr + echo "FAIL: Could not download source $source_file from $build_url" |tee /dev/stderr echo "skipping.." continue fi @@ -126,13 +126,13 @@ do wget -nv $PARAMS "$build_url" 2>&1 popd > /dev/null if [ $? != 0 ]; then - echo "FAIL: Could not download target $target_file from $build_url" > /dev/stderr + echo "FAIL: Could not download target $target_file from $build_url" |tee /dev/stderr echo "skipping.." continue fi check_update "$source_build_platform" "downloads/$source_file" "downloads/$target_file" if [ "$?" != "0" ]; then - echo "FAIL: check_update returned non-zero exit code: $?" > /dev/stderr + echo "FAIL: check_update returned non-zero exit code: $?" |tee /dev/stderr continue fi done