system/yay
system/yay
1
0
Fork 0
mirror of https://github.com/Jguer/yay synced 2024-10-05 23:59:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(config): move default settings to config

Browse source
This commit is contained in:
jguer 2020-07-05 03:28:57 +02:00
parent 9b49f76bbd
commit 0bae6e2f7d
No known key found for this signature in database
GPG key ID: 6D6CC9BEA8556B35
5 changed files with 58 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd.go
View file

@ -199,7 +199,7 @@ func handleVersion() {
func handlePrint() (err error) {
switch {
case cmdArgs.ExistsArg("d", "defaultconfig"):
tmpConfig := defaultSettings()
tmpConfig := settings.MakeConfig()
tmpConfig.ExpandEnv()
fmt.Printf("%v", tmpConfig)
case cmdArgs.ExistsArg("g", "currentconfig"):

53
config.go
View file

@ -40,59 +40,6 @@ var alpmHandle *alpm.Handle
var hideMenus = false
func defaultSettings() *settings.Configuration {
newConfig := &settings.Configuration{
AURURL: "https://aur.archlinux.org",
BuildDir: "$HOME/.cache/yay",
ABSDir: "$HOME/.cache/yay/abs",
CleanAfter: false,
Editor: "",
EditorFlags: "",
Devel: false,
MakepkgBin: "makepkg",
MakepkgConf: "",
NoConfirm: false,
PacmanBin: "pacman",
PGPFetch: true,
PacmanConf: "/etc/pacman.conf",
GpgFlags: "",
MFlags: "",
GitFlags: "",
SortMode: settings.BottomUp,
CompletionInterval: 7,
SortBy: "votes",
SearchBy: "name-desc",
SudoLoop: false,
GitBin: "git",
GpgBin: "gpg",
SudoBin: "sudo",
SudoFlags: "",
TimeUpdate: false,
RequestSplitN: 150,
ReDownload: "no",
ReBuild: "no",
BatchInstall: false,
AnswerClean: "",
AnswerDiff: "",
AnswerEdit: "",
AnswerUpgrade: "",
RemoveMake: "ask",
Provides: true,
UpgradeMenu: true,
CleanMenu: true,
DiffMenu: true,
EditMenu: false,
UseAsk: false,
CombinedUpgrade: false,
}
if os.Getenv("XDG_CACHE_HOME") != "" {
newConfig.BuildDir = "$XDG_CACHE_HOME/yay"
}
return newConfig
}
// Editor returns the preferred system editor.
func editor() (editor string, args []string) {
switch {

4
keys_test.go
View file

@ -13,6 +13,8 @@ import (
gosrc "github.com/Morganamilo/go-srcinfo"
rpc "github.com/mikkeloscar/aur"
"github.com/Jguer/yay/v10/pkg/settings"
)
const (
@ -72,7 +74,7 @@ func TestImportKeys(t *testing.T) {
}
defer os.RemoveAll(keyringDir)
config = defaultSettings()
config = settings.MakeConfig()
config.GpgBin = "gpg"
config.GpgFlags = fmt.Sprintf("--homedir %s --keyserver 127.0.0.1", keyringDir)

2
main.go
View file

@ -184,7 +184,7 @@ func main() {
runtime, err := settings.MakeRuntime()
exitOnError(err)
config = defaultSettings()
config = settings.MakeConfig()
config.Runtime = runtime
exitOnError(initConfig(runtime.ConfigPath))
exitOnError(cmdArgs.ParseCommandLine(config))

53
pkg/settings/config.go
View file

@ -115,3 +115,56 @@ func (config *Configuration) String() string {
}
return buf.String()
}
func MakeConfig() *Configuration {
newConfig := &Configuration{
AURURL: "https://aur.archlinux.org",
BuildDir: "$HOME/.cache/yay",
ABSDir: "$HOME/.cache/yay/abs",
CleanAfter: false,
Editor: "",
EditorFlags: "",
Devel: false,
MakepkgBin: "makepkg",
MakepkgConf: "",
NoConfirm: false,
PacmanBin: "pacman",
PGPFetch: true,
PacmanConf: "/etc/pacman.conf",
GpgFlags: "",
MFlags: "",
GitFlags: "",
SortMode: BottomUp,
CompletionInterval: 7,
SortBy: "votes",
SearchBy: "name-desc",
SudoLoop: false,
GitBin: "git",
GpgBin: "gpg",
SudoBin: "sudo",
SudoFlags: "",
TimeUpdate: false,
RequestSplitN: 150,
ReDownload: "no",
ReBuild: "no",
BatchInstall: false,
AnswerClean: "",
AnswerDiff: "",
AnswerEdit: "",
AnswerUpgrade: "",
RemoveMake: "ask",
Provides: true,
UpgradeMenu: true,
CleanMenu: true,
DiffMenu: true,
EditMenu: false,
UseAsk: false,
CombinedUpgrade: false,
}
if os.Getenv("XDG_CACHE_HOME") != "" {
newConfig.BuildDir = "$XDG_CACHE_HOME/yay"
}
return newConfig
}