[incubator-apisix] branch master updated: bugfix(CLI): added `$prefix/deps/share/lua/5.1/?/init.lua` to search path. (#1443)

[membphis]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 04539ae  bugfix(CLI): added `$prefix/deps/share/lua/5.1/?/init.lua` to 
search path. (#1443)
04539ae is described below

commit 04539ae972b4af6f08296d0ff7605011c7886ba0
Author: YuanSheng Wang <membp...@gmail.com>
AuthorDate: Mon Apr 13 09:54:07 2020 +0800

    bugfix(CLI): added `$prefix/deps/share/lua/5.1/?/init.lua` to search path. 
(#1443)
---
 .travis/linux_apisix_current_luarocks_runner.sh | 5 ++++-
 .travis/linux_apisix_master_luarocks_runner.sh  | 3 +++
 bin/apisix                                      | 4 ++--
 utils/install-apisix.sh                         | 4 ++--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.travis/linux_apisix_current_luarocks_runner.sh 
b/.travis/linux_apisix_current_luarocks_runner.sh
index 7c30dc3..8a4e672 100755
--- a/.travis/linux_apisix_current_luarocks_runner.sh
+++ b/.travis/linux_apisix_current_luarocks_runner.sh
@@ -39,6 +39,8 @@ script() {
     openresty -V
     sudo service etcd start
 
+    sudo rm -rf /usr/local/apisix
+
     # install APISIX with local version
     sudo luarocks install rockspec/apisix-master-0.rockspec --only-deps
     sudo luarocks make rockspec/apisix-master-0.rockspec
@@ -61,7 +63,8 @@ script() {
         exit 1
     fi
 
-    sudo luarocks remove rockspec/apisix-master-0.rockspec
+    sudo luarocks purge --tree=/usr/local
+    sudo rm -rf /usr/local/apisix
 }
 
 case_opt=$1
diff --git a/.travis/linux_apisix_master_luarocks_runner.sh 
b/.travis/linux_apisix_master_luarocks_runner.sh
index 7be6389..8105a9d 100755
--- a/.travis/linux_apisix_master_luarocks_runner.sh
+++ b/.travis/linux_apisix_master_luarocks_runner.sh
@@ -39,6 +39,8 @@ script() {
     openresty -V
     sudo service etcd start
 
+    sudo rm -rf /usr/local/apisix
+
     # install APISIX by shell
     sudo mkdir -p /usr/local/apisix/deps
     sudo PATH=$PATH ./utils/install-apisix.sh install
@@ -71,6 +73,7 @@ script() {
     fi
 
     sudo luarocks remove rockspec/apisix-master-0.rockspec
+    sudo luarocks purge --tree=/usr/local
 }
 
 case_opt=$1
diff --git a/bin/apisix b/bin/apisix
index 83712c4..ea265a5 100755
--- a/bin/apisix
+++ b/bin/apisix
@@ -111,7 +111,7 @@ env APISIX_PROFILE;
 
 {% if stream_proxy then %}
 stream {
-    lua_package_path  "$prefix/deps/share/lua/5.1/?.lua;]=]
+    lua_package_path  
"$prefix/deps/share/lua/5.1/?.lua;$prefix/deps/share/lua/5.1/?/init.lua;]=]
                       .. 
[=[{*apisix_lua_home*}/?.lua;{*apisix_lua_home*}/?/init.lua;;{*lua_path*};";
     lua_package_cpath "$prefix/deps/lib64/lua/5.1/?.so;]=]
                       .. [=[$prefix/deps/lib/lua/5.1/?.so;;]=]
@@ -164,7 +164,7 @@ stream {
 {% end %}
 
 http {
-    lua_package_path  "$prefix/deps/share/lua/5.1/?.lua;]=]
+    lua_package_path  
"$prefix/deps/share/lua/5.1/?.lua;$prefix/deps/share/lua/5.1/?/init.lua;]=]
                        .. 
[=[{*apisix_lua_home*}/?.lua;{*apisix_lua_home*}/?/init.lua;;{*lua_path*};";
     lua_package_cpath "$prefix/deps/lib64/lua/5.1/?.so;]=]
                       .. [=[$prefix/deps/lib/lua/5.1/?.so;;]=]
diff --git a/utils/install-apisix.sh b/utils/install-apisix.sh
index ad1f97b..5fc9e99 100755
--- a/utils/install-apisix.sh
+++ b/utils/install-apisix.sh
@@ -49,8 +49,8 @@ do_install() {
         sudo luarocks install $APISIX_VER --tree=/usr/local/apisix/deps --local
     fi
 
-    sudo rm -f /usr/local/bin/apisix
-    sudo ln -s /usr/local/apisix/deps/bin/apisix /usr/local/bin/apisix
+    sudo rm -f /usr/bin/apisix
+    sudo ln -s /usr/local/apisix/deps/bin/apisix /usr/bin/apisix
 }