X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=misc%2Ftools%2Fxzipdiff;h=ad2ffa616c0f04ce978b2f1a5f038bbc23f77680;hb=c303237ecf7ae679334a8b60b4f9363404f69552;hp=e9734c758d57349ead5a38ae53afde7c8e8e523c;hpb=37311e35645dd6c065b7cb3b167b5e5bb99052c3;p=xonotic%2Fxonotic.git

diff --git a/misc/tools/xzipdiff b/misc/tools/xzipdiff
index e9734c75..ad2ffa61 100755
--- a/misc/tools/xzipdiff
+++ b/misc/tools/xzipdiff
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 from=$1
 to=$2
 output=$3
@@ -8,10 +10,16 @@ case "$to" in /*) ;; *) to=`pwd`/$to ;; esac
 case "$output" in /*) ;; *) output=`pwd`/$output ;; esac
 
 excludes="
-	data/xonotic-*-data.pk3
-	data/xonotic-*-maps.pk3
-	data/xonotic-*-music.pk3
-	data/xonotic-*-nexcompat.pk3
+	Xonotic/data/xonotic-*-data.pk3
+	Xonotic/data/xonotic-*-maps.pk3
+	Xonotic/data/xonotic-*-music.pk3
+	Xonotic/data/xonotic-*-nexcompat.pk3
+	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()
@@ -19,16 +27,17 @@ makepatchname()
 	wildcard=$1
 	fromname=$2
 	toname=$3
-	prefix=${wildcard##*\*}
-	suffix=${wildcard%\**}
+	prefix=${wildcard%%\**}
+	suffix=${wildcard#*\*}
 	fromversion=${fromname#$prefix}
 	fromversion=${fromversion%$suffix}
-	toversion=${fromname#$prefix}
-	toversion=${fromversion%$suffix}
+	toversion=${toname#$prefix}
+	toversion=${toversion%$suffix}
 	echo "$prefix$fromversion"patch"$toversion$suffix"
 }
 
 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"