Include the nexcompat package in low and high release zips

[xonotic/xonotic.git] / misc / tools / xzipdiff

diff --git a/misc/tools/xzipdiff b/misc/tools/xzipdiff
index e9734c758d57349ead5a38ae53afde7c8e8e523c..ad2ffa616c0f04ce978b2f1a5f038bbc23f77680 100755 (executable)
--- 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"