summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorHong <hong@topbug.net>2016-10-10 14:01:37 -0700
committerMarc Cornellà <marc.cornella@live.com>2016-10-10 23:01:37 +0200
commitf7d4f985ac391e4532a5e6331e0c296fad4a913c (patch)
treec041d6abeff3ef467fb81df76bd5d03360b6e05b /lib
parenta56eac7a71a774a4d97bb9456f36b8eb495329d5 (diff)
downloadzsh-f7d4f985ac391e4532a5e6331e0c296fad4a913c.tar.gz
zsh-f7d4f985ac391e4532a5e6331e0c296fad4a913c.tar.bz2
zsh-f7d4f985ac391e4532a5e6331e0c296fad4a913c.zip
Use $+commands to check the existence of a command in clipboard.zsh. (#5519)
Diffstat (limited to 'lib')
-rw-r--r--lib/clipboard.zsh8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/clipboard.zsh b/lib/clipboard.zsh
index b663800a4..2c93d1bb5 100644
--- a/lib/clipboard.zsh
+++ b/lib/clipboard.zsh
@@ -31,13 +31,13 @@ function clipcopy() {
cat $file > /dev/clipboard
fi
else
- if which xclip &>/dev/null; then
+ if (( $+commands[xclip] )); then
if [[ -z $file ]]; then
xclip -in -selection clipboard
else
xclip -in -selection clipboard $file
fi
- elif which xsel &>/dev/null; then
+ elif (( $+commands[xsel] )); then
if [[ -z $file ]]; then
xsel --clipboard --input
else
@@ -74,9 +74,9 @@ function clippaste() {
elif [[ $OSTYPE == cygwin* ]]; then
cat /dev/clipboard
else
- if which xclip &>/dev/null; then
+ if (( $+commands[xclip] )); then
xclip -out -selection clipboard
- elif which xsel &>/dev/null; then
+ elif (( $+commands[xsel] )); then
xsel --clipboard --output
else
print "clipcopy: Platform $OSTYPE not supported or xclip/xsel not installed" >&2