shader-audit: detect broken nesting of braces

[xonotic/xonotic-maps.pk3dir.git] / scripts / shader-audit.sh

diff --git a/scripts/shader-audit.sh b/scripts/shader-audit.sh
index 1b2567298eb4da830297c33bf7cff6fdb7defb04..ab8de9070307869da062163a12479301c54da711 100755 (executable)
--- a/scripts/shader-audit.sh
+++ b/scripts/shader-audit.sh
@@ -149,7 +149,7 @@ use_texture()
                        esac
                        ;;
                ## RULE: textures/FOO/* must use textures/FOO/*, for FOO in decals, liquids_water, liquids_slime, liquids_lava
-               textures/decals/*|textures/liquids_*/*|textures/effects_*/*)
+               textures/decals/*|textures/liquids_*/*|textures/effects_*/*|textures/screens/*|textures/logos/*)
                        pre=`echo "$1" | cut -d / -f 1-2`
                        case "$2" in
                                "$pre"/*)
@@ -196,7 +196,7 @@ parsing_shader=
 parse_shaderstage()
 {
        while read L A1 Aother; do
-               case "$L" in
+               case "`echo "$L" | tr A-Z a-z`" in
                        map)
                                case "$A1" in
                                        '$lightmap')
@@ -211,6 +211,9 @@ parse_shaderstage()
                                        use_texture "$parsing_shader" "`normalize "$X"`" animmap
                                done
                                ;;
+                       '{')
+                               echo "(EE) brace nesting error in $parsing_shader"; seterror
+                               ;;
                        '}')
                                break
                                ;;
@@ -224,7 +227,7 @@ parse_shader()
 {
        use_texture "$parsing_shader" "$parsing_shader" shader
        while read L A1 Aother; do
-               case "$L" in
+               case "`echo "$L" | tr A-Z a-z`" in
                        qer_editorimage)
                                use_texture "$parsing_shader" "`normalize "$A1"`" editorimage
                                ;;