From ac339c698745d478418c2874c6b8186a473d99fd Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Thu, 23 May 2024 10:34:57 -0500 Subject: [PATCH] noop --- pkgs/oizys/oizys-go/cmd/root.go | 2 +- pkgs/oizys/oizys-go/pkg/oizys.go | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/oizys/oizys-go/cmd/root.go b/pkgs/oizys/oizys-go/cmd/root.go index 30952f6..059130e 100644 --- a/pkgs/oizys/oizys-go/cmd/root.go +++ b/pkgs/oizys/oizys-go/cmd/root.go @@ -38,7 +38,7 @@ var rootCmd = &cobra.Command{ Use: "oizys", Short: "nix begat oizys", PersistentPreRun: func(cmd *cobra.Command, args []string) { - oizys.Update(flake, host, cacheName, verbose) + oizys.Set(flake, host, cacheName, verbose) oizys.CheckFlake() }, } diff --git a/pkgs/oizys/oizys-go/pkg/oizys.go b/pkgs/oizys/oizys-go/pkg/oizys.go index e863620..6d81218 100644 --- a/pkgs/oizys/oizys-go/pkg/oizys.go +++ b/pkgs/oizys/oizys-go/pkg/oizys.go @@ -52,7 +52,7 @@ func (o *Oizys) Output() string { ) } -func (o *Oizys) Update( +func (o *Oizys) Set ( flake, host, cache string, verbose bool, ) { @@ -81,9 +81,9 @@ func terminalSize() (int, int) { } type packages struct { + desc string names []string pad int - desc string } func parsePackages(lines []string, desc string) *packages { @@ -171,12 +171,14 @@ func (o *Oizys) GitPull() { os.Exit(1) } - if cmdOutput, err := o.git("pull").CombinedOutput(); err != nil { + cmdOutput, err = o.git("pull").CombinedOutput() + if err != nil { showFailedOutput(cmdOutput) log.Fatal(err) } } + func parseDryRun(buf string) (*packages, *packages) { lines := strings.Split(strings.TrimSpace(buf), "\n") var parts [2][]string