[incubator-apisix] branch master updated: CLI: added missing Lua path. (#1114)

[me...@apache.org]

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 4a681af  CLI: added missing Lua path. (#1114)
4a681af is described below

commit 4a681af4cb42b2184d5d79bbdd1be65a6b3797f3
Author: YuanSheng Wang <me...@gmail.com>
AuthorDate: Sun Feb 9 20:57:13 2020 +0800

    CLI: added missing Lua path. (#1114)
---
 .travis/check-nginxconf.sh | 2 +-
 bin/apisix                 | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis/check-nginxconf.sh b/.travis/check-nginxconf.sh
index ba8e4b7..938325a 100644
--- a/.travis/check-nginxconf.sh
+++ b/.travis/check-nginxconf.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/bin/apisix b/bin/apisix
index eea31ef..db8e97b 100755
--- a/bin/apisix
+++ b/bin/apisix
@@ -103,6 +103,7 @@ worker_shutdown_timeout 3;
 {% if stream_proxy then %}
 stream {
     lua_package_path  "$prefix/deps/share/lua/5.1/?.lua;/usr/share/lua/5.1/apisix/lua/?.lua;]=]
+                      .. [=[/usr/local/share/lua/5.1/apisix/lua/?.lua;]=]
                       .. [=[$prefix/deps/share/lua/5.1/apisix/lua/?.lua;]=]
                       .. [=[{*apisix_lua_home*}/lua/?.lua;;{*lua_path*};";
     lua_package_cpath "$prefix/deps/lib64/lua/5.1/?.so;]=]
@@ -150,6 +151,7 @@ stream {
 
 http {
     lua_package_path  "$prefix/deps/share/lua/5.1/?.lua;/usr/share/lua/5.1/apisix/lua/?.lua;]=]
+                      .. [=[/usr/local/share/lua/5.1/apisix/lua/?.lua;]=]
                       .. [=[$prefix/deps/share/lua/5.1/apisix/lua/?.lua;]=]
                       .. [=[{*apisix_lua_home*}/lua/?.lua;;{*lua_path*};";
     lua_package_cpath "$prefix/deps/lib64/lua/5.1/?.so;]=]