diff --git a/base/ssh/scripts.go b/base/ssh/script.go similarity index 100% rename from base/ssh/scripts.go rename to base/ssh/script.go diff --git a/base/web/serve.go b/base/web/serve.go index 0d716001..30d44f56 100644 --- a/base/web/serve.go +++ b/base/web/serve.go @@ -374,10 +374,10 @@ func init() { PP(ice.REQUIRE): {Name: "/require/shylinux.com/x/volcanos/proto.js", Help: "代码库", Hand: func(m *ice.Message, arg ...string) { _share_repos(m, path.Join(arg[0], arg[1], arg[2]), arg[3:]...) }}, - PP(ice.REQUIRE, ice.LIB, ice.NODE_MODULES): {Name: "/require/lib/node_modules/", Help: "依赖库", Hand: func(m *ice.Message, arg ...string) { - p := path.Join(ice.USR_VOLCANOS, ice.LIB, ice.NODE_MODULES, path.Join(arg...)) + PP(ice.REQUIRE, ice.PAGE, ice.NODE_MODULES): {Name: "/require/page/node_modules/", Help: "依赖库", Hand: func(m *ice.Message, arg ...string) { + p := path.Join(ice.USR_VOLCANOS, ice.PAGE, ice.NODE_MODULES, path.Join(arg...)) if !nfs.ExistsFile(m, p) { - m.Cmd(cli.SYSTEM, "npm", "install", arg[0], kit.Dict(cli.CMD_DIR, path.Join(ice.USR_VOLCANOS, ice.LIB))) + m.Cmd(cli.SYSTEM, "npm", "install", arg[0], kit.Dict(cli.CMD_DIR, path.Join(ice.USR_VOLCANOS, ice.PAGE))) } m.RenderDownload(p) }}, diff --git a/core/code/webpack.go b/core/code/webpack.go index 818c376f..8dd4b480 100644 --- a/core/code/webpack.go +++ b/core/code/webpack.go @@ -87,13 +87,13 @@ func _webpack_cache(m *ice.Message, dir string, write bool) { p := value[nfs.PATH] switch kit.Ext(p) { case nfs.CSS: - _webpack_css(m, css, js, path.Join(ice.REQUIRE, ice.LIB, ice.NODE_MODULES, p)) + _webpack_css(m, css, js, path.Join(ice.REQUIRE, ice.PAGE, ice.NODE_MODULES, p)) return case nfs.JS: default: p = p + "/lib/" + p + ".js" } - _webpack_node(m, js, path.Join(ice.REQUIRE, ice.LIB, ice.NODE_MODULES, p)) + _webpack_node(m, js, path.Join(ice.REQUIRE, ice.PAGE, ice.NODE_MODULES, p)) }) } func _webpack_build(m *ice.Message, file string) {