diff options
Diffstat (limited to 'zip')
| -rw-r--r-- | zip/cmd/main.go | 5 | ||||
| -rw-r--r-- | zip/zip.go | 15 |
2 files changed, 2 insertions, 18 deletions
diff --git a/zip/cmd/main.go b/zip/cmd/main.go index f49105a6..dfd56dc6 100644 --- a/zip/cmd/main.go +++ b/zip/cmd/main.go @@ -199,11 +199,6 @@ func main() { flags.Parse(expandedArgs[1:]) - if flags.NArg() > 0 { - fmt.Fprintf(os.Stderr, "unexpected arguments %s\n", strings.Join(flags.Args(), " ")) - usage() - } - err := zip.Run(zip.ZipArgs{ FileArgs: fArgs, OutputFilePath: *out, @@ -224,20 +224,9 @@ func Run(args ZipArgs) (err error) { noCompression := args.CompressionLevel == 0 for _, fa := range args.FileArgs { - var srcs []string - for _, s := range fa.SourceFiles { - globbed, _, err := pathtools.Glob(s, nil, pathtools.DontFollowSymlinks) - if err != nil { - return err - } - srcs = append(srcs, globbed...) - } + srcs := fa.SourceFiles if fa.GlobDir != "" { - globbed, _, err := pathtools.Glob(filepath.Join(fa.GlobDir, "**/*"), nil, pathtools.DontFollowSymlinks) - if err != nil { - return err - } - srcs = append(srcs, globbed...) + srcs = append(srcs, recursiveGlobFiles(fa.GlobDir)...) } for _, src := range srcs { err := fillPathPairs(fa, src, &pathMappings, args.NonDeflatedFiles, noCompression) |