octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-02-13 00:58:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't add newline on version string (fixes #865)

Browse Source
This commit is contained in:
Jakob Borg 2014-10-15 18:15:21 +02:00
parent 212f6dc9e0
commit 598ce4bb5f
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
build.go
View File

@ -302,8 +302,7 @@ func rmr(paths ...string) {
} }
func getVersion() string { func getVersion() string {
ecmd := exec.Command("git", "describe", "--always", "--dirty") v, err := runError("git", "describe", "--always", "--dirty")
v, err := ecmd.CombinedOutput()
if err != nil { if err != nil {
return "unknown-dev" return "unknown-dev"
} }
@ -315,8 +314,7 @@ func getVersion() string {
} }
func buildStamp() int64 { func buildStamp() int64 {
ecmd := exec.Command("git", "show", "-s", "--format=%ct") bs, err := runError("git", "show", "-s", "--format=%ct")
bs, err := ecmd.CombinedOutput()
if err != nil { if err != nil {
return time.Now().Unix() return time.Now().Unix()
} }
@ -360,8 +358,7 @@ func archiveName() string {
} }
func run(cmd string, args ...string) []byte { func run(cmd string, args ...string) []byte {
ecmd := exec.Command(cmd, args...) bs, err := runError(cmd, args...)
bs, err := ecmd.CombinedOutput()
if err != nil { if err != nil {
log.Println(cmd, strings.Join(args, " ")) log.Println(cmd, strings.Join(args, " "))
log.Println(string(bs)) log.Println(string(bs))
@ -370,6 +367,15 @@ func run(cmd string, args ...string) []byte {
return bytes.TrimSpace(bs) return bytes.TrimSpace(bs)
} }
func runError(cmd string, args ...string) ([]byte, error) {
ecmd := exec.Command(cmd, args...)
bs, err := ecmd.CombinedOutput()
if err != nil {
return nil, err
}
return bytes.TrimSpace(bs), nil
}
func runPrint(cmd string, args ...string) { func runPrint(cmd string, args ...string) {
log.Println(cmd, strings.Join(args, " ")) log.Println(cmd, strings.Join(args, " "))
ecmd := exec.Command(cmd, args...) ecmd := exec.Command(cmd, args...)