github/wails
5
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2025-05-02 19:50:15 +08:00
Code Projects Activity

Trim spaces around version (#2197)

Browse Source 
Co-authored-by: stffabi <stffabi@users.noreply.github.com>
This commit is contained in:
Matt Holt 2022-12-12 12:40:02 -07:00 committed by GitHub
parent eb2d929824
commit 38ffbb3161
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
v2/cmd/wails/internal/gomod/gomod.go
View File

@ -2,13 +2,15 @@ package gomod
import ( import (
"fmt" "fmt"
"os"
"strings"
"github.com/wailsapp/wails/v2/cmd/wails/internal" "github.com/wailsapp/wails/v2/cmd/wails/internal"
"github.com/wailsapp/wails/v2/internal/colour" "github.com/wailsapp/wails/v2/internal/colour"
"github.com/wailsapp/wails/v2/internal/fs" "github.com/wailsapp/wails/v2/internal/fs"
"github.com/wailsapp/wails/v2/internal/gomod" "github.com/wailsapp/wails/v2/internal/gomod"
"github.com/wailsapp/wails/v2/internal/goversion" "github.com/wailsapp/wails/v2/internal/goversion"
"github.com/wailsapp/wails/v2/pkg/clilogger" "github.com/wailsapp/wails/v2/pkg/clilogger"
"os"
) )
func SyncGoMod(logger *clilogger.CLILogger, updateWailsVersion bool) error { func SyncGoMod(logger *clilogger.CLILogger, updateWailsVersion bool) error {
@ -32,12 +34,13 @@ func SyncGoMod(logger *clilogger.CLILogger, updateWailsVersion bool) error {
LogGreen("Updated go.mod to use Go '%s'", goversion.MinRequirement) LogGreen("Updated go.mod to use Go '%s'", goversion.MinRequirement)
} }
if outOfSync, err := gomod.GoModOutOfSync(gomodData, internal.Version); err != nil { internalVersion := strings.TrimSpace(internal.Version)
if outOfSync, err := gomod.GoModOutOfSync(gomodData, internalVersion); err != nil {
return err return err
} else if outOfSync { } else if outOfSync {
if updateWailsVersion { if updateWailsVersion {
LogGreen("Updating go.mod to use Wails '%s'", internal.Version) LogGreen("Updating go.mod to use Wails '%s'", internalVersion)
gomodData, err = gomod.UpdateGoModVersion(gomodData, internal.Version) gomodData, err = gomod.UpdateGoModVersion(gomodData, internalVersion)
if err != nil { if err != nil {
return err return err
} }