瀏覽代碼

feat(cmd): remove unused absdir option

jguer 3 年之前
父節點
當前提交
ba1e06d367
共有 6 個文件被更改,包括 0 次插入14 次删除
  1. 0 1
      cmd.go
  2. 0 1
      completions/fish
  3. 0 5
      doc/yay.8
  4. 0 2
      pkg/settings/args.go
  5. 0 3
      pkg/settings/config.go
  6. 0 2
      pkg/settings/parser/parser.go

+ 0 - 1
cmd.go

@@ -59,7 +59,6 @@ Permanent configuration options:
 
 
     --aururl      <url>   Set an alternative AUR URL
     --aururl      <url>   Set an alternative AUR URL
     --builddir    <dir>   Directory used to download and run PKGBUILDS
     --builddir    <dir>   Directory used to download and run PKGBUILDS
-    --absdir      <dir>   Directory used to store downloads from the ABS
     --editor      <file>  Editor to use when editing PKGBUILDs
     --editor      <file>  Editor to use when editing PKGBUILDs
     --editorflags <flags> Pass arguments to editor
     --editorflags <flags> Pass arguments to editor
     --makepkg     <file>  makepkg command to use
     --makepkg     <file>  makepkg command to use

+ 0 - 1
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 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 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 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 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 editorflags -d 'Editor flags to use' -f
 complete -c $progname -n "not $noopt" -l makepkg -d 'Makepkg command to use' -f
 complete -c $progname -n "not $noopt" -l makepkg -d 'Makepkg command to use' -f

+ 0 - 5
doc/yay.8

@@ -155,11 +155,6 @@ Directory to use for Building AUR Packages. This directory is also used as
 the AUR cache when deciding if Yay should skip builds.
 the AUR cache when deciding if Yay should skip builds.
 
 
 .TP
 .TP
-.B \-\-absdir <dir>
-Directory used to store downloads from the ABS. During \-G, the PKGBUILD
-placed in the current dir symlinks to absdir.
-
-.TP
 .B \-\-editor <command>
 .B \-\-editor <command>
 Editor to use when editing PKGBUILDs. If this is not set the \fBEDITOR\fR
 Editor to use when editing PKGBUILDs. If this is not set the \fBEDITOR\fR
 environment variable will be checked, followed by \fBVISUAL\fR. If none of
 environment variable will be checked, followed by \fBVISUAL\fR. If none of

+ 0 - 2
pkg/settings/args.go

@@ -108,8 +108,6 @@ func (c *Configuration) handleOption(option, value string) bool {
 		c.GitFlags = value
 		c.GitFlags = value
 	case "builddir":
 	case "builddir":
 		c.BuildDir = value
 		c.BuildDir = value
-	case "absdir":
-		c.ABSDir = value
 	case "editor":
 	case "editor":
 		c.Editor = value
 		c.Editor = value
 	case "editorflags":
 	case "editorflags":

+ 0 - 3
pkg/settings/config.go

@@ -36,7 +36,6 @@ var NoConfirm = false
 type Configuration struct {
 type Configuration struct {
 	AURURL             string   `json:"aururl"`
 	AURURL             string   `json:"aururl"`
 	BuildDir           string   `json:"buildDir"`
 	BuildDir           string   `json:"buildDir"`
-	ABSDir             string   `json:"absdir"`
 	Editor             string   `json:"editor"`
 	Editor             string   `json:"editor"`
 	EditorFlags        string   `json:"editorflags"`
 	EditorFlags        string   `json:"editorflags"`
 	MakepkgBin         string   `json:"makepkgbin"`
 	MakepkgBin         string   `json:"makepkgbin"`
@@ -110,7 +109,6 @@ func (c *Configuration) Save(configPath string) error {
 
 
 func (c *Configuration) expandEnv() {
 func (c *Configuration) expandEnv() {
 	c.AURURL = os.ExpandEnv(c.AURURL)
 	c.AURURL = os.ExpandEnv(c.AURURL)
-	c.ABSDir = os.ExpandEnv(c.ABSDir)
 	c.BuildDir = os.ExpandEnv(c.BuildDir)
 	c.BuildDir = os.ExpandEnv(c.BuildDir)
 	c.Editor = os.ExpandEnv(c.Editor)
 	c.Editor = os.ExpandEnv(c.Editor)
 	c.EditorFlags = os.ExpandEnv(c.EditorFlags)
 	c.EditorFlags = os.ExpandEnv(c.EditorFlags)
@@ -174,7 +172,6 @@ func DefaultConfig() *Configuration {
 	return &Configuration{
 	return &Configuration{
 		AURURL:             "https://aur.archlinux.org",
 		AURURL:             "https://aur.archlinux.org",
 		BuildDir:           os.ExpandEnv("$HOME/.cache/yay"),
 		BuildDir:           os.ExpandEnv("$HOME/.cache/yay"),
-		ABSDir:             os.ExpandEnv("$HOME/.cache/yay/abs"),
 		CleanAfter:         false,
 		CleanAfter:         false,
 		Editor:             "",
 		Editor:             "",
 		EditorFlags:        "",
 		EditorFlags:        "",

+ 0 - 2
pkg/settings/parser/parser.go

@@ -333,7 +333,6 @@ func isArg(arg string) bool {
 	case "d", "nodeps":
 	case "d", "nodeps":
 	case "assume-installed":
 	case "assume-installed":
 	case "dbonly":
 	case "dbonly":
-	case "absdir":
 	case "noprogressbar":
 	case "noprogressbar":
 	case "numberupgrades":
 	case "numberupgrades":
 	case "noscriptlet":
 	case "noscriptlet":
@@ -519,7 +518,6 @@ func hasParam(arg string) bool {
 	case "gpgflags":
 	case "gpgflags":
 	case "gitflags":
 	case "gitflags":
 	case "builddir":
 	case "builddir":
-	case "absdir":
 	case "editor":
 	case "editor":
 	case "editorflags":
 	case "editorflags":
 	case "makepkg":
 	case "makepkg":