Bug 393036, re-unpack ab-CD.xpi when doing update verification with 1.5.0.x win32 installers, r=rhelmer

This commit is contained in:
nrthomas@gmail.com 2007-08-22 10:23:59 -07:00
Родитель 3c881cb74e
Коммит 2d804d85f3
3 изменённых файлов: 6 добавлений и 3 удалений

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

@ -3,17 +3,18 @@ check_updates () {
update_platform=$1 update_platform=$1
source_package=$2 source_package=$2
target_package=$3 target_package=$3
locale=$4
# cleanup # cleanup
rm -rf source/* rm -rf source/*
rm -rf target/* rm -rf target/*
unpack_build $update_platform source "$source_package" unpack_build $update_platform source "$source_package" $locale
if [ "$?" != "0" ]; then if [ "$?" != "0" ]; then
echo "FAILED: cannot unpack_build $update_platform source $source_package" echo "FAILED: cannot unpack_build $update_platform source $source_package"
return 1 return 1
fi fi
unpack_build $update_platform target "$target_package" unpack_build $update_platform target "$target_package" $locale
if [ "$?" != "0" ]; then if [ "$?" != "0" ]; then
echo "FAILED: cannot unpack_build $update_platform target $target_package" echo "FAILED: cannot unpack_build $update_platform target $target_package"
return 1 return 1

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

@ -3,6 +3,7 @@ unpack_build () {
unpack_platform="$1" unpack_platform="$1"
dir_name="$2" dir_name="$2"
pkg_file="$3" pkg_file="$3"
locale=$4
mkdir -p $dir_name mkdir -p $dir_name
pushd $dir_name > /dev/null pushd $dir_name > /dev/null
@ -29,6 +30,7 @@ unpack_build () {
do do
unzip -o $file > /dev/null unzip -o $file > /dev/null
done done
unzip -o ${locale}.xpi > /dev/null
fi fi
;; ;;
linux-i686|linux|Linux_x86-gcc|Linux_x86-gcc3) linux-i686|linux|Linux_x86-gcc|Linux_x86-gcc3)

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

@ -128,7 +128,7 @@ do
fi fi
source_file=`basename "$from_path"` source_file=`basename "$from_path"`
target_file=`basename "$to_path"` target_file=`basename "$to_path"`
check_updates "$platform" "downloads/$source_file" "downloads/$target_file" check_updates "$platform" "downloads/$source_file" "downloads/$target_file" $locale
err=$? err=$?
if [ "$err" != "0" ]; then if [ "$err" != "0" ]; then
echo "WARN: check_update returned non-zero exit code for $platform downloads/$source_file vs. downloads/$target_file: $err" echo "WARN: check_update returned non-zero exit code for $platform downloads/$source_file vs. downloads/$target_file: $err"