Merge pull request #148 from Jguer/fix#138

Fix #138. Fix some display messages and eliminates secret sauce

clean.go

@@ -54,10 +54,12 @@ func cleanRemove(pkgNames []string) (err error) {
 		return nil
 	}
 
+	oldvalue := config.NoConfirm
+	config.NoConfirm = true
 	arguments := makeArguments()
-	arguments.addArg("R", "noconfirm")
+	arguments.addArg("R")
 	arguments.addTarget(pkgNames...)
-
 	err = passToPacman(arguments)
+	config.NoConfirm = oldvalue
 	return err
 }

config.go

@@ -44,8 +44,6 @@ var version = "2.297"
 // baseURL givers the AUR default address.
 const baseURL string = "https://aur.archlinux.org"
 
-var specialDBsauce = false
-
 var savedInfo infos
 
 // configfile holds yay config file path.

install.go

@@ -19,7 +19,7 @@ func install(parser *arguments) error {
 
 	if len(missing) > 0 {
 		fmt.Println(missing)
-		return fmt.Errorf("Could not find all Targets")
+		fmt.Println("Could not find all Targets")
 	}
 
 	arguments := parser.copy()
@@ -57,15 +57,15 @@ func install(parser *arguments) error {
 
 		for _, pkg := range dc.AurMake {
 			if pkg.Maintainer == "" {
-				fmt.Println(boldRedFgBlackBg(arrow+"Warning:"),
-					blackBg(pkg.Name+"-"+pkg.Version+"is orphaned"))
+				fmt.Println(boldRedFgBlackBg(arrow+" Warning:"),
+					blackBg(pkg.Name+"-"+pkg.Version+" is orphaned"))
 			}
 		}
 
 		for _, pkg := range dc.Aur {
 			if pkg.Maintainer == "" {
-				fmt.Println(boldRedFgBlackBg(arrow+"Warning:"),
-					blackBg(pkg.Name+"-"+pkg.Version+"is orphaned"))
+				fmt.Println(boldRedFgBlackBg(arrow+" Warning:"),
+					blackBg(pkg.Name+"-"+pkg.Version+" is orphaned"))
 			}
 		}
 
@@ -85,9 +85,11 @@ func install(parser *arguments) error {
 		// 	return fmt.Errorf("Aborting due to user")
 		// }
 
-		err = checkForConflicts(dc.Aur, dc.AurMake, dc.Repo, dc.RepoMake)
-		if err != nil {
-			return err
+		if _, ok := arguments.options["gendb"]; !ok {
+			err = checkForConflicts(dc.Aur, dc.AurMake, dc.Repo, dc.RepoMake)
+			if err != nil {
+				return err
+			}
 		}
 
 		err = dowloadPkgBuilds(dc.AurMake)
@@ -101,6 +103,10 @@ func install(parser *arguments) error {
 
 		askEditPkgBuilds(dc.AurMake)
 		askEditPkgBuilds(dc.Aur)
+		if _, ok := arguments.options["gendb"]; ok {
+			fmt.Println("GenDB finished. No packages were installed")
+			return nil
+		}
 
 		// if !continueTask("Proceed with install?", "nN") {
 		// 	return fmt.Errorf("Aborting due to user")

query.go

@@ -274,7 +274,7 @@ func packageSlices(toCheck []string) (aur []string, repo []string, missing []str
 
 	info, err := rpc.Info(possibleAur)
 	if err != nil {
-		return
+		fmt.Println(err)
 	}
 
 outer:

vcs.go

@@ -37,8 +37,8 @@ func createDevelDB() error {
 	}
 
 	config.NoConfirm = true
-	specialDBsauce = true
 	arguments := makeArguments()
+	arguments.addArg("gendb")
 	arguments.addTarget(remoteNames...)
 	err = install(arguments)
 	return err