liubin/icebergs
1
0
Fork 0
forked from x/icebergs
Code Pull Requests Activity

opt some

Browse Source
This commit is contained in:
harveyshao 2023-01-02 20:28:59 +08:00
parent 0d9931c1fb
commit ae91a34c5a
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
base/ssh/script.go
View File

@ -112,8 +112,8 @@ func (f *Frame) parse(m *ice.Message, h, line string) string {
func (f *Frame) scan(m *ice.Message, h, line string) *Frame { func (f *Frame) scan(m *ice.Message, h, line string) *Frame {
f.ps1 = kit.Simple(m.Confv(PROMPT, kit.Keym(PS1))) f.ps1 = kit.Simple(m.Confv(PROMPT, kit.Keym(PS1)))
f.ps2 = kit.Simple(m.Confv(PROMPT, kit.Keym(PS2))) f.ps2 = kit.Simple(m.Confv(PROMPT, kit.Keym(PS2)))
m.Options(MESSAGE, m, ice.LOG_DISABLE, ice.TRUE)
m.I, m.O = f.stdin, f.stdout m.I, m.O = f.stdin, f.stdout
m.Optionv(MESSAGE, m)
ps, bio := f.ps1, bufio.NewScanner(f.stdin) ps, bio := f.ps1, bufio.NewScanner(f.stdin)
for f.prompt(m, ps...); f.stdin != nil && bio.Scan(); f.prompt(m, ps...) { for f.prompt(m, ps...); f.stdin != nil && bio.Scan(); f.prompt(m, ps...) {
if len(bio.Text()) == 0 && h == STDIO { if len(bio.Text()) == 0 && h == STDIO {
@ -231,8 +231,8 @@ func init() {
} }
}}, }},
PROMPT: {Name: "prompt arg run", Help: "命令提示", Actions: ctx.ConfAction( PROMPT: {Name: "prompt arg run", Help: "命令提示", Actions: ctx.ConfAction(
PS1, []ice.Any{"\033[33;44m", mdb.COUNT, "[", mdb.TIME, "]", "\033[5m", TARGET, "\033[0m", "\033[44m", ">", "\033[0m ", "\033[?25h", "\033[32m"}, PS1, ice.List{"\033[33;44m", mdb.COUNT, "[", mdb.TIME, "]", "\033[5m", TARGET, "\033[0m", "\033[44m", ">", "\033[0m ", "\033[?25h", "\033[32m"},
PS2, []ice.Any{mdb.COUNT, " ", TARGET, "> "}, PS2, ice.List{mdb.COUNT, " ", TARGET, "> "},
), Hand: func(m *ice.Message, arg ...string) { ), Hand: func(m *ice.Message, arg ...string) {
if f, ok := m.Target().Server().(*Frame); ok { if f, ok := m.Target().Server().(*Frame); ok {
f.prompt(m, arg...) f.prompt(m, arg...)

3
misc/git/repos.go
View File

@ -80,10 +80,7 @@ func _repos_commit(m *ice.Message, dir, branch string, cb func(*gogit.Commit, *g
} }
if p := ci.ParentCommit(0); p != nil { if p := ci.ParentCommit(0); p != nil {
oid = p.Oid oid = p.Oid
m.Debug("what %v %v", ci.Oid.Short(), oid.Short())
continue continue
} else {
m.Debug("what %v %v", ci.Oid.Short())
} }
} }
break break