From 95344bdc47d2802946672045e2d8f719fb94803e Mon Sep 17 00:00:00 2001 From: Oscar Lim Date: Sun, 8 Feb 2015 23:36:09 -0800 Subject: [PATCH 1/3] Use `wget` in travis setup Switch to using `wget` instead of `curl` in travis setup so that site redirection will work when downloading source packages to install. --- .travis_setup.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis_setup.sh b/.travis_setup.sh index a8a8d9b..b5b95d0 100644 --- a/.travis_setup.sh +++ b/.travis_setup.sh @@ -3,22 +3,22 @@ # LUA must be "Lua 5.1", "Lua 5.2" or "LuaJIT 2.0". if [ "$LUA" == "LuaJIT 2.0" ]; then - curl http://luajit.org/download/LuaJIT-2.0.2.tar.gz | tar xz + wget -O - http://luajit.org/download/LuaJIT-2.0.2.tar.gz | tar xz cd LuaJIT-2.0.2 make && sudo make install INSTALL_TSYMNAME=lua; else if [ "$LUA" == "Lua 5.1" ]; then - curl http://www.lua.org/ftp/lua-5.1.5.tar.gz | tar xz + wget -O - http://www.lua.org/ftp/lua-5.1.5.tar.gz | tar xz cd lua-5.1.5; elif [ "$LUA" == "Lua 5.2" ]; then - curl http://www.lua.org/ftp/lua-5.2.3.tar.gz | tar xz + wget -O - http://www.lua.org/ftp/lua-5.2.3.tar.gz | tar xz cd lua-5.2.3; fi sudo make linux install; fi cd .. -curl http://luarocks.org/releases/luarocks-2.1.2.tar.gz | tar xz +wget -O - http://luarocks.org/releases/luarocks-2.1.2.tar.gz | tar xz cd luarocks-2.1.2 if [ "$LUA" == "LuaJIT 2.0" ]; then From f3f3640c9b05d695c9561983db3f9abf84e438f4 Mon Sep 17 00:00:00 2001 From: Oscar Lim Date: Sun, 8 Feb 2015 23:37:29 -0800 Subject: [PATCH 2/3] Update travis to use luarocks v2.2.0 --- .travis_setup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis_setup.sh b/.travis_setup.sh index b5b95d0..8dcd44a 100644 --- a/.travis_setup.sh +++ b/.travis_setup.sh @@ -18,8 +18,8 @@ else fi cd .. -wget -O - http://luarocks.org/releases/luarocks-2.1.2.tar.gz | tar xz -cd luarocks-2.1.2 +wget -O - http://luarocks.org/releases/luarocks-2.2.0.tar.gz | tar xz +cd luarocks-2.2.0 if [ "$LUA" == "LuaJIT 2.0" ]; then ./configure --with-lua-include=/usr/local/include/luajit-2.0; From 6f8ead414eeb51c91d0670eabe538c3711962c58 Mon Sep 17 00:00:00 2001 From: Oscar Lim Date: Sun, 8 Feb 2015 23:38:37 -0800 Subject: [PATCH 3/3] Update travis setup script to exit on error --- .travis_setup.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis_setup.sh b/.travis_setup.sh index 8dcd44a..9eb7ae6 100644 --- a/.travis_setup.sh +++ b/.travis_setup.sh @@ -2,6 +2,8 @@ # Sets up Lua and Luarocks. # LUA must be "Lua 5.1", "Lua 5.2" or "LuaJIT 2.0". +set -e + if [ "$LUA" == "LuaJIT 2.0" ]; then wget -O - http://luajit.org/download/LuaJIT-2.0.2.tar.gz | tar xz cd LuaJIT-2.0.2