Index: common.sh =================================================================== RCS file: /cvsroot/mozilla/tools/update-packaging/common.sh,v retrieving revision 1.9 diff -u -8 -p -r1.9 common.sh --- common.sh 29 Mar 2007 14:11:40 -0000 1.9 +++ common.sh 16 Apr 2007 13:21:37 -0000 @@ -96,16 +96,17 @@ append_remove_instructions() { # generated MAR files (see bug 306077). Pass a variable name and it will be # filled as an array. list_files() { count=0 find . -type f \ ! -name "channel-prefs.js" \ ! -name "update.manifest" \ + ! -name "temp-filelist" \ | sed 's/\.\/\(.*\)/\1/' \ - | sort > "$workdir/temp-filelist" + | sort > "temp-filelist" while read file; do eval "${1}[$count]=\"$file\"" (( count++ )) - done < "$workdir/temp-filelist" - rm "$workdir/temp-filelist" + done < "temp-filelist" + rm "temp-filelist" } Index: make_incremental_update.sh =================================================================== RCS file: /cvsroot/mozilla/tools/update-packaging/make_incremental_update.sh,v retrieving revision 1.11 diff -u -8 -p -r1.11 make_incremental_update.sh --- make_incremental_update.sh 29 Mar 2007 14:11:40 -0000 1.11 +++ make_incremental_update.sh 16 Apr 2007 13:21:37 -0000 @@ -145,17 +145,17 @@ done # Now, we just need to worry about newly added files num_newfiles=${#newfiles[*]} for ((i=0; $i<$num_newfiles; i=$i+1)); do f="${newfiles[$i]}" # If we've already tested this file, then skip it for ((j=0; $j<$num_oldfiles; j=$j+1)); do - if [ "\"$f\"" = "${oldfiles[j]}" ]; then + if [ "$f" = "${oldfiles[j]}" ]; then continue 2 fi done dir=$(dirname "$workdir/$f") mkdir -p "$dir" $BZIP2 -cz9 "$newdir/$f" > "$workdir/$f"