X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=blobdiff_plain;f=scripts%2Fshader-audit.sh;h=46d92795962856bdeb03f4b558bd42f1d68134bd;hp=83aba6b9b77ee173a8b32f8c11920ff24bcf15c9;hb=d4c51266cbce5c6394f2c3d4db525ac522ca9c60;hpb=4499fdf39c8271fdf6554f586b26ee06834f885c diff --git a/scripts/shader-audit.sh b/scripts/shader-audit.sh index 83aba6b9..46d92795 100755 --- a/scripts/shader-audit.sh +++ b/scripts/shader-audit.sh @@ -157,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[/_]*) @@ -245,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_*