system/yay
system/yay
1
0
Fork 0
mirror of https://github.com/Jguer/yay synced 2024-09-14 13:51:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add GitBin and tweak defaults

Browse source 
Use cacheHome for builddir instead of hardcoding ~/.cache
Use the command names in config.*Bin options.

For example PacmanBin is changed to just "pacman" this means yay will
call the pacman commit in PATH. If the user wants to use a different
binary they can still specify a full path in the config.
This commit is contained in:
morganamilo 2018-03-07 16:29:52 +00:00
parent d3f0053ce1
commit 7e6def5a5f
No known key found for this signature in database
GPG key ID: 6FE9E7996B0B082E
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
config.go
View file

@ -32,6 +32,7 @@ type Configuration struct {
PacmanConf string `json:"pacmanconf"` PacmanConf string `json:"pacmanconf"`
TarBin string `json:"tarbin"` TarBin string `json:"tarbin"`
ReDownload string `json:"redownload"` ReDownload string `json:"redownload"`
GitBin string `json:"gitbin"`
RequestSplitN int `json:"requestsplitn"` RequestSplitN int `json:"requestsplitn"`
SearchMode int `json:"-"` SearchMode int `json:"-"`
SortMode int `json:"sortmode"` SortMode int `json:"sortmode"`
@ -115,17 +116,18 @@ func (config *Configuration) saveConfig() error {
} }
func defaultSettings(config *Configuration) { func defaultSettings(config *Configuration) {
config.BuildDir = fmt.Sprintf("%s/.cache/yay/", os.Getenv("HOME")) config.BuildDir = cacheHome + "/"
config.CleanAfter = false config.CleanAfter = false
config.Editor = "" config.Editor = ""
config.Devel = false config.Devel = false
config.MakepkgBin = "/usr/bin/makepkg" config.MakepkgBin = "makepkg"
config.NoConfirm = false config.NoConfirm = false
config.PacmanBin = "/usr/bin/pacman" config.PacmanBin = "pacman"
config.PacmanConf = "/etc/pacman.conf" config.PacmanConf = "/etc/pacman.conf"
config.SortMode = BottomUp config.SortMode = BottomUp
config.SudoLoop = false config.SudoLoop = false
config.TarBin = "/usr/bin/bsdtar" config.TarBin = "bsdtar"
config.GitBin = "git"
config.TimeUpdate = false config.TimeUpdate = false
config.RequestSplitN = 150 config.RequestSplitN = 150
config.ReDownload = "no" config.ReDownload = "no"

4
vcs.go
View file

@ -103,7 +103,7 @@ func getCommit(url string, branch string, protocols []string) string {
for _, protocol := range protocols { for _, protocol := range protocols {
var outbuf bytes.Buffer var outbuf bytes.Buffer
cmd := exec.Command("git", "ls-remote", protocol+"://"+url, branch) cmd := exec.Command(config.GitBin, "ls-remote", protocol+"://"+url, branch)
cmd.Stdout = &outbuf cmd.Stdout = &outbuf
err := cmd.Start() err := cmd.Start()
@ -144,7 +144,7 @@ func getCommit(url string, branch string, protocols []string) string {
func (infos shaInfos) needsUpdate() bool { func (infos shaInfos) needsUpdate() bool {
for url, info := range infos { for url, info := range infos {
hash := getCommit(url, info.Brach, info.Protocols) hash := getCommit(url, info.Brach, info.Protocols)
if hash != info.SHA { if hash != "" && hash != info.SHA {
return true return true
} }
} }