change: don't hack the prefix of LuaRocks (apache#3508)

Signed-off-by: spacewander <[email protected]>
summerhill5 · Feb 3, 2021 · c8139fc · c8139fc
1 parent a6358ea
commit c8139fc
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 12 deletions.
diff --git a/.travis/linux_apisix_master_luarocks_runner.sh b/.travis/linux_apisix_master_luarocks_runner.sh
@@ -54,6 +54,7 @@ script() {
 
     # install APISIX by luarocks
     sudo luarocks install $APISIX_MAIN > build.log 2>&1 || (cat build.log && exit 1)
+    cp ../bin/apisix /usr/local/bin/apisix
 
     # show install files
     luarocks show apisix

diff --git a/apisix/cli/apisix.lua b/apisix/cli/apisix.lua
@@ -21,10 +21,7 @@ local pkg_path_org = package.path
 local apisix_home = "/usr/local/apisix"
 local pkg_cpath = apisix_home .. "/deps/lib64/lua/5.1/?.so;"
                   .. apisix_home .. "/deps/lib/lua/5.1/?.so;"
-                  .. "/usr/lib64/lua/5.1/?.so;"
-                  .. "/usr/lib/lua/5.1/?.so;;"
 local pkg_path = apisix_home .. "/deps/share/lua/5.1/?.lua;"
-                  .. "/usr/share/lua/5.1/?.lua;;"
 
 -- modify the load path to load our dependencies
 package.cpath = pkg_cpath .. pkg_cpath_org

diff --git a/apisix/cli/ngx_tpl.lua b/apisix/cli/ngx_tpl.lua
@@ -57,12 +57,9 @@ env {*name*};
 {% if stream_proxy then %}
 stream {
     lua_package_path  "{*extra_lua_path*}$prefix/deps/share/lua/5.1/?.lua;$prefix/deps/share/lua/5.1/?/init.lua;]=]
-                      .. [=[/usr/share/lua/5.1/?.lua;/usr/share/lua/5.1/?/init.lua;]=]
                       .. [=[{*apisix_lua_home*}/?.lua;{*apisix_lua_home*}/?/init.lua;;{*lua_path*};";
     lua_package_cpath "{*extra_lua_cpath*}$prefix/deps/lib64/lua/5.1/?.so;]=]
                       .. [=[$prefix/deps/lib/lua/5.1/?.so;;]=]
-                      .. [=[/usr/lib64/lua/5.1/?.so;]=]
-                      .. [=[/usr/lib/lua/5.1/?.so;]=]
                       .. [=[{*lua_cpath*};";
     lua_socket_log_errors off;
 
@@ -123,12 +120,9 @@ http {
     # put extra_lua_path in front of the builtin path
     # so user can override the source code
     lua_package_path  "{*extra_lua_path*}$prefix/deps/share/lua/5.1/?.lua;$prefix/deps/share/lua/5.1/?/init.lua;]=]
-                       .. [=[/usr/share/lua/5.1/?.lua;/usr/share/lua/5.1/?/init.lua;]=]
                        .. [=[{*apisix_lua_home*}/?.lua;{*apisix_lua_home*}/?/init.lua;;{*lua_path*};";
     lua_package_cpath "{*extra_lua_cpath*}$prefix/deps/lib64/lua/5.1/?.so;]=]
                       .. [=[$prefix/deps/lib/lua/5.1/?.so;;]=]
-                      .. [=[/usr/lib64/lua/5.1/?.so;]=]
-                      .. [=[/usr/lib/lua/5.1/?.so;]=]
                       .. [=[{*lua_cpath*};";
 
     lua_shared_dict internal_status      10m;

diff --git a/bin/apisix b/bin/apisix
@@ -20,9 +20,9 @@
 if [ -s './apisix/cli/apisix.lua' ]; then
     # install via source
     APISIX_LUA=./apisix/cli/apisix.lua
-elif [ -s '/usr/share/lua/5.1/apisix/cli/apisix.lua' ]; then
+elif [ -s '/usr/local/share/lua/5.1/apisix/cli/apisix.lua' ]; then
     # install via luarock
-    APISIX_LUA=/usr/share/lua/5.1/apisix/cli/apisix.lua
+    APISIX_LUA=/usr/local/share/lua/5.1/apisix/cli/apisix.lua
 elif [ -s '/usr/local/apisix/deps/share/lua/5.1/apisix/cli/apisix.lua' ]; then
     # install via shell
     APISIX_LUA=/usr/local/apisix/deps/share/lua/5.1/apisix/cli/apisix.lua

diff --git a/utils/linux-install-luarocks.sh b/utils/linux-install-luarocks.sh
@@ -33,7 +33,7 @@ else
     WITH_LUA_OPT=
 fi
 
-./configure --prefix=/usr $WITH_LUA_OPT \
+./configure $WITH_LUA_OPT \
     > build.log 2>&1 || (cat build.log && exit 1)
 
 make build > build.log 2>&1 || (cat build.log && exit 1)