moved eval func type to the top, added some error logs

git-svn-id: file:///srv/svn/repo/aya/trunk@4 cec141ff-132a-4243-88a5-ce187bd62f94
This commit is contained in:
zaitsev.serge
2014-12-05 17:26:59 +00:00
parent e8b697f054
commit b70b4dd78d

8
zs.go
View File

@@ -21,6 +21,8 @@ const (
PUBDIR = ".pub"
)
type EvalFn func(args []string, vars map[string]string) (string, error)
func split2(s, delim string) (string, string) {
parts := strings.SplitN(s, delim, 2)
if len(parts) == 2 {
@@ -43,8 +45,6 @@ func md(s string) (map[string]string, string) {
return v, body
}
type EvalFn func(args []string, vars map[string]string) (string, error)
func render(s string, vars map[string]string, eval EvalFn) (string, error) {
b := []byte(s)
delim_open := []byte("{{")
@@ -228,7 +228,7 @@ func main() {
buildAll(false) // pass duration
case "var":
if len(args) == 0 {
// print error
log.Println("ERROR: filename expected")
return
}
if b, err := ioutil.ReadFile(args[0]); err == nil {
@@ -244,7 +244,7 @@ func main() {
}
}
} else {
// print error
log.Println(err)
}
default:
cmd := exec.Command(path.Join(ZSDIR, cmd), args...)