From ba1e06d3671210e09733f4ab5251508616b7831b Mon Sep 17 00:00:00 2001 From: jguer Date: Wed, 8 Sep 2021 09:43:37 +0200 Subject: [PATCH] feat(cmd): remove unused absdir option --- cmd.go | 1 - completions/fish | 1 - doc/yay.8 | 5 ----- pkg/settings/args.go | 2 -- pkg/settings/config.go | 3 --- pkg/settings/parser/parser.go | 2 -- 6 files changed, 14 deletions(-) diff --git a/cmd.go b/cmd.go index 55fc0aa4..64b1f579 100644 --- a/cmd.go +++ b/cmd.go @@ -59,7 +59,6 @@ Permanent configuration options: --aururl Set an alternative AUR URL --builddir Directory used to download and run PKGBUILDS - --absdir Directory used to store downloads from the ABS --editor Editor to use when editing PKGBUILDs --editorflags Pass arguments to editor --makepkg makepkg command to use diff --git a/completions/fish b/completions/fish index e3c7eac9..f22df838 100644 --- a/completions/fish +++ b/completions/fish @@ -183,7 +183,6 @@ complete -c $progname -n "$getpkgbuild" -s p -l print -d 'Print pkgbuild of pack complete -c $progname -n "not $noopt" -l save -d 'Save current arguments to yay permanent configuration' -f complete -c $progname -n "not $noopt" -l aururl -d 'Set an alternative AUR URL' -f complete -c $progname -n "not $noopt" -l builddir -d 'Directory to use for Building AUR Packages' -r -complete -c $progname -n "not $noopt" -l absdir -d 'Directory used to store downloads from the ABS' -r complete -c $progname -n "not $noopt" -l editor -d 'Editor to use' -f complete -c $progname -n "not $noopt" -l editorflags -d 'Editor flags to use' -f complete -c $progname -n "not $noopt" -l makepkg -d 'Makepkg command to use' -f diff --git a/doc/yay.8 b/doc/yay.8 index b79f4122..de7fdefd 100644 --- a/doc/yay.8 +++ b/doc/yay.8 @@ -154,11 +154,6 @@ to use https://aur.tuna.tsinghua.edu.cn/. Directory to use for Building AUR Packages. This directory is also used as the AUR cache when deciding if Yay should skip builds. -.TP -.B \-\-absdir -Directory used to store downloads from the ABS. During \-G, the PKGBUILD -placed in the current dir symlinks to absdir. - .TP .B \-\-editor Editor to use when editing PKGBUILDs. If this is not set the \fBEDITOR\fR diff --git a/pkg/settings/args.go b/pkg/settings/args.go index add87005..6f877a82 100644 --- a/pkg/settings/args.go +++ b/pkg/settings/args.go @@ -108,8 +108,6 @@ func (c *Configuration) handleOption(option, value string) bool { c.GitFlags = value case "builddir": c.BuildDir = value - case "absdir": - c.ABSDir = value case "editor": c.Editor = value case "editorflags": diff --git a/pkg/settings/config.go b/pkg/settings/config.go index d5fe8605..dcea40e7 100644 --- a/pkg/settings/config.go +++ b/pkg/settings/config.go @@ -36,7 +36,6 @@ var NoConfirm = false type Configuration struct { AURURL string `json:"aururl"` BuildDir string `json:"buildDir"` - ABSDir string `json:"absdir"` Editor string `json:"editor"` EditorFlags string `json:"editorflags"` MakepkgBin string `json:"makepkgbin"` @@ -110,7 +109,6 @@ func (c *Configuration) Save(configPath string) error { func (c *Configuration) expandEnv() { c.AURURL = os.ExpandEnv(c.AURURL) - c.ABSDir = os.ExpandEnv(c.ABSDir) c.BuildDir = os.ExpandEnv(c.BuildDir) c.Editor = os.ExpandEnv(c.Editor) c.EditorFlags = os.ExpandEnv(c.EditorFlags) @@ -174,7 +172,6 @@ func DefaultConfig() *Configuration { return &Configuration{ AURURL: "https://aur.archlinux.org", BuildDir: os.ExpandEnv("$HOME/.cache/yay"), - ABSDir: os.ExpandEnv("$HOME/.cache/yay/abs"), CleanAfter: false, Editor: "", EditorFlags: "", diff --git a/pkg/settings/parser/parser.go b/pkg/settings/parser/parser.go index 0e61755a..04f5ce52 100644 --- a/pkg/settings/parser/parser.go +++ b/pkg/settings/parser/parser.go @@ -333,7 +333,6 @@ func isArg(arg string) bool { case "d", "nodeps": case "assume-installed": case "dbonly": - case "absdir": case "noprogressbar": case "numberupgrades": case "noscriptlet": @@ -519,7 +518,6 @@ func hasParam(arg string) bool { case "gpgflags": case "gitflags": case "builddir": - case "absdir": case "editor": case "editorflags": case "makepkg":