Merge pull request #923 from Jguer/revert-916-sudobin

Revert "Add SudoBin"
This commit is contained in:
J Guerreiro 2019-03-29 22:09:39 +00:00 committed by GitHub
commit 8880213fb0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 2 additions and 31 deletions

2
cmd.go
View file

@ -105,8 +105,6 @@ Permanent configuration options:
--combinedupgrade Refresh then perform the repo and AUR upgrade together
--nocombinedupgrade Perform the repo upgrade and AUR upgrade separately
--sudo <file> sudo command to use
--sudoflags <flags> Pass arguments to sudo
--sudoloop Loop sudo calls in the background to avoid timeout
--nosudoloop Do not loop sudo calls in the background

View file

@ -58,8 +58,6 @@ type Configuration struct {
SortBy string `json:"sortby"`
GitFlags string `json:"gitflags"`
RemoveMake string `json:"removemake"`
SudoBin string `json:"sudobin"`
SudoFlags string `json:"sudoflags"`
RequestSplitN int `json:"requestsplitn"`
SearchMode int `json:"-"`
SortMode int `json:"sortmode"`
@ -163,8 +161,6 @@ func defaultSettings() *Configuration {
TarBin: "bsdtar",
GitBin: "git",
GpgBin: "gpg",
SudoBin: "sudo",
SudoFlags: "",
TimeUpdate: false,
RequestSplitN: 150,
ReDownload: "no",
@ -207,8 +203,6 @@ func (config *Configuration) expandEnv() {
config.TarBin = os.ExpandEnv(config.TarBin)
config.GitBin = os.ExpandEnv(config.GitBin)
config.GpgBin = os.ExpandEnv(config.GpgBin)
config.SudoBin = os.ExpandEnv(config.SudoBin)
config.SudoFlags = os.ExpandEnv(config.SudoFlags)
config.ReDownload = os.ExpandEnv(config.ReDownload)
config.ReBuild = os.ExpandEnv(config.ReBuild)
config.AnswerClean = os.ExpandEnv(config.AnswerClean)

View file

@ -482,19 +482,6 @@ gpg is called by Yay. Arguments are split on whitespace before being
passed to gpg. Multiple arguments may be passed by supplying a space
separated list that is quoted by the shell.
.TP
.B \-\-sudo <command>
The command to use for \fBsudo\fR calls. This can be a command in
\fBPATH\fR or an absolute path to the file.
The sudoloop is not guarantee to work with a custom \fBsudo\fR command.
.TP
.B \-\-sudoflags <flags>
Passes arguments to sudo. These flags get passed to every instance where
sudo is called by Yay. Arguments are split on whitespace before being
passed to sudo. Multiple arguments may be passed by supplying a space
separated list that is quoted by the shell.
.TP
.B \-\-sudoloop
Loop sudo calls in the background to prevent sudo from timing out during long

View file

@ -45,7 +45,7 @@ func sudoLoop() {
func updateSudo() {
for {
err := show(exec.Command(config.SudoBin, "-v"))
err := show(exec.Command("sudo", "-v"))
if err != nil {
fmt.Fprintln(os.Stderr, err)
} else {
@ -77,7 +77,7 @@ func passToPacman(args *arguments) *exec.Cmd {
argArr := make([]string, 0)
if args.needRoot() {
argArr = append(argArr, config.SudoBin, config.SudoFlags)
argArr = append(argArr, "sudo")
}
argArr = append(argArr, config.PacmanBin)

View file

@ -460,8 +460,6 @@ func isArg(arg string) bool {
case "tar":
case "git":
case "gpg":
case "sudo":
case "sudoflags":
case "requestsplitn":
case "sudoloop":
case "nosudoloop":
@ -591,10 +589,6 @@ func handleConfig(option, value string) bool {
config.GitBin = value
case "gpg":
config.GpgBin = value
case "sudo":
config.SudoBin = value
case "sudoflags":
config.SudoFlags = value
case "requestsplitn":
n, err := strconv.Atoi(value)
if err == nil && n > 0 {
@ -728,8 +722,6 @@ func hasParam(arg string) bool {
case "tar":
case "git":
case "gpg":
case "sudo":
case "sudoflags":
case "requestsplitn":
case "answerclean":
case "answerdiff":