timamsk/sing-box
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Print command to shell error

Browse Source
This commit is contained in:
世界
2023-03-13 11:31:36 +08:00
parent caad60da45
commit 657b05fd96
6 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/internal/build_shared/tag.go
View File

@@ -1,18 +1,16 @@
package build_shared
import (
"github.com/sagernet/sing/common"
)
import "github.com/sagernet/sing/common/shell"
func ReadTag() (string, error) {
currentTag, err := common.Exec("git", "describe", "--tags").ReadOutput()
currentTag, err := shell.Exec("git", "describe", "--tags").ReadOutput()
if err != nil {
return currentTag, err
}
currentTagRev, _ := common.Exec("git", "describe", "--tags", "--abbrev=0").ReadOutput()
currentTagRev, _ := shell.Exec("git", "describe", "--tags", "--abbrev=0").ReadOutput()
if currentTagRev == currentTag {
return currentTag[1:], nil
}
shortCommit, _ := common.Exec("git", "rev-parse", "--short", "HEAD").ReadOutput()
shortCommit, _ := shell.Exec("git", "rev-parse", "--short", "HEAD").ReadOutput()
return currentTagRev[1:] + "-" + shortCommit, nil
}