Skip to content

Commit 5c004e8

Browse files
pchampiopchampio
committed
- hover doesn't update on every run
 - fixes: go-flutter-desktop/go-flutter#169 - provide a `hover upgrade `command (like flutter upgrade) - every 2 days a check is made to see if the current project tags uses the last github release. if a new release is available print a message about `hover upgrade` - adds more debug message, 'bundling flutter', 'compiling go-flutter', 'running project',... - only print the 'channel beta' message if the user is on master, if the user was on stable the message was printed for no reason. The behaviour of `hover run` and `hover build` is the same as before when `--branch` is provided. But there is a little twist, if the current version is a valid release (available on github), `hover run` will not overwrite the 'go-flutter' version. Example: ``` $ hover run --branch '@v0.20.0' $ hover run # no upgrade trigged running on v0.20.0, at some point you # will get a `hover upgrade` notice $ hover upgrade # user has to run to upgrade away from v0.20.0 $ $ hover run --branch '@master' $ hover run # auto upgrade trigged! Not a real release. # If the user hasn't access to internet, fail silently and # keep using '@master' ``` To check every two days, a hidden file `./desktop/.last_goflutter_check` is created on a project bases, the file contains a timestamps indicating the last hover update check. About the hover repo: A empty go.mod file has been added to hover/assets/app/ this prevent adding `go-flutter` as a go mod dependency. (because `go mod tidy` was peeking listing hover/asset/options.go as a hover code file)
1 parent 4751a8e commit 5c004e8

File tree

9 files changed

+295
-69
lines changed

9 files changed

+295
-69
lines changed

‎assets/app/go.mod

Whitespace-only changes.

‎assets/plugin/plugin.go.tmpl

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎cmd/build.go

Lines changed: 42 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"runtime"
1010
"strings"
1111

12+
version "github.com/hashicorp/go-version"
1213
"github.com/otiai10/copy"
1314
"github.com/spf13/cobra"
1415

@@ -28,7 +29,7 @@ var (
2829
func init() {
2930
buildCmd.Flags().StringVarP(&buildTarget, "target", "t", "lib/main_desktop.dart", "The main entry-point file of the application.")
3031
buildCmd.Flags().StringVarP(&buildManifest, "manifest", "m", "pubspec.yaml", "Flutter manifest file of the application.")
31-
buildCmd.Flags().StringVarP(&buildBranch, "branch", "b", "", "The go-flutter-desktop/go-flutter branch to use when building the embedder. (@master for example)")
32+
buildCmd.Flags().StringVarP(&buildBranch, "branch", "b", "", "The 'go-flutter' version to use. (@master for example)")
3233
buildCmd.Flags().BoolVar(&buildDebug, "debug", false, "Build a debug version of the app.")
3334
buildCmd.Flags().StringVarP(&buildCachePath, "cache-path", "", "", "The path that hover uses to cache dependencies such as the Flutter engine .so/.dll (defaults to the standard user cache directory)")
3435
buildCmd.Flags().MarkHidden("branch")
@@ -92,18 +93,18 @@ func build(projectName string, targetOS string, vmArguments []string) {
9293
cmdCheckFlutter := exec.Command(flutterBin, "--version")
9394
cmdCheckFlutterOut, err := cmdCheckFlutter.Output()
9495
if err != nil {
95-
fmt.Printf("hover: failed to check your flutter version: %v\n", err)
96+
fmt.Printf("hover: failed to check your flutter channel: %v\n", err)
9697
} else {
9798
re := regexp.MustCompile("•\\schannel\\s(\\w*)\\s•")
9899

99100
match := re.FindStringSubmatch(string(cmdCheckFlutterOut))
100101
if len(match) >= 2 {
101-
if match[1] != "beta" {
102+
if match[1] == "master" {
102103
fmt.Println("hover: ⚠ The go-flutter project tries to stay compatible with the beta channel of Flutter.")
103104
fmt.Println("hover: ⚠ It's advised to use the beta channel. ($ flutter channel beta)")
104105
}
105106
} else {
106-
fmt.Printf("hover: failed to check your flutter version: Unrecognized output format")
107+
fmt.Printf("hover: failed to check your flutter channel: Unrecognized output format")
107108
}
108109
}
109110

@@ -112,6 +113,8 @@ func build(projectName string, targetOS string, vmArguments []string) {
112113
"--target", buildTarget,
113114
"--manifest", buildManifest,
114115
)
116+
117+
fmt.Printf("hover: Bundling flutter app\n")
115118
cmdFlutterBuild.Stderr = os.Stderr
116119
cmdFlutterBuild.Stdout = os.Stdout
117120
err = cmdFlutterBuild.Run()
@@ -184,33 +187,43 @@ func build(projectName string, targetOS string, vmArguments []string) {
184187
os.Exit(1)
185188
}
186189

187-
cmdGoGetU := exec.Command(goBin, "get", "-u", "github.com/go-flutter-desktop/go-flutter"+buildBranch)
188-
cmdGoGetU.Dir = filepath.Join(wd, "desktop")
189-
cmdGoGetU.Env = append(os.Environ(),
190-
"GO111MODULE=on",
191-
"CGO_LDFLAGS="+cgoLdflags,
192-
)
193-
cmdGoGetU.Stderr = os.Stderr
194-
cmdGoGetU.Stdout = os.Stdout
190+
if buildBranch == "" {
195191

196-
err = cmdGoGetU.Run()
197-
if err != nil {
198-
fmt.Printf("hover: Updating go-flutter to latest version failed: %v\n", err)
199-
os.Exit(1)
200-
}
192+
currentTag, err := enginecache.CurrentGoFlutterTag(wd)
193+
if err != nil {
194+
fmt.Printf("hover: %v\n", err)
195+
os.Exit(1)
196+
}
201197

202-
cmdGoModDownload := exec.Command(goBin, "mod", "download")
203-
cmdGoModDownload.Dir = filepath.Join(wd, "desktop")
204-
cmdGoModDownload.Env = append(os.Environ(),
205-
"GO111MODULE=on",
206-
)
207-
cmdGoModDownload.Stderr = os.Stderr
208-
cmdGoModDownload.Stdout = os.Stdout
198+
semver, err := version.NewSemver(currentTag)
199+
if err != nil {
200+
fmt.Printf("hover: faild to parse 'go-flutter' semver: %v\n", err)
201+
os.Exit(1)
202+
}
209203

210-
err = cmdGoModDownload.Run()
211-
if err != nil {
212-
fmt.Printf("hover: Go mod download failed: %v\n", err)
213-
os.Exit(1)
204+
if semver.Prerelease() != "" {
205+
fmt.Printf("hover: Upgrade 'go-flutter' to the latest release\n")
206+
// no buildBranch provided and currentTag isn't a release,
207+
// force update. (same behaviour as previous version of hover).
208+
err = upgradeGoFlutter(targetOS, engineCachePath)
209+
if err != nil {
210+
// the upgrade can fail silently
211+
fmt.Printf("hover: Upgrade ignored, current 'go-flutter' version: %s\n", currentTag)
212+
}
213+
} else {
214+
// when the buildBranch is empty and the currentTag is a release.
215+
// Check if the 'go-flutter' needs updates.
216+
enginecache.CheckFoGoFlutterUpdate(wd, currentTag)
217+
}
218+
219+
} else {
220+
fmt.Printf("hover: Downloading 'go-flutter' %s\n", buildBranch)
221+
222+
// when the buildBranch is set, fetch the go-flutter branch version.
223+
err = upgradeGoFlutter(targetOS, engineCachePath)
224+
if err != nil {
225+
os.Exit(1)
226+
}
214227
}
215228

216229
var ldflags []string
@@ -240,6 +253,7 @@ func build(projectName string, targetOS string, vmArguments []string) {
240253
cmdGoBuild.Stderr = os.Stderr
241254
cmdGoBuild.Stdout = os.Stdout
242255

256+
fmt.Printf("hover: Compiling 'go-flutter' and plugins\n")
243257
err = cmdGoBuild.Run()
244258
if err != nil {
245259
fmt.Printf("hover: Go build failed: %v\n", err)

‎cmd/run.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const defaultObservatoryPort = "50300"
1919
func init() {
2020
runCmd.Flags().StringVarP(&buildTarget, "target", "t", "lib/main_desktop.dart", "The main entry-point file of the application.")
2121
runCmd.Flags().StringVarP(&buildManifest, "manifest", "m", "pubspec.yaml", "Flutter manifest file of the application.")
22-
runCmd.Flags().StringVarP(&buildBranch, "branch", "b", "", "The go-flutter-desktop/go-flutter branch to use when building the embedder. (@master for example)")
22+
runCmd.Flags().StringVarP(&buildBranch, "branch", "b", "", "The 'go-flutter' version to use. (@master for example)")
2323
runCmd.Flags().StringVarP(&buildCachePath, "cache-path", "", "", "The path that hover uses to cache dependencies such as the Flutter engine .so/.dll (defaults to the standard user cache directory)")
2424
runCmd.Flags().MarkHidden("branch")
2525
rootCmd.AddCommand(runCmd)
@@ -79,6 +79,7 @@ func runAndAttach(projectName string, targetOS string) {
7979
// Non-blockingly echo command stderr to terminal
8080
go io.Copy(os.Stderr, stderrApp)
8181

82+
fmt.Printf("hover: Running %s in debug mode\n", projectName)
8283
err = cmdApp.Start()
8384
if err != nil {
8485
fmt.Printf("hover: failed to start app '%s': %v\n", projectName, err)

‎cmd/upgrade.go

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
package cmd
2+
3+
import (
4+
"fmt"
5+
"os"
6+
"os/exec"
7+
"path/filepath"
8+
"runtime"
9+
10+
"github.com/go-flutter-desktop/hover/internal/enginecache"
11+
"github.com/spf13/cobra"
12+
)
13+
14+
func init() {
15+
upgradeCmd.Flags().StringVarP(&buildCachePath, "cache-path", "", "", "The path that hover uses to cache dependencies such as the Flutter engine .so/.dll (defaults to the standard user cache directory)")
16+
upgradeCmd.Flags().MarkHidden("branch")
17+
rootCmd.AddCommand(upgradeCmd)
18+
}
19+
20+
var upgradeCmd = &cobra.Command{
21+
Use: "upgrade",
22+
Short: "upgrade the 'go-flutter' core library",
23+
Run: func(cmd *cobra.Command, args []string) {
24+
assertInFlutterProject()
25+
// Hardcode target to the current OS (no cross-compile support yet)
26+
targetOS := runtime.GOOS
27+
28+
err := upgrade(targetOS)
29+
if err != nil {
30+
os.Exit(1)
31+
}
32+
},
33+
}
34+
35+
func upgrade(targetOS string) (err error) {
36+
var engineCachePath string
37+
if buildCachePath != "" {
38+
engineCachePath = enginecache.ValidateOrUpdateEngineAtPath(targetOS, buildCachePath)
39+
} else {
40+
engineCachePath = enginecache.ValidateOrUpdateEngine(targetOS)
41+
}
42+
return upgradeGoFlutter(targetOS, engineCachePath)
43+
}
44+
45+
func upgradeGoFlutter(targetOS string, engineCachePath string) (err error) {
46+
wd, err := os.Getwd()
47+
if err != nil {
48+
fmt.Printf("hover: Failed to get working dir: %v\n", err)
49+
return
50+
}
51+
52+
var cgoLdflags string
53+
switch targetOS {
54+
case "darwin":
55+
cgoLdflags = fmt.Sprintf("-F%s -Wl,-rpath,@executable_path", engineCachePath)
56+
case "linux":
57+
cgoLdflags = fmt.Sprintf("-L%s", engineCachePath)
58+
case "windows":
59+
cgoLdflags = fmt.Sprintf("-L%s", engineCachePath)
60+
default:
61+
fmt.Printf("hover: Target platform %s is not supported, cgo_ldflags not implemented.\n", targetOS)
62+
return
63+
}
64+
65+
cmdGoGetU := exec.Command(goBin, "get", "-u", "github.com/go-flutter-desktop/go-flutter"+buildBranch)
66+
cmdGoGetU.Dir = filepath.Join(wd, "desktop")
67+
cmdGoGetU.Env = append(os.Environ(),
68+
"GO111MODULE=on",
69+
"CGO_LDFLAGS="+cgoLdflags,
70+
)
71+
cmdGoGetU.Stderr = os.Stderr
72+
cmdGoGetU.Stdout = os.Stdout
73+
74+
err = cmdGoGetU.Run()
75+
if err != nil {
76+
versionName := buildBranch
77+
if versionName == "" {
78+
versionName = "latest"
79+
}
80+
fmt.Printf("hover: Updating go-flutter to %s version failed: %v\n", versionName, err)
81+
return
82+
}
83+
84+
cmdGoModDownload := exec.Command(goBin, "mod", "download")
85+
cmdGoModDownload.Dir = filepath.Join(wd, "desktop")
86+
cmdGoModDownload.Env = append(os.Environ(),
87+
"GO111MODULE=on",
88+
)
89+
cmdGoModDownload.Stderr = os.Stderr
90+
cmdGoModDownload.Stdout = os.Stdout
91+
92+
err = cmdGoModDownload.Run()
93+
if err != nil {
94+
fmt.Printf("hover: Go mod download failed: %v\n", err)
95+
return
96+
}
97+
98+
currentTag, err := enginecache.CurrentGoFlutterTag(wd)
99+
if err != nil {
100+
fmt.Printf("hover: %v\n", err)
101+
os.Exit(1)
102+
}
103+
104+
fmt.Printf("hover: 'go-flutter' upgraded to: %s\n", currentTag)
105+
106+
return nil
107+
108+
}

‎go.mod

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,16 @@ go 1.12
44

55
require (
66
github.com/GeertJohan/go.rice v1.0.0
7+
github.com/google/go-github v17.0.0+incompatible // indirect
8+
github.com/google/go-querystring v1.0.0 // indirect
9+
github.com/hashicorp/go-version v1.2.0
710
github.com/mitchellh/go-homedir v1.1.0
811
github.com/otiai10/copy v1.0.1
12+
github.com/otiai10/curr v0.0.0-20190513014714-f5a3d24e5776 // indirect
913
github.com/pkg/errors v0.8.1
1014
github.com/spf13/cobra v0.0.5
15+
github.com/stretchr/testify v1.3.0 // indirect
16+
github.com/tcnksm/go-latest v0.0.0-20170313132115-e3007ae9052e
17+
golang.org/x/net v0.0.0-20190628185345-da137c7871d7 // indirect
1118
gopkg.in/yaml.v2 v2.2.2
1219
)

‎go.sum

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
bou.ke/monkey v1.0.1 h1:zEMLInw9xvNakzUUPjfS4Ds6jYPqCFx3m7bRmG5NH2U=
12
bou.ke/monkey v1.0.1/go.mod h1:FgHuK96Rv2Nlf+0u1OOVDpCMdsWyOFmeeketDHE7LIg=
23
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
34
github.com/GeertJohan/go.incremental v1.0.0/go.mod h1:6fAjUhbVuX1KcMD3c8TEgVUqmo4seqhv0i0kdATSkM0=
@@ -11,55 +12,66 @@ github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3Ee
1112
github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
1213
github.com/daaku/go.zipexe v1.0.0 h1:VSOgZtH418pH9L16hC/JrgSNJbbAL26pj7lmD1+CGdY=
1314
github.com/daaku/go.zipexe v1.0.0/go.mod h1:z8IiR6TsVLEYKwXAoE/I+8ys/sDkgTzSL0CLnGVd57E=
15+
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
16+
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
1417
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
15-
github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
1618
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
17-
github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
19+
github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4rEjNlfyDHW9dolSY=
20+
github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
21+
github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
22+
github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
23+
github.com/hashicorp/go-version v1.2.0 h1:3vNe/fWF5CBgRIguda1meWhsZHy3m8gCJ5wx+dIzX/E=
24+
github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
1825
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
26+
github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
1927
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
2028
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
21-
github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY=
2229
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
2330
github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
2431
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
25-
github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
2632
github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
2733
github.com/nkovacs/streamquote v0.0.0-20170412213628-49af9bddb229/go.mod h1:0aYXnNPJ8l7uZxf45rWW1a/uME32OF0rhiYGNQ2oF2E=
2834
github.com/otiai10/copy v1.0.1 h1:gtBjD8aq4nychvRZ2CyJvFWAw0aja+VHazDdruZKGZA=
2935
github.com/otiai10/copy v1.0.1/go.mod h1:8bMCJrAqOtN/d9oyh5HR7HhLQMvcGMpGdwRDYsfOCHc=
36+
github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE=
37+
github.com/otiai10/curr v0.0.0-20190513014714-f5a3d24e5776 h1:o59bHXu8Ejas8Kq6pjoVJQ9/neN66SM8AKh6wI42BBs=
38+
github.com/otiai10/curr v0.0.0-20190513014714-f5a3d24e5776/go.mod h1:3HNVkVOU7vZeFXocWuvtcS0XSFLcf2XUSDHkq9t1jU4=
39+
github.com/otiai10/mint v1.2.3 h1:PsrRBmrxR68kyNu6YlqYHbNlItc5vOkuS6LBEsNttVA=
3040
github.com/otiai10/mint v1.2.3/go.mod h1:YnfyPNhBvnY8bW4SGQHCs/aAFhkgySlMZbrF5U0bOVw=
31-
github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
41+
github.com/otiai10/mint v1.2.4 h1:DxYL0itZyPaR5Z9HILdxSoHx+gNs6Yx+neOGS3IVUk0=
42+
github.com/otiai10/mint v1.2.4/go.mod h1:d+b7n/0R3tdyUYYylALXpWQ/kTN+QobSq/4SRGBkR3M=
3243
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
3344
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
3445
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
46+
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
3547
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
3648
github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
37-
github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI=
3849
github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
39-
github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8=
4050
github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
41-
github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8=
42-
github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
43-
github.com/spf13/cobra v0.0.4 h1:S0tLZ3VOKl2Te0hpq8+ke0eSJPfCnNTPiDlsfwi1/NE=
44-
github.com/spf13/cobra v0.0.4/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
4551
github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s=
4652
github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
47-
github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk=
4853
github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
4954
github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
5055
github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
51-
github.com/spf13/viper v1.3.2 h1:VUFqw5KcqRf7i70GOzW7N+Q7+gxVBkSSqiXB12+JQ4M=
5256
github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
57+
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
5358
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
59+
github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
60+
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
61+
github.com/tcnksm/go-latest v0.0.0-20170313132115-e3007ae9052e h1:IWllFTiDjjLIf2oeKxpIUmtiDV5sn71VgeQgg6vcE7k=
62+
github.com/tcnksm/go-latest v0.0.0-20170313132115-e3007ae9052e/go.mod h1:d7u6HkTYKSv5m6MCKkOQlHwaShTMl3HjqSGW3XtVhXM=
5463
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
5564
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
5665
github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
5766
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
5867
golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
59-
golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a h1:1n5lsVfiQW3yfsRGu98756EH1YthsFqr/5mxHduZW2A=
68+
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
69+
golang.org/x/net v0.0.0-20190628185345-da137c7871d7 h1:rTIdg5QFRR7XCaK4LCjBiPbx8j4DQRpdYMnGn/bJUEU=
70+
golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
6071
golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
61-
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
72+
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
6273
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
74+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
6375
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
6476
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
6577
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

‎internal/enginecache/cache.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"net/http"
1111
"os"
1212
"path/filepath"
13-
"runtime"
1413
"strconv"
1514
"strings"
1615
"time"
@@ -293,7 +292,7 @@ func ValidateOrUpdateEngineAtPath(targetOS string, cachePath string) (engineCach
293292
case "windows":
294293
engineDownloadURL += platform + "-embedder.zip"
295294
default:
296-
fmt.Printf("hover: cannot run on %s, download engine not implemented.\n", runtime.GOOS)
295+
fmt.Printf("hover: cannot run on %s, download engine not implemented.\n", targetOS)
297296
os.Exit(1)
298297
}
299298

0 commit comments

Comments
 (0)