From 46f74c05b008b6f62c658fbfef960db6ae2d3738 Mon Sep 17 00:00:00 2001 From: shy Date: Sun, 26 Jun 2022 14:03:17 +0800 Subject: [PATCH] opt some --- base/cli/runtime.go | 3 ++- base/web/space.go | 2 +- core/code/compile.go | 4 ++-- render.go | 3 ++- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/base/cli/runtime.go b/base/cli/runtime.go index 2204d31b..27fedf26 100644 --- a/base/cli/runtime.go +++ b/base/cli/runtime.go @@ -100,9 +100,10 @@ const ( const ( GOARCH = "GOARCH" AMD64 = "amd64" - X386 = "386" + X86 = "386" ARM = "arm" ARM64 = "arm64" + MIPSLE = "mipsle" GOOS = "GOOS" LINUX = "linux" diff --git a/base/web/space.go b/base/web/space.go index 7e6c1afe..b2f53c1d 100644 --- a/base/web/space.go +++ b/base/web/space.go @@ -234,7 +234,7 @@ func _space_fork(m *ice.Message) { args := append([]string{mdb.TYPE, kind, mdb.NAME, name}, m.OptionSimple(SHARE, RIVER)...) m.Go(func() { - h := m.Rich(SPACE, nil, kit.Dict(SOCKET, s, mdb.TEXT, text, args)) + h := m.Rich(SPACE, nil, kit.Dict(SOCKET, s, mdb.TEXT, kit.Select(text, m.Option(mdb.TEXT)), args)) m.Log_CREATE(SPACE, name, mdb.TYPE, kind) switch kind { diff --git a/core/code/compile.go b/core/code/compile.go index eeb807d8..af615420 100644 --- a/core/code/compile.go +++ b/core/code/compile.go @@ -17,7 +17,7 @@ func _compile_target(m *ice.Message, arg ...string) (string, string, string, str main, file := ice.SRC_MAIN_GO, "" for _, k := range arg { switch k { - case cli.X386, cli.AMD64, cli.ARM64, cli.ARM: + case cli.AMD64, cli.X86, cli.ARM, cli.ARM64, cli.MIPSLE: arch = k case cli.WINDOWS, cli.DARWIN, cli.LINUX: goos = k @@ -46,7 +46,7 @@ func init() { cli.ENV, kit.Dict("GOPROXY", "https://goproxy.cn,direct", "GOPRIVATE", "shylinux.com,github.com", "CGO_ENABLED", "0"), )}, }, Commands: map[string]*ice.Command{ - COMPILE: {Name: "compile arch=amd64,386,arm,arm64 os=linux,darwin,windows src=src/main.go@key run binpack relay install", Help: "编译", Action: map[string]*ice.Action{ + COMPILE: {Name: "compile arch=amd64,386,arm,arm64,mipsle os=linux,darwin,windows src=src/main.go@key run binpack relay install", Help: "编译", Action: map[string]*ice.Action{ mdb.INPUTS: {Name: "inputs", Help: "补全", Hand: func(m *ice.Message, arg ...string) { m.Cmdy(nfs.DIR, ice.SRC, nfs.DIR_CLI_FIELDS, kit.Dict(nfs.DIR_REG, `.*\.go$`)).Sort(nfs.PATH) }}, diff --git a/render.go b/render.go index b20efa83..f5a09ee1 100644 --- a/render.go +++ b/render.go @@ -95,7 +95,8 @@ func (m *Message) RenderDownload(args ...Any) *Message { return m.Render(RENDER_DOWNLOAD, args...) } func (m *Message) RenderWebsite(pod string, dir string, arg ...string) *Message { - return m.RenderResult(m.Cmdx(m.Space(pod), WEBSITE, SHOW, dir, arg)) + m.Echo(m.Cmdx(m.Space(pod), WEBSITE, SHOW, dir, arg)) + return m.RenderResult() } func (m *Message) RenderIndex(serve, repos string, file ...string) *Message { return m.RenderDownload(path.Join(m.Conf(serve, kit.Keym(repos, "path")), kit.Select(m.Conf(serve, kit.Keym(repos, INDEX)), path.Join(file...))))