sysutil: non-Linux OS support (#90)

gookit · Mar 22, 2023 · 78df8c8 · 78df8c8
1 parent 78ded57
commit 78df8c8
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 1 deletion.
diff --git a/sysutil/clipboard/clipboard.go b/sysutil/clipboard/clipboard.go
@@ -198,7 +198,7 @@ func (c *Clipboard) ReadTo(w io.Writer) error {
 
 // Available check
 func (c *Clipboard) Available() bool {
-	return c.writeable && c.readable
+	return c.writeable && c.readable && available()
 }
 
 // Writeable check

diff --git a/sysutil/clipboard/util_darwin.go b/sysutil/clipboard/util_darwin.go
@@ -11,3 +11,5 @@ func GetWriterBin() string {
 func GetReaderBin() string {
 	return ReaderOnMac
 }
+
+func available() bool { return true }
diff --git a/sysutil/clipboard/util_unix.go b/sysutil/clipboard/util_unix.go
@@ -2,6 +2,8 @@
 
 package clipboard
 
+import "os"
+
 // GetWriterBin program name
 func GetWriterBin() string {
 	return WriterOnLin
@@ -11,3 +13,8 @@ func GetWriterBin() string {
 func GetReaderBin() string {
 	return ReaderOnLin
 }
+
+func available() bool {
+	// X clipboard is unavailable when not under X.
+	return os.Getenv("DISPLAY") != ""
+}
diff --git a/sysutil/clipboard/util_windows.go b/sysutil/clipboard/util_windows.go
@@ -11,3 +11,5 @@ func GetWriterBin() string {
 func GetReaderBin() string {
 	return ReaderOnWin
 }
+
+func available() bool { return true }
diff --git a/sysutil/sysutil_linux.go → sysutil/sysutil_unix.go b/sysutil/sysutil_linux.go → sysutil/sysutil_unix.go
@@ -1,3 +1,5 @@
+//go:build !windows && !darwin
+
 package sysutil
 
 import (