webmcp
changeset 217:7f9c9c4434a1
Bugfixes/improvements in mcp.lua
author | jbe |
---|---|
date | Fri Jan 30 03:41:00 2015 +0100 (2015-01-30) |
parents | fd0360594636 |
children | 15c9de7832cc |
files | framework/bin/mcp.lua |
line diff
1.1 --- a/framework/bin/mcp.lua Mon Jan 12 03:02:26 2015 +0100 1.2 +++ b/framework/bin/mcp.lua Fri Jan 30 03:41:00 2015 +0100 1.3 @@ -23,14 +23,14 @@ 1.4 then 1.5 helpout = io.stdout 1.6 elseif 1.7 - #config_args < 1 or 1.8 + #WEBMCP_CONFIG_NAMES < 1 or 1.9 (WEBMCP_MODE == "interactive") ~= (arg3 == "INTERACTIVE") 1.10 then 1.11 helpout = io.stderr 1.12 end 1.13 - helpout:write("Usage: moonbridge -- <framework path>/bin/mcp.lua <framework path> <app base path> <app name> <config name> [<config name> ...]\n") 1.14 - helpout:write(" or: lua -i <framework path>/bin/mcp.lua <framework path> <app base path> INTERACTIVE <config name> [<config name> ...]\n") 1.15 if helpout then 1.16 + helpout:write("Usage: moonbridge -- <framework path>/bin/mcp.lua <framework path> <app base path> <app name> <config name> [<config name> ...]\n") 1.17 + helpout:write(" or: lua -i <framework path>/bin/mcp.lua <framework path> <app base path> INTERACTIVE <config name> [<config name> ...]\n") 1.18 if helpout == io.stderr then 1.19 return 1 1.20 else 1.21 @@ -38,7 +38,7 @@ 1.22 end 1.23 end 1.24 local function append_trailing_slash(str) 1.25 - return string.sub(str, "([^/])$", function(last) return last .. "/" end) 1.26 + return string.gsub(str, "([^/])$", function(last) return last .. "/" end) 1.27 end 1.28 WEBMCP_FRAMEWORK_PATH = append_trailing_slash(arg1) 1.29 WEBMCP_BASE_PATH = append_trailing_slash(arg2) 1.30 @@ -49,17 +49,23 @@ 1.31 1.32 -- setup search paths for libraries 1.33 do 1.34 - package.path = WEBMCP_FRAMEWORK_PATH .. "lib/?.lua;" .. package.path 1.35 + if string.match(package.path, "^[^;]") then 1.36 + package.path = ";" .. package.path 1.37 + end 1.38 + package.path = WEBMCP_FRAMEWORK_PATH .. "lib/?.lua" .. package.path 1.39 -- find out which file name extension shared libraries have 1.40 local slib_exts = {} 1.41 for ext in string.gmatch(package.cpath, "%?%.([A-Za-z0-9_-]+)") do 1.42 - slib_exts[ext] = true 1.43 + if not slib_exts[ext] then 1.44 + slib_exts[#slib_exts+1] = ext 1.45 + slib_exts[ext] = true 1.46 + end 1.47 end 1.48 local paths = {} 1.49 - for ext in pairs(slib_exts) do 1.50 + for i, ext in ipairs(slib_exts) do 1.51 paths[#paths+1] = WEBMCP_FRAMEWORK_PATH .. "accelerator/?." .. ext 1.52 end 1.53 - for ext in pairs(slib_exts) do 1.54 + for i, ext in ipairs(slib_exts) do 1.55 paths[#paths+1] = WEBMCP_FRAMEWORK_PATH .. "lib/?." .. ext 1.56 end 1.57 paths[#paths+1] = package.cpath