commit 67576dbb2fd7161fecb354d37d2c6f4256d2d985
| author | 斟酌 鵬兄 <tgckpg@gmail.com> |
|---|
| date | 2026-09-07T12:02:54Z |
|---|
| subject | Fix pbpaste |
|---|
commit 67576dbb2fd7161fecb354d37d2c6f4256d2d985
Author: 斟酌 鵬兄 <tgckpg@gmail.com>
Date: 2026-09-07T12:02:54Z
Fix pbpaste
---
bash/dist/rbashrc | 2 +-
bash/dist/rbashrc.asc | 10 +++++-----
bash/dist/sources.list | 2 +-
bash/sources/42_clipboard_server | 39 ++++++++++++++++++++++-----------------
4 files changed, 29 insertions(+), 24 deletions(-)
diff --git a/bash/dist/rbashrc b/bash/dist/rbashrc
index 8f57a6d..432651e 100755
--- a/bash/dist/rbashrc
+++ b/bash/dist/rbashrc
@@ -18,7 +18,7 @@ RBASH_CONFIG="$RBASH_HOME/config"
RBASH_ENV="$RBASH_HOME/env"
RBASH_MERGED="$RBASH_CACHE_DIR/merged"
RBASH_BIN="$RBASH_HOME/bin"
-RBASH_SOURCES_SUM="a5bc07b2fe8fa5c35cb7255f21ac56347f0cd0c0a3bc4fde63cfadd83d73981f"
+RBASH_SOURCES_SUM="58550a8c9bdb30da739a8b67903f6c77d71194f6e0c7feb54c33989af00a61ac"
# ---- rbash: bash/core/00_env.bash ----
diff --git a/bash/dist/rbashrc.asc b/bash/dist/rbashrc.asc
index a51470f..bcabc83 100644
--- a/bash/dist/rbashrc.asc
+++ b/bash/dist/rbashrc.asc
@@ -1,8 +1,8 @@
-----BEGIN PGP SIGNATURE-----
-iJEEABYKADkWIQR8HpSNhBJUxWnt+97Vz1+xz60nwwUCap5NXhsUgAAAAAAEAA5t
-YW51MiwyLjUrMS4xMiwwLDMACgkQ1c9fsc+tJ8P4lgD/QY8KkS2cmOXCvzZgeLy1
-/bm4i40dQL5pUE9F72uxyDoA/ilwF+RMAUh/1QQCANGaV89+y6WvkYZFm6tERgiX
-GtIO
-=RfT/
+iJEEABYKADkWIQR8HpSNhBJUxWnt+97Vz1+xz60nwwUCap6nshsUgAAAAAAEAA5t
+YW51MiwyLjUrMS4xMiwwLDMACgkQ1c9fsc+tJ8N17QEA9WfmUCPrWdNNNjB3wh/6
+yoAI+rqUdaQQrmdMlPqWWugA/1NMaht/kQ28lkrNnv+ImF0f7UzX3oeRKK2xqi50
+v3EH
+=CwGK
-----END PGP SIGNATURE-----
diff --git a/bash/dist/sources.list b/bash/dist/sources.list
index a718ac7..706148f 100644
--- a/bash/dist/sources.list
+++ b/bash/dist/sources.list
@@ -13,5 +13,5 @@ b5a488efc0558e2b795a1558e2c91a8aeecc3fd441d437aff3a4749d5eb0bdfc sources/23_win
5dbc166ce1b051b54d244ef5dc6b52dfbff03965e9abb0ed891d441dffbf8a76 sources/31_git-utils
c9c270376844e7c7e3c48b1e86c2ce3e7824dde64e8724c17c5fc95910abd11c sources/40_go-command
c0e8ef70466063907b5ed9e52c13532b0019b8cb5975d020899804549a76a37f sources/41_pivot-command
-43251f55a7927f7a422fd2d187a06c2a3436920dfbe90456d4222041528cde4c sources/42_clipboard_server
+7ece6390d7546338752ae889b42a0d6a49d24792749a9a41fc818623c0a99f15 sources/42_clipboard_server
d02be2a68e8bd1f7e5adacbdd0bdc4f426aabfa1a57709270b673617db6c5352 sources/60_diagnostics
diff --git a/bash/sources/42_clipboard_server b/bash/sources/42_clipboard_server
index 055989a..fdf518f 100644
--- a/bash/sources/42_clipboard_server
+++ b/bash/sources/42_clipboard_server
@@ -183,17 +183,18 @@ function sshc {
function pbcopy {
local remote_socket
- remote_socket="$(_ssh_clipboard_find_remote_socket copy)"
+ if [ -n "${SSH_CONNECTION:-}" ]; then
+ remote_socket="$(_ssh_clipboard_find_remote_socket copy)"
- if [ -n "$remote_socket" ]; then
-
- command -v socat >/dev/null 2>&1 || {
- echo "pbcopy: socat is required for the remote clipboard" >&2
- return 1
- }
+ if [ -n "$remote_socket" ]; then
+ command -v socat >/dev/null 2>&1 || {
+ echo "pbcopy: socat is required for the remote clipboard" >&2
+ return 1
+ }
- socat - "UNIX-CONNECT:$remote_socket"
- return $?
+ socat - "UNIX-CONNECT:$remote_socket"
+ return $?
+ fi
fi
case "$OSTYPE" in
@@ -219,16 +220,20 @@ function pbcopy {
function pbpaste {
- if [ -n "${SSH_CLIPBOARD_REMOTE_PASTE_SOCKET:-}" ] &&
- [ -S "$SSH_CLIPBOARD_REMOTE_PASTE_SOCKET" ]; then
+ local remote_socket
- command -v socat >/dev/null 2>&1 || {
- echo "pbpaste: socat is required for the remote clipboard" >&2
- return 1
- }
+ if [ -n "${SSH_CONNECTION:-}" ]; then
+ remote_socket="$(_ssh_clipboard_find_remote_socket paste)"
- socat - "UNIX-CONNECT:$SSH_CLIPBOARD_REMOTE_PASTE_SOCKET"
- return $?
+ if [ -n "$remote_socket" ]; then
+ command -v socat >/dev/null 2>&1 || {
+ echo "pbpaste: socat is required for the remote clipboard" >&2
+ return 1
+ }
+
+ socat - "UNIX-CONNECT:$remote_socket"
+ return $?
+ fi
fi
case "$OSTYPE" in