Skip to content
This repository has been archived by the owner on Jan 8, 2024. It is now read-only.

Commit

Permalink
Fix prompt cutoff on macOS (#194)
Browse files Browse the repository at this point in the history
* Fix prompt cutoff on macOS

* vendor
  • Loading branch information
joshblum committed Mar 6, 2020
1 parent 771c721 commit d2cee5c
Show file tree
Hide file tree
Showing 12 changed files with 1,212 additions and 2 deletions.
8 changes: 6 additions & 2 deletions keybase/prompt.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (

"github.com/keybase/go-updater"
"github.com/keybase/go-updater/command"
"github.com/keybase/go-updater/util"
)

type updaterPromptInput struct {
Expand All @@ -32,8 +33,11 @@ func (c context) promptInput(update updater.Update, options updater.UpdateOption
description = "Please visit https://keybase.io for more information."
}
promptJSONInput, err := json.Marshal(updaterPromptInput{
Title: fmt.Sprintf("Keybase Update: Version %s", update.Version),
Message: fmt.Sprintf("The version you are currently running (%s) is outdated.", options.Version),
// Note we use util.Semver to shorten to the Major.Minor.Patch format
// because of spacing restrictions of 700 characters on macOS and
// better readability.
Title: fmt.Sprintf("Keybase Update: Version %s", util.Semver(update.Version)),
Message: fmt.Sprintf("The version you are currently running (%s) is outdated.", util.Semver(options.Version)),
Description: description,
AutoUpdate: promptOptions.AutoUpdate,
OutPath: promptOptions.OutPath,
Expand Down
14 changes: 14 additions & 0 deletions util/semver.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package util

import "github.com/blang/semver"

// Semver outputs the semver in Major.Minor.Patch form for readability.
func Semver(version string) string {
v, err := semver.Parse(version)
if err != nil {
return version
}
v.Pre = nil
v.Build = nil
return v.String()
}
22 changes: 22 additions & 0 deletions vendor/github.com/blang/semver/LICENSE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

194 changes: 194 additions & 0 deletions vendor/github.com/blang/semver/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions vendor/github.com/blang/semver/go.mod

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 23 additions & 0 deletions vendor/github.com/blang/semver/json.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions vendor/github.com/blang/semver/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit d2cee5c

Please sign in to comment.