From 02adfef817ea1ecced2a4165019f12f9c8b3138e Mon Sep 17 00:00:00 2001 From: Randall Winkhart Date: Wed, 5 Jun 2024 17:45:49 -0400 Subject: [PATCH] Handle error for failing to read clipboard contents on all platforms --- src/backend/copyDARWIN.go | 8 ++++++-- src/backend/copyTERMUX.go | 8 ++++++-- src/backend/copyWIN.go | 8 ++++++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/backend/copyDARWIN.go b/src/backend/copyDARWIN.go index 4633175..0edc316 100644 --- a/src/backend/copyDARWIN.go +++ b/src/backend/copyDARWIN.go @@ -40,12 +40,16 @@ func clipClear(oldContents string) { time.Sleep(30 * time.Second) cmd := exec.Command("pbpaste") - newContents, _ := cmd.Output() + newContents, err := cmd.Output() + if err != nil { + fmt.Println(AnsiError + "Failed to read clipboard contents: " + err.Error() + AnsiReset) + os.Exit(1) + } if oldContents == strings.TrimRight(string(newContents), "\r\n") { cmd = exec.Command("pbcopy") writeToStdin(cmd, "") - err := cmd.Run() + err = cmd.Run() if err != nil { fmt.Println(AnsiError + "Failed to clear clipboard: " + err.Error() + AnsiReset) os.Exit(1) diff --git a/src/backend/copyTERMUX.go b/src/backend/copyTERMUX.go index 7fe808f..a61b9e6 100644 --- a/src/backend/copyTERMUX.go +++ b/src/backend/copyTERMUX.go @@ -38,12 +38,16 @@ func clipClear(oldContents string) { time.Sleep(30 * time.Second) cmd := exec.Command("termux-clipboard-get") - newContents, _ := cmd.Output() + newContents, err := cmd.Output() + if err != nil { + fmt.Println(AnsiError + "Failed to read clipboard contents: " + err.Error() + AnsiReset) + os.Exit(1) + } if oldContents == strings.TrimRight(string(newContents), "\r\n") { cmd = exec.Command("termux-clipboard-set") writeToStdin(cmd, "") - err := cmd.Run() + err = cmd.Run() if err != nil { fmt.Println(AnsiError + "Failed to clear clipboard: " + err.Error() + AnsiReset) os.Exit(1) diff --git a/src/backend/copyWIN.go b/src/backend/copyWIN.go index 68edf12..987e0b5 100644 --- a/src/backend/copyWIN.go +++ b/src/backend/copyWIN.go @@ -37,11 +37,15 @@ func clipClear(oldContents string) { time.Sleep(30 * time.Second) cmd := exec.Command("powershell.exe", "-c", "Get-Clipboard") - newContents, _ := cmd.Output() + newContents, err := cmd.Output() + if err != nil { + fmt.Println(AnsiError + "Failed to read clipboard contents: " + err.Error() + AnsiReset) + os.Exit(1) + } if oldContents == strings.TrimRight(string(newContents), "\r\n") { cmd = exec.Command("powershell.exe", "-c", "Set-Clipboard") - err := cmd.Run() + err = cmd.Run() if err != nil { fmt.Println(AnsiError + "Failed to clear clipboard: " + err.Error() + AnsiReset) os.Exit(1)