X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=blobdiff_plain;f=scripts%2Fshader-audit.sh;h=a203d037ebdbb52dc5f8e4825efb24c57854bd5f;hp=95454f835ad2beb5788da7549328de1e06bf047d;hb=8328b766c0767da25b7b15995470d9a577124cc6;hpb=3c073e0bc91859a8ad15aac7804016e609c364f3

diff --git a/scripts/shader-audit.sh b/scripts/shader-audit.sh
old mode 100644
new mode 100755
index 95454f83..a203d037
--- a/scripts/shader-audit.sh
+++ b/scripts/shader-audit.sh
@@ -1,5 +1,11 @@
 #!/bin/sh
 
+case "$0" in
+	*/*)
+		cd "${0%/*}"
+		;;
+esac
+
 LF="
 "
 
@@ -151,7 +157,7 @@ use_texture()
 			sky=${1#textures/skies/}
 			sky=${sky%%_*}
 			case "$2" in
-				"$1")
+				textures/skies/$sky|textures/skies/$sky[_]*)
 					# typical place for preview image
 					;;
 				env/$sky[/_]*)
@@ -181,7 +187,7 @@ use_texture()
 parsing_shader=
 parse_shaderstage()
 {
-	while read L A1 A2 Aother; do
+	while read L A1 Aother; do
 		case "$L" in
 			map)
 				case "$A1" in
@@ -193,7 +199,7 @@ parse_shaderstage()
 				esac
 				;;
 			animmap)
-				for X in $A2 $Aother; do
+				for X in $Aother; do
 					use_texture "$parsing_shader" "`normalize "$X"`" animmap
 				done
 				;;
@@ -209,7 +215,7 @@ parse_shaderstage()
 parse_shader()
 {
 	use_texture "$parsing_shader" "$parsing_shader" shader
-	while read L A1 AREST; do
+	while read L A1 Aother; do
 		case "$L" in
 			qer_editorimage)
 				use_texture "$parsing_shader" "`normalize "$A1"`" editorimage
@@ -239,7 +245,7 @@ parse_shaderfile()
 	case "$1" in
 		## RULE: map_FOO.shader may define tetxures/map_FOO_* and textures/map_FOO/*
 		map_*)
-			allowed_prefixes="textures/map_`echo "$1" | cut -d _ -f 2`_ textures/map_`echo "$1" | cut -d - -f 2`/"
+			allowed_prefixes="textures/map_`echo "$1" | cut -d _ -f 2`_ textures/map_`echo "$1" | cut -d _ -f 2`/"
 			forbidden_prefixes=
 			;;
 		## RULE: skies_FOO.shader may define tetxures/skies/FOO and textures/skies/FOO_*
@@ -280,24 +286,36 @@ strip_comments()
 	sed 's,//.*,,g; s,\r, ,g; s,\t, ,g; s,  *, ,g; s, $,,; s,^ ,,; /^$/ d'
 }
 
-t=`mktemp`
-for X in *.shader; do
-	strip_comments < "$X" > "$t"
-	parse_shaderfile "${X%.shader}" < "$t"
-done
-rm -f "$t"
+{
+	t=`mktemp || echo ".temp"`
+	for X in *.shader; do
+		strip_comments < "$X" > "$t"
+		parse_shaderfile "${X%.shader}" < "$t"
+	done
+	rm -f "$t"
 
-textures_avail=`( cd ..; find textures/ -type f -not -name '*_norm.*' -not -name '*_glow.*' -not -name '*_gloss.*' -not -name '*.xcf' ) | while IFS= read -r T; do normalize "$T"; done | sort -u`
-textures_used=`echo "${textures_used#$LF}" | sort -u`
+	textures_avail=`( cd ..; find textures/ -type f -not -name '*_norm.*' -not -name '*_glow.*' -not -name '*_gloss.*' -not -name '*_reflect.*' -not -name '*.xcf' ) | while IFS= read -r T; do normalize "$T"; done | sort -u`
+	textures_used=`echo "${textures_used#$LF}" | sort -u`
 
-echo "$textures_used$LF$textures_used$LF$textures_avail" | sort | uniq -u | while IFS= read -r L; do
-	case "$L" in
-		textures/radiant/*)
-			;;
-		textures/map_*/*)
-			;;
-		*)
-			echo "(EE) texture $L is not referenced by any shader"
-			;;
-	esac
-done
+	echo "$textures_used$LF$textures_used$LF$textures_avail" | sort | uniq -u | while IFS= read -r L; do
+		case "$L" in
+			textures/radiant/*)
+				;;
+			textures/map_*/*)
+				;;
+			*)
+				echo "(EE) texture $L is not referenced by any shader"
+				;;
+		esac
+	done
+} | {
+	return=true
+	while IFS= read -r STATUS TEXT; do
+		case "$STATUS" in
+			'(EE)')
+				return=false
+				;;
+		esac
+	done
+	$return
+}