shinyoukai/aya
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions

Browse Source 
git-svn-id: file:///srv/svn/repo/aya/trunk@25 cec141ff-132a-4243-88a5-ce187bd62f94
This commit is contained in:
zaitsev.serge
2015-08-30 12:22:00 +00:00
parent 10854b5124
commit 0b5b64f5b8
2 changed files with 37 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
zs_util.go
View File

@@ -19,7 +19,7 @@ func varFunc(s string) func() string {
func pluginFunc(cmd string, vars Vars) func(args ...string) string {
return func(args ...string) string {
out := bytes.NewBuffer(nil)
if err := run(cmd, args, vars, out); err != nil {
if err := run(filepath.Join(ZSDIR, cmd), args, vars, out); err != nil {
return cmd + ":" + err.Error()
} else {
return string(out.Bytes())
@@ -28,15 +28,19 @@ func pluginFunc(cmd string, vars Vars) func(args ...string) string {
}
func builtins() Funcs {
exec := func(s ...string) string {
exec := func(cmd string, args ...string) string {
out := bytes.NewBuffer(nil)
if err := run(cmd, args, Vars{}, out); err != nil {
return cmd + ":" + err.Error()
} else {
return string(out.Bytes())
}
return ""
}
return Funcs{
"exec": exec,
"zs": func(args ...string) string {
cmd := []string{"zs"}
cmd = append(cmd, args...)
return exec(cmd...)
return exec(os.Args[0], args...)
},
}
}