Merge pull request #43 from imikushin/vendor-conf

Use vendor.conf as common config file name
rancher · Sep 9, 2016 · 6f78de3 · 6f78de3
2 parents 0fb97e9 + 7397fdf
commit 6f78de3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/trash.go b/trash.go
@@ -29,7 +29,7 @@ func main() {
 	app.Flags = []cli.Flag{
 		cli.StringFlag{
 			Name:  "file, f",
-			Value: "trash.conf",
+			Value: "vendor.conf",
 			Usage: "Vendored packages list",
 		},
 		cli.StringFlag{
@@ -94,7 +94,7 @@ func run(c *cli.Context) error {
 	}
 	logrus.Debugf("dir: '%s'", dir)
 
-	for _, trashFile = range []string{trashFile, "trash.yml", "glide.yaml", "glide.yml", "trash.yaml"} {
+	for _, trashFile = range []string{trashFile, "trash.conf", "vndr.cfg", "vendor.manifest", "trash.yml", "glide.yaml", "glide.yml", "trash.yaml"} {
 		if _, err = os.Stat(trashFile); err == nil {
 			break
 		}