X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=misc%2Ftools%2Fxzipdiff;h=ad2ffa616c0f04ce978b2f1a5f038bbc23f77680;hb=ae42651d6185955b0352c883adae13cbe39720bd;hp=03824bed1a144918570d4e45515f581979391a13;hpb=b8b02b38175b92c771201b26f371c8fdd62fe3e8;p=xonotic%2Fxonotic.git

diff --git a/misc/tools/xzipdiff b/misc/tools/xzipdiff
index 03824bed..ad2ffa61 100755
--- a/misc/tools/xzipdiff
+++ b/misc/tools/xzipdiff
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 from=$1
 to=$2
 output=$3
@@ -16,6 +18,7 @@ excludes="
 	Xonotic/data/xonotic-*-maps-low.pk3
 	Xonotic/data/xonotic-*-music-low.pk3
 	Xonotic/data/font-nimbussansl-*.pk3
+	Xonotic/data/font-unifont-*.pk3
 	Xonotic/data/font-xolonium-*.pk3
 "
 
@@ -33,7 +36,8 @@ makepatchname()
 	echo "$prefix$fromversion"patch"$toversion$suffix"
 }
 
-zipdiff -z "zip -9r" -f "$from" -t "$to" -o "$output" -x "$excludes"
+zipdiff -f "$from" -t "$to" -o "$output" -x "$excludes"
+# or maybe just include ALL not excluded files from $to in $output?
 
 tempdir=`mktemp -d -t zipdiff.XXXXXX`
 cd "$tempdir"
@@ -47,7 +51,7 @@ for x in $excludes; do
 	patchname=`makepatchname "$x" "$fromname" "$toname"`
 	patchdir="c/$patchname"; patchdir=${patchdir%/*}
 	mkdir -p "$patchdir"
-	zipdiff -z "zip -9r" -f a/"$fromname" -t b/"$toname" -o c/"$patchname"
+	zipdiff -f a/"$fromname" -t b/"$toname" -o c/"$patchname"
 	if [ -f c/"$patchname" ]; then
 		(cd c && zip -0r "$output" "$patchname")
 	fi