Merge pull request #2399 from niamu/travis

Travis CI fixes
hawkthorne · May 24, 2015 · 8ec38fe · 8ec38fe
2 parents d6e4792 + 0361bc9
commit 8ec38fe
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,11 +2,11 @@ language: erlang
 before_install:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
+install:
   - sudo apt-get install python-virtualenv lua5.1
   - sudo add-apt-repository -y ppa:bartbes/love-stable
-  - sudo apt-get update -qq
+  - sudo apt-get update -y -f
   - sudo apt-get install -y love
-install:
   - mkdir -p $TRAVIS_BUILD_DIR/share/love/
 env:
   global:

diff --git a/Makefile b/Makefile
@@ -50,7 +50,7 @@ bin/love.app/Contents/MacOS/love:
 
 /usr/bin/love:
 	sudo add-apt-repository -y ppa:bartbes/love-stable
-	sudo apt-get update -qq
+	sudo apt-get update -y -f
 	sudo apt-get install -y love
 
 ######################################################

diff --git a/src/main.lua b/src/main.lua
@@ -44,7 +44,14 @@ function love.load(arg)
     error("invalid version label")
   end
 
-  if love._version ~= "0.9.1" then
+  local version = utils.split(love._version:gsub("%.", "/"),"/")
+  local major = tonumber(version[1])
+  local minor = tonumber(version[2])
+  local revision = tonumber(version[3])
+
+  if major ~= 0 or
+     minor ~= 9 or
+     revision < 1 then
     error("Love 0.9.1 is required")
   end