diff --git a/go.mod b/go.mod index e84880866f..72cda51b06 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,7 @@ go 1.20 require ( filippo.io/age v1.1.1 + github.com/AnomalRoil/screenshot v0.0.2 github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95 github.com/atotto/clipboard v0.1.4 github.com/blang/semver/v4 v4.0.0 @@ -21,7 +22,6 @@ require ( github.com/hashicorp/golang-lru v0.5.4 github.com/jsimonetti/pwscheme v0.0.0-20220922140336-67a4d090f150 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 - github.com/kbinani/screenshot v0.0.0-20210720154843-7d3a670d8329 github.com/makiuchi-d/gozxing v0.1.1 github.com/martinhoefling/goxkcdpwgen v0.1.2-0.20221205222637-737661b92a0e github.com/mattn/go-colorable v0.1.13 diff --git a/go.sum b/go.sum index 4e95bde4ad..50cc00e202 100644 --- a/go.sum +++ b/go.sum @@ -4,6 +4,8 @@ filippo.io/age v1.1.1 h1:pIpO7l151hCnQ4BdyBujnGP2YlUo0uj6sAVNHGBvXHg= filippo.io/age v1.1.1/go.mod h1:l03SrzDUrBkdBx8+IILdnn2KZysqQdbEBUQ4p3sqEQE= filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek= filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns= +github.com/AnomalRoil/screenshot v0.0.2 h1:MVFqxkjOeCznTldJSzlcyvwmTIKh3q1L57yr4I29rz4= +github.com/AnomalRoil/screenshot v0.0.2/go.mod h1:f1wcpgUow6TZKOZBBHXGhjGnU0S1lSnurTRpK9BR6R0= github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95 h1:KLq8BE0KwCL+mmXnjLWEAOYO+2l2AE4YMmqG1ZpZHBs= github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0= github.com/alessio/shellescape v1.4.2 h1:MHPfaU+ddJ0/bYWpgIeUnQUqKrlJ1S7BfEYPM4uEoM0= @@ -52,7 +54,6 @@ github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo github.com/gdamore/tcell/v2 v2.2.0/go.mod h1:cTTuF84Dlj/RqmaCIV5p4w8uG1zWdk0SF6oBpwHp4fU= github.com/gdamore/tcell/v2 v2.6.0 h1:OKbluoP9VYmJwZwq/iLb4BxwKcwGthaa1YNBJIyCySg= github.com/gdamore/tcell/v2 v2.6.0/go.mod h1:be9omFATkdr0D9qewWW3d+MEvl5dha+Etb5y65J2H8Y= -github.com/gen2brain/shm v0.0.0-20200228170931-49f9650110c5/go.mod h1:uF6rMu/1nvu+5DpiRLwusA6xB8zlkNoGzKn8lmYONUo= github.com/gen2brain/shm v0.0.0-20221026125803-c33c9e32b1c8 h1:u4/UVF0sNxlqDwCptjIUTUkZW4UoZDrcHzvd2kNnF/k= github.com/gen2brain/shm v0.0.0-20221026125803-c33c9e32b1c8/go.mod h1:uF6rMu/1nvu+5DpiRLwusA6xB8zlkNoGzKn8lmYONUo= github.com/godbus/dbus v0.0.0-20190623212516-8a1682060722 h1:NNKZiuNXd6lpZRyoFM/uhssj5W9Ps1DbhGHxT49Pm9I= @@ -86,7 +87,6 @@ github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+l github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/golang-lru/v2 v2.0.4 h1:7GHuZcgid37q8o5i3QI9KMT4nCWQQ3Kx3Ov6bb9MfK0= github.com/hashicorp/golang-lru/v2 v2.0.4/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= -github.com/jezek/xgb v0.0.0-20210312150743-0e0f116e1240/go.mod h1:3P4UH/k22rXyHIJD2w4h2XMqPX4Of/eySEZq9L6wqc4= github.com/jezek/xgb v1.1.0 h1:wnpxJzP1+rkbGclEkmwpVFQWpuE2PUGNUzP8SbfFobk= github.com/jezek/xgb v1.1.0/go.mod h1:nrhwO0FX/enq75I7Y7G8iN1ubpSGZEiA3v9e9GyRFlk= github.com/jsimonetti/pwscheme v0.0.0-20220922140336-67a4d090f150 h1:ta6N7DaOQEACq28cLa0iRqXIbchByN9Lfll08CT2GBc= @@ -98,8 +98,6 @@ github.com/jwalton/go-supportscolor v1.2.0 h1:g6Ha4u7Vm3LIsQ5wmeBpS4gazu0UP1DRDE github.com/jwalton/go-supportscolor v1.2.0/go.mod h1:hFVUAZV2cWg+WFFC4v8pT2X/S2qUUBYMioBD9AINXGs= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= -github.com/kbinani/screenshot v0.0.0-20210720154843-7d3a670d8329 h1:qq2nCpSrXrmvDGRxW0ruW9BVEV1CN2a9YDOExdt+U0o= -github.com/kbinani/screenshot v0.0.0-20210720154843-7d3a670d8329/go.mod h1:2VPVQDR4wO7KXHwP+DAypEy67rXf+okUx2zjgpCxZw4= github.com/kjk/lzmadec v0.0.0-20210713164611-19ac3ee91a71 h1:TYp9Fj0apeZMWentXRaFM6B0ixdFefrlgY8n8XYEz1s= github.com/kjk/lzmadec v0.0.0-20210713164611-19ac3ee91a71/go.mod h1:2zRkQCuw/eK6cqkYAeNqyBU7JKa2Gcq40BZ9GSJbmfE= github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= diff --git a/pkg/otp/screenshot_others.go b/pkg/otp/screenshot_others.go index 279e2e8d10..b6044f2030 100644 --- a/pkg/otp/screenshot_others.go +++ b/pkg/otp/screenshot_others.go @@ -1,5 +1,5 @@ -//go:build !linux -// +build !linux +//go:build !(linux || windows || darwin || freebsd || netbsd || openbsd) +// +build !linux,!windows,!darwin,!freebsd,!netbsd,!openbsd package otp @@ -11,5 +11,5 @@ import ( // ParseScreen will attempt to parse all available screen and will look for otpauth QR codes. It returns the first one // it has found. func ParseScreen(ctx context.Context) (string, error) { - return "", fmt.Errorf("Not supported on OSX without compiling with CGO") + return "", fmt.Errorf("Not supported on your platform") } diff --git a/pkg/otp/screenshot_linux.go b/pkg/otp/screenshot_supported.go similarity index 88% rename from pkg/otp/screenshot_linux.go rename to pkg/otp/screenshot_supported.go index 6ac7a8127a..85794b96e9 100644 --- a/pkg/otp/screenshot_linux.go +++ b/pkg/otp/screenshot_supported.go @@ -1,5 +1,5 @@ -//go:build linux -// +build linux +//go:build linux || windows || darwin || freebsd || netbsd || openbsd +// +build linux windows darwin freebsd netbsd openbsd package otp @@ -7,8 +7,8 @@ import ( "context" "strings" + "github.com/AnomalRoil/screenshot" "github.com/gopasspw/gopass/internal/out" - "github.com/kbinani/screenshot" "github.com/makiuchi-d/gozxing" "github.com/makiuchi-d/gozxing/qrcode" )