rename to compile-map-pk3, generate a full map (against origin/master) which is put...

diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index 89e5832cf32368b27a8fa512e16b15ebc5208295..39d48ae7eef4c65b2d83df84e99b03f529b24555 100644 (file)
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -3,13 +3,13 @@ case "$cmd" in
        update-maps)
                misc/tools/xonotic-map-compiler-autobuild download
                ;;
-       compile-map)
+       compile-map-pk3)
                if [ $# -eq 0 ] ; then
-                       msg "Usage: ./all compile-map mapname1 mapname2 mapname3"
-                       msg "For example: ./all compile-map dance xoylent"
+                       msg "Usage: ./all compile-map-pk3 mapname1 mapname2 mapname3"
+                       msg "For example: ./all compile-map-pk3 dance xoylent"
                fi
                if ! [ -f "netradiant/install/q3map2.x86" ] ; then
-                       msg "q3map2 needed! Building netradiant..."
+                       msg "q3map2 needed! Building..."
                        make -C netradiant install/q3map2.x86
                fi
                for mapfile in "$@"; do
@@ -20,12 +20,10 @@ case "$cmd" in
                        else
                                time misc/tools/xonotic-map-compiler-optionsfile "$mapfile" 2>&1 | tee data/xonotic-maps.pk3dir/$mapname.log
                                cd data/xonotic-maps.pk3dir
-                               mapblobhash=`git rev-parse --revs-only "HEAD:maps/$mapname.map.options" || true`-`git rev-parse --revs-only "HEAD:maps/$mapname.map" || true`
                                mapnamezip=${mapname##*/}
-                               echo "Compressing to .pk3..."
-                               zip -9r "$mapnamezip-$mapblobhash.pk3"  "maps/$mapname.bsp" "maps/$mapname/"  "gfx/${mapnamezip}_mini.tga" "$mapname.log"
-                               mv -f "$mapnamezip-$mapblobhash.pk3" ../
-                               verbose "$SELF" update-maps
+                               msg "Compressing to .pk3..."
+                               zip -9r "$mapnamezip.pk3"  "maps/$mapname.bsp" "maps/$mapname/"  "gfx/${mapnamezip}_mini.tga" "$mapname.log" `git diff --name-only --diff-filter=ACMRTUXB origin/master...HEAD`
+                               mv $mapnamezip.pk3 ../../
                        fi
                done
                ;;