print errors to both stderr and stdout

This commit is contained in:
rhelmer%mozilla.com 2006-08-01 21:25:14 +00:00
Родитель 920d41e97c
Коммит 9d45afbb2b
2 изменённых файлов: 13 добавлений и 13 удалений

Просмотреть файл

@ -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

Просмотреть файл

@ -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