cached converter: PROPERLY decide what to DDS-ify

[xonotic/xonotic.git] / misc / tools / cached-converter.sh

diff --git a/misc/tools/cached-converter.sh b/misc/tools/cached-converter.sh
index e3b2d802cc845fb83b97fbe6d239c1b0a1e8b145..df8191159710bfab79edf3fce09c956ff23fd455 100755 (executable)
--- a/misc/tools/cached-converter.sh
+++ b/misc/tools/cached-converter.sh
@@ -168,19 +168,20 @@ for F in "$@"; do
        echo >&2 "Handling $F..."
        conv=false
        keep=false
+
        will_jpeg=$do_jpeg
        will_dds=$do_dds
        case "$F" in
-               textures/*) ;;
-               models/*) ;;
-               maps/*/*) ;;
-                       ;;
+               ./textures/*) ;;
+               ./models/*) ;;
+               ./maps/*/*) ;;
                *)
                        # we can't DDS compress the 2D textures, sorry
                        # but JPEG is still fine
                        will_dds=false
                        ;;
        esac
+
        case "$F" in
                *_alpha.jpg)
                        # handle in *.jpg case
@@ -206,11 +207,9 @@ for F in "$@"; do
                        if [ -s "$F.hasalpha" ]; then
                                cached "$will_dds"  reduce_rgba_dds    "$F" ""                  "dds/${F%.*}.dds" ""                  "$dds_flags"
                                cached "$will_jpeg" reduce_rgba_jpeg2  "$F" ""                  "${F%.*}.jpg"     "${F%.*}_alpha.jpg" "$jpeg_qual_rgb" "$jpeg_qual_a"
-                               rm -f "$F" # TGA becomes useless after JPEGging
                        else                                                             
                                cached "$will_dds"  reduce_rgb_dds     "$F" ""                  "dds/${F%.*}.dds" ""                  "$dds_flags"
                                cached "$will_jpeg" reduce_rgb_jpeg    "$F" ""                  "${F%.*}.jpg"     ""                  "$jpeg_qual_rgb"
-                               rm -f "$F" # TGA becomes useless after JPEGging
                        fi
                        rm -f "$F.hasalpha"
                        ;;