From 3deb8862babe9bf986f692ddbf791bd457678a28 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Sun, 20 Jul 2025 02:02:22 +0900 Subject: [PATCH] cmd/nix-tool: improve message formatting --- cmd/nix-tool/main.go | 8 ++++---- cmd/nix-tool/resolve.go | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmd/nix-tool/main.go b/cmd/nix-tool/main.go index 4467202..912cdde 100644 --- a/cmd/nix-tool/main.go +++ b/cmd/nix-tool/main.go @@ -79,12 +79,12 @@ func main() { return err } - log.Println("signing collected paths") + log.Println("signing collected paths...") if err := nix.Sign(ctx, flagCacheKeyPath, slices.Values(collective)); err != nil { return commandHandlerError(fmt.Sprintf("cannot sign: %v", err)) } - log.Println("copying to binary cache") + log.Println("copying to binary cache...") if err := nix.Copy(ctx, flagCacheKeyPath, &nix.BinaryCache{ Compression: flagCacheComp, ParallelCompression: flagCachePComp, @@ -143,12 +143,12 @@ func main() { return err } - log.Println("initialising evaluator") + log.Println("initialising evaluator...") var collective []string if eval, err := nix.NewInstantiatedEvaluator(ctx, installable); err != nil { return commandHandlerError(fmt.Sprintf("cannot initialise evaluator: %v", err)) } else { - log.Println("collecting paths") + log.Println("collecting paths...") collective = slices.Collect(eval.Instantiated()) if err := eval.Err(); err != nil { return commandHandlerError(fmt.Sprintf("cannot collect: %v", err)) diff --git a/cmd/nix-tool/resolve.go b/cmd/nix-tool/resolve.go index 7414df1..99313ec 100644 --- a/cmd/nix-tool/resolve.go +++ b/cmd/nix-tool/resolve.go @@ -13,7 +13,7 @@ func buildAndResolve(ctx nix.Context, name string, installable *string, collecti return err } - log.Printf("evaluating %s", *installable) + log.Printf("evaluating %q...", *installable) var installables []string if v, err := nix.EvalInstantiated(ctx, *installable); err != nil { return commandHandlerError(fmt.Sprintf("cannot evaluate: %v", err)) @@ -21,12 +21,12 @@ func buildAndResolve(ctx nix.Context, name string, installable *string, collecti installables = v } - log.Println("building instantiated derivations") + log.Println("building instantiated derivations...") if err := nix.Build(ctx, slices.Values(installables)); err != nil { return commandHandlerError(fmt.Sprintf("cannot build: %v", err)) } - log.Println("collecting store paths") + log.Println("collecting store paths...") if derivations, err := nix.DerivationShow(ctx, slices.Values(installables)); err != nil { return commandHandlerError(fmt.Sprintf("cannot get derivations: %v", err)) } else {