X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fxonotic-map-compiler-autobuild;h=d19e79cde6f6f13950d46d865dde65c1ff54e6bd;hp=6e8b9802d0755f9adea6ad6b26c78fd45aae972c;hb=5721052160c40e8de5359adcd75ec5e44bf51526;hpb=93fc58484e0aedf13ffa8b842a0c96906cad41e6

diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild
index 6e8b9802..d19e79cd 100755
--- a/misc/tools/xonotic-map-compiler-autobuild
+++ b/misc/tools/xonotic-map-compiler-autobuild
@@ -16,10 +16,16 @@ allmaps()
 {
 	commithash=$1
 	shift
-	for F in `git ls-files "$commithash" -- maps/\*.map.options`; do
-		M=${F#maps/}
-		M=${M%.map.options}
-		blobhash=`git rev-parse --revs-only "$commithash:maps/$M.map.options" || true`-`git rev-parse --revs-only "$commithash:maps/$M.map" || true`
+	for F in `git show "${commithash}:maps/"`; do
+		case "$F" in
+			*.map.options)
+				;;
+			*)
+				continue
+				;;
+		esac
+		M=${F%.map.options}
+		blobhash=`git rev-parse --revs-only "${commithash}:maps/$M.map.options" || true`-`git rev-parse --revs-only "${commithash}:maps/$M.map" || true`
 		case "$blobhash" in
 			-*)
 				;;
@@ -274,9 +280,7 @@ rundownload()
 			mv "$b" "$bspdir.old"/
 		fi
 	done
-	cd data/xonotic-maps.pk3dir
 	allmaps "HEAD" getthemap "$url_http" "$bspdir.old" "$bspdir"
-	cd ../..
 }
 
 branches()
@@ -290,6 +294,7 @@ runmakeindex()
 	branches | while read -r HASH TYPE REFNAME; do
 		allmaps "$HASH" indexthemap "$REFNAME"
 	done
+	cd ../..
 }
 
 case "$1" in
@@ -305,10 +310,10 @@ case "$1" in
 		git checkout -f master
 		;;
 	screenshot)
+		runmakeindex > "branches.idx.new"
+		rsync -vaSHP "branches.idx.new" "$url_ssh""branches.idx.new"
+		rm -f "branches.idx.new"
 		cd data/xonotic-maps.pk3dir
-		runmakeindex > branches.idx.new
-		rsync -vaSHP "$branches.idx.new" "$url_ssh""branches.idx.new"
-		rm -f branches.idx.new
 		branches | while read -r HASH TYPE REFNAME; do
 			if [ -f "$screenshot_cachedir/$HASH" ]; then
 				continue
@@ -319,9 +324,8 @@ case "$1" in
 				continue
 			fi
 
-			cd data/xonotic-maps.pk3dir
-
 			allmaps "$HASH" screenshotthemap "$REFNAME" "$url_http"
+
 			touch "$screenshot_cachedir/$HASH"
 		done
 		git checkout -f master
@@ -330,7 +334,9 @@ case "$1" in
 		runmakeindex
 		;;
 	download)
+		cd data/xonotic-maps.pk3dir
 		rundownload
+		cd ../..
 		echo "List of maps that got deleted (if any) and currently are in $bspdir.old:"
 		ls -l "$bspdir.old" || true
 		;;