From f6f0cb56ae64a47dcb948134e19afbd241452fd9 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Sat, 18 Oct 2025 17:35:20 +0900 Subject: internal/app/hsu: remove wrapper method This was added to reduce the size of diffs. Signed-off-by: Ophestra --- cmd/hakurei/command.go | 4 ++-- cmd/hakurei/parse.go | 2 +- cmd/hakurei/print.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'cmd') diff --git a/cmd/hakurei/command.go b/cmd/hakurei/command.go index 0cf0ef1b..232b3234 100644 --- a/cmd/hakurei/command.go +++ b/cmd/hakurei/command.go @@ -94,7 +94,7 @@ func buildCommand(ctx context.Context, msg message.Msg, early *earlyHardeningErr passwd *user.User passwdOnce sync.Once passwdFunc = func() { - us := strconv.Itoa(app.HsuUid(new(app.Hsu).MustIDMsg(msg), flagIdentity)) + us := strconv.Itoa(app.HsuUid(new(app.Hsu).MustID(msg), flagIdentity)) if u, err := user.LookupId(us); err != nil { msg.Verbosef("cannot look up uid %s", us) passwd = &user.User{ @@ -302,7 +302,7 @@ func buildCommand(ctx context.Context, msg message.Msg, early *earlyHardeningErr var flagShort bool c.NewCommand("ps", "List active instances", func(args []string) error { var sc hst.Paths - app.CopyPaths().Copy(&sc, new(app.Hsu).MustID()) + app.CopyPaths().Copy(&sc, new(app.Hsu).MustID(nil)) printPs(os.Stdout, time.Now().UTC(), state.NewMulti(msg, sc.RunDirPath.String()), flagShort, flagJSON) return errSuccess }).Flag(&flagShort, "short", command.BoolFlag(false), "Print instance id") diff --git a/cmd/hakurei/parse.go b/cmd/hakurei/parse.go index 3d15f665..75d720d6 100644 --- a/cmd/hakurei/parse.go +++ b/cmd/hakurei/parse.go @@ -89,7 +89,7 @@ func tryShort(msg message.Msg, name string) (config *hst.Config, entry *state.St msg.Verbose("argument looks like prefix") var sc hst.Paths - app.CopyPaths().Copy(&sc, new(app.Hsu).MustID()) + app.CopyPaths().Copy(&sc, new(app.Hsu).MustID(nil)) s := state.NewMulti(msg, sc.RunDirPath.String()) if entries, err := state.Join(s); err != nil { log.Printf("cannot join store: %v", err) diff --git a/cmd/hakurei/print.go b/cmd/hakurei/print.go index 07fec385..86fc1ed9 100644 --- a/cmd/hakurei/print.go +++ b/cmd/hakurei/print.go @@ -21,7 +21,7 @@ func printShowSystem(output io.Writer, short, flagJSON bool) { t := newPrinter(output) defer t.MustFlush() - info := &hst.Info{User: new(app.Hsu).MustID()} + info := &hst.Info{User: new(app.Hsu).MustID(nil)} app.CopyPaths().Copy(&info.Paths, info.User) if flagJSON { -- cgit v1.3.1