From 03295c3f3fc91f9dddebb4abcb3a7d43c2dad5b9 Mon Sep 17 00:00:00 2001 From: morganamilo Date: Fri, 16 Feb 2018 15:33:17 +0000 Subject: [PATCH] Install repo deps for aur packages after questions --- install.go | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/install.go b/install.go index d5da9052..25b4e648 100644 --- a/install.go +++ b/install.go @@ -81,27 +81,7 @@ func install(parser *arguments) error { if !continueTask("Proceed with install?", "nN") { return fmt.Errorf("Aborting due to user") } - - if len(dc.Repo) > 0 { - arguments := parser.copy() - arguments.delArg("u", "sysupgrade") - arguments.delArg("y", "refresh") - arguments.op = "S" - arguments.targets = make(stringSet) - arguments.addArg("needed", "asdeps") - for _, pkg := range dc.Repo { - arguments.addTarget(pkg.Name()) - } - - oldConfirm := config.NoConfirm - config.NoConfirm = true - passToPacman(arguments) - config.NoConfirm = oldConfirm - if err != nil { - return err - } - } - + // if !continueTask("Proceed with download?", "nN") { // return fmt.Errorf("Aborting due to user") // } @@ -122,6 +102,27 @@ func install(parser *arguments) error { if err != nil { return err } + + if len(dc.Repo) > 0 { + arguments := parser.copy() + arguments.delArg("u", "sysupgrade") + arguments.delArg("y", "refresh") + arguments.op = "S" + arguments.targets = make(stringSet) + arguments.addArg("needed", "asdeps") + for _, pkg := range dc.Repo { + arguments.addTarget(pkg.Name()) + } + + oldConfirm := config.NoConfirm + config.NoConfirm = true + passToPacman(arguments) + config.NoConfirm = oldConfirm + if err != nil { + return err + } + } + if _, ok := arguments.options["gendb"]; ok { fmt.Println("GenDB finished. No packages were installed")