updates to infrastructure scripts

diff --git a/misc/infrastructure/xonotic-map-screenshot.cron b/misc/infrastructure/xonotic-map-screenshot.cron
index 829fab8772d0cf935fba3ee328e74f5d23ae9435..0435c1426d1d5db913391aa054626d7794acdac6 100755 (executable)
--- a/misc/infrastructure/xonotic-map-screenshot.cron
+++ b/misc/infrastructure/xonotic-map-screenshot.cron
@@ -26,12 +26,11 @@ grep -l -- '-->(none)<!--' */index.html | cut -d / -f 1 | while IFS= read -r D;
                echo "$deltime $F" >> .to_delete
        done
 done
-deltime=$(($now - 86400))
 while IFS=' ' read -r d f; do
        if [ $d -lt $now ]; then
-               rm -f "$f"
+               rm -rf "$f"
        else
                echo "$d $f"
-       done
+       fi
 done < .to_delete > .to_delete_new
 mv .to_delete_new .to_delete

diff --git a/misc/infrastructure/xonotic-release-build.cron b/misc/infrastructure/xonotic-release-build.cron
index 024887895d230511c605caa05a09b902d33b2fc7..24f7d4fc939a397280aa6a06e4a265cf8f0c8213 100755 (executable)
--- a/misc/infrastructure/xonotic-release-build.cron
+++ b/misc/infrastructure/xonotic-release-build.cron
@@ -41,8 +41,6 @@ cd ~/xonotic-release-build
 #   maps near completion
 
 for b in \
-       origin/fruitiex/space_elevator \
-       origin/fruitiex/dance \
        origin/fruitiex/runningmanctf \
        origin/mintox/geoplanetary
 do
@@ -61,5 +59,6 @@ for X in Xonotic-$d*.zip; do
        ln -snf "$X" "Xonotic-latest${X#Xonotic-$d}"
 done
 rsync -vaSHP Xonotic*.zip xonotic-beta:autobuild/
+ssh xonotic-beta sh update-rsync.sh "$d"
 echo "Finished a new beta build at http://beta.xonotic.org/autobuild/" | $IRCSPAM
 cd