From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 13 Mar 2012 12:05:26 +0000 (+0100)
Subject: use advzip here too
X-Git-Tag: xonotic-v0.7.0~68
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=470bfee155a979102f2b012965e3e35af6787cbb;p=xonotic%2Fxonotic.git

use advzip here too
---

diff --git a/misc/tools/xzipdiff b/misc/tools/xzipdiff
index 14ef0714..564fa413 100755
--- 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 d0a622e5..661d9a2d 100755
--- 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