* Now correctly parses the Release file (it broke when SHA1 field has been
added). * TODO: Still have to generate the SHA1 field for the main tree.
This commit is contained in:
parent
f66a295335
commit
b312b89f7f
|
@ -8,6 +8,8 @@
|
||||||
# Complete the "Release" file if it exists
|
# Complete the "Release" file if it exists
|
||||||
|
|
||||||
if [ -e "dists/$CODENAME/Release" ]; then
|
if [ -e "dists/$CODENAME/Release" ]; then
|
||||||
|
# Add the MD5Sum field again
|
||||||
|
echo "MD5Sum:" >> dists/$CODENAME/Release
|
||||||
find dists/$CODENAME/ -name 'Packages' -o -name 'Packages.gz' \
|
find dists/$CODENAME/ -name 'Packages' -o -name 'Packages.gz' \
|
||||||
-o -name 'Sources' -o -name 'Sources.gz' -o -name 'Release' | \
|
-o -name 'Sources' -o -name 'Sources.gz' -o -name 'Release' | \
|
||||||
grep -v non-US/ | grep -v dists/$CODENAME/Release | \
|
grep -v non-US/ | grep -v dists/$CODENAME/Release | \
|
||||||
|
@ -18,9 +20,13 @@ if [ -e "dists/$CODENAME/Release" ]; then
|
||||||
m=`md5sum < $rfile`; \
|
m=`md5sum < $rfile`; \
|
||||||
printf " %s %8d %s\n" $m $c $file; \
|
printf " %s %8d %s\n" $m $c $file; \
|
||||||
done) >> dists/$CODENAME/Release
|
done) >> dists/$CODENAME/Release
|
||||||
|
# TODO: Should add SHA1 field here
|
||||||
|
# Check with libdigest-sha1-perl
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -n "$NONUS" -a -e "dists/$CODENAME/non-US/Release" ]; then
|
if [ -n "$NONUS" -a -e "dists/$CODENAME/non-US/Release" ]; then
|
||||||
|
# Add the MD5Sum field again
|
||||||
|
echo "MD5Sum:" >> dists/$CODENAME/non-US/Release
|
||||||
find dists/$CODENAME/non-US/ -name 'Packages' -o -name 'Packages.gz' \
|
find dists/$CODENAME/non-US/ -name 'Packages' -o -name 'Packages.gz' \
|
||||||
-o -name 'Sources' -o -name 'Sources.gz' -o -name 'Release' | \
|
-o -name 'Sources' -o -name 'Sources.gz' -o -name 'Release' | \
|
||||||
grep -v dists/$CODENAME/non-US/Release | \
|
grep -v dists/$CODENAME/non-US/Release | \
|
||||||
|
@ -31,6 +37,8 @@ if [ -n "$NONUS" -a -e "dists/$CODENAME/non-US/Release" ]; then
|
||||||
m=`md5sum < $rfile`; \
|
m=`md5sum < $rfile`; \
|
||||||
printf " %s %8d %s\n" $m $c $file; \
|
printf " %s %8d %s\n" $m $c $file; \
|
||||||
done) >> dists/$CODENAME/non-US/Release
|
done) >> dists/$CODENAME/non-US/Release
|
||||||
|
# TODO: Should add SHA1 field here
|
||||||
|
# Check with libdigest-sha1-perl
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Create the $CODENAME-secured tree by copying files from the mirror
|
# Create the $CODENAME-secured tree by copying files from the mirror
|
||||||
|
|
|
@ -33,14 +33,22 @@ cd "$2"
|
||||||
if [ "$1" = "install" ]; then
|
if [ "$1" = "install" ]; then
|
||||||
|
|
||||||
if [ -e "$MIRROR/dists/$CODENAME/Release" ]; then
|
if [ -e "$MIRROR/dists/$CODENAME/Release" ]; then
|
||||||
sed -e "/^ /d" -e "s/^Architectures: .*$/Architectures: $ARCH/" \
|
# Strip the MD5Sum and SHA1 fields
|
||||||
$MIRROR/dists/$CODENAME/Release \
|
sed -e "s/^Architectures: .*$/Architectures: $ARCH/" \
|
||||||
> dists/$CODENAME/Release
|
$MIRROR/dists/$CODENAME/Release | \
|
||||||
|
perl -ne 'if (/^(MD5Sum|SHA1):/i) { $f=1; next }
|
||||||
|
if ($f) {
|
||||||
|
unless (/^ /) { print; $f=0 }
|
||||||
|
} else { print }' > dists/$CODENAME/Release
|
||||||
fi
|
fi
|
||||||
if [ -n "$NONUS" -a -e "$NONUS/dists/$CODENAME/non-US/Release" ]; then
|
if [ -n "$NONUS" -a -e "$NONUS/dists/$CODENAME/non-US/Release" ]; then
|
||||||
|
# Strip the MD5Sum and SHA1 fields
|
||||||
sed -e "/^ /d" -e "s/^Architectures: .*$/Architectures: $ARCH/" \
|
sed -e "/^ /d" -e "s/^Architectures: .*$/Architectures: $ARCH/" \
|
||||||
$NONUS/dists/$CODENAME/non-US/Release \
|
$NONUS/dists/$CODENAME/non-US/Release | \
|
||||||
> dists/$CODENAME/non-US/Release
|
perl -ne 'if (/^(MD5Sum|SHA1):/i) { $f=1; next }
|
||||||
|
if ($f) {
|
||||||
|
unless (/^ /) { print; $f=0 }
|
||||||
|
} else { print }' > dists/$CODENAME/non-US/Release
|
||||||
fi
|
fi
|
||||||
|
|
||||||
for SECT in $SECTIONS; do
|
for SECT in $SECTIONS; do
|
||||||
|
|
|
@ -36,11 +36,20 @@ for i in `cd dists; echo *; cd ..`; do
|
||||||
done
|
done
|
||||||
|
|
||||||
if [ -e "$MIRROR/dists/$CODENAME/Release" ]; then
|
if [ -e "$MIRROR/dists/$CODENAME/Release" ]; then
|
||||||
sed -e "/^ /d" $MIRROR/dists/$CODENAME/Release \
|
# Strip the MD5Sum and SHA1 field
|
||||||
> dists/$CODENAME/Release
|
perl -ne 'if (/^(MD5Sum|SHA1):/) { $f=1; next; }
|
||||||
|
if ($f) {
|
||||||
|
unless (/^ /) { print; $f=0 }
|
||||||
|
} else { print }' \
|
||||||
|
$MIRROR/dists/$CODENAME/Release > dists/$CODENAME/Release
|
||||||
fi
|
fi
|
||||||
if [ -n "$NONUS" -a -e "$NONUS/dists/$CODENAME/non-US/Release" ]; then
|
if [ -n "$NONUS" -a -e "$NONUS/dists/$CODENAME/non-US/Release" ]; then
|
||||||
sed -e "/^ /d" $NONUS/dists/$CODENAME/non-US/Release \
|
# Strip the MD5Sum and SHA1 field
|
||||||
|
perl -ne 'if (/^(MD5Sum|SHA1):/) { $f=1; next; }
|
||||||
|
if ($f) {
|
||||||
|
unless (/^ /) { print; $f=0 }
|
||||||
|
} else { print }' \
|
||||||
|
$NONUS/dists/$CODENAME/non-US/Release \
|
||||||
> dists/$CODENAME/non-US/Release
|
> dists/$CODENAME/non-US/Release
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue