X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/20a72f83f0501485ccd746322957c3de2ce5c5d8..e40e78a8761909f61c3f70ea61b0476b6eac3bc4:/tools/check_dist_archive diff --git a/tools/check_dist_archive b/tools/check_dist_archive index 22c717b547..7937222119 100755 --- a/tools/check_dist_archive +++ b/tools/check_dist_archive @@ -81,15 +81,22 @@ find b -type f \ | sort > "$fb" diffcmd() { - diff -u "$fa" "$fb" + if cmp -s "$fa" "$fb"; then + status=0 + echo "The archive looks good." + else + status=1 + echo "Some files are missing and/or unexpected in the archive." + diff -u "$fa" "$fb" + fi } colordiff=$(type -p colordiff) colorless() { - if [ -n "$colordiff" ]; then - "$colordiff" | less -R -F + if [ -x "$colordiff" ]; then + "$colordiff" | less -R -F -X else - less -F + less -F -X fi } @@ -97,4 +104,6 @@ if [ "$interactive" = "1" ]; then diffcmd | colorless else diffcmd -fi +fi || true + +exit $status