simono41/clipman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(selector): allow logging errors

Browse source
This commit is contained in:
yory8 2019-05-09 18:46:16 +02:00
parent 0a00dede30
commit 970e8ad514
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
main.go
View file

@ -16,7 +16,7 @@ var (
asSelector = app.Flag("select", "Select an item from clipboard history").Short('s').Default("false").Bool() asSelector = app.Flag("select", "Select an item from clipboard history").Short('s').Default("false").Bool()
noPersist = app.Flag("no-persist", "Don't persist a copy buffer after a program exits").Short('P').Default("false").Bool() noPersist = app.Flag("no-persist", "Don't persist a copy buffer after a program exits").Short('P').Default("false").Bool()
max = app.Flag("max-items", "items to store in history (with -d) or display before scrolling (with -s)").Default("15").Int() max = app.Flag("max-items", "items to store in history (with -d) or display before scrolling (with -s)").Default("15").Int()
tool = app.Flag("selector", "Which selector to use: dmenu/rofi").Default("dmenu").String() tool = app.Flag("selector", "Which selector to use: dmenu/rofi").Default("dmenu").String()
) )
func main() { func main() {

14
selector.go
View file

@ -15,8 +15,11 @@ func selector(history []string, max int, tool string) error {
selected, err := dmenu(history, max, tool) selected, err := dmenu(history, max, tool)
if err != nil { if err != nil {
// dmenu exits with error when no selection done if err.Error() == "exit status 1" {
return nil // dmenu exits with this error when no selection done
return nil
}
return err
} }
// serve selection to the OS // serve selection to the OS
@ -30,6 +33,11 @@ func dmenu(list []string, max int, tool string) (string, error) {
return "", nil return "", nil
} }
bin, err := exec.LookPath("/usr/bin/" + tool)
if err != nil {
return "", fmt.Errorf("%s is not installed", tool)
}
var args []string var args []string
if tool == "dmenu" { if tool == "dmenu" {
args = []string{"dmenu", "-b", args = []string{"dmenu", "-b",
@ -62,7 +70,7 @@ func dmenu(list []string, max int, tool string) (string, error) {
input := strings.NewReader(strings.Join(reprList, "\n")) input := strings.NewReader(strings.Join(reprList, "\n"))
cmd := exec.Cmd{Path: "/usr/bin/" + tool, Args: args, Stdin: input} cmd := exec.Cmd{Path: bin, Args: args, Stdin: input}
selected, err := cmd.Output() selected, err := cmd.Output()
if err != nil { if err != nil {
return "", err return "", err