internal/app: declutter and merge small files

This should make internal/app easier to work with for the upcoming params to shim.

Signed-off-by: Ophestra <cat@gensokyo.uk>

cmd/hakurei/command.go

@@ -237,25 +237,10 @@ func buildCommand(ctx context.Context, msg container.Msg, early *earlyHardeningE
 		}).Flag(&flagShort, "short", command.BoolFlag(false), "Print instance id")
 	}
 
-	c.Command("version", "Display version information", func(args []string) error {
+	c.Command("version", "Display version information", func(args []string) error { fmt.Println(internal.Version()); return errSuccess })
-		fmt.Println(internal.Version())
+	c.Command("license", "Show full license text", func(args []string) error { fmt.Println(license); return errSuccess })
-		return errSuccess
+	c.Command("template", "Produce a config template", func(args []string) error { printJSON(os.Stdout, false, hst.Template()); return errSuccess })
-	})
+	c.Command("help", "Show this help message", func([]string) error { c.PrintHelp(); return errSuccess })
-
-	c.Command("license", "Show full license text", func(args []string) error {
-		fmt.Println(license)
-		return errSuccess
-	})
-
-	c.Command("template", "Produce a config template", func(args []string) error {
-		printJSON(os.Stdout, false, hst.Template())
-		return errSuccess
-	})
-
-	c.Command("help", "Show this help message", func([]string) error {
-		c.PrintHelp()
-		return errSuccess
-	})
 
 	return c
 }

internal/app/finalise.go

@@ -26,6 +26,17 @@ import (
 	"hakurei.app/system/wayland"
 )
 
+func newInt(v int) *stringPair[int] { return &stringPair[int]{v, strconv.Itoa(v)} }
+
+// stringPair stores a value and its string representation.
+type stringPair[T comparable] struct {
+	v T
+	s string
+}
+
+func (s *stringPair[T]) unwrap() T      { return s.v }
+func (s *stringPair[T]) String() string { return s.s }
+
 func newWithMessage(msg string) error { return newWithMessageError(msg, os.ErrInvalid) }
 func newWithMessageError(msg string, err error) error {
 	return &hst.AppError{Step: "finalise", Err: err, Msg: msg}

internal/app/path.go

@@ -6,6 +6,10 @@ import (
 )
 
 func deepContainsH(basepath, targpath string) (bool, error) {
+	const upper = ".." + string(filepath.Separator)
+
 	rel, err := filepath.Rel(basepath, targpath)
-	return err == nil && rel != ".." && !strings.HasPrefix(rel, string([]byte{'.', '.', filepath.Separator})), err
+	return err == nil &&
+		rel != ".." &&
+		!strings.HasPrefix(rel, upper), err
 }

internal/app/strings.go

@@ -1,16 +0,0 @@
-package app
-
-import (
-	"strconv"
-)
-
-func newInt(v int) *stringPair[int] { return &stringPair[int]{v, strconv.Itoa(v)} }
-
-// stringPair stores a value and its string representation.
-type stringPair[T comparable] struct {
-	v T
-	s string
-}
-
-func (s *stringPair[T]) unwrap() T      { return s.v }
-func (s *stringPair[T]) String() string { return s.s }