Fix nits and force args on extract

cmd/embedded.go

@@ -121,60 +121,42 @@ func initEmbeddedExtractor(c *cli.Context) error {
 }
 
 func runList(c *cli.Context) error {
- if err := initEmbeddedExtractor(c); err != nil {
+ if err := runListDo(c); err != nil {
+ fmt.Fprintf(os.Stderr, "%v\n", err)
  return err
  }
-
- for _, a := range assets {
- fmt.Println(a.Path)
- }
-
  return nil
 }
 
-func buildAssetList(sec *section, globs []glob.Glob, c *cli.Context) []asset {
- var results = make([]asset, 0, 64)
- for _, name := range sec.Names() {
- if isdir, err := sec.IsDir(name); !isdir && err == nil {
- if sec.Path == "public" &&
- strings.HasPrefix(name, "vendor/") &&
- !c.Bool("include-vendored") {
- continue
- }
- matchName := "/" + sec.Path + "/" + name
- for _, g := range globs {
- if g.Match(matchName) {
- results = append(results, asset{Section: sec,
- Name: name,
- Path: sec.Path + "/" + name})
- break
- }
- }
- }
+func runExtract(c *cli.Context) error {
+ if err := runExtractDo(c); err != nil {
+ fmt.Fprintf(os.Stderr, "%v\n", err)
+ return err
  }
- return results
+ return nil
 }
 
-func getPatterns(args []string) ([]glob.Glob, error) {
- if len(args) == 0 {
- args = []string{"**"}
+func runListDo(c *cli.Context) error {
+ if err := initEmbeddedExtractor(c); err != nil {
+ return err
  }
- pat := make([]glob.Glob, len(args))
- for i := range args {
- if g, err := glob.Compile(args[i], '.', '/'); err != nil {
- return nil, fmt.Errorf("'%s': Invalid glob pattern: %v", args[i], err)
- } else {
- pat[i] = g
- }
+
+ for _, a := range assets {
+ fmt.Println(a.Path)
  }
- return pat, nil
+
+ return nil
 }
 
-func runExtract(c *cli.Context) error {
+func runExtractDo(c *cli.Context) error {
  if err := initEmbeddedExtractor(c); err != nil {
  return err
  }
 
+ if len(c.Args()) == 0 {
+ return fmt.Errorf("A list of pattern of files to extract is mandatory (e.g. '**' for all)")
+ }
+
  destdir := "."
 
  if c.IsSet("destination") {
@@ -185,18 +167,19 @@ func runExtract(c *cli.Context) error {
  }
 
  if fi, err := os.Stat(destdir); err != nil {
- return fmt.Errorf("%s: err", destdir)
+ return fmt.Errorf("%s: %s", destdir, err)
  } else if !fi.IsDir() {
  return fmt.Errorf("%s does not exist or is not a directory.", destdir)
  }
 
- fmt.Println("Extracting to", destdir)
+ fmt.Printf("Extracting to %s:\n", destdir)
 
  overwrite := c.Bool("overwrite")
  rename := c.Bool("rename")
 
  for _, a := range assets {
  if err := extractAsset(destdir, a, overwrite, rename); err != nil {
+ // Non-fatal error
  fmt.Fprintf(os.Stderr, "%s: %v", a.Path, err)
  }
  }
@@ -225,7 +208,7 @@ func extractAsset(d string, a asset, overwrite, rename bool) error {
  return fmt.Errorf("%s: %v", dest, err)
  }
  } else if !overwrite && !rename {
- fmt.Fprintf(os.Stderr, "%s already exists; skipped.\n", dest)
+ fmt.Printf("%s already exists; skipped.\n", dest)
  return nil
  } else if !fi.Mode().IsRegular() {
  return fmt.Errorf("%s already exists and is not a regular file", dest)
@@ -255,3 +238,42 @@ func extractAsset(d string, a asset, overwrite, rename bool) error {
 
  return nil
 }
+
+func buildAssetList(sec *section, globs []glob.Glob, c *cli.Context) []asset {
+ var results = make([]asset, 0, 64)
+ for _, name := range sec.Names() {
+ if isdir, err := sec.IsDir(name); !isdir && err == nil {
+ if sec.Path == "public" &&
+ strings.HasPrefix(name, "vendor/") &&
+ !c.Bool("include-vendored") {
+ continue
+ }
+ matchName := "/" + sec.Path + "/" + name
+ for _, g := range globs {
+ if g.Match(matchName) {
+ results = append(results, asset{Section: sec,
+ Name: name,
+ Path: sec.Path + "/" + name})
+ break
+ }
+ }
+ }
+ }
+ return results
+}
+
+func getPatterns(args []string) ([]glob.Glob, error) {
+ if len(args) == 0 {
+ args = []string{"**"}
+ }
+ pat := make([]glob.Glob, len(args))
+ for i := range args {
+ if g, err := glob.Compile(args[i], '.', '/'); err != nil {
+ return nil, fmt.Errorf("'%s': Invalid glob pattern: %v", args[i], err)
+ } else {
+ pat[i] = g
+ }
+ }
+ return pat, nil
+}
+