Skip to content
This repository has been archived by the owner on Feb 8, 2021. It is now read-only.

Commit

Permalink
fix typos, change docker to hyper for output
Browse files Browse the repository at this point in the history
  • Loading branch information
carmark committed Apr 3, 2016
1 parent 2de8af1 commit 0477e80
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 11 deletions.
4 changes: 2 additions & 2 deletions cli/cli.go
Expand Up @@ -99,7 +99,7 @@ func (cli *Cli) noSuchCommand(command string) {
if cli.Stderr == nil {
cli.Stderr = os.Stderr
}
fmt.Fprintf(cli.Stderr, "docker: '%s' is not a docker command.\nSee 'docker --help'.\n", command)
fmt.Fprintf(cli.Stderr, "hyper: '%s' is not a hyper command.\nSee 'hyper --help'.\n", command)
os.Exit(1)
}

Expand Down Expand Up @@ -180,7 +180,7 @@ func Subcmd(name string, synopses []string, description string, exitOnError bool
synopsis = " " + synopsis
}

fmt.Fprintf(flags.Out(), "\n%sdocker %s%s%s", lead, name, options, synopsis)
fmt.Fprintf(flags.Out(), "\n%shyper %s%s%s", lead, name, options, synopsis)
}

fmt.Fprintf(flags.Out(), "\n\n%s\n", description)
Expand Down
7 changes: 4 additions & 3 deletions cli/common.go
Expand Up @@ -29,6 +29,7 @@ var dockerCommands = []Command{
{"attach", "Attach to a running container"},
{"build", "Build an image from a Dockerfile"},
{"commit", "Create a new image from a container's changes"},
{"config", "Config access key and secret key to Hyper server"},
{"cp", "Copy files/folders between a container and the local filesystem"},
{"create", "Create a new container"},
{"diff", "Inspect changes on a container's filesystem"},
Expand All @@ -45,7 +46,7 @@ var dockerCommands = []Command{
{"login", "Register or log in to a Docker registry"},
{"logout", "Log out from a Docker registry"},
{"logs", "Fetch the logs of a container"},
{"network", "Manage Docker networks"},
{"network", "Manage Hyper_ networks"},
{"pause", "Pause all processes within a container"},
{"port", "List port mappings or a specific mapping for the CONTAINER"},
{"ps", "List containers"},
Expand All @@ -65,8 +66,8 @@ var dockerCommands = []Command{
{"top", "Display the running processes of a container"},
{"unpause", "Unpause all processes within a container"},
{"update", "Update resources of one or more containers"},
{"version", "Show the Docker version information"},
{"volume", "Manage Docker volumes"},
{"version", "Show the Hyper_ version information"},
{"volume", "Manage Hyper_ volumes"},
{"wait", "Block until a container stops, then print its exit code"},
}

Expand Down
2 changes: 1 addition & 1 deletion docker/daemon.go
Expand Up @@ -268,7 +268,7 @@ func (cli *DaemonCli) CmdDaemon(args ...string) error {
"commit": dockerversion.GitCommit,
"execdriver": d.ExecutionDriver().Name(),
"graphdriver": d.GraphDriverName(),
}).Info("Docker daemon")
}).Info("Hyper_ Cloud")

api.InitRouters(d)

Expand Down
8 changes: 4 additions & 4 deletions docker/docker.go
Expand Up @@ -27,7 +27,7 @@ func main() {
flag.Merge(flag.CommandLine, clientFlags.FlagSet, commonFlags.FlagSet)

flag.Usage = func() {
fmt.Fprint(stdout, "Usage: docker [OPTIONS] COMMAND [arg...]\n"+daemonUsage+" docker [ --help | -v | --version ]\n\n")
fmt.Fprint(stdout, "Usage: hyper [OPTIONS] COMMAND [arg...]\n"+daemonUsage+" hyper [ --help | -v | --version ]\n\n")
fmt.Fprint(stdout, "A self-sufficient runtime for containers.\n\nOptions:\n")

flag.CommandLine.SetOutput(stdout)
Expand All @@ -39,7 +39,7 @@ func main() {
help += fmt.Sprintf(" %-10.10s%s\n", cmd.Name, cmd.Description)
}

help += "\nRun 'docker COMMAND --help' for more information on a command."
help += "\nRun 'hyper COMMAND --help' for more information on a command."
fmt.Fprintf(stdout, "%s\n", help)
}

Expand Down Expand Up @@ -75,8 +75,8 @@ func main() {

func showVersion() {
if utils.ExperimentalBuild() {
fmt.Printf("Docker version %s, build %s, experimental\n", dockerversion.Version, dockerversion.GitCommit)
fmt.Printf("Hyper version %s, build %s, experimental\n", dockerversion.Version, dockerversion.GitCommit)
} else {
fmt.Printf("Docker version %s, build %s\n", dockerversion.Version, dockerversion.GitCommit)
fmt.Printf("Hyper version %s, build %s\n", dockerversion.Version, dockerversion.GitCommit)
}
}
2 changes: 1 addition & 1 deletion errors/server.go
Expand Up @@ -30,7 +30,7 @@ var (
ErrorNetworkControllerNotEnabled = errcode.Register(errGroup, errcode.ErrorDescriptor{
Value: "NETWORK_CONTROLLER_NOT_ENABLED",
Message: "the network controller is not enabled for this platform",
Description: "Docker's networking stack is disabled for this platform",
Description: "Hyper's networking stack is disabled for this platform",
HTTPStatusCode: http.StatusNotFound,
})

Expand Down

0 comments on commit 0477e80

Please sign in to comment.