1 files changed, 11 insertions, 16 deletions

diff --git a/main.go b/main.go
index c64f374..fd2de2c 100644
--- a/main.go
+++ b/main.go
@@ -5,7 +5,6 @@ package main
 import (
         "embed"
         "fmt"
-        "io/fs"
         "log"
 
         "code.crute.us/mcrute/ssh-proxy/app"
@@ -14,6 +13,7 @@ import (
         "code.crute.us/mcrute/ssh-proxy/cmd/web"
 
         "code.crute.us/mcrute/golib/cli"
+        "code.crute.us/mcrute/golib/fs"
 
         "github.com/spf13/cobra"
 
@@ -23,30 +23,25 @@ import (
 )
 
 //go:embed templates
-var embeddedTemplates embed.FS
+var templates embed.FS
 
 //go:embed clients
-var embeddedClients embed.FS
+var clients embed.FS
 
-var appVersion string
+var version string
 
 func main() {
-        rootCmd := &cobra.Command{
+        r := &cobra.Command{
                 Use:   "web-server",
-                Short: fmt.Sprintf("SSH proxy web server (version %s)", appVersion),
+                Short: fmt.Sprintf("SSH proxy web server (version %s)", version),
         }
-        cli.AddFlags(rootCmd, &app.Config{}, app.DefaultConfig, "")
+        cli.AddFlags(r, &app.Config{}, app.DefaultConfig, "")
 
-        templates, err := fs.Sub(embeddedTemplates, "templates")
-        if err != nil {
-                log.Fatalf("Error building sub-fs of embeded fs")
-        }
-
-        web.Register(rootCmd, templates, embeddedClients, appVersion)
-        client.Register(rootCmd, appVersion)
-        register.Register(rootCmd)
+        web.Register(r, fs.MustSub(templates, "templates"), clients, version)
+        client.Register(r, version)
+        register.Register(r)
 
-        if err := rootCmd.Execute(); err != nil {
+        if err := r.Execute(); err != nil {
                 log.Fatalf("Error running root command: %s", err)
         }
 }