Update buildbot

diff --git a/util/buildbot/buildwin32.sh b/util/buildbot/buildwin32.sh
index 52d2aa18245b8f895a7d68d1910e6c0ea3de0a3b..fc42db8a79c9e78b0abdb382d23d32a6193031d1 100755 (executable)
--- a/util/buildbot/buildwin32.sh
+++ b/util/buildbot/buildwin32.sh
@@ -50,11 +50,11 @@ cd $builddir
        -c -O $packagedir/libvorbis-$vorbis_version-dll.7z || exit 1
 [ -e $packagedir/libcurl-$curl_version-win32-msvc.zip ] || wget http://curl.haxx.se/download/libcurl-$curl_version-win32-msvc.zip \
        -c -O $packagedir/libcurl-$curl_version-win32-msvc.zip || exit 1
-wget http://github.com/celeron55/minetest/zipball/master \
-       -c -O $packagedir/minetest.zip --tries=3 || (echo "Please download http://github.com/celeron55/minetest/zipball/master manually and save it as $packagedir/minetest.zip"; read -s)
+wget http://github.com/minetest/minetest/zipball/master \
+       -c -O $packagedir/minetest.zip --tries=3 || (echo "Please download http://github.com/minetest/minetest/zipball/master manually and save it as $packagedir/minetest.zip"; read -s)
 [ -e $packagedir/minetest.zip ] || (echo "minetest.zip not found"; exit 1)
-wget http://github.com/celeron55/minetest_game/zipball/master \
-       -c -O $packagedir/minetest_game.zip --tries=3 || (echo "Please download http://github.com/celeron55/minetest_game/zipball/master manually and save it as $packagedir/minetest_game.zip"; read -s)
+wget http://github.com/minetest/minetest_game/zipball/master \
+       -c -O $packagedir/minetest_game.zip --tries=3 || (echo "Please download http://github.com/minetest/minetest_game/zipball/master manually and save it as $packagedir/minetest_game.zip"; read -s)
 [ -e $packagedir/minetest_game.zip ] || (echo "minetest_game.zip not found"; exit 1)
 [ -e $packagedir/openal_stripped.zip ] || wget http://minetest.ru/bin/openal_stripped.zip \
        -c -O $packagedir/openal_stripped.zip || exit 1
@@ -63,10 +63,10 @@ wget http://github.com/celeron55/minetest_game/zipball/master \
 
 
 # Figure out some path names from the packages
-minetestdirname=`unzip -l $packagedir/minetest.zip | head -n 7 | tail -n 1 | sed -e 's/^[^c]*//' -e 's/\/.*$//'`
+minetestdirname=`unzip -l $packagedir/minetest.zip | head -n 7 | tail -n 1 | sed -e 's/^[^m]*//' -e 's/\/.*$//'`
 minetestdir=$builddir/$minetestdirname || exit 1
-git_hash=`echo $minetestdirname | sed -e 's/celeron55-minetest-//'`
-minetest_gamedirname=`unzip -l $packagedir/minetest_game.zip | head -n 7 | tail -n 1 | sed -e 's/^[^c]*//' -e 's/\/.*$//'`
+git_hash=`echo $minetestdirname | sed -e 's/minetest-minetest-//'`
+minetest_gamedirname=`unzip -l $packagedir/minetest_game.zip | head -n 7 | tail -n 1 | sed -e 's/^[^m]*//' -e 's/\/.*$//'`
 
 # Extract stuff
 cd $libdir || exit 1