X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=misc%2Ftools%2Fxzipdiff;h=ad2ffa616c0f04ce978b2f1a5f038bbc23f77680;hb=1c5216a20975eafbe2aad5b1c15006e49b4998dc;hp=48ad7df690a57799ce15d01c8e4cd6fcbffbf562;hpb=22d273247e5c4f7641eb915a63a97e9929b8129d;p=xonotic%2Fxonotic.git

diff --git a/misc/tools/xzipdiff b/misc/tools/xzipdiff
index 48ad7df6..ad2ffa61 100755
--- a/misc/tools/xzipdiff
+++ b/misc/tools/xzipdiff
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 from=$1
 to=$2
 output=$3
@@ -15,6 +17,9 @@ excludes="
 	Xonotic/data/xonotic-*-data-low.pk3
 	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
 "
 
 makepatchname()
@@ -31,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"
@@ -45,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