From ff116d5ed04c442367176f1d539fd5ccf8089399 Mon Sep 17 00:00:00 2001
From: shaoying <shaoying@bytedance.com>
Date: Thu, 29 Nov 2018 18:30:50 +0800
Subject: [PATCH] add some

---
 Makefile                  |  5 +++++
 src/contexts/cli/cli.go   |  1 +
 src/examples/wiki/wiki.go | 16 ++++++++--------
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index a503d711..2427adc2 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,7 @@ install:
 	@go get github.com/nsf/termbox-go
 	@go get github.com/skip2/go-qrcode
 	@go get github.com/gomarkdown/markdown
+	@go get github.com/PuerkitoBio/goquery
 	go install $(BENCH)
 	@date
 	# bench web.code.counter nmake 1
@@ -20,6 +21,10 @@ install_all: install
 
 run:
 	etc/bootstrap.sh
+shy:
+	cp -r src/ ~/shycontext/
+	cp -r usr/template/ ~/shycontext/usr/
+	cp -r usr/librarys/ ~/shycontext/usr/
 
 tar:
 	[ -e tar ] || mkdir tar
diff --git a/src/contexts/cli/cli.go b/src/contexts/cli/cli.go
index 88cebbc4..7f8f0689 100644
--- a/src/contexts/cli/cli.go
+++ b/src/contexts/cli/cli.go
@@ -227,6 +227,7 @@ var Index = &ctx.Context{Name: "cli", Help: "管理中心",
 				msg := m
 				for k, v := range m.Confv("cmd_script").(map[string]interface{}) {
 					if strings.HasSuffix(detail[0], "."+k) {
+						detail[0] = m.Sess("nfs").Cmd("path", detail[0]).Result(0)
 						detail = append([]string{v.(string)}, detail...)
 						msg = m.Spawn(cli.target)
 						break
diff --git a/src/examples/wiki/wiki.go b/src/examples/wiki/wiki.go
index e5afbb34..06a7a7d5 100644
--- a/src/examples/wiki/wiki.go
+++ b/src/examples/wiki/wiki.go
@@ -29,18 +29,18 @@ var Index = &ctx.Context{Name: "wiki", Help: "文档中心",
 		"componet_group": &ctx.Config{Name: "component_group", Value: "index", Help: "默认组件"},
 		"componet": &ctx.Config{Name: "componet", Value: map[string]interface{}{
 			"index": []interface{}{
-				map[string]interface{}{"name": "head", "template": "head"},
-				map[string]interface{}{"name": "header", "template": "header"},
-				map[string]interface{}{"name": "list", "template": "list",
-					"context": "web.wiki", "command": "wiki_list", "arguments": []interface{}{"h2", "int_r"},
+				map[string]interface{}{"componet_name": "head", "template": "head"},
+				map[string]interface{}{"componet_name": "header", "template": "header"},
+				map[string]interface{}{"componet_name": "list", "template": "list",
+					"componet_ctx": "web.wiki", "componet_cmd": "wiki_list", "arguments": []interface{}{"h2", "int_r"},
 					"pre_run": true,
 				},
-				map[string]interface{}{"name": "text", "template": "text",
-					"context": "web.wiki", "command": "wiki_body", "arguments": []interface{}{"@wiki_favor"},
+				map[string]interface{}{"componet_name": "text", "template": "text",
+					"componet_ctx": "web.wiki", "componet_cmd": "wiki_body", "arguments": []interface{}{"@wiki_favor"},
 					"pre_run": true,
 				},
-				map[string]interface{}{"name": "footer", "template": "footer"},
-				map[string]interface{}{"name": "tail", "template": "tail"},
+				map[string]interface{}{"componet_name": "footer", "template": "footer"},
+				map[string]interface{}{"componet_name": "tail", "template": "tail"},
 			},
 		}, Help: "组件列表"},
 	},