yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

GODT-2150: fixed initial implementation that filtered --no-window in gui instead of bridge.

Browse Source
This commit is contained in:
Xavier Michelon
2022-11-30 19:03:35 +01:00
parent 6b8faf0ecf
commit f3cc19b09c
3 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/restarter/restarter.go
View File

@ -77,7 +77,7 @@ func (restarter *Restarter) Restart() {
//nolint:gosec
cmd := execabs.Command(
restarter.exe,
xslices.Join(removeFlagWithValue(os.Args[1:], "parent-pid"), restarter.flags)...,
xslices.Join(removeFlagWithValue(removeFlag(os.Args[1:], "no-window"), "parent-pid"), restarter.flags)...,
)
l := logrus.WithFields(logrus.Fields{
@ -156,3 +156,7 @@ func removeFlagWithValue(argList []string, flag string) []string {
return result
}
func removeFlag(argList []string, flag string) []string {
return xslices.Filter(argList, func(arg string) bool { return (arg != "-"+flag) && (arg != "--"+flag) })
}

17
pkg/restarter/restarter_test.go
View File

@ -41,3 +41,20 @@ func TestRemoveFlagWithValue(t *testing.T) {
require.Equal(t, removeFlagWithValue(tt.argList, tt.flag), tt.expected)
}
}
func TestRemoveFlag(t *testing.T) {
tests := []struct {
argList []string
flag string
expected []string
}{
{[]string{}, "b", []string{}},
{[]string{"-a", "-b", "-c"}, "b", []string{"-a", "-c"}},
{[]string{"-a", "--b", "-b"}, "b", []string{"-a"}},
{[]string{"-a", "-c"}, "b", []string{"-a", "-c"}},
}
for _, tt := range tests {
require.Equal(t, removeFlag(tt.argList, tt.flag), tt.expected)
}
}