From 8e74e58cadffbcfee110bc52d38e215e6e3e0b59 Mon Sep 17 00:00:00 2001 From: Arsen Musayelyan Date: Mon, 3 Oct 2022 15:51:46 -0700 Subject: [PATCH] Don't pull repos if they've already been pulled in the same command --- build.go | 2 +- install.go | 14 ++++++++------ upgrade.go | 7 ++++++- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/build.go b/build.go index 923e65f..765eb81 100644 --- a/build.go +++ b/build.go @@ -192,7 +192,7 @@ func buildPackage(ctx context.Context, script string, mgr manager.Manager) ([]st if len(vars.BuildDepends) > 0 { log.Info("Installing build dependencies").Send() - installPkgs(ctx, vars.BuildDepends, mgr) + installPkgs(ctx, vars.BuildDepends, mgr, false) } var builtDeps, builtNames, repoDeps []string diff --git a/install.go b/install.go index e99fba5..a0b09bd 100644 --- a/install.go +++ b/install.go @@ -36,21 +36,23 @@ func installCmd(c *cli.Context) error { log.Fatal("Unable to detect supported package manager on system").Send() } - installPkgs(c.Context, args.Slice(), mgr) + installPkgs(c.Context, args.Slice(), mgr, true) return nil } -func installPkgs(ctx context.Context, pkgs []string, mgr manager.Manager) { - err := pullRepos(ctx) - if err != nil { - log.Fatal("Error pulling repositories").Err(err).Send() +func installPkgs(ctx context.Context, pkgs []string, mgr manager.Manager, pull bool) { + if pull { + err := pullRepos(ctx) + if err != nil { + log.Fatal("Error pulling repositories").Err(err).Send() + } } scripts, notFound := findPkgs(pkgs) if len(notFound) > 0 { - err = mgr.Install(nil, notFound...) + err := mgr.Install(nil, notFound...) if err != nil { log.Fatal("Error installing native packages").Err(err).Send() } diff --git a/upgrade.go b/upgrade.go index dd02b46..0339072 100644 --- a/upgrade.go +++ b/upgrade.go @@ -38,13 +38,18 @@ func upgradeCmd(c *cli.Context) error { log.Fatal("Unable to detect supported package manager on system").Send() } + err = pullRepos(c.Context) + if err != nil { + log.Fatal("Error pulling repos").Err(err).Send() + } + updates, err := checkForUpdates(c.Context, mgr, info) if err != nil { log.Fatal("Error checking for updates").Err(err).Send() } if len(updates) > 0 { - installPkgs(c.Context, updates, mgr) + installPkgs(c.Context, updates, mgr, false) } else { log.Info("There is nothing to do.").Send() }