Add correct check for Wayland in clipboard plugins

jarun · Nov 26, 2022 · 0c23406 · 0c23406 · raffaem · Nov 28, 2022
1 parent 07c5590
commit 0c23406
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/plugins/.cbcp b/plugins/.cbcp
@@ -24,7 +24,10 @@ IFS="$(printf '%b_' '\n')"; IFS="${IFS%_}" # protect trailing \n
 selection=${NNN_SEL:-${XDG_CONFIG_HOME:-$HOME/.config}/nnn/.selection}
 [ -s "$selection" ] || { echo "plugin .cbcp error: empty selection" >&2 ; exit 1; }
 
-if type xsel >/dev/null 2>&1; then
+if [ "$XDG_SESSION_TYPE" = "wayland" ]; then
+    # Wayland
+    tr '\0' '\n' < "$selection" | wl-copy
+elif type xsel >/dev/null 2>&1; then
     # Linux
     tr '\0' '\n' < "$selection" | xsel -bi
 elif type xclip >/dev/null 2>&1; then
@@ -42,9 +45,6 @@ elif type clip.exe >/dev/null 2>&1; then
 elif type clip >/dev/null 2>&1; then
     # Cygwin
     tr '\0' '\n' < "$selection" | clip
-elif type wl-copy >/dev/null 2>&1; then
-    # Wayland
-    tr '\0' '\n' < "$selection" | wl-copy
 elif type clipboard >/dev/null 2>&1; then
     # Haiku
     tr '\0' '\n' < "$selection" | clipboard --stdin

diff --git a/plugins/x2sel b/plugins/x2sel
@@ -23,7 +23,10 @@ IFS="$(printf '%b_' '\n')"; IFS="${IFS%_}" # protect trailing \n
 selection=${NNN_SEL:-${XDG_CONFIG_HOME:-$HOME/.config}/nnn/.selection}
 
 getclip () {
-	if type xsel >/dev/null 2>&1; then
+	if [ "$XDG_SESSION_TYPE" = "wayland" ]; then
+		# Wayland
+		wl-paste
+	elif type xsel >/dev/null 2>&1; then
 		# Linux
 		xsel -bo
 	elif type xclip >/dev/null 2>&1; then
@@ -41,9 +44,6 @@ getclip () {
 	elif [ -r /dev/clipboard ] ; then
 		# Cygwin
 		cat /dev/clipboard
-	elif type wl-paste >/dev/null 2>&1; then
-		# Wayland
-		wl-paste
 	elif type clipboard >/dev/null 2>&1; then
 		# Haiku
 		clipboard --print