浏览代码

Fix +dev suffix in version

Tulir Asokan 5 年之前
父节点
当前提交
f3793309a0
共有 2 个文件被更改,包括 4 次插入7 次删除
  1. 1 4
      commands.go
  2. 3 3
      main.go

+ 1 - 4
commands.go

@@ -179,13 +179,10 @@ func (handler *CommandHandler) CommandDevTest(_ *CommandEvent) {
 const cmdVersionHelp = `version - View the bridge version`
 
 func (handler *CommandHandler) CommandVersion(ce *CommandEvent) {
-	version := fmt.Sprintf("%s+dev.unknown", Version)
+	version := fmt.Sprintf("%s.unknown", Version)
 	if Tag == Version {
 		version = fmt.Sprintf("[%s](%s/releases/%s) (%s)", Version, URL, Tag, BuildTime)
 	} else if len(Commit) > 8 {
-		if !strings.HasSuffix(Version, "+dev") {
-			Version += "+dev"
-		}
 		version = fmt.Sprintf("%s.[%s](%s/commit/%s) (%s)", Version, Commit[:8], URL, Commit, BuildTime)
 	}
 	ce.Reply(fmt.Sprintf("[%s](%s) %s", Name, URL, version))

+ 3 - 3
main.go

@@ -55,6 +55,9 @@ func init() {
 	if len(Tag) > 0 && Tag[0] == 'v' {
 		Tag = Tag[1:]
 	}
+	if Tag != Version && !strings.HasSuffix(Version, "+dev") {
+		Version += "+dev"
+	}
 }
 
 var configPath = flag.MakeFull("c", "config", "The path to your config file.", "config.yaml").String()
@@ -371,9 +374,6 @@ func (bridge *Bridge) Main() {
 		if Tag == Version {
 			fmt.Printf("%s %s (%s)\n", Name, Tag, BuildTime)
 		} else if len(Commit) > 8 {
-			if !strings.HasSuffix(Version, "+dev") {
-				Version += "+dev"
-			}
 			fmt.Printf("%s %s.%s (%s)\n", Name, Version, Commit[:8], BuildTime)
 		} else {
 			fmt.Printf("%s %s+dev.unknown\n", Name, Version)