Skip to content

Replaced go-bindata with go1.16's embed feature #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: golang
Choose a base branch
from
Open

Replaced go-bindata with go1.16's embed feature #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb8082a
go-bindata replaced with go1.6's go embed
mixcode May 12, 2021
e043692
'go generate' command removed from build.ps1
mixcode May 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@ $env:GOARCH=$null

$returnValue = 0

# Generate assets.go
go generate
if ($LastExitCode -ne 0) { $returnValue = $LastExitCode }

# Build for each architecture
Foreach ($arch in $Architectures)
{
Expand Down
3 changes: 1 addition & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/benpye/wsl-ssh-pageant

go 1.12
go 1.16

require (
github.com/Microsoft/go-winio v0.4.11
Expand All @@ -12,7 +12,6 @@ require (
github.com/getlantern/hidden v0.0.0-20190325191715-f02dbb02be55 // indirect
github.com/getlantern/ops v0.0.0-20190325191751-d70cb0d6f85f // indirect
github.com/getlantern/systray v0.0.0-20190131073753-26d5b920200d
github.com/go-bindata/go-bindata v3.1.1+incompatible // indirect
github.com/go-stack/stack v1.8.0 // indirect
github.com/lxn/win v0.0.0-20181015143721-a7f87360b10e
github.com/oxtoacart/bpool v0.0.0-20190227141107-8c4636f812cc // indirect
Expand Down
11 changes: 6 additions & 5 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package main

//go:generate go run github.com/go-bindata/go-bindata/go-bindata -pkg $GOPACKAGE -o assets.go assets/

import (
"bufio"
Expand All @@ -19,6 +18,8 @@ import (
"syscall"
"unsafe"

_ "embed"

"github.com/Microsoft/go-winio"
"github.com/apenwarr/fixconsole"
"github.com/getlantern/systray"
Expand All @@ -32,6 +33,9 @@ var (
verbose = flag.Bool("verbose", false, "Enable verbose logging")
systrayFlag = flag.Bool("systray", false, "Enable systray integration")
force = flag.Bool("force", false, "Force socket usage (unlink existing socket)")

//go:embed assets/icon.ico
icon []byte
)

const (
Expand Down Expand Up @@ -314,10 +318,7 @@ func onSystrayReady() {
systray.SetTitle("WSL-SSH-Pageant")
systray.SetTooltip("WSL-SSH-Pageant")

data, err := Asset("assets/icon.ico")
if err == nil {
systray.SetIcon(data)
}
systray.SetIcon(icon)

quit := systray.AddMenuItem("Quit", "Quits this app")

Expand Down