Update dependencies

This commit is contained in:
世界
2023-03-13 11:31:36 +08:00
parent 77e3f2d465
commit 4f4a815654
9 changed files with 59 additions and 60 deletions

View File

@@ -1,16 +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").Read()
currentTag, err := shell.Exec("git", "describe", "--tags").Read()
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
}