Skip to content

Commit

Permalink
Merge pull request #3410 from eyqs/1812
Browse files Browse the repository at this point in the history
Replace xclip with xsel
  • Loading branch information
dnschneid committed Nov 20, 2017
2 parents c73e7a8 + 8712774 commit 99877ea
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions chroot-bin/croutonclip
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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`"
Expand Down
2 changes: 1 addition & 1 deletion targets/extension
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ fi
. "${TARGETSDIR:="$PWD"}/common"

### Append to prepare.sh:
install x11-utils xclip
install x11-utils xsel

compile websocket ''

Expand Down

0 comments on commit 99877ea

Please sign in to comment.