mirror of https://github.com/hrfee/jfa-go.git
Trim commit before comparing in IsNew()
Fixes the current version appearing as an update. Also fixed error handling when no update is available, which obviously hadn't previously been experienced.
This commit is contained in:
parent
7bd8fadf76
commit
30bef15855
|
@ -13,3 +13,4 @@ config-payload.json
|
|||
server.key
|
||||
server.pem
|
||||
server.crt
|
||||
instructions-debian.txt
|
||||
|
|
|
@ -236,9 +236,9 @@
|
|||
"integrity": "sha1-vfpzUplmTfr9NFKe1PhSKidf6lY="
|
||||
},
|
||||
"esbuild": {
|
||||
"version": "0.8.56",
|
||||
"resolved": "https://registry.npm.taobao.org/esbuild/download/esbuild-0.8.56.tgz",
|
||||
"integrity": "sha1-nHw9bmFNtzZ6+jSK2wqyh8KWc14="
|
||||
"version": "0.8.57",
|
||||
"resolved": "https://registry.npm.taobao.org/esbuild/download/esbuild-0.8.57.tgz?cache=0&sync_timestamp=1615272041268&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fesbuild%2Fdownload%2Fesbuild-0.8.57.tgz",
|
||||
"integrity": "sha1-pC0CvCtXxwvNDviX/iRHZrtt2SY="
|
||||
},
|
||||
"escalade": {
|
||||
"version": "3.1.1",
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
"dependencies": {
|
||||
"@ts-stack/markdown": "^1.3.0",
|
||||
"a17t": "^0.4.0",
|
||||
"esbuild": "^0.8.56",
|
||||
"esbuild": "^0.8.57",
|
||||
"lodash": "^4.17.19",
|
||||
"mjml": "^4.8.0",
|
||||
"remixicon": "^2.5.0",
|
||||
|
|
|
@ -197,11 +197,14 @@ func (ud *Updater) GetTag() (Tag, int, error) {
|
|||
|
||||
var tag Tag
|
||||
err = json.Unmarshal(body, &tag)
|
||||
if tag.Version == "" {
|
||||
err = errors.New("Tag was empty")
|
||||
}
|
||||
return tag, resp.StatusCode, err
|
||||
}
|
||||
|
||||
func (t *Tag) IsNew() bool {
|
||||
return t.Version != commit
|
||||
return t.Version[:7] != commit
|
||||
}
|
||||
|
||||
func (ud *Updater) getRelease() (release GHRelease, status int, err error) {
|
||||
|
@ -462,7 +465,7 @@ func (app *appContext) checkForUpdates() {
|
|||
go func() {
|
||||
tag, status, err := app.updater.GetTag()
|
||||
if status != 200 || err != nil {
|
||||
if strings.Contains(err.Error(), "strconv.ParseInt") {
|
||||
if err != nil && strings.Contains(err.Error(), "strconv.ParseInt") {
|
||||
app.err.Println("No new updates available.")
|
||||
} else {
|
||||
app.err.Printf("Failed to get latest tag (%d): %v", status, err)
|
||||
|
|
Loading…
Reference in New Issue