|
@@ -81,7 +81,28 @@ func install(parser *arguments) error {
|
|
|
if !continueTask("Proceed with install?", "nN") {
|
|
|
return fmt.Errorf("Aborting due to user")
|
|
|
}
|
|
|
+
|
|
|
+ // if !continueTask("Proceed with download?", "nN") {
|
|
|
+ // return fmt.Errorf("Aborting due to user")
|
|
|
+ // }
|
|
|
+
|
|
|
+ if _, ok := arguments.options["gendb"]; !ok {
|
|
|
+ //err = checkForConflicts(dc.Aur, dc.AurMake, dc.Repo, dc.RepoMake)
|
|
|
+ if err != nil {
|
|
|
+ return err
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
+ err = dowloadPkgBuilds(dc.Aur, dc.Bases)
|
|
|
+ if err != nil {
|
|
|
+ return err
|
|
|
+ }
|
|
|
+
|
|
|
+ err = askEditPkgBuilds(dc.Aur, dc.Bases)
|
|
|
+ if err != nil {
|
|
|
+ return err
|
|
|
+ }
|
|
|
+
|
|
|
if len(dc.Repo) > 0 {
|
|
|
arguments := parser.copy()
|
|
|
arguments.delArg("u", "sysupgrade")
|
|
@@ -102,26 +123,6 @@ func install(parser *arguments) error {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- // if !continueTask("Proceed with download?", "nN") {
|
|
|
- // return fmt.Errorf("Aborting due to user")
|
|
|
- // }
|
|
|
-
|
|
|
- if _, ok := arguments.options["gendb"]; !ok {
|
|
|
- //err = checkForConflicts(dc.Aur, dc.AurMake, dc.Repo, dc.RepoMake)
|
|
|
- if err != nil {
|
|
|
- return err
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- err = dowloadPkgBuilds(dc.Aur, dc.Bases)
|
|
|
- if err != nil {
|
|
|
- return err
|
|
|
- }
|
|
|
-
|
|
|
- err = askEditPkgBuilds(dc.Aur, dc.Bases)
|
|
|
- if err != nil {
|
|
|
- return err
|
|
|
- }
|
|
|
|
|
|
if _, ok := arguments.options["gendb"]; ok {
|
|
|
fmt.Println("GenDB finished. No packages were installed")
|