The Emperor (IV)

* `aya help` is provided by aya.PrintUsage() now

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

diff --git a/cmd/aya/main.go b/cmd/aya/main.go
index 0ebafee8414408760a40629e70f7082d6363452f..c446482a385f9513f60b67b403a7132dfbbcf3b1 100644 (file)
--- a/cmd/aya/main.go
+++ b/cmd/aya/main.go
@@ -1,4 +1,4 @@
-// $TheSupernovaDuo: marisa.chaotic.ninja/aya/cmd/aya, v0.6.6 2023-12-03 23:48:17+0000, yakumo_izuru Exp $
+// $TheSupernovaDuo: marisa.chaotic.ninja/aya/cmd/aya, v0.6.7 2023-12-04 01:55:36+0000, yakumo_izuru Exp $
 package main
 
 import (
@@ -375,23 +375,11 @@ func init() {
        os.Setenv("PATH", p)
 }
 
-// Print usage notes
-func printUsage() {
-       fmt.Printf("Usage: %s <command> [args]\n", os.Args[0])
-       fmt.Printf("Where <command> is one of\n")
-       fmt.Printf("\n")
-       fmt.Printf("\tbuild\t(Re-)builds site or a specific file\n")
-       fmt.Printf("\tclean\trm -rf %s\n", PUBDIR)
-       fmt.Printf("\tserve\tServes the %s directory over HTTP\n", PUBDIR)
-       fmt.Printf("\tvar\tPrint a list of variables defined in a given file, or values of certain variables\n")
-       fmt.Printf("\twatch\t(Re-)builds site and looks for changes\n")
-       os.Exit(0)
-}
-
 // Main loop
 func main() {
        if len(os.Args) == 1 {
-               printUsage()
+               fmt.Println("No command supplied. See 'aya help'")
+               os.Exit(1)
        }
        cmd := os.Args[1]
        args := os.Args[2:]
@@ -412,7 +400,7 @@ func main() {
                fmt.Println("Removing generated site directory")
                os.RemoveAll(PUBDIR)
        case "help":
-               printUsage()
+               aya.PrintUsage()
        case "serve":
                aya.HttpServe(PUBDIR)
        case "var":

diff --git a/usage.go b/usage.go
new file mode 100644 (file)
index 0000000..33facd1
--- /dev/null
+++ b/usage.go
@@ -0,0 +1,17 @@
+package aya
+
+import (
+       "fmt"
+)
+
+func PrintUsage() {
+       fmt.Printf("aya/%v\n", FullVersion())
+       fmt.Println("Homepage: https://aya.chaotic.ninja")
+       fmt.Println("Repository: https://git.chaotic.ninja/yakumo.izuru/aya")
+       fmt.Println("==")
+       fmt.Println("build [file] · (Re)build a site or a file in particular")
+       fmt.Println("clean · Remove the generated .pub directory")
+       fmt.Println("==")
+       fmt.Println("For more information please read the manual page")
+       fmt.Println("man aya")
+}

diff --git a/version.go b/version.go
index bfa02222d8ca4d53e936f31a9c7bb2591ceaa897..46e51c54601a5ffb15bdfd135802c5f907d3f8e0 100644 (file)
--- a/version.go
+++ b/version.go
@@ -8,7 +8,7 @@ import (
 
 var (
        // Set to current tag
-       Version = "v0.6.6"
+       Version = "v0.6.7"
        Time = time.Now()
 )