From aa35150800025a45c452c9c8f7d4e059367a9a3e Mon Sep 17 00:00:00 2001 From: Izuru Yakumo Date: Sun, 3 Dec 2023 23:21:03 -0300 Subject: [PATCH] The Emperor (IV) * `aya help` is provided by aya.PrintUsage() now Signed-off-by: Izuru Yakumo --- cmd/aya/main.go | 20 ++++---------------- usage.go | 17 +++++++++++++++++ version.go | 2 +- 3 files changed, 22 insertions(+), 17 deletions(-) create mode 100644 usage.go diff --git a/cmd/aya/main.go b/cmd/aya/main.go index 0ebafee..c446482 100644 --- 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 [args]\n", os.Args[0]) - fmt.Printf("Where 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 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 bfa0222..46e51c5 100644 --- 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() ) -- 2.43.0