Changeset 74 in code

Timestamp:

Nov 21, 2023, 11:44:14 AM (19 months ago)

Author:

Izuru Yakumo

Message:

The World (XXI)

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

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

File:

• trunk/cmd/aya/main.go (modified) (6 diffs)

trunk/cmd/aya/main.go

@@ -6 +6 @@
         "fmt"
         "io"
-        "log"
         "os"
         "os/exec"
@@ -79 +78 @@
 
         if errbuf.Len() > 0 {
-                log.Println("ERROR:", errbuf.String())
+                fmt.Println("ERROR:", errbuf.String())
         }
         if err != nil {
@@ -351 +350 @@
                                         modified = true
                                 }
-                                log.Println("build:", path)
+                                fmt.Println("build:", path)
                                 return build(path, nil, vars)
                         }
@@ -403 +402 @@
                 } else if len(args) == 1 {
                         if err := build(args[0], os.Stdout, globals()); err != nil {
-                                log.Fatal("ERROR: " + err.Error())
-                        }
-                } else {
-                        log.Fatal("ERROR: too many arguments")
+                                fmt.Println("ERROR: " + err.Error())
+                                os.Exit(1)
+                        }
+                } else {
+                        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":
@@ -417 +418 @@
         case "var":
                 if len(args) == 0 {
-                        log.Fatal("var: filename expected")
+                        fmt.Println("var: filename expected")
+                        os.Exit(1)
                 } else {
                         s := ""
@@ -442 +444 @@
         default:
                 if s, err := run(globals(), cmd, args...); err != nil {
-                        log.Println(err)
-                } else {
-                        log.Println(s)
-                }
-        }
-}
+                        fmt.Println(err)
+                } else {
+                        fmt.Println(s)
+                }
+        }
+}