diff --git a/base/web/matrix.go b/base/web/matrix.go index 54e435ab..a074dcad 100644 --- a/base/web/matrix.go +++ b/base/web/matrix.go @@ -20,12 +20,12 @@ func _matrix_list(m *ice.Message, domain, typ string, value ice.Maps, fields ... button := []ice.Any{PORTAL, DESKTOP, ADMIN, WORD, OPEN, compile, DREAM} kit.If(istech, func() { button = append(button, STATUS) }) - kit.If(istech, func() { button = append(button, VIMER, cli.RUNTIME, XTERM) }) + kit.If(istech, func() { button = append(button, VIMER, COMPILE, cli.RUNTIME, XTERM) }) m.PushRecord(value, fields...).PushButton(button...) button = []ice.Any{PORTAL, DESKTOP, ADMIN, WORD, OPEN, compile} kit.If(istech, func() { button = append(button, STATUS) }) - kit.If(istech, func() { button = append(button, VIMER, cli.RUNTIME, XTERM, cli.STOP) }) + kit.If(istech, func() { button = append(button, VIMER, COMPILE, cli.RUNTIME, XTERM, cli.STOP) }) m.Cmd(Space(m, domain), DREAM).Table(func(value ice.Maps) { switch value[mdb.TYPE] { case WORKER: diff --git a/base/web/serve.go b/base/web/serve.go index ce00b648..8f895546 100644 --- a/base/web/serve.go +++ b/base/web/serve.go @@ -241,7 +241,7 @@ func init() { cli.START: {Name: "start dev proto host port=9020 nodename username usernick", Hand: func(m *ice.Message, arg ...string) { if runtime.GOOS == cli.LINUX { m.Cmd(nfs.SAVE, nfs.ETC_LOCAL_SH, m.Spawn(ice.Maps{cli.PWD: kit.Path(""), aaa.USER: kit.UserName(), ctx.ARGS: kit.JoinCmds(arg...)}).Template("local.sh")+lex.NL) - m.GoSleep("3s", func() { m.Cmd("", PROXY_CONF, ice.Info.NodeName) }) + m.GoSleep("3s", func() { m.Cmd("", PROXY_CONF, kit.Select(ice.Info.NodeName, m.Option("nodename"))) }) } else if runtime.GOOS == cli.WINDOWS { m.Cmd(cli.SYSTEM, cli.ECHO, "-ne", kit.Format("\033]0;%s %s serve start %s\007", path.Base(kit.Path("")), strings.TrimPrefix(kit.Path(os.Args[0]), kit.Path("")+nfs.PS), kit.JoinCmdArgs(arg...))) diff --git a/core/code/binpack.go b/core/code/binpack.go index f2dd5f7b..a0e03bd9 100644 --- a/core/code/binpack.go +++ b/core/code/binpack.go @@ -24,7 +24,7 @@ func _binpack_file(m *ice.Message, files map[string]bool, w io.Writer, arg ...st return } else if kit.Contains(arg[0], "/bin/", "/log/") { return - } else if strings.HasPrefix(arg[0], "usr/volcanos/publish/") && !strings.HasSuffix(arg[0], "/proto.js") { + } else if kit.HasPrefix(arg[0], "usr/volcanos/publish/", "etc/conf/cert/") && !strings.HasSuffix(arg[0], "/proto.js") { return } switch arg[0] {