Skip to content
This repository was archived by the owner on Mar 25, 2024. It is now read-only.

Commit 7397fdf

Browse files
committed
Use vendor.conf as common config file name
that vndr and trash use. trash.conf will be supported as fallback (vndr.cfg and vendor.manifest, too)
1 parent 0fb97e9 commit 7397fdf

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

trash.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func main() {
2929
app.Flags = []cli.Flag{
3030
cli.StringFlag{
3131
Name: "file, f",
32-
Value: "trash.conf",
32+
Value: "vendor.conf",
3333
Usage: "Vendored packages list",
3434
},
3535
cli.StringFlag{
@@ -94,7 +94,7 @@ func run(c *cli.Context) error {
9494
}
9595
logrus.Debugf("dir: '%s'", dir)
9696

97-
for _, trashFile = range []string{trashFile, "trash.yml", "glide.yaml", "glide.yml", "trash.yaml"} {
97+
for _, trashFile = range []string{trashFile, "trash.conf", "vndr.cfg", "vendor.manifest", "trash.yml", "glide.yaml", "glide.yml", "trash.yaml"} {
9898
if _, err = os.Stat(trashFile); err == nil {
9999
break
100100
}

0 commit comments

Comments
 (0)