travis: use script setenv_lua.sh

starius · Dec 26, 2015 · aaf5cc1 · aaf5cc1
1 parent 8c6bba0
commit aaf5cc1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,14 +11,11 @@ env:
 
 before_install:
   - sudo apt-get update
-  - bash .travis/setup_lua.sh
+  - source .travis/setenv_lua.sh
   - bash .travis/install_rocks.sh
   - bash .travis/install_rote.sh
   - sudo apt-get install valgrind
   - sudo pip install cpp-coveralls
-  - luarocks path > paths
-  - echo 'PATH=$PATH:~/.luarocks/bin' >> paths
-  - . paths
 
 script:
   - bash .travis/test_with_valgrind.sh

diff --git a/.travis/setenv_lua.sh b/.travis/setenv_lua.sh
@@ -0,0 +1,5 @@
+export PATH=${PATH}:$HOME/.lua:$HOME/.local/bin
+export PATH=${PATH}:${TRAVIS_BUILD_DIR}/install/luarocks/bin
+export PATH=${PATH}:~/.luarocks/bin
+bash .travis/setup_lua.sh
+eval `$HOME/.lua/luarocks path`