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

The World (XXI)

Browse Source 
* Replace all iterations of log.* with fmt.* and os.Exit()
* Use proper Go versioning

Signed-off-by: Izuru Yakumo <yakumo.izuru@chaotic.ninja>

git-svn-id: file:///srv/svn/repo/aya/trunk@74 cec141ff-132a-4243-88a5-ce187bd62f94
This commit is contained in:
yakumo.izuru
2023-11-21 11:44:14 +00:00
parent 34cc1312ba
commit 5dbb5fe308
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/aya/main.go
View File

@@ -5,7 +5,6 @@ import (
"bytes" "bytes"
"fmt" "fmt"
"io" "io"
"log"
"os" "os"
"os/exec" "os/exec"
"path/filepath" "path/filepath"
@@ -78,7 +77,7 @@ func run(vars Vars, cmd string, args ...string) (string, error) {
err := c.Run() err := c.Run()
if errbuf.Len() > 0 { if errbuf.Len() > 0 {
log.Println("ERROR:", errbuf.String()) fmt.Println("ERROR:", errbuf.String())
} }
if err != nil { if err != nil {
return "", err return "", err
@@ -350,7 +349,7 @@ func buildAll(watch bool) {
run(vars, "prehook") run(vars, "prehook")
modified = true modified = true
} }
log.Println("build:", path) fmt.Println("build:", path)
return build(path, nil, vars) return build(path, nil, vars)
} }
return nil return nil
@@ -402,13 +401,15 @@ func main() {
buildAll(false) buildAll(false)
} else if len(args) == 1 { } else if len(args) == 1 {
if err := build(args[0], os.Stdout, globals()); err != nil { if err := build(args[0], os.Stdout, globals()); err != nil {
log.Fatal("ERROR: " + err.Error()) fmt.Println("ERROR: " + err.Error())
os.Exit(1)
} }
} else { } else {
log.Fatal("ERROR: too many arguments") fmt.Println("ERROR: too many arguments")
os.Exit(1)
} }
case "clean": case "clean":
log.Println("Removing generated site directory") fmt.Println("Removing generated site directory")
os.RemoveAll(PUBDIR) os.RemoveAll(PUBDIR)
case "help": case "help":
printUsage() printUsage()
@@ -416,7 +417,8 @@ func main() {
aya.HttpServe(PUBDIR) aya.HttpServe(PUBDIR)
case "var": case "var":
if len(args) == 0 { if len(args) == 0 {
log.Fatal("var: filename expected") fmt.Println("var: filename expected")
os.Exit(1)
} else { } else {
s := "" s := ""
if vars, _, err := getVars(args[0], Vars{}); err != nil { if vars, _, err := getVars(args[0], Vars{}); err != nil {
@@ -441,9 +443,9 @@ func main() {
buildAll(true) buildAll(true)
default: default:
if s, err := run(globals(), cmd, args...); err != nil { if s, err := run(globals(), cmd, args...); err != nil {
log.Println(err) fmt.Println(err)
} else { } else {
log.Println(s) fmt.Println(s)
} }
} }
} }