From 871277458336c9156070c19e001c92a88e34f369 Mon Sep 17 00:00:00 2001 From: "Eugene Y. Q. Shen" Date: Fri, 15 Sep 2017 23:04:47 -0700 Subject: [PATCH] Replace xclip with xsel --- chroot-bin/croutonclip | 8 ++++---- targets/extension | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/chroot-bin/croutonclip b/chroot-bin/croutonclip index 8f261a0c7..299dbbd67 100755 --- a/chroot-bin/croutonclip +++ b/chroot-bin/croutonclip @@ -42,7 +42,7 @@ copyclip() { # Check if display is still running if rundisplay "$current" xdpyinfo >/dev/null 2>&1; then echo -n 'R' - rundisplay "$current" xclip -o -sel clip + rundisplay "$current" xsel -ob else echo -n "EUnable to open display '$current'." fi @@ -71,9 +71,9 @@ copyclip() { trap "rm -f '$cliptmp'" 0 cat > $cliptmp - if ! rundisplay "$next" xclip -o -sel clip \ + if ! rundisplay "$next" xsel -ob \ | diff -q - "$cliptmp" > /dev/null; then - cat "$cliptmp" | rundisplay "$next" xclip -i -sel clip + rundisplay "$next" xsel -ib < "$cliptmp" fi fi ) && current="$next" @@ -158,7 +158,7 @@ addtrap "echo -n > '$CROUTONLOCKDIR/clip' 2>/dev/null" : done ) | ( - # Do not hold the lock in this subshell and children (especially xclip) + # Do not hold the lock in this subshell and children (especially xsel) exec 3>/dev/null while read -r line; do display="`croutoncycle display`" diff --git a/targets/extension b/targets/extension index 612f7d948..e8fd559a4 100644 --- a/targets/extension +++ b/targets/extension @@ -19,7 +19,7 @@ fi . "${TARGETSDIR:="$PWD"}/common" ### Append to prepare.sh: -install x11-utils xclip +install x11-utils xsel compile websocket ''