Merge pull request #144 from mackerelio/fix-windows-plugin-zip

Fix copying plugin archives while installing a plugin on Windows
mackerelio · Jan 19, 2018 · 313f0e1 · 313f0e1
2 parents edd3209 + 46292bf
commit 313f0e1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/plugin/install.go b/plugin/install.go
@@ -197,6 +197,9 @@ func installByArtifact(artifactFile, bindir, workdir string, overwrite bool) err
 }
 
 func looksLikePlugin(name string) bool {
+	if strings.HasSuffix(name, ".zip") || strings.HasSuffix(name, ".tar.gz") || strings.HasSuffix(name, ".tgz") {
+		return false
+	}
 	return strings.HasPrefix(name, "check-") || strings.HasPrefix(name, "mackerel-plugin-")
 }
 

diff --git a/plugin/install_test.go b/plugin/install_test.go
@@ -289,6 +289,9 @@ func TestLooksLikePlugin(t *testing.T) {
 		{"hoge-mackerel-plugin-sample", false},
 		{"hoge-check-sample", false},
 		{"wrong-sample", false},
+		{"mackerel-plugin-sample.zip", false},
+		{"mackerel-plugin-sample.tgz", false},
+		{"check-sample.tar.gz", false},
 	}
 
 	for _, tc := range testCases {