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 fc475cc change: use the correct parameters based on the version of
luarocks
fc475cc is described below
commit fc475ccd7e72c713f8e7612cc951dcc8218cd323
Author: dabue <[email protected]>
AuthorDate: Tue Mar 10 15:16:14 2020 +0800
change: use the correct parameters based on the version of luarocks
Fix #1227
---
Makefile | 4 +---
utils/install-apisix.sh | 5 +----
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index 6083288..6ac491b 100644
--- a/Makefile
+++ b/Makefile
@@ -47,9 +47,7 @@ help: default
### deps: Installation dependencies
.PHONY: deps
deps: default
-ifeq ($(UNAME),Darwin)
- luarocks install --lua-dir=$(LUAJIT_DIR)
rockspec/apisix-master-0.rockspec --tree=deps --only-deps --local
-else ifeq ($(LUAROCKS_VER),luarocks 3.)
+ifeq ($(LUAROCKS_VER),luarocks 3.)
luarocks install --lua-dir=$(LUAJIT_DIR)
rockspec/apisix-master-0.rockspec --tree=deps --only-deps --local
else
luarocks install rockspec/apisix-master-0.rockspec --tree=deps
--only-deps --local
diff --git a/utils/install-apisix.sh b/utils/install-apisix.sh
index 75295dd..ad1f97b 100755
--- a/utils/install-apisix.sh
+++ b/utils/install-apisix.sh
@@ -42,10 +42,7 @@ echo $UNAME
do_install() {
- if [ "$UNAME" = "Darwin" ]; then
- sudo luarocks install --lua-dir=$LUA_JIT_DIR $APISIX_VER
--tree=/usr/local/apisix/deps --local
-
- elif [ "$LUAROCKS_VER" = 'luarocks 3.' ]; then
+ if [ "$LUAROCKS_VER" = 'luarocks 3.' ]; then
sudo luarocks install --lua-dir=$LUA_JIT_DIR $APISIX_VER
--tree=/usr/local/apisix/deps --local
else
