New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make use of %USERPROFILE% in cli help message #11316

Merged
merged 1 commit into from Mar 11, 2015

Conversation

Projects
None yet
5 participants
@ahmetb
Contributor

ahmetb commented Mar 11, 2015

An earlier commit was causing docker windows CLI build to not to pick up
the shorthand form for home directory (%USERPROFILE%) shown in when
docker --help is executed.

Example:

c:\gopath\src\github.com\docker\docker>docker --help
Usage: docker [OPTIONS] COMMAND [arg...]

A self-sufficient runtime for linux containers.

Options:
[...]
  --tlscacert=%USERPROFILE%\.docker\ca.pem    Trust certs signed only by this CA
  --tlscert=%USERPROFILE%\.docker\cert.pem    Path to TLS certificate file
  --tlskey=%USERPROFILE%\.docker\key.pem      Path to TLS key file
  --tlsverify=false                           Use TLS and verify the remote
  -v, --version=false                         Print version information and quit

Fixing this bug and making the if statement concise and clear. This also fixes
the test failure TestHelpTextVerify (line >80 char) on windows CI.

Signed-off-by: Ahmet Alp Balkan ahmetalpbalkan@gmail.com
cc: @duglin @tiborvass

Make use of %USERPROFILE% in cli help message
An earlier commit was causing docker windows CLI build to not to pick up
the shorthand form for home directory (`%USERPROFILE%`) shown in when
`docker --help` is executed.

Fixing that bug and making the if statement concise and clear.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
@duglin

This comment has been minimized.

Contributor

duglin commented Mar 11, 2015

LGTM

@tiborvass

This comment has been minimized.

Collaborator

tiborvass commented Mar 11, 2015

LGTM

tiborvass added a commit that referenced this pull request Mar 11, 2015

Merge pull request #11316 from ahmetalpbalkan/win-cli/help-homepath-fix
Make use of %USERPROFILE% in cli help message

@tiborvass tiborvass merged commit 1a5e46c into moby:master Mar 11, 2015

1 check passed

janky Jenkins build Docker-PRs 3056 has succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment