aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml6
-rwxr-xr-xsrc/bin/luarocks3
-rwxr-xr-xsrc/bin/luarocks-admin3
3 files changed, 7 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 8f265fb1..7ea8b487 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,7 @@ language: python
2 2
3cache: 3cache:
4 directories: 4 directories:
5 - lua_install
5 - test/testing_cache-5.1 6 - test/testing_cache-5.1
6 - test/testing_cache-5.2 7 - test/testing_cache-5.2
7 - test/testing_cache-5.3 8 - test/testing_cache-5.3
@@ -53,9 +54,8 @@ matrix:
53 54
54 55
55before_install: 56before_install:
56 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update;fi 57 - if [ ! -d lua_install ]; then pip install hererocks; fi
57 - pip install hererocks 58 - if [ ! -d lua_install ]; then hererocks lua_install -r^ --$LUA; fi
58 - hererocks lua_install --luarocks @luarocks-3 --$LUA
59 - export PATH=$PATH:$PWD/lua_install/bin # Add directory with all installed binaries to PATH 59 - export PATH=$PATH:$PWD/lua_install/bin # Add directory with all installed binaries to PATH
60 60
61install: 61install:
diff --git a/src/bin/luarocks b/src/bin/luarocks
index 88a1d1ca..ee7edf19 100755
--- a/src/bin/luarocks
+++ b/src/bin/luarocks
@@ -1,4 +1,5 @@
1#!/usr/bin/env lua 1#!/Programs/Lua/5.3.3/bin/lua-5.3
2package.path = [[/Users/hisham/projects/luarocks/src/?.lua;]]..package.path
2 3
3-- this should be loaded first. 4-- this should be loaded first.
4local cfg = require("luarocks.core.cfg") 5local cfg = require("luarocks.core.cfg")
diff --git a/src/bin/luarocks-admin b/src/bin/luarocks-admin
index 5db24640..7af77fc2 100755
--- a/src/bin/luarocks-admin
+++ b/src/bin/luarocks-admin
@@ -1,4 +1,5 @@
1#!/usr/bin/env lua 1#!/Programs/Lua/5.3.3/bin/lua-5.3
2package.path = [[/Users/hisham/projects/luarocks/src/?.lua;]]..package.path
2 3
3-- this should be loaded first. 4-- this should be loaded first.
4local cfg = require("luarocks.core.cfg") 5local cfg = require("luarocks.core.cfg")