Skip to content

O
oh-my-zsh
Commit f7d4f985 authored by Hong's avatar Hong Committed by Marc Cornellà
Browse files
Options

Use $+commands to check the existence of a command in clipboard.zsh. (#5519)

parent a56eac7a
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
lib/clipboard.zsh
View file @ f7d4f985
...@@ -31,13 +31,13 @@ function clipcopy() { ...@@ -31,13 +31,13 @@ function clipcopy() {
cat $file > /dev/clipboard cat $file > /dev/clipboard
fi fi
else else
if which xclip &>/dev/null; then if (( $+commands[xclip] )); then
if [[ -z $file ]]; then if [[ -z $file ]]; then
xclip -in -selection clipboard xclip -in -selection clipboard
else else
xclip -in -selection clipboard $file xclip -in -selection clipboard $file
fi fi
elif which xsel &>/dev/null; then elif (( $+commands[xsel] )); then
if [[ -z $file ]]; then if [[ -z $file ]]; then
xsel --clipboard --input xsel --clipboard --input
else else
...@@ -74,9 +74,9 @@ function clippaste() { ...@@ -74,9 +74,9 @@ function clippaste() {
elif [[ $OSTYPE == cygwin* ]]; then elif [[ $OSTYPE == cygwin* ]]; then
cat /dev/clipboard cat /dev/clipboard
else else
if which xclip &>/dev/null; then if (( $+commands[xclip] )); then
xclip -out -selection clipboard xclip -out -selection clipboard
elif which xsel &>/dev/null; then elif (( $+commands[xsel] )); then
xsel --clipboard --output xsel --clipboard --output
else else
print "clipcopy: Platform $OSTYPE not supported or xclip/xsel not installed" >&2 print "clipcopy: Platform $OSTYPE not supported or xclip/xsel not installed" >&2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment