Merge pull request #2 from Songmu/fix-help

output usage to stdout and normally exit with `-h` option

README.md

@@ -77,11 +77,10 @@ or
 
 ## Options
 
-- `d` destination directory (`./goxz` by default)
-- `os`
-   - os: linux,darwin and windows by default
-- `arch`
-   - arch: arm64 only by default
+- `-d` destination directory (`./goxz` by default)
+- `-n` application name. by default the directory name is used.
+- `-os` linux,darwin and windows by default
+- `-arch`  arm64 only by default
 - `-pv` for speicifing version (optional)
 - `-o` output filename
   - not available with multiple package building

cli.go

@@ -29,7 +29,9 @@ func (cl *cli) parseArgs(args []string) (*goxz, error) {
 	fs := flag.NewFlagSet("goxz", flag.ContinueOnError)
 	fs.SetOutput(cl.errStream)
 	fs.Usage = func() {
-		fmt.Fprintf(cl.errStream, `goxz - Just do cross building and archiving go tools conventionally
+		fs.SetOutput(cl.outStream)
+		defer fs.SetOutput(cl.errStream)
+		fmt.Fprintf(cl.outStream, `goxz - Just do cross building and archiving go tools conventionally
 
 Version: %s (rev: %s/%s)
 
@@ -47,7 +49,6 @@ Options:
 	fs.StringVar(&gx.output, "o", "", "output (optional)")
 	fs.StringVar(&gx.os, "os", "", "Specify OS (default is 'linux darwin windows')")
 	fs.StringVar(&gx.arch, "arch", "", "Specify Arch (default is 'amd64')")
-	// TODO: fs.StringVar(&gx.buildConstraints, "build", "", "Specify build constraints")
 	fs.StringVar(&gx.buildLdFlags, "build-ldflags", "", "arguments to pass on each go tool link invocation")
 	fs.StringVar(&gx.buildTags, "build-tags", "", "a space-separated list of build `tags`")
 	fs.BoolVar(&gx.zipAlways, "z", false, "zip always")

goxz.go

@@ -23,9 +23,10 @@ const (
 func Run(args []string) int {
 	err := (&cli{outStream: os.Stdout, errStream: os.Stderr}).run(args)
 	if err != nil {
-		if err != flag.ErrHelp {
-			log.Printf("[!!ERROR!!] %s\n", err)
+		if err == flag.ErrHelp {
+			return exitCodeOK
 		}
+		log.Printf("[!!ERROR!!] %s\n", err)
 		return exitCodeErr
 	}
 	return exitCodeOK
@@ -104,7 +105,6 @@ func (gx *goxz) init() error {
 		return err
 	}
 
-	// TODO: implement build constraints
 	// fill the defaults
 	if gx.os == "" {
 		gx.os = "linux darwin windows"

goxz_test.go

@@ -7,7 +7,7 @@ import (
 
 func TestRun_help(t *testing.T) {
 	i := Run([]string{"-h"})
-	if i != exitCodeErr {
+	if i != exitCodeOK {
 		t.Errorf("somthing went wrong")
 	}
 }