Skip to content

Commit 8e866c8

Browse files
committed
fix subcmd/update
1 parent fec1d82 commit 8e866c8

File tree

2 files changed

+16
-3
lines changed

2 files changed

+16
-3
lines changed

subcmd/command.go

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,17 @@ import (
44
"fmt"
55
"os"
66
"path/filepath"
7+
"regexp"
78

9+
"github.com/blang/semver"
810
"github.com/pkg/errors"
911
)
1012

11-
var Version string
13+
var (
14+
Version string
15+
16+
reVersion = regexp.MustCompile(`\d+\.\d+\.\d+`)
17+
)
1218

1319
type (
1420
// Command sub command interface
@@ -81,3 +87,11 @@ PYTHONBREW_VERSION_LIB=%s
8187
fp.WriteString(env)
8288
return nil
8389
}
90+
91+
func semverVersion() semver.Version {
92+
v := Version
93+
if loc := reVersion.FindStringIndex(v); loc != nil && loc[0] > 0 {
94+
v = v[loc[0]:]
95+
}
96+
return semver.MustParse(v)
97+
}

subcmd/update.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package subcmd
33
import (
44
"flag"
55

6-
"github.com/blang/semver"
76
"github.com/pkg/errors"
87
"github.com/rhysd/go-github-selfupdate/selfupdate"
98
"github.com/utahta/pythonbrew/flagset"
@@ -56,7 +55,7 @@ func (c *Update) Run(args []string) error {
5655
return nil
5756
}
5857

59-
previous := semver.MustParse(Version)
58+
previous := semverVersion()
6059
latest, err := selfupdate.UpdateSelf(previous, "utahta/pythonbrew")
6160
if err != nil {
6261
return errors.Wrap(err, tag)

0 commit comments

Comments
 (0)