diff --git a/bin/apisix b/bin/apisix index 409ece52fea1..4583fd1b52a0 100755 --- a/bin/apisix +++ b/bin/apisix @@ -31,11 +31,11 @@ fi # find the openresty OR_BIN=$(command -v openresty || exit 1) OR_EXEC=${OR_BIN:-'/usr/local/openresty-debug/bin/openresty'} -OR_VER=$(openresty -v 2>&1 | awk -F '/' '{print $2}' | awk -F '.' '{print $1"."$2}') +OR_VER=$(openresty -v 2>&1 | awk -F '/' '{print $2}' | awk -F '.' '{print $1 * 100 + $2}') LUA_VERSION=$(lua -v 2>&1| grep -E -o "Lua [0-9]+.[0-9]+") -if [[ -e $OR_EXEC && "$OR_VER" =~ "1.19" ]]; then - # OpenResty version is 1.19, use luajit by default +if [[ -e $OR_EXEC && "$OR_VER" -ge 119 ]]; then + # OpenResty version is >= 1.19, use luajit by default # find the luajit binary of openresty LUAJIT_BIN=$(${OR_EXEC} -V 2>&1 | grep prefix | grep -Eo 'prefix=(.*)/nginx\s+--' | grep -Eo '/.*/')luajit/bin/luajit @@ -43,9 +43,9 @@ if [[ -e $OR_EXEC && "$OR_VER" =~ "1.19" ]]; then echo "$LUAJIT_BIN $APISIX_LUA $*" exec $LUAJIT_BIN $APISIX_LUA $* elif [[ "$LUA_VERSION" =~ "Lua 5.1" ]]; then - # OpenResty version is not 1.19, use Lua 5.1 by default + # OpenResty version is < 1.19, use Lua 5.1 by default echo "lua $APISIX_LUA $*" exec lua $APISIX_LUA $* else - echo "ERROR: Please check the version of OpenResty and Lua, OpenResty 1.19 + LuaJIT or OpenResty before 1.19 + Lua 5.1 is required for Apache APISIX." + echo "ERROR: Please check the version of OpenResty and Lua, OpenResty 1.19+ + LuaJIT or OpenResty before 1.19 + Lua 5.1 is required for Apache APISIX." fi diff --git a/utils/linux-install-luarocks.sh b/utils/linux-install-luarocks.sh index be738ce45d42..a8d1bafd0428 100755 --- a/utils/linux-install-luarocks.sh +++ b/utils/linux-install-luarocks.sh @@ -29,8 +29,8 @@ rm -f v"$LUAROCKS_VER".tar.gz cd luarocks-"$LUAROCKS_VER" || exit OR_BIN="$OPENRESTY_PREFIX/bin/openresty" -OR_VER=$($OR_BIN -v 2>&1 | awk -F '/' '{print $2}' | awk -F '.' '{print $1"."$2}') -if [[ -e $OR_BIN && "$OR_VER" == 1.19 ]]; then +OR_VER=$($OR_BIN -v 2>&1 | awk -F '/' '{print $2}' | awk -F '.' '{print $1 * 100 + $2}') +if [[ -e $OR_BIN && "$OR_VER" -ge 119 ]]; then WITH_LUA_OPT="--with-lua=${OPENRESTY_PREFIX}/luajit" else # For old version OpenResty, we still need to install LuaRocks with Lua