From c869e1fed71026fe1f9804e8a33e2b7c6119c894 Mon Sep 17 00:00:00 2001 From: shy Date: Mon, 22 Jan 2024 11:29:14 +0800 Subject: [PATCH] add some --- base/web/dream.go | 4 ++-- misc/ssh/relay/relay.go | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/base/web/dream.go b/base/web/dream.go index 7ac630df..d6287e8f 100644 --- a/base/web/dream.go +++ b/base/web/dream.go @@ -232,12 +232,12 @@ func init() { }) }}, cli.BUILD: {Name: "build name", Hand: func(m *ice.Message, arg ...string) { - m.Option(ice.MSG_TITLE, m.ActionKey()) + m.Option(ice.MSG_TITLE, kit.Keys(m.CommandKey(), m.ActionKey())) m.Cmd("", FOR_FLOW, m.Option(mdb.NAME), kit.JoinWord(cli.SH, ice.ETC_MISS_SH)) m.Sleep3s().Cmdy(ROUTE, cli.BUILD).ProcessInner() }}, PUBLISH: {Name: "publish name", Help: "发布", Icon: "bi bi-send-check", Hand: func(m *ice.Message, arg ...string) { - m.Option(ice.MSG_TITLE, m.ActionKey()) + m.Option(ice.MSG_TITLE, kit.Keys(m.CommandKey(), m.ActionKey())) defer ToastProcess(m)() list := []string{cli.LINUX, cli.DARWIN, cli.WINDOWS} msg := m.Spawn(ice.Maps{ice.MSG_DAEMON: ""}) diff --git a/misc/ssh/relay/relay.go b/misc/ssh/relay/relay.go index a23c1ce1..53f6a7ab 100644 --- a/misc/ssh/relay/relay.go +++ b/misc/ssh/relay/relay.go @@ -108,6 +108,7 @@ func (s relay) Inputs(m *ice.Message, arg ...string) { } } func (s relay) Stats(m *ice.Message) { + m.Option(ice.MSG_TITLE, kit.Keys(m.CommandKey(), m.ActionKey())) cmds := []string{ PACKAGE, `if yum -h &>/dev/null; then echo yum; elif apk version &>/dev/null; then echo apk; elif apt -h &>/dev/null; then echo apt; fi`, SHELL, `echo $SHELL`, KERNEL, `uname -s`, ARCH, `uname -m`, @@ -293,7 +294,7 @@ func (s relay) Install(m *ice.Message, arg ...string) { s.Modify(m, kit.Simple(m.OptionSimple(MACHINE, web.DREAM))...) } func (s relay) Upgrade(m *ice.Message, arg ...string) { - m.Option(ice.MSG_TITLE, m.ActionKey()) + m.Option(ice.MSG_TITLE, kit.Keys(m.CommandKey(), m.ActionKey())) if len(arg) == 0 && (m.Option(MACHINE) == "" || strings.Contains(m.Option(MACHINE), ",")) { s.foreach(m, func(msg *ice.Message, cmd []string) { ssh.PushShell(msg.Message, strings.Split(msg.Template(UPGRADE_SH), lex.NL), func(res string) { @@ -305,7 +306,7 @@ func (s relay) Upgrade(m *ice.Message, arg ...string) { } } func (s relay) Version(m *ice.Message, arg ...string) { - m.Option(ice.MSG_TITLE, m.ActionKey()) + m.Option(ice.MSG_TITLE, kit.Keys(m.CommandKey(), m.ActionKey())) s.foreach(m, func(msg *ice.Message, cmd []string) { ssh.PushShell(msg.Message, strings.Split(msg.Template(VERSION_SH), lex.NL), func(res string) { web.PushNoticeGrow(m.Options(ctx.DISPLAY, web.PLUGIN_XTERM).Message, res)