Skip to content

Commit 6da0ac0

Browse files
committed
fix an install bug for linux
1 parent 81966d0 commit 6da0ac0

File tree

3 files changed

+4
-12
lines changed

3 files changed

+4
-12
lines changed

vanilla/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ install: all
1414
# $(INSTALL) -d $(VANILLA_LIB_DIR)/vanilla/resty/
1515
$(INSTALL) ./bin/ $(VANILLA_LIB_DIR)/bin
1616
$(MKDIR) $(VANILLA_LIB_DIR)/vanilla
17-
$(INSTALL) ./base/ $(VANILLA_ROOT)/
17+
$(INSTALL) ./base/* $(VANILLA_ROOT)/
1818
$(INSTALL) ./v $(VANILLA_LIB_DIR)/vanilla
1919
$(INSTALL) ./sys $(VANILLA_LIB_DIR)/vanilla
2020
$(INSTALL) ./vanilla-$(VANILLA_VERSION) $(VANILLA_BIN_PATH)/vanilla-$(VANILLA_VERSION)

vanilla/base/init.lua

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,4 @@ init_vanilla = function ()
8787
end
8888

8989

90-
--+--------------------------------------------------------------------------------+--
91-
local helpers = require("/Users/zhoujing/data/vanilla/framework/0_1_0_rc6/vanilla.v.libs.utils")
92-
function sprint_r( ... )
93-
return helpers.sprint_r(...)
94-
end
95-
96-
function print_r( ... )
97-
ngx.say(sprint_r(...))
98-
end
90+
--+--------------------------------------------------------------------------------+--

vanilla/sys/application.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -974,7 +974,7 @@ init_vanilla()
974974
--+--------------------------------------------------------------------------------+--
975975
976976
977-
if Registry['VA_ENV'] == nil then
977+
-- if Registry['VA_ENV'] == nil then
978978
local helpers = LoadV "vanilla.v.libs.utils"
979979
function sprint_r( ... )
980980
return helpers.sprint_r(...)
@@ -993,7 +993,7 @@ if Registry['VA_ENV'] == nil then
993993
function err_log(msg)
994994
ngx.log(ngx.ERR, "===zjdebug" .. msg .. "===")
995995
end
996-
end
996+
-- end
997997
--+--------------------------------------------------------------------------------+--
998998
999999

0 commit comments

Comments
 (0)