From 683f57484fb32f8e810b59e3a96a8d361d255e95 Mon Sep 17 00:00:00 2001 From: Chris Down Date: Fri, 17 Feb 2017 11:50:02 -0500 Subject: [PATCH] Remove xclip support Pretty much everyone runs with xsel, so xclip support is becoming more and more questionable. Just have people use xsel. --- clipmenu | 6 +----- clipmenud | 14 ++------------ tests/test-perf | 1 - 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/clipmenu b/clipmenu index 11e12c2..ce93af6 100755 --- a/clipmenu +++ b/clipmenu @@ -22,9 +22,5 @@ if ! [[ -f "$file" ]]; then fi for selection in clipboard primary; do - if type -p xsel >/dev/null 2>&1; then - xsel --logfile /dev/null -i --"$selection" < "$file" - else - xclip -sel "$selection" < "$file" - fi + xsel --logfile /dev/null -i --"$selection" < "$file" done diff --git a/clipmenud b/clipmenud index a978a3d..c044665 100755 --- a/clipmenud +++ b/clipmenud @@ -55,13 +55,7 @@ declare -A last_filename while sleep "${CLIPMENUD_SLEEP:-0.5}"; do for selection in clipboard primary; do - if type -p xsel >/dev/null 2>&1; then - debug 'Using xsel' - data=$(xsel --logfile /dev/null -o --"$selection"; printf x) - else - debug 'Using xclip' - data=$(xclip -o -sel "$selection"; printf x) - fi + data=$(xsel --logfile /dev/null -o --"$selection"; printf x) debug "Data before stripping: $data" @@ -114,11 +108,7 @@ while sleep "${CLIPMENUD_SLEEP:-0.5}"; do # We can't colocate this with the above copying code because # https://github.com/cdown/clipmenu/issues/34 requires knowing if # we would skip first. - if type -p xsel >/dev/null 2>&1; then - xsel --logfile /dev/null -o --"$selection" | xsel -i --"$selection" - else - xclip -o -sel "$selection" | xclip -i -sel "$selection" - fi + xsel --logfile /dev/null -o --"$selection" | xsel -i --"$selection" fi done done diff --git a/tests/test-perf b/tests/test-perf index fca39ac..bc75d5a 100755 --- a/tests/test-perf +++ b/tests/test-perf @@ -35,7 +35,6 @@ shopt -s expand_aliases alias dmenu=: alias xsel=: -alias xclip=: EOF