From c71cacb507ae42b83ef9934f5fddc69ac0871901 Mon Sep 17 00:00:00 2001 From: Randall Winkhart Date: Thu, 16 Jan 2025 15:49:57 -0500 Subject: [PATCH] Fix build failures on several platforms --- core/copyDARWIN.go | 4 ++-- core/copyTERMUX.go | 4 ++-- core/launchClipClearProcessCLIGeneric.go | 2 +- core/launchClipClearProcessGUIGeneric.go | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/copyDARWIN.go b/core/copyDARWIN.go index d063f5e..abceda8 100644 --- a/core/copyDARWIN.go +++ b/core/copyDARWIN.go @@ -11,7 +11,7 @@ import ( // copyString copies a string to the clipboard. func copyString(continuous bool, copySubject string) { cmd := exec.Command("pbcopy") - writeToStdin(cmd, copySubject) + WriteToStdin(cmd, copySubject) err := cmd.Run() if err != nil { fmt.Println(AnsiError+"Failed to copy to clipboard:", err.Error()+AnsiReset) @@ -26,6 +26,6 @@ func copyString(continuous bool, copySubject string) { // getClipCommands returns the commands for pasting and clearing the clipboard contents. func getClipCommands() (*exec.Cmd, *exec.Cmd) { cmdClear := exec.Command("pbcopy") - writeToStdin(cmdClear, "") + WriteToStdin(cmdClear, "") return exec.Command("pbpaste"), cmdClear } diff --git a/core/copyTERMUX.go b/core/copyTERMUX.go index 0d0da61..c4f18b6 100644 --- a/core/copyTERMUX.go +++ b/core/copyTERMUX.go @@ -11,7 +11,7 @@ import ( // copyString copies a string to the clipboard. func copyString(continuous bool, copySubject string) { cmd := exec.Command("termux-clipboard-set") - writeToStdin(cmd, copySubject) + WriteToStdin(cmd, copySubject) err := cmd.Run() if err != nil { fmt.Println(AnsiError+"Failed to copy to clipboard:", err.Error()+AnsiReset) @@ -26,6 +26,6 @@ func copyString(continuous bool, copySubject string) { // getClipCommands returns the commands for pasting and clearing the clipboard contents. func getClipCommands() (*exec.Cmd, *exec.Cmd) { cmdClear := exec.Command("termux-clipboard-set") - writeToStdin(cmdClear, "") + WriteToStdin(cmdClear, "") return exec.Command("termux-clipboard-get"), cmdClear } diff --git a/core/launchClipClearProcessCLIGeneric.go b/core/launchClipClearProcessCLIGeneric.go index 6c371b6..1ee21eb 100644 --- a/core/launchClipClearProcessCLIGeneric.go +++ b/core/launchClipClearProcessCLIGeneric.go @@ -13,7 +13,7 @@ import ( func LaunchClipClearProcess(copySubject string) { executableName := os.Args[0] cmd := exec.Command(executableName, "clipclear") - writeToStdin(cmd, copySubject) + WriteToStdin(cmd, copySubject) err := cmd.Start() if err != nil { fmt.Println(AnsiError + "Failed to launch automated clipboard clearing process - Does this libmutton implementation support the \"clipclear\" argument?" + AnsiReset) diff --git a/core/launchClipClearProcessGUIGeneric.go b/core/launchClipClearProcessGUIGeneric.go index bafda13..bfb174a 100644 --- a/core/launchClipClearProcessGUIGeneric.go +++ b/core/launchClipClearProcessGUIGeneric.go @@ -6,5 +6,5 @@ package core // For interactive GUI/TUI implementations, the clipboard clearing process is launched as a goroutine. // copySubject can be omitted to clear the clipboard immediately and unconditionally. func LaunchClipClearProcess(copySubject string) { - go ClipClearProcess(copySubject) + go clipClearProcess(copySubject) }