From fda64ff0032bb97abed1c73f94175e3a834a1a98 Mon Sep 17 00:00:00 2001 From: nobe4 Date: Mon, 6 May 2024 09:24:00 +0200 Subject: [PATCH 1/2] fix: update install suggestion for missing `fyne` command This makes the install process more inline with the CI workflow, where both are tested --- internal/command/command.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/command/command.go b/internal/command/command.go index 4559ed1..020407d 100644 --- a/internal/command/command.go +++ b/internal/command/command.go @@ -157,7 +157,7 @@ func printUsage(template string, data interface{}) { func checkFyneBinHost(ctx Context) (string, error) { fyne, err := execabs.LookPath("fyne") if err != nil { - return "", fmt.Errorf("missed requirement: fyne. To install: `go get fyne.io/fyne/v2/cmd/fyne` and add $GOPATH/bin to $PATH") + return "", fmt.Errorf("missed requirement: fyne. To install: `go install fyne.io/fyne/v2/cmd/fyne@latest` or `go get fyne.io/fyne/v2/cmd/fyne@latest` and add $GOPATH/bin to $PATH") } if debugging() { From 26515d991e7704276e3fc5c6152d5935e15715ac Mon Sep 17 00:00:00 2001 From: nobe4 Date: Tue, 7 May 2024 09:14:08 +0200 Subject: [PATCH 2/2] fix: remove `go get` when installing this command cc https://github.com/fyne-io/fyne-cross/pull/248#pullrequestreview-2041278225 --- .github/workflows/ci.yml | 8 ++------ internal/command/command.go | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4389bb3..cca249e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -131,11 +131,9 @@ jobs: working-directory: fyne-cross run: go install - # attempt to use "go install" but fallback to "go get" - name: Install Fyne run: | - go install fyne.io/fyne/v2/cmd/fyne@latest || - go get fyne.io/fyne/v2/cmd/fyne@latest + go install fyne.io/fyne/v2/cmd/fyne@latest - name: Install Podman if: ${{ runner.os == 'macos' }} @@ -213,11 +211,9 @@ jobs: working-directory: fyne-cross run: go install - # attempt to use "go install" but fallback to "go get" - name: Install Fyne run: | - go install fyne.io/fyne/v2/cmd/fyne@latest || - go get fyne.io/fyne/v2/cmd/fyne@latest + go install fyne.io/fyne/v2/cmd/fyne@latest - name: Install Podman if: ${{ runner.os == 'macos' }} diff --git a/internal/command/command.go b/internal/command/command.go index 020407d..3ce1490 100644 --- a/internal/command/command.go +++ b/internal/command/command.go @@ -157,7 +157,7 @@ func printUsage(template string, data interface{}) { func checkFyneBinHost(ctx Context) (string, error) { fyne, err := execabs.LookPath("fyne") if err != nil { - return "", fmt.Errorf("missed requirement: fyne. To install: `go install fyne.io/fyne/v2/cmd/fyne@latest` or `go get fyne.io/fyne/v2/cmd/fyne@latest` and add $GOPATH/bin to $PATH") + return "", fmt.Errorf("missed requirement: fyne. To install: `go install fyne.io/fyne/v2/cmd/fyne@latest` and add $GOPATH/bin to $PATH") } if debugging() {