From ec48698f3544c3227577638bf19e00043cb9102a Mon Sep 17 00:00:00 2001 From: morganamilo Date: Sat, 21 Jul 2018 14:20:00 +0100 Subject: [PATCH] Add --{no,ask}removemake --- cmd.go | 6 ++++++ config.go | 2 ++ install.go | 6 +++++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/cmd.go b/cmd.go index 929b333a..b77a91f3 100644 --- a/cmd.go +++ b/cmd.go @@ -326,6 +326,12 @@ func handleConfig(option, value string) bool { mode = ModeAUR case "repo": mode = ModeRepo + case "removemake": + config.RemoveMake = "yes" + case "noremovemake": + config.RemoveMake = "no" + case "askremovemake": + config.RemoveMake = "ask" default: return false } diff --git a/config.go b/config.go index daff6461..04dd9a40 100644 --- a/config.go +++ b/config.go @@ -54,6 +54,7 @@ type Configuration struct { MFlags string `json:"mflags"` SortBy string `json:"sortby"` GitFlags string `json:"gitflags"` + RemoveMake string `json:"removemake"` RequestSplitN int `json:"requestsplitn"` SearchMode int `json:"-"` SortMode int `json:"sortmode"` @@ -173,6 +174,7 @@ func defaultSettings(config *Configuration) { config.AnswerDiff = "" config.AnswerEdit = "" config.AnswerUpgrade = "" + config.RemoveMake = "ask" config.GitClone = true config.Provides = true config.UpgradeMenu = true diff --git a/install.go b/install.go index abdf8686..c4185b50 100644 --- a/install.go +++ b/install.go @@ -166,7 +166,11 @@ func install(parser *arguments) error { fmt.Println() 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 } }