From 9416b86ed637529a810accd0190ac8922b7a84b8 Mon Sep 17 00:00:00 2001 From: shaoying Date: Mon, 16 Apr 2018 10:50:33 +0800 Subject: [PATCH] =?UTF-8?q?tce=20fix=20cli.source=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- etc/init.shy | 1 + src/contexts/cli/cli.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/etc/init.shy b/etc/init.shy index 4967c424..6cd987a1 100644 --- a/etc/init.shy +++ b/etc/init.shy @@ -1 +1,2 @@ ~aaa login root root +source etc/local.shy diff --git a/src/contexts/cli/cli.go b/src/contexts/cli/cli.go index 5f828fd6..f18f043d 100644 --- a/src/contexts/cli/cli.go +++ b/src/contexts/cli/cli.go @@ -646,7 +646,7 @@ var Index = &ctx.Context{Name: "cli", Help: "管理中心", }}, "source": &ctx.Command{Name: "source file", Help: "运行脚本, file: 脚本文件名", Hand: func(m *ctx.Message, c *ctx.Context, key string, arg ...string) { if _, ok := m.Target().Server.(*CLI); m.Assert(ok) && !m.Caps("skip") { // {{{ - m.Start(fmt.Sprintf("%s%d", key, m.Optioni("level", m.Capi("level")+1)), "脚本文件", arg[0]) + m.Start(fmt.Sprintf("%s_%d_%s", key, m.Optioni("level", m.Capi("level")+1), arg[0]), "脚本文件", arg[0]) } // }}} }}, "return": &ctx.Command{Name: "return result...", Help: "结束脚本, rusult: 返回值", Hand: func(m *ctx.Message, c *ctx.Context, key string, arg ...string) {