use advzip here too

diff --git a/misc/tools/xzipdiff b/misc/tools/xzipdiff
index 14ef0714d9c353f6f61e1e569281c668cd27fadd..564fa413e79d211f755c3c00dbf575d6c3562076 100755 (executable)
--- a/misc/tools/xzipdiff
+++ b/misc/tools/xzipdiff
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 from=$1
 to=$2
 output=$3

diff --git a/misc/tools/zipdiff b/misc/tools/zipdiff
index d0a622e55268e17889a75a9c2601f468fca5529e..661d9a2d677b3fcf3c583f5ae4b924b36405497c 100755 (executable)
--- a/misc/tools/zipdiff
+++ b/misc/tools/zipdiff
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 usage()
 {
        cat <<EOF
@@ -19,13 +21,9 @@ ziptool="mkzip"
 mkzip()
 {
        archive=$1; shift
-       sevenzipflags=-mx=9
-       zipflags=-9
-       ziplist=`mktemp`
-       find "$@" -xtype f \( -executable -or -type l \) -print > "$ziplist"
-       7za a -tzip $sevenzipflags -x@"$ziplist" "$archive" "$@" || true
-       zip         $zipflags -y   -@<"$ziplist" "$archive"      || true
-       rm -f "$ziplist"
+       zipflags=-1ry
+       zip $zipflags "$archive" "$@" || true
+       advzip -z -4 "$archive"
 }
 
 while [ $# -gt 0 ]; do