Quellcode durchsuchen

Merge pull request #328 from Morganamilo/flags

Repect --answer* flags when --noconfirm is set
Morgana vor 7 Jahren
Ursprung
Commit
922a591b64
3 geänderte Dateien mit 4 neuen und 12 gelöschten Zeilen
  1. 1 1
      config.go
  2. 3 4
      install.go
  3. 0 7
      upgrade.go

+ 1 - 1
config.go

@@ -233,7 +233,7 @@ func continueTask(s string, def string) (cont bool) {
 }
 
 func getInput(defaultValue string) (string, error) {
-	if defaultValue != "" {
+	if defaultValue != "" || config.NoConfirm {
 		fmt.Println(defaultValue)
 		return defaultValue, nil
 	}

+ 3 - 4
install.go

@@ -216,9 +216,12 @@ func install(parser *arguments) error {
 			}
 		}
 	} else if hasAur {
+		oldValue := config.NoConfirm
+		config.NoConfirm = false
 		if len(toEdit) > 0 && !continueTask("Proceed with install?", "nN") {
 			return fmt.Errorf("Aborting due to user")
 		}
+		config.NoConfirm = oldValue
 	}
 
 	if hasAur {
@@ -316,10 +319,6 @@ func cleanEditNumberMenu(pkgs []*rpc.Pkg, bases map[string][]*rpc.Pkg, installed
 	toClean := make([]*rpc.Pkg, 0)
 	toEdit := make([]*rpc.Pkg, 0)
 
-	if config.NoConfirm {
-		return toClean, toEdit, nil
-	}
-
 	for n, pkg := range pkgs {
 		dir := config.BuildDir + pkg.PackageBase + "/"
 

+ 0 - 7
upgrade.go

@@ -277,13 +277,6 @@ func upgradePkgs(aurUp, repoUp upSlice) (stringSet, stringSet, error) {
 	repoUp.Print(len(aurUp) + 1)
 	aurUp.Print(1)
 
-	if config.NoConfirm {
-		for _, up := range aurUp {
-			aurNames.set(up.Name)
-		}
-		return ignore, aurNames, nil
-	}
-
 	fmt.Println(bold(green(arrow + " Packages to not upgrade (eg: 1 2 3, 1-3, ^4 or repo name)")))
 	fmt.Print(bold(green(arrow + " ")))