diff --git a/core/chat/header.go b/core/chat/header.go index 91d2ba21..d1817f53 100644 --- a/core/chat/header.go +++ b/core/chat/header.go @@ -125,10 +125,10 @@ func init() { _header_users(m, m.ActionKey(), arg...) }}, - ctx.CONFIG: {Name: "config", Help: "配置", Hand: func(m *ice.Message, arg ...string) { + ctx.CONFIG: {Name: "config file", Help: "配置", Hand: func(m *ice.Message, arg ...string) { pod := strings.Split(m.Cmdx(web.SPACE, m.Option(ice.MSG_USERPOD), cli.RUNTIME, "make.domain"), "/chat/pod/")[1] - m.Cmd(web.SPACE, m.Option(ice.MSG_USERPOD), nfs.SAVE, ice.ETC_LOCAL_SHY, m.Cmdx(web.SPACE, pod, nfs.CAT, ice.ETC_LOCAL_SHY)) - m.Cmd(web.SPACE, m.Option(ice.MSG_USERPOD), ssh.SOURCE, ice.ETC_LOCAL_SHY) + m.Cmd(web.SPACE, m.Option(ice.MSG_USERPOD), nfs.SAVE, m.Option(nfs.FILE), m.Cmdx(web.SPACE, pod, nfs.CAT, m.Option(nfs.FILE))) + m.Cmd(web.SPACE, m.Option(ice.MSG_USERPOD), ssh.SOURCE, m.Option(nfs.FILE)) }}, code.WEBPACK: {Name: "webpack", Help: "打包页面", Hand: func(m *ice.Message, arg ...string) { m.Cmdy(code.WEBPACK, cli.BUILD, m.OptionSimple(mdb.NAME)) diff --git a/go.mod b/go.mod index b13a5c26..a3981b74 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,6 @@ go 1.11 require ( shylinux.com/x/go-qrcode v0.0.1 - shylinux.com/x/toolkits v0.5.7 + shylinux.com/x/toolkits v0.5.8 shylinux.com/x/websocket v0.0.1 ) diff --git a/go.sum b/go.sum index 2f544cba..96f6e8b8 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,4 @@ shylinux.com/x/go-qrcode v0.0.1/go.mod h1:KAbtU+KwiiABMZ/CJ0zh9PI2AX82Uf9rRYcQ4ODm4po= -shylinux.com/x/toolkits v0.5.7 h1:egzaV8Y59g9l6wTXKpYu4otVBVJRInvoPt0tIXGhh7Q= -shylinux.com/x/toolkits v0.5.7/go.mod h1:8LbYHe7oxBIqb6s4MSOD+4d28QvPdvkyCVtwB/JW7AA= +shylinux.com/x/toolkits v0.5.8 h1:8MhHLmglPTPiXAdUgAJXx+gOxJoQzmpNeC7QzsZcjJw= +shylinux.com/x/toolkits v0.5.8/go.mod h1:8LbYHe7oxBIqb6s4MSOD+4d28QvPdvkyCVtwB/JW7AA= shylinux.com/x/websocket v0.0.1/go.mod h1:AaSpMToOxbMULKQytzczeHPuqb708vK1vrAzCxLo/XE= diff --git a/misc/git/repos.go b/misc/git/repos.go index 94f6c1d0..ff2cf36e 100644 --- a/misc/git/repos.go +++ b/misc/git/repos.go @@ -80,7 +80,7 @@ func init() { m.Option(cli.CMD_DIR, m.Option(nfs.PATH)) m.Cmd(cli.SYSTEM, GIT, INIT) m.Cmd(cli.SYSTEM, GIT, REMOTE, ADD, ORIGIN, m.Option(REPOS)) - m.Cmd(cli.SYSTEM, GIT, PULL, ORIGIN, MASTER) + m.Cmd(cli.SYSTEM, GIT, PULL, ORIGIN, kit.Select(MASTER, m.Option(BRANCH))) } else { m.Option(cli.CMD_DIR, "") m.Cmd(cli.SYSTEM, GIT, CLONE, "-b", kit.Select(MASTER, m.Option(BRANCH)),