diff options
| author | Steven Barth <steven@midlink.org> | 2008-08-06 20:20:40 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2008-08-06 20:20:40 +0000 |
| commit | 50093ed3d97c763d344f8f6b7bf934e593a92178 (patch) | |
| tree | 5fa7d666103429e59a88139b5388a3ba24997782 /libs/web/luasrc | |
| parent | 76982655fa433edd885bbb80bbe74e82fca527e2 (diff) | |
Moved luci.sys.libpath to luci.util
Diffstat (limited to 'libs/web/luasrc')
| -rw-r--r-- | libs/web/luasrc/dispatcher.lua | 2 | ||||
| -rw-r--r-- | libs/web/luasrc/i18n.lua | 4 | ||||
| -rw-r--r-- | libs/web/luasrc/template.lua | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/libs/web/luasrc/dispatcher.lua b/libs/web/luasrc/dispatcher.lua index 576db36b4..840dbf3c2 100644 --- a/libs/web/luasrc/dispatcher.lua +++ b/libs/web/luasrc/dispatcher.lua @@ -201,7 +201,7 @@ end --- Generate the dispatching index using the best possible strategy. function createindex() - local path = luci.sys.libpath() .. "/controller/" + local path = luci.util.libpath() .. "/controller/" local suff = ".lua" if luci.util.copcall(require, "luci.fastindex") then diff --git a/libs/web/luasrc/i18n.lua b/libs/web/luasrc/i18n.lua index 5f0ee8a01..84a869539 100644 --- a/libs/web/luasrc/i18n.lua +++ b/libs/web/luasrc/i18n.lua @@ -26,10 +26,10 @@ limitations under the License. --- LuCI translation library. module("luci.i18n", package.seeall) -require("luci.sys") +require("luci.util") table = {} -i18ndir = luci.sys.libpath() .. "/i18n/" +i18ndir = luci.util.libpath() .. "/i18n/" loaded = {} context = luci.util.threadlocal() default = "en" diff --git a/libs/web/luasrc/template.lua b/libs/web/luasrc/template.lua index 659c7216d..907403fcb 100644 --- a/libs/web/luasrc/template.lua +++ b/libs/web/luasrc/template.lua @@ -30,12 +30,13 @@ module("luci.template", package.seeall) require("luci.config") require("luci.util") require("luci.fs") +require("luci.sys") require("luci.http") luci.config.template = luci.config.template or {} -viewdir = luci.config.template.viewdir or luci.sys.libpath() .. "/view" -compiledir = luci.config.template.compiledir or luci.sys.libpath() .. "/view" +viewdir = luci.config.template.viewdir or luci.util.libpath() .. "/view" +compiledir = luci.config.template.compiledir or luci.util.libpath() .. "/view" -- Compile modes: |