clipboard: Reduce unnecessary special-casing on stdin

Ideally the parameter would just be removed-users could always just do "clipcopy < some-file". but removing the parameter would break backwards compatibility. In any case, this simplifies the logic considerably.

clipboard: Reduce unnecessary special-casing on stdin
d8555476 · Robert Estelle · 29fb617e · d8555476
Commit d8555476 authored Jul 12, 2019 by Robert Estelle
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 21 deletions

clipboard.zsh lib/clipboard.zsh +6 -21

No files found.
--- a/lib/clipboard.zsh
+++ b/lib/clipboard.zsh
@@ -17,32 +17,17 @@
 #
 function clipcopy() {
  emulate -L zsh
-  local file=$1
+  local file="${1:-/dev/stdin}"
  if [[ $OSTYPE == darwin* ]]; then
-    if [[ -z $file ]]; then
+    pbcopy < "${file}"
-      pbcopy
-    else
-      cat $file | pbcopy
-    fi
  elif [[ $OSTYPE == cygwin* ]]; then
-    if [[ -z $file ]]; then
+    cat "${file}" > /dev/clipboard
-      cat > /dev/clipboard
-    else
-      cat $file > /dev/clipboard
-    fi
  else
    if (( $+commands[xclip] )); then
-      if [[ -z $file ]]; then
+      xclip -in -selection clipboard < "${file}"
-        xclip -in -selection clipboard
-      else
-        xclip -in -selection clipboard $file
-      fi
    elif (( $+commands[xsel] )); then
-      if [[ -z $file ]]; then
+      xsel --clipboard --input  < "${file}"
-        xsel --clipboard --input 
-      else
-        cat "$file" | xsel --clipboard --input
-      fi
    else
      print "clipcopy: Platform $OSTYPE not supported or xclip/xsel not installed" >&2
      return 1