Merge pull request #2209 from mitchellh/b-ignore-non-exe
ignore non-exe plugins on Windows [GH-2173]
This commit is contained in:
commit
33724d382e
10
config.go
10
config.go
|
@ -6,6 +6,7 @@ import (
|
||||||
"log"
|
"log"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
"runtime"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/mitchellh/osext"
|
"github.com/mitchellh/osext"
|
||||||
|
@ -172,6 +173,15 @@ func (c *config) discoverSingle(glob string, m *map[string]string) error {
|
||||||
for _, match := range matches {
|
for _, match := range matches {
|
||||||
file := filepath.Base(match)
|
file := filepath.Base(match)
|
||||||
|
|
||||||
|
// One Windows, ignore any plugins that don't end in .exe.
|
||||||
|
// We could do a full PATHEXT parse, but this is probably good enough.
|
||||||
|
if runtime.GOOS == "windows" && strings.ToLower(filepath.Ext(file)) != ".exe" {
|
||||||
|
log.Printf(
|
||||||
|
"[DEBUG] Ignoring plugin match %s, no exe extension",
|
||||||
|
match)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
// If the filename has a ".", trim up to there
|
// If the filename has a ".", trim up to there
|
||||||
if idx := strings.Index(file, "."); idx >= 0 {
|
if idx := strings.Index(file, "."); idx >= 0 {
|
||||||
file = file[:idx]
|
file = file[:idx]
|
||||||
|
|
Loading…
Reference in New Issue