Changeset 70 in code for trunk/cmd

Timestamp:

Sep 16, 2023, 4:11:35 PM (21 months ago)

Author:

Izuru Yakumo

Message:

Fix a bug that I caused

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

File:

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

trunk/cmd/aya/main.go

@@ -1 @@
-// $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
 
@@ -363 +363 @@
 }
 
-// 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))
 }
@@ -379 +381 @@
 // 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\tGenerate site\n")
-        fmt.Printf("\tclean\tRemoves the generated site directory\n")
-        fmt.Printf("\tvar\tQuery variable(s) from a markdown file\n")
-        fmt.Printf("\tversion\tPrint program version and exit\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)
+        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)
 }
@@ -414 +414 @@
         case "help":
                 printUsage()
+        case "serve":
+                serve()
         case "var":
                 if len(args) == 0 {
@@ -439 +441 @@
         case "watch":
                 buildAll(true)
-                serve()
         default:
                 if s, err := run(globals(), cmd, args...); err != nil {