From 14a605300b7c1e1e2c32a7d10a401f6351a149ed Mon Sep 17 00:00:00 2001 From: Ruben Pollan <meskio@sindominio.net> Date: Mon, 6 Apr 2020 19:45:51 +0200 Subject: [PATCH] [bug] switch to keybase go-ps implementation The old mitchellh go-ps is not maintained and it has an issue where it truncates the process names: https://github.com/mitchellh/go-ps/issues/15 - Related: #152 --- go.mod | 4 +++- go.sum | 6 ++---- pkg/standalone/launcher_linux.go | 2 +- pkg/systray/pid.go | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index c6525d05..d3052786 100644 --- a/go.mod +++ b/go.mod @@ -1,5 +1,7 @@ module 0xacab.org/leap/bitmask-vpn +go 1.14 + require ( 0xacab.org/leap/go-dialog v0.0.0-20181123042829-0ee8438431a0 0xacab.org/leap/shapeshifter v0.0.0-20191029173606-85d3e8ac43e2 @@ -17,9 +19,9 @@ require ( github.com/gotk3/gotk3 v0.0.0-20191027191019-60cba67d4ea4 // indirect github.com/jmshal/go-locale v0.0.0-20190124211249-eb00fb25cc61 github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect + github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19 github.com/mattn/go-gtk v0.0.0-20191030024613-af2e013261f5 // indirect github.com/mattn/go-pointer v0.0.0-20190911064623-a0a44394634f // indirect - github.com/mitchellh/go-ps v0.0.0-20190716172923-621e5597135b github.com/sevlyar/go-daemon v0.1.5 github.com/skelterjohn/go.wde v0.0.0-20190318181201-adc3f78cdb45 // indirect github.com/skratchdot/open-golang v0.0.0-20190402232053-79abb63cd66e diff --git a/go.sum b/go.sum index 7b5a6751..596446de 100644 --- a/go.sum +++ b/go.sum @@ -75,16 +75,14 @@ github.com/jmshal/go-locale v0.0.0-20190124211249-eb00fb25cc61 h1:9vsXCXRCUb82jJ github.com/jmshal/go-locale v0.0.0-20190124211249-eb00fb25cc61/go.mod h1:+Ny9b1U6p4zX0L9w+k3hSkz3puupLFP14Mion+rGNF8= github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uiaSepXwyf3o52HaUYcV+Tu66S3F5GA= github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8= +github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19 h1:WjT3fLi9n8YWh/Ih8Q1LHAPsTqGddPcHqscN+PJ3i68= +github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19/go.mod h1:hY+WOq6m2FpbvyrI93sMaypsttvaIL5nhVR92dTMUcQ= github.com/mattn/go-gtk v0.0.0-20180216084204-5a311a1830ab/go.mod h1:PwzwfeB5syFHXORC3MtPylVcjIoTDT/9cvkKpEndGVI= github.com/mattn/go-gtk v0.0.0-20190405072524-4deadb416788/go.mod h1:PwzwfeB5syFHXORC3MtPylVcjIoTDT/9cvkKpEndGVI= github.com/mattn/go-gtk v0.0.0-20191030024613-af2e013261f5/go.mod h1:PwzwfeB5syFHXORC3MtPylVcjIoTDT/9cvkKpEndGVI= github.com/mattn/go-pointer v0.0.0-20171114154726-1d30dc4b6f28/go.mod h1:2zXcozF6qYGgmsG+SeTZz3oAbFLdD3OWqnUbNvJZAlc= github.com/mattn/go-pointer v0.0.0-20180825124634-49522c3f3791/go.mod h1:2zXcozF6qYGgmsG+SeTZz3oAbFLdD3OWqnUbNvJZAlc= github.com/mattn/go-pointer v0.0.0-20190911064623-a0a44394634f/go.mod h1:2zXcozF6qYGgmsG+SeTZz3oAbFLdD3OWqnUbNvJZAlc= -github.com/mitchellh/go-ps v0.0.0-20170309133038-4fdf99ab2936 h1:kw1v0NlnN+GZcU8Ma8CLF2Zzgjfx95gs3/GN3vYAPpo= -github.com/mitchellh/go-ps v0.0.0-20170309133038-4fdf99ab2936/go.mod h1:r1VsdOzOPt1ZSrGZWFoNhsAedKnEd6r9Np1+5blZCWk= -github.com/mitchellh/go-ps v0.0.0-20190716172923-621e5597135b h1:9+ke9YJ9KGWw5ANXK6ozjoK47uI3uNbXv4YVINBnGm8= -github.com/mitchellh/go-ps v0.0.0-20190716172923-621e5597135b/go.mod h1:r1VsdOzOPt1ZSrGZWFoNhsAedKnEd6r9Np1+5blZCWk= github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2 h1:CXwSGu/LYmbjEab5aMCs5usQRVBGThelUKBNnoSOuso= github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2/go.mod h1:L3UMQOThbttwfYRNFOWLLVXMhk5Lkio4GGOtw5UrxS0= github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c h1:rp5dCmg/yLR3mgFuSOe4oEnDDmGLROTvMragMUXpTQw= diff --git a/pkg/standalone/launcher_linux.go b/pkg/standalone/launcher_linux.go index 76f74f8e..5b66415b 100644 --- a/pkg/standalone/launcher_linux.go +++ b/pkg/standalone/launcher_linux.go @@ -25,7 +25,7 @@ import ( "0xacab.org/leap/bitmask-vpn/pkg/config" "0xacab.org/leap/bitmask-vpn/pkg/standalone/bonafide" - "github.com/mitchellh/go-ps" + "github.com/keybase/go-ps" ) const ( diff --git a/pkg/systray/pid.go b/pkg/systray/pid.go index ba3a6f34..b898d4e4 100644 --- a/pkg/systray/pid.go +++ b/pkg/systray/pid.go @@ -11,7 +11,7 @@ import ( "syscall" "0xacab.org/leap/bitmask-vpn/pkg/config" - "github.com/mitchellh/go-ps" + "github.com/keybase/go-ps" ) var pidFile = filepath.Join(config.Path, "systray.pid") -- GitLab