Merge branch 'main' of github.com:matryer/xbar into main

matryer · Apr 2, 2021 · 331aaae · 331aaae
2 parents 9d38354 + 6154485
commit 331aaae
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/pkg/plugins/action.go b/pkg/plugins/action.go
@@ -42,7 +42,7 @@ func (i *Item) Action() ActionFunc {
 	if i.Params.Shell != "" {
 		actions = append(actions, actionShell(debugf, i, i.Params.Shell, i.Params.ShellParams))
 	}
-	if i.Params.Refresh == true {
+	if i.Params.Refresh {
 		shouldDelayBeforeRefresh := false
 		if len(actions) > 0 {
 			// there are actions other than refresh, so let's introduce a
@@ -157,6 +157,5 @@ func actionRefresh(debugf DebugFunc, refreshFunc func(ctx context.Context)) Acti
 	return func(ctx context.Context) {
 		debugf("action refresh")
 		refreshFunc(ctx)
-		return
 	}
 }
diff --git a/pkg/plugins/install_test.go b/pkg/plugins/install_test.go
@@ -176,7 +176,6 @@ func TestGetInstalledPluginName(t *testing.T) {
 // 		is.True(err != nil)
 // 	})
 // }
-
-const simplePlugin = `#!/bin/bash
-echo "Hello, xbar."
-`
+// const simplePlugin = `#!/bin/bash
+// echo "Hello, xbar."
+// `
diff --git a/pkg/plugins/items.go → pkg/plugins/item_params.go b/pkg/plugins/items.go → pkg/plugins/item_params.go
diff --git a/pkg/plugins/items_test.go → pkg/plugins/item_params_test.go b/pkg/plugins/items_test.go → pkg/plugins/item_params_test.go
diff --git a/pkg/plugins/parse_test.go b/pkg/plugins/parse_test.go
@@ -39,7 +39,7 @@ func TestParseParams(t *testing.T) {
 	s, params, err = parseParams(`no params`)
 	is.NoErr(err)
 	is.Equal(s, "no params")
-	is.Equal(params.Terminal, false)  // Terminal
+	is.Equal(params.Terminal, "false")  // Terminal
 	is.Equal(params.Refresh, false)   // Refresh
 	is.Equal(params.Dropdown, true)   // Dropdown
 	is.Equal(params.Length, 0)        // Length