mirror/yay
0
0
Fork 0
mirror of https://github.com/Jguer/yay.git synced 2024-11-06 17:17:22 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #328 from Morganamilo/flags

Browse Source 
Repect --answer* flags when --noconfirm is set
This commit is contained in:
Morgana 2018-04-04 22:40:04 +01:00 committed by GitHub
commit 922a591b64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.go
View File

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

7
install.go
View File

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

7
upgrade.go
View File

@ -277,13 +277,6 @@ func upgradePkgs(aurUp, repoUp upSlice) (stringSet, stringSet, error) {
repoUp.Print(len(aurUp) + 1) repoUp.Print(len(aurUp) + 1)
aurUp.Print(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.Println(bold(green(arrow + " Packages to not upgrade (eg: 1 2 3, 1-3, ^4 or repo name)")))
fmt.Print(bold(green(arrow + " "))) fmt.Print(bold(green(arrow + " ")))