Mercurial > yakumo_izuru > aya
changeset 73:8533d875a2bb draft
The World (XXI)
* Replace all iterations of log.* with fmt.* and os.Exit()
* Use proper Go versioning
Signed-off-by: Izuru Yakumo <yakumo.izuru@chaotic.ninja>
| author | yakumo.izuru |
|---|---|
| date | Tue, 21 Nov 2023 11:44:14 +0000 |
| parents | b32ca33188c0 |
| children | d8727551f403 |
| files | cmd/aya/main.go |
| diffstat | 1 files changed, 11 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/cmd/aya/main.go Mon Oct 23 22:39:52 2023 +0000 +++ b/cmd/aya/main.go Tue Nov 21 11:44:14 2023 +0000 @@ -5,7 +5,6 @@ "bytes" "fmt" "io" - "log" "os" "os/exec" "path/filepath" @@ -78,7 +77,7 @@ err := c.Run() if errbuf.Len() > 0 { - log.Println("ERROR:", errbuf.String()) + fmt.Println("ERROR:", errbuf.String()) } if err != nil { return "", err @@ -350,7 +349,7 @@ run(vars, "prehook") modified = true } - log.Println("build:", path) + fmt.Println("build:", path) return build(path, nil, vars) } return nil @@ -402,13 +401,15 @@ buildAll(false) } else if len(args) == 1 { if err := build(args[0], os.Stdout, globals()); err != nil { - log.Fatal("ERROR: " + err.Error()) + fmt.Println("ERROR: " + err.Error()) + os.Exit(1) } } else { - log.Fatal("ERROR: too many arguments") + fmt.Println("ERROR: too many arguments") + os.Exit(1) } case "clean": - log.Println("Removing generated site directory") + fmt.Println("Removing generated site directory") os.RemoveAll(PUBDIR) case "help": printUsage() @@ -416,7 +417,8 @@ aya.HttpServe(PUBDIR) case "var": if len(args) == 0 { - log.Fatal("var: filename expected") + fmt.Println("var: filename expected") + os.Exit(1) } else { s := "" if vars, _, err := getVars(args[0], Vars{}); err != nil { @@ -441,9 +443,9 @@ buildAll(true) default: if s, err := run(globals(), cmd, args...); err != nil { - log.Println(err) + fmt.Println(err) } else { - log.Println(s) + fmt.Println(s) } } }