Skip to content

Commit

Permalink
Fix bali branch newline
Browse files Browse the repository at this point in the history
  • Loading branch information
fcharlie committed Oct 24, 2020
1 parent 0198a6e commit 90db375
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ Project file `bali.toml`:
```toml
# https://toml.io/en/
name = "bali"
version = "1.2.2"
version = "1.2.3"
dirs = [
"cmd/bali", # dirs
]
Expand Down Expand Up @@ -173,7 +173,7 @@ Program build file `balisrc.toml`:
name = "bali"
description = "Bali - Minimalist Golang build and packaging tool"
destination = "bin"
version = "1.2.2"
version = "1.2.3"
versioninfo = "res/versioninfo.json"
icon = "res/bali.ico"
manifest = "res/bali.manifest"
Expand Down
4 changes: 2 additions & 2 deletions README.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ Bali 同时支持 TOML 或者 JSON 格式的项目文件,JSON 使用内置解
```toml
# https://toml.io/en/
name = "bali"
version = "1.2.2"
version = "1.2.3"
dirs = [
"cmd/bali", # dirs
]
Expand Down Expand Up @@ -155,7 +155,7 @@ norename = true
name = "bali"
description = "Bali - Minimalist Golang build and packaging tool"
destination = "bin"
version = "1.2.2"
version = "1.2.3"
versioninfo = "res/versioninfo.json"
icon = "res/bali.ico"
manifest = "res/bali.manifest"
Expand Down
2 changes: 1 addition & 1 deletion bali.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bali",
"version": "1.2.2",
"version": "1.2.3",
"files": [
{
"path": "LICENSE",
Expand Down
2 changes: 1 addition & 1 deletion bali.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# https://toml.io/en/
name = "bali"
version = "1.2.2"
version = "1.2.3"
dirs = [
"cmd/bali", # dirs
]
Expand Down
2 changes: 1 addition & 1 deletion cmd/bali/balisrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "bali",
"description": "Bali - Minimalist Golang build and packaging tool",
"destination": "bin",
"version": "1.2.2",
"version": "1.2.3",
"links": [
"bin/baligo"
],
Expand Down
2 changes: 1 addition & 1 deletion cmd/bali/balisrc.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "bali"
description = "Bali - Minimalist Golang build and packaging tool"
destination = "bin"
version = "1.2.2"
version = "1.2.3"
versioninfo = "res/versioninfo.json"
icon = "res/bali.ico"
manifest = "res/bali.manifest"
Expand Down
2 changes: 1 addition & 1 deletion cmd/bali/executor.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func resolveReference(cwd string) string {
cmd := exec.Command("git", "symbolic-ref", "HEAD")
cmd.Dir = cwd
if out, err := cmd.CombinedOutput(); err == nil {
ref := string(out)
ref := strings.TrimSpace(string(out))
DbgPrint("BUILD_REFNAME: '%s'", ref)
return ref
}
Expand Down

0 comments on commit 90db375

Please sign in to comment.