[apisix] branch master updated: test: remove temporary hack (#2625)

[wenming]

This is an automated email from the ASF dual-hosted git repository.

wenming pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git


The following commit(s) were added to refs/heads/master by this push:
     new f790c92  test: remove temporary hack (#2625)
f790c92 is described below

commit f790c92b2300173daed38f8a5165f27bb6eaeca5
Author: 罗泽轩 <spacewander...@gmail.com>
AuthorDate: Wed Nov 4 17:17:09 2020 +0800

    test: remove temporary hack (#2625)
---
 .travis/linux_apisix_master_luarocks_runner.sh | 7 -------
 bin/apisix                                     | 8 ++------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/.travis/linux_apisix_master_luarocks_runner.sh 
b/.travis/linux_apisix_master_luarocks_runner.sh
index 61d0ca5..01a8d6a 100755
--- a/.travis/linux_apisix_master_luarocks_runner.sh
+++ b/.travis/linux_apisix_master_luarocks_runner.sh
@@ -60,9 +60,6 @@ script() {
     sudo PATH=$PATH ./utils/install-apisix.sh install > build.log 2>&1 || (cat 
build.log && exit 1)
 
     which apisix
-    # TODO: DELETE ME AFTER
-    sudo cp ../bin/apisix /usr/bin/apisix
-    lua -e 'print(package.path)'
 
     # run test
     sudo PATH=$PATH apisix help
@@ -75,10 +72,6 @@ script() {
     # install APISIX by luarocks
     sudo luarocks install $APISIX_MAIN > build.log 2>&1 || (cat build.log && 
exit 1)
 
-    # TODO: DELETE ME AFTER
-    sudo cp ../bin/apisix /usr/bin/apisix
-    lua -e 'print(package.path)'
-
     # show install files
     luarocks show apisix
 
diff --git a/bin/apisix b/bin/apisix
index b1ff52e..cfc5ba6 100755
--- a/bin/apisix
+++ b/bin/apisix
@@ -29,12 +29,8 @@ local pkg_path = apisix_home .. "/deps/share/lua/5.1/?.lua;;"
 package.cpath = pkg_cpath .. pkg_cpath_org
 package.path  = pkg_path .. pkg_path_org
 
--- FIXME DELETE AFTER MERGE
-local env = require("apisix.cli.env")
-if type(env) == 'function' then
-    -- the cached master one returns table instead of function
-    env = env(apisix_home, pkg_cpath_org, pkg_path_org)
-end
+-- pass path to construct the final result
+local env = require("apisix.cli.env")(apisix_home, pkg_cpath_org, pkg_path_org)
 local util = require("apisix.cli.util")
 local ngx_tpl = require("apisix.cli.ngx_tpl")
 local yaml = require("tinyyaml")