cached converter: PROPERLY decide what to DDS-ify

[xonotic/xonotic.git] / all

diff --git a/all b/all
index a826350126915ae21b1563782c57660e69522570..1cb555a46eae7b7c7d0363d62d74fe87e7e8a113 100755 (executable)
--- a/all
+++ b/all
@@ -860,7 +860,7 @@ case "$cmd" in
        # release building goes here
        release-prepare)
                #"$SELF" each git clean -fxd
-               rm -rf Xonotic
+               rm -rf Xonotic Xonotic*.zip
                mkdir -p Xonotic
                date +%Y%m%d > Xonotic/stamp.txt
                git archive --format=tar HEAD -- Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles | {
@@ -966,9 +966,6 @@ case "$cmd" in
        release-maps)
                "$SELF" update-maps
                ;;
-       release-finish)
-               # version number and stuff like that
-               ;;
        release-qc)
                verbose make -C data/xonotic-data.pk3dir FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" FTEQCCFLAGS_WATERMARK=
                ;;
@@ -1078,7 +1075,7 @@ case "$cmd" in
                dst=${src%.pk3dir}
                case "$dst" in
                        data/xonotic-*)
-                               dst="xonotic-$stamp-${dst#data/xonotic-}"
+                               dst="data/xonotic-$stamp-${dst#data/xonotic-}"
                                ;;
                        *)
                                dst="$dst-$stamp"
@@ -1149,9 +1146,8 @@ case "$cmd" in
                "$SELF" release-prepare
                "$SELF" release-maps &
                "$SELF" release-engine &
-               "$SELF" release-finish &
-               "$SELF" release-qc &
                wait
+               "$SELF" release-qc
                "$SELF" release-pack-needsx11
                "$SELF" release-zip
                ;;