From 98a828351180f096a9a14e22b41cbeab850c1b2a Mon Sep 17 00:00:00 2001
From: Felix Sonntag <sonntag@in.tum.de>
Date: Fri, 16 Jan 2015 14:37:18 +0100
Subject: [PATCH 1/3] added osx plugin

---
 plugins/README.markdown         |   1 +
 plugins/osx/OSX-README.markdown |  17 ++++++
 plugins/osx/osx.load            | 104 ++++++++++++++++++++++++++++++++
 3 files changed, 122 insertions(+)
 create mode 100644 plugins/osx/OSX-README.markdown
 create mode 100644 plugins/osx/osx.load

diff --git a/plugins/README.markdown b/plugins/README.markdown
index b815c98..ba89093 100644
--- a/plugins/README.markdown
+++ b/plugins/README.markdown
@@ -22,6 +22,7 @@
 * __node__ – Adds locally installed NodeJS `npm` binary executable modules to the path.
 * __percol__ – Browse your fish history with [percol](https://github.com/mooz/percol).
 * __peco__ – Browse your fish history with [peco](https://github.com/peco/peco).
+* __osx__ - Integration with Finder and iTunes.
 * __php__ – Manage phphttp server.
 * __plenv__ – [plenv](https://github.com/tokuhirom/plenv) Perl binary manager integration.
 * __pyenv__ – [Simple Python Version Management](https://github.com/yyuu/pyenv) integration.
diff --git a/plugins/osx/OSX-README.markdown b/plugins/osx/OSX-README.markdown
new file mode 100644
index 0000000..172661e
--- /dev/null
+++ b/plugins/osx/OSX-README.markdown
@@ -0,0 +1,17 @@
+osx
+---
+
+**Maintainer:** [cykeb](https://github.com/CYKEB)
+
+Inspired by the oh-my-zsh plugin by [sorin-ionescu](https://github.com/sorin-ionescu)
+https://github.com/robbyrussell/oh-my-zsh/blob/master/plugins/osx/osx.plugin.zsh
+
+- `tab` - open the current directory in a new tab
+- `pfd` - return the path of the frontmost Finder window
+- `pfs` - return the current Finder selection
+- `cdf` - cd to the current Finder directory
+- `pushdf` - pushd to the current Finder directory
+- `ql` - Quick Look a specified file
+- `manp` - open a specified man page in Preview
+- `trash` - move a specified file to the Trash
+- `itunes` - play, pause etc. iTunes
diff --git a/plugins/osx/osx.load b/plugins/osx/osx.load
new file mode 100644
index 0000000..79b9292
--- /dev/null
+++ b/plugins/osx/osx.load
@@ -0,0 +1,104 @@
+# ------------------------------------------------------------------------------
+#          FILE:  osx.fish
+#   DESCRIPTION:  oh-my-fish plugin file.
+#        AUTHOR:  Felix Sonntag
+#       VERSION:  1.0
+#       COMMENT:  Inspired by the oh-my-zsh plugin by Sorin Ionescu (sorin.ionescu@gmail.com)
+#                 https://github.com/robbyrussell/oh-my-zsh/blob/master/plugins/osx/osx.plugin.zsh
+# ------------------------------------------------------------------------------
+
+
+function tab
+  osascript 2>/dev/null -e '
+      tell application "System Events"
+        tell process "Terminal" to keystroke "t" using command down
+      end tell'
+end
+
+function pfd
+  osascript 2>/dev/null -e '
+      tell application "Finder"
+        return POSIX path of (target of window 1 as alias)
+      end tell'
+end
+
+function cdf
+  cd (pfd)
+end
+
+function pushdf
+  pushd (pfd)
+end
+
+function ql
+  if count $argv > 0
+    qlmanage >/dev/null ^/dev/null -p Applications/ &
+  end
+end
+
+function manp
+  man -t $argv | open -f -a Preview
+end
+
+function trash
+  set -l trash_dir "$HOME/.Trash"
+  for item in $argv
+    if test -e $item
+      set -l item_name (basename $item)
+      if test -e "$trash_dir/$item_name"
+        set -l currentTime (date "+%H.%M.%S")
+        mv -f "$item" "$trash_dir/$item_name $currentTime"
+      else
+        mv -f "$item" "$trash_dir/"
+      end
+    end
+  end
+end
+
+function pfs
+  osascript 2>/dev/null -e '
+      set output to ""
+      tell application "Finder" to set the_selection to selection
+      set item_count to count the_selection
+      repeat with item_index from 1 to count the_selection
+        if item_index is less than item_count then set the_delimiter to "\n"
+        if item_index is item_count then set the_delimiter to ""
+        set output to output & ((item item_index of the_selection as alias)\'s POSIX path) & the_delimiter
+      end repeat'
+end
+
+
+function itunes
+  set -l opt $argv[1]
+  switch $opt
+    case launch play pause stop rewind resume quit
+      ;;
+    case mute
+      set opt "set mute to true"
+      ;;
+    case unmute
+      set opt "set mute to false"
+      ;;
+    case next previous
+      set opt "$opt track"
+      ;;
+    case vol volume
+      set opt "set sound volume to $argv[2]"
+      ;;
+    case "" -h --help
+      return 0
+      ;;
+    case '*'
+      echo "Usage: itunes <option>"
+      echo "option:"
+      echo \t"launch|play|pause|stop|rewind|resume|quit"
+      echo \t"mute|unmute\tcontrol volume set"
+      echo \t"next|previous\tplay next or previous track"
+      echo \t"shuf|shuffle [on|off|toggle]"\t"Set shuffled playback. Default: toggle. Note: toggle doesn't support the MiniPlayer."
+      echo \t"vol"\t"Set the volume, takes an argument from 0 to 100"
+      echo \t"help"\t"show this message and exit"
+      return 1
+      ;;
+  end
+  osascript -e "tell application \"iTunes\" to $opt"
+end

From d4acc8148a072334f53e0aefda9c890775eb792e Mon Sep 17 00:00:00 2001
From: Felix Sonntag <sonntag@in.tum.de>
Date: Sat, 17 Jan 2015 01:34:24 +0100
Subject: [PATCH 2/3] osx plugin: added descriptions, split up files, minor
 changes

---
 plugins/osx/OSX-README.markdown |  12 ++--
 plugins/osx/cdf.fish            |  12 ++++
 plugins/osx/itunes.fish         |  36 +++++++++++
 plugins/osx/manp.fish           |  12 ++++
 plugins/osx/osx.load            | 104 --------------------------------
 plugins/osx/pfd.fish            |  15 +++++
 plugins/osx/pfs.fish            |  20 ++++++
 plugins/osx/pushdf.fish         |  12 ++++
 plugins/osx/ql.fish             |  14 +++++
 plugins/osx/tab.fish            |  14 +++++
 plugins/osx/trash.fish          |  23 +++++++
 11 files changed, 164 insertions(+), 110 deletions(-)
 create mode 100644 plugins/osx/cdf.fish
 create mode 100644 plugins/osx/itunes.fish
 create mode 100644 plugins/osx/manp.fish
 delete mode 100644 plugins/osx/osx.load
 create mode 100644 plugins/osx/pfd.fish
 create mode 100644 plugins/osx/pfs.fish
 create mode 100644 plugins/osx/pushdf.fish
 create mode 100644 plugins/osx/ql.fish
 create mode 100644 plugins/osx/tab.fish
 create mode 100644 plugins/osx/trash.fish

diff --git a/plugins/osx/OSX-README.markdown b/plugins/osx/OSX-README.markdown
index 172661e..2fda50d 100644
--- a/plugins/osx/OSX-README.markdown
+++ b/plugins/osx/OSX-README.markdown
@@ -6,12 +6,12 @@ osx
 Inspired by the oh-my-zsh plugin by [sorin-ionescu](https://github.com/sorin-ionescu)
 https://github.com/robbyrussell/oh-my-zsh/blob/master/plugins/osx/osx.plugin.zsh
 
-- `tab` - open the current directory in a new tab
-- `pfd` - return the path of the frontmost Finder window
-- `pfs` - return the current Finder selection
+- `tab` - Open the current directory in a new tab
+- `pfd` - Return the path of the frontmost Finder window
+- `pfs` - Return the current Finder selection
 - `cdf` - cd to the current Finder directory
 - `pushdf` - pushd to the current Finder directory
 - `ql` - Quick Look a specified file
-- `manp` - open a specified man page in Preview
-- `trash` - move a specified file to the Trash
-- `itunes` - play, pause etc. iTunes
+- `manp` - Open a specified man page in Preview
+- `trash` - Move a specified file to the Trash
+- `itunes` - Play, pause etc. iTunes
diff --git a/plugins/osx/cdf.fish b/plugins/osx/cdf.fish
new file mode 100644
index 0000000..fc0d80a
--- /dev/null
+++ b/plugins/osx/cdf.fish
@@ -0,0 +1,12 @@
+# cd to the current Finder directory
+
+function cdf
+	if count $argv >/dev/null
+    switch $argv[1]
+      case -d --description
+        echo "cd to the current Finder directory"
+        return 0
+    end
+  end
+  cd (pfd)
+end
\ No newline at end of file
diff --git a/plugins/osx/itunes.fish b/plugins/osx/itunes.fish
new file mode 100644
index 0000000..2262b14
--- /dev/null
+++ b/plugins/osx/itunes.fish
@@ -0,0 +1,36 @@
+# Play, pause etc. iTunes
+
+function itunes
+  if count $argv >/dev/null
+    set -l opt $argv[1]
+    switch $opt
+      case -d --description
+        echo "Play, pause etc. iTunes. Use -h or --help for a more detailed description."
+        return 0
+      case launch play pause stop rewind resume quit      
+      case mute
+        set opt "set mute to true"      
+      case unmute
+        set opt "set mute to false"      
+      case next previous
+        set opt "$opt track"      
+      case vol volume
+        set opt "set sound volume to $argv[2]"      
+      case "" -h --help
+        echo "Usage: itunes <option>"
+        echo "option:"
+        echo \t"launch|play|pause|stop|rewind|resume|quit"
+        echo \t"mute|unmute\tcontrol volume set"
+        echo \t"next|previous\tplay next or previous track"
+        echo \t"vol"\t"Set the volume, takes an argument from 0 to 100"
+        echo \t"help"\t"show this message and exit"
+        return 0      
+      case '*'
+        echo "Unknown option $opt. Use -h or --help for a more detailed description."
+        return 1      
+    end
+    osascript -e "tell application \"iTunes\" to $opt"
+  else
+    echo "Arguments expected. Use -h or --help for a more detailed description."
+  end
+end
\ No newline at end of file
diff --git a/plugins/osx/manp.fish b/plugins/osx/manp.fish
new file mode 100644
index 0000000..37c3289
--- /dev/null
+++ b/plugins/osx/manp.fish
@@ -0,0 +1,12 @@
+# Open a specified man page in Preview
+
+function manp
+  if count $argv >/dev/null
+    switch $argv[1]
+      case -d --description
+        echo "Open a specified man page in Preview"
+        return 0
+    end
+  end
+  man -t $argv | open -f -a Preview
+end
\ No newline at end of file
diff --git a/plugins/osx/osx.load b/plugins/osx/osx.load
deleted file mode 100644
index 79b9292..0000000
--- a/plugins/osx/osx.load
+++ /dev/null
@@ -1,104 +0,0 @@
-# ------------------------------------------------------------------------------
-#          FILE:  osx.fish
-#   DESCRIPTION:  oh-my-fish plugin file.
-#        AUTHOR:  Felix Sonntag
-#       VERSION:  1.0
-#       COMMENT:  Inspired by the oh-my-zsh plugin by Sorin Ionescu (sorin.ionescu@gmail.com)
-#                 https://github.com/robbyrussell/oh-my-zsh/blob/master/plugins/osx/osx.plugin.zsh
-# ------------------------------------------------------------------------------
-
-
-function tab
-  osascript 2>/dev/null -e '
-      tell application "System Events"
-        tell process "Terminal" to keystroke "t" using command down
-      end tell'
-end
-
-function pfd
-  osascript 2>/dev/null -e '
-      tell application "Finder"
-        return POSIX path of (target of window 1 as alias)
-      end tell'
-end
-
-function cdf
-  cd (pfd)
-end
-
-function pushdf
-  pushd (pfd)
-end
-
-function ql
-  if count $argv > 0
-    qlmanage >/dev/null ^/dev/null -p Applications/ &
-  end
-end
-
-function manp
-  man -t $argv | open -f -a Preview
-end
-
-function trash
-  set -l trash_dir "$HOME/.Trash"
-  for item in $argv
-    if test -e $item
-      set -l item_name (basename $item)
-      if test -e "$trash_dir/$item_name"
-        set -l currentTime (date "+%H.%M.%S")
-        mv -f "$item" "$trash_dir/$item_name $currentTime"
-      else
-        mv -f "$item" "$trash_dir/"
-      end
-    end
-  end
-end
-
-function pfs
-  osascript 2>/dev/null -e '
-      set output to ""
-      tell application "Finder" to set the_selection to selection
-      set item_count to count the_selection
-      repeat with item_index from 1 to count the_selection
-        if item_index is less than item_count then set the_delimiter to "\n"
-        if item_index is item_count then set the_delimiter to ""
-        set output to output & ((item item_index of the_selection as alias)\'s POSIX path) & the_delimiter
-      end repeat'
-end
-
-
-function itunes
-  set -l opt $argv[1]
-  switch $opt
-    case launch play pause stop rewind resume quit
-      ;;
-    case mute
-      set opt "set mute to true"
-      ;;
-    case unmute
-      set opt "set mute to false"
-      ;;
-    case next previous
-      set opt "$opt track"
-      ;;
-    case vol volume
-      set opt "set sound volume to $argv[2]"
-      ;;
-    case "" -h --help
-      return 0
-      ;;
-    case '*'
-      echo "Usage: itunes <option>"
-      echo "option:"
-      echo \t"launch|play|pause|stop|rewind|resume|quit"
-      echo \t"mute|unmute\tcontrol volume set"
-      echo \t"next|previous\tplay next or previous track"
-      echo \t"shuf|shuffle [on|off|toggle]"\t"Set shuffled playback. Default: toggle. Note: toggle doesn't support the MiniPlayer."
-      echo \t"vol"\t"Set the volume, takes an argument from 0 to 100"
-      echo \t"help"\t"show this message and exit"
-      return 1
-      ;;
-  end
-  osascript -e "tell application \"iTunes\" to $opt"
-end
diff --git a/plugins/osx/pfd.fish b/plugins/osx/pfd.fish
new file mode 100644
index 0000000..7ddb5f2
--- /dev/null
+++ b/plugins/osx/pfd.fish
@@ -0,0 +1,15 @@
+# Return the path of the frontmost Finder window
+
+function pfd
+  if count $argv >/dev/null
+    switch $argv[1]
+      case -d --description
+        echo "Return the path of the frontmost Finder window"
+        return 0
+    end
+  end
+  osascript 2>/dev/null -e '
+      tell application "Finder"
+        return POSIX path of (target of window 1 as alias)
+      end tell'
+end
\ No newline at end of file
diff --git a/plugins/osx/pfs.fish b/plugins/osx/pfs.fish
new file mode 100644
index 0000000..f7f9a51
--- /dev/null
+++ b/plugins/osx/pfs.fish
@@ -0,0 +1,20 @@
+# Return the path of the frontmost Finder window
+
+function pfs
+  if count $argv >/dev/null
+    switch $argv[1]
+      case -d --description
+        echo "Return the path of the frontmost Finder window"
+        return 0
+    end
+  end
+  osascript 2>/dev/null -e '
+      set output to ""
+      tell application "Finder" to set the_selection to selection
+      set item_count to count the_selection
+      repeat with item_index from 1 to count the_selection
+        if item_index is less than item_count then set the_delimiter to "\n"
+        if item_index is item_count then set the_delimiter to ""
+        set output to output & ((item item_index of the_selection as alias)\'s POSIX path) & the_delimiter
+      end repeat'
+end
\ No newline at end of file
diff --git a/plugins/osx/pushdf.fish b/plugins/osx/pushdf.fish
new file mode 100644
index 0000000..2e6f8a8
--- /dev/null
+++ b/plugins/osx/pushdf.fish
@@ -0,0 +1,12 @@
+# pushd to the current Finder directory
+
+function pushdf
+  if count $argv >/dev/null
+    switch $argv[1]
+      case -d --description
+        echo "pushd to the current Finder directory"
+        return 0
+    end
+  end
+  pushd (pfd)
+end
\ No newline at end of file
diff --git a/plugins/osx/ql.fish b/plugins/osx/ql.fish
new file mode 100644
index 0000000..85c3164
--- /dev/null
+++ b/plugins/osx/ql.fish
@@ -0,0 +1,14 @@
+# Quick Look a specified file
+
+function ql
+  if count $argv >/dev/null
+    switch $argv[1]
+      case -d --description
+        echo "Quick Look a specified file"
+        return 0
+    end
+  end
+  if count $argv > 0
+    qlmanage >/dev/null ^/dev/null -p Applications/ &
+  end
+end
\ No newline at end of file
diff --git a/plugins/osx/tab.fish b/plugins/osx/tab.fish
new file mode 100644
index 0000000..ceda6af
--- /dev/null
+++ b/plugins/osx/tab.fish
@@ -0,0 +1,14 @@
+# Open the current directory in a new tab
+function tab
+  if count $argv >/dev/null
+    switch $argv[1]
+      case -d --description
+        echo "Open the current directory in a new tab"
+        return 0
+    end
+  end
+  osascript 2>/dev/null -e '
+      tell application "System Events"
+        tell process "Terminal" to keystroke "t" using command down
+      end tell'
+end
diff --git a/plugins/osx/trash.fish b/plugins/osx/trash.fish
new file mode 100644
index 0000000..19a49a7
--- /dev/null
+++ b/plugins/osx/trash.fish
@@ -0,0 +1,23 @@
+# Move a specified file to the Trash
+
+function trash
+  if count $argv >/dev/null
+    switch $argv[1]
+      case -d --description
+        echo "Move a specified file to the Trash"
+        return 0
+    end
+  end
+  set -l trash_dir "$HOME/.Trash"
+  for item in $argv
+    if test -e $item
+      set -l item_name (basename $item)
+      if test -e "$trash_dir/$item_name"
+        set -l current_time (date "+%H.%M.%S")
+        mv -f "$item" "$trash_dir/$item_name $current_time"
+      else
+        mv -f "$item" "$trash_dir/"
+      end
+    end
+  end
+end
\ No newline at end of file

From 39f54c28050a924670d631b3fa6d05c04d6d49e8 Mon Sep 17 00:00:00 2001
From: Felix Sonntag <sonntag@in.tum.de>
Date: Mon, 19 Jan 2015 23:27:48 +0100
Subject: [PATCH 3/3] osx plugin: Updated description implementation, improved
 argument checking

---
 .../{OSX-README.markdown => README.markdown}  |  0
 plugins/osx/cdf.fish                          |  9 +-----
 plugins/osx/itunes.fish                       |  7 ++---
 plugins/osx/manp.fish                         |  9 +-----
 plugins/osx/pfd.fish                          |  9 +-----
 plugins/osx/pfs.fish                          |  9 +-----
 plugins/osx/pushdf.fish                       |  9 +-----
 plugins/osx/ql.fish                           | 13 +++-----
 plugins/osx/tab.fish                          |  9 +-----
 plugins/osx/trash.fish                        | 31 +++++++++----------
 10 files changed, 26 insertions(+), 79 deletions(-)
 rename plugins/osx/{OSX-README.markdown => README.markdown} (100%)

diff --git a/plugins/osx/OSX-README.markdown b/plugins/osx/README.markdown
similarity index 100%
rename from plugins/osx/OSX-README.markdown
rename to plugins/osx/README.markdown
diff --git a/plugins/osx/cdf.fish b/plugins/osx/cdf.fish
index fc0d80a..ec4a8b7 100644
--- a/plugins/osx/cdf.fish
+++ b/plugins/osx/cdf.fish
@@ -1,12 +1,5 @@
 # cd to the current Finder directory
 
-function cdf
-	if count $argv >/dev/null
-    switch $argv[1]
-      case -d --description
-        echo "cd to the current Finder directory"
-        return 0
-    end
-  end
+function cdf -d "cd to the current Finder directory"
   cd (pfd)
 end
\ No newline at end of file
diff --git a/plugins/osx/itunes.fish b/plugins/osx/itunes.fish
index 2262b14..139197c 100644
--- a/plugins/osx/itunes.fish
+++ b/plugins/osx/itunes.fish
@@ -1,12 +1,9 @@
 # Play, pause etc. iTunes
 
-function itunes
-  if count $argv >/dev/null
+function itunes -d "Play, pause etc. iTunes. Use -h or --help for a more detailed description."
+  if [ (count $argv) -gt 0 ]
     set -l opt $argv[1]
     switch $opt
-      case -d --description
-        echo "Play, pause etc. iTunes. Use -h or --help for a more detailed description."
-        return 0
       case launch play pause stop rewind resume quit      
       case mute
         set opt "set mute to true"      
diff --git a/plugins/osx/manp.fish b/plugins/osx/manp.fish
index 37c3289..3899cbb 100644
--- a/plugins/osx/manp.fish
+++ b/plugins/osx/manp.fish
@@ -1,12 +1,5 @@
 # Open a specified man page in Preview
 
-function manp
-  if count $argv >/dev/null
-    switch $argv[1]
-      case -d --description
-        echo "Open a specified man page in Preview"
-        return 0
-    end
-  end
+function manp -d "Open a specified man page in Preview"
   man -t $argv | open -f -a Preview
 end
\ No newline at end of file
diff --git a/plugins/osx/pfd.fish b/plugins/osx/pfd.fish
index 7ddb5f2..974ca7c 100644
--- a/plugins/osx/pfd.fish
+++ b/plugins/osx/pfd.fish
@@ -1,13 +1,6 @@
 # Return the path of the frontmost Finder window
 
-function pfd
-  if count $argv >/dev/null
-    switch $argv[1]
-      case -d --description
-        echo "Return the path of the frontmost Finder window"
-        return 0
-    end
-  end
+function pfd -d "Return the path of the frontmost Finder window"
   osascript 2>/dev/null -e '
       tell application "Finder"
         return POSIX path of (target of window 1 as alias)
diff --git a/plugins/osx/pfs.fish b/plugins/osx/pfs.fish
index f7f9a51..31022e0 100644
--- a/plugins/osx/pfs.fish
+++ b/plugins/osx/pfs.fish
@@ -1,13 +1,6 @@
 # Return the path of the frontmost Finder window
 
-function pfs
-  if count $argv >/dev/null
-    switch $argv[1]
-      case -d --description
-        echo "Return the path of the frontmost Finder window"
-        return 0
-    end
-  end
+function pfs -d "Return the path of the frontmost Finder window"
   osascript 2>/dev/null -e '
       set output to ""
       tell application "Finder" to set the_selection to selection
diff --git a/plugins/osx/pushdf.fish b/plugins/osx/pushdf.fish
index 2e6f8a8..ec81f6f 100644
--- a/plugins/osx/pushdf.fish
+++ b/plugins/osx/pushdf.fish
@@ -1,12 +1,5 @@
 # pushd to the current Finder directory
 
-function pushdf
-  if count $argv >/dev/null
-    switch $argv[1]
-      case -d --description
-        echo "pushd to the current Finder directory"
-        return 0
-    end
-  end
+function pushdf -d "pushd to the current Finder directory"
   pushd (pfd)
 end
\ No newline at end of file
diff --git a/plugins/osx/ql.fish b/plugins/osx/ql.fish
index 85c3164..fa52c4f 100644
--- a/plugins/osx/ql.fish
+++ b/plugins/osx/ql.fish
@@ -1,14 +1,9 @@
 # Quick Look a specified file
 
-function ql
-  if count $argv >/dev/null
-    switch $argv[1]
-      case -d --description
-        echo "Quick Look a specified file"
-        return 0
-    end
-  end
-  if count $argv > 0
+function ql -d "Quick Look a specified file"
+  if [ (count $argv) -gt 0 ]
     qlmanage >/dev/null ^/dev/null -p Applications/ &
+  else
+    echo "No file or folder as argument given"
   end
 end
\ No newline at end of file
diff --git a/plugins/osx/tab.fish b/plugins/osx/tab.fish
index ceda6af..0b73e4a 100644
--- a/plugins/osx/tab.fish
+++ b/plugins/osx/tab.fish
@@ -1,12 +1,5 @@
 # Open the current directory in a new tab
-function tab
-  if count $argv >/dev/null
-    switch $argv[1]
-      case -d --description
-        echo "Open the current directory in a new tab"
-        return 0
-    end
-  end
+function tab -d "Open the current directory in a new tab"
   osascript 2>/dev/null -e '
       tell application "System Events"
         tell process "Terminal" to keystroke "t" using command down
diff --git a/plugins/osx/trash.fish b/plugins/osx/trash.fish
index 19a49a7..bf13a03 100644
--- a/plugins/osx/trash.fish
+++ b/plugins/osx/trash.fish
@@ -1,23 +1,20 @@
 # Move a specified file to the Trash
 
-function trash
-  if count $argv >/dev/null
-    switch $argv[1]
-      case -d --description
-        echo "Move a specified file to the Trash"
-        return 0
-    end
-  end
-  set -l trash_dir "$HOME/.Trash"
-  for item in $argv
-    if test -e $item
-      set -l item_name (basename $item)
-      if test -e "$trash_dir/$item_name"
-        set -l current_time (date "+%H.%M.%S")
-        mv -f "$item" "$trash_dir/$item_name $current_time"
-      else
-        mv -f "$item" "$trash_dir/"
+function trash -d "Move a specified file to the Trash"
+  if [ (count $argv) -gt 0 ]
+    set -l trash_dir "$HOME/.Trash"
+    for item in $argv
+      if test -e $item
+        set -l item_name (basename $item)
+        if test -e "$trash_dir/$item_name"
+          set -l current_time (date "+%H.%M.%S")
+          mv -f "$item" "$trash_dir/$item_name $current_time"
+        else
+          mv -f "$item" "$trash_dir/"
+        end
       end
     end
+  else
+    echo "No file(s) given to delete"
   end
 end
\ No newline at end of file