Fix a bug that I caused

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

git-svn-id: file:///srv/svn/repo/aya/trunk@70 cec141ff-132a-4243-88a5-ce187bd62f94

aya.1

@@ -23,24 +23,33 @@ or a file in particular
 .It clean
 Removes the generated
 site directory
+.It serve
+Serves the .pub
+directory over
+HTTP
 .It var
 Print a list of variables
 defined in a given
-markdown file
+markdown file,
+including empty
+variables.
 .It watch
 (Re-)build a site if
-any file changed and
+any file changed.
-serve it over HTTP
 .El
 .Sh HISTORY
 .Nm
-was originally forked from prologic/zs by Izuru
+was originally forked from
-out of disgust with the latest revision, so he
+prologic/zs by Izuru out of disgust
-used a earlier commit as a base, and then
+with the latest revision, so he used an
+earlier commit as a base, and then
 eventually reimplemented older features from
-zserge's original project.
+the original project.
 .Sh AUTHORS
 .Nm
 is maintained by
 .An Izuru Yakumo
 .Aq Lk https://geidontei.chaotic.ninja/usr/yakumo_izuru/
+.Sh BUGS
+Report them to this mailing list
+.Mt devel@chaotic.ninja

cmd/aya/main.go

@@ -1,4 +1,4 @@
-// $TheSupernovaDuo: cmd/aya/main.go,v 0.6.0 2023/9/13 07:50:00 yakumo_izuru Exp $
+// $TheSupernovaDuo: cmd/aya/main.go,v 0.6.1 2023/9/16 11:43:00 yakumo_izuru Exp $
 package main
 
 import (
@@ -362,9 +362,11 @@ func buildAll(watch bool) {
 	}
 }
 
-// Serve the public directory over HTTP and watch for changes
+// Serve the public directory over HTTP
 func serve() {
-	http.Handle("/", http.FileServer(http.Dir(PUBDIR)))
+	root := http.Dir(PUBDIR)
+	http.Handle("/", http.FileServer(root))
+	log.Printf("Serving the %s directory over http://localhost:8000. Interrupt with ^C.\n", PUBDIR)
 	log.Fatal(http.ListenAndServe(":8000", nil))
 }
 
@@ -378,16 +380,14 @@ func init() {
 
 // Print usage notes
 func printUsage() {
-	fmt.Printf("%v <command> [args]\n", os.Args[0])
+	fmt.Printf("Usage: %s <command> [args]\n", os.Args[0])
+	fmt.Printf("Where <command> is one of\n")
 	fmt.Printf("\n")
-	fmt.Printf("Where <command> is:\n")
+	fmt.Printf("\tbuild\t(Re-)builds site or a specific file\n")
-	fmt.Printf("\tbuild\tGenerate site\n")
+	fmt.Printf("\tclean\trm -rf %s\n", PUBDIR)
-	fmt.Printf("\tclean\tRemoves the generated site directory\n")
+	fmt.Printf("\tserve\tServes the %s directory over HTTP\n", PUBDIR)
-	fmt.Printf("\tvar\tQuery variable(s) from a markdown file\n")
+	fmt.Printf("\tvar\tPrint a list of variables defined in a given file, or values of certain variables\n")
-	fmt.Printf("\tversion\tPrint program version and exit\n")
+	fmt.Printf("\twatch\t(Re-)builds site and looks for changes\n")
-	fmt.Printf("\twatch\t(Re)generate site while looking for changes (it also serves on HTTP)\n")
-	fmt.Printf("\n")
-	fmt.Printf("Other commands may be dynamically added by plugins found in %v\n", AYADIR)
 	os.Exit(0)
 }
 
@@ -413,6 +413,8 @@ func main() {
 		os.RemoveAll(PUBDIR)
 	case "help":
 		printUsage()
+	case "serve":
+		serve()
 	case "var":
 		if len(args) == 0 {
 			log.Fatal("var: filename expected")
@@ -438,7 +440,6 @@ func main() {
 		os.Exit(0)
 	case "watch":
 		buildAll(true)
-		serve()
 	default:
 		if s, err := run(globals(), cmd, args...); err != nil {
 			log.Println(err)

doc.go

@@ -1,3 +1,4 @@
+package aya
 // Package aya is [...]
 
 // Aya is the fastest static site generator
@@ -17,4 +18,3 @@
 // This one (re)incorporates the features removed in the former from the latter
 
 // Ayaya~
-package aya