Style fixes and shorter command lookup

plugins/cask/cask.plugin.zsh

@@ -1,21 +1,26 @@
 () {
-  if which cask &> /dev/null; then
+  emulate -L zsh
-    local cask_bin cask_base f comp_files
+
-    cask_bin=$(which cask)
+  if ! (( $+commands[cask] )); then
-    cask_base=${cask_bin:h:h}
+    print "zsh cask plugin: cask command not found" >&2
-    # Plain cask installation location (for Cask 0.7.2 and earlier)
+    return
-    comp_files=( $cask_base/etc/cask_completion.zsh )
+  fi
-    # Mac Homebrew installs the completion in a different location
+
-    if which brew &> /dev/null; then
+  cask_base=${commands[cask]:h:h}
-      comp_files+=`brew --prefix`/share/zsh/site-functions/cask_completion.zsh
+
-    fi
+  # Plain cask installation location (for Cask 0.7.2 and earlier)
-    for f in $comp_files; do
+  comp_files=($cask_base/etc/cask_completion.zsh)
-      if [[ -f $f ]]; then
+
-        source $f;
+  # Mac Homebrew installs the completion in a different location
-        break;
+  if (( $+commands[brew] )); then
-      fi
+    comp_files+=($(brew --prefix)/share/zsh/site-functions/cask_completion.zsh)
-    done
-  else
-    print "zsh cask plugin: cask not found"
   fi
-}
+
+  # Load first found file
+  for f in $comp_files; do
+    if [[ -f "$f" ]]; then
+      source "$f"
+      break
+    fi
+  done
+}