mirror of
https://github.com/Jguer/yay.git
synced 2025-10-09 00:07:14 -04:00
Merge pull request #575 from Morganamilo/fix#574
Add --{no,ask}removemake
This commit is contained in:
commit
1d463d1e3f
6
cmd.go
6
cmd.go
@ -326,6 +326,12 @@ func handleConfig(option, value string) bool {
|
|||||||
mode = ModeAUR
|
mode = ModeAUR
|
||||||
case "repo":
|
case "repo":
|
||||||
mode = ModeRepo
|
mode = ModeRepo
|
||||||
|
case "removemake":
|
||||||
|
config.RemoveMake = "yes"
|
||||||
|
case "noremovemake":
|
||||||
|
config.RemoveMake = "no"
|
||||||
|
case "askremovemake":
|
||||||
|
config.RemoveMake = "ask"
|
||||||
default:
|
default:
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
@ -54,6 +54,7 @@ type Configuration struct {
|
|||||||
MFlags string `json:"mflags"`
|
MFlags string `json:"mflags"`
|
||||||
SortBy string `json:"sortby"`
|
SortBy string `json:"sortby"`
|
||||||
GitFlags string `json:"gitflags"`
|
GitFlags string `json:"gitflags"`
|
||||||
|
RemoveMake string `json:"removemake"`
|
||||||
RequestSplitN int `json:"requestsplitn"`
|
RequestSplitN int `json:"requestsplitn"`
|
||||||
SearchMode int `json:"-"`
|
SearchMode int `json:"-"`
|
||||||
SortMode int `json:"sortmode"`
|
SortMode int `json:"sortmode"`
|
||||||
@ -173,6 +174,7 @@ func defaultSettings(config *Configuration) {
|
|||||||
config.AnswerDiff = ""
|
config.AnswerDiff = ""
|
||||||
config.AnswerEdit = ""
|
config.AnswerEdit = ""
|
||||||
config.AnswerUpgrade = ""
|
config.AnswerUpgrade = ""
|
||||||
|
config.RemoveMake = "ask"
|
||||||
config.GitClone = true
|
config.GitClone = true
|
||||||
config.Provides = true
|
config.Provides = true
|
||||||
config.UpgradeMenu = true
|
config.UpgradeMenu = true
|
||||||
|
@ -166,7 +166,11 @@ func install(parser *arguments) error {
|
|||||||
fmt.Println()
|
fmt.Println()
|
||||||
|
|
||||||
if do.HasMake() {
|
if do.HasMake() {
|
||||||
if !continueTask("Remove make dependencies after install?", "yY") {
|
if config.RemoveMake == "yes" {
|
||||||
|
removeMake = true
|
||||||
|
} else if config.RemoveMake == "no" {
|
||||||
|
removeMake = false
|
||||||
|
} else if !continueTask("Remove make dependencies after install?", "yY") {
|
||||||
removeMake = true
|
removeMake = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user