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

unbreak glob pattern in floppy_files

Browse Source 
Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
This commit is contained in:
Vasiliy Tolstov 2016-09-15 23:16:21 +03:00
parent 902ac5ab2e
commit 7f391a94aa
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
common/floppy_config.go
View File

@ -3,6 +3,8 @@ package common
import ( import (
"fmt" "fmt"
"os" "os"
"path/filepath"
"strings"
"github.com/mitchellh/packer/template/interpolate" "github.com/mitchellh/packer/template/interpolate"
) )
@ -14,13 +16,19 @@ type FloppyConfig struct {
func (c *FloppyConfig) Prepare(ctx *interpolate.Context) []error { func (c *FloppyConfig) Prepare(ctx *interpolate.Context) []error {
var errs []error var errs []error
var err error
if c.FloppyFiles == nil { if c.FloppyFiles == nil {
c.FloppyFiles = make([]string, 0) c.FloppyFiles = make([]string, 0)
} }
for _, path := range c.FloppyFiles { for _, path := range c.FloppyFiles {
if _, err := os.Stat(path); err != nil { if strings.IndexAny(path, "*?[") >= 0 {
_, err = filepath.Glob(path)
} else {
_, err = os.Stat(path)
}
if err != nil {
errs = append(errs, fmt.Errorf("Bad Floppy disk file '%s': %s", path, err)) errs = append(errs, fmt.Errorf("Bad Floppy disk file '%s': %s", path, err))
} }
} }
@ -30,7 +38,12 @@ func (c *FloppyConfig) Prepare(ctx *interpolate.Context) []error {
} }
for _, path := range c.FloppyDirectories { for _, path := range c.FloppyDirectories {
if _, err := os.Stat(path); err != nil { if strings.IndexAny(path, "*?[") >= 0 {
_, err = filepath.Glob(path)
} else {
_, err = os.Stat(path)
}
if err != nil {
errs = append(errs, fmt.Errorf("Bad Floppy disk directory '%s': %s", path, err)) errs = append(errs, fmt.Errorf("Bad Floppy disk directory '%s': %s", path, err))
} }
} }