A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add option -X to less, to avoid to clear the screen.
[simgrid.git]
/
tools
/
check_dist_archive
diff --git
a/tools/check_dist_archive
b/tools/check_dist_archive
index 22c717b547cd0d2317ead2543f2821dde66d00b8..793722211947aec9ad179196b62dddce7108c67a 100755
(executable)
--- a/
tools/check_dist_archive
+++ b/
tools/check_dist_archive
@@
-81,15
+81,22
@@
find b -type f \
| sort > "$fb"
diffcmd() {
| 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() {
}
colordiff=$(type -p colordiff)
colorless() {
- if [ -
n
"$colordiff" ]; then
- "$colordiff" | less -R -F
+ if [ -
x
"$colordiff" ]; then
+ "$colordiff" | less -R -F
-X
else
else
- less -F
+ less -F
-X
fi
}
fi
}
@@
-97,4
+104,6
@@
if [ "$interactive" = "1" ]; then
diffcmd | colorless
else
diffcmd
diffcmd | colorless
else
diffcmd
-fi
+fi || true
+
+exit $status