X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=scripts%2Fdebian%2Fddtp-i18n-check.sh;h=71391154a9a223985fd2eec5e777f0e6d8562d16;hb=278c336540a48829f0d0b6ae81968640f40aab21;hp=cefb68e62bc334507161a4bd31294f88aac63337;hpb=2f30eb272c2dfbdb3544d7e0a0e120a9e4be3294;p=dak.git diff --git a/scripts/debian/ddtp-i18n-check.sh b/scripts/debian/ddtp-i18n-check.sh index cefb68e6..71391154 100755 --- a/scripts/debian/ddtp-i18n-check.sh +++ b/scripts/debian/ddtp-i18n-check.sh @@ -1,8 +1,8 @@ #!/bin/bash # -# $Id: ddtp_i18n_check.sh 1670 2009-03-31 20:57:49Z nekral-guest $ +# $Id: ddtp_i18n_check.sh 2535 2011-02-19 14:20:52Z nekral-guest $ # -# Copyright (C) 2008, Felipe Augusto van de Wiel +# Copyright (C) 2008, 2011 Felipe Augusto van de Wiel # Copyright (C) 2008, 2009 Nicolas François # # This program is free software; you can redistribute it and/or modify @@ -80,21 +80,21 @@ elif [ ! -d "$PACKAGES_LISTS_DIR" ]; then usage fi -#STABLE="lenny" -TESTING="wheezy" +#STABLE="squeeze" +TESTING="jessie" UNSTABLE="sid" # Original SHA256SUMS, generated by i18n.debian.net -SHA256SUMS="SHA256SUMS" +CHECKSUMS="SHA256SUMS" # DAK Timestamp TIMESTAMP="timestamp" # These special files must exist on the top of dists_parent_dir -SPECIAL_FILES="$SHA256SUMS $TIMESTAMP $TIMESTAMP.gpg" +SPECIAL_FILES="$CHECKSUMS $TIMESTAMP $TIMESTAMP.gpg" # Temporary working directory. We need a full path to reduce the -# complexity of checking SHA256SUMS and cleaning/removing TMPDIR +# complexity of checking CHECKSUMS and cleaning/removing TMPDIR TEMP_WORK_DIR=$(mktemp -d -t ddtp_dinstall_tmpdir.XXXXXX) cd "$TEMP_WORK_DIR" TMP_WORK_DIR=$(pwd) @@ -105,6 +105,7 @@ unset TEMP_WORK_DIR trap_exit () { rm -rf "$TMP_WORK_DIR" rm -f "$dists_parent_dir"/dists/*/main/i18n/Translation-*.bz2 + rm -f "$dists_parent_dir"/dists/*/main/i18n/Index exit 1 } trap trap_exit EXIT HUP INT QUIT TERM @@ -315,18 +316,18 @@ for sf in $SPECIAL_FILES; do fi done -# Comparing SHA256SUMS -# We don use -c because a file could exist in the directory tree and not in -# the SHA256SUMS, so we sort the existing SHA256SUMS and we create a new one +# Comparing CHECKSUMS +# We don't use -c because a file could exist in the directory tree and not in +# the CHECKSUMS, so we sort the existing CHECKSUMS and we create a new one # already sorted, if cmp fails then files are different and we don't want to # continue. cd "$dists_parent_dir" -find dists -type f -print0 |xargs --null sha256sum > "$TMP_WORK_DIR/$SHA256SUMS.new" -sort "$SHA256SUMS" > "$TMP_WORK_DIR/$SHA256SUMS.sorted" -sort "$TMP_WORK_DIR/$SHA256SUMS.new" > "$TMP_WORK_DIR/$SHA256SUMS.new.sorted" -if ! cmp --quiet "$TMP_WORK_DIR/$SHA256SUMS.sorted" "$TMP_WORK_DIR/$SHA256SUMS.new.sorted"; then - echo "Failed to compare the SHA256SUMS, they are not identical!" >&2 - diff -au "$TMP_WORK_DIR/$SHA256SUMS.sorted" "$TMP_WORK_DIR/$SHA256SUMS.new.sorted" >&2 +find dists -type f -print0 |xargs --null sha256sum > "$TMP_WORK_DIR/$CHECKSUMS.new" +sort "$CHECKSUMS" > "$TMP_WORK_DIR/$CHECKSUMS.sorted" +sort "$TMP_WORK_DIR/$CHECKSUMS.new" > "$TMP_WORK_DIR/$CHECKSUMS.new.sorted" +if ! cmp --quiet "$TMP_WORK_DIR/$CHECKSUMS.sorted" "$TMP_WORK_DIR/$CHECKSUMS.new.sorted"; then + echo "Failed to compare the $CHECKSUMS, they are not identical!" >&2 + diff -au "$TMP_WORK_DIR/$CHECKSUMS.sorted" "$TMP_WORK_DIR/$CHECKSUMS.new.sorted" >&2 exit 1 fi cd "$OLDPWD"