Mirrors/task
1
0
Fork 0
mirror of https://github.com/go-task/task.git synced 2025-12-16 11:47:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace \r\n on Windows as we do for \n on Linux

Browse Source 
Closes #717
This commit is contained in:
Andrey Nering
2022-05-08 17:33:54 -03:00
parent 4951a2bf7a
commit 1acd59c7d6
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@@ -1,5 +1,11 @@
# Changelog # Changelog
## Unreleased
- Fixed bug where, on Windows, variables were ending with `\r` because we were
only removing the final `\n` but not `\r\n`
([#717](https://github.com/go-task/task/issues/717)).
## v3.12.0 - 2022-03-31 ## v3.12.0 - 2022-03-31
- The `--list` and `--list-all` flags can now be combined with the `--silent` - The `--list` and `--list-all` flags can now be combined with the `--silent`

3
internal/compiler/v3/compiler_v3.go
View File

@@ -151,7 +151,8 @@ func (c *CompilerV3) HandleDynamicVar(v taskfile.Var, dir string) (string, error
// Trim a single trailing newline from the result to make most command // Trim a single trailing newline from the result to make most command
// output easier to use in shell commands. // output easier to use in shell commands.
result := strings.TrimSuffix(stdout.String(), "\n") result := strings.TrimSuffix(stdout.String(), "\r\n")
result = strings.TrimSuffix(result, "\n")
c.dynamicCache[v.Sh] = result c.dynamicCache[v.Sh] = result
c.Logger.VerboseErrf(logger.Magenta, `task: dynamic variable: '%s' result: '%s'`, v.Sh, result) c.Logger.VerboseErrf(logger.Magenta, `task: dynamic variable: '%s' result: '%s'`, v.Sh, result)