X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=misc%2Ftools%2Fzipdiff;h=661d9a2d677b3fcf3c583f5ae4b924b36405497c;hb=86fe07aec96d25dd1c47ba14ca23467ce0fbed7d;hp=00af981458bc66975e870e8280fba9269d8dbae8;hpb=497ee72bcdad6d02507340f9de99bc4916a2348f;p=xonotic%2Fxonotic.git

diff --git a/misc/tools/zipdiff b/misc/tools/zipdiff
index 00af9814..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
@@ -177,7 +175,7 @@ case "$output" in
 				mkdir -p "$tempdir/${dline%/*}"
 				unzip "$to" "$line"
 			done
-			$ziptool "$output" .
+			$ziptool "$output" *
 			cd ..
 		fi
 		;;