diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3155ad3 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +binaries/ \ No newline at end of file diff --git a/README.md b/README.md index 36ff38d..0d47237 100644 --- a/README.md +++ b/README.md @@ -14,10 +14,15 @@ Docker 1.10 and docker deamon running. ## Installation +### Homebrew (OSX only) +```sh +brew install dockward +``` + ### Binary -Download binary for other platforms on the [releases](https://github.com/abiosoft/dockward/releases) page. +Download binary for other platforms on the [releases](https://github.com/abiosoft/dockward/releases) page or replace download link accordingly for OSX. ```sh -curl -LO https://github.com/abiosoft/dockward/releases/download/0.0.2/dockward_linux_amd64.tar.gz \ +curl -LO https://github.com/abiosoft/dockward/releases/download/0.0.4/dockward_linux_amd64.tar.gz \ && tar xvfz dockward_linux_amd64.tar.gz \ && sudo mv dockward_linux_amd64 /usr/local/bin/dockward \ && sudo chmod +x /usr/local/bin/dockward @@ -26,7 +31,7 @@ curl -LO https://github.com/abiosoft/dockward/releases/download/0.0.2/dockward_l ### Source Requires Go. ```sh -go get github.com/abiosoft/dockward +go get -v -u github.com/abiosoft/dockward ``` ## Usage diff --git a/cli/cli.go b/cli/cli.go index c74b0ed..9f04706 100644 --- a/cli/cli.go +++ b/cli/cli.go @@ -1,6 +1,7 @@ package cli import ( + "errors" "flag" "fmt" "io/ioutil" @@ -10,12 +11,12 @@ import ( ) const ( - AppName = "dockward" - Version = "0.0.3" - Usage = `Usage: dockward [options...] [ ] [endpoints...] + appName = "dockward" + appVersion = "0.0.4" + appUsage = `Usage: dockward [options...] [ ] [endpoints...] try 'dockward --help' for more. ` - FullUsage = `Usage: dockward [options...] [ ] [endpoints...] + appFullUsage = `Usage: dockward [options...] [ ] [endpoints...] options: --host=false Host mode, forward to host endpoints instead of container. @@ -75,24 +76,24 @@ func parseCli() cliConf { exitIfErr(err) if conf.Help { - fmt.Println(FullUsage) + fmt.Println(appFullUsage) exit(nil) } if conf.Version { - fmt.Println(AppName, "version", Version) + fmt.Println(appName, "version", appVersion) exit(nil) } switch fs.NArg() { case 0: - usageErr(fmt.Errorf("port missing.")) + usageErr(errors.New("port missing")) case 1: if !conf.Host { // docker mode - usageErr(fmt.Errorf("filter missing.")) + usageErr(errors.New("filter missing")) } else if !conf.remoteClient { // host mode - usageErr(fmt.Errorf("endpoint(s) missing.")) + usageErr(errors.New("endpoint(s) missing")) } } @@ -140,7 +141,7 @@ func parseCli() cliConf { } func usageErr(err error) { - exit(fmt.Errorf("dockward: %v\n%v", err, Usage)) + exit(fmt.Errorf("dockward: %v\n%v", err, appUsage)) } func exitIfErr(err error) {