From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 25 Sep 2010 11:33:59 +0000 (+0200)
Subject: REALLY return exit status
X-Git-Tag: xonotic-v0.1.0preview~151^2~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c04a82ef707cf2659a40b789a9a032055a3cc514;p=xonotic%2Fxonotic-maps.pk3dir.git

REALLY return exit status
---

diff --git a/scripts/shader-audit.sh b/scripts/shader-audit.sh
index 4e2a5aa7..da58f444 100755
--- a/scripts/shader-audit.sh
+++ b/scripts/shader-audit.sh
@@ -6,6 +6,14 @@ case "$0" in
 		;;
 esac
 
+pid=$$
+status=true
+trap 'status=false' USR1
+seterror()
+{
+	kill -USR1 "$pid"
+}
+
 LF="
 "
 
@@ -33,7 +41,7 @@ use_texture()
 		if [ "$3" = "shader" ]; then
 			return
 		else
-			echo "(EE) shader $1 uses non-existing texture $2"
+			echo "(EE) shader $1 uses non-existing texture $2"; seterror
 		fi
 	fi
 	textures_used="$textures_used$LF$2"
@@ -58,7 +66,7 @@ use_texture()
 		esac
 	done
 	if ! $ok; then
-		echo "(EE) shader $1 is not allowed in this shader file (allowed: $allowed_prefixes, forbidden: $forbidden_prefixes)"
+		echo "(EE) shader $1 is not allowed in this shader file (allowed: $allowed_prefixes, forbidden: $forbidden_prefixes)"; seterror
 	fi
 
 	case "$3" in
@@ -68,7 +76,7 @@ use_texture()
 				env/*)
 					;;
 				*)
-					echo "(EE) texture $2 of shader $1 is out of place, $3 textures must be in env/"
+					echo "(EE) texture $2 of shader $1 is out of place, $3 textures must be in env/"; seterror
 					;;
 			esac
 			;;
@@ -76,7 +84,7 @@ use_texture()
 		*)
 			case "$2" in
 				env/*)
-					echo "(EE) texture $2 of shader $1 is out of place, $3 textures must not be in env/"
+					echo "(EE) texture $2 of shader $1 is out of place, $3 textures must not be in env/"; seterror
 					;;
 				*)
 					;;
@@ -95,7 +103,7 @@ use_texture()
 				"$pre"/*/*)
 					;;
 				*)
-					echo "(EE) texture $2 of shader $1 is out of place, recommended file name is $pre/$suf"
+					echo "(EE) texture $2 of shader $1 is out of place, recommended file name is $pre/$suf"; seterror
 					;;
 			esac
 			;;
@@ -107,7 +115,7 @@ use_texture()
 				"$pre"/*/*)
 					;;
 				*)
-					echo "(EE) texture $2 of shader $1 is out of place, recommended file name is $pre/base/$suf"
+					echo "(EE) texture $2 of shader $1 is out of place, recommended file name is $pre/base/$suf"; seterror
 					;;
 			esac
 			;;
@@ -121,7 +129,7 @@ use_texture()
 					;;
 				textures/map_*)
 					# protect one map's textures from the evil of other maps :P
-					echo "(EE) texture $2 of shader $1 is out of place, recommended file name is $pre/map_$map/*"
+					echo "(EE) texture $2 of shader $1 is out of place, recommended file name is $pre/map_$map/*"; seterror
 					;;
 				*)
 					# using outside stuff is permitted
@@ -136,7 +144,7 @@ use_texture()
 				textures/common/*/*)
 					;;
 				*)
-					echo "(EE) texture $2 of shader $1 is out of place, recommended file name is $1 or textures/common/*/*"
+					echo "(EE) texture $2 of shader $1 is out of place, recommended file name is $1 or textures/common/*/*"; seterror
 					;;
 			esac
 			;;
@@ -148,7 +156,7 @@ use_texture()
 					# I _suppose_ this is fine, as tZork committed this pack
 					;;
 				*)
-					echo "(EE) texture $2 of shader $1 is out of place, recommended file name is $1"
+					echo "(EE) texture $2 of shader $1 is out of place, recommended file name is $1"; seterror
 					;;
 			esac
 			;;
@@ -164,7 +172,7 @@ use_texture()
 					# typical place for skybox
 					;;
 				*)
-					echo "(EE) texture $2 of shader $1 is out of place, recommended file name is $1"
+					echo "(EE) texture $2 of shader $1 is out of place, recommended file name is $1"; seterror
 					;;
 			esac
 			;;
@@ -174,12 +182,12 @@ use_texture()
 				models/*)
 					;;
 				*)
-					echo "(EE) texture $2 of shader $1 is out of place, recommended file name is $1 or models/*"
+					echo "(EE) texture $2 of shader $1 is out of place, recommended file name is $1 or models/*"; seterror
 					;;
 			esac
 			;;
 		*)
-			echo "(EE) no shader name pattern for $1"
+			echo "(EE) no shader name pattern for $1"; seterror
 			;;
 	esac
 }
@@ -286,37 +294,26 @@ strip_comments()
 	sed 's,//.*,,g; s,\r, ,g; s,\t, ,g; s,  *, ,g; s, $,,; s,^ ,,; /^$/ d'
 }
 
-{
-	t=`mktemp || echo ".temp"`
-	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 '*_reflect.*' -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
-} | {
-	return=true
-	while IFS= read -r STATUS TEXT; do
-		case "$STATUS" in
-			'(EE)')
-				return=false
-				;;
-		esac
-		echo "$STATUS $TEXT"
-	done
-	$return
-}
+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"; seterror
+			;;
+	esac
+done
+
+$status