mirror of
https://github.com/Jguer/yay
synced 2024-09-14 13:51:12 +00:00
Fixes --noconfirm. Changes default build location to ~/.cache/yay/
This commit is contained in:
parent
fb8297881f
commit
c0901ff86b
9
cmd.go
9
cmd.go
|
@ -665,6 +665,10 @@ func passToPacman(args *arguments) error {
|
||||||
argArr = append(argArr, "pacman")
|
argArr = append(argArr, "pacman")
|
||||||
argArr = append(argArr, cmdArgs.formatGlobals()...)
|
argArr = append(argArr, cmdArgs.formatGlobals()...)
|
||||||
argArr = append(argArr, args.formatArgs()...)
|
argArr = append(argArr, args.formatArgs()...)
|
||||||
|
if config.NoConfirm {
|
||||||
|
argArr = append(argArr, "--noconfirm")
|
||||||
|
}
|
||||||
|
|
||||||
argArr = append(argArr, args.formatTargets()...)
|
argArr = append(argArr, args.formatTargets()...)
|
||||||
|
|
||||||
cmd = exec.Command(argArr[0], argArr[1:]...)
|
cmd = exec.Command(argArr[0], argArr[1:]...)
|
||||||
|
@ -676,6 +680,11 @@ func passToPacman(args *arguments) error {
|
||||||
|
|
||||||
// passToMakepkg outsources execution to makepkg binary without modifications.
|
// passToMakepkg outsources execution to makepkg binary without modifications.
|
||||||
func passToMakepkg(dir string, args ...string) (err error) {
|
func passToMakepkg(dir string, args ...string) (err error) {
|
||||||
|
|
||||||
|
if config.NoConfirm {
|
||||||
|
args = append(args)
|
||||||
|
}
|
||||||
|
|
||||||
cmd := exec.Command(config.MakepkgBin, args...)
|
cmd := exec.Command(config.MakepkgBin, args...)
|
||||||
cmd.Stdin, cmd.Stdout, cmd.Stderr = os.Stdin, os.Stdout, os.Stderr
|
cmd.Stdin, cmd.Stdout, cmd.Stderr = os.Stdin, os.Stdout, os.Stderr
|
||||||
cmd.Dir = dir
|
cmd.Dir = dir
|
||||||
|
|
|
@ -5,7 +5,6 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"os/user"
|
|
||||||
|
|
||||||
alpm "github.com/jguer/go-alpm"
|
alpm "github.com/jguer/go-alpm"
|
||||||
)
|
)
|
||||||
|
@ -103,11 +102,7 @@ func (config *Configuration) saveConfig() error {
|
||||||
}
|
}
|
||||||
|
|
||||||
func defaultSettings(config *Configuration) {
|
func defaultSettings(config *Configuration) {
|
||||||
u, err := user.Current()
|
config.BuildDir = fmt.Sprintf("%s/.cache/yay/", os.Getenv("HOME"))
|
||||||
if err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
config.BuildDir = fmt.Sprintf("/tmp/yaytmp-%s/", u.Uid)
|
|
||||||
config.CleanAfter = false
|
config.CleanAfter = false
|
||||||
config.Editor = ""
|
config.Editor = ""
|
||||||
config.Devel = false
|
config.Devel = false
|
||||||
|
|
Loading…
Reference in a new issue