Skip to content

Fix tabs vs spaces in big text-heavy output #625

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.

Sign up for GitHub

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

Merged
kytrinyx merged 1 commit into from
Jul 13, 2018
Merged

Fix tabs vs spaces in big text-heavy output #625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 15 additions & 13 deletions cmd/configure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,14 +155,14 @@ func runConfigure(configuration config.Configuration, flags *pflag.FlagSet) erro
if info, err := os.Lstat(workspace); !os.IsNotExist(err) && !info.IsDir() {
msg := `

There is already something at the workspace location you are configuring:
There is already something at the workspace location you are configuring:

%s
%s

Please rename it, or set a different workspace location:
Please rename it, or set a different workspace location:

%s configure %s --workspace=PATH_TO_DIFFERENT_FOLDER
`
%s configure %s --workspace=PATH_TO_DIFFERENT_FOLDER
`

return fmt.Errorf(msg, workspace, BinaryName, commandify(flags))
}
Expand All @@ -174,18 +174,20 @@ func runConfigure(configuration config.Configuration, flags *pflag.FlagSet) erro
// If it already exists don't clobber it with the default.
if _, err := os.Lstat(workspace); !os.IsNotExist(err) {
msg := `
The default Exercism workspace is
The default Exercism workspace is

%s
%s

There is already something there.
If it's a directory, that might be fine. If it's a file, you will need to move it first,
or choose a different location for the workspace.
There is already something there.
If it's a directory, that might be fine.
If it's a file, you will need to move it first, or choose a
different location for the workspace.

You can choose the workspace location by rerunning this command with the --workspace flag.
You can choose the workspace location by rerunning this command
with the --workspace flag.

%s configure %s --workspace=%s
`
%s configure %s --workspace=%s
`

return fmt.Errorf(msg, workspace, BinaryName, commandify(flags), workspace)
}
Expand Down
6 changes: 3 additions & 3 deletions cmd/submit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ func runSubmit(cfg config.Configuration, flags *pflag.FlagSet, args []string) er

%s configure --token=YOUR_TOKEN

`
`
return fmt.Errorf(msg, tokenURL, BinaryName)
}

Expand Down Expand Up @@ -212,7 +212,7 @@ func runSubmit(cfg config.Configuration, flags *pflag.FlagSet, args []string) er

msg := `

WARNING: Skipping empty file
WARNING: Skipping empty file
%s

`
Expand All @@ -225,7 +225,7 @@ func runSubmit(cfg config.Configuration, flags *pflag.FlagSet, args []string) er
if len(paths) == 0 {
msg := `

No files found to submit.
No files found to submit.

`
return errors.New(msg)
Expand Down