Translated using Weblate (Spanish)

[dragonfireclient.git] / util / travis / before_install.sh

diff --git a/util/travis/before_install.sh b/util/travis/before_install.sh
index 19c40ef90704514b54e44974de77db7d4f013e24..649486dad6e341a659f10b17b34b3dd141cd2639 100755 (executable)
--- a/util/travis/before_install.sh
+++ b/util/travis/before_install.sh
@@ -4,32 +4,26 @@ echo "Preparing for $TRAVIS_COMMIT_RANGE"
 
 . util/travis/common.sh
 
-if [[ "${LINT}" == "1" ]]; then
+if [[ ! -z "${CLANG_FORMAT}" ]]; then
        exit 0
 fi
 
 needs_compile || exit 0
 
-if [[ $PLATFORM == "Unix" ]] || [[ $CLANG_TIDY == "1" ]]; then
-       if [[ $TRAVIS_OS_NAME == "linux" ]] || [[ $CLANG_TIDY == "1" ]]; then
+if [[ $PLATFORM == "Unix" ]] || [[ ! -z "${CLANG_TIDY}" ]]; then
+       if [[ $TRAVIS_OS_NAME == "linux" ]] || [[ ! -z "${CLANG_TIDY}" ]]; then
                install_linux_deps
        else
                install_macosx_deps
        fi
 elif [[ $PLATFORM == "Win32" ]]; then
-       sudo apt-get update
-       sudo apt-get install p7zip-full
-       wget http://minetest.kitsunemimi.pw/mingw-w64-i686_7.1.1_ubuntu14.04.7z -O mingw.7z
-       sed -e "s|%PREFIX%|i686-w64-mingw32|" \
-               -e "s|%ROOTPATH%|/usr/i686-w64-mingw32|" \
-               < util/travis/toolchain_mingw.cmake.in > util/buildbot/toolchain_mingw.cmake
-       sudo 7z x -y -o/usr mingw.7z
+       wget http://minetest.kitsunemimi.pw/mingw-w64-i686_9.2.0_ubuntu18.04.tar.xz -O mingw.tar.xz
+       # buildwin32.sh detects the installed toolchain automatically
+       sudo tar -xaf mingw.tar.xz -C /usr
 elif [[ $PLATFORM == "Win64" ]]; then
-       sudo apt-get update
-       sudo apt-get install p7zip-full
-       wget http://minetest.kitsunemimi.pw/mingw-w64-x86_64_7.1.1_ubuntu14.04.7z -O mingw.7z
+       wget http://minetest.kitsunemimi.pw/mingw-w64-x86_64_9.2.0_ubuntu18.04.tar.xz -O mingw.tar.xz
        sed -e "s|%PREFIX%|x86_64-w64-mingw32|" \
                -e "s|%ROOTPATH%|/usr/x86_64-w64-mingw32|" \
                < util/travis/toolchain_mingw.cmake.in > util/buildbot/toolchain_mingw64.cmake
-       sudo 7z x -y -o/usr mingw.7z
+       sudo tar -xaf mingw.tar.xz -C /usr
 fi