Changeset 25 in code for trunk/zs_util.go

Timestamp:

Aug 30, 2015, 12:22:00 PM (10 years ago)

Author:

zaitsev.serge

Message:

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

File:

• trunk/zs_util.go (modified) (3 diffs)

trunk/zs_util.go

@@ -20 +20 @@
         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 {
@@ -29 +29 @@
 
 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 ""
         }
@@ -35 +41 @@
                 "exec": exec,
                 "zs": func(args ...string) string {
-                        cmd := []string{"zs"}
-                        cmd = append(cmd, args...)
-                        return exec(cmd...)
+                        return exec(os.Args[0], args...)
                 },
         }