2005-06-09 05:29:17 +04:00
|
|
|
#!/bin/bash
|
|
|
|
#
|
|
|
|
# This tool generates incremental update packages for the update system.
|
|
|
|
# Author: Darin Fisher
|
|
|
|
#
|
|
|
|
|
2005-09-22 22:18:27 +04:00
|
|
|
. $(dirname "$0")/common.sh
|
2005-06-09 05:29:17 +04:00
|
|
|
|
|
|
|
# -----------------------------------------------------------------------------
|
|
|
|
|
|
|
|
print_usage() {
|
2005-09-22 22:18:27 +04:00
|
|
|
notice "Usage: $(basename $0) [OPTIONS] ARCHIVE FROMDIR TODIR"
|
|
|
|
notice ""
|
|
|
|
notice "The differences between FROMDIR and TODIR will be stored in ARCHIVE."
|
|
|
|
notice ""
|
|
|
|
notice "Options:"
|
|
|
|
notice " -h show this help text"
|
2006-02-13 09:55:47 +03:00
|
|
|
notice " -f clobber this file in the installation"
|
|
|
|
notice " Must be a path to a file to clobber in the partial update."
|
2005-09-22 22:18:27 +04:00
|
|
|
notice ""
|
2006-02-13 09:55:47 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
check_for_forced_update() {
|
|
|
|
force_list="$1"
|
|
|
|
forced_file_chk="$2"
|
|
|
|
|
|
|
|
local f
|
|
|
|
|
2011-04-12 08:23:18 +04:00
|
|
|
if [ "$forced_file_chk" = "precomplete" ]; then
|
|
|
|
## "true" *giggle*
|
|
|
|
return 0;
|
|
|
|
fi
|
|
|
|
|
2009-01-20 01:12:21 +03:00
|
|
|
if [ "${forced_file_chk##*.}" = "chk" ]
|
|
|
|
then
|
|
|
|
## "true" *giggle*
|
|
|
|
return 0;
|
|
|
|
fi
|
|
|
|
|
2006-02-13 09:55:47 +03:00
|
|
|
for f in $force_list; do
|
|
|
|
#echo comparing $forced_file_chk to $f
|
|
|
|
if [ "$forced_file_chk" = "$f" ]; then
|
|
|
|
## "true" *giggle*
|
2009-01-20 01:12:21 +03:00
|
|
|
return 0;
|
2006-02-13 09:55:47 +03:00
|
|
|
fi
|
|
|
|
done
|
2009-01-20 01:12:21 +03:00
|
|
|
## 'false'... because this is bash. Oh yay!
|
|
|
|
return 1;
|
2006-02-13 09:55:47 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
if [ $# = 0 ]; then
|
|
|
|
print_usage
|
2005-06-09 05:29:17 +04:00
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
|
2010-08-13 09:17:49 +04:00
|
|
|
requested_forced_updates=''
|
2006-02-13 09:55:47 +03:00
|
|
|
|
|
|
|
while getopts "hf:" flag
|
|
|
|
do
|
|
|
|
case "$flag" in
|
|
|
|
h) print_usage; exit 0
|
|
|
|
;;
|
|
|
|
f) requested_forced_updates="$requested_forced_updates $OPTARG"
|
|
|
|
;;
|
|
|
|
?) print_usage; exit 1
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
done
|
|
|
|
|
2005-06-09 05:29:17 +04:00
|
|
|
# -----------------------------------------------------------------------------
|
|
|
|
|
2006-02-13 09:55:47 +03:00
|
|
|
let arg_start=$OPTIND-1
|
|
|
|
shift $arg_start
|
|
|
|
|
2005-06-09 05:29:17 +04:00
|
|
|
archive="$1"
|
|
|
|
olddir="$2"
|
|
|
|
newdir="$3"
|
2011-04-12 08:23:18 +04:00
|
|
|
# Prevent the workdir from being inside the targetdir so it isn't included in
|
|
|
|
# the update mar.
|
|
|
|
if [ $(echo "$newdir" | grep -c '\/$') = 1 ]; then
|
|
|
|
# Remove the /
|
|
|
|
newdir=$(echo "$newdir" | sed -e 's:\/$::')
|
|
|
|
fi
|
2005-06-09 05:29:17 +04:00
|
|
|
workdir="$newdir.work"
|
2011-04-12 08:23:18 +04:00
|
|
|
updatemanifestv1="$workdir/update.manifest"
|
|
|
|
updatemanifestv2="$workdir/updatev2.manifest"
|
|
|
|
archivefiles="update.manifest updatev2.manifest"
|
2005-06-09 05:29:17 +04:00
|
|
|
|
2007-03-29 18:11:40 +04:00
|
|
|
mkdir -p "$workdir"
|
|
|
|
|
2011-04-12 08:23:18 +04:00
|
|
|
# On Mac, the precomplete file added by Bug 386760 will cause OS X to reload the
|
|
|
|
# Info.plist so it launches the right architecture, bug 600098
|
|
|
|
|
2005-06-09 05:29:17 +04:00
|
|
|
# Generate a list of all files in the target directory.
|
2006-02-24 21:16:33 +03:00
|
|
|
pushd "$olddir"
|
|
|
|
if test $? -ne 0 ; then
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
|
2007-03-29 18:11:40 +04:00
|
|
|
list_files oldfiles
|
2011-04-12 08:23:18 +04:00
|
|
|
list_dirs olddirs
|
2006-02-24 21:16:33 +03:00
|
|
|
|
|
|
|
popd
|
|
|
|
|
|
|
|
pushd "$newdir"
|
|
|
|
if test $? -ne 0 ; then
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
|
2011-04-12 08:23:18 +04:00
|
|
|
if [ ! -f "precomplete" ]; then
|
|
|
|
notice "precomplete file is missing!"
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
list_dirs newdirs
|
2007-03-29 18:11:40 +04:00
|
|
|
list_files newfiles
|
2005-06-09 05:29:17 +04:00
|
|
|
|
2006-02-24 21:16:33 +03:00
|
|
|
popd
|
|
|
|
|
2011-04-12 08:23:18 +04:00
|
|
|
notice ""
|
|
|
|
notice "Adding file patch and add instructions to file 'update.manifest'"
|
|
|
|
> $updatemanifestv1
|
2005-06-09 05:29:17 +04:00
|
|
|
|
|
|
|
num_oldfiles=${#oldfiles[*]}
|
2011-04-12 08:23:18 +04:00
|
|
|
remove_array=
|
|
|
|
num_removes=0
|
2005-06-09 05:29:17 +04:00
|
|
|
|
|
|
|
for ((i=0; $i<$num_oldfiles; i=$i+1)); do
|
2007-03-29 18:11:40 +04:00
|
|
|
f="${oldfiles[$i]}"
|
2006-02-13 09:55:47 +03:00
|
|
|
|
|
|
|
# This file is created by Talkback, so we can ignore it
|
|
|
|
if [ "$f" = "readme.txt" ]; then
|
|
|
|
continue 1
|
|
|
|
fi
|
|
|
|
|
2011-04-12 08:23:18 +04:00
|
|
|
# removed-files is excluded by make_incremental_updates.py so it is excluded
|
|
|
|
# here for consistency.
|
|
|
|
if [ `basename $f` = "removed-files" ]; then
|
|
|
|
continue 1
|
|
|
|
fi
|
|
|
|
|
2005-06-09 05:29:17 +04:00
|
|
|
# If this file exists in the new directory as well, then check if it differs.
|
|
|
|
if [ -f "$newdir/$f" ]; then
|
2009-11-20 11:55:25 +03:00
|
|
|
|
|
|
|
if check_for_forced_update "$requested_forced_updates" "$f"; then
|
2011-04-12 08:23:18 +04:00
|
|
|
# The full workdir may not exist yet, so create it if necessary.
|
2009-11-24 00:38:31 +03:00
|
|
|
mkdir -p `dirname "$workdir/$f"`
|
2009-11-20 11:55:25 +03:00
|
|
|
$BZIP2 -cz9 "$newdir/$f" > "$workdir/$f"
|
2010-02-05 06:30:34 +03:00
|
|
|
copy_perm "$newdir/$f" "$workdir/$f"
|
2011-04-12 08:23:18 +04:00
|
|
|
make_add_instruction "$f" 1 >> $updatemanifestv1
|
2009-11-20 11:55:25 +03:00
|
|
|
archivefiles="$archivefiles \"$f\""
|
|
|
|
continue 1
|
|
|
|
fi
|
|
|
|
|
2005-06-09 05:29:17 +04:00
|
|
|
if ! diff "$olddir/$f" "$newdir/$f" > /dev/null; then
|
|
|
|
# Compute both the compressed binary diff and the compressed file, and
|
|
|
|
# compare the sizes. Then choose the smaller of the two to package.
|
|
|
|
dir=$(dirname "$workdir/$f")
|
|
|
|
mkdir -p "$dir"
|
|
|
|
$MBSDIFF "$olddir/$f" "$newdir/$f" "$workdir/$f.patch"
|
|
|
|
$BZIP2 -z9 "$workdir/$f.patch"
|
|
|
|
$BZIP2 -cz9 "$newdir/$f" > "$workdir/$f"
|
2010-02-05 06:30:34 +03:00
|
|
|
copy_perm "$newdir/$f" "$workdir/$f"
|
2005-06-09 05:29:17 +04:00
|
|
|
patchfile="$workdir/$f.patch.bz2"
|
|
|
|
patchsize=$(get_file_size "$patchfile")
|
|
|
|
fullsize=$(get_file_size "$workdir/$f")
|
2006-02-13 09:55:47 +03:00
|
|
|
|
2011-04-12 08:23:18 +04:00
|
|
|
if [ $patchsize -lt $fullsize ]; then
|
|
|
|
make_patch_instruction "$f" >> $updatemanifestv1
|
2005-06-09 05:29:17 +04:00
|
|
|
mv -f "$patchfile" "$workdir/$f.patch"
|
|
|
|
rm -f "$workdir/$f"
|
|
|
|
archivefiles="$archivefiles \"$f.patch\""
|
|
|
|
else
|
2011-04-12 08:23:18 +04:00
|
|
|
make_add_instruction "$f" >> $updatemanifestv1
|
2005-06-09 05:29:17 +04:00
|
|
|
rm -f "$patchfile"
|
|
|
|
archivefiles="$archivefiles \"$f\""
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
else
|
2011-04-12 08:23:18 +04:00
|
|
|
# remove instructions are added after add / patch instructions for
|
|
|
|
# consistency with make_incremental_updates.py
|
|
|
|
remove_array[$num_removes]=$f
|
|
|
|
(( num_removes++ ))
|
2005-06-09 05:29:17 +04:00
|
|
|
fi
|
|
|
|
done
|
|
|
|
|
2011-04-12 08:23:18 +04:00
|
|
|
# Newly added files
|
|
|
|
notice ""
|
|
|
|
notice "Adding file add instructions to file 'update.manifest'"
|
2005-06-09 05:29:17 +04:00
|
|
|
num_newfiles=${#newfiles[*]}
|
|
|
|
|
|
|
|
for ((i=0; $i<$num_newfiles; i=$i+1)); do
|
2007-03-29 18:11:40 +04:00
|
|
|
f="${newfiles[$i]}"
|
2005-06-09 05:29:17 +04:00
|
|
|
|
2011-04-12 08:23:18 +04:00
|
|
|
# removed-files is excluded by make_incremental_updates.py so it is excluded
|
|
|
|
# here for consistency.
|
|
|
|
if [ `basename $f` = "removed-files" ]; then
|
|
|
|
continue 1
|
|
|
|
fi
|
|
|
|
|
2005-06-09 05:29:17 +04:00
|
|
|
# If we've already tested this file, then skip it
|
|
|
|
for ((j=0; $j<$num_oldfiles; j=$j+1)); do
|
2008-01-10 23:59:46 +03:00
|
|
|
if [ "$f" = "${oldfiles[j]}" ]; then
|
2005-06-09 05:29:17 +04:00
|
|
|
continue 2
|
|
|
|
fi
|
|
|
|
done
|
2011-04-12 08:23:18 +04:00
|
|
|
|
2005-06-09 05:29:17 +04:00
|
|
|
dir=$(dirname "$workdir/$f")
|
|
|
|
mkdir -p "$dir"
|
|
|
|
|
|
|
|
$BZIP2 -cz9 "$newdir/$f" > "$workdir/$f"
|
2010-02-05 06:30:34 +03:00
|
|
|
copy_perm "$newdir/$f" "$workdir/$f"
|
2005-06-09 05:29:17 +04:00
|
|
|
|
2011-04-12 08:23:18 +04:00
|
|
|
make_add_instruction "$f" >> "$updatemanifestv1"
|
2005-06-09 05:29:17 +04:00
|
|
|
archivefiles="$archivefiles \"$f\""
|
|
|
|
done
|
|
|
|
|
2011-04-12 08:23:18 +04:00
|
|
|
notice ""
|
|
|
|
notice "Adding file remove instructions to file 'update.manifest'"
|
|
|
|
for ((i=0; $i<$num_removes; i=$i+1)); do
|
|
|
|
f="${remove_array[$i]}"
|
|
|
|
notice " remove: $f"
|
|
|
|
echo "remove \"$f\"" >> $updatemanifestv1
|
|
|
|
done
|
|
|
|
|
|
|
|
# Add the type of update to the beginning of and cat the contents of the version
|
|
|
|
# 1 update manifest to the version 2 update manifest.
|
|
|
|
notice ""
|
|
|
|
notice "Adding type instruction to file 'updatev2.manifest'"
|
|
|
|
> $updatemanifestv2
|
|
|
|
notice " type: partial"
|
|
|
|
echo "type \"partial\"" >> $updatemanifestv2
|
|
|
|
|
|
|
|
notice ""
|
|
|
|
notice "Concatenating file 'update.manifest' to file 'updatev2.manifest'"
|
|
|
|
cat $updatemanifestv1 >> $updatemanifestv2
|
|
|
|
|
2005-09-22 22:18:27 +04:00
|
|
|
# Append remove instructions for any dead files.
|
2011-04-12 08:23:18 +04:00
|
|
|
notice ""
|
|
|
|
notice "Adding file and directory remove instructions from file 'removed-files'"
|
|
|
|
append_remove_instructions "$newdir" "$updatemanifestv1" "$updatemanifestv2"
|
|
|
|
|
|
|
|
notice ""
|
|
|
|
notice "Adding directory remove instructions for directories that no longer exist"
|
|
|
|
num_olddirs=${#olddirs[*]}
|
|
|
|
|
|
|
|
for ((i=0; $i<$num_olddirs; i=$i+1)); do
|
|
|
|
f="${olddirs[$i]}"
|
|
|
|
# If this dir doesn't exist in the new directory remove it.
|
|
|
|
if [ ! -d "$newdir/$f" ]; then
|
|
|
|
notice " rmdir: $f/"
|
|
|
|
echo "rmdir \"$f/\"" >> $updatemanifestv2
|
|
|
|
fi
|
|
|
|
done
|
2005-09-22 22:18:27 +04:00
|
|
|
|
2011-04-12 08:23:18 +04:00
|
|
|
$BZIP2 -z9 "$updatemanifestv1" && mv -f "$updatemanifestv1.bz2" "$updatemanifestv1"
|
|
|
|
$BZIP2 -z9 "$updatemanifestv2" && mv -f "$updatemanifestv2.bz2" "$updatemanifestv2"
|
2005-06-09 05:29:17 +04:00
|
|
|
|
2005-06-22 04:32:16 +04:00
|
|
|
eval "$MAR -C \"$workdir\" -c output.mar $archivefiles"
|
2005-06-09 05:29:17 +04:00
|
|
|
mv -f "$workdir/output.mar" "$archive"
|
|
|
|
|
|
|
|
# cleanup
|
|
|
|
rm -fr "$workdir"
|
2011-04-12 08:23:18 +04:00
|
|
|
|
|
|
|
notice ""
|
|
|
|
notice "Finished"
|