rebase
This commit is contained in:
parent
553a9feb42
commit
e5e5c1cc99
|
@ -1,40 +1,14 @@
|
|||
9,26c9,16
|
||||
< local self = { healthy = true, clip_util = "", clip_cmd = "", }
|
||||
<
|
||||
< if h.is_mac() then
|
||||
< self.clip_util = "pbcopy"
|
||||
< self.clip_cmd = "LANG=en_US.UTF-8 " .. self.clip_util
|
||||
< elseif h.is_wayland() then
|
||||
< local function is_wl_copy_installed()
|
||||
< local handle = h.subprocess { 'wl-copy', '--version' }
|
||||
< return handle.status == 0 and handle.stdout:match("wl%-clipboard") ~= nil
|
||||
< end
|
||||
<
|
||||
< self.clip_util = "wl-copy"
|
||||
< self.clip_cmd = self.clip_util
|
||||
< self.healthy = is_wl_copy_installed()
|
||||
< else
|
||||
< local function is_xclip_installed()
|
||||
< local handle = h.subprocess { 'xclip', '-version' }
|
||||
< return handle.status == 0 and handle.stderr:match("xclip version") ~= nil
|
||||
---
|
||||
> local self = {}
|
||||
> local clip = (function()
|
||||
> if h.is_mac() then
|
||||
> return 'LANG=en_US.UTF-8 pbcopy'
|
||||
> elseif h.is_wayland() then
|
||||
> return 'wl-copy'
|
||||
> else
|
||||
> return 'xsel --input --clipboard'
|
||||
28,32c18
|
||||
<
|
||||
< self.clip_util = "xclip"
|
||||
< self.clip_cmd = self.clip_util .. " -i -selection clipboard"
|
||||
< self.healthy = is_xclip_installed()
|
||||
< end
|
||||
---
|
||||
> end)()
|
||||
39c25
|
||||
< local handle = io.popen(self.clip_cmd, 'w')
|
||||
---
|
||||
> local handle = io.popen(clip, 'w')
|
||||
diff -urN ../mpvacious/platform/nix.lua ../mpvacious-patch/platform/nix.lua
|
||||
--- ../mpvacious/platform/nix.lua 2024-06-28 22:39:00.110717010 -0400
|
||||
+++ ../mpvacious-patch/platform/nix.lua 2024-06-28 22:51:09.477937080 -0400
|
||||
@@ -26,8 +26,8 @@
|
||||
return handle.status == 0 and handle.stderr:match("xclip version") ~= nil
|
||||
end
|
||||
|
||||
- self.clip_util = "xclip"
|
||||
- self.clip_cmd = self.clip_util .. " -i -selection clipboard"
|
||||
+ self.clip_util = "xsel"
|
||||
+ self.clip_cmd = self.clip_util .. " --input --clipboard"
|
||||
self.healthy = is_xclip_installed()
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue