iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8542 from TJM/plugin_logs 

Parse out -PACKERSPACE- before looking for exec
This commit is contained in:
Megan Marsh 2020-01-06 14:14:46 -08:00 committed by GitHub
parent e525d2bd6e 9d85aa36ec
commit d95b0122f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
config.go
View File

@ -267,6 +267,14 @@ func (c *config) discoverInternalComponents() error {
func (c *config) pluginClient(path string) *plugin.Client { func (c *config) pluginClient(path string) *plugin.Client {
originalPath := path originalPath := path
// Check for special case using `packer plugin PLUGIN`
args := []string{}
if strings.Contains(path, PACKERSPACE) {
parts := strings.Split(path, PACKERSPACE)
path = parts[0]
args = parts[1:]
}
// First attempt to find the executable by consulting the PATH. // First attempt to find the executable by consulting the PATH.
path, err := exec.LookPath(path) path, err := exec.LookPath(path)
if err != nil { if err != nil {
@ -282,14 +290,6 @@ func (c *config) pluginClient(path string) *plugin.Client {
} }
} }
// Check for special case using `packer plugin PLUGIN`
args := []string{}
if strings.Contains(path, PACKERSPACE) {
parts := strings.Split(path, PACKERSPACE)
path = parts[0]
args = parts[1:]
}
// If everything failed, just use the original path and let the error // If everything failed, just use the original path and let the error
// bubble through. // bubble through.
if path == "" { if path == "" {