zulcss/mmdebstrap
1
0
Fork 0
forked from josch/mmdebstrap
Code Pull requests Activity

coverage.sh: exit 1 instead of continuing after printing differences

Browse source
This commit is contained in:
Johannes 'josch' Schauer 2020-01-07 18:10:12 +01:00
parent 161f8b0ec2
commit caf8fd8283
Signed by untrusted user: josch
GPG key ID: F2CBA5C78FBD83E1
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
coverage.sh
View file

@ -117,21 +117,21 @@ cmp dev1.tar dev2.tar || ret=\$?
if [ "\$ret" -ne 0 ]; then if [ "\$ret" -ne 0 ]; then
if type diffoscope >/dev/null; then if type diffoscope >/dev/null; then
diffoscope dev1.tar dev2.tar diffoscope dev1.tar dev2.tar
continue exit 1
else else
echo "no diffoscope installed" >&2 echo "no diffoscope installed" >&2
fi fi
if type base64 >/dev/null; then if type base64 >/dev/null; then
base64 dev1.tar base64 dev1.tar
base64 dev2.tar base64 dev2.tar
continue exit 1
else else
echo "no base64 installed" >&2 echo "no base64 installed" >&2
fi fi
if type xxd >/dev/null; then if type xxd >/dev/null; then
xxd dev1.tar xxd dev1.tar
xxd dev2.tar xxd dev2.tar
continue exit 1
else else
echo "no xxd installed" >&2 echo "no xxd installed" >&2
fi fi
@ -1570,21 +1570,21 @@ for n in setup essential customize; do
if [ "\$ret" -ne 0 ]; then if [ "\$ret" -ne 0 ]; then
if type diffoscope >/dev/null; then if type diffoscope >/dev/null; then
diffoscope /tmp/tar-in-\$n.tar /tmp/tar-out-\$n.tar diffoscope /tmp/tar-in-\$n.tar /tmp/tar-out-\$n.tar
continue exit 1
else else
echo "no diffoscope installed" >&2 echo "no diffoscope installed" >&2
fi fi
if type base64 >/dev/null; then if type base64 >/dev/null; then
base64 /tmp/tar-in-\$n.tar base64 /tmp/tar-in-\$n.tar
base64 /tmp/tar-out-\$n.tar base64 /tmp/tar-out-\$n.tar
continue exit 1
else else
echo "no base64 installed" >&2 echo "no base64 installed" >&2
fi fi
if type xxd >/dev/null; then if type xxd >/dev/null; then
xxd /tmp/tar-in-\$n.tar xxd /tmp/tar-in-\$n.tar
xxd /tmp/tar-out-\$n.tar xxd /tmp/tar-out-\$n.tar
continue exit 1
else else
echo "no xxd installed" >&2 echo "no xxd installed" >&2
fi fi