From 5d90f58b37fd67184c4aed3d81a1d3703f8fe832 Mon Sep 17 00:00:00 2001
From: Tristan Carel <tcarel@exalead.com>
Date: Wed, 13 Apr 2011 20:21:13 +0200
Subject: [PATCH 001/364] I should not have merged this here.

---
 plugins/git-svn/.gitignore         |  1 -
 plugins/git-svn/git-svn.plugin.zsh | 10 ----------
 2 files changed, 11 deletions(-)
 delete mode 100644 plugins/git-svn/.gitignore
 delete mode 100644 plugins/git-svn/git-svn.plugin.zsh

diff --git a/plugins/git-svn/.gitignore b/plugins/git-svn/.gitignore
deleted file mode 100644
index bf5e1a14f..000000000
--- a/plugins/git-svn/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-git-svn-clone-externals
diff --git a/plugins/git-svn/git-svn.plugin.zsh b/plugins/git-svn/git-svn.plugin.zsh
deleted file mode 100644
index 062d63e05..000000000
--- a/plugins/git-svn/git-svn.plugin.zsh
+++ /dev/null
@@ -1,10 +0,0 @@
-
-if ! [ -d "$ZSH/plugins/git-svn/git-svn-clone-externals" ] ;then
-    git clone https://github.com/andrep/git-svn-clone-externals.git
-fi
-export PATH="$ZSH/plugins/git-svn/git-svn-clone-externals:$PATH"
-
-function git_svn_update {
-    (cd "$ZSH/plugins/git-svn/git-svn-clone-externals" && \
-        git pull origin master)
-}

From a183bcbc6d8d61bd9c1077b45d1c5b3239e96a71 Mon Sep 17 00:00:00 2001
From: Tristan Carel <tristan.carel@gmail.com>
Date: Thu, 14 Apr 2011 07:17:10 +0200
Subject: [PATCH 002/364] More comments

---
 plugins/emacs/emacs.plugin.zsh | 25 ++++++++++++++++++++++---
 plugins/emacs/emacsclient.sh   |  1 +
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/plugins/emacs/emacs.plugin.zsh b/plugins/emacs/emacs.plugin.zsh
index bca79e70e..62d9fbccc 100644
--- a/plugins/emacs/emacs.plugin.zsh
+++ b/plugins/emacs/emacs.plugin.zsh
@@ -1,11 +1,30 @@
-# Use daemon capabilities of emacs 23
+# Emacs 23 daemon capability is a killing feature.
+# One emacs process handles all your frames whether
+# you use a frame opened in a terminal via a ssh connection or X frames 
+# opened on the same host.
+
+# Benefits are multiple
+# - You don't have the cost of starting Emacs all the time anymore
+# - Opening a file is as fast as Emacs does not have anything else to do.
+# - You can share opened buffered across opened frames.
+# - Configuration changes made at runtime are applied to all frames.
+
+
 if "$ZSH/tools/require_tool.sh" emacs 23 2>/dev/null ; then
     export EDITOR="$ZSH/plugins/emacs/emacsclient.sh"
     alias emacs="$EDITOR --no-wait"
     alias e=emacs
 
+    # same than M-x eval but from outside Emacs.
+    alias eeval="emacs --eval"
+    # create a new X frame
+    alias eframe='emacsclient --alternate-editor "" --create-frame'
+
+    # to code all night long
     alias emasc=emacs
     alias emcas=emacs
-    # create a new X frame
-    alias emacs_frame='emacsclient --alternate-editor "" --create-frame'
 fi
+
+## Local Variables:
+## mode: sh
+## End:
diff --git a/plugins/emacs/emacsclient.sh b/plugins/emacs/emacsclient.sh
index 3475926a6..b098fd24a 100755
--- a/plugins/emacs/emacsclient.sh
+++ b/plugins/emacs/emacsclient.sh
@@ -6,5 +6,6 @@ x=`emacsclient --alternate-editor '' --eval '(x-display-list)' 2>/dev/null`
 if [ -z "$x" ] ;then
     emacsclient --alternate-editor "" --create-frame $@
 else
+    # prevent creating another X frame if there is at least one present.
     emacsclient --alternate-editor "" $@
 fi

From 49c0a1381a7bd48464a1c33cac6e09770749f795 Mon Sep 17 00:00:00 2001
From: Tristan Carel <tcarel@exalead.com>
Date: Fri, 15 Apr 2011 18:13:01 +0200
Subject: [PATCH 003/364] - Fix pass of parameters - Add new function `ecd'.

---
 plugins/emacs/emacs.plugin.zsh | 18 +++++++++++++++++-
 plugins/emacs/emacsclient.sh   |  4 ++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/plugins/emacs/emacs.plugin.zsh b/plugins/emacs/emacs.plugin.zsh
index 62d9fbccc..58043040e 100644
--- a/plugins/emacs/emacs.plugin.zsh
+++ b/plugins/emacs/emacs.plugin.zsh
@@ -1,6 +1,6 @@
 # Emacs 23 daemon capability is a killing feature.
 # One emacs process handles all your frames whether
-# you use a frame opened in a terminal via a ssh connection or X frames 
+# you use a frame opened in a terminal via a ssh connection or X frames
 # opened on the same host.
 
 # Benefits are multiple
@@ -23,8 +23,24 @@ if "$ZSH/tools/require_tool.sh" emacs 23 2>/dev/null ; then
     # to code all night long
     alias emasc=emacs
     alias emcas=emacs
+
+    # jump to the directory of the current buffer
+    function ecd {
+        local cmd="(let ((buf-name (buffer-file-name (window-buffer))))
+               (if buf-name
+                 (file-name-directory buf-name)))"
+
+        local dir=`$EDITOR --eval "$cmd" | tr -d \"`
+        if [ -n "$dir" ] ;then
+            cd "$dir"
+        else
+            echo "can not deduce current buffer filename." >/dev/stderr
+            return 1
+        fi
+    }
 fi
 
+
 ## Local Variables:
 ## mode: sh
 ## End:
diff --git a/plugins/emacs/emacsclient.sh b/plugins/emacs/emacsclient.sh
index b098fd24a..7fc2ad202 100755
--- a/plugins/emacs/emacsclient.sh
+++ b/plugins/emacs/emacsclient.sh
@@ -4,8 +4,8 @@
 
 x=`emacsclient --alternate-editor '' --eval '(x-display-list)' 2>/dev/null`
 if [ -z "$x" ] ;then
-    emacsclient --alternate-editor "" --create-frame $@
+    emacsclient --alternate-editor "" --create-frame "$@"
 else
     # prevent creating another X frame if there is at least one present.
-    emacsclient --alternate-editor "" $@
+    emacsclient --alternate-editor "" "$@"
 fi

From 9b29136ec65953004f064ec4a834ae7b1f2949e7 Mon Sep 17 00:00:00 2001
From: Tristan Carel <tcarel@exalead.com>
Date: Fri, 15 Apr 2011 18:21:22 +0200
Subject: [PATCH 004/364] Fix alias `eeval'

---
 plugins/emacs/emacs.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/emacs/emacs.plugin.zsh b/plugins/emacs/emacs.plugin.zsh
index 58043040e..fc6b8865e 100644
--- a/plugins/emacs/emacs.plugin.zsh
+++ b/plugins/emacs/emacs.plugin.zsh
@@ -16,7 +16,7 @@ if "$ZSH/tools/require_tool.sh" emacs 23 2>/dev/null ; then
     alias e=emacs
 
     # same than M-x eval but from outside Emacs.
-    alias eeval="emacs --eval"
+    alias eeval="$EDITOR --eval"
     # create a new X frame
     alias eframe='emacsclient --alternate-editor "" --create-frame'
 

From 6f1929f822d24c6cfc9cecf574cb21c6b3817bb5 Mon Sep 17 00:00:00 2001
From: Tristan Carel <tcarel@exalead.com>
Date: Fri, 15 Apr 2011 18:22:27 +0200
Subject: [PATCH 005/364] Fix indentation

---
 plugins/emacs/emacs.plugin.zsh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/emacs/emacs.plugin.zsh b/plugins/emacs/emacs.plugin.zsh
index fc6b8865e..3e45e54d0 100644
--- a/plugins/emacs/emacs.plugin.zsh
+++ b/plugins/emacs/emacs.plugin.zsh
@@ -27,8 +27,7 @@ if "$ZSH/tools/require_tool.sh" emacs 23 2>/dev/null ; then
     # jump to the directory of the current buffer
     function ecd {
         local cmd="(let ((buf-name (buffer-file-name (window-buffer))))
-               (if buf-name
-                 (file-name-directory buf-name)))"
+                     (if buf-name (file-name-directory buf-name)))"
 
         local dir=`$EDITOR --eval "$cmd" | tr -d \"`
         if [ -n "$dir" ] ;then

From e5f77b8f0496e5915383f2f456f91a20f5ff4ace Mon Sep 17 00:00:00 2001
From: Justin Riley <justin.t.riley@gmail.com>
Date: Thu, 28 Apr 2011 15:05:52 -0400
Subject: [PATCH 006/364] add git-prompt plugin from
 olivierverdier/zsh-git-prompt

---
 plugins/git-prompt/git-prompt.plugin.zsh | 60 +++++++++++++++++++++
 plugins/git-prompt/gitstatus.py          | 68 ++++++++++++++++++++++++
 2 files changed, 128 insertions(+)
 create mode 100644 plugins/git-prompt/git-prompt.plugin.zsh
 create mode 100644 plugins/git-prompt/gitstatus.py

diff --git a/plugins/git-prompt/git-prompt.plugin.zsh b/plugins/git-prompt/git-prompt.plugin.zsh
new file mode 100644
index 000000000..01b8a88d9
--- /dev/null
+++ b/plugins/git-prompt/git-prompt.plugin.zsh
@@ -0,0 +1,60 @@
+# ZSH Git Prompt Plugin from:
+# http://github.com/olivierverdier/zsh-git-prompt
+#
+export __GIT_PROMPT_DIR=$ZSH/plugins/git-prompt
+# Initialize colors.
+autoload -U colors
+colors
+
+# Allow for functions in the prompt.
+setopt PROMPT_SUBST
+
+## Enable auto-execution of functions.
+typeset -ga preexec_functions
+typeset -ga precmd_functions
+typeset -ga chpwd_functions
+
+# Append git functions needed for prompt.
+preexec_functions+='preexec_update_git_vars'
+precmd_functions+='precmd_update_git_vars'
+chpwd_functions+='chpwd_update_git_vars'
+
+## Function definitions
+function preexec_update_git_vars() {
+    case "$2" in
+        git*)
+        __EXECUTED_GIT_COMMAND=1
+        ;;
+    esac
+}
+
+function precmd_update_git_vars() {
+    if [ -n "$__EXECUTED_GIT_COMMAND" ]; then
+        update_current_git_vars
+        unset __EXECUTED_GIT_COMMAND
+    fi
+}
+
+function chpwd_update_git_vars() {
+    update_current_git_vars
+}
+
+function update_current_git_vars() {
+    unset __CURRENT_GIT_STATUS
+
+    local gitstatus="$__GIT_PROMPT_DIR/gitstatus.py"
+    _GIT_STATUS=`python ${gitstatus}`
+    __CURRENT_GIT_STATUS=("${(f)_GIT_STATUS}")
+}
+
+function prompt_git_info() {
+    if [ -n "$__CURRENT_GIT_STATUS" ]; then
+        echo "(%{${fg[red]}%}$__CURRENT_GIT_STATUS[1]%{${fg[default]}%}$__CURRENT_GIT_STATUS[2]%{${fg[magenta]}%}$__CURRENT_GIT_STATUS[3]%{${fg[default]}%})"
+    fi
+}
+
+# Set the prompt.
+#PROMPT='%B%m%~%b$(prompt_git_info) %# '
+# for a right prompt:
+#RPROMPT='%b$(prompt_git_info)'
+RPROMPT='$(prompt_git_info)'
diff --git a/plugins/git-prompt/gitstatus.py b/plugins/git-prompt/gitstatus.py
new file mode 100644
index 000000000..ee6fab9bd
--- /dev/null
+++ b/plugins/git-prompt/gitstatus.py
@@ -0,0 +1,68 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+
+# change those symbols to whatever you prefer
+symbols = {'ahead of': '↑', 'behind': '↓', 'staged':'♦', 'changed':'‣', 'untracked':'…', 'clean':'⚡', 'unmerged':'≠', 'sha1':':'}
+
+from subprocess import Popen, PIPE
+
+output,error = Popen(['git','status'], stdout=PIPE, stderr=PIPE).communicate()
+
+if error:
+	import sys
+	sys.exit(0)
+lines = output.splitlines()
+
+import re
+behead_re = re.compile(r"^# Your branch is (ahead of|behind) '(.*)' by (\d+) commit")
+diverge_re = re.compile(r"^# and have (\d+) and (\d+) different")
+
+status = ''
+staged = re.compile(r'^# Changes to be committed:$', re.MULTILINE)
+changed = re.compile(r'^# Changed but not updated:$', re.MULTILINE)
+untracked = re.compile(r'^# Untracked files:$', re.MULTILINE)
+unmerged = re.compile(r'^# Unmerged paths:$', re.MULTILINE)
+
+def execute(*command):
+	out, err = Popen(stdout=PIPE, stderr=PIPE, *command).communicate()
+	if not err:
+		nb = len(out.splitlines())
+	else:
+		nb = '?'
+	return nb
+
+if staged.search(output):
+	nb = execute(['git','diff','--staged','--name-only','--diff-filter=ACDMRT'])
+	status += '%s%s' % (symbols['staged'], nb)
+if unmerged.search(output):
+	nb = execute(['git','diff', '--staged','--name-only', '--diff-filter=U'])
+	status += '%s%s' % (symbols['unmerged'], nb)
+if changed.search(output):
+	nb = execute(['git','diff','--name-only', '--diff-filter=ACDMRT'])
+	status += '%s%s' % (symbols['changed'], nb)
+if untracked.search(output):
+## 		nb = len(Popen(['git','ls-files','--others','--exclude-standard'],stdout=PIPE).communicate()[0].splitlines())
+## 		status += "%s" % (symbols['untracked']*(nb//3 + 1), )
+	status += symbols['untracked']
+if status == '':
+	status = symbols['clean']
+
+remote = ''
+
+bline = lines[0]
+if bline.find('Not currently on any branch') != -1:
+	branch = symbols['sha1']+ Popen(['git','rev-parse','--short','HEAD'], stdout=PIPE).communicate()[0][:-1]
+else:
+	branch = bline.split(' ')[3]
+	bstatusline = lines[1]
+	match = behead_re.match(bstatusline)
+	if match:
+		remote = symbols[match.groups()[0]]
+		remote += match.groups()[2]
+	elif lines[2:]:
+		div_match = diverge_re.match(lines[2])
+	 	if div_match:
+			remote = "{behind}{1}{ahead of}{0}".format(*div_match.groups(), **symbols)
+
+print '\n'.join([branch,remote,status])
+

From f20cfc68e81be754521672541fd6ff25983f402c Mon Sep 17 00:00:00 2001
From: Randy Hancock <rhancock@genome.wustl.edu>
Date: Mon, 1 Aug 2011 10:10:42 -0500
Subject: [PATCH 007/364] Fix edit-command-line binding

This binding doesn't work when the edit-command-line.zsh file is loaded
after the key-bindings.zsh file because 'bindkey -e' in key-bindings.zsh
resets the binding. Moving the bindings to they key-bindings.zsh file
and removing edit-command-line.zsh.
---
 lib/edit-command-line.zsh | 3 ---
 lib/key-bindings.zsh      | 5 +++++
 2 files changed, 5 insertions(+), 3 deletions(-)
 delete mode 100644 lib/edit-command-line.zsh

diff --git a/lib/edit-command-line.zsh b/lib/edit-command-line.zsh
deleted file mode 100644
index db2000325..000000000
--- a/lib/edit-command-line.zsh
+++ /dev/null
@@ -1,3 +0,0 @@
-autoload -U edit-command-line
-zle -N edit-command-line
-bindkey '\C-x\C-e' edit-command-line
diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
index 9c2dda35a..d9611b557 100644
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@@ -26,6 +26,11 @@ bindkey "^[[3~" delete-char
 bindkey "^[3;5~" delete-char
 bindkey "\e[3~" delete-char
 
+# Edit the current command line in $EDITOR
+autoload -U edit-command-line
+zle -N edit-command-line
+bindkey '\C-x\C-e' edit-command-line
+
 # consider emacs keybindings:
 
 #bindkey -e  ## emacs key bindings

From 574de93efbba22db0ec816ecec717d502dfa333e Mon Sep 17 00:00:00 2001
From: Tristan Carel <tcarel@exalead.com>
Date: Tue, 6 Sep 2011 10:50:53 +0200
Subject: [PATCH 008/364] New function `efile`

---
 plugins/emacs/emacs.plugin.zsh | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/plugins/emacs/emacs.plugin.zsh b/plugins/emacs/emacs.plugin.zsh
index 3e45e54d0..737abe9d6 100644
--- a/plugins/emacs/emacs.plugin.zsh
+++ b/plugins/emacs/emacs.plugin.zsh
@@ -24,14 +24,22 @@ if "$ZSH/tools/require_tool.sh" emacs 23 2>/dev/null ; then
     alias emasc=emacs
     alias emcas=emacs
 
-    # jump to the directory of the current buffer
+    # Write to standard output the path to the file
+    # opened in the current buffer.
+    function efile {
+        local cmd="(buffer-file-name (window-buffer))"
+        $EDITOR --eval "$cmd" | tr -d \"
+    }
+
+    # display the directory of the file
+    # opened in the the current buffer
     function ecd {
         local cmd="(let ((buf-name (buffer-file-name (window-buffer))))
                      (if buf-name (file-name-directory buf-name)))"
 
         local dir=`$EDITOR --eval "$cmd" | tr -d \"`
         if [ -n "$dir" ] ;then
-            cd "$dir"
+            echo "$dir"
         else
             echo "can not deduce current buffer filename." >/dev/stderr
             return 1
@@ -39,7 +47,6 @@ if "$ZSH/tools/require_tool.sh" emacs 23 2>/dev/null ; then
     }
 fi
 
-
 ## Local Variables:
 ## mode: sh
 ## End:

From deb8543bb48eb8bde85e2285ac9ce276113c433b Mon Sep 17 00:00:00 2001
From: "Marco A. Peraza" <marcoaperaza@gmail.com>
Date: Thu, 29 Sep 2011 14:39:09 -0400
Subject: [PATCH 009/364] Show if you're ahead of remote in the wedisagree
 theme

---
 themes/wedisagree.zsh-theme | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/themes/wedisagree.zsh-theme b/themes/wedisagree.zsh-theme
index 7cb27934d..9bdbce40d 100644
--- a/themes/wedisagree.zsh-theme
+++ b/themes/wedisagree.zsh-theme
@@ -25,7 +25,7 @@ PROMPT='%{$fg[magenta]%}[%c] %{$reset_color%}'
 
 # The right-hand prompt
 
-RPROMPT='${time} %{$fg[magenta]%}$(git_prompt_info)%{$reset_color%}$(git_prompt_status)%{$reset_color%}'
+RPROMPT='${time} %{$fg[magenta]%}$(git_prompt_info)%{$reset_color%}$(git_prompt_status)%{$reset_color%}$(git_prompt_ahead)%{$reset_color%}'
 
 # Add this at the start of RPROMPT to include rvm info showing ruby-version@gemset-name
 # %{$fg[yellow]%}$(~/.rvm/bin/rvm-prompt)%{$reset_color%} 
@@ -46,6 +46,7 @@ ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[yellow]%} ⚡"  # ⓜ ⑁
 ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖" # ⓧ ⑂
 ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[blue]%} ➜" # ⓡ ⑄
 ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[magenta]%} ♒" # ⓤ ⑊
+ZSH_THEME_GIT_PROMPT_AHEAD="%{$fg[blue]%} 𝝙"
 
 # More symbols to choose from:
 # ☀ ✹ ☄ ♆ ♀ ♁ ♐ ♇ ♈ ♉ ♚ ♛ ♜ ♝ ♞ ♟ ♠ ♣ ⚢ ⚲ ⚳ ⚴ ⚥ ⚤ ⚦ ⚒ ⚑ ⚐ ♺ ♻ ♼ ☰ ☱ ☲ ☳ ☴ ☵ ☶ ☷
@@ -104,4 +105,4 @@ function git_time_since_commit() {
             echo "($(rvm_gemset)$COLOR~|"
         fi
     fi
-}
\ No newline at end of file
+}

From de29ef809dad9c1a1190a4b670cbb30b8b578f3c Mon Sep 17 00:00:00 2001
From: Jason Whittle <jason.whittle@gmail.com>
Date: Wed, 5 Oct 2011 00:57:48 -0300
Subject: [PATCH 010/364] Change default zshrc to export $ZSH (as required by
 check_for_upgrade.sh).

---
 templates/zshrc.zsh-template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 1ab40aba6..6f0529972 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -1,5 +1,5 @@
 # Path to your oh-my-zsh configuration.
-ZSH=$HOME/.oh-my-zsh
+export ZSH=$HOME/.oh-my-zsh
 
 # Set name of the theme to load.
 # Look in ~/.oh-my-zsh/themes/

From 7066bf7c6b522af9147ebf03c00361c4c6490d42 Mon Sep 17 00:00:00 2001
From: Tristan Carel <tcarel@exalead.com>
Date: Mon, 10 Oct 2011 14:54:20 +0200
Subject: [PATCH 011/364] Fix builtin `ecd' when file path contains space
 characters.

---
 plugins/emacs/emacs.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/emacs/emacs.plugin.zsh b/plugins/emacs/emacs.plugin.zsh
index 737abe9d6..e22f10740 100644
--- a/plugins/emacs/emacs.plugin.zsh
+++ b/plugins/emacs/emacs.plugin.zsh
@@ -31,13 +31,13 @@ if "$ZSH/tools/require_tool.sh" emacs 23 2>/dev/null ; then
         $EDITOR --eval "$cmd" | tr -d \"
     }
 
-    # display the directory of the file
+    # Write to standard output the directory of the file
     # opened in the the current buffer
     function ecd {
         local cmd="(let ((buf-name (buffer-file-name (window-buffer))))
                      (if buf-name (file-name-directory buf-name)))"
 
-        local dir=`$EDITOR --eval "$cmd" | tr -d \"`
+        local dir="$($EDITOR --eval $cmd | tr -d \")"
         if [ -n "$dir" ] ;then
             echo "$dir"
         else

From 3a408f326f1436a81ae481610c76c8938903df4f Mon Sep 17 00:00:00 2001
From: Tristan Carel <tcarel@exalead.com>
Date: Mon, 10 Oct 2011 18:04:13 +0200
Subject: [PATCH 012/364] Comment

---
 plugins/emacs/emacsclient.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/emacs/emacsclient.sh b/plugins/emacs/emacsclient.sh
index 7fc2ad202..38d419813 100755
--- a/plugins/emacs/emacsclient.sh
+++ b/plugins/emacs/emacsclient.sh
@@ -1,9 +1,10 @@
 #!/bin/sh
 
-# Starts emacs daemon if not already started.
-
+# get list of available X windows.
 x=`emacsclient --alternate-editor '' --eval '(x-display-list)' 2>/dev/null`
+
 if [ -z "$x" ] ;then
+    # Create one if there is no X window yet.
     emacsclient --alternate-editor "" --create-frame "$@"
 else
     # prevent creating another X frame if there is at least one present.

From a01b1fefe63101fdc36291d0ec2097bdc3994f22 Mon Sep 17 00:00:00 2001
From: Tristan Carel <tcarel@exalead.com>
Date: Mon, 10 Oct 2011 18:04:24 +0200
Subject: [PATCH 013/364] Do not overwrite EDITOR environment variable if
 already defined.

---
 plugins/emacs/emacs.plugin.zsh | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/plugins/emacs/emacs.plugin.zsh b/plugins/emacs/emacs.plugin.zsh
index e22f10740..a3f0085a8 100644
--- a/plugins/emacs/emacs.plugin.zsh
+++ b/plugins/emacs/emacs.plugin.zsh
@@ -11,12 +11,16 @@
 
 
 if "$ZSH/tools/require_tool.sh" emacs 23 2>/dev/null ; then
-    export EDITOR="$ZSH/plugins/emacs/emacsclient.sh"
-    alias emacs="$EDITOR --no-wait"
+    export EMACS_PLUGIN_LAUNCHER="$ZSH/plugins/emacs/emacsclient.sh"
+
+    # set EDITOR if not already defined.
+    export EDITOR="${EDITOR:-${EMACS_PLUGIN_LAUNCHER}}"
+
+    alias emacs="$EMACS_PLUGIN_LAUNCHER --no-wait"
     alias e=emacs
 
     # same than M-x eval but from outside Emacs.
-    alias eeval="$EDITOR --eval"
+    alias eeval="$EMACS_PLUGIN_LAUNCHER --eval"
     # create a new X frame
     alias eframe='emacsclient --alternate-editor "" --create-frame'
 
@@ -28,7 +32,7 @@ if "$ZSH/tools/require_tool.sh" emacs 23 2>/dev/null ; then
     # opened in the current buffer.
     function efile {
         local cmd="(buffer-file-name (window-buffer))"
-        $EDITOR --eval "$cmd" | tr -d \"
+        "$EMACS_PLUGIN_LAUNCHER" --eval "$cmd" | tr -d \"
     }
 
     # Write to standard output the directory of the file
@@ -37,7 +41,7 @@ if "$ZSH/tools/require_tool.sh" emacs 23 2>/dev/null ; then
         local cmd="(let ((buf-name (buffer-file-name (window-buffer))))
                      (if buf-name (file-name-directory buf-name)))"
 
-        local dir="$($EDITOR --eval $cmd | tr -d \")"
+        local dir="$($EMACS_PLUGIN_LAUNCHER --eval $cmd | tr -d \")"
         if [ -n "$dir" ] ;then
             echo "$dir"
         else

From be6f0c90b8f7d56d812a0938cb2f6ef1a393c36c Mon Sep 17 00:00:00 2001
From: Fredrik Wallgren <fredrik.wallgren@gmail.com>
Date: Sat, 15 Oct 2011 23:31:27 +0200
Subject: [PATCH 014/364] Update the script to account for the changes in 0.1.7
 where .gas is a directory

---
 plugins/gas/_gas | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/plugins/gas/_gas b/plugins/gas/_gas
index befdc9459..23e6d99aa 100644
--- a/plugins/gas/_gas
+++ b/plugins/gas/_gas
@@ -13,6 +13,7 @@ case $state in
 		cmds=(
             "version:Prints Gas's version"
             "use:Uses author"
+            "ssh:Creates a new ssh key for an existing gas author"
             "show:Shows your current user"
             "list:Lists your authors"
             "import:Imports current user to gasconfig"
@@ -25,8 +26,12 @@ case $state in
 	args)
 		case $line[1] in
 			(use|delete)
-				_values -S , 'authors' $(cat ~/.gas | sed -n -e 's/^\[\(.*\)\]/\1/p') && ret=0
-				;;
+        VERSION=$(gas -v)
+        if [[ $VERSION == <1->.*.* ]] || [[ $VERSION == 0.<2->.* ]] || [[ $VERSION == 0.1.<6-> ]] then
+          _values -S , 'authors' $(cat ~/.gas/gas.authors | sed -n -e 's/^.*\[\(.*\)\]/\1/p') && ret=0
+        else
+				  _values -S , 'authors' $(cat ~/.gas | sed -n -e 's/^\[\(.*\)\]/\1/p') && ret=0
+        fi
 		esac
 		;;
 esac

From 40508b79a4d25b0548e771fb3698675595230a04 Mon Sep 17 00:00:00 2001
From: Wael Nasreddine <wael.nasreddine@gmail.com>
Date: Thu, 20 Oct 2011 13:10:20 +0200
Subject: [PATCH 015/364] Add zsh_reload which provides src function, this
 function will source .zshrc and rebuilds cache

---
 plugins/zsh_reload/zsh_reload.plugin.zsh | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 plugins/zsh_reload/zsh_reload.plugin.zsh

diff --git a/plugins/zsh_reload/zsh_reload.plugin.zsh b/plugins/zsh_reload/zsh_reload.plugin.zsh
new file mode 100644
index 000000000..a435dbc8d
--- /dev/null
+++ b/plugins/zsh_reload/zsh_reload.plugin.zsh
@@ -0,0 +1,13 @@
+zsh_cache=$HOME/.zsh_cache
+mkdir -p $zsh_cache
+
+# reload zshrc
+function src()
+{
+  autoload -U compinit zrecompile
+  compinit -d $zsh_cache/zcomp-$HOST
+  for f in $HOME/.zshrc $zsh_cache/zcomp-$HOST; do
+    zrecompile -p $f && rm -f $f.zwc.old
+  done
+  source ~/.zshrc
+}
\ No newline at end of file

From 9e3776f1ecbaa29d646cdfe8fc204597ca98746c Mon Sep 17 00:00:00 2001
From: Max Masnick <max@masnick.me>
Date: Sun, 30 Oct 2011 21:43:53 -0400
Subject: [PATCH 016/364] update fino theme to work with rbenv

also fix bug where prompt char did not reflect
whether or not you were in a git repo.
---
 themes/fino.zsh-theme | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/themes/fino.zsh-theme b/themes/fino.zsh-theme
index 17cf59708..a7a63f661 100644
--- a/themes/fino.zsh-theme
+++ b/themes/fino.zsh-theme
@@ -1,7 +1,7 @@
 # Fino theme by Max Masnick (http://max.masnick.me)
 
 # Use with a dark background and 256-color terminal!
-# Meant for people with RVM and git. Tested only on OS X 10.7.
+# Meant for people with rbenv and git. Tested only on OS X 10.7.
 
 # You can set your computer name in the ~/.box-name file if you want.
 
@@ -11,27 +11,24 @@
 #
 # Also borrowing from http://stevelosh.com/blog/2010/02/my-extravagant-zsh-prompt/
 
-function virtualenv_info {
-    [ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`') '
-}
 
 function prompt_char {
-    git branch >/dev/null 2>/dev/null && echo '±' && return
-    echo '○'
+  git branch >/dev/null 2>/dev/null && echo "±" && return
+  echo '○'
 }
 
 function box_name {
     [ -f ~/.box-name ] && cat ~/.box-name || hostname -s
 }
 
-
-local rvm_ruby='‹$(rvm-prompt i v g)›%{$reset_color%}'
 local current_dir='${PWD/#$HOME/~}'
 local git_info='$(git_prompt_info)'
+local prompt_char='$(prompt_char)'
+local rbenv_version='$(rbenv version-name)'
 
 
-PROMPT="╭─%{$FG[040]%}%n%{$reset_color%} %{$FG[239]%}at%{$reset_color%} %{$FG[033]%}$(box_name)%{$reset_color%} %{$FG[239]%}in%{$reset_color%} %{$terminfo[bold]$FG[226]%}${current_dir}%{$reset_color%}${git_info} %{$FG[239]%}using%{$FG[243]%} ${rvm_ruby}
-╰─$(virtualenv_info)$(prompt_char) "
+PROMPT="╭─%{$FG[040]%}%n%{$reset_color%} %{$FG[239]%}at%{$reset_color%} %{$FG[033]%}$(box_name)%{$reset_color%} %{$FG[239]%}in%{$reset_color%} %{$terminfo[bold]$FG[226]%}${current_dir}%{$reset_color%}${git_info} %{$FG[239]%}using%{$FG[243]%} ‹${rbenv_version}›%{$reset_color%}
+╰─${prompt_char} "
 
 ZSH_THEME_GIT_PROMPT_PREFIX=" %{$FG[239]%}on%{$reset_color%} %{$fg[255]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"

From 98578ec2412d5b5d2e105f3ddd0d41eb21c3de14 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Fri, 16 Dec 2011 14:21:45 +0100
Subject: [PATCH 017/364] `setopt append_history` is not necessary.

Especially given the inc_append_history option, it is not necessary to
set the (default) append_history option.
---
 lib/history.zsh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/history.zsh b/lib/history.zsh
index 876936b87..b162a5577 100644
--- a/lib/history.zsh
+++ b/lib/history.zsh
@@ -3,7 +3,6 @@ HISTFILE=$HOME/.zsh_history
 HISTSIZE=10000
 SAVEHIST=10000
 
-setopt append_history
 setopt extended_history
 setopt hist_expire_dups_first
 setopt hist_ignore_dups # ignore duplication command history list

From 77045230f4e2c80f4f312fbbeeb8583a41aa5a92 Mon Sep 17 00:00:00 2001
From: Philip Hofstetter <phofstetter@sensational.ch>
Date: Wed, 28 Dec 2011 15:54:47 +0100
Subject: [PATCH 018/364] make pygmalion theme use two lines when needed

if the length of the prompt (excluding color escapes) exceeds 40
characters, emit the arrow prompt on its own line

This helps a lot on smaller terminals
---
 themes/pygmalion.zsh-theme | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/themes/pygmalion.zsh-theme b/themes/pygmalion.zsh-theme
index cf3bb908f..435c05830 100644
--- a/themes/pygmalion.zsh-theme
+++ b/themes/pygmalion.zsh-theme
@@ -1,9 +1,34 @@
 # Yay! High voltage and arrows!
 
-ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}"
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
-ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[yellow]%}⚡%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_CLEAN=""
+prompt_setup_pygmalion(){
+  ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}"
+  ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
+  ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[yellow]%}⚡%{$reset_color%}"
+  ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+  base_prompt='%{$fg[magenta]%}%n%{$reset_color%}%{$fg[cyan]%}@%{$reset_color%}%{$fg[yellow]%}%m%{$reset_color%}%{$fg[red]%}:%{$reset_color%}%{$fg[cyan]%}%0~%{$reset_color%}%{$fg[red]%}|%{$reset_color%}'
+  post_prompt='%{$fg[cyan]%}⇒%{$reset_color%}  '
+
+  base_prompt_nocolor=$(echo "$base_prompt" | perl -pe "s/%\{[^}]+\}//g")
+  post_prompt_nocolor=$(echo "$post_prompt" | perl -pe "s/%\{[^}]+\}//g")
+
+  add-zsh-hook precmd prompt_pygmalion_precmd
+}
+
+prompt_pygmalion_precmd(){
+  local gitinfo=$(git_prompt_info)
+  local gitinfo_nocolor=$(echo "$gitinfo" | perl -pe "s/%\{[^}]+\}//g")
+  local exp_nocolor=$(print -P "$base_prompt_nocolor$gitinfo_nocolor$post_prompt_nocolor")
+  local prompt_length=${#exp_nocolor}
+
+  local nl=""
+
+  if [[ $prompt_length -gt 40 ]]; then
+    nl=$'\n%{\r%}';
+  fi
+  PROMPT="$base_prompt$gitinfo$nl$post_prompt"
+}
+
+prompt_setup_pygmalion
 
-PROMPT='%{$fg[magenta]%}%n%{$reset_color%}%{$fg[cyan]%}@%{$reset_color%}%{$fg[yellow]%}%m%{$reset_color%}%{$fg[red]%}:%{$reset_color%}%{$fg[cyan]%}%0~%{$reset_color%}%{$fg[red]%}|%{$reset_color%}$(git_prompt_info)%{$fg[cyan]%}⇒%{$reset_color%}  '
 

From 3445dada95f7d5c4730b73ebb8b3abb0e5723e26 Mon Sep 17 00:00:00 2001
From: Philip Hofstetter <phofstetter@sensational.ch>
Date: Thu, 29 Dec 2011 14:35:38 +0100
Subject: [PATCH 019/364] correctly handle path names with spaces

---
 themes/pygmalion.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/pygmalion.zsh-theme b/themes/pygmalion.zsh-theme
index 435c05830..654e0fc37 100644
--- a/themes/pygmalion.zsh-theme
+++ b/themes/pygmalion.zsh-theme
@@ -18,7 +18,7 @@ prompt_setup_pygmalion(){
 prompt_pygmalion_precmd(){
   local gitinfo=$(git_prompt_info)
   local gitinfo_nocolor=$(echo "$gitinfo" | perl -pe "s/%\{[^}]+\}//g")
-  local exp_nocolor=$(print -P "$base_prompt_nocolor$gitinfo_nocolor$post_prompt_nocolor")
+  local exp_nocolor="$(print -P \"$base_prompt_nocolor$gitinfo_nocolor$post_prompt_nocolor\")"
   local prompt_length=${#exp_nocolor}
 
   local nl=""

From ff7e0648965e027d1b8c995065b5152333a82b7a Mon Sep 17 00:00:00 2001
From: Rach Belaid <rachid.belaid@gmail.com>
Date: Sun, 19 Feb 2012 19:54:33 +0000
Subject: [PATCH 020/364] change the color of arrow when the command line
 return an error

---
 themes/robbyrussell.zsh-theme | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/themes/robbyrussell.zsh-theme b/themes/robbyrussell.zsh-theme
index 7b524e82d..24e1e8c52 100644
--- a/themes/robbyrussell.zsh-theme
+++ b/themes/robbyrussell.zsh-theme
@@ -1,4 +1,5 @@
-PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
+local ret_status="%(?:%{$fg_bold[green]%}➜ :%{$fg_bold[red]%}➜ %s)"
+PROMPT='${ret_status}%{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
 
 ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"

From bcd5b3b52b35a458df87b204119eb18a264a580b Mon Sep 17 00:00:00 2001
From: John Barker <jebarker@gmail.com>
Date: Mon, 20 Feb 2012 19:05:27 -0500
Subject: [PATCH 021/364] Added a peepcode theme

---
 themes/peepcode.zsh-theme | 44 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 themes/peepcode.zsh-theme

diff --git a/themes/peepcode.zsh-theme b/themes/peepcode.zsh-theme
new file mode 100644
index 000000000..ca2a8862f
--- /dev/null
+++ b/themes/peepcode.zsh-theme
@@ -0,0 +1,44 @@
+#
+# Based on Geoffrey Grosenbach's peepcode zsh theme from
+# https://github.com/topfunky/zsh-simple
+#
+
+git_repo_path() {
+  git rev-parse --git-dir 2>/dev/null
+}
+
+git_commit_id() {
+  git rev-parse --short HEAD 2>/dev/null
+}
+
+git_mode() {
+  if [[ -e "$repo_path/BISECT_LOG" ]]; then
+    echo "+bisect"
+  elif [[ -e "$repo_path/MERGE_HEAD" ]]; then
+    echo "+merge"
+  elif [[ -e "$repo_path/rebase" || -e "$repo_path/rebase-apply" || -e "$repo_path/rebase-merge" || -e "$repo_path/../.dotest" ]]; then
+    echo "+rebase"
+  fi
+}
+
+git_dirty() {
+  if [[ "$repo_path" != '.' && `git ls-files -m` != "" ]]; then
+    echo " %{$fg_bold[grey]%}✗%{$reset_color%}"
+  fi
+}
+
+git_prompt() {
+  local cb=$(current_branch)
+  if [ -n "$cb" ]; then
+    local repo_path=$(git_repo_path)
+    echo " %{$fg_bold[grey]%}$cb %{$fg[white]%}$(git_commit_id)%{$reset_color%}$(git_mode)$(git_dirty)"
+  fi
+}
+
+local smiley="%(?,%{$fg[green]%}☺%{$reset_color%},%{$fg[red]%}☹%{$reset_color%})"
+
+PROMPT='
+%~
+${smiley}  %{$reset_color%}'
+
+RPROMPT='%{$fg[white]%} $(~/.rvm/bin/rvm-prompt)$(git_prompt)%{$reset_color%}'

From 6272b4854c0b13fa778fe7d4f6f9bb12d716299f Mon Sep 17 00:00:00 2001
From: Jeff McClure <jmcclure@sonicradish.com>
Date: Mon, 20 Feb 2012 22:37:23 -0500
Subject: [PATCH 022/364] Added New Theme: sonicradish  (256 colors)

Forked from muse theme and inspired by mustang vim theme

Dark Background and Solarized Dark look great [ tested on OS X ]

Screenshot: https://img.skitch.com/20120221-eb1cxey5aun84tb1ak7fm376k.png

muse: https://github.com/robbyrussell/oh-my-zsh/blob/master/themes/muse.zsh-theme
mustang: http://hcalves.deviantart.com/art/Mustang-Vim-Colorscheme-98974484http://hcalves.deviantart.com/art/Mustang-Vim-Colorscheme-98974484
---
 themes/sonicradish.zsh-theme | 39 ++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 themes/sonicradish.zsh-theme

diff --git a/themes/sonicradish.zsh-theme b/themes/sonicradish.zsh-theme
new file mode 100644
index 000000000..cc7ba1c76
--- /dev/null
+++ b/themes/sonicradish.zsh-theme
@@ -0,0 +1,39 @@
+#!/usr/bin/env zsh 
+#local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
+
+setopt promptsubst
+
+autoload -U add-zsh-hook
+ROOT_ICON_COLOR=$FG[111]
+MACHINE_NAME_COLOR=$FG[208]
+PROMPT_SUCCESS_COLOR=$FG[103]
+PROMPT_FAILURE_COLOR=$FG[124]
+PROMPT_VCS_INFO_COLOR=$FG[242]
+PROMPT_PROMPT=$FG[208]
+GIT_DIRTY_COLOR=$FG[124]
+GIT_CLEAN_COLOR=$FG[148]
+GIT_PROMPT_INFO=$FG[148]
+
+# Hash
+ROOT_ICON="# "
+if [[ $EUID -ne 0 ]] ; then
+	ROOT_ICON=""
+fi
+
+PROMPT='%{$ROOT_ICON_COLOR%}$ROOT_ICON%{$reset_color%}%{$MACHINE_NAME_COLOR%}%m➜  %{$reset_color%}%{$PROMPT_SUCCESS_COLOR%}%c%{$reset_color%} %{$GIT_PROMPT_INFO%}$(git_prompt_info)%{$GIT_DIRTY_COLOR%}$(git_prompt_status) %{$reset_color%}%{$PROMPT_PROMPT%}ᐅ %{$reset_color%} '
+
+#RPS1="${return_code}"
+
+ZSH_THEME_GIT_PROMPT_PREFIX=": "
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$GIT_PROMPT_INFO%} :"
+ZSH_THEME_GIT_PROMPT_DIRTY=" %{$GIT_DIRTY_COLOR%}✘"
+ZSH_THEME_GIT_PROMPT_CLEAN=" %{$GIT_CLEAN_COLOR%}✔"
+
+ZSH_THEME_GIT_PROMPT_ADDED="%{$FG[103]%}✚%{$rset_color%}"
+ZSH_THEME_GIT_PROMPT_MODIFIED="%{$FG[103]%}✹%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DELETED="%{$FG[103]%}✖%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_RENAMED="%{$FG[103]%}➜%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_UNMERGED="%{$FG[103]%}═%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$FG[103]%}✭%{$reset_color%}"
+
+export LSCOLORS=dxfxcxdxbxexexabagacad

From 867cb3f511fe8d0cad04ae799b595d7b0c86746a Mon Sep 17 00:00:00 2001
From: Jeff McClure <jmcclure@sonicradish.com>
Date: Tue, 21 Feb 2012 00:45:33 -0500
Subject: [PATCH 023/364] [JM] Removed LSCOLOR Declaration for Wider Support

---
 themes/sonicradish.zsh-theme | 2 --
 1 file changed, 2 deletions(-)

diff --git a/themes/sonicradish.zsh-theme b/themes/sonicradish.zsh-theme
index cc7ba1c76..508611830 100644
--- a/themes/sonicradish.zsh-theme
+++ b/themes/sonicradish.zsh-theme
@@ -35,5 +35,3 @@ ZSH_THEME_GIT_PROMPT_DELETED="%{$FG[103]%}✖%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_RENAMED="%{$FG[103]%}➜%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_UNMERGED="%{$FG[103]%}═%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$FG[103]%}✭%{$reset_color%}"
-
-export LSCOLORS=dxfxcxdxbxexexabagacad

From c9c021478ea4a2b55aac8cda3cd0d05137443f36 Mon Sep 17 00:00:00 2001
From: William Roe <willroe@gmail.com>
Date: Thu, 23 Feb 2012 14:11:52 +0000
Subject: [PATCH 024/364] Add completion for pip install -r - so that it
 autocompletes requirements filenames

---
 plugins/pip/_pip | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/pip/_pip b/plugins/pip/_pip
index df53ba5ce..0b66913a0 100644
--- a/plugins/pip/_pip
+++ b/plugins/pip/_pip
@@ -58,6 +58,7 @@ case "$words[1]" in
   	_arguments \
       '(-U --upgrade)'{-U,--upgrade}'[upgrade all packages to the newest available version]' \
       '(-f --find-links)'{-f,--find-links}'[URL for finding packages]' \
+      '(-r --requirement)'{-r,--requirement}'[Requirements file for packages to install]:File:_files' \
       '(--no-deps --no-dependencies)'{--no-deps,--no-dependencies}'[iIgnore package dependencies]' \
       '(--no-install)--no-install[only download packages]' \
       '(--no-download)--no-download[only install downloaded packages]' \

From d49e98267a741075f889808b04b1f0c699917f8a Mon Sep 17 00:00:00 2001
From: Max Masnick <max@masnick.me>
Date: Sat, 25 Feb 2012 16:16:43 -0500
Subject: [PATCH 025/364] clean up rbenv support for 'fino' theme

---
 themes/fino.zsh-theme | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/themes/fino.zsh-theme b/themes/fino.zsh-theme
index 2159e54a8..4c7aabcff 100644
--- a/themes/fino.zsh-theme
+++ b/themes/fino.zsh-theme
@@ -21,22 +21,21 @@ function box_name {
     [ -f ~/.box-name ] && cat ~/.box-name || hostname -s
 }
 
-local rvm_ruby=''
+local ruby_env=''
 if which rvm-prompt &> /dev/null; then
-  rvm_ruby='‹$(rvm-prompt i v g)›%{$reset_color%}'
+  ruby_env=' ‹$(rvm-prompt i v g)›%{$reset_color%}'
 else
   if which rbenv &> /dev/null; then
-    rvm_ruby='‹$(rbenv version | sed -e "s/ (set.*$//")›%{$reset_color%}'
+    ruby_env=' ‹$(rbenv version-name)›%{$reset_color%}'
   fi
 fi
 
 local current_dir='${PWD/#$HOME/~}'
 local git_info='$(git_prompt_info)'
 local prompt_char='$(prompt_char)'
-local rbenv_version='$(rbenv version-name)'
 
 
-PROMPT="╭─%{$FG[040]%}%n%{$reset_color%} %{$FG[239]%}at%{$reset_color%} %{$FG[033]%}$(box_name)%{$reset_color%} %{$FG[239]%}in%{$reset_color%} %{$terminfo[bold]$FG[226]%}${current_dir}%{$reset_color%}${git_info} %{$FG[239]%}using%{$FG[243]%} ‹${rbenv_version}›%{$reset_color%}
+PROMPT="╭─%{$FG[040]%}%n%{$reset_color%} %{$FG[239]%}at%{$reset_color%} %{$FG[033]%}$(box_name)%{$reset_color%} %{$FG[239]%}in%{$reset_color%} %{$terminfo[bold]$FG[226]%}${current_dir}%{$reset_color%}${git_info} %{$FG[239]%}using%{$FG[243]%}${ruby_env}
 ╰─${prompt_char} "
 
 ZSH_THEME_GIT_PROMPT_PREFIX=" %{$FG[239]%}on%{$reset_color%} %{$fg[255]%}"

From fa1657e10bc062394390d83d0bb5d3848905f5b6 Mon Sep 17 00:00:00 2001
From: David Lee <davidomundo@gmail.com>
Date: Sun, 26 Feb 2012 02:29:24 -0800
Subject: [PATCH 026/364] Add gem build autocompletion

---
 plugins/gem/_gem | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/gem/_gem b/plugins/gem/_gem
index 83cba40d1..3c0922f2c 100644
--- a/plugins/gem/_gem
+++ b/plugins/gem/_gem
@@ -9,6 +9,7 @@ _gem_installed() {
 
 local -a _1st_arguments
 _1st_arguments=(
+  'build:Build a gem from a gemspec'
   'cert:Manage RubyGems certificates and signing settings'
   'check:Check installed gems'
   'cleanup:Clean up old versions of installed gems in the local repository'
@@ -53,6 +54,9 @@ if (( CURRENT == 1 )); then
 fi
 
 case "$words[1]" in
+  build)
+    _files -g "*.gemspec"
+    ;;
   list)
       if [[ "$state" == forms ]]; then
         _gem_installed

From 071d0d68ec1a7f883c10529fda47630dcc3f5afe Mon Sep 17 00:00:00 2001
From: Tom Morris <tom@tommorris.org>
Date: Mon, 5 Mar 2012 11:55:30 +0000
Subject: [PATCH 027/364] Added link to wiki page for plugins to README.

The wiki is more readable than going to the plugins directory.
---
 README.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.textile b/README.textile
index bf6776665..64dbc96e9 100644
--- a/README.textile
+++ b/README.textile
@@ -43,7 +43,7 @@ You _might_ need to modify your PATH in ~/.zshrc if you're not able to find some
 
 h2. Usage
 
-* enable the plugins you want in your @~/.zshrc@ (take a look at @plugins/@ to see what's possible)
+* enable the plugins you want in your @~/.zshrc@ (take a look at the @plugins/@ directory and the "wiki":https://github.com/robbyrussell/oh-my-zsh/wiki/Plugins to see what's possible)
 ** example: @plugins=(git osx ruby)@
 * Theme support: Change the @ZSH_THEME@ environment variable in @~/.zshrc@.
 ** Take a look at the "current themes":https://wiki.github.com/robbyrussell/oh-my-zsh/themes that come bundled with _Oh My Zsh_.

From 4a88743d1eb28f7d928c6d7ce3ebeccc6b1991a8 Mon Sep 17 00:00:00 2001
From: William Ting <william.h.ting@gmail.com>
Date: Tue, 6 Mar 2012 14:31:03 -1000
Subject: [PATCH 028/364] fix gnzh theme to detect local rvm installations

---
 themes/gnzh.zsh-theme | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/themes/gnzh.zsh-theme b/themes/gnzh.zsh-theme
index 3c6b8a409..33f187bc6 100644
--- a/themes/gnzh.zsh-theme
+++ b/themes/gnzh.zsh-theme
@@ -6,7 +6,7 @@ autoload -U colors zsh/terminfo # Used in the colour alias below
 colors
 setopt prompt_subst
 
-# make some aliases for the colours: (coud use normal escap.seq's too)
+# make some aliases for the colours: (could use normal escape sequences too)
 for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE; do
   eval PR_$color='%{$fg[${(L)color}]%}'
 done
@@ -25,7 +25,7 @@ elif [[ $UID -eq 0 ]]; then # root
 fi
 
 # Check if we are on SSH or not
-if [[ -n "$SSH_CLIENT"  ||  -n "$SSH2_CLIENT" ]]; then 
+if [[ -n "$SSH_CLIENT"  ||  -n "$SSH2_CLIENT" ]]; then
   eval PR_HOST='${PR_YELLOW}%M${PR_NO_COLOR}' #SSH
 else
   eval PR_HOST='${PR_GREEN}%M${PR_NO_COLOR}' # no SSH
@@ -36,12 +36,12 @@ local return_code="%(?..%{$PR_RED%}%? ↵%{$PR_NO_COLOR%})"
 local user_host='${PR_USER}${PR_CYAN}@${PR_HOST}'
 local current_dir='%{$PR_BOLD$PR_BLUE%}%~%{$PR_NO_COLOR%}'
 local rvm_ruby=''
-if which rvm-prompt &> /dev/null; then
+if ${HOME}/.rvm/bin/rvm-prompt &> /dev/null; then # detect local user rvm installation
+  rvm_ruby='%{$PR_RED%}‹$(${HOME}/.rvm/bin/rvm-prompt i v g s)›%{$PR_NO_COLOR%}'
+elif which rvm-prompt &> /dev/null; then # detect sysem-wide rvm installation
   rvm_ruby='%{$PR_RED%}‹$(rvm-prompt i v g s)›%{$PR_NO_COLOR%}'
-else
-  if which rbenv &> /dev/null; then
-    rvm_ruby='%{$PR_RED%}‹$(rbenv version | sed -e "s/ (set.*$//")›%{$PR_NO_COLOR%}'
-  fi
+elif which rbenv &> /dev/null; then # detect Simple Ruby Version management
+  rvm_ruby='%{$PR_RED%}‹$(rbenv version | sed -e "s/ (set.*$//")›%{$PR_NO_COLOR%}'
 fi
 local git_branch='$(git_prompt_info)%{$PR_NO_COLOR%}'
 

From aefacb69509f8cdd4ad3b0bba9b77cd9ee63e115 Mon Sep 17 00:00:00 2001
From: cmar <chris@spreecommerce.com>
Date: Fri, 9 Mar 2012 08:53:09 -0500
Subject: [PATCH 029/364] added powed command to list pow urls

---
 plugins/pow/pow.plugin.zsh | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/plugins/pow/pow.plugin.zsh b/plugins/pow/pow.plugin.zsh
index 399a54cb0..c823cdb22 100644
--- a/plugins/pow/pow.plugin.zsh
+++ b/plugins/pow/pow.plugin.zsh
@@ -8,18 +8,18 @@
 # Supports command completion.
 #
 # If you are not already using completion you might need to enable it with
-# 
+#
 #    autoload -U compinit compinit
 #
 # Changes:
 #
-# Defaults to the current application, and will walk up the tree to find 
+# Defaults to the current application, and will walk up the tree to find
 # a config.ru file and restart the corresponding app
 #
-# Will Detect if a app does not exist in pow and print a (slightly) helpful 
+# Will Detect if a app does not exist in pow and print a (slightly) helpful
 # error message
 
-rack_root_detect(){
+rack_root(){
   setopt chaselinks
   local orgdir=$(pwd)
   local basedir=$(pwd)
@@ -32,6 +32,11 @@ rack_root_detect(){
 
   builtin cd $orgdir 2>/dev/null
   [[ ${basedir} == "/" ]] && return 1
+  echo $basedir
+}
+
+rack_root_detect(){
+  basedir=$(rack_root)
   echo `basename $basedir | sed -E "s/.(com|net|org)//"`
 }
 
@@ -51,16 +56,21 @@ kapow(){
 compctl -W ~/.pow -/ kapow
 
 powit(){
-	local basedir=$(pwd)
+  local basedir=$(pwd)
   local vhost=$1
   [ ! -n "$vhost" ] && vhost=$(rack_root_detect)
   if [ ! -h ~/.pow/$vhost ]
-	then
-		echo "pow: Symlinking your app with pow. ${vhost}"
-	  [ ! -d ~/.pow/${vhost} ] && ln -s $basedir ~/.pow/$vhost
+  then
+    echo "pow: Symlinking your app with pow. ${vhost}"
+    [ ! -d ~/.pow/${vhost} ] && ln -s $basedir ~/.pow/$vhost
     return 1
   fi
 }
 
+powed(){
+  local basedir=$(rack_root)
+  find ~/.pow/ -type l -lname "*$basedir*" -exec basename {}'.dev' \;
+}
+
 # View the standard out (puts) from any pow app
-alias kaput="tail -f ~/Library/Logs/Pow/apps/*"
+alias kaput="tail -f ~/Library/Logs/Pow/apps/*"
\ No newline at end of file

From e652756fdb0495e58f3f4f3be3a82aa9f166731d Mon Sep 17 00:00:00 2001
From: Derek Wyatt <dwyatt@rim.com>
Date: Tue, 20 Mar 2012 08:16:44 -0400
Subject: [PATCH 030/364] A plugin that makes it easier to interact with the
 (single) running instance of gvim

---
 plugins/vim-interaction/README.md             | 69 +++++++++++++++++++
 .../vim-interaction.plugin.zsh                | 67 ++++++++++++++++++
 2 files changed, 136 insertions(+)
 create mode 100644 plugins/vim-interaction/README.md
 create mode 100644 plugins/vim-interaction/vim-interaction.plugin.zsh

diff --git a/plugins/vim-interaction/README.md b/plugins/vim-interaction/README.md
new file mode 100644
index 000000000..65e678b51
--- /dev/null
+++ b/plugins/vim-interaction/README.md
@@ -0,0 +1,69 @@
+# Vim Interaction #
+
+The plugin presents a function called `callvim` whose usage is:
+
+    usage: callvim [-b cmd] [-a cmd] [file ... fileN]
+    
+      -b cmd     Run this command in GVIM before editing the first file
+      -a cmd     Run this command in GVIM after editing the first file
+      file       The file to edit
+      ... fileN  The other files to add to the argslist
+
+## Rationale ##
+
+The idea for this script is to give you some decent interaction with a running
+GVim session.  Normally you'll be running around your filesystem doing any
+number of amazing things and you'll need to load some files into GVim for
+editing, inspecting, destruction, or other bits of mayhem.  This script lets you
+do that.
+
+## Aliases ##
+
+There are a few aliases presented as well:
+
+* `v` A shorthand for `callvim`
+* `vvsp` Edits the passed in file but first makes a vertical split
+* `vhsp` Edits the passed in file but first makes a horizontal split
+
+## Examples ##
+
+This will load `/tmp/myfile.scala` into the running GVim session:
+
+    > v /tmp/myfile.scala
+
+This will load it after first doing a vertical split:
+
+    > vvsp /tmp/myfile.scala
+    or
+    > v -b':vsp' /tmp/myfile.scala
+
+This will load it after doing a horizontal split, then moving to the bottom of
+the file:
+
+    > vhsp -aG /tmp/myfile.scala
+    or
+    > v -b':sp' -aG /tmp/myfile.scala
+
+This will load the file and then copy the first line to the end (Why you would
+ever want to do this... I dunno):
+
+    > v -a':1t$' /tmp/myfile.scala
+
+And this will load all of the `*.txt` files into the args list:
+
+    > v *.txt
+
+If you want to load files into areas that are already split, use one of the
+aliases for that:
+
+    # Do a ':wincmd h' first
+    > vh /tmp/myfile.scala
+
+    # Do a ':wincmd j' first
+    > vj /tmp/myfile.scala
+
+    # Do a ':wincmd k' first
+    > vk /tmp/myfile.scala
+
+    # Do a ':wincmd l' first
+    > vl /tmp/myfile.scala
diff --git a/plugins/vim-interaction/vim-interaction.plugin.zsh b/plugins/vim-interaction/vim-interaction.plugin.zsh
new file mode 100644
index 000000000..3f346dfc3
--- /dev/null
+++ b/plugins/vim-interaction/vim-interaction.plugin.zsh
@@ -0,0 +1,67 @@
+#
+# See README.md
+#
+# Derek Wyatt (derek@{myfirstnamemylastname}.org
+# 
+
+function resolveFile
+{
+  if [ -f "$1" ]; then
+    echo $(readlink -f "$1")
+  else
+    echo "$1"
+  fi
+}
+
+function callvim
+{
+  if [[ $# == 0 ]]; then
+    cat <<EOH
+usage: callvim [-b cmd] [-a cmd] [file ... fileN]
+
+  -b cmd     Run this command in GVIM before editing the first file
+  -a cmd     Run this command in GVIM after editing the first file
+  file       The file to edit
+  ... fileN  The other files to add to the argslist
+EOH
+    return 0
+  fi
+
+  local cmd=""
+  local before=""
+  local after=""
+  while getopts ":b:a:" option
+  do
+    case $option in
+      a) after="$OPTARG"
+         ;;
+      b) before="$OPTARG"
+         ;;
+    esac
+  done
+  shift $((OPTIND-1))
+  if [[ ${after#:} != $after && ${after%<cr>} == $after ]]; then
+    after="$after<cr>"
+  fi
+  if [[ ${before#:} != $before && ${before%<cr>} == $before ]]; then
+    before="$before<cr>"
+  fi
+  local files=""
+  for f in $@
+  do
+    files="$files $(resolveFile $f)"
+  done
+  if [[ -n $files ]]; then
+    files=':args! '"$files<cr>"
+  fi
+  cmd="$before$files$after"
+  gvim --remote-send "$cmd"
+}
+
+alias v=callvim
+alias vvsp="callvim -b':vsp'"
+alias vhsp="callvim -b':sp'"
+alias vk="callvim -b':wincmd k'"
+alias vj="callvim -b':wincmd j'"
+alias vl="callvim -b':wincmd l'"
+alias vh="callvim -b':wincmd h'"

From 92227f171ad3777c2671395a9e1d7fbb86a11428 Mon Sep 17 00:00:00 2001
From: Derek Wyatt <dwyatt@rim.com>
Date: Tue, 20 Mar 2012 09:55:25 -0400
Subject: [PATCH 031/364] Fixed: If you callvim on a non-existant file with a
 relative path, the CWD of the running gvim process is used, and that's not
 right.  We use the PWD explicitly instead, in this case

---
 plugins/vim-interaction/vim-interaction.plugin.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/vim-interaction/vim-interaction.plugin.zsh b/plugins/vim-interaction/vim-interaction.plugin.zsh
index 3f346dfc3..309012b34 100644
--- a/plugins/vim-interaction/vim-interaction.plugin.zsh
+++ b/plugins/vim-interaction/vim-interaction.plugin.zsh
@@ -8,8 +8,10 @@ function resolveFile
 {
   if [ -f "$1" ]; then
     echo $(readlink -f "$1")
+  elif [[ "${1#/}" == "$1" ]]; then
+    echo "$(pwd)/$1"
   else
-    echo "$1"
+    echo $1
   fi
 }
 

From ce6a21c3b3c6b0fb6a8b8a2cb20991fec91ec86a Mon Sep 17 00:00:00 2001
From: Piotr Solnica <piotr.solnica@gmail.com>
Date: Fri, 23 Mar 2012 20:31:13 +0100
Subject: [PATCH 032/364] [themes/josh] Use $(current_branch) in prompt

---
 themes/josh.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/josh.zsh-theme b/themes/josh.zsh-theme
index 142e76838..12dfe4069 100644
--- a/themes/josh.zsh-theme
+++ b/themes/josh.zsh-theme
@@ -31,7 +31,7 @@ function josh_prompt {
     prompt=" $prompt"
   done
   
-  prompt="%{%F{green}%}$PWD$prompt%{%F{red}%}$(rvm_prompt_info || rbenv_prompt_info)%{$reset_color%} $(git_prompt_info)"
+  prompt="%{%F{green}%}$PWD$prompt%{%F{red}%}$(rvm_prompt_info || rbenv_prompt_info)%{$reset_color%} $(current_branch)"
   
   echo $prompt
 }

From 04a7536641621e0188987b5bb1362e6b922a8771 Mon Sep 17 00:00:00 2001
From: Derek Wyatt <derek@derekwyatt.org>
Date: Fri, 30 Mar 2012 06:33:06 -0400
Subject: [PATCH 033/364] Added an optional callout to the end of the
 interaction function. I put it in to allow me to put the window focus on
 MacVim / GVim depending on the different OS I happen to be on

---
 plugins/vim-interaction/vim-interaction.plugin.zsh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/vim-interaction/vim-interaction.plugin.zsh b/plugins/vim-interaction/vim-interaction.plugin.zsh
index 309012b34..af7e60c88 100644
--- a/plugins/vim-interaction/vim-interaction.plugin.zsh
+++ b/plugins/vim-interaction/vim-interaction.plugin.zsh
@@ -58,6 +58,9 @@ EOH
   fi
   cmd="$before$files$after"
   gvim --remote-send "$cmd"
+  if typeset -f postCallVim > /dev/null; then
+    postCallVim
+  fi
 }
 
 alias v=callvim

From c2e459ad43b060c9dc2548e378a2f2d412d6da60 Mon Sep 17 00:00:00 2001
From: Derek Wyatt <derek@derekwyatt.org>
Date: Fri, 30 Mar 2012 06:39:49 -0400
Subject: [PATCH 034/364] Updated the README to include documentation on the
 postCallVim callout

---
 plugins/vim-interaction/README.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/plugins/vim-interaction/README.md b/plugins/vim-interaction/README.md
index 65e678b51..681648018 100644
--- a/plugins/vim-interaction/README.md
+++ b/plugins/vim-interaction/README.md
@@ -25,6 +25,19 @@ There are a few aliases presented as well:
 * `vvsp` Edits the passed in file but first makes a vertical split
 * `vhsp` Edits the passed in file but first makes a horizontal split
 
+## Post Callout ##
+
+At the end of the `callvim` function we invoke the `postCallVim` function if it
+exists.  If you're using MacVim, for example, you could define a function that
+brings window focus to it after the file is loaded:
+
+    function postCallVim
+    {
+      osascript -e 'tell application "MacVim" to activate'
+    }
+
+This'll be different depending on your OS / Window Manager.
+
 ## Examples ##
 
 This will load `/tmp/myfile.scala` into the running GVim session:

From 94dd6515365e0d2655485c5afc27e75a921fa6ec Mon Sep 17 00:00:00 2001
From: Derek Wyatt <derek@derekwyatt.org>
Date: Sun, 1 Apr 2012 15:41:39 -0400
Subject: [PATCH 035/364] Added an <esc> to the begining of everything. I ran
 something when I was in insert mode once and all it did was shove !args...
 into the buffer.  <esc> first.

---
 plugins/vim-interaction/vim-interaction.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/vim-interaction/vim-interaction.plugin.zsh b/plugins/vim-interaction/vim-interaction.plugin.zsh
index af7e60c88..5142f1f9b 100644
--- a/plugins/vim-interaction/vim-interaction.plugin.zsh
+++ b/plugins/vim-interaction/vim-interaction.plugin.zsh
@@ -30,7 +30,7 @@ EOH
   fi
 
   local cmd=""
-  local before=""
+  local before="<esc>"
   local after=""
   while getopts ":b:a:" option
   do

From 8762b27d67156886d144213ba656aa3e8edfcf8b Mon Sep 17 00:00:00 2001
From: cmar <chris@spreecommerce.com>
Date: Wed, 4 Apr 2012 12:54:31 -0400
Subject: [PATCH 036/364] command to restart pow process

---
 plugins/pow/pow.plugin.zsh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/plugins/pow/pow.plugin.zsh b/plugins/pow/pow.plugin.zsh
index c823cdb22..7f86c0c76 100644
--- a/plugins/pow/pow.plugin.zsh
+++ b/plugins/pow/pow.plugin.zsh
@@ -72,5 +72,14 @@ powed(){
   find ~/.pow/ -type l -lname "*$basedir*" -exec basename {}'.dev' \;
 }
 
+# Restart pow process
+# taken from http://www.matthewratzloff.com/blog/2011/12/23/restarting-pow-when-dns-stops-responding
+repow(){
+  lsof | grep 20560 | awk '{print $2}' | xargs kill -9
+  launchctl unload ~/Library/LaunchAgents/cx.pow.powd.plist
+  launchctl load ~/Library/LaunchAgents/cx.pow.powd.plist
+  echo "restarted pow"
+}
+
 # View the standard out (puts) from any pow app
 alias kaput="tail -f ~/Library/Logs/Pow/apps/*"
\ No newline at end of file

From af03da0dc91a32175f99f85ab1fc09dc4246fef9 Mon Sep 17 00:00:00 2001
From: Peter Jaros <peter.a.jaros@gmail.com>
Date: Wed, 16 May 2012 14:51:52 -0400
Subject: [PATCH 037/364] Move example plugin to the custom plugins dir.

---
 .gitignore                                      | 4 ++--
 custom/{ => plugins}/example/example.plugin.zsh | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename custom/{ => plugins}/example/example.plugin.zsh (100%)

diff --git a/.gitignore b/.gitignore
index 2e8db7341..fdd13bb87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,8 @@
 locals.zsh
 log/.zsh_history
 projects.zsh
-custom/*
-!custom/example
+custom
+!custom/plugins/example
 !custom/example.zsh
 cache
 *.swp
diff --git a/custom/example/example.plugin.zsh b/custom/plugins/example/example.plugin.zsh
similarity index 100%
rename from custom/example/example.plugin.zsh
rename to custom/plugins/example/example.plugin.zsh

From dbef8b1a92f789f4109435a3b7278f899e328767 Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Sat, 5 May 2012 10:39:05 +0200
Subject: [PATCH 038/364] Add helper to get the value of an alias only

---
 lib/functions.zsh | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/lib/functions.zsh b/lib/functions.zsh
index d2dcadd0c..b4d89a64a 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -15,3 +15,33 @@ function take() {
   cd $1
 }
 
+#
+# Get the value of an alias.
+#
+# Arguments:
+#    1. alias - The alias to get its value from
+# STDOUT:
+#    The value of alias $1 (if it has one).
+# Return value:
+#    0 if the alias was found,
+#    1 if it does not exist
+#
+function alias_value() {
+    alias "$1" | sed "s/^$1='\(.*\)'$/\1/"
+    test $(alias "$1")
+}
+
+#
+# Try to get the value of an alias,
+# otherwise return the input.
+#
+# Arguments:
+#    1. alias - The alias to get its value from
+# STDOUT:
+#    The value of alias $1, or $1 if there is no alias $1.
+# Return value:
+#    Always 0
+#
+function try_alias_value() {
+    alias_value "$1" || echo "$1"
+}
\ No newline at end of file

From 8f71efc09b42d69cc053649fade92485d282a561 Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Sat, 5 May 2012 10:39:31 +0200
Subject: [PATCH 039/364] Add helper to easily define default values for
 variables and env variables.

---
 lib/functions.zsh | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/lib/functions.zsh b/lib/functions.zsh
index b4d89a64a..3770d4e82 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -44,4 +44,32 @@ function alias_value() {
 #
 function try_alias_value() {
     alias_value "$1" || echo "$1"
+}
+
+#
+# Set variable "$1" to default value "$2" if "$1" is not yet defined.
+#
+# Arguments:
+#    1. name - The variable to set
+#    2. val  - The default value 
+# Return value:
+#    0 if the variable exists, 3 if it was set
+#
+function default() {
+    test `typeset +m "$1"` && return 0
+    typeset -g "$1"="$2"   && return 3
+}
+
+#
+# Set enviroment variable "$1" to default value "$2" if "$1" is not yet defined.
+#
+# Arguments:
+#    1. name - The env variable to set
+#    2. val  - The default value 
+# Return value:
+#    0 if the env variable exists, 3 if it was set
+#
+function env_default() {
+    env | grep -q "^$1=" && return 0 
+    export "$1=$2"       && return 3
 }
\ No newline at end of file

From fcb153c2e32641bb13649bfdd8d3bbe8c17798c8 Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Sat, 5 May 2012 00:05:50 +0200
Subject: [PATCH 040/364] Add the singlechar plugin

---
 plugins/singlechar/singlechar.plugin.zsh | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 plugins/singlechar/singlechar.plugin.zsh

diff --git a/plugins/singlechar/singlechar.plugin.zsh b/plugins/singlechar/singlechar.plugin.zsh
new file mode 100644
index 000000000..1440a6237
--- /dev/null
+++ b/plugins/singlechar/singlechar.plugin.zsh
@@ -0,0 +1,24 @@
+###########################
+# Settings 
+#
+# These can be overwritten any time.
+# If they are not set yet, they will be
+# overwritten with their default values
+
+default GREP grep
+default ROOT sudo
+
+###########################
+# Alias
+
+alias y='"$GREP" -i'
+alias n='"$GREP" -vi'
+
+alias x='xargs'
+alias xy='xargs "$GREP" -i'
+alias xn='xargs "$GREP" -iv'
+
+alias s='"$ROOT"'
+alias sx='"$ROOT" xargs'
+alias sxy='"$ROOT" xargs "$GREP" -i'
+alias sxn='"$ROOT" xargs "$GREP" -iv'
\ No newline at end of file

From f970d8206e9245eb2f78728623fdfff354402644 Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Sat, 5 May 2012 10:52:46 +0200
Subject: [PATCH 041/364] Add cat (+write, +append), enhance formatting

---
 plugins/singlechar/singlechar.plugin.zsh | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/plugins/singlechar/singlechar.plugin.zsh b/plugins/singlechar/singlechar.plugin.zsh
index 1440a6237..3635dd19a 100644
--- a/plugins/singlechar/singlechar.plugin.zsh
+++ b/plugins/singlechar/singlechar.plugin.zsh
@@ -11,14 +11,35 @@ default ROOT sudo
 ###########################
 # Alias
 
+# CAT, GREP
+
 alias y='"$GREP" -i'
 alias n='"$GREP" -vi'
 
+alias c='cat'
+alias w='cat >'
+alias a='cat >>'
+
+# XARGS
+
 alias x='xargs'
+
 alias xy='xargs "$GREP" -i'
 alias xn='xargs "$GREP" -iv'
 
+alias xc='xargs cat'
+alias xw='xargs cat >'
+alias xa='xargs cat >>'
+
+# SUDO
+
 alias s='"$ROOT"'
+
 alias sx='"$ROOT" xargs'
+
 alias sxy='"$ROOT" xargs "$GREP" -i'
-alias sxn='"$ROOT" xargs "$GREP" -iv'
\ No newline at end of file
+alias sxn='"$ROOT" xargs "$GREP" -iv'
+
+alias sxc='"$ROOT" xargs cat'
+alias sxw='"$ROOT" xargs cat >'
+alias sxa='"$ROOT" xargs cat >>'

From 4c0b5c71d5332f6961156fc1cda0ab9cc54b8787 Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Sat, 5 May 2012 10:58:55 +0200
Subject: [PATCH 042/364] Add a description

---
 plugins/singlechar/singlechar.plugin.zsh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/plugins/singlechar/singlechar.plugin.zsh b/plugins/singlechar/singlechar.plugin.zsh
index 3635dd19a..06fa78b9c 100644
--- a/plugins/singlechar/singlechar.plugin.zsh
+++ b/plugins/singlechar/singlechar.plugin.zsh
@@ -1,6 +1,16 @@
+################################################################################
+#          FILE:  singlechar.plugin.zsh
+#   DESCRIPTION:  oh-my-zsh plugin file.
+#        AUTHOR:  Michael Varner (musikmichael@web.de)
+#       VERSION:  1.0.0
+#
+# This plugin adds single char shortcuts (and combinations) for some commands.
+#
+################################################################################
+
 ###########################
 # Settings 
-#
+
 # These can be overwritten any time.
 # If they are not set yet, they will be
 # overwritten with their default values

From e0b271264460219e624ac378c40421490a8e193c Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Sat, 5 May 2012 16:03:48 +0200
Subject: [PATCH 043/364] Add download shortcuts

---
 plugins/singlechar/singlechar.plugin.zsh | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/plugins/singlechar/singlechar.plugin.zsh b/plugins/singlechar/singlechar.plugin.zsh
index 06fa78b9c..f4517d274 100644
--- a/plugins/singlechar/singlechar.plugin.zsh
+++ b/plugins/singlechar/singlechar.plugin.zsh
@@ -17,11 +17,13 @@
 
 default GREP grep
 default ROOT sudo
+default WGET wget
+default CURL curl
 
 ###########################
 # Alias
 
-# CAT, GREP
+# CAT, GREP, CURL, WGET
 
 alias y='"$GREP" -i'
 alias n='"$GREP" -vi'
@@ -30,6 +32,9 @@ alias c='cat'
 alias w='cat >'
 alias a='cat >>'
 
+alias d='"$WGET"'
+alias u='"$CURL"'
+
 # XARGS
 
 alias x='xargs'
@@ -41,6 +46,9 @@ alias xc='xargs cat'
 alias xw='xargs cat >'
 alias xa='xargs cat >>'
 
+alias xd='xargs "$WGET"'
+alias xu='xargs "$CURL"'
+
 # SUDO
 
 alias s='"$ROOT"'
@@ -53,3 +61,6 @@ alias sxn='"$ROOT" xargs "$GREP" -iv'
 alias sxc='"$ROOT" xargs cat'
 alias sxw='"$ROOT" xargs cat >'
 alias sxa='"$ROOT" xargs cat >>'
+
+alias sxd='"$ROOT" xargs "$WGET"'
+alias sxu='"$ROOT" xargs "$CURL"'
\ No newline at end of file

From 712f850f3a860e87458d35a7d8ebba13b9975a06 Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Sat, 5 May 2012 16:07:05 +0200
Subject: [PATCH 044/364] Add pager shortcuts

---
 plugins/singlechar/singlechar.plugin.zsh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/plugins/singlechar/singlechar.plugin.zsh b/plugins/singlechar/singlechar.plugin.zsh
index f4517d274..aadcde423 100644
--- a/plugins/singlechar/singlechar.plugin.zsh
+++ b/plugins/singlechar/singlechar.plugin.zsh
@@ -20,6 +20,8 @@ default ROOT sudo
 default WGET wget
 default CURL curl
 
+env_defaul PAGER less
+
 ###########################
 # Alias
 
@@ -32,6 +34,8 @@ alias c='cat'
 alias w='cat >'
 alias a='cat >>'
 
+alias p='"$PAGER"'
+
 alias d='"$WGET"'
 alias u='"$CURL"'
 
@@ -46,6 +50,8 @@ alias xc='xargs cat'
 alias xw='xargs cat >'
 alias xa='xargs cat >>'
 
+alias xp='xargs "$PAGER"'
+
 alias xd='xargs "$WGET"'
 alias xu='xargs "$CURL"'
 
@@ -62,5 +68,7 @@ alias sxc='"$ROOT" xargs cat'
 alias sxw='"$ROOT" xargs cat >'
 alias sxa='"$ROOT" xargs cat >>'
 
+alias sxp='"$ROOT" xargs "$PAGER"'
+
 alias sxd='"$ROOT" xargs "$WGET"'
 alias sxu='"$ROOT" xargs "$CURL"'
\ No newline at end of file

From 6f5599474f31516cec641242c0bdb391d8930cf2 Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Sat, 5 May 2012 16:08:40 +0200
Subject: [PATCH 045/364] Add sudo without xargs shortcuts

---
 plugins/singlechar/singlechar.plugin.zsh | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/plugins/singlechar/singlechar.plugin.zsh b/plugins/singlechar/singlechar.plugin.zsh
index aadcde423..0a815736d 100644
--- a/plugins/singlechar/singlechar.plugin.zsh
+++ b/plugins/singlechar/singlechar.plugin.zsh
@@ -59,6 +59,19 @@ alias xu='xargs "$CURL"'
 
 alias s='"$ROOT"'
 
+alias sy='"$ROOT" "$GREP" -i'
+alias sn='"$ROOT" "$GREP" -iv'
+
+alias sc='"$ROOT" cat'
+alias sw='"$ROOT" cat >'
+alias sa='"$ROOT" cat >>'
+
+alias sp='"$ROOT" "$PAGER"'
+
+alias sd='"$ROOT" "$WGET"'
+
+# SUDO-XARGS
+
 alias sx='"$ROOT" xargs'
 
 alias sxy='"$ROOT" xargs "$GREP" -i'

From 88f3f28e8c634e54e68769d72f2ec40f7c5d35f9 Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Sat, 5 May 2012 16:10:52 +0200
Subject: [PATCH 046/364] env_defaul=>env_default

---
 plugins/singlechar/singlechar.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/singlechar/singlechar.plugin.zsh b/plugins/singlechar/singlechar.plugin.zsh
index 0a815736d..b6c9665c5 100644
--- a/plugins/singlechar/singlechar.plugin.zsh
+++ b/plugins/singlechar/singlechar.plugin.zsh
@@ -20,7 +20,7 @@ default ROOT sudo
 default WGET wget
 default CURL curl
 
-env_defaul PAGER less
+env_default PAGER less
 
 ###########################
 # Alias

From 67290ffca93d3fb7ebeb9253cc551a5632299c16 Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Sat, 5 May 2012 16:17:26 +0200
Subject: [PATCH 047/364] Enhance writing routines

---
 plugins/singlechar/singlechar.plugin.zsh | 40 ++++++++++++++++--------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/plugins/singlechar/singlechar.plugin.zsh b/plugins/singlechar/singlechar.plugin.zsh
index b6c9665c5..ea9b34324 100644
--- a/plugins/singlechar/singlechar.plugin.zsh
+++ b/plugins/singlechar/singlechar.plugin.zsh
@@ -30,15 +30,20 @@ env_default PAGER less
 alias y='"$GREP" -i'
 alias n='"$GREP" -vi'
 
-alias c='cat'
-alias w='cat >'
-alias a='cat >>'
+alias w='echo >'
+alias a='echo >>'
 
+alias c='cat'
 alias p='"$PAGER"'
 
 alias d='"$WGET"'
 alias u='"$CURL"'
 
+# enhanced writeing
+
+alias w:='cat >'
+alias a:='cat >>'
+
 # XARGS
 
 alias x='xargs'
@@ -46,15 +51,18 @@ alias x='xargs'
 alias xy='xargs "$GREP" -i'
 alias xn='xargs "$GREP" -iv'
 
-alias xc='xargs cat'
-alias xw='xargs cat >'
-alias xa='xargs cat >>'
+alias xw='xargs echo >'
+alias xa='xargs echo >>'
 
+alias xc='xargs cat'
 alias xp='xargs "$PAGER"'
 
 alias xd='xargs "$WGET"'
 alias xu='xargs "$CURL"'
 
+alias xw:='xargs cat >'
+alias xa:='xargs >>'
+
 # SUDO
 
 alias s='"$ROOT"'
@@ -62,14 +70,17 @@ alias s='"$ROOT"'
 alias sy='"$ROOT" "$GREP" -i'
 alias sn='"$ROOT" "$GREP" -iv'
 
-alias sc='"$ROOT" cat'
-alias sw='"$ROOT" cat >'
-alias sa='"$ROOT" cat >>'
+alias sw='"$ROOT" echo >'
+alias sa='"$ROOT" echo >>'
 
+alias sc='"$ROOT" cat'
 alias sp='"$ROOT" "$PAGER"'
 
 alias sd='"$ROOT" "$WGET"'
 
+alias sw:='"$ROOT" cat >'
+alias sa:='"$ROOT" cat >>'
+
 # SUDO-XARGS
 
 alias sx='"$ROOT" xargs'
@@ -77,11 +88,14 @@ alias sx='"$ROOT" xargs'
 alias sxy='"$ROOT" xargs "$GREP" -i'
 alias sxn='"$ROOT" xargs "$GREP" -iv'
 
-alias sxc='"$ROOT" xargs cat'
-alias sxw='"$ROOT" xargs cat >'
-alias sxa='"$ROOT" xargs cat >>'
+alias sxw='"$ROOT" xargs echo >'
+alias sxa='"$ROOT" xargs echo >>'
 
+alias sxc='"$ROOT" xargs cat'
 alias sxp='"$ROOT" xargs "$PAGER"'
 
 alias sxd='"$ROOT" xargs "$WGET"'
-alias sxu='"$ROOT" xargs "$CURL"'
\ No newline at end of file
+alias sxu='"$ROOT" xargs "$CURL"'
+
+alias sxw:='"$ROOT" xargs cat >'
+alias sxa:='"$ROOT" xargs cat >>'
\ No newline at end of file

From 3af5cf3b1d40312101dae89c1d43c9d6afef8fcd Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Thu, 10 May 2012 09:21:50 +0200
Subject: [PATCH 048/364] Add file finders

---
 plugins/singlechar/singlechar.plugin.zsh | 26 +++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/plugins/singlechar/singlechar.plugin.zsh b/plugins/singlechar/singlechar.plugin.zsh
index ea9b34324..cd5191cbd 100644
--- a/plugins/singlechar/singlechar.plugin.zsh
+++ b/plugins/singlechar/singlechar.plugin.zsh
@@ -30,6 +30,12 @@ env_default PAGER less
 alias y='"$GREP" -i'
 alias n='"$GREP" -vi'
 
+alias f.='find .'
+alias f:='find'
+
+alias f='"$GREP" -li'
+alias fn='"$GREP" -lvi'
+
 alias w='echo >'
 alias a='echo >>'
 
@@ -39,7 +45,7 @@ alias p='"$PAGER"'
 alias d='"$WGET"'
 alias u='"$CURL"'
 
-# enhanced writeing
+# enhanced writing
 
 alias w:='cat >'
 alias a:='cat >>'
@@ -51,6 +57,12 @@ alias x='xargs'
 alias xy='xargs "$GREP" -i'
 alias xn='xargs "$GREP" -iv'
 
+alias xf.='xargs find .'
+alias xf:='xargs find'
+
+alias xf='xargs "$GREP" -li'
+alias xfn='xargs "$GREP" -lvi'
+
 alias xw='xargs echo >'
 alias xa='xargs echo >>'
 
@@ -70,6 +82,12 @@ alias s='"$ROOT"'
 alias sy='"$ROOT" "$GREP" -i'
 alias sn='"$ROOT" "$GREP" -iv'
 
+alias xf.='"$ROOT" find .'
+alias xf:='"$ROOT" find'
+
+alias xf='"$ROOT" "$GREP" -li'
+alias xfn='"$ROOT" "$GREP" -lvi'
+
 alias sw='"$ROOT" echo >'
 alias sa='"$ROOT" echo >>'
 
@@ -88,6 +106,12 @@ alias sx='"$ROOT" xargs'
 alias sxy='"$ROOT" xargs "$GREP" -i'
 alias sxn='"$ROOT" xargs "$GREP" -iv'
 
+alias sxf.='"$ROOT" xargs find .'
+alias sxf:='"$ROOT" xargs find'
+
+alias sxf='"$ROOT" xargs "$GREP" -li'
+alias sxfn='"$ROOT" xargs "$GREP" -lvi'
+
 alias sxw='"$ROOT" xargs echo >'
 alias sxa='"$ROOT" xargs echo >>'
 

From 7a338ab6a5208a9f9b9fcbf69d225159fc4ae600 Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Thu, 10 May 2012 09:35:29 +0200
Subject: [PATCH 049/364] Add Man

---
 plugins/singlechar/singlechar.plugin.zsh | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/plugins/singlechar/singlechar.plugin.zsh b/plugins/singlechar/singlechar.plugin.zsh
index cd5191cbd..d44a0e80f 100644
--- a/plugins/singlechar/singlechar.plugin.zsh
+++ b/plugins/singlechar/singlechar.plugin.zsh
@@ -42,6 +42,8 @@ alias a='echo >>'
 alias c='cat'
 alias p='"$PAGER"'
 
+alias m='man'
+
 alias d='"$WGET"'
 alias u='"$CURL"'
 
@@ -69,6 +71,8 @@ alias xa='xargs echo >>'
 alias xc='xargs cat'
 alias xp='xargs "$PAGER"'
 
+alias xm='xargs man'
+
 alias xd='xargs "$WGET"'
 alias xu='xargs "$CURL"'
 
@@ -82,11 +86,11 @@ alias s='"$ROOT"'
 alias sy='"$ROOT" "$GREP" -i'
 alias sn='"$ROOT" "$GREP" -iv'
 
-alias xf.='"$ROOT" find .'
-alias xf:='"$ROOT" find'
+alias sf.='"$ROOT" find .'
+alias sf:='"$ROOT" find'
 
-alias xf='"$ROOT" "$GREP" -li'
-alias xfn='"$ROOT" "$GREP" -lvi'
+alias sf='"$ROOT" "$GREP" -li'
+alias sfn='"$ROOT" "$GREP" -lvi'
 
 alias sw='"$ROOT" echo >'
 alias sa='"$ROOT" echo >>'
@@ -94,6 +98,8 @@ alias sa='"$ROOT" echo >>'
 alias sc='"$ROOT" cat'
 alias sp='"$ROOT" "$PAGER"'
 
+alias sm='"$ROOT" man'
+
 alias sd='"$ROOT" "$WGET"'
 
 alias sw:='"$ROOT" cat >'
@@ -118,6 +124,8 @@ alias sxa='"$ROOT" xargs echo >>'
 alias sxc='"$ROOT" xargs cat'
 alias sxp='"$ROOT" xargs "$PAGER"'
 
+alias sxm='"$ROOT" xargs man'
+
 alias sxd='"$ROOT" xargs "$WGET"'
 alias sxu='"$ROOT" xargs "$CURL"'
 

From d573cddcc937be8c253b97b7343a0670aea3e9b7 Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Tue, 29 May 2012 03:07:15 +0200
Subject: [PATCH 050/364] Enhance file find

---
 plugins/singlechar/singlechar.plugin.zsh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/singlechar/singlechar.plugin.zsh b/plugins/singlechar/singlechar.plugin.zsh
index d44a0e80f..4d3e16b12 100644
--- a/plugins/singlechar/singlechar.plugin.zsh
+++ b/plugins/singlechar/singlechar.plugin.zsh
@@ -30,7 +30,7 @@ env_default PAGER less
 alias y='"$GREP" -i'
 alias n='"$GREP" -vi'
 
-alias f.='find .'
+alias f.='find . | "$GREP"'
 alias f:='find'
 
 alias f='"$GREP" -li'
@@ -59,7 +59,7 @@ alias x='xargs'
 alias xy='xargs "$GREP" -i'
 alias xn='xargs "$GREP" -iv'
 
-alias xf.='xargs find .'
+alias xf.='xargs find . | "$GREP"'
 alias xf:='xargs find'
 
 alias xf='xargs "$GREP" -li'
@@ -86,7 +86,7 @@ alias s='"$ROOT"'
 alias sy='"$ROOT" "$GREP" -i'
 alias sn='"$ROOT" "$GREP" -iv'
 
-alias sf.='"$ROOT" find .'
+alias sf.='"$ROOT" find . | "$GREP"'
 alias sf:='"$ROOT" find'
 
 alias sf='"$ROOT" "$GREP" -li'
@@ -112,7 +112,7 @@ alias sx='"$ROOT" xargs'
 alias sxy='"$ROOT" xargs "$GREP" -i'
 alias sxn='"$ROOT" xargs "$GREP" -iv'
 
-alias sxf.='"$ROOT" xargs find .'
+alias sxf.='"$ROOT" xargs find . | "$GREP"'
 alias sxf:='"$ROOT" xargs find'
 
 alias sxf='"$ROOT" xargs "$GREP" -li'

From b1977d4049cbb7fd203f53511c1067a17150d3e4 Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Sun, 13 May 2012 10:22:45 +0200
Subject: [PATCH 051/364] Make grep recoursive

---
 plugins/singlechar/singlechar.plugin.zsh | 28 ++++++++++++------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/plugins/singlechar/singlechar.plugin.zsh b/plugins/singlechar/singlechar.plugin.zsh
index 4d3e16b12..58837407d 100644
--- a/plugins/singlechar/singlechar.plugin.zsh
+++ b/plugins/singlechar/singlechar.plugin.zsh
@@ -27,14 +27,14 @@ env_default PAGER less
 
 # CAT, GREP, CURL, WGET
 
-alias y='"$GREP" -i'
-alias n='"$GREP" -vi'
+alias y='"$GREP" -Ri'
+alias n='"$GREP" -Rvi'
 
 alias f.='find . | "$GREP"'
 alias f:='find'
 
-alias f='"$GREP" -li'
-alias fn='"$GREP" -lvi'
+alias f='"$GREP" -Rli'
+alias fn='"$GREP" -Rlvi'
 
 alias w='echo >'
 alias a='echo >>'
@@ -56,14 +56,14 @@ alias a:='cat >>'
 
 alias x='xargs'
 
-alias xy='xargs "$GREP" -i'
-alias xn='xargs "$GREP" -iv'
+alias xy='xargs "$GREP" -Ri'
+alias xn='xargs "$GREP" -Riv'
 
 alias xf.='xargs find . | "$GREP"'
 alias xf:='xargs find'
 
-alias xf='xargs "$GREP" -li'
-alias xfn='xargs "$GREP" -lvi'
+alias xf='xargs "$GREP" -Rli'
+alias xfn='xargs "$GREP" -Rlvi'
 
 alias xw='xargs echo >'
 alias xa='xargs echo >>'
@@ -83,14 +83,14 @@ alias xa:='xargs >>'
 
 alias s='"$ROOT"'
 
-alias sy='"$ROOT" "$GREP" -i'
-alias sn='"$ROOT" "$GREP" -iv'
+alias sy='"$ROOT" "$GREP" -Ri'
+alias sn='"$ROOT" "$GREP" -Riv'
 
 alias sf.='"$ROOT" find . | "$GREP"'
 alias sf:='"$ROOT" find'
 
-alias sf='"$ROOT" "$GREP" -li'
-alias sfn='"$ROOT" "$GREP" -lvi'
+alias sf='"$ROOT" "$GREP" -Rli'
+alias sfn='"$ROOT" "$GREP" -Rlvi'
 
 alias sw='"$ROOT" echo >'
 alias sa='"$ROOT" echo >>'
@@ -109,8 +109,8 @@ alias sa:='"$ROOT" cat >>'
 
 alias sx='"$ROOT" xargs'
 
-alias sxy='"$ROOT" xargs "$GREP" -i'
-alias sxn='"$ROOT" xargs "$GREP" -iv'
+alias sxy='"$ROOT" xargs "$GREP" -Ri'
+alias sxn='"$ROOT" xargs "$GREP" -Riv'
 
 alias sxf.='"$ROOT" xargs find . | "$GREP"'
 alias sxf:='"$ROOT" xargs find'

From 0f35726a003e133daf8879aa05ba276ed565c0dd Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Sun, 13 May 2012 10:23:20 +0200
Subject: [PATCH 052/364] Make (s)xf not search in current dir

---
 plugins/singlechar/singlechar.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/singlechar/singlechar.plugin.zsh b/plugins/singlechar/singlechar.plugin.zsh
index 58837407d..44bd998aa 100644
--- a/plugins/singlechar/singlechar.plugin.zsh
+++ b/plugins/singlechar/singlechar.plugin.zsh
@@ -59,7 +59,7 @@ alias x='xargs'
 alias xy='xargs "$GREP" -Ri'
 alias xn='xargs "$GREP" -Riv'
 
-alias xf.='xargs find . | "$GREP"'
+alias xf.='xargs find | "$GREP"'
 alias xf:='xargs find'
 
 alias xf='xargs "$GREP" -Rli'
@@ -112,7 +112,7 @@ alias sx='"$ROOT" xargs'
 alias sxy='"$ROOT" xargs "$GREP" -Ri'
 alias sxn='"$ROOT" xargs "$GREP" -Riv'
 
-alias sxf.='"$ROOT" xargs find . | "$GREP"'
+alias sxf.='"$ROOT" xargs find | "$GREP"'
 alias sxf:='"$ROOT" xargs find'
 
 alias sxf='"$ROOT" xargs "$GREP" -li'

From b7bad0f69b064225a4557667eb1e95d3df8ad819 Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Sun, 6 May 2012 00:05:22 +0200
Subject: [PATCH 053/364] Add the fastfile plugin

---
 plugins/fastfile/fastfile.plugin.zsh | 128 +++++++++++++++++++++++++++
 1 file changed, 128 insertions(+)
 create mode 100644 plugins/fastfile/fastfile.plugin.zsh

diff --git a/plugins/fastfile/fastfile.plugin.zsh b/plugins/fastfile/fastfile.plugin.zsh
new file mode 100644
index 000000000..51e48df5b
--- /dev/null
+++ b/plugins/fastfile/fastfile.plugin.zsh
@@ -0,0 +1,128 @@
+################################################################################
+#          FILE:  fastfile.plugin.zsh
+#   DESCRIPTION:  oh-my-zsh plugin file.
+#        AUTHOR:  Michael Varner (musikmichael@web.de)
+#       VERSION:  1.0.0
+#
+# This plugin adds the ability to on the fly generate and access file shortcuts.
+#
+################################################################################
+
+###########################
+# Settings 
+
+# These can be overwritten any time.
+# If they are not set yet, they will be
+# overwritten with their default values
+
+default fastfile_dir        "${HOME}/.fastfile/"
+default fastfile_var_prefix "§"
+
+###########################
+# Impl
+
+#
+# Generate a shortcut
+#
+# Arguments:
+#    1. name - The name of the shortcut (default: name of the file)
+#    2. file - The file or directory to make the shortcut for
+# STDOUT:
+#    => fastfle_print
+#
+function fastfile() {
+    test "$2" || 2="."
+    2=$(readlink -f "$2")
+    test "$1" || 1="$(basename "$2")"
+
+    mkdir -p "${fastfile_dir}"
+    echo "$2" > "$(fastfile_resolv "$1")"
+
+    fastfile_sync
+    fastfile_print "$1"
+}
+
+#
+# Resolve the location of a shortcut file (the database file, where the value is written!)
+#
+# Arguments:
+#    1. name - The name of the shortcut
+# STDOUT:
+#   The path
+#
+function fastfile_resolv() {
+    echo "${fastfile_dir}${1}"
+}
+
+#
+# Get the real path of a shortcut
+#
+# Arguments:
+#    1. name - The name of the shortcut
+# STDOUT:
+#    The path
+#
+function fastfile_get() {
+    cat "$(fastfile_resolv "$1")"
+}
+
+#
+# Print a shortcut
+#
+# Arguments:
+#    1. name - The name of the shortcut
+# STDOUT:
+#    Name and value of the shortcut
+#
+function fastfile_print() {
+    echo "${fastfile_var_prefix}${1} -> $(fastfile_get "$1")"
+}
+
+#
+# List all shortcuts
+#
+# STDOUT:
+#    (=> fastfle_print) for each shortcut
+#
+function fastfile_ls() {
+    for f in $(ls "${fastfile_dir}"); do
+	fastfile_print "$f"
+    done | column -t
+}
+
+#
+# Remove a shortcut
+#
+# Arguments:
+#    1. name - The name of the shortcut (default: name of the file)
+#    2. file - The file or directory to make the shortcut for
+# STDOUT:
+#    => fastfle_print
+#
+function fastfile_rm() {
+    fastfile_print "$1"
+    rm "$(fastfile_resolv "$1")"
+}
+
+#
+# Generate the aliases for the shortcuts
+#
+function fastfile_sync() {
+    for f in $(ls "${fastfile_dir}"); do
+	alias -g "${fastfile_var_prefix}${f}"="$(fastfile_get "$f")"
+    done
+}
+
+##################################
+# Shortcuts
+
+alias ff=fastfile
+alias ffp=fastfile_print
+alias ffrm=fastfile_rm
+alias ffls=fastfile_ls
+alias ffsync=fastfile_sync
+
+##################################
+# Init 
+
+fastfile_sync
\ No newline at end of file

From 8c18f007131eb242eacae16db85b07f986b08063 Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Sun, 6 May 2012 22:26:12 +0200
Subject: [PATCH 054/364] Enhance handleing of spaces in filenames

---
 plugins/fastfile/fastfile.plugin.zsh | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/plugins/fastfile/fastfile.plugin.zsh b/plugins/fastfile/fastfile.plugin.zsh
index 51e48df5b..775e9483e 100644
--- a/plugins/fastfile/fastfile.plugin.zsh
+++ b/plugins/fastfile/fastfile.plugin.zsh
@@ -32,14 +32,17 @@ default fastfile_var_prefix "§"
 #
 function fastfile() {
     test "$2" || 2="."
-    2=$(readlink -f "$2")
-    test "$1" || 1="$(basename "$2")"
+    file=$(readlink -f "$2")
+    
+    test "$1" || 1="$(basename "$file")"
+    name=$(echo "$1" | tr " " "_")
+
 
     mkdir -p "${fastfile_dir}"
-    echo "$2" > "$(fastfile_resolv "$1")"
+    echo "$file" > "$(fastfile_resolv "$name")"
 
     fastfile_sync
-    fastfile_print "$1"
+    fastfile_print "$name"
 }
 
 #
@@ -85,9 +88,13 @@ function fastfile_print() {
 #    (=> fastfle_print) for each shortcut
 #
 function fastfile_ls() {
-    for f in $(ls "${fastfile_dir}"); do
-	fastfile_print "$f"
-    done | column -t
+    for f in "${fastfile_dir}"/*; do 
+	file=`basename "$f"` # To enable simpler handeling of spaces in file names
+	varkey=`echo "$file" | tr " " "_"`
+
+	# Special format for colums
+	echo "${fastfile_var_prefix}${varkey}|->|$(fastfile_get "$file")"
+    done | column -t -s "|"
 }
 
 #
@@ -108,8 +115,11 @@ function fastfile_rm() {
 # Generate the aliases for the shortcuts
 #
 function fastfile_sync() {
-    for f in $(ls "${fastfile_dir}"); do
-	alias -g "${fastfile_var_prefix}${f}"="$(fastfile_get "$f")"
+    for f in "${fastfile_dir}"/*; do 
+	file=`basename "$f"` # To enable simpler handeling of spaces in file names
+	varkey=`echo "$file" | tr " " "_"`
+
+	alias -g "${fastfile_var_prefix}${varkey}"="'$(fastfile_get "$file")'"
     done
 }
 

From 4f9cfee9bdfcab18bb83d17129f090a62dc05eac Mon Sep 17 00:00:00 2001
From: nXqd <nxqd.inbox@gmail.com>
Date: Thu, 14 Jun 2012 08:06:36 +0300
Subject: [PATCH 055/364] avoid VCS folders

---
 lib/grep.zsh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/grep.zsh b/lib/grep.zsh
index 93c4270b6..25345bd06 100644
--- a/lib/grep.zsh
+++ b/lib/grep.zsh
@@ -2,5 +2,11 @@
 # Color grep results
 # Examples: http://rubyurl.com/ZXv
 #
-export GREP_OPTIONS='--color=auto'
+
+# avoid VCS folders
+GREP_OPTIONS=
+for PATTERN in .cvs .git .hg .svn; do
+    GREP_OPTIONS+="--exclude-dir=$PATTERN "
+done
+export GREP_OPTIONS+='--color=auto '
 export GREP_COLOR='1;32'
\ No newline at end of file

From 0aa4456d5657c957eaf0c54f6eb24e58b9149d4b Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Sat, 30 Jun 2012 01:42:35 +0200
Subject: [PATCH 056/364] Add completion instructions for apt/aptitude commands

---
 plugins/debian/debian.plugin.zsh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index 39d3ef36a..22803ee1b 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -107,6 +107,20 @@ else
         ?not(~n`uname -r`))'\'' root'
 fi
 
+# Completion ################################################################
+
+# TODO: These definitions won't change between apt-get and uptitude automaticaly
+compdef _apt aac="$apt_pref autoclean"
+compdef _apt abd="$apt_pref build-dep"
+compdef _apt ac="$apt_pref clean"
+compdef _apt ad="$apt_pref update"
+compdef _apt afu="$apt_pref update"
+compdef _apt ag="$apt_pref upgrade"
+compdef _apt ai="$apt_pref install"
+compdef _apt ail="$apt_pref install"
+compdef _apt ap="$apt_pref purge"
+compdef _apt ar="$apt_pref remove"
+compdef _apt ads="apt-get dselect-upgrade"
 
 # Misc. #####################################################################
 # print all installed packages

From 7d24f4cd407d61a17bd88157c594215ecc3b0bcd Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Sat, 30 Jun 2012 01:42:47 +0200
Subject: [PATCH 057/364] Use a static apt-get where only apt-get works

---
 plugins/debian/debian.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index 22803ee1b..55e2be06c 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -56,7 +56,7 @@ if [[ $use_sudo -eq 1 ]]; then
     alias ar='sudo $apt_pref remove'
 
     # apt-get only
-    alias ads='sudo $apt_pref dselect-upgrade'
+    alias ads='sudo apt-get dselect-upgrade'
 
     # Install all .deb files in the current directory.
     # Warning: you will need to put the glob in single quotes if you use:

From e3c87611fc75ff5149b13fdd84ee8c87c7c1d129 Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Sat, 30 Jun 2012 01:44:08 +0200
Subject: [PATCH 058/364] Add myself to the authors list

---
 plugins/debian/debian.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index 55e2be06c..c556cb0b5 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -1,6 +1,7 @@
 # Authors:
 # https://github.com/AlexBio
 # https://github.com/dbb
+# https://github.com/Mappleconfusers
 #
 # Debian-related zsh aliases and functions for zsh
 

From 5f37649508f6b6323e78249671d7897af8076886 Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Sat, 30 Jun 2012 04:44:26 +0200
Subject: [PATCH 059/364] Dynamicly generate completion functions to support
 changing apt_pref

---
 plugins/debian/debian.plugin.zsh | 45 +++++++++++++++++++++++---------
 1 file changed, 33 insertions(+), 12 deletions(-)

diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index c556cb0b5..b6f9fd2bf 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -110,18 +110,39 @@ fi
 
 # Completion ################################################################
 
-# TODO: These definitions won't change between apt-get and uptitude automaticaly
-compdef _apt aac="$apt_pref autoclean"
-compdef _apt abd="$apt_pref build-dep"
-compdef _apt ac="$apt_pref clean"
-compdef _apt ad="$apt_pref update"
-compdef _apt afu="$apt_pref update"
-compdef _apt ag="$apt_pref upgrade"
-compdef _apt ai="$apt_pref install"
-compdef _apt ail="$apt_pref install"
-compdef _apt ap="$apt_pref purge"
-compdef _apt ar="$apt_pref remove"
-compdef _apt ads="apt-get dselect-upgrade"
+#
+# Registers a compdef for $1 that calls $apt_pref with the commands $2
+# To do that it creates a new completion function called _apt_pref_$2
+#
+apt_pref_compdef() {
+    local f fb
+    f="_apt_pref_${2}"
+
+    fb="function ${f}() {
+        shift words; 
+	service=\"\$apt_pref\"; 
+	words=(\"\$apt_pref\" '$2' \$words); 
+	((CURRENT++))
+	test \"\${apt_pref}\" = 'aptitude' && _aptitude || _apt
+    }"
+    
+    eval "$fb"
+    echo "$fb"
+
+    compdef "$f" "$1"
+}
+
+apt_pref_compdef aac "autoclean"
+apt_pref_compdef abd "build-dep"
+apt_pref_compdef ac  "clean"
+apt_pref_compdef ad  "update"
+apt_pref_compdef afu "update"
+apt_pref_compdef ag  "upgrade"
+apt_pref_compdef ai  "install"
+apt_pref_compdef ail "install"
+apt_pref_compdef ap  "purge"
+apt_pref_compdef ar  "remove"
+apt_pref_compdef ads "dselect-upgrade"
 
 # Misc. #####################################################################
 # print all installed packages

From 1b36c1beae21dafead692f83a099bdd69a0c6e50 Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Sat, 30 Jun 2012 05:37:10 +0200
Subject: [PATCH 060/364] Remove debug info

---
 plugins/debian/debian.plugin.zsh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index b6f9fd2bf..722b83c30 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -118,16 +118,13 @@ apt_pref_compdef() {
     local f fb
     f="_apt_pref_${2}"
 
-    fb="function ${f}() {
+    eval "function ${f}() {
         shift words; 
 	service=\"\$apt_pref\"; 
 	words=(\"\$apt_pref\" '$2' \$words); 
 	((CURRENT++))
 	test \"\${apt_pref}\" = 'aptitude' && _aptitude || _apt
     }"
-    
-    eval "$fb"
-    echo "$fb"
 
     compdef "$f" "$1"
 }

From 4d0c135798368a6241752060ffc6a2190a94a810 Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Tue, 10 Jul 2012 14:49:32 +0200
Subject: [PATCH 061/364] added completion for all asadmin subcommands

---
 plugins/glassfish/_asadmin | 345 +++++++++++++++++++++++++++++++++++++
 1 file changed, 345 insertions(+)
 create mode 100644 plugins/glassfish/_asadmin

diff --git a/plugins/glassfish/_asadmin b/plugins/glassfish/_asadmin
new file mode 100644
index 000000000..c8f62c67c
--- /dev/null
+++ b/plugins/glassfish/_asadmin
@@ -0,0 +1,345 @@
+#compdef asadmin
+#autoload
+
+local -a _1st_arguments
+_1st_arguments=(
+    "add-library:adds one or more library JAR files to GlassFish Server"
+    "add-resources:creates the resources specified in an XML file"
+    "apply-http-lb-changes:applies load balancer configuration changes to the load balancer"
+    "backup-domain:performs a backup on the domain"
+    "change-admin-password:changes the administrator password"
+    "change-master-broker:changes the master broker in a Message Queue cluster providing JMS services for a GlassFish Server cluster."
+    "change-master-password:changes the master password"
+    "collect-log-files:creates a ZIP archive of all available log files"
+    "configure-jms-cluster:configures the Message Queue cluster providing JMS services to a GlassFish Server cluster"
+    "configure-lb-weight:sets load balancing weights for clustered instances"
+    "configure-ldap-for-admin:configures the authentication realm named admin-realm for the given LDAP"
+    "copy-config:copies an existing named configuration to create another configuration"
+    "create-admin-object:adds the administered object with the specified JNDI name for a resource adapter"
+    "create-application-ref:creates a reference to an application"
+    "create-audit-module:adds an audit module"
+    "create-auth-realm:adds the named authentication realm"
+    "create-cluster:creates a GlassFish Server cluster"
+    "create-connector-connection-pool:adds a connection pool with the specified connection pool name"
+    "create-connector-resource:registers the connector resource with the specified JNDI name"
+    "create-connector-security-map:creates a security map for the specified connector connection pool"
+    "create-connector-work-security-map:creates a work security map for the specified resource adapter"
+    "create-custom-resource:creates a custom resource"
+    "create-domain:creates a domain"
+    "create-file-user:creates a new file user"
+    "create-http:sets HTTP parameters for a protocol"
+    "create-http-health-checker:creates a health-checker for a specified load balancer configuration"
+    "create-http-lb:creates a load balancer"
+    "create-http-lb-config:creates a configuration for the load balancer"
+    "create-http-lb-ref:adds an existing cluster or server instance to an existing load balancer configuration or load balancer"
+    "create-http-listener:adds a new HTTP network listener socket"
+    "create-http-redirect:adds a new HTTP redirect"
+    "create-iiop-listener:adds an IIOP listener"
+    "create-instance:creates a GlassFish Server instance"
+    "create-jacc-provider:enables administrators to create a JACC provider that can be used by third-party authorization modules for applications running in GlassFish Server"
+    "create-javamail-resource:creates a JavaMail session resource"
+    "create-jdbc-connection-pool:registers a JDBC connection pool"
+    "create-jdbc-resource:creates a JDBC resource with the specified JNDI name"
+    "create-jms-host:creates a JMS host"
+    "create-jms-resource:creates a JMS resource"
+    "create-jmsdest:creates a JMS physical destination"
+    "create-jndi-resource:registers a JNDI resource"
+    "create-jvm-options:creates options for the Java application launcher"
+    "create-lifecycle-module:creates a lifecycle module"
+    "create-local-instance:creates a GlassFish Server instance on the host where the subcommand is run"
+    "create-message-security-provider:enables administrators to create a message security provider, which specifies how SOAP messages will be secured."
+    "create-network-listener:adds a new network listener socket"
+    "create-node-config:creates a node that is not enabled for remote communication"
+    "create-node-dcom:creates a node that is enabled for com munication over DCOM"
+    "create-node-ssh:creates a node that is enabled for communication over SSH"
+    "create-password-alias:creates a password alias"
+    "create-profiler:creates the profiler element"
+    "create-protocol:adds a new protocol"
+    "create-protocol-filter:adds a new protocol filter"
+    "create-protocol-finder:adds a new protocol finder"
+    "create-resource-adapter-config:creates the configuration information for the connector module"
+    "create-resource-ref:creates a reference to a resource"
+    "create-service:configures the starting of a DAS or a GlassFish Server instance on an unattended boot"
+    "create-ssl:creates and configures the SSL element in the selected HTTP listener, IIOP listener, or IIOP service"
+    "create-system-properties:adds one or more system property elements that can be referenced elsewhere in the configuration."
+    "create-threadpool:adds a thread pool"
+    "create-transport:adds a new transport"
+    "create-virtual-server:creates the named virtual server"
+    "delete-admin-object:removes the administered object with the specified JNDI name."
+    "delete-application-ref:removes a reference to an applica tion"
+    "delete-audit-module:removes the named audit-module"
+    "delete-auth-realm:removes the named authentication realm"
+    "delete-cluster:deletes a GlassFish Server cluster"
+    "delete-config:deletes an existing named configuration"
+    "delete-connector-connection-pool:removes the specified connector connection pool"
+    "delete-connector-resource:removes the connector resource with the specified JNDI name"
+    "delete-connector-security-map:deletes a security map for the specified connector connection pool"
+    "delete-connector-work-security-map:deletes a work security map for the specified resource adapter"
+    "delete-custom-resource:removes a custom resource"
+    "delete-domain:deletes a domain"
+    "delete-file-user:removes the named file user"
+    "delete-http:removes HTTP parameters from a protocol"
+    "delete-http-health-checker:deletes the health-checker for a specified load balancer configuration"
+    "delete-http-lb:deletes a load balancer"
+    "delete-http-lb-config:deletes a load balancer configuration"
+    "delete-http-lb-ref:deletes the cluster or server instance from a load balancer"
+    "delete-http-listener:removes a network listener"
+    "delete-http-redirect:removes an HTTP redirect"
+    "delete-iiop-listener:removes an IIOP listener"
+    "delete-instance:deletes a GlassFish Server instance"
+    "delete-jacc-provider:enables administrators to delete JACC providers defined for a domain"
+    "delete-javamail-resource:removes a JavaMail session resource"
+    "delete-jdbc-connection-pool:removes the specified JDBC connection pool"
+    "delete-jdbc-resource:removes a JDBC resource with the specified JNDI name"
+    "delete-jms-host:removes a JMS host"
+    "delete-jms-resource:removes a JMS resource"
+    "delete-jmsdest:removes a JMS physical destination"
+    "delete-jndi-resource:removes a JNDI resource"
+    "delete-jvm-options:removes one or more options for the Java application launcher"
+    "delete-lifecycle-module:removes the lifecycle module"
+    "delete-local-instance:deletes a GlassFish Server instance on the machine where the subcommand is run"
+    "delete-log-levels:"
+    "delete-message-security-provider:enables administrators to delete a message security provider"
+    "delete-network-listener:removes a network listener"
+    "delete-node-config:deletes a node that is not enabled for remote communication"
+    "delete-node-dcom:deletes a node that is enabled for communication over DCOM"
+    "delete-node-ssh:deletes a node that is enabled for communication over SSH"
+    "delete-password-alias:deletes a password alias"
+    "delete-profiler:removes the profiler element"
+    "delete-protocol:removes a protocol"
+    "delete-protocol-filter:removes a protocol filter"
+    "delete-protocol-finder:removes a protocol finder"
+    "delete-resource-adapter-config:deletes the resource adapter configuration"
+    "delete-resource-ref:removes a reference to a resource"
+    "delete-ssl:deletes the SSL element in the selected HTTP listener, IIOP listener, or IIOP service"
+    "delete-system-property:removes a system property of the domain, configuration, cluster, or server instance, one at a time"
+    "delete-threadpool:removes a thread pool"
+    "delete-transport:removes a transport"
+    "delete-virtual-server:removes a virtual server"
+    "deploy:deploys the specified component"
+    "deploydir:deploys an exploded format of application archive"
+    "environment variable"
+    "disable:disables the component"
+    "disable-http-lb-application:disables an application managed by a load balancer"
+    "disable-http-lb-server:disables a sever or cluster managed by a load balancer"
+    "disable-monitoring:disables monitoring for the server or for specific monitorable modules"
+    "disable-secure-admin:disables secure admin if it is already enabled."
+    "disable-secure-admin-internal-user:Instructs the GlassFish Server DAS and instances to not use the specified admin user to authenticate with each other and to authorize admin operations."
+    "disable-secure-admin-principal:disables the certificate for authorizing access in secure administration."
+    "enable:enables the component"
+    "enable-http-lb-application:enables a previously-disabled application managed by a load balancer"
+    "enable-http-lb-server:enables a previously disabled sever or cluster managed by a load balancer"
+    "enable-monitoring:enables monitoring for the server or for specific monitorable modules"
+    "enable-secure-admin:enables secure admin (if it is not already enabled), optionally changing the alias used for DAS-to-instance admin messages or the alias used for instance-to-DAS admin messages."
+    "enable-secure-admin-internal-user:Instructs the GlassFish Server DAS and instances to use the specified admin user and the password associated with the password alias to authenticate with each other and to authorize admin operations."
+    "enable-secure-admin-principal:Instructs GlassFish Server, when secure admin is enabled, to accept admin requests from clients identified by the specified SSL certificate."
+    "export:marks a variable name for automatic export to the environment of subsequent commands in multimode"
+    "export-http-lb-config:exports the load balancer configuration or load balancer to a file"
+    "export-sync-bundle:exports the configuration data of a cluster or standalone instance to an archive file"
+    "flush-connection-pool:reintializes all connections established in the specified connection pool"
+    "flush-jmsdest:purges messages in a JMS destination."
+    "freeze-transaction-service:freezes the transaction subsystem"
+    "generate-domain-schema:"
+    "generate-jvm-report:shows the JVM machine statistics for a given target instance"
+    "get:gets the values of configurable or monitorable attributes"
+    "get-client-stubs:retrieves the application JAR files needed to launch the application client."
+    "get-health:provides information on the cluster health"
+    "asadmin:utility for performing administrative tasks for Oracle GlassFish Server"
+    "import-sync-bundle:imports the configuration data of a clustered instance or standalone instance from an archive file"
+    "install-node:installs GlassFish Server software on specified SSH-enabled hosts"
+    "install-node-dcom:installs GlassFish Server software on specified DCOM-enabled hosts"
+    "install-node-ssh:installs GlassFish Server software on specified SSH-enabled hosts"
+    "jms-ping:checks if the JMS service is up and running"
+    "list:lists configurable or monitorable elements"
+    "list-admin-objects:gets all the administered objects"
+    "list-application-refs:lists the existing application references"
+    "list-applications:lists deployed applications"
+    "list-audit-modules:gets all audit modules and displays them"
+    "list-auth-realms:lists the authentication realms"
+    "list-backups:lists all backups"
+    "list-clusters:lists existing clusters in a domain"
+    "list-commands:lists available commands"
+    "list-components:lists deployed components"
+    "list-configs:lists named configurations"
+    "list-connector-connection-pools:lists the existing connector connection pools"
+    "list-connector-resources:lists all connector resources"
+    "list-connector-security-maps:lists the security maps belonging to the specified connector connection pool"
+    "list-connector-work-security-maps:lists the work security maps belonging to the specified resource adapter"
+    "list-containers:lists application containers"
+    "list-custom-resources:gets all custom resources"
+    "list-domains:lists the domains in the specified directory"
+    "list-file-groups:lists file groups"
+    "list-file-users:lists the file users"
+    "list-http-lb-configs:lists load balancer configurations"
+    "list-http-lbs:lists load balancers"
+    "list-http-listeners:lists the existing network listeners"
+    "list-iiop-listeners:lists the existing IIOP listeners"
+    "list-instances:lists GlassFish Server instances in a domain"
+    "list-jacc-providers:enables administrators to list JACC providers defined for a domain"
+    "list-javamail-resources:lists the existing JavaMail session resources"
+    "list-jdbc-connection-pools:lists all JDBC connection pools"
+    "list-jdbc-resources:lists all JDBC resources"
+    "list-jms-hosts:lists the existing JMS hosts"
+    "list-jms-resources:lists the JMS resources"
+    "list-jmsdest:lists the existing JMS physical destinations"
+    "list-jndi-entries:browses and queries the JNDI tree"
+    "list-jndi-resources:lists all existing JNDI resources"
+    "list-jvm-options:lists options for the Java application launcher"
+    "list-libraries:lists library JAR files on GlassFish Server"
+    "list-lifecycle-modules:lists the lifecycle modules"
+    "list-log-attributes:lists all logging attributes defined for a specified target in a domain"
+    "list-log-levels:lists the loggers and their log levels"
+    "list-message-security-providers:lists all security message providers for the given message layer"
+    "list-modules:lists GlassFish Server modules"
+    "list-network-listeners:lists the existing network listeners"
+    "list-nodes:lists all GlassFish Server nodes in a domain"
+    "list-nodes-config:lists all GlassFish Server nodes that do not support remote communication in a domain"
+    "list-nodes-dcom:lists all GlassFish Server nodes that support communication over DCOM in a domain"
+    "list-nodes-ssh:lists all GlassFish Server nodes that support communication over SSH in a domain"
+    "list-password-aliases:lists all password aliases"
+    "list-persistence-types:lists registered persistence types for HTTP sessions and SFSB instances"
+    "list-protocol-filters:lists the existing protocol filters"
+    "list-protocol-finders:lists the existing protocol finders"
+    "list-protocols:lists the existing protocols"
+    "list-resource-adapter-configs:lists the names of the current resource adapter configurations"
+    "list-resource-refs:lists existing resource references"
+    "list-secure-admin-internal-users:lists the user names that the GlassFish Server DAS and instances use to authenticate with each other and to authorize admin operations."
+    "list-secure-admin-principals:lists the certificates for which GlassFish Server accepts admin requests from clients."
+    "list-sub-components:lists EJB or servlet components in a deployed module or module of a deployed application"
+    "list-supported-cipher-suites:enables administrators to list the cipher suites that are supported and available to a specified GlassFish Server target"
+    "list-system-properties:lists the system properties of the domain, configuration, cluster, or server instance"
+    "list-threadpools:lists all the thread pools"
+    "list-timers:lists all of the persistent timers owned by server instance(s)"
+    "list-transports:lists the existing transports"
+    "list-virtual-servers:lists the existing virtual servers"
+    "list-web-context-param:lists servlet contextinitialization parameters of a deployed web application or module"
+    "list-web-env-entry:lists environment entries for a deployed web application or module"
+    "login:logs you into a domain"
+    "migrate-timers:moves EJB timers when a clustered instance was stopped or has crashed"
+    "monitor:displays monitoring data for commonly used components and services"
+    "multimode:allows multiple subcommands to be run while preserving environment settings and remaining in the asadmin utility"
+    "ping-connection-pool:tests if a connection pool is usable"
+    "ping-node-dcom:tests if a node that is enabled for communication over DCOM is usable"
+    "ping-node-ssh:tests if a node that is enabled for communication over SSH is usable"
+    "recover-transactions:manually recovers pending transactions"
+    "redeploy:redeploys the specified component"
+    "remove-library:removes one or more library JAR files from GlassFish Server"
+    "restart-domain:restarts the DAS of the specified domain"
+    "restart-instance:restarts a running GlassFish Server instance"
+    "restart-local-instance:restarts a running GlassFish Server instance on the host where the subcommand is run"
+    "restore-domain:restores files from backup"
+    "rollback-transaction:rolls back the named transaction"
+    "rotate-log:rotates the log file"
+    "set:sets the values of configurable attributes"
+    "set-log-attributes:sets the logging attributes for one or more loggers"
+    "set-log-levels:sets the log level for one or more loggers"
+    "set-web-context-param:sets a servlet context initialization parameter of a deployed web application or module"
+    "set-web-env-entry:sets an environment entry for a deployed web application or module"
+    "setup-ssh:sets up an SSH key on specified hosts"
+    "show-component-status:displays the status of the deployed component"
+    "start-cluster:starts a cluster"
+    "start-database:starts the Java DB"
+    "start-domain:starts the DAS of the specified domain"
+    "start-instance:starts a GlassFish Server instance"
+    "start-local-instance:starts a GlassFish Server instance on the host where the subcommand is run"
+    "stop-cluster:stops a GlassFish Server cluster"
+    "stop-database:stops the Java DB"
+    "stop-domain:stops the Domain Administration Server of the specified domain"
+    "stop-instance:stops a running GlassFish Server instance"
+    "stop-local-instance:stops a GlassFish Server instance on the machine where the subcommand is run"
+    "undeploy:removes a deployed component"
+    "unfreeze-transaction-service:resumes all suspended transactions"
+    "uninstall-node:uninstalls GlassFish Server software from specified hosts"
+    "uninstall-node-dcom:uninstalls GlassFish Server software from specified DCOM-enabled hosts"
+    "uninstall-node-ssh:uninstalls GlassFish Server software from specified SSH-enabled hosts"
+    "unset:removes one or more variables from the multimode environment"
+    "unset-web-context-param:unsets a servlet context initialization parameter of a deployed web application or module"
+    "unset-web-env-entry:unsets an environment entry for a deployed web application or module"
+    "update-connector-security-map:modifies a security map for the specified connector connection pool"
+    "update-connector-work-security-map:modifies a work security map for the specified resource adapter"
+    "update-file-user:updates a current file user as specified"
+    "update-node-config:updates the configuration data of anode"
+    "update-node-dcom:updates the configuration data of a node"
+    "update-node-ssh:updates the configuration data of a node"
+    "update-password-alias:updates a password alias"
+    "uptime:returns the length of time that the DAS has been running"
+    "validate-dcom:tests the connection over DCOM to a remote host"
+    "validate-multicast:validates that multicast transport is available for clusters"
+    "verify-domain-xml:verifies the content of the domain.xml file"
+    "version:displays version information forGlassFish Server"
+)
+
+_arguments '*:: :->command'
+
+if (( CURRENT == 1 )); then
+    _describe -t commands "glassfish command" _1st_arguments
+    return
+fi
+
+local -a _command_args
+case "$words[1]" in
+    apps:info)
+        _command_args=(
+            '(-r|--raw)'{-r,--raw}'[output info as raw key/value pairs]' \
+                )
+        ;;
+    apps:create)
+        _command_args=(
+            '(-a|--addons)'{-a,--addons}'[a list of addons to install]' \
+                '(-r|--remote)'{-r,--remote}'[the git remote to create, default "heroku"]' \
+                '(-s|--stack)'{-s,--stack}'[the stack on which to create the app]' \
+                )
+        ;;
+    config)
+        _command_args=(
+            '(-s|--shell)'{-s,--shell}'[output config vars in shell format]' \
+                )
+        ;;
+    db:push)
+        _command_args=(
+            '(-c|--chunksize)'{-c,--chunksize}'[specify the number of rows to send in each batch]' \
+                '(-d|--debug)'{-d,--debug}'[enable debugging output]' \
+                '(-e|--exclude)'{-e,--exclude}'[exclude the specified tables from the push]' \
+                '(-f|--filter)'{-f,--filter}'[only push certain tables]' \
+                '(-r|--resume)'{-r,--resume}'[resume transfer described by a .dat file]' \
+                '(-t|--tables)'{-t,--tables}'[only push the specified tables]' \
+                )
+        ;;
+    db:pull)
+        _command_args=(
+            '(-c|--chunksize)'{-c,--chunksize}'[specify the number of rows to send in each batch]' \
+                '(-d|--debug)'{-d,--debug}'[enable debugging output]' \
+                '(-e|--exclude)'{-e,--exclude}'[exclude the specified tables from the pull]' \
+                '(-f|--filter)'{-f,--filter}'[only pull certain tables]' \
+                '(-r|--resume)'{-r,--resume}'[resume transfer described by a .dat file]' \
+                '(-t|--tables)'{-t,--tables}'[only pull the specified tables]' \
+                )
+        ;;
+    keys)
+        _command_args=(
+            '(-l|--long)'{-l,--long}'[display extended information for each key]' \
+                )
+        ;;
+    logs)
+        _command_args=(
+            '(-n|--num)'{-n,--num}'[the number of lines to display]' \
+                '(-p|--ps)'{-p,--ps}'[only display logs from the given process]' \
+                '(-s|--source)'{-s,--source}'[only display logs from the given source]' \
+                '(-t|--tail)'{-t,--tail}'[continually stream logs]' \
+                )
+        ;;
+    pgbackups:capture)
+        _command_args=(
+            '(-e|--expire)'{-e,--expire}'[if no slots are available to capture, delete the oldest backup to make room]' \
+                )
+        ;;
+    stack)
+        _command_args=(
+            '(-a|--all)'{-a,--all}'[include deprecated stacks]' \
+                )
+        ;;
+esac
+
+_arguments \
+    $_command_args \
+    &&  return 0

From d2116f355742ffe3f0c44ee865d136cb979eedea Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Tue, 10 Jul 2012 14:57:59 +0200
Subject: [PATCH 062/364] apparently, this file must exist for the plugin to
 load

---
 plugins/glassfish/_glassfish | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 plugins/glassfish/_glassfish

diff --git a/plugins/glassfish/_glassfish b/plugins/glassfish/_glassfish
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/plugins/glassfish/_glassfish
@@ -0,0 +1 @@
+

From 350720eca171513a5e959d01dbeceaf15f268c5c Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Thu, 12 Jul 2012 14:05:33 +0200
Subject: [PATCH 063/364] added completions for all known arguments to all
 known commands

---
 plugins/glassfish/_asadmin | 684 +++++++++++++++++++++++++++++++++----
 1 file changed, 624 insertions(+), 60 deletions(-)

diff --git a/plugins/glassfish/_asadmin b/plugins/glassfish/_asadmin
index c8f62c67c..08ae9d461 100644
--- a/plugins/glassfish/_asadmin
+++ b/plugins/glassfish/_asadmin
@@ -278,66 +278,630 @@ fi
 
 local -a _command_args
 case "$words[1]" in
-    apps:info)
-        _command_args=(
-            '(-r|--raw)'{-r,--raw}'[output info as raw key/value pairs]' \
-                )
-        ;;
-    apps:create)
-        _command_args=(
-            '(-a|--addons)'{-a,--addons}'[a list of addons to install]' \
-                '(-r|--remote)'{-r,--remote}'[the git remote to create, default "heroku"]' \
-                '(-s|--stack)'{-s,--stack}'[the stack on which to create the app]' \
-                )
-        ;;
-    config)
-        _command_args=(
-            '(-s|--shell)'{-s,--shell}'[output config vars in shell format]' \
-                )
-        ;;
-    db:push)
-        _command_args=(
-            '(-c|--chunksize)'{-c,--chunksize}'[specify the number of rows to send in each batch]' \
-                '(-d|--debug)'{-d,--debug}'[enable debugging output]' \
-                '(-e|--exclude)'{-e,--exclude}'[exclude the specified tables from the push]' \
-                '(-f|--filter)'{-f,--filter}'[only push certain tables]' \
-                '(-r|--resume)'{-r,--resume}'[resume transfer described by a .dat file]' \
-                '(-t|--tables)'{-t,--tables}'[only push the specified tables]' \
-                )
-        ;;
-    db:pull)
-        _command_args=(
-            '(-c|--chunksize)'{-c,--chunksize}'[specify the number of rows to send in each batch]' \
-                '(-d|--debug)'{-d,--debug}'[enable debugging output]' \
-                '(-e|--exclude)'{-e,--exclude}'[exclude the specified tables from the pull]' \
-                '(-f|--filter)'{-f,--filter}'[only pull certain tables]' \
-                '(-r|--resume)'{-r,--resume}'[resume transfer described by a .dat file]' \
-                '(-t|--tables)'{-t,--tables}'[only pull the specified tables]' \
-                )
-        ;;
-    keys)
-        _command_args=(
-            '(-l|--long)'{-l,--long}'[display extended information for each key]' \
-                )
-        ;;
-    logs)
-        _command_args=(
-            '(-n|--num)'{-n,--num}'[the number of lines to display]' \
-                '(-p|--ps)'{-p,--ps}'[only display logs from the given process]' \
-                '(-s|--source)'{-s,--source}'[only display logs from the given source]' \
-                '(-t|--tail)'{-t,--tail}'[continually stream logs]' \
-                )
-        ;;
-    pgbackups:capture)
-        _command_args=(
-            '(-e|--expire)'{-e,--expire}'[if no slots are available to capture, delete the oldest backup to make room]' \
-                )
-        ;;
-    stack)
-        _command_args=(
-            '(-a|--all)'{-a,--all}'[include deprecated stacks]' \
-                )
-        ;;
+	add-library)
+		_command_args=('--type')
+	;;
+	add-resources)
+		_command_args=('--target')
+	;;
+	apply-http-lb-changes)
+		_command_args=('--ping')
+	;;
+	backup-domain)
+		_command_args=('--backupconfig' '--backupdir' '--description' '--domaindir' '--long')
+	;;
+	change-admin-password)
+		_command_args=('--domain_name' '--domaindir')
+	;;
+	change-master-password)
+		_command_args=('--domaindir' '--nodedir' '--savemasterpassword')
+	;;
+	collect-log-files)
+		_command_args=('--retrieve' '--target')
+	;;
+	configure-jms-cluster)
+		_command_args=('--clustertype' '--configstoretype' '--dburl' '--dbuser' '--dbvendor' '--jmsdbpassword' '--messagestoretype' '--property')
+	;;
+	configure-lb-weight)
+		_command_args=('--cluster')
+	;;
+	configure-ldap-for-admin)
+		_command_args=('--basedn' '--ldap-group' '--target' '--url')
+	;;
+	copy-config)
+		_command_args=('--systemproperties')
+	;;
+	create-admin-object)
+		_command_args=('--classname' '--description' '--enabled' '--property' '--raname' '--restype' '--target')
+	;;
+	create-application-ref)
+		_command_args=('--enabled' '--lbenabled' '--target' '--virtualservers')
+	;;
+	create-audit-module)
+		_command_args=('--classname' '--property' '--target')
+	;;
+	create-auth-realm)
+		_command_args=('--classname' '--property' '--target')
+	;;
+	create-connector-connection-pool)
+		_command_args=('--associatewiththread' '--connectiondefinition' '--creationretryattempts' '--creationretryinterval' '--description' '--failconnection' '--idletimeout' '--isconnectvalidatereq' '--lazyconnectionassociation' '--lazyconnectionenlistment' '--leakreclaim' '--leaktimeout' '--matchconnections' '--maxconnectionusagecount' '--maxpoolsize' '--maxwait' '--ping' '--pooling' '--poolresize' '--property' '--raname' '--steadypoolsize' '--target' '--transactionsupport' '--validateatmostonceperiod')
+	;;
+	create-connector-resource)
+		_command_args=('--description' '--enabled' '--objecttype' '--poolname' '--property' '--target')
+	;;
+	create-connector-security-map)
+		_command_args=('--mappedpassword' '--mappedusername' '--poolname' '--principals' '--target' '--usergroups')
+	;;
+	create-connector-work-security-map)
+		_command_args=('--description' '--groupsmap' '--principalsmap' '--raname')
+	;;
+	create-custom-resource)
+		_command_args=('--description' '--enabled' '--factoryclass' '--property' '--restype' '--target')
+	;;
+	create-domain)
+		_command_args=('--adminport' '--checkports' '--domaindir' '--domainproperties' '--instanceport' '--keytooloptions' '--nopassword' '--portbase' '--profile' '--savelogin' '--savemasterpassword' '--template' '--usemasterpassword')
+	;;
+	create-file-user)
+		_command_args=('--authrealmname' '--groups' '--target' '--userpassword')
+	;;
+	create-http)
+		_command_args=('--default-virtual-server' '--dns-lookup-enabled' '--max-connection' '--request-timeout-seconds' '--servername' '--target' '--timeout-seconds' '--xpowered')
+	;;
+	create-http-health-checker)
+		_command_args=('--config' '--interval' '--timeout' '--url')
+	;;
+	create-http-lb)
+		_command_args=('--autoapplyenabled' '--devicehost' '--deviceport' '--healthcheckerinterval' '--healthcheckertimeout' '--healthcheckerurl' '--httpsrouting' '--lbenableallapplications' '--lbenableallinstances' '--lbpolicy' '--lbpolicymodule' '--lbweight' '--monitor' '--property' '--reloadinterval' '--responsetimeout' '--routecookie' '--sslproxyhost' '--sslproxyport' '--target')
+	;;
+	create-http-lb-ref)
+		_command_args=('--config' '--healthcheckerinterval' '--healthcheckertimeout' '--healthcheckerurl' '--lbenableallapplications' '--lbenableallinstances' '--lbname' '--lbpolicy' '--lbpolicymodule' '--lbweight')
+	;;
+	create-http-listener)
+		_command_args=('--acceptorthreads' '--default-virtual-server' '--defaultvs' '--enabled' '--listeneraddress' '--listenerport' '--redirectport' '--secure' '--securityenabled' '--servername' '--target' '--xpowered')
+	;;
+	create-http-redirect)
+		_command_args=('--redirect-port' '--secure-redirect' '--target')
+	;;
+	create-iiop-listener)
+		_command_args=('--enabled' '--iiopport' '--listeneraddress' '--property' '--securityenabled' '--target')
+	;;
+	create-instance)
+		_command_args=('--checkports' '--cluster' '--config' '--lbenabled' '--node' '--portbase' '--systemproperties' '--terse')
+	;;
+	create-jacc-provider)
+		_command_args=('--policyconfigfactoryclass' '--policyproviderclass' '--property' '--target')
+	;;
+	create-javamail-resource)
+		_command_args=('--debug' '--description' '--enabled' '--fromaddress' '--mailhost' '--mailuser' '--property' '--storeprotocol' '--storeprotocolclass' '--target' '--transprotocol' '--transprotocolclass')
+	;;
+	create-jdbc-connection-pool)
+		_command_args=('--allownoncomponentcallers' '--associatewiththread' '--creationretryattempts' '--creationretryinterval' '--datasourceclassname' '--description' '--driverclassname' '--failconnection' '--idletimeout' '--initsql' '--isconnectvalidatereq' '--isisolationguaranteed' '--isolationlevel' '--lazyconnectionassociation' '--lazyconnectionenlistment' '--leakreclaim' '--leaktimeout' '--matchconnections' '--maxconnectionusagecount' '--maxpoolsize' '--maxwait' '--nontransactionalconnections' '--ping' '--pooling' '--poolresize' '--property' '--restype' '--sqltracelisteners' '--statementcachesize' '--statementleakreclaim' '--statementleaktimeout' '--statementtimeout' '--steadypoolsize' '--target' '--validateatmostonceperiod' '--validationclassname' '--validationmethod' '--validationtable' '--wrapjdbcobjects')
+	;;
+	create-jdbc-resource)
+		_command_args=('--connectionpoolid' '--description' '--enabled' '--property' '--target')
+	;;
+	create-jms-host)
+		_command_args=('--mqhost' '--mqpassword' '--mqport' '--mquser' '--property' '--target')
+	;;
+	create-jms-resource)
+		_command_args=('--description' '--enabled' '--property' '--restype' '--target')
+	;;
+	create-jmsdest)
+		_command_args=('--desttype' '--property' '--target')
+	;;
+	create-jndi-resource)
+		_command_args=('--description' '--enabled' '--factoryclass' '--jndilookupname' '--property' '--restype' '--target')
+	;;
+	create-jvm-options)
+		_command_args=('--profiler' '--target')
+	;;
+	create-lifecycle-module)
+		_command_args=('--classname' '--classpath' '--description' '--enabled' '--failurefatal' '--loadorder' '--property' '--target')
+	;;
+	create-local-instance)
+		_command_args=('--checkports' '--cluster' '--config' '--lbenabled' '--node' '--nodedir' '--portbase' '--savemasterpassword' '--systemproperties' '--usemasterpassword')
+	;;
+	create-message-security-provider)
+		_command_args=('--classname' '--isdefaultprovider' '--layer' '--property' '--providertype' '--requestauthrecipient' '--requestauthsource' '--responseauthrecipient' '--responseauthsource' '--target')
+	;;
+	create-network-listener)
+		_command_args=('--address' '--enabled' '--jkenabled' '--listenerport' '--protocol' '--target' '--threadpool' '--transport')
+	;;
+	create-node-config)
+		_command_args=('--installdir' '--nodedir' '--nodehost')
+	;;
+	create-node-dcom)
+		_command_args=('--archive' '--force' '--install' '--installdir' '--nodedir' '--nodehost' '--windowsdomain' '--windowspassword' '--windowsuser')
+	;;
+	create-node-ssh)
+		_command_args=('--archive' '--force' '--install' '--installdir' '--nodedir' '--nodehost' '--sshkeyfile' '--sshkeypassphrase' '--sshpassword' '--sshport' '--sshuser')
+	;;
+	create-password-alias)
+		_command_args=('--aliaspassword')
+	;;
+	create-profiler)
+		_command_args=('--classpath' '--enabled' '--nativelibrarypath' '--property' '--target')
+	;;
+	create-protocol)
+		_command_args=('--securityenabled' '--target')
+	;;
+	create-protocol-filter)
+		_command_args=('--classname' '--protocol' '--target')
+	;;
+	create-protocol-finder)
+		_command_args=('--classname' '--protocol' '--target' '--targetprotocol')
+	;;
+	create-resource-adapter-config)
+		_command_args=('--objecttype' '--property' '--target' '--threadpoolid')
+	;;
+	create-resource-ref)
+		_command_args=('--enabled' '--target')
+	;;
+	create-service)
+		_command_args=('--domaindir' '--dry-run' '--force' '--name' '--node' '--nodedir' '--serviceproperties' '--serviceuser')
+	;;
+	create-ssl)
+		_command_args=('--certname' '--clientauthenabled' '--ssl2ciphers' '--ssl2enabled' '--ssl3enabled' '--ssl3tlsciphers' '--target' '--tlsenabled' '--tlsrollbackenabled' '--type')
+	;;
+	create-system-properties)
+		_command_args=('--target')
+	;;
+	create-threadpool)
+		_command_args=('--idletimeout' '--maxqueuesize' '--maxthreadpoolsize' '--minthreadpoolsize' '--target' '--workqueues')
+	;;
+	create-transport)
+		_command_args=('--acceptorthreads' '--buffersizebytes' '--bytebuffertype' '--classname' '--displayconfiguration' '--enablesnoop' '--idlekeytimeoutseconds' '--maxconnectionscount' '--readtimeoutmillis' '--selectionkeyhandler' '--selectorpolltimeoutmillis' '--target' '--tcpnodelay' '--writetimeoutmillis')
+	;;
+	create-virtual-server)
+		_command_args=('--defaultwebmodule' '--hosts' '--httplisteners' '--logfile' '--networklisteners' '--property' '--state' '--target')
+	;;
+	delete-admin-object)
+		_command_args=('--target')
+	;;
+	delete-application-ref)
+		_command_args=('--cascade' '--target')
+	;;
+	delete-audit-module)
+		_command_args=('--target')
+	;;
+	delete-auth-realm)
+		_command_args=('--target')
+	;;
+	delete-connector-connection-pool)
+		_command_args=('--cascade' '--target')
+	;;
+	delete-connector-resource)
+		_command_args=('--target')
+	;;
+	delete-connector-security-map)
+		_command_args=('--poolname' '--target')
+	;;
+	delete-connector-work-security-map)
+		_command_args=('--raname')
+	;;
+	delete-custom-resource)
+		_command_args=('--target')
+	;;
+	delete-domain)
+		_command_args=('--domaindir')
+	;;
+	delete-file-user)
+		_command_args=('--authrealmname' '--target')
+	;;
+	delete-http)
+		_command_args=('--target')
+	;;
+	delete-http-health-checker)
+		_command_args=('--config')
+	;;
+	delete-http-lb-ref)
+		_command_args=('--config' '--force' '--lbname')
+	;;
+	delete-http-listener)
+		_command_args=('--secure' '--target')
+	;;
+	delete-http-redirect)
+		_command_args=('--target')
+	;;
+	delete-iiop-listener)
+		_command_args=('--target')
+	;;
+	delete-instance)
+		_command_args=('--terse')
+	;;
+	delete-jacc-provider)
+		_command_args=('--target')
+	;;
+	delete-javamail-resource)
+		_command_args=('--target')
+	;;
+	delete-jdbc-connection-pool)
+		_command_args=('--cascade' '--target')
+	;;
+	delete-jdbc-resource)
+		_command_args=('--target')
+	;;
+	delete-jms-host)
+		_command_args=('--target')
+	;;
+	delete-jms-resource)
+		_command_args=('--target')
+	;;
+	delete-jmsdest)
+		_command_args=('--desttype' '--target')
+	;;
+	delete-jndi-resource)
+		_command_args=('--target')
+	;;
+	delete-jvm-options)
+		_command_args=('--profiler' '--target')
+	;;
+	delete-lifecycle-module)
+		_command_args=('--target')
+	;;
+	delete-local-instance)
+		_command_args=('--node' '--nodedir')
+	;;
+	delete-log-levels)
+		_command_args=('--target')
+	;;
+	delete-message-security-provider)
+		_command_args=('--layer' '--target')
+	;;
+	delete-network-listener)
+		_command_args=('--target')
+	;;
+	delete-profiler)
+		_command_args=('--target')
+	;;
+	delete-protocol)
+		_command_args=('--target')
+	;;
+	delete-protocol-filter)
+		_command_args=('--protocol' '--target')
+	;;
+	delete-protocol-finder)
+		_command_args=('--protocol' '--target')
+	;;
+	delete-resource-adapter-config)
+		_command_args=('--target')
+	;;
+	delete-resource-ref)
+		_command_args=('--target')
+	;;
+	delete-ssl)
+		_command_args=('--target' '--type')
+	;;
+	delete-system-property)
+		_command_args=('--target')
+	;;
+	delete-threadpool)
+		_command_args=('--target')
+	;;
+	delete-transport)
+		_command_args=('--target')
+	;;
+	delete-virtual-server)
+		_command_args=('--target')
+	;;
+	deploy)
+		_command_args=('--asyncreplication' '--availabilityenabled' '--contextroot' '--createtables' '--dbvendorname' '--deploymentplan' '--description' '--dropandcreatetables' '--enabled' '--force' '--generatermistubs' '--isredeploy' '--keepfailedstubs' '--keepreposdir' '--keepstate' '--lbenabled' '--libraries' '--logreportederrors' '--name' '--precompilejsp' '--properties' '--property' '--retrieve' '--target' '--type' '--uniquetablenames' '--verify' '--virtualservers')
+	;;
+	deploydir)
+		_command_args=('--asyncreplication' '--availabilityenabled' '--contextroot' '--createtables' '--dbvendorname' '--deploymentplan' '--description' '--dropandcreatetables' '--enabled' '--force' '--generatermistubs' '--isredeploy' '--keepfailedstubs' '--keepreposdir' '--keepstate' '--lbenabled' '--libraries' '--logreportederrors' '--name' '--precompilejsp' '--properties' '--property' '--retrieve' '--target' '--type' '--uniquetablenames' '--verify' '--virtualservers')
+	;;
+	disable)
+		_command_args=('--cascade' '--droptables' '--isredeploy' '--isundeploy' '--keepreposdir' '--keepstate' '--properties' '--target')
+	;;
+	disable-http-lb-application)
+		_command_args=('--name' '--timeout')
+	;;
+	disable-http-lb-server)
+		_command_args=('--timeout')
+	;;
+	disable-monitoring)
+		_command_args=('--modules' '--target')
+	;;
+	enable)
+		_command_args=('--target')
+	;;
+	enable-http-lb-application)
+		_command_args=('--name')
+	;;
+	enable-monitoring)
+		_command_args=('--dtrace' '--mbean' '--modules' '--options' '--pid' '--target')
+	;;
+	enable-secure-admin)
+		_command_args=('--adminalias' '--instancealias')
+	;;
+	export-http-lb-config)
+		_command_args=('--config' '--lbname' '--lbtargets' '--property' '--retrievefile')
+	;;
+	export-sync-bundle)
+		_command_args=('--retrieve' '--target')
+	;;
+	flush-connection-pool)
+		_command_args=('--appname' '--modulename')
+	;;
+	flush-jmsdest)
+		_command_args=('--desttype' '--target')
+	;;
+	freeze-transaction-service)
+		_command_args=('--target')
+	;;
+	generate-domain-schema)
+		_command_args=('--format' '--showdeprecated' '--showsubclasses')
+	;;
+	generate-jvm-report)
+		_command_args=('--target' '--type')
+	;;
+	get)
+		_command_args=('--monitor')
+	;;
+	get-client-stubs)
+		_command_args=('--appname')
+	;;
+	import-sync-bundle)
+		_command_args=('--instance' '--node' '--nodedir')
+	;;
+	install-node-dcom)
+		_command_args=('--archive' '--create' '--force' '--installdir' '--save' '--windowsdomain' '--windowsuser')
+	;;
+	install-node-ssh)
+		_command_args=('--archive' '--create' '--force' '--installdir' '--save' '--sshkeyfile' '--sshport' '--sshuser')
+	;;
+	jms-ping)
+		_command_args=('--target')
+	;;
+	list)
+		_command_args=('--monitor')
+	;;
+	list-application-refs)
+		_command_args=('--long' '--terse')
+	;;
+	list-backups)
+		_command_args=('--backupconfig' '--backupdir' '--domaindir' '--long')
+	;;
+	list-commands)
+		_command_args=('--localonly' '--remoteonly')
+	;;
+	list-components)
+		_command_args=('--long' '--resources' '--subcomponents' '--terse' '--type')
+	;;
+	list-connector-security-maps)
+		_command_args=('--long' '--securitymap' '--target')
+	;;
+	list-connector-work-security-maps)
+		_command_args=('--securitymap')
+	;;
+	list-custom-resources)
+		_command_args=('--target')
+	;;
+	list-domains)
+		_command_args=('--domaindir')
+	;;
+	list-file-groups)
+		_command_args=('--authrealmname' '--name')
+	;;
+	list-file-users)
+		_command_args=('--authrealmname')
+	;;
+	list-http-listeners)
+		_command_args=('--long')
+	;;
+	list-instances)
+		_command_args=('--long' '--nostatus' '--standaloneonly' '--timeoutmsec')
+	;;
+	list-javamail-resources)
+		_command_args=('--target')
+	;;
+	list-jms-hosts)
+		_command_args=('--target')
+	;;
+	list-jms-resources)
+		_command_args=('--restype')
+	;;
+	list-jmsdest)
+		_command_args=('--desttype' '--property')
+	;;
+	list-jndi-entries)
+		_command_args=('--context')
+	;;
+	list-jndi-resources)
+		_command_args=('--target')
+	;;
+	list-jvm-options)
+		_command_args=('--profiler' '--target')
+	;;
+	list-libraries)
+		_command_args=('--type')
+	;;
+	list-lifecycle-modules)
+		_command_args=('--terse')
+	;;
+	list-message-security-providers)
+		_command_args=('--layer')
+	;;
+	list-nodes)
+		_command_args=('--long' '--terse')
+	;;
+	list-nodes-config)
+		_command_args=('--long' '--terse')
+	;;
+	list-nodes-dcom)
+		_command_args=('--long' '--terse')
+	;;
+	list-nodes-ssh)
+		_command_args=('--long' '--terse')
+	;;
+	list-persistence-types)
+		_command_args=('--type')
+	;;
+	list-protocol-filters)
+		_command_args=('--target')
+	;;
+	list-protocol-finders)
+		_command_args=('--target')
+	;;
+	list-resource-adapter-configs)
+		_command_args=('--long' '--raname')
+	;;
+	list-sub-components)
+		_command_args=('--appname' '--resources' '--terse' '--type')
+	;;
+	list-virtual-servers)
+		_command_args=('--target')
+	;;
+	list-web-context-param)
+		_command_args=('--name')
+	;;
+	list-web-env-entry)
+		_command_args=('--name')
+	;;
+	login)
+		_command_args=('--target')
+	;;
+	migrate-timers)
+		_command_args=('--target')
+	;;
+	monitor)
+		_command_args=('--filename' '--filter' '--interval' '--type')
+	;;
+	multimode)
+		_command_args=('--encoding' '--file' '--printprompt')
+	;;
+	ping-connection-pool)
+		_command_args=('--appname' '--modulename' '--target')
+	;;
+	recover-transactions)
+		_command_args=('--target' '--transactionlogdir')
+	;;
+	redeploy)
+		_command_args=('--asyncreplication' '--availabilityenabled' '--contextroot' '--createtables' '--dbvendorname' '--deploymentplan' '--description' '--dropandcreatetables' '--enabled' '--force' '--generatermistubs' '--isredeploy' '--keepfailedstubs' '--keepreposdir' '--keepstate' '--lbenabled' '--libraries' '--logreportederrors' '--name' '--precompilejsp' '--properties' '--property' '--retrieve' '--target' '--type' '--uniquetablenames' '--verify' '--virtualservers')
+	;;
+	remove-library)
+		_command_args=('--type')
+	;;
+	restart-domain)
+		_command_args=('--debug' '--domaindir' '--force' '--kill')
+	;;
+	restart-instance)
+		_command_args=('--debug')
+	;;
+	restart-local-instance)
+		_command_args=('--debug' '--force' '--kill' '--node' '--nodedir')
+	;;
+	restore-domain)
+		_command_args=('--backupconfig' '--backupdir' '--description' '--domaindir' '--filename' '--force' '--long')
+	;;
+	rollback-transaction)
+		_command_args=('--target' '--transaction_id')
+	;;
+	rotate-log)
+		_command_args=('--target')
+	;;
+	set-log-attributes)
+		_command_args=('--target')
+	;;
+	set-log-levels)
+		_command_args=('--target')
+	;;
+	set-web-context-param)
+		_command_args=('--description' '--ignoredescriptoritem' '--name' '--value')
+	;;
+	set-web-env-entry)
+		_command_args=('--description' '--ignoredescriptoritem' '--name' '--type' '--value')
+	;;
+	setup-ssh)
+		_command_args=('--generatekey' '--sshkeyfile' '--sshport' '--sshpublickeyfile' '--sshuser')
+	;;
+	show-component-status)
+		_command_args=('--target')
+	;;
+	start-cluster)
+		_command_args=('--autohadboverride' '--verbose')
+	;;
+	start-database)
+		_command_args=('--dbhome' '--dbhost' '--dbport' '--jvmoptions')
+	;;
+	start-domain)
+		_command_args=('--debug' '--domaindir' '--upgrade' '--verbose')
+	;;
+	start-instance)
+		_command_args=('--debug' '--setenv' '--sync' '--terse')
+	;;
+	start-local-instance)
+		_command_args=('--debug' '--node' '--nodedir' '--sync' '--verbose')
+	;;
+	stop-cluster)
+		_command_args=('--autohadboverride' '--kill' '--verbose')
+	;;
+	stop-database)
+		_command_args=('--dbhost' '--dbport' '--dbuser')
+	;;
+	stop-domain)
+		_command_args=('--domaindir' '--force' '--kill')
+	;;
+	stop-instance)
+		_command_args=('--force' '--kill')
+	;;
+	stop-local-instance)
+		_command_args=('--force' '--kill' '--node' '--nodedir')
+	;;
+	undeploy)
+		_command_args=('--cascade' '--droptables' '--isredeploy' '--keepreposdir' '--keepstate' '--properties' '--target')
+	;;
+	unfreeze-transaction-service)
+		_command_args=('--target')
+	;;
+	uninstall-node-dcom)
+		_command_args=('--force' '--installdir' '--windowsdomain' '--windowsuser')
+	;;
+	uninstall-node-ssh)
+		_command_args=('--force' '--installdir' '--sshkeyfile' '--sshport' '--sshuser')
+	;;
+	unset-web-context-param)
+		_command_args=('--name')
+	;;
+	unset-web-env-entry)
+		_command_args=('--name')
+	;;
+	update-connector-security-map)
+		_command_args=('--addprincipals' '--addusergroups' '--mappedpassword' '--mappedusername' '--poolname' '--removeprincipals' '--removeusergroups' '--target')
+	;;
+	update-connector-work-security-map)
+		_command_args=('--addgroups' '--addprincipals' '--raname' '--removegroups' '--removeprincipals')
+	;;
+	update-file-user)
+		_command_args=('--authrealmname' '--groups' '--target' '--userpassword')
+	;;
+	update-node-config)
+		_command_args=('--installdir' '--nodedir' '--nodehost')
+	;;
+	update-node-dcom)
+		_command_args=('--force' '--installdir' '--nodedir' '--nodehost' '--windowsdomain' '--windowspassword' '--windowsuser')
+	;;
+	update-node-ssh)
+		_command_args=('--force' '--installdir' '--nodedir' '--nodehost' '--sshkeyfile' '--sshkeypassphrase' '--sshpassword' '--sshport' '--sshuser')
+	;;
+	update-password-alias)
+		_command_args=('--aliaspassword')
+	;;
+	uptime)
+		_command_args=('--milliseconds')
+	;;
+	validate-dcom)
+		_command_args=('--remotetestdir' '--verbose' '--windowsdomain' '--windowspassword' '--windowsuser')
+	;;
+	validate-multicast)
+		_command_args=('--bindaddress' '--multicastaddress' '--multicastport' '--sendperiod' '--timeout' '--timetolive' '--verbose')
+	;;
+	verify-domain-xml)
+		_command_args=('--domaindir')
+	;;
+	version)
+		_command_args=('--local' '--terse' '--verbose')
+	;;
 esac
 
 _arguments \

From df176fb3dcdc036ecd6165beea47e64e307ea978 Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Thu, 12 Jul 2012 14:17:59 +0200
Subject: [PATCH 064/364] added alias

---
 plugins/glassfish/_glassfish           | 1 -
 plugins/glassfish/glassfish.plugin.zsh | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)
 delete mode 100644 plugins/glassfish/_glassfish
 create mode 100644 plugins/glassfish/glassfish.plugin.zsh

diff --git a/plugins/glassfish/_glassfish b/plugins/glassfish/_glassfish
deleted file mode 100644
index 8b1378917..000000000
--- a/plugins/glassfish/_glassfish
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/plugins/glassfish/glassfish.plugin.zsh b/plugins/glassfish/glassfish.plugin.zsh
new file mode 100644
index 000000000..49ca23299
--- /dev/null
+++ b/plugins/glassfish/glassfish.plugin.zsh
@@ -0,0 +1,3 @@
+# if there is a user named 'glassfish' on the system, we'll assume
+# that is the user asadmin should be run as
+grep -e '^glassfish' /etc/passwd > /dev/null && alias asadmin='sudo -u glassfish asadmin'
\ No newline at end of file

From 4caea1f7e143ac84583618cf8d2109212ba6909a Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Fri, 13 Jul 2012 12:08:41 +0200
Subject: [PATCH 065/364] completion options

---
 plugins/glassfish/_asadmin | 418 ++++++++++++++++++-------------------
 1 file changed, 209 insertions(+), 209 deletions(-)

diff --git a/plugins/glassfish/_asadmin b/plugins/glassfish/_asadmin
index 08ae9d461..f0ebea9f2 100644
--- a/plugins/glassfish/_asadmin
+++ b/plugins/glassfish/_asadmin
@@ -272,635 +272,635 @@ _1st_arguments=(
 _arguments '*:: :->command'
 
 if (( CURRENT == 1 )); then
-    _describe -t commands "glassfish command" _1st_arguments
+    _describe -t commands "asadmin command" _1st_arguments
     return
 fi
 
 local -a _command_args
 case "$words[1]" in
 	add-library)
-		_command_args=('--type')
+		_command_args=('--type+:type:(common ext app)')
 	;;
 	add-resources)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	apply-http-lb-changes)
-		_command_args=('--ping')
+		_command_args=('--ping+:')
 	;;
 	backup-domain)
-		_command_args=('--backupconfig' '--backupdir' '--description' '--domaindir' '--long')
+		_command_args=('--backupconfig+:' '--backupdir+:' '--description+:' '--domaindir+:' '--long+:long:(true false)')
 	;;
 	change-admin-password)
-		_command_args=('--domain_name' '--domaindir')
+		_command_args=('--domain_name+:' '--domaindir+:')
 	;;
 	change-master-password)
-		_command_args=('--domaindir' '--nodedir' '--savemasterpassword')
+		_command_args=('--domaindir+:' '--nodedir+:' '--savemasterpassword+:savemasterpassword:(true false)')
 	;;
 	collect-log-files)
-		_command_args=('--retrieve' '--target')
+		_command_args=('--retrieve+:retrieve:(true false)' '--target+:')
 	;;
 	configure-jms-cluster)
-		_command_args=('--clustertype' '--configstoretype' '--dburl' '--dbuser' '--dbvendor' '--jmsdbpassword' '--messagestoretype' '--property')
+		_command_args=('--clustertype+:' '--configstoretype+:' '--dburl+:' '--dbuser+:' '--dbvendor+:' '--jmsdbpassword+:' '--messagestoretype+:' '--property+:')
 	;;
 	configure-lb-weight)
-		_command_args=('--cluster')
+		_command_args=('--cluster+:')
 	;;
 	configure-ldap-for-admin)
-		_command_args=('--basedn' '--ldap-group' '--target' '--url')
+		_command_args=('--basedn+:' '--ldap-group+:' '--target+:' '--url+:')
 	;;
 	copy-config)
-		_command_args=('--systemproperties')
+		_command_args=('--systemproperties+:')
 	;;
 	create-admin-object)
-		_command_args=('--classname' '--description' '--enabled' '--property' '--raname' '--restype' '--target')
+		_command_args=('--classname+:' '--description+:' '--enabled+:enabled:(true false)' '--property+:' '--raname+:' '--restype+:' '--target+:')
 	;;
 	create-application-ref)
-		_command_args=('--enabled' '--lbenabled' '--target' '--virtualservers')
+		_command_args=('--enabled+:enabled:(true false)' '--lbenabled+:lbenabled:(true false)' '--target+:' '--virtualservers+:')
 	;;
 	create-audit-module)
-		_command_args=('--classname' '--property' '--target')
+		_command_args=('--classname+:' '--property+:' '--target+:')
 	;;
 	create-auth-realm)
-		_command_args=('--classname' '--property' '--target')
+		_command_args=('--classname+:' '--property+:' '--target+:')
 	;;
 	create-connector-connection-pool)
-		_command_args=('--associatewiththread' '--connectiondefinition' '--creationretryattempts' '--creationretryinterval' '--description' '--failconnection' '--idletimeout' '--isconnectvalidatereq' '--lazyconnectionassociation' '--lazyconnectionenlistment' '--leakreclaim' '--leaktimeout' '--matchconnections' '--maxconnectionusagecount' '--maxpoolsize' '--maxwait' '--ping' '--pooling' '--poolresize' '--property' '--raname' '--steadypoolsize' '--target' '--transactionsupport' '--validateatmostonceperiod')
+		_command_args=('--associatewiththread+:associatewiththread:(true false)' '--connectiondefinition+:' '--creationretryattempts+:' '--creationretryinterval+:' '--description+:' '--failconnection+:failconnection:(true false)' '--idletimeout+:' '--isconnectvalidatereq+:isconnectvalidatereq:(true false)' '--lazyconnectionassociation+:lazyconnectionassociation:(true false)' '--lazyconnectionenlistment+:lazyconnectionenlistment:(true false)' '--leakreclaim+:leakreclaim:(true false)' '--leaktimeout+:' '--matchconnections+:matchconnections:(true false)' '--maxconnectionusagecount+:' '--maxpoolsize+:' '--maxwait+:' '--ping+:ping:(true false)' '--pooling+:pooling:(true false)' '--poolresize+:' '--property+:' '--raname+:' '--steadypoolsize+:' '--target+:' '--transactionsupport+:transactionsupport:(XATransaction LocalTransaction NoTransaction)' '--validateatmostonceperiod+:')
 	;;
 	create-connector-resource)
-		_command_args=('--description' '--enabled' '--objecttype' '--poolname' '--property' '--target')
+		_command_args=('--description+:' '--enabled+:enabled:(true false)' '--objecttype+:' '--poolname+:' '--property+:' '--target+:')
 	;;
 	create-connector-security-map)
-		_command_args=('--mappedpassword' '--mappedusername' '--poolname' '--principals' '--target' '--usergroups')
+		_command_args=('--mappedpassword+:' '--mappedusername+:' '--poolname+:' '--principals+:' '--target+:' '--usergroups+:')
 	;;
 	create-connector-work-security-map)
-		_command_args=('--description' '--groupsmap' '--principalsmap' '--raname')
+		_command_args=('--description+:' '--groupsmap+:' '--principalsmap+:' '--raname+:')
 	;;
 	create-custom-resource)
-		_command_args=('--description' '--enabled' '--factoryclass' '--property' '--restype' '--target')
+		_command_args=('--description+:' '--enabled+:enabled:(true false)' '--factoryclass+:' '--property+:' '--restype+:' '--target+:')
 	;;
 	create-domain)
-		_command_args=('--adminport' '--checkports' '--domaindir' '--domainproperties' '--instanceport' '--keytooloptions' '--nopassword' '--portbase' '--profile' '--savelogin' '--savemasterpassword' '--template' '--usemasterpassword')
+		_command_args=('--adminport+:' '--checkports+:checkports:(true false)' '--domaindir+:' '--domainproperties+:' '--instanceport+:' '--keytooloptions+:' '--nopassword+:nopassword:(true false)' '--portbase+:' '--profile+:' '--savelogin+:savelogin:(true false)' '--savemasterpassword+:savemasterpassword:(true false)' '--template+:' '--usemasterpassword+:usemasterpassword:(true false)')
 	;;
 	create-file-user)
-		_command_args=('--authrealmname' '--groups' '--target' '--userpassword')
+		_command_args=('--authrealmname+:' '--groups+:' '--target+:' '--userpassword+:')
 	;;
 	create-http)
-		_command_args=('--default-virtual-server' '--dns-lookup-enabled' '--max-connection' '--request-timeout-seconds' '--servername' '--target' '--timeout-seconds' '--xpowered')
+		_command_args=('--default-virtual-server+:' '--dns-lookup-enabled+:dns-lookup-enabled:(true false)' '--max-connection+:' '--request-timeout-seconds+:' '--servername+:' '--target+:' '--timeout-seconds+:' '--xpowered+:xpowered:(true false)')
 	;;
 	create-http-health-checker)
-		_command_args=('--config' '--interval' '--timeout' '--url')
+		_command_args=('--config+:' '--interval+:' '--timeout+:' '--url+:')
 	;;
 	create-http-lb)
-		_command_args=('--autoapplyenabled' '--devicehost' '--deviceport' '--healthcheckerinterval' '--healthcheckertimeout' '--healthcheckerurl' '--httpsrouting' '--lbenableallapplications' '--lbenableallinstances' '--lbpolicy' '--lbpolicymodule' '--lbweight' '--monitor' '--property' '--reloadinterval' '--responsetimeout' '--routecookie' '--sslproxyhost' '--sslproxyport' '--target')
+		_command_args=('--autoapplyenabled+:autoapplyenabled:(true false)' '--devicehost+:' '--deviceport+:' '--healthcheckerinterval+:' '--healthcheckertimeout+:' '--healthcheckerurl+:' '--httpsrouting+:httpsrouting:(true false)' '--lbenableallapplications+:' '--lbenableallinstances+:' '--lbpolicy+:' '--lbpolicymodule+:' '--lbweight+:' '--monitor+:monitor:(true false)' '--property+:' '--reloadinterval+:' '--responsetimeout+:' '--routecookie+:routecookie:(true false)' '--sslproxyhost+:' '--sslproxyport+:' '--target+:')
 	;;
 	create-http-lb-ref)
-		_command_args=('--config' '--healthcheckerinterval' '--healthcheckertimeout' '--healthcheckerurl' '--lbenableallapplications' '--lbenableallinstances' '--lbname' '--lbpolicy' '--lbpolicymodule' '--lbweight')
+		_command_args=('--config+:' '--healthcheckerinterval+:' '--healthcheckertimeout+:' '--healthcheckerurl+:' '--lbenableallapplications+:' '--lbenableallinstances+:' '--lbname+:' '--lbpolicy+:' '--lbpolicymodule+:' '--lbweight+:')
 	;;
 	create-http-listener)
-		_command_args=('--acceptorthreads' '--default-virtual-server' '--defaultvs' '--enabled' '--listeneraddress' '--listenerport' '--redirectport' '--secure' '--securityenabled' '--servername' '--target' '--xpowered')
+		_command_args=('--acceptorthreads+:' '--default-virtual-server+:' '--defaultvs+:' '--enabled+:enabled:(true false)' '--listeneraddress+:' '--listenerport+:' '--redirectport+:' '--secure+:secure:(true false)' '--securityenabled+:securityenabled:(true false)' '--servername+:' '--target+:' '--xpowered+:xpowered:(true false)')
 	;;
 	create-http-redirect)
-		_command_args=('--redirect-port' '--secure-redirect' '--target')
+		_command_args=('--redirect-port+:' '--secure-redirect+:' '--target+:')
 	;;
 	create-iiop-listener)
-		_command_args=('--enabled' '--iiopport' '--listeneraddress' '--property' '--securityenabled' '--target')
+		_command_args=('--enabled+:enabled:(true false)' '--iiopport+:' '--listeneraddress+:' '--property+:' '--securityenabled+:securityenabled:(true false)' '--target+:')
 	;;
 	create-instance)
-		_command_args=('--checkports' '--cluster' '--config' '--lbenabled' '--node' '--portbase' '--systemproperties' '--terse')
+		_command_args=('--checkports+:checkports:(true false)' '--cluster+:' '--config+:' '--lbenabled+:lbenabled:(true false)' '--node+:' '--portbase+:' '--systemproperties+:' '--terse+:terse:(true false)')
 	;;
 	create-jacc-provider)
-		_command_args=('--policyconfigfactoryclass' '--policyproviderclass' '--property' '--target')
+		_command_args=('--policyconfigfactoryclass+:' '--policyproviderclass+:' '--property+:' '--target+:')
 	;;
 	create-javamail-resource)
-		_command_args=('--debug' '--description' '--enabled' '--fromaddress' '--mailhost' '--mailuser' '--property' '--storeprotocol' '--storeprotocolclass' '--target' '--transprotocol' '--transprotocolclass')
+		_command_args=('--debug+:debug:(true false)' '--description+:' '--enabled+:enabled:(true false)' '--fromaddress+:' '--mailhost+:' '--mailuser+:' '--property+:' '--storeprotocol+:' '--storeprotocolclass+:' '--target+:' '--transprotocol+:' '--transprotocolclass+:')
 	;;
 	create-jdbc-connection-pool)
-		_command_args=('--allownoncomponentcallers' '--associatewiththread' '--creationretryattempts' '--creationretryinterval' '--datasourceclassname' '--description' '--driverclassname' '--failconnection' '--idletimeout' '--initsql' '--isconnectvalidatereq' '--isisolationguaranteed' '--isolationlevel' '--lazyconnectionassociation' '--lazyconnectionenlistment' '--leakreclaim' '--leaktimeout' '--matchconnections' '--maxconnectionusagecount' '--maxpoolsize' '--maxwait' '--nontransactionalconnections' '--ping' '--pooling' '--poolresize' '--property' '--restype' '--sqltracelisteners' '--statementcachesize' '--statementleakreclaim' '--statementleaktimeout' '--statementtimeout' '--steadypoolsize' '--target' '--validateatmostonceperiod' '--validationclassname' '--validationmethod' '--validationtable' '--wrapjdbcobjects')
+		_command_args=('--allownoncomponentcallers+:allownoncomponentcallers:(true false)' '--associatewiththread+:associatewiththread:(true false)' '--creationretryattempts+:' '--creationretryinterval+:' '--datasourceclassname+:' '--description+:' '--driverclassname+:' '--failconnection+:failconnection:(true false)' '--idletimeout+:' '--initsql+:' '--isconnectvalidatereq+:isconnectvalidatereq:(true false)' '--isisolationguaranteed+:isisolationguaranteed:(true false)' '--isolationlevel+:' '--lazyconnectionassociation+:lazyconnectionassociation:(true false)' '--lazyconnectionenlistment+:lazyconnectionenlistment:(true false)' '--leakreclaim+:leakreclaim:(true false)' '--leaktimeout+:' '--matchconnections+:matchconnections:(true false)' '--maxconnectionusagecount+:' '--maxpoolsize+:' '--maxwait+:' '--nontransactionalconnections+:nontransactionalconnections:(true false)' '--ping+:ping:(true false)' '--pooling+:pooling:(true false)' '--poolresize+:' '--property+:' '--restype+:restype:(javax.sql.DataSource javax.sql.XADataSource javax.sql.ConnectionPoolDataSource java.sql.Driver)' '--sqltracelisteners+:' '--statementcachesize+:' '--statementleakreclaim+:statementleakreclaim:(true false)' '--statementleaktimeout+:' '--statementtimeout+:' '--steadypoolsize+:' '--target+:' '--validateatmostonceperiod+:' '--validationclassname+:' '--validationmethod+:validationmethod:(auto-commit meta-data table custom-validation)' '--validationtable+:' '--wrapjdbcobjects+:wrapjdbcobjects:(true false)')
 	;;
 	create-jdbc-resource)
-		_command_args=('--connectionpoolid' '--description' '--enabled' '--property' '--target')
+		_command_args=('--connectionpoolid+:' '--description+:' '--enabled+:enabled:(true false)' '--property+:' '--target+:')
 	;;
 	create-jms-host)
-		_command_args=('--mqhost' '--mqpassword' '--mqport' '--mquser' '--property' '--target')
+		_command_args=('--mqhost+:' '--mqpassword+:' '--mqport+:' '--mquser+:' '--property+:' '--target+:')
 	;;
 	create-jms-resource)
-		_command_args=('--description' '--enabled' '--property' '--restype' '--target')
+		_command_args=('--description+:' '--enabled+:enabled:(true false)' '--property+:' '--restype+:' '--target+:')
 	;;
 	create-jmsdest)
-		_command_args=('--desttype' '--property' '--target')
+		_command_args=('--desttype+:' '--property+:' '--target+:')
 	;;
 	create-jndi-resource)
-		_command_args=('--description' '--enabled' '--factoryclass' '--jndilookupname' '--property' '--restype' '--target')
+		_command_args=('--description+:' '--enabled+:enabled:(true false)' '--factoryclass+:' '--jndilookupname+:' '--property+:' '--restype+:' '--target+:')
 	;;
 	create-jvm-options)
-		_command_args=('--profiler' '--target')
+		_command_args=('--profiler+:profiler:(true false)' '--target+:')
 	;;
 	create-lifecycle-module)
-		_command_args=('--classname' '--classpath' '--description' '--enabled' '--failurefatal' '--loadorder' '--property' '--target')
+		_command_args=('--classname+:' '--classpath+:' '--description+:' '--enabled+:enabled:(true false)' '--failurefatal+:failurefatal:(true false)' '--loadorder+:' '--property+:' '--target+:')
 	;;
 	create-local-instance)
-		_command_args=('--checkports' '--cluster' '--config' '--lbenabled' '--node' '--nodedir' '--portbase' '--savemasterpassword' '--systemproperties' '--usemasterpassword')
+		_command_args=('--checkports+:checkports:(true false)' '--cluster+:' '--config+:' '--lbenabled+:lbenabled:(true false)' '--node+:' '--nodedir+:' '--portbase+:' '--savemasterpassword+:savemasterpassword:(true false)' '--systemproperties+:' '--usemasterpassword+:usemasterpassword:(true false)')
 	;;
 	create-message-security-provider)
-		_command_args=('--classname' '--isdefaultprovider' '--layer' '--property' '--providertype' '--requestauthrecipient' '--requestauthsource' '--responseauthrecipient' '--responseauthsource' '--target')
+		_command_args=('--classname+:' '--isdefaultprovider+:isdefaultprovider:(true false)' '--layer+:layer:(SOAP HttpServlet)' '--property+:' '--providertype+:providertype:(client server client-server)' '--requestauthrecipient+:' '--requestauthsource+:' '--responseauthrecipient+:' '--responseauthsource+:' '--target+:')
 	;;
 	create-network-listener)
-		_command_args=('--address' '--enabled' '--jkenabled' '--listenerport' '--protocol' '--target' '--threadpool' '--transport')
+		_command_args=('--address+:' '--enabled+:enabled:(true false)' '--jkenabled+:jkenabled:(true false)' '--listenerport+:' '--protocol+:' '--target+:' '--threadpool+:' '--transport+:')
 	;;
 	create-node-config)
-		_command_args=('--installdir' '--nodedir' '--nodehost')
+		_command_args=('--installdir+:' '--nodedir+:' '--nodehost+:')
 	;;
 	create-node-dcom)
-		_command_args=('--archive' '--force' '--install' '--installdir' '--nodedir' '--nodehost' '--windowsdomain' '--windowspassword' '--windowsuser')
+		_command_args=('--archive+:' '--force+:force:(true false)' '--install+:install:(true false)' '--installdir+:' '--nodedir+:' '--nodehost+:' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
 	;;
 	create-node-ssh)
-		_command_args=('--archive' '--force' '--install' '--installdir' '--nodedir' '--nodehost' '--sshkeyfile' '--sshkeypassphrase' '--sshpassword' '--sshport' '--sshuser')
+		_command_args=('--archive+:' '--force+:force:(true false)' '--install+:install:(true false)' '--installdir+:' '--nodedir+:' '--nodehost+:' '--sshkeyfile+:' '--sshkeypassphrase+:' '--sshpassword+:' '--sshport+:' '--sshuser+:')
 	;;
 	create-password-alias)
-		_command_args=('--aliaspassword')
+		_command_args=('--aliaspassword+:')
 	;;
 	create-profiler)
-		_command_args=('--classpath' '--enabled' '--nativelibrarypath' '--property' '--target')
+		_command_args=('--classpath+:' '--enabled+:enabled:(true false)' '--nativelibrarypath+:' '--property+:' '--target+:')
 	;;
 	create-protocol)
-		_command_args=('--securityenabled' '--target')
+		_command_args=('--securityenabled+:securityenabled:(true false)' '--target+:')
 	;;
 	create-protocol-filter)
-		_command_args=('--classname' '--protocol' '--target')
+		_command_args=('--classname+:' '--protocol+:' '--target+:')
 	;;
 	create-protocol-finder)
-		_command_args=('--classname' '--protocol' '--target' '--targetprotocol')
+		_command_args=('--classname+:' '--protocol+:' '--target+:' '--targetprotocol+:')
 	;;
 	create-resource-adapter-config)
-		_command_args=('--objecttype' '--property' '--target' '--threadpoolid')
+		_command_args=('--objecttype+:' '--property+:' '--target+:' '--threadpoolid+:')
 	;;
 	create-resource-ref)
-		_command_args=('--enabled' '--target')
+		_command_args=('--enabled+:enabled:(true false)' '--target+:')
 	;;
 	create-service)
-		_command_args=('--domaindir' '--dry-run' '--force' '--name' '--node' '--nodedir' '--serviceproperties' '--serviceuser')
+		_command_args=('--domaindir+:' '--dry-run+:dry-run:(true false)' '--force+:force:(true false)' '--name+:' '--node+:' '--nodedir+:' '--serviceproperties+:' '--serviceuser+:')
 	;;
 	create-ssl)
-		_command_args=('--certname' '--clientauthenabled' '--ssl2ciphers' '--ssl2enabled' '--ssl3enabled' '--ssl3tlsciphers' '--target' '--tlsenabled' '--tlsrollbackenabled' '--type')
+		_command_args=('--certname+:' '--clientauthenabled+:clientauthenabled:(true false)' '--ssl2ciphers+:' '--ssl2enabled+:ssl2enabled:(true false)' '--ssl3enabled+:ssl3enabled:(true false)' '--ssl3tlsciphers+:' '--target+:' '--tlsenabled+:tlsenabled:(true false)' '--tlsrollbackenabled+:tlsrollbackenabled:(true false)' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
 	;;
 	create-system-properties)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	create-threadpool)
-		_command_args=('--idletimeout' '--maxqueuesize' '--maxthreadpoolsize' '--minthreadpoolsize' '--target' '--workqueues')
+		_command_args=('--idletimeout+:' '--maxqueuesize+:' '--maxthreadpoolsize+:' '--minthreadpoolsize+:' '--target+:' '--workqueues+:')
 	;;
 	create-transport)
-		_command_args=('--acceptorthreads' '--buffersizebytes' '--bytebuffertype' '--classname' '--displayconfiguration' '--enablesnoop' '--idlekeytimeoutseconds' '--maxconnectionscount' '--readtimeoutmillis' '--selectionkeyhandler' '--selectorpolltimeoutmillis' '--target' '--tcpnodelay' '--writetimeoutmillis')
+		_command_args=('--acceptorthreads+:' '--buffersizebytes+:' '--bytebuffertype+:' '--classname+:' '--displayconfiguration+:displayconfiguration:(true false)' '--enablesnoop+:enablesnoop:(true false)' '--idlekeytimeoutseconds+:' '--maxconnectionscount+:' '--readtimeoutmillis+:' '--selectionkeyhandler+:' '--selectorpolltimeoutmillis+:' '--target+:' '--tcpnodelay+:tcpnodelay:(true false)' '--writetimeoutmillis+:')
 	;;
 	create-virtual-server)
-		_command_args=('--defaultwebmodule' '--hosts' '--httplisteners' '--logfile' '--networklisteners' '--property' '--state' '--target')
+		_command_args=('--defaultwebmodule+:' '--hosts+:' '--httplisteners+:' '--logfile+:' '--networklisteners+:' '--property+:' '--state+:state:(on off disabled)' '--target+:')
 	;;
 	delete-admin-object)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-application-ref)
-		_command_args=('--cascade' '--target')
+		_command_args=('--cascade+:cascade:(true false)' '--target+:')
 	;;
 	delete-audit-module)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-auth-realm)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-connector-connection-pool)
-		_command_args=('--cascade' '--target')
+		_command_args=('--cascade+:cascade:(true false)' '--target+:')
 	;;
 	delete-connector-resource)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-connector-security-map)
-		_command_args=('--poolname' '--target')
+		_command_args=('--poolname+:' '--target+:')
 	;;
 	delete-connector-work-security-map)
-		_command_args=('--raname')
+		_command_args=('--raname+:')
 	;;
 	delete-custom-resource)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-domain)
-		_command_args=('--domaindir')
+		_command_args=('--domaindir+:')
 	;;
 	delete-file-user)
-		_command_args=('--authrealmname' '--target')
+		_command_args=('--authrealmname+:' '--target+:')
 	;;
 	delete-http)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-http-health-checker)
-		_command_args=('--config')
+		_command_args=('--config+:')
 	;;
 	delete-http-lb-ref)
-		_command_args=('--config' '--force' '--lbname')
+		_command_args=('--config+:' '--force+:' '--lbname+:')
 	;;
 	delete-http-listener)
-		_command_args=('--secure' '--target')
+		_command_args=('--secure+:' '--target+:')
 	;;
 	delete-http-redirect)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-iiop-listener)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-instance)
-		_command_args=('--terse')
+		_command_args=('--terse+:terse:(true false)')
 	;;
 	delete-jacc-provider)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-javamail-resource)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-jdbc-connection-pool)
-		_command_args=('--cascade' '--target')
+		_command_args=('--cascade+:cascade:(true false)' '--target+:')
 	;;
 	delete-jdbc-resource)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-jms-host)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-jms-resource)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-jmsdest)
-		_command_args=('--desttype' '--target')
+		_command_args=('--desttype+:' '--target+:')
 	;;
 	delete-jndi-resource)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-jvm-options)
-		_command_args=('--profiler' '--target')
+		_command_args=('--profiler+:profiler:(true false)' '--target+:')
 	;;
 	delete-lifecycle-module)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-local-instance)
-		_command_args=('--node' '--nodedir')
+		_command_args=('--node+:' '--nodedir+:')
 	;;
 	delete-log-levels)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-message-security-provider)
-		_command_args=('--layer' '--target')
+		_command_args=('--layer+:' '--target+:')
 	;;
 	delete-network-listener)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-profiler)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-protocol)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-protocol-filter)
-		_command_args=('--protocol' '--target')
+		_command_args=('--protocol+:' '--target+:')
 	;;
 	delete-protocol-finder)
-		_command_args=('--protocol' '--target')
+		_command_args=('--protocol+:' '--target+:')
 	;;
 	delete-resource-adapter-config)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-resource-ref)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-ssl)
-		_command_args=('--target' '--type')
+		_command_args=('--target+:' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
 	;;
 	delete-system-property)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-threadpool)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-transport)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-virtual-server)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	deploy)
-		_command_args=('--asyncreplication' '--availabilityenabled' '--contextroot' '--createtables' '--dbvendorname' '--deploymentplan' '--description' '--dropandcreatetables' '--enabled' '--force' '--generatermistubs' '--isredeploy' '--keepfailedstubs' '--keepreposdir' '--keepstate' '--lbenabled' '--libraries' '--logreportederrors' '--name' '--precompilejsp' '--properties' '--property' '--retrieve' '--target' '--type' '--uniquetablenames' '--verify' '--virtualservers')
+		_command_args=('--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
 	;;
 	deploydir)
-		_command_args=('--asyncreplication' '--availabilityenabled' '--contextroot' '--createtables' '--dbvendorname' '--deploymentplan' '--description' '--dropandcreatetables' '--enabled' '--force' '--generatermistubs' '--isredeploy' '--keepfailedstubs' '--keepreposdir' '--keepstate' '--lbenabled' '--libraries' '--logreportederrors' '--name' '--precompilejsp' '--properties' '--property' '--retrieve' '--target' '--type' '--uniquetablenames' '--verify' '--virtualservers')
+		_command_args=('--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
 	;;
 	disable)
-		_command_args=('--cascade' '--droptables' '--isredeploy' '--isundeploy' '--keepreposdir' '--keepstate' '--properties' '--target')
+		_command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--isredeploy+:isredeploy:(true false)' '--isundeploy+:isundeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--properties+:' '--target+:')
 	;;
 	disable-http-lb-application)
-		_command_args=('--name' '--timeout')
+		_command_args=('--name+:' '--timeout+:')
 	;;
 	disable-http-lb-server)
-		_command_args=('--timeout')
+		_command_args=('--timeout+:')
 	;;
 	disable-monitoring)
-		_command_args=('--modules' '--target')
+		_command_args=('--modules+:' '--target+:')
 	;;
 	enable)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	enable-http-lb-application)
-		_command_args=('--name')
+		_command_args=('--name+:')
 	;;
 	enable-monitoring)
-		_command_args=('--dtrace' '--mbean' '--modules' '--options' '--pid' '--target')
+		_command_args=('--dtrace+:dtrace:(true false)' '--mbean+:mbean:(true false)' '--modules+:' '--options+:' '--pid+:' '--target+:')
 	;;
 	enable-secure-admin)
-		_command_args=('--adminalias' '--instancealias')
+		_command_args=('--adminalias+:' '--instancealias+:')
 	;;
 	export-http-lb-config)
-		_command_args=('--config' '--lbname' '--lbtargets' '--property' '--retrievefile')
+		_command_args=('--config+:' '--lbname+:' '--lbtargets+:' '--property+:' '--retrievefile+:retrievefile:(true false)')
 	;;
 	export-sync-bundle)
-		_command_args=('--retrieve' '--target')
+		_command_args=('--retrieve+:retrieve:(true false)' '--target+:')
 	;;
 	flush-connection-pool)
-		_command_args=('--appname' '--modulename')
+		_command_args=('--appname+:' '--modulename+:')
 	;;
 	flush-jmsdest)
-		_command_args=('--desttype' '--target')
+		_command_args=('--desttype+:' '--target+:')
 	;;
 	freeze-transaction-service)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	generate-domain-schema)
-		_command_args=('--format' '--showdeprecated' '--showsubclasses')
+		_command_args=('--format+:' '--showdeprecated+:showdeprecated:(true false)' '--showsubclasses+:showsubclasses:(true false)')
 	;;
 	generate-jvm-report)
-		_command_args=('--target' '--type')
+		_command_args=('--target+:' '--type+:type:(summary thread class memory log)')
 	;;
 	get)
-		_command_args=('--monitor')
+		_command_args=('--monitor+:monitor:(true false)')
 	;;
 	get-client-stubs)
-		_command_args=('--appname')
+		_command_args=('--appname+:')
 	;;
 	import-sync-bundle)
-		_command_args=('--instance' '--node' '--nodedir')
+		_command_args=('--instance+:' '--node+:' '--nodedir+:')
 	;;
 	install-node-dcom)
-		_command_args=('--archive' '--create' '--force' '--installdir' '--save' '--windowsdomain' '--windowsuser')
+		_command_args=('--archive+:' '--create+:create:(true false)' '--force+:force:(true false)' '--installdir+:' '--save+:save:(true false)' '--windowsdomain+:' '--windowsuser+:')
 	;;
 	install-node-ssh)
-		_command_args=('--archive' '--create' '--force' '--installdir' '--save' '--sshkeyfile' '--sshport' '--sshuser')
+		_command_args=('--archive+:' '--create+:create:(true false)' '--force+:force:(true false)' '--installdir+:' '--save+:save:(true false)' '--sshkeyfile+:' '--sshport+:' '--sshuser+:')
 	;;
 	jms-ping)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	list)
-		_command_args=('--monitor')
+		_command_args=('--monitor+:monitor:(true false)')
 	;;
 	list-application-refs)
-		_command_args=('--long' '--terse')
+		_command_args=('--long+:long:(true false)' '--terse+:terse:(true false)')
 	;;
 	list-backups)
-		_command_args=('--backupconfig' '--backupdir' '--domaindir' '--long')
+		_command_args=('--backupconfig+:' '--backupdir+:' '--domaindir+:' '--long+:long:(true false)')
 	;;
 	list-commands)
-		_command_args=('--localonly' '--remoteonly')
+		_command_args=('--localonly+:localonly:(true false)' '--remoteonly+:remoteonly:(true false)')
 	;;
 	list-components)
-		_command_args=('--long' '--resources' '--subcomponents' '--terse' '--type')
+		_command_args=('--long+:long:(true false)' '--resources+:resources:(true false)' '--subcomponents+:subcomponents:(true false)' '--terse+:terse:(true false)' '--type+:')
 	;;
 	list-connector-security-maps)
-		_command_args=('--long' '--securitymap' '--target')
+		_command_args=('--long+:long:(true false)' '--securitymap+:' '--target+:')
 	;;
 	list-connector-work-security-maps)
-		_command_args=('--securitymap')
+		_command_args=('--securitymap+:')
 	;;
 	list-custom-resources)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	list-domains)
-		_command_args=('--domaindir')
+		_command_args=('--domaindir+:')
 	;;
 	list-file-groups)
-		_command_args=('--authrealmname' '--name')
+		_command_args=('--authrealmname+:' '--name+:')
 	;;
 	list-file-users)
-		_command_args=('--authrealmname')
+		_command_args=('--authrealmname+:')
 	;;
 	list-http-listeners)
-		_command_args=('--long')
+		_command_args=('--long+:long:(true false)')
 	;;
 	list-instances)
-		_command_args=('--long' '--nostatus' '--standaloneonly' '--timeoutmsec')
+		_command_args=('--long+:long:(true false)' '--nostatus+:nostatus:(true false)' '--standaloneonly+:standaloneonly:(true false)' '--timeoutmsec+:')
 	;;
 	list-javamail-resources)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	list-jms-hosts)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	list-jms-resources)
-		_command_args=('--restype')
+		_command_args=('--restype+:')
 	;;
 	list-jmsdest)
-		_command_args=('--desttype' '--property')
+		_command_args=('--desttype+:' '--property+:')
 	;;
 	list-jndi-entries)
-		_command_args=('--context')
+		_command_args=('--context+:')
 	;;
 	list-jndi-resources)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	list-jvm-options)
-		_command_args=('--profiler' '--target')
+		_command_args=('--profiler+:profiler:(true false)' '--target+:')
 	;;
 	list-libraries)
-		_command_args=('--type')
+		_command_args=('--type+:type:(common ext app)')
 	;;
 	list-lifecycle-modules)
-		_command_args=('--terse')
+		_command_args=('--terse+:terse:(true false)')
 	;;
 	list-message-security-providers)
-		_command_args=('--layer')
+		_command_args=('--layer+:layer:(SOAP HttpServlet)')
 	;;
 	list-nodes)
-		_command_args=('--long' '--terse')
+		_command_args=('--long+:long:(true false)' '--terse+:terse:(true false)')
 	;;
 	list-nodes-config)
-		_command_args=('--long' '--terse')
+		_command_args=('--long+:long:(true false)' '--terse+:terse:(true false)')
 	;;
 	list-nodes-dcom)
-		_command_args=('--long' '--terse')
+		_command_args=('--long+:long:(true false)' '--terse+:terse:(true false)')
 	;;
 	list-nodes-ssh)
-		_command_args=('--long' '--terse')
+		_command_args=('--long+:long:(true false)' '--terse+:terse:(true false)')
 	;;
 	list-persistence-types)
-		_command_args=('--type')
+		_command_args=('--type+:')
 	;;
 	list-protocol-filters)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	list-protocol-finders)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	list-resource-adapter-configs)
-		_command_args=('--long' '--raname')
+		_command_args=('--long+:long:(true false)' '--raname+:')
 	;;
 	list-sub-components)
-		_command_args=('--appname' '--resources' '--terse' '--type')
+		_command_args=('--appname+:' '--resources+:resources:(true false)' '--terse+:terse:(true false)' '--type+:')
 	;;
 	list-virtual-servers)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	list-web-context-param)
-		_command_args=('--name')
+		_command_args=('--name+:')
 	;;
 	list-web-env-entry)
-		_command_args=('--name')
+		_command_args=('--name+:')
 	;;
 	login)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	migrate-timers)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	monitor)
-		_command_args=('--filename' '--filter' '--interval' '--type')
+		_command_args=('--filename+:' '--filter+:' '--interval+:' '--type+:')
 	;;
 	multimode)
-		_command_args=('--encoding' '--file' '--printprompt')
+		_command_args=('--encoding+:' '--file+:' '--printprompt+:printprompt:(true false)')
 	;;
 	ping-connection-pool)
-		_command_args=('--appname' '--modulename' '--target')
+		_command_args=('--appname+:' '--modulename+:' '--target+:')
 	;;
 	recover-transactions)
-		_command_args=('--target' '--transactionlogdir')
+		_command_args=('--target+:' '--transactionlogdir+:')
 	;;
 	redeploy)
-		_command_args=('--asyncreplication' '--availabilityenabled' '--contextroot' '--createtables' '--dbvendorname' '--deploymentplan' '--description' '--dropandcreatetables' '--enabled' '--force' '--generatermistubs' '--isredeploy' '--keepfailedstubs' '--keepreposdir' '--keepstate' '--lbenabled' '--libraries' '--logreportederrors' '--name' '--precompilejsp' '--properties' '--property' '--retrieve' '--target' '--type' '--uniquetablenames' '--verify' '--virtualservers')
+		_command_args=('--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
 	;;
 	remove-library)
-		_command_args=('--type')
+		_command_args=('--type+:type:(common ext app)')
 	;;
 	restart-domain)
-		_command_args=('--debug' '--domaindir' '--force' '--kill')
+		_command_args=('--debug+:debug:(true false)' '--domaindir+:' '--force+:force:(true false)' '--kill+:kill:(true false)')
 	;;
 	restart-instance)
-		_command_args=('--debug')
+		_command_args=('--debug+:')
 	;;
 	restart-local-instance)
-		_command_args=('--debug' '--force' '--kill' '--node' '--nodedir')
+		_command_args=('--debug+:debug:(true false)' '--force+:force:(true false)' '--kill+:kill:(true false)' '--node+:' '--nodedir+:')
 	;;
 	restore-domain)
-		_command_args=('--backupconfig' '--backupdir' '--description' '--domaindir' '--filename' '--force' '--long')
+		_command_args=('--backupconfig+:' '--backupdir+:' '--description+:' '--domaindir+:' '--filename+:' '--force+:force:(true false)' '--long+:long:(true false)')
 	;;
 	rollback-transaction)
-		_command_args=('--target' '--transaction_id')
+		_command_args=('--target+:' '--transaction_id+:')
 	;;
 	rotate-log)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	set-log-attributes)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	set-log-levels)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	set-web-context-param)
-		_command_args=('--description' '--ignoredescriptoritem' '--name' '--value')
+		_command_args=('--description+:' '--ignoredescriptoritem+:ignoredescriptoritem:(true false)' '--name+:' '--value+:')
 	;;
 	set-web-env-entry)
-		_command_args=('--description' '--ignoredescriptoritem' '--name' '--type' '--value')
+		_command_args=('--description+:' '--ignoredescriptoritem+:ignoredescriptoritem:(true false)' '--name+:' '--type+:' '--value+:')
 	;;
 	setup-ssh)
-		_command_args=('--generatekey' '--sshkeyfile' '--sshport' '--sshpublickeyfile' '--sshuser')
+		_command_args=('--generatekey+:generatekey:(true false)' '--sshkeyfile+:' '--sshport+:' '--sshpublickeyfile+:' '--sshuser+:')
 	;;
 	show-component-status)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	start-cluster)
-		_command_args=('--autohadboverride' '--verbose')
+		_command_args=('--autohadboverride+:autohadboverride:(true false)' '--verbose+:verbose:(true false)')
 	;;
 	start-database)
-		_command_args=('--dbhome' '--dbhost' '--dbport' '--jvmoptions')
+		_command_args=('--dbhome+:' '--dbhost+:' '--dbport+:' '--jvmoptions+:')
 	;;
 	start-domain)
-		_command_args=('--debug' '--domaindir' '--upgrade' '--verbose')
+		_command_args=('--debug+:debug:(true false)' '--domaindir+:' '--upgrade+:upgrade:(true false)' '--verbose+:verbose:(true false)')
 	;;
 	start-instance)
-		_command_args=('--debug' '--setenv' '--sync' '--terse')
+		_command_args=('--debug+:debug:(true false)' '--setenv+:' '--sync+:sync:(none normal full)' '--terse+:terse:(true false)')
 	;;
 	start-local-instance)
-		_command_args=('--debug' '--node' '--nodedir' '--sync' '--verbose')
+		_command_args=('--debug+:debug:(true false)' '--node+:' '--nodedir+:' '--sync+:sync:(none normal full)' '--verbose+:verbose:(true false)')
 	;;
 	stop-cluster)
-		_command_args=('--autohadboverride' '--kill' '--verbose')
+		_command_args=('--autohadboverride+:autohadboverride:(true false)' '--kill+:kill:(true false)' '--verbose+:verbose:(true false)')
 	;;
 	stop-database)
-		_command_args=('--dbhost' '--dbport' '--dbuser')
+		_command_args=('--dbhost+:' '--dbport+:' '--dbuser+:')
 	;;
 	stop-domain)
-		_command_args=('--domaindir' '--force' '--kill')
+		_command_args=('--domaindir+:' '--force+:force:(true false)' '--kill+:kill:(true false)')
 	;;
 	stop-instance)
-		_command_args=('--force' '--kill')
+		_command_args=('--force+:force:(true false)' '--kill+:kill:(true false)')
 	;;
 	stop-local-instance)
-		_command_args=('--force' '--kill' '--node' '--nodedir')
+		_command_args=('--force+:force:(true false)' '--kill+:kill:(true false)' '--node+:' '--nodedir+:')
 	;;
 	undeploy)
-		_command_args=('--cascade' '--droptables' '--isredeploy' '--keepreposdir' '--keepstate' '--properties' '--target')
+		_command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--properties+:' '--target+:')
 	;;
 	unfreeze-transaction-service)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	uninstall-node-dcom)
-		_command_args=('--force' '--installdir' '--windowsdomain' '--windowsuser')
+		_command_args=('--force+:force:(true false)' '--installdir+:' '--windowsdomain+:' '--windowsuser+:')
 	;;
 	uninstall-node-ssh)
-		_command_args=('--force' '--installdir' '--sshkeyfile' '--sshport' '--sshuser')
+		_command_args=('--force+:force:(true false)' '--installdir+:' '--sshkeyfile+:' '--sshport+:' '--sshuser+:')
 	;;
 	unset-web-context-param)
-		_command_args=('--name')
+		_command_args=('--name+:')
 	;;
 	unset-web-env-entry)
-		_command_args=('--name')
+		_command_args=('--name+:')
 	;;
 	update-connector-security-map)
-		_command_args=('--addprincipals' '--addusergroups' '--mappedpassword' '--mappedusername' '--poolname' '--removeprincipals' '--removeusergroups' '--target')
+		_command_args=('--addprincipals+:' '--addusergroups+:' '--mappedpassword+:' '--mappedusername+:' '--poolname+:' '--removeprincipals+:' '--removeusergroups+:' '--target+:')
 	;;
 	update-connector-work-security-map)
-		_command_args=('--addgroups' '--addprincipals' '--raname' '--removegroups' '--removeprincipals')
+		_command_args=('--addgroups+:' '--addprincipals+:' '--raname+:' '--removegroups+:' '--removeprincipals+:')
 	;;
 	update-file-user)
-		_command_args=('--authrealmname' '--groups' '--target' '--userpassword')
+		_command_args=('--authrealmname+:' '--groups+:' '--target+:' '--userpassword+:')
 	;;
 	update-node-config)
-		_command_args=('--installdir' '--nodedir' '--nodehost')
+		_command_args=('--installdir+:' '--nodedir+:' '--nodehost+:')
 	;;
 	update-node-dcom)
-		_command_args=('--force' '--installdir' '--nodedir' '--nodehost' '--windowsdomain' '--windowspassword' '--windowsuser')
+		_command_args=('--force+:force:(true false)' '--installdir+:' '--nodedir+:' '--nodehost+:' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
 	;;
 	update-node-ssh)
-		_command_args=('--force' '--installdir' '--nodedir' '--nodehost' '--sshkeyfile' '--sshkeypassphrase' '--sshpassword' '--sshport' '--sshuser')
+		_command_args=('--force+:force:(true false)' '--installdir+:' '--nodedir+:' '--nodehost+:' '--sshkeyfile+:' '--sshkeypassphrase+:' '--sshpassword+:' '--sshport+:' '--sshuser+:')
 	;;
 	update-password-alias)
-		_command_args=('--aliaspassword')
+		_command_args=('--aliaspassword+:')
 	;;
 	uptime)
-		_command_args=('--milliseconds')
+		_command_args=('--milliseconds+:milliseconds:(true false)')
 	;;
 	validate-dcom)
-		_command_args=('--remotetestdir' '--verbose' '--windowsdomain' '--windowspassword' '--windowsuser')
+		_command_args=('--remotetestdir+:' '--verbose+:verbose:(true false)' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
 	;;
 	validate-multicast)
-		_command_args=('--bindaddress' '--multicastaddress' '--multicastport' '--sendperiod' '--timeout' '--timetolive' '--verbose')
+		_command_args=('--bindaddress+:' '--multicastaddress+:' '--multicastport+:' '--sendperiod+:' '--timeout+:' '--timetolive+:' '--verbose+:verbose:(true false)')
 	;;
 	verify-domain-xml)
-		_command_args=('--domaindir')
+		_command_args=('--domaindir+:')
 	;;
 	version)
-		_command_args=('--local' '--terse' '--verbose')
+		_command_args=('--local+:local:(true false)' '--terse+:terse:(true false)' '--verbose+:verbose:(true false)')
 	;;
 esac
 

From e4ffac154d4af9187b4d052c9fc1b3305a538076 Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Fri, 13 Jul 2012 16:24:45 +0200
Subject: [PATCH 066/364] added _files values for certain options

---
 plugins/glassfish/_asadmin | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/glassfish/_asadmin b/plugins/glassfish/_asadmin
index f0ebea9f2..2ae6064e9 100644
--- a/plugins/glassfish/_asadmin
+++ b/plugins/glassfish/_asadmin
@@ -279,10 +279,10 @@ fi
 local -a _command_args
 case "$words[1]" in
 	add-library)
-		_command_args=('--type+:type:(common ext app)')
+		_command_args=('*:directory:_files' '--type+:type:(common ext app)')
 	;;
 	add-resources)
-		_command_args=('--target+:')
+		_command_args=('*:directory:_files' '--target+:')
 	;;
 	apply-http-lb-changes)
 		_command_args=('--ping+:')
@@ -438,7 +438,7 @@ case "$words[1]" in
 		_command_args=('--enabled+:enabled:(true false)' '--target+:')
 	;;
 	create-service)
-		_command_args=('--domaindir+:' '--dry-run+:dry-run:(true false)' '--force+:force:(true false)' '--name+:' '--node+:' '--nodedir+:' '--serviceproperties+:' '--serviceuser+:')
+		_command_args=('--domaindir+:domaindir:directory:_files' '--dry-run+:dry-run:(true false)' '--force+:force:(true false)' '--name+:' '--node+:' '--nodedir+:' '--serviceproperties+:' '--serviceuser+:')
 	;;
 	create-ssl)
 		_command_args=('--certname+:' '--clientauthenabled+:clientauthenabled:(true false)' '--ssl2ciphers+:' '--ssl2enabled+:ssl2enabled:(true false)' '--ssl3enabled+:ssl3enabled:(true false)' '--ssl3tlsciphers+:' '--target+:' '--tlsenabled+:tlsenabled:(true false)' '--tlsrollbackenabled+:tlsrollbackenabled:(true false)' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
@@ -585,10 +585,10 @@ case "$words[1]" in
 		_command_args=('--target+:')
 	;;
 	deploy)
-		_command_args=('--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
+		_command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
 	;;
 	deploydir)
-		_command_args=('--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
+		_command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
 	;;
 	disable)
 		_command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--isredeploy+:isredeploy:(true false)' '--isundeploy+:isundeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--properties+:' '--target+:')
@@ -765,10 +765,10 @@ case "$words[1]" in
 		_command_args=('--target+:')
 	;;
 	monitor)
-		_command_args=('--filename+:' '--filter+:' '--interval+:' '--type+:')
+		_command_args=('--filename+:filename:directory:_files' '--filter+:' '--interval+:' '--type+:')
 	;;
 	multimode)
-		_command_args=('--encoding+:' '--file+:' '--printprompt+:printprompt:(true false)')
+		_command_args=('--encoding+:' '--file+:file:directory:_files' '--printprompt+:printprompt:(true false)')
 	;;
 	ping-connection-pool)
 		_command_args=('--appname+:' '--modulename+:' '--target+:')
@@ -777,7 +777,7 @@ case "$words[1]" in
 		_command_args=('--target+:' '--transactionlogdir+:')
 	;;
 	redeploy)
-		_command_args=('--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
+		_command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
 	;;
 	remove-library)
 		_command_args=('--type+:type:(common ext app)')

From b49c97e08ee5abc705b001d846575c33dee1bf56 Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Tue, 24 Jul 2012 12:15:36 +0200
Subject: [PATCH 067/364] help command, node completion

---
 plugins/glassfish/_asadmin | 1394 ++++++++++++++++++++----------------
 1 file changed, 769 insertions(+), 625 deletions(-)

diff --git a/plugins/glassfish/_asadmin b/plugins/glassfish/_asadmin
index 2ae6064e9..b29d65d3b 100644
--- a/plugins/glassfish/_asadmin
+++ b/plugins/glassfish/_asadmin
@@ -144,6 +144,7 @@ _1st_arguments=(
     "get:gets the values of configurable or monitorable attributes"
     "get-client-stubs:retrieves the application JAR files needed to launch the application client."
     "get-health:provides information on the cluster health"
+    "help"
     "asadmin:utility for performing administrative tasks for Oracle GlassFish Server"
     "import-sync-bundle:imports the configuration data of a clustered instance or standalone instance from an archive file"
     "install-node:installs GlassFish Server software on specified SSH-enabled hosts"
@@ -278,632 +279,775 @@ fi
 
 local -a _command_args
 case "$words[1]" in
-	add-library)
-		_command_args=('*:directory:_files' '--type+:type:(common ext app)')
-	;;
-	add-resources)
-		_command_args=('*:directory:_files' '--target+:')
-	;;
-	apply-http-lb-changes)
-		_command_args=('--ping+:')
-	;;
-	backup-domain)
-		_command_args=('--backupconfig+:' '--backupdir+:' '--description+:' '--domaindir+:' '--long+:long:(true false)')
-	;;
-	change-admin-password)
-		_command_args=('--domain_name+:' '--domaindir+:')
-	;;
-	change-master-password)
-		_command_args=('--domaindir+:' '--nodedir+:' '--savemasterpassword+:savemasterpassword:(true false)')
-	;;
-	collect-log-files)
-		_command_args=('--retrieve+:retrieve:(true false)' '--target+:')
-	;;
-	configure-jms-cluster)
-		_command_args=('--clustertype+:' '--configstoretype+:' '--dburl+:' '--dbuser+:' '--dbvendor+:' '--jmsdbpassword+:' '--messagestoretype+:' '--property+:')
-	;;
-	configure-lb-weight)
-		_command_args=('--cluster+:')
-	;;
-	configure-ldap-for-admin)
-		_command_args=('--basedn+:' '--ldap-group+:' '--target+:' '--url+:')
-	;;
-	copy-config)
-		_command_args=('--systemproperties+:')
-	;;
-	create-admin-object)
-		_command_args=('--classname+:' '--description+:' '--enabled+:enabled:(true false)' '--property+:' '--raname+:' '--restype+:' '--target+:')
-	;;
-	create-application-ref)
-		_command_args=('--enabled+:enabled:(true false)' '--lbenabled+:lbenabled:(true false)' '--target+:' '--virtualservers+:')
-	;;
-	create-audit-module)
-		_command_args=('--classname+:' '--property+:' '--target+:')
-	;;
-	create-auth-realm)
-		_command_args=('--classname+:' '--property+:' '--target+:')
-	;;
-	create-connector-connection-pool)
-		_command_args=('--associatewiththread+:associatewiththread:(true false)' '--connectiondefinition+:' '--creationretryattempts+:' '--creationretryinterval+:' '--description+:' '--failconnection+:failconnection:(true false)' '--idletimeout+:' '--isconnectvalidatereq+:isconnectvalidatereq:(true false)' '--lazyconnectionassociation+:lazyconnectionassociation:(true false)' '--lazyconnectionenlistment+:lazyconnectionenlistment:(true false)' '--leakreclaim+:leakreclaim:(true false)' '--leaktimeout+:' '--matchconnections+:matchconnections:(true false)' '--maxconnectionusagecount+:' '--maxpoolsize+:' '--maxwait+:' '--ping+:ping:(true false)' '--pooling+:pooling:(true false)' '--poolresize+:' '--property+:' '--raname+:' '--steadypoolsize+:' '--target+:' '--transactionsupport+:transactionsupport:(XATransaction LocalTransaction NoTransaction)' '--validateatmostonceperiod+:')
-	;;
-	create-connector-resource)
-		_command_args=('--description+:' '--enabled+:enabled:(true false)' '--objecttype+:' '--poolname+:' '--property+:' '--target+:')
-	;;
-	create-connector-security-map)
-		_command_args=('--mappedpassword+:' '--mappedusername+:' '--poolname+:' '--principals+:' '--target+:' '--usergroups+:')
-	;;
-	create-connector-work-security-map)
-		_command_args=('--description+:' '--groupsmap+:' '--principalsmap+:' '--raname+:')
-	;;
-	create-custom-resource)
-		_command_args=('--description+:' '--enabled+:enabled:(true false)' '--factoryclass+:' '--property+:' '--restype+:' '--target+:')
-	;;
-	create-domain)
-		_command_args=('--adminport+:' '--checkports+:checkports:(true false)' '--domaindir+:' '--domainproperties+:' '--instanceport+:' '--keytooloptions+:' '--nopassword+:nopassword:(true false)' '--portbase+:' '--profile+:' '--savelogin+:savelogin:(true false)' '--savemasterpassword+:savemasterpassword:(true false)' '--template+:' '--usemasterpassword+:usemasterpassword:(true false)')
-	;;
-	create-file-user)
-		_command_args=('--authrealmname+:' '--groups+:' '--target+:' '--userpassword+:')
-	;;
-	create-http)
-		_command_args=('--default-virtual-server+:' '--dns-lookup-enabled+:dns-lookup-enabled:(true false)' '--max-connection+:' '--request-timeout-seconds+:' '--servername+:' '--target+:' '--timeout-seconds+:' '--xpowered+:xpowered:(true false)')
-	;;
-	create-http-health-checker)
-		_command_args=('--config+:' '--interval+:' '--timeout+:' '--url+:')
-	;;
-	create-http-lb)
-		_command_args=('--autoapplyenabled+:autoapplyenabled:(true false)' '--devicehost+:' '--deviceport+:' '--healthcheckerinterval+:' '--healthcheckertimeout+:' '--healthcheckerurl+:' '--httpsrouting+:httpsrouting:(true false)' '--lbenableallapplications+:' '--lbenableallinstances+:' '--lbpolicy+:' '--lbpolicymodule+:' '--lbweight+:' '--monitor+:monitor:(true false)' '--property+:' '--reloadinterval+:' '--responsetimeout+:' '--routecookie+:routecookie:(true false)' '--sslproxyhost+:' '--sslproxyport+:' '--target+:')
-	;;
-	create-http-lb-ref)
-		_command_args=('--config+:' '--healthcheckerinterval+:' '--healthcheckertimeout+:' '--healthcheckerurl+:' '--lbenableallapplications+:' '--lbenableallinstances+:' '--lbname+:' '--lbpolicy+:' '--lbpolicymodule+:' '--lbweight+:')
-	;;
-	create-http-listener)
-		_command_args=('--acceptorthreads+:' '--default-virtual-server+:' '--defaultvs+:' '--enabled+:enabled:(true false)' '--listeneraddress+:' '--listenerport+:' '--redirectport+:' '--secure+:secure:(true false)' '--securityenabled+:securityenabled:(true false)' '--servername+:' '--target+:' '--xpowered+:xpowered:(true false)')
-	;;
-	create-http-redirect)
-		_command_args=('--redirect-port+:' '--secure-redirect+:' '--target+:')
-	;;
-	create-iiop-listener)
-		_command_args=('--enabled+:enabled:(true false)' '--iiopport+:' '--listeneraddress+:' '--property+:' '--securityenabled+:securityenabled:(true false)' '--target+:')
-	;;
-	create-instance)
-		_command_args=('--checkports+:checkports:(true false)' '--cluster+:' '--config+:' '--lbenabled+:lbenabled:(true false)' '--node+:' '--portbase+:' '--systemproperties+:' '--terse+:terse:(true false)')
-	;;
-	create-jacc-provider)
-		_command_args=('--policyconfigfactoryclass+:' '--policyproviderclass+:' '--property+:' '--target+:')
-	;;
-	create-javamail-resource)
-		_command_args=('--debug+:debug:(true false)' '--description+:' '--enabled+:enabled:(true false)' '--fromaddress+:' '--mailhost+:' '--mailuser+:' '--property+:' '--storeprotocol+:' '--storeprotocolclass+:' '--target+:' '--transprotocol+:' '--transprotocolclass+:')
-	;;
-	create-jdbc-connection-pool)
-		_command_args=('--allownoncomponentcallers+:allownoncomponentcallers:(true false)' '--associatewiththread+:associatewiththread:(true false)' '--creationretryattempts+:' '--creationretryinterval+:' '--datasourceclassname+:' '--description+:' '--driverclassname+:' '--failconnection+:failconnection:(true false)' '--idletimeout+:' '--initsql+:' '--isconnectvalidatereq+:isconnectvalidatereq:(true false)' '--isisolationguaranteed+:isisolationguaranteed:(true false)' '--isolationlevel+:' '--lazyconnectionassociation+:lazyconnectionassociation:(true false)' '--lazyconnectionenlistment+:lazyconnectionenlistment:(true false)' '--leakreclaim+:leakreclaim:(true false)' '--leaktimeout+:' '--matchconnections+:matchconnections:(true false)' '--maxconnectionusagecount+:' '--maxpoolsize+:' '--maxwait+:' '--nontransactionalconnections+:nontransactionalconnections:(true false)' '--ping+:ping:(true false)' '--pooling+:pooling:(true false)' '--poolresize+:' '--property+:' '--restype+:restype:(javax.sql.DataSource javax.sql.XADataSource javax.sql.ConnectionPoolDataSource java.sql.Driver)' '--sqltracelisteners+:' '--statementcachesize+:' '--statementleakreclaim+:statementleakreclaim:(true false)' '--statementleaktimeout+:' '--statementtimeout+:' '--steadypoolsize+:' '--target+:' '--validateatmostonceperiod+:' '--validationclassname+:' '--validationmethod+:validationmethod:(auto-commit meta-data table custom-validation)' '--validationtable+:' '--wrapjdbcobjects+:wrapjdbcobjects:(true false)')
-	;;
-	create-jdbc-resource)
-		_command_args=('--connectionpoolid+:' '--description+:' '--enabled+:enabled:(true false)' '--property+:' '--target+:')
-	;;
-	create-jms-host)
-		_command_args=('--mqhost+:' '--mqpassword+:' '--mqport+:' '--mquser+:' '--property+:' '--target+:')
-	;;
-	create-jms-resource)
-		_command_args=('--description+:' '--enabled+:enabled:(true false)' '--property+:' '--restype+:' '--target+:')
-	;;
-	create-jmsdest)
-		_command_args=('--desttype+:' '--property+:' '--target+:')
-	;;
-	create-jndi-resource)
-		_command_args=('--description+:' '--enabled+:enabled:(true false)' '--factoryclass+:' '--jndilookupname+:' '--property+:' '--restype+:' '--target+:')
-	;;
-	create-jvm-options)
-		_command_args=('--profiler+:profiler:(true false)' '--target+:')
-	;;
-	create-lifecycle-module)
-		_command_args=('--classname+:' '--classpath+:' '--description+:' '--enabled+:enabled:(true false)' '--failurefatal+:failurefatal:(true false)' '--loadorder+:' '--property+:' '--target+:')
-	;;
-	create-local-instance)
-		_command_args=('--checkports+:checkports:(true false)' '--cluster+:' '--config+:' '--lbenabled+:lbenabled:(true false)' '--node+:' '--nodedir+:' '--portbase+:' '--savemasterpassword+:savemasterpassword:(true false)' '--systemproperties+:' '--usemasterpassword+:usemasterpassword:(true false)')
-	;;
-	create-message-security-provider)
-		_command_args=('--classname+:' '--isdefaultprovider+:isdefaultprovider:(true false)' '--layer+:layer:(SOAP HttpServlet)' '--property+:' '--providertype+:providertype:(client server client-server)' '--requestauthrecipient+:' '--requestauthsource+:' '--responseauthrecipient+:' '--responseauthsource+:' '--target+:')
-	;;
-	create-network-listener)
-		_command_args=('--address+:' '--enabled+:enabled:(true false)' '--jkenabled+:jkenabled:(true false)' '--listenerport+:' '--protocol+:' '--target+:' '--threadpool+:' '--transport+:')
-	;;
-	create-node-config)
-		_command_args=('--installdir+:' '--nodedir+:' '--nodehost+:')
-	;;
-	create-node-dcom)
-		_command_args=('--archive+:' '--force+:force:(true false)' '--install+:install:(true false)' '--installdir+:' '--nodedir+:' '--nodehost+:' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
-	;;
-	create-node-ssh)
-		_command_args=('--archive+:' '--force+:force:(true false)' '--install+:install:(true false)' '--installdir+:' '--nodedir+:' '--nodehost+:' '--sshkeyfile+:' '--sshkeypassphrase+:' '--sshpassword+:' '--sshport+:' '--sshuser+:')
-	;;
-	create-password-alias)
-		_command_args=('--aliaspassword+:')
-	;;
-	create-profiler)
-		_command_args=('--classpath+:' '--enabled+:enabled:(true false)' '--nativelibrarypath+:' '--property+:' '--target+:')
-	;;
-	create-protocol)
-		_command_args=('--securityenabled+:securityenabled:(true false)' '--target+:')
-	;;
-	create-protocol-filter)
-		_command_args=('--classname+:' '--protocol+:' '--target+:')
-	;;
-	create-protocol-finder)
-		_command_args=('--classname+:' '--protocol+:' '--target+:' '--targetprotocol+:')
-	;;
-	create-resource-adapter-config)
-		_command_args=('--objecttype+:' '--property+:' '--target+:' '--threadpoolid+:')
-	;;
-	create-resource-ref)
-		_command_args=('--enabled+:enabled:(true false)' '--target+:')
-	;;
-	create-service)
-		_command_args=('--domaindir+:domaindir:directory:_files' '--dry-run+:dry-run:(true false)' '--force+:force:(true false)' '--name+:' '--node+:' '--nodedir+:' '--serviceproperties+:' '--serviceuser+:')
-	;;
-	create-ssl)
-		_command_args=('--certname+:' '--clientauthenabled+:clientauthenabled:(true false)' '--ssl2ciphers+:' '--ssl2enabled+:ssl2enabled:(true false)' '--ssl3enabled+:ssl3enabled:(true false)' '--ssl3tlsciphers+:' '--target+:' '--tlsenabled+:tlsenabled:(true false)' '--tlsrollbackenabled+:tlsrollbackenabled:(true false)' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
-	;;
-	create-system-properties)
-		_command_args=('--target+:')
-	;;
-	create-threadpool)
-		_command_args=('--idletimeout+:' '--maxqueuesize+:' '--maxthreadpoolsize+:' '--minthreadpoolsize+:' '--target+:' '--workqueues+:')
-	;;
-	create-transport)
-		_command_args=('--acceptorthreads+:' '--buffersizebytes+:' '--bytebuffertype+:' '--classname+:' '--displayconfiguration+:displayconfiguration:(true false)' '--enablesnoop+:enablesnoop:(true false)' '--idlekeytimeoutseconds+:' '--maxconnectionscount+:' '--readtimeoutmillis+:' '--selectionkeyhandler+:' '--selectorpolltimeoutmillis+:' '--target+:' '--tcpnodelay+:tcpnodelay:(true false)' '--writetimeoutmillis+:')
-	;;
-	create-virtual-server)
-		_command_args=('--defaultwebmodule+:' '--hosts+:' '--httplisteners+:' '--logfile+:' '--networklisteners+:' '--property+:' '--state+:state:(on off disabled)' '--target+:')
-	;;
-	delete-admin-object)
-		_command_args=('--target+:')
-	;;
-	delete-application-ref)
-		_command_args=('--cascade+:cascade:(true false)' '--target+:')
-	;;
-	delete-audit-module)
-		_command_args=('--target+:')
-	;;
-	delete-auth-realm)
-		_command_args=('--target+:')
-	;;
-	delete-connector-connection-pool)
-		_command_args=('--cascade+:cascade:(true false)' '--target+:')
-	;;
-	delete-connector-resource)
-		_command_args=('--target+:')
-	;;
-	delete-connector-security-map)
-		_command_args=('--poolname+:' '--target+:')
-	;;
-	delete-connector-work-security-map)
-		_command_args=('--raname+:')
-	;;
-	delete-custom-resource)
-		_command_args=('--target+:')
-	;;
-	delete-domain)
-		_command_args=('--domaindir+:')
-	;;
-	delete-file-user)
-		_command_args=('--authrealmname+:' '--target+:')
-	;;
-	delete-http)
-		_command_args=('--target+:')
-	;;
-	delete-http-health-checker)
-		_command_args=('--config+:')
-	;;
-	delete-http-lb-ref)
-		_command_args=('--config+:' '--force+:' '--lbname+:')
-	;;
-	delete-http-listener)
-		_command_args=('--secure+:' '--target+:')
-	;;
-	delete-http-redirect)
-		_command_args=('--target+:')
-	;;
-	delete-iiop-listener)
-		_command_args=('--target+:')
-	;;
-	delete-instance)
-		_command_args=('--terse+:terse:(true false)')
-	;;
-	delete-jacc-provider)
-		_command_args=('--target+:')
-	;;
-	delete-javamail-resource)
-		_command_args=('--target+:')
-	;;
-	delete-jdbc-connection-pool)
-		_command_args=('--cascade+:cascade:(true false)' '--target+:')
-	;;
-	delete-jdbc-resource)
-		_command_args=('--target+:')
-	;;
-	delete-jms-host)
-		_command_args=('--target+:')
-	;;
-	delete-jms-resource)
-		_command_args=('--target+:')
-	;;
-	delete-jmsdest)
-		_command_args=('--desttype+:' '--target+:')
-	;;
-	delete-jndi-resource)
-		_command_args=('--target+:')
-	;;
-	delete-jvm-options)
-		_command_args=('--profiler+:profiler:(true false)' '--target+:')
-	;;
-	delete-lifecycle-module)
-		_command_args=('--target+:')
-	;;
-	delete-local-instance)
-		_command_args=('--node+:' '--nodedir+:')
-	;;
-	delete-log-levels)
-		_command_args=('--target+:')
-	;;
-	delete-message-security-provider)
-		_command_args=('--layer+:' '--target+:')
-	;;
-	delete-network-listener)
-		_command_args=('--target+:')
-	;;
-	delete-profiler)
-		_command_args=('--target+:')
-	;;
-	delete-protocol)
-		_command_args=('--target+:')
-	;;
-	delete-protocol-filter)
-		_command_args=('--protocol+:' '--target+:')
-	;;
-	delete-protocol-finder)
-		_command_args=('--protocol+:' '--target+:')
-	;;
-	delete-resource-adapter-config)
-		_command_args=('--target+:')
-	;;
-	delete-resource-ref)
-		_command_args=('--target+:')
-	;;
-	delete-ssl)
-		_command_args=('--target+:' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
-	;;
-	delete-system-property)
-		_command_args=('--target+:')
-	;;
-	delete-threadpool)
-		_command_args=('--target+:')
-	;;
-	delete-transport)
-		_command_args=('--target+:')
-	;;
-	delete-virtual-server)
-		_command_args=('--target+:')
-	;;
-	deploy)
-		_command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
-	;;
-	deploydir)
-		_command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
-	;;
-	disable)
-		_command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--isredeploy+:isredeploy:(true false)' '--isundeploy+:isundeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--properties+:' '--target+:')
-	;;
-	disable-http-lb-application)
-		_command_args=('--name+:' '--timeout+:')
-	;;
-	disable-http-lb-server)
-		_command_args=('--timeout+:')
-	;;
-	disable-monitoring)
-		_command_args=('--modules+:' '--target+:')
-	;;
-	enable)
-		_command_args=('--target+:')
-	;;
-	enable-http-lb-application)
-		_command_args=('--name+:')
-	;;
-	enable-monitoring)
-		_command_args=('--dtrace+:dtrace:(true false)' '--mbean+:mbean:(true false)' '--modules+:' '--options+:' '--pid+:' '--target+:')
-	;;
-	enable-secure-admin)
-		_command_args=('--adminalias+:' '--instancealias+:')
-	;;
-	export-http-lb-config)
-		_command_args=('--config+:' '--lbname+:' '--lbtargets+:' '--property+:' '--retrievefile+:retrievefile:(true false)')
-	;;
-	export-sync-bundle)
-		_command_args=('--retrieve+:retrieve:(true false)' '--target+:')
-	;;
-	flush-connection-pool)
-		_command_args=('--appname+:' '--modulename+:')
-	;;
-	flush-jmsdest)
-		_command_args=('--desttype+:' '--target+:')
-	;;
-	freeze-transaction-service)
-		_command_args=('--target+:')
-	;;
-	generate-domain-schema)
-		_command_args=('--format+:' '--showdeprecated+:showdeprecated:(true false)' '--showsubclasses+:showsubclasses:(true false)')
-	;;
-	generate-jvm-report)
-		_command_args=('--target+:' '--type+:type:(summary thread class memory log)')
-	;;
-	get)
-		_command_args=('--monitor+:monitor:(true false)')
-	;;
-	get-client-stubs)
-		_command_args=('--appname+:')
-	;;
-	import-sync-bundle)
-		_command_args=('--instance+:' '--node+:' '--nodedir+:')
-	;;
-	install-node-dcom)
-		_command_args=('--archive+:' '--create+:create:(true false)' '--force+:force:(true false)' '--installdir+:' '--save+:save:(true false)' '--windowsdomain+:' '--windowsuser+:')
-	;;
-	install-node-ssh)
-		_command_args=('--archive+:' '--create+:create:(true false)' '--force+:force:(true false)' '--installdir+:' '--save+:save:(true false)' '--sshkeyfile+:' '--sshport+:' '--sshuser+:')
-	;;
-	jms-ping)
-		_command_args=('--target+:')
-	;;
-	list)
-		_command_args=('--monitor+:monitor:(true false)')
-	;;
-	list-application-refs)
-		_command_args=('--long+:long:(true false)' '--terse+:terse:(true false)')
-	;;
-	list-backups)
-		_command_args=('--backupconfig+:' '--backupdir+:' '--domaindir+:' '--long+:long:(true false)')
-	;;
-	list-commands)
-		_command_args=('--localonly+:localonly:(true false)' '--remoteonly+:remoteonly:(true false)')
-	;;
-	list-components)
-		_command_args=('--long+:long:(true false)' '--resources+:resources:(true false)' '--subcomponents+:subcomponents:(true false)' '--terse+:terse:(true false)' '--type+:')
-	;;
-	list-connector-security-maps)
-		_command_args=('--long+:long:(true false)' '--securitymap+:' '--target+:')
-	;;
-	list-connector-work-security-maps)
-		_command_args=('--securitymap+:')
-	;;
-	list-custom-resources)
-		_command_args=('--target+:')
-	;;
-	list-domains)
-		_command_args=('--domaindir+:')
-	;;
-	list-file-groups)
-		_command_args=('--authrealmname+:' '--name+:')
-	;;
-	list-file-users)
-		_command_args=('--authrealmname+:')
-	;;
-	list-http-listeners)
-		_command_args=('--long+:long:(true false)')
-	;;
-	list-instances)
-		_command_args=('--long+:long:(true false)' '--nostatus+:nostatus:(true false)' '--standaloneonly+:standaloneonly:(true false)' '--timeoutmsec+:')
-	;;
-	list-javamail-resources)
-		_command_args=('--target+:')
-	;;
-	list-jms-hosts)
-		_command_args=('--target+:')
-	;;
-	list-jms-resources)
-		_command_args=('--restype+:')
-	;;
-	list-jmsdest)
-		_command_args=('--desttype+:' '--property+:')
-	;;
-	list-jndi-entries)
-		_command_args=('--context+:')
-	;;
-	list-jndi-resources)
-		_command_args=('--target+:')
-	;;
-	list-jvm-options)
-		_command_args=('--profiler+:profiler:(true false)' '--target+:')
-	;;
-	list-libraries)
-		_command_args=('--type+:type:(common ext app)')
-	;;
-	list-lifecycle-modules)
-		_command_args=('--terse+:terse:(true false)')
-	;;
-	list-message-security-providers)
-		_command_args=('--layer+:layer:(SOAP HttpServlet)')
-	;;
-	list-nodes)
-		_command_args=('--long+:long:(true false)' '--terse+:terse:(true false)')
-	;;
-	list-nodes-config)
-		_command_args=('--long+:long:(true false)' '--terse+:terse:(true false)')
-	;;
-	list-nodes-dcom)
-		_command_args=('--long+:long:(true false)' '--terse+:terse:(true false)')
-	;;
-	list-nodes-ssh)
-		_command_args=('--long+:long:(true false)' '--terse+:terse:(true false)')
-	;;
-	list-persistence-types)
-		_command_args=('--type+:')
-	;;
-	list-protocol-filters)
-		_command_args=('--target+:')
-	;;
-	list-protocol-finders)
-		_command_args=('--target+:')
-	;;
-	list-resource-adapter-configs)
-		_command_args=('--long+:long:(true false)' '--raname+:')
-	;;
-	list-sub-components)
-		_command_args=('--appname+:' '--resources+:resources:(true false)' '--terse+:terse:(true false)' '--type+:')
-	;;
-	list-virtual-servers)
-		_command_args=('--target+:')
-	;;
-	list-web-context-param)
-		_command_args=('--name+:')
-	;;
-	list-web-env-entry)
-		_command_args=('--name+:')
-	;;
-	login)
-		_command_args=('--target+:')
-	;;
-	migrate-timers)
-		_command_args=('--target+:')
-	;;
-	monitor)
-		_command_args=('--filename+:filename:directory:_files' '--filter+:' '--interval+:' '--type+:')
-	;;
-	multimode)
-		_command_args=('--encoding+:' '--file+:file:directory:_files' '--printprompt+:printprompt:(true false)')
-	;;
-	ping-connection-pool)
-		_command_args=('--appname+:' '--modulename+:' '--target+:')
-	;;
-	recover-transactions)
-		_command_args=('--target+:' '--transactionlogdir+:')
-	;;
-	redeploy)
-		_command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
-	;;
-	remove-library)
-		_command_args=('--type+:type:(common ext app)')
-	;;
-	restart-domain)
-		_command_args=('--debug+:debug:(true false)' '--domaindir+:' '--force+:force:(true false)' '--kill+:kill:(true false)')
-	;;
-	restart-instance)
-		_command_args=('--debug+:')
-	;;
-	restart-local-instance)
-		_command_args=('--debug+:debug:(true false)' '--force+:force:(true false)' '--kill+:kill:(true false)' '--node+:' '--nodedir+:')
-	;;
-	restore-domain)
-		_command_args=('--backupconfig+:' '--backupdir+:' '--description+:' '--domaindir+:' '--filename+:' '--force+:force:(true false)' '--long+:long:(true false)')
-	;;
-	rollback-transaction)
-		_command_args=('--target+:' '--transaction_id+:')
-	;;
-	rotate-log)
-		_command_args=('--target+:')
-	;;
-	set-log-attributes)
-		_command_args=('--target+:')
-	;;
-	set-log-levels)
-		_command_args=('--target+:')
-	;;
-	set-web-context-param)
-		_command_args=('--description+:' '--ignoredescriptoritem+:ignoredescriptoritem:(true false)' '--name+:' '--value+:')
-	;;
-	set-web-env-entry)
-		_command_args=('--description+:' '--ignoredescriptoritem+:ignoredescriptoritem:(true false)' '--name+:' '--type+:' '--value+:')
-	;;
-	setup-ssh)
-		_command_args=('--generatekey+:generatekey:(true false)' '--sshkeyfile+:' '--sshport+:' '--sshpublickeyfile+:' '--sshuser+:')
-	;;
-	show-component-status)
-		_command_args=('--target+:')
-	;;
-	start-cluster)
-		_command_args=('--autohadboverride+:autohadboverride:(true false)' '--verbose+:verbose:(true false)')
-	;;
-	start-database)
-		_command_args=('--dbhome+:' '--dbhost+:' '--dbport+:' '--jvmoptions+:')
-	;;
-	start-domain)
-		_command_args=('--debug+:debug:(true false)' '--domaindir+:' '--upgrade+:upgrade:(true false)' '--verbose+:verbose:(true false)')
-	;;
-	start-instance)
-		_command_args=('--debug+:debug:(true false)' '--setenv+:' '--sync+:sync:(none normal full)' '--terse+:terse:(true false)')
-	;;
-	start-local-instance)
-		_command_args=('--debug+:debug:(true false)' '--node+:' '--nodedir+:' '--sync+:sync:(none normal full)' '--verbose+:verbose:(true false)')
-	;;
-	stop-cluster)
-		_command_args=('--autohadboverride+:autohadboverride:(true false)' '--kill+:kill:(true false)' '--verbose+:verbose:(true false)')
-	;;
-	stop-database)
-		_command_args=('--dbhost+:' '--dbport+:' '--dbuser+:')
-	;;
-	stop-domain)
-		_command_args=('--domaindir+:' '--force+:force:(true false)' '--kill+:kill:(true false)')
-	;;
-	stop-instance)
-		_command_args=('--force+:force:(true false)' '--kill+:kill:(true false)')
-	;;
-	stop-local-instance)
-		_command_args=('--force+:force:(true false)' '--kill+:kill:(true false)' '--node+:' '--nodedir+:')
-	;;
-	undeploy)
-		_command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--properties+:' '--target+:')
-	;;
-	unfreeze-transaction-service)
-		_command_args=('--target+:')
-	;;
-	uninstall-node-dcom)
-		_command_args=('--force+:force:(true false)' '--installdir+:' '--windowsdomain+:' '--windowsuser+:')
-	;;
-	uninstall-node-ssh)
-		_command_args=('--force+:force:(true false)' '--installdir+:' '--sshkeyfile+:' '--sshport+:' '--sshuser+:')
-	;;
-	unset-web-context-param)
-		_command_args=('--name+:')
-	;;
-	unset-web-env-entry)
-		_command_args=('--name+:')
-	;;
-	update-connector-security-map)
-		_command_args=('--addprincipals+:' '--addusergroups+:' '--mappedpassword+:' '--mappedusername+:' '--poolname+:' '--removeprincipals+:' '--removeusergroups+:' '--target+:')
-	;;
-	update-connector-work-security-map)
-		_command_args=('--addgroups+:' '--addprincipals+:' '--raname+:' '--removegroups+:' '--removeprincipals+:')
-	;;
-	update-file-user)
-		_command_args=('--authrealmname+:' '--groups+:' '--target+:' '--userpassword+:')
-	;;
-	update-node-config)
-		_command_args=('--installdir+:' '--nodedir+:' '--nodehost+:')
-	;;
-	update-node-dcom)
-		_command_args=('--force+:force:(true false)' '--installdir+:' '--nodedir+:' '--nodehost+:' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
-	;;
-	update-node-ssh)
-		_command_args=('--force+:force:(true false)' '--installdir+:' '--nodedir+:' '--nodehost+:' '--sshkeyfile+:' '--sshkeypassphrase+:' '--sshpassword+:' '--sshport+:' '--sshuser+:')
-	;;
-	update-password-alias)
-		_command_args=('--aliaspassword+:')
-	;;
-	uptime)
-		_command_args=('--milliseconds+:milliseconds:(true false)')
-	;;
-	validate-dcom)
-		_command_args=('--remotetestdir+:' '--verbose+:verbose:(true false)' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
-	;;
-	validate-multicast)
-		_command_args=('--bindaddress+:' '--multicastaddress+:' '--multicastport+:' '--sendperiod+:' '--timeout+:' '--timetolive+:' '--verbose+:verbose:(true false)')
-	;;
-	verify-domain-xml)
-		_command_args=('--domaindir+:')
-	;;
-	version)
-		_command_args=('--local+:local:(true false)' '--terse+:terse:(true false)' '--verbose+:verbose:(true false)')
-	;;
+    add-library)
+        _command_args=('*:directory:_files' '--host+:' '--port+:' '--type+:type:(common ext app)')
+        ;;
+    add-resources)
+        _command_args=('*:directory:_files' '--host+:' '--port+:' '--target+:')
+        ;;
+    apply-http-lb-changes)
+        _command_args=('--host+:' '--ping+:' '--port+:')
+        ;;
+    backup-domain)
+        _command_args=('--backupconfig+:' '--backupdir+:' '--description+:' '--domaindir+:' '--long+:long:(true false)')
+        ;;
+    change-admin-password)
+        _command_args=('--domain_name+:' '--domaindir+:')
+        ;;
+    change-master-broker)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    change-master-password)
+        _command_args=('--domaindir+:' '--nodedir+:' '--savemasterpassword+:savemasterpassword:(true false)')
+        ;;
+    collect-log-files)
+        _command_args=('--host+:' '--port+:' '--retrieve+:retrieve:(true false)' '--target+:')
+        ;;
+    configure-jms-cluster)
+        _command_args=('--clustertype+:' '--configstoretype+:' '--dburl+:' '--dbuser+:' '--dbvendor+:' '--host+:' '--jmsdbpassword+:' '--messagestoretype+:' '--port+:' '--property+:')
+        ;;
+    configure-lb-weight)
+        _command_args=('--cluster+:' '--host+:' '--port+:')
+        ;;
+    configure-ldap-for-admin)
+        _command_args=('--basedn+:' '--host+:' '--ldap-group+:' '--port+:' '--target+:' '--url+:')
+        ;;
+    copy-config)
+        _command_args=('--host+:' '--port+:' '--systemproperties+:')
+        ;;
+    create-admin-object)
+        _command_args=('--classname+:' '--description+:' '--enabled+:enabled:(true false)' '--host+:' '--port+:' '--property+:' '--raname+:' '--restype+:' '--target+:')
+        ;;
+    create-application-ref)
+        _command_args=('--enabled+:enabled:(true false)' '--host+:' '--lbenabled+:lbenabled:(true false)' '--port+:' '--target+:' '--virtualservers+:')
+        ;;
+    create-audit-module)
+        _command_args=('--classname+:' '--host+:' '--port+:' '--property+:' '--target+:')
+        ;;
+    create-auth-realm)
+        _command_args=('--classname+:' '--host+:' '--port+:' '--property+:' '--target+:')
+        ;;
+    create-connector-connection-pool)
+        _command_args=('--associatewiththread+:associatewiththread:(true false)' '--connectiondefinition+:' '--creationretryattempts+:' '--creationretryinterval+:' '--description+:' '--failconnection+:failconnection:(true false)' '--host+:' '--idletimeout+:' '--isconnectvalidatereq+:isconnectvalidatereq:(true false)' '--lazyconnectionassociation+:lazyconnectionassociation:(true false)' '--lazyconnectionenlistment+:lazyconnectionenlistment:(true false)' '--leakreclaim+:leakreclaim:(true false)' '--leaktimeout+:' '--matchconnections+:matchconnections:(true false)' '--maxconnectionusagecount+:' '--maxpoolsize+:' '--maxwait+:' '--ping+:ping:(true false)' '--pooling+:pooling:(true false)' '--poolresize+:' '--port+:' '--property+:' '--raname+:' '--steadypoolsize+:' '--target+:' '--transactionsupport+:transactionsupport:(XATransaction LocalTransaction NoTransaction)' '--validateatmostonceperiod+:')
+        ;;
+    create-connector-resource)
+        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--host+:' '--objecttype+:' '--poolname+:' '--port+:' '--property+:' '--target+:')
+        ;;
+    create-connector-security-map)
+        _command_args=('--host+:' '--mappedpassword+:' '--mappedusername+:' '--poolname+:' '--port+:' '--principals+:' '--target+:' '--usergroups+:')
+        ;;
+    create-connector-work-security-map)
+        _command_args=('--description+:' '--groupsmap+:' '--host+:' '--port+:' '--principalsmap+:' '--raname+:')
+        ;;
+    create-custom-resource)
+        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--factoryclass+:' '--host+:' '--port+:' '--property+:' '--restype+:' '--target+:')
+        ;;
+    create-domain)
+        _command_args=('--adminport+:' '--checkports+:checkports:(true false)' '--domaindir+:' '--domainproperties+:' '--instanceport+:' '--keytooloptions+:' '--nopassword+:nopassword:(true false)' '--portbase+:' '--profile+:' '--savelogin+:savelogin:(true false)' '--savemasterpassword+:savemasterpassword:(true false)' '--template+:' '--usemasterpassword+:usemasterpassword:(true false)')
+        ;;
+    create-file-user)
+        _command_args=('--authrealmname+:' '--groups+:' '--host+:' '--port+:' '--target+:' '--userpassword+:')
+        ;;
+    create-http)
+        _command_args=('--default-virtual-server+:' '--dns-lookup-enabled+:dns-lookup-enabled:(true false)' '--host+:' '--max-connection+:' '--port+:' '--request-timeout-seconds+:' '--servername+:' '--target+:' '--timeout-seconds+:' '--xpowered+:xpowered:(true false)')
+        ;;
+    create-http-health-checker)
+        _command_args=('--config+:' '--host+:' '--interval+:' '--port+:' '--timeout+:' '--url+:')
+        ;;
+    create-http-lb)
+        _command_args=('--autoapplyenabled+:autoapplyenabled:(true false)' '--devicehost+:' '--deviceport+:' '--healthcheckerinterval+:' '--healthcheckertimeout+:' '--healthcheckerurl+:' '--host+:' '--httpsrouting+:httpsrouting:(true false)' '--lbenableallapplications+:' '--lbenableallinstances+:' '--lbpolicy+:' '--lbpolicymodule+:' '--lbweight+:' '--monitor+:monitor:(true false)' '--port+:' '--property+:' '--reloadinterval+:' '--responsetimeout+:' '--routecookie+:routecookie:(true false)' '--sslproxyhost+:' '--sslproxyport+:' '--target+:')
+        ;;
+    create-http-lb-ref)
+        _command_args=('--config+:' '--healthcheckerinterval+:' '--healthcheckertimeout+:' '--healthcheckerurl+:' '--host+:' '--lbenableallapplications+:' '--lbenableallinstances+:' '--lbname+:' '--lbpolicy+:' '--lbpolicymodule+:' '--lbweight+:' '--port+:')
+        ;;
+    create-http-listener)
+        _command_args=('--acceptorthreads+:' '--default-virtual-server+:' '--defaultvs+:' '--enabled+:enabled:(true false)' '--host+:' '--listeneraddress+:' '--listenerport+:' '--port+:' '--redirectport+:' '--secure+:secure:(true false)' '--securityenabled+:securityenabled:(true false)' '--servername+:' '--target+:' '--xpowered+:xpowered:(true false)')
+        ;;
+    create-http-redirect)
+        _command_args=('--host+:' '--port+:' '--redirect-port+:' '--secure-redirect+:' '--target+:')
+        ;;
+    create-iiop-listener)
+        _command_args=('--enabled+:enabled:(true false)' '--host+:' '--iiopport+:' '--listeneraddress+:' '--port+:' '--property+:' '--securityenabled+:securityenabled:(true false)' '--target+:')
+        ;;
+    create-instance)
+        _command_args=('--checkports+:checkports:(true false)' '--cluster+:' '--config+:' '--host+:' '--lbenabled+:lbenabled:(true false)' '--node+:node:_asadmin_nodes' '--port+:' '--portbase+:' '--systemproperties+:' '--terse+:terse:(true false)')
+        ;;
+    create-jacc-provider)
+        _command_args=('--host+:' '--policyconfigfactoryclass+:' '--policyproviderclass+:' '--port+:' '--property+:' '--target+:')
+        ;;
+    create-javamail-resource)
+        _command_args=('--debug+:debug:(true false)' '--description+:' '--enabled+:enabled:(true false)' '--fromaddress+:' '--host+:' '--mailhost+:' '--mailuser+:' '--port+:' '--property+:' '--storeprotocol+:' '--storeprotocolclass+:' '--target+:' '--transprotocol+:' '--transprotocolclass+:')
+        ;;
+    create-jdbc-connection-pool)
+        _command_args=('--allownoncomponentcallers+:allownoncomponentcallers:(true false)' '--associatewiththread+:associatewiththread:(true false)' '--creationretryattempts+:' '--creationretryinterval+:' '--datasourceclassname+:' '--description+:' '--driverclassname+:' '--failconnection+:failconnection:(true false)' '--host+:' '--idletimeout+:' '--initsql+:' '--isconnectvalidatereq+:isconnectvalidatereq:(true false)' '--isisolationguaranteed+:isisolationguaranteed:(true false)' '--isolationlevel+:' '--lazyconnectionassociation+:lazyconnectionassociation:(true false)' '--lazyconnectionenlistment+:lazyconnectionenlistment:(true false)' '--leakreclaim+:leakreclaim:(true false)' '--leaktimeout+:' '--matchconnections+:matchconnections:(true false)' '--maxconnectionusagecount+:' '--maxpoolsize+:' '--maxwait+:' '--nontransactionalconnections+:nontransactionalconnections:(true false)' '--ping+:ping:(true false)' '--pooling+:pooling:(true false)' '--poolresize+:' '--port+:' '--property+:' '--restype+:restype:(javax.sql.DataSource javax.sql.XADataSource javax.sql.ConnectionPoolDataSource java.sql.Driver)' '--sqltracelisteners+:' '--statementcachesize+:' '--statementleakreclaim+:statementleakreclaim:(true false)' '--statementleaktimeout+:' '--statementtimeout+:' '--steadypoolsize+:' '--target+:' '--validateatmostonceperiod+:' '--validationclassname+:' '--validationmethod+:validationmethod:(auto-commit meta-data table custom-validation)' '--validationtable+:' '--wrapjdbcobjects+:wrapjdbcobjects:(true false)')
+        ;;
+    create-jdbc-resource)
+        _command_args=('--connectionpoolid+:' '--description+:' '--enabled+:enabled:(true false)' '--host+:' '--port+:' '--property+:' '--target+:')
+        ;;
+    create-jms-host)
+        _command_args=('--host+:' '--mqhost+:' '--mqpassword+:' '--mqport+:' '--mquser+:' '--port+:' '--property+:' '--target+:')
+        ;;
+    create-jms-resource)
+        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--host+:' '--port+:' '--property+:' '--restype+:' '--target+:')
+        ;;
+    create-jmsdest)
+        _command_args=('--desttype+:' '--host+:' '--port+:' '--property+:' '--target+:')
+        ;;
+    create-jndi-resource)
+        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--factoryclass+:' '--host+:' '--jndilookupname+:' '--port+:' '--property+:' '--restype+:' '--target+:')
+        ;;
+    create-jvm-options)
+        _command_args=('--host+:' '--port+:' '--profiler+:profiler:(true false)' '--target+:')
+        ;;
+    create-lifecycle-module)
+        _command_args=('--classname+:' '--classpath+:' '--description+:' '--enabled+:enabled:(true false)' '--failurefatal+:failurefatal:(true false)' '--host+:' '--loadorder+:' '--port+:' '--property+:' '--target+:')
+        ;;
+    create-local-instance)
+        _command_args=('--checkports+:checkports:(true false)' '--cluster+:' '--config+:' '--lbenabled+:lbenabled:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:' '--portbase+:' '--savemasterpassword+:savemasterpassword:(true false)' '--systemproperties+:' '--usemasterpassword+:usemasterpassword:(true false)')
+        ;;
+    create-message-security-provider)
+        _command_args=('--classname+:' '--host+:' '--isdefaultprovider+:isdefaultprovider:(true false)' '--layer+:layer:(SOAP HttpServlet)' '--port+:' '--property+:' '--providertype+:providertype:(client server client-server)' '--requestauthrecipient+:' '--requestauthsource+:' '--responseauthrecipient+:' '--responseauthsource+:' '--target+:')
+        ;;
+    create-network-listener)
+        _command_args=('--address+:' '--enabled+:enabled:(true false)' '--host+:' '--jkenabled+:jkenabled:(true false)' '--listenerport+:' '--port+:' '--protocol+:' '--target+:' '--threadpool+:' '--transport+:')
+        ;;
+    create-node-config)
+        _command_args=('--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:')
+        ;;
+    create-node-dcom)
+        _command_args=('--archive+:' '--force+:force:(true false)' '--host+:' '--install+:install:(true false)' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
+        ;;
+    create-node-ssh)
+        _command_args=('--archive+:' '--force+:force:(true false)' '--host+:' '--install+:install:(true false)' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:' '--sshkeyfile+:' '--sshkeypassphrase+:' '--sshpassword+:' '--sshport+:' '--sshuser+:')
+        ;;
+    create-password-alias)
+        _command_args=('--aliaspassword+:' '--host+:' '--port+:')
+        ;;
+    create-profiler)
+        _command_args=('--classpath+:' '--enabled+:enabled:(true false)' '--host+:' '--nativelibrarypath+:' '--port+:' '--property+:' '--target+:')
+        ;;
+    create-protocol)
+        _command_args=('--host+:' '--port+:' '--securityenabled+:securityenabled:(true false)' '--target+:')
+        ;;
+    create-protocol-filter)
+        _command_args=('--classname+:' '--host+:' '--port+:' '--protocol+:' '--target+:')
+        ;;
+    create-protocol-finder)
+        _command_args=('--classname+:' '--host+:' '--port+:' '--protocol+:' '--target+:' '--targetprotocol+:')
+        ;;
+    create-resource-adapter-config)
+        _command_args=('--host+:' '--objecttype+:' '--port+:' '--property+:' '--target+:' '--threadpoolid+:')
+        ;;
+    create-resource-ref)
+        _command_args=('--enabled+:enabled:(true false)' '--host+:' '--port+:' '--target+:')
+        ;;
+    create-service)
+        _command_args=('--domaindir+:domaindir:directory:_files' '--dry-run+:dry-run:(true false)' '--force+:force:(true false)' '--name+:' '--node+:node:_asadmin_nodes' '--nodedir+:' '--serviceproperties+:' '--serviceuser+:')
+        ;;
+    create-ssl)
+        _command_args=('--certname+:' '--clientauthenabled+:clientauthenabled:(true false)' '--host+:' '--port+:' '--ssl2ciphers+:' '--ssl2enabled+:ssl2enabled:(true false)' '--ssl3enabled+:ssl3enabled:(true false)' '--ssl3tlsciphers+:' '--target+:' '--tlsenabled+:tlsenabled:(true false)' '--tlsrollbackenabled+:tlsrollbackenabled:(true false)' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
+        ;;
+    create-system-properties)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    create-threadpool)
+        _command_args=('--host+:' '--idletimeout+:' '--maxqueuesize+:' '--maxthreadpoolsize+:' '--minthreadpoolsize+:' '--port+:' '--target+:' '--workqueues+:')
+        ;;
+    create-transport)
+        _command_args=('--acceptorthreads+:' '--buffersizebytes+:' '--bytebuffertype+:' '--classname+:' '--displayconfiguration+:displayconfiguration:(true false)' '--enablesnoop+:enablesnoop:(true false)' '--host+:' '--idlekeytimeoutseconds+:' '--maxconnectionscount+:' '--port+:' '--readtimeoutmillis+:' '--selectionkeyhandler+:' '--selectorpolltimeoutmillis+:' '--target+:' '--tcpnodelay+:tcpnodelay:(true false)' '--writetimeoutmillis+:')
+        ;;
+    create-virtual-server)
+        _command_args=('--defaultwebmodule+:' '--host+:' '--hosts+:' '--httplisteners+:' '--logfile+:' '--networklisteners+:' '--port+:' '--property+:' '--state+:state:(on off disabled)' '--target+:')
+        ;;
+    delete-admin-object)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-application-ref)
+        _command_args=('--cascade+:cascade:(true false)' '--host+:' '--port+:' '--target+:')
+        ;;
+    delete-audit-module)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-auth-realm)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-config)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    delete-connector-connection-pool)
+        _command_args=('--cascade+:cascade:(true false)' '--host+:' '--port+:' '--target+:')
+        ;;
+    delete-connector-resource)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-connector-security-map)
+        _command_args=('--host+:' '--poolname+:' '--port+:' '--target+:')
+        ;;
+    delete-connector-work-security-map)
+        _command_args=('--host+:' '--port+:' '--raname+:')
+        ;;
+    delete-custom-resource)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-domain)
+        _command_args=('--domaindir+:')
+        ;;
+    delete-file-user)
+        _command_args=('--authrealmname+:' '--host+:' '--port+:' '--target+:')
+        ;;
+    delete-http)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-http-health-checker)
+        _command_args=('--config+:' '--host+:' '--port+:')
+        ;;
+    delete-http-lb-ref)
+        _command_args=('--config+:' '--force+:' '--host+:' '--lbname+:' '--port+:')
+        ;;
+    delete-http-listener)
+        _command_args=('--host+:' '--port+:' '--secure+:' '--target+:')
+        ;;
+    delete-http-redirect)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-iiop-listener)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-instance)
+        _command_args=('--host+:' '--port+:' '--terse+:terse:(true false)')
+        ;;
+    delete-jacc-provider)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-javamail-resource)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-jdbc-connection-pool)
+        _command_args=('--cascade+:cascade:(true false)' '--host+:' '--port+:' '--target+:')
+        ;;
+    delete-jdbc-resource)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-jms-host)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-jms-resource)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-jmsdest)
+        _command_args=('--desttype+:' '--host+:' '--port+:' '--target+:')
+        ;;
+    delete-jndi-resource)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-jvm-options)
+        _command_args=('--host+:' '--port+:' '--profiler+:profiler:(true false)' '--target+:')
+        ;;
+    delete-lifecycle-module)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-local-instance)
+        _command_args=('--node+:node:_asadmin_nodes' '--nodedir+:')
+        ;;
+    delete-log-levels)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-message-security-provider)
+        _command_args=('--host+:' '--layer+:' '--port+:' '--target+:')
+        ;;
+    delete-network-listener)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-node-config)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    delete-node-dcom)
+        _command_args=('--force+:force:(true false)' '--host+:' '--port+:' '--uninstall+:uninstall:(true false)')
+        ;;
+    delete-node-ssh)
+        _command_args=('--force+:force:(true false)' '--host+:' '--port+:' '--uninstall+:uninstall:(true false)')
+        ;;
+    delete-password-alias)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    delete-profiler)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-protocol)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-protocol-filter)
+        _command_args=('--host+:' '--port+:' '--protocol+:' '--target+:')
+        ;;
+    delete-protocol-finder)
+        _command_args=('--host+:' '--port+:' '--protocol+:' '--target+:')
+        ;;
+    delete-resource-adapter-config)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-resource-ref)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-ssl)
+        _command_args=('--host+:' '--port+:' '--target+:' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
+        ;;
+    delete-system-property)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-threadpool)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-transport)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-virtual-server)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    deploy)
+        _command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--port+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
+        ;;
+    deploydir)
+        _command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--port+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
+        ;;
+    disable)
+        _command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--isundeploy+:isundeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--port+:' '--properties+:' '--target+:')
+        ;;
+    disable-http-lb-application)
+        _command_args=('--host+:' '--name+:' '--port+:' '--timeout+:')
+        ;;
+    disable-http-lb-server)
+        _command_args=('--host+:' '--port+:' '--timeout+:')
+        ;;
+    disable-monitoring)
+        _command_args=('--host+:' '--modules+:' '--port+:' '--target+:')
+        ;;
+    disable-secure-admin)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    enable)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    enable-http-lb-application)
+        _command_args=('--host+:' '--name+:' '--port+:')
+        ;;
+    enable-http-lb-server)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    enable-monitoring)
+        _command_args=('--dtrace+:dtrace:(true false)' '--host+:' '--mbean+:mbean:(true false)' '--modules+:' '--options+:' '--pid+:' '--port+:' '--target+:')
+        ;;
+    enable-secure-admin)
+        _command_args=('--adminalias+:' '--host+:' '--instancealias+:' '--port+:')
+        ;;
+    export-http-lb-config)
+        _command_args=('--config+:' '--host+:' '--lbname+:' '--lbtargets+:' '--port+:' '--property+:' '--retrievefile+:retrievefile:(true false)')
+        ;;
+    export-sync-bundle)
+        _command_args=('--host+:' '--port+:' '--retrieve+:retrieve:(true false)' '--target+:')
+        ;;
+    flush-connection-pool)
+        _command_args=('--appname+:' '--host+:' '--modulename+:' '--port+:')
+        ;;
+    flush-jmsdest)
+        _command_args=('--desttype+:' '--host+:' '--port+:' '--target+:')
+        ;;
+    freeze-transaction-service)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    generate-domain-schema)
+        _command_args=('--format+:' '--host+:' '--port+:' '--showdeprecated+:showdeprecated:(true false)' '--showsubclasses+:showsubclasses:(true false)')
+        ;;
+    generate-jvm-report)
+        _command_args=('--host+:' '--port+:' '--target+:' '--type+:type:(summary thread class memory log)')
+        ;;
+    get)
+        _command_args=('--host+:' '--monitor+:monitor:(true false)' '--port+:')
+        ;;
+    get-client-stubs)
+        _command_args=('--appname+:' '--host+:' '--port+:')
+        ;;
+    get-health)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    help)
+        _describe -t help-commands "asadmin help command" _1st_arguments
+    ;;
+    import-sync-bundle)
+        _command_args=('--instance+:' '--node+:node:_asadmin_nodes' '--nodedir+:')
+        ;;
+    install-node)
+        _command_args=('--archive+:' '--create+:create:(true false)' '--force+:force:(true false)' '--installdir+:' '--save+:save:(true false)' '--sshkeyfile+:' '--sshport+:' '--sshuser+:')
+        ;;
+    install-node-dcom)
+        _command_args=('--archive+:' '--create+:create:(true false)' '--force+:force:(true false)' '--installdir+:' '--save+:save:(true false)' '--windowsdomain+:' '--windowsuser+:')
+        ;;
+    install-node-ssh)
+        _command_args=('--archive+:' '--create+:create:(true false)' '--force+:force:(true false)' '--installdir+:' '--save+:save:(true false)' '--sshkeyfile+:' '--sshport+:' '--sshuser+:')
+        ;;
+    jms-ping)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    list)
+        _command_args=('--host+:' '--monitor+:monitor:(true false)' '--port+:')
+        ;;
+    list-admin-objects)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-application-refs)
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--terse+:terse:(true false)')
+        ;;
+    list-applications)
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--resources+:resources:(true false)' '--subcomponents+:subcomponents:(true false)' '--terse+:terse:(true false)' '--type+:')
+        ;;
+    list-audit-modules)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-auth-realms)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-backups)
+        _command_args=('--backupconfig+:' '--backupdir+:' '--domaindir+:' '--long+:long:(true false)')
+        ;;
+    list-clusters)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-commands)
+        _command_args=('--localonly+:localonly:(true false)' '--remoteonly+:remoteonly:(true false)')
+        ;;
+    list-components)
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--resources+:resources:(true false)' '--subcomponents+:subcomponents:(true false)' '--terse+:terse:(true false)' '--type+:')
+        ;;
+    list-configs)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-connector-connection-pools)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-connector-resources)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-connector-security-maps)
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--securitymap+:' '--target+:')
+        ;;
+    list-connector-work-security-maps)
+        _command_args=('--host+:' '--port+:' '--securitymap+:')
+        ;;
+    list-containers)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-custom-resources)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    list-descriptors)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-domains)
+        _command_args=('--domaindir+:')
+        ;;
+    list-file-groups)
+        _command_args=('--authrealmname+:' '--host+:' '--name+:' '--port+:')
+        ;;
+    list-file-users)
+        _command_args=('--authrealmname+:' '--host+:' '--port+:')
+        ;;
+    list-http-lb-configs)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-http-listeners)
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:')
+        ;;
+    list-iiop-listeners)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-instances)
+        _command_args=('--host+:' '--long+:long:(true false)' '--nostatus+:nostatus:(true false)' '--port+:' '--standaloneonly+:standaloneonly:(true false)' '--timeoutmsec+:')
+        ;;
+    list-jacc-providers)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-javamail-resources)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    list-jdbc-connection-pools)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-jdbc-resources)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-jms-hosts)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    list-jms-resources)
+        _command_args=('--host+:' '--port+:' '--restype+:')
+        ;;
+    list-jmsdest)
+        _command_args=('--desttype+:' '--host+:' '--port+:' '--property+:')
+        ;;
+    list-jndi-entries)
+        _command_args=('--context+:' '--host+:' '--port+:')
+        ;;
+    list-jndi-resources)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    list-jvm-options)
+        _command_args=('--host+:' '--port+:' '--profiler+:profiler:(true false)' '--target+:')
+        ;;
+    list-libraries)
+        _command_args=('--host+:' '--port+:' '--type+:type:(common ext app)')
+        ;;
+    list-lifecycle-modules)
+        _command_args=('--host+:' '--port+:' '--terse+:terse:(true false)')
+        ;;
+    list-log-attributes)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-log-levels)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-message-security-providers)
+        _command_args=('--host+:' '--layer+:layer:(SOAP HttpServlet)' '--port+:')
+        ;;
+    list-modules)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-network-listeners)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-nodes)
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--terse+:terse:(true false)')
+        ;;
+    list-nodes-config)
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--terse+:terse:(true false)')
+        ;;
+    list-nodes-dcom)
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--terse+:terse:(true false)')
+        ;;
+    list-nodes-ssh)
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--terse+:terse:(true false)')
+        ;;
+    list-password-aliases)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-persistence-types)
+        _command_args=('--host+:' '--port+:' '--type+:')
+        ;;
+    list-protocol-filters)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    list-protocol-finders)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    list-protocols)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-resource-adapter-configs)
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--raname+:')
+        ;;
+    list-resource-refs)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-sub-components)
+        _command_args=('--appname+:' '--host+:' '--port+:' '--resources+:resources:(true false)' '--terse+:terse:(true false)' '--type+:')
+        ;;
+    list-supported-cipher-suites)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-system-properties)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-threadpools)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-timers)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-transports)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-virtual-servers)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    list-web-context-param)
+        _command_args=('--host+:' '--name+:' '--port+:')
+        ;;
+    list-web-env-entry)
+        _command_args=('--host+:' '--name+:' '--port+:')
+        ;;
+    login)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    migrate-timers)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    monitor)
+        _command_args=('--filename+:filename:directory:_files' '--filter+:' '--interval+:' '--type+:')
+        ;;
+    multimode)
+        _command_args=('--encoding+:' '--file+:file:directory:_files' '--printprompt+:printprompt:(true false)')
+        ;;
+    ping-connection-pool)
+        _command_args=('--appname+:' '--host+:' '--modulename+:' '--port+:' '--target+:')
+        ;;
+    ping-node-dcom)
+        _command_args=('--host+:' '--port+:' '--validate+:validate:(true false)')
+        ;;
+    ping-node-ssh)
+        _command_args=('--host+:' '--port+:' '--validate+:validate:(true false)')
+        ;;
+    recover-transactions)
+        _command_args=('--host+:' '--port+:' '--target+:' '--transactionlogdir+:')
+        ;;
+    redeploy)
+        _command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--port+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
+        ;;
+    remove-library)
+        _command_args=('--host+:' '--port+:' '--type+:type:(common ext app)')
+        ;;
+    restart-domain)
+        _command_args=('--debug+:debug:(true false)' '--domaindir+:' '--force+:force:(true false)' '--kill+:kill:(true false)')
+        ;;
+    restart-instance)
+        _command_args=('--debug+:' '--host+:' '--port+:')
+        ;;
+    restart-local-instance)
+        _command_args=('--debug+:debug:(true false)' '--force+:force:(true false)' '--kill+:kill:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:')
+        ;;
+    restore-domain)
+        _command_args=('--backupconfig+:' '--backupdir+:' '--description+:' '--domaindir+:' '--filename+:' '--force+:force:(true false)' '--long+:long:(true false)')
+        ;;
+    rollback-transaction)
+        _command_args=('--host+:' '--port+:' '--target+:' '--transaction_id+:')
+        ;;
+    rotate-log)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    set)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    set-log-attributes)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    set-log-levels)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    set-web-context-param)
+        _command_args=('--description+:' '--host+:' '--ignoredescriptoritem+:ignoredescriptoritem:(true false)' '--name+:' '--port+:' '--value+:')
+        ;;
+    set-web-env-entry)
+        _command_args=('--description+:' '--host+:' '--ignoredescriptoritem+:ignoredescriptoritem:(true false)' '--name+:' '--port+:' '--type+:' '--value+:')
+        ;;
+    setup-ssh)
+        _command_args=('--generatekey+:generatekey:(true false)' '--sshkeyfile+:' '--sshport+:' '--sshpublickeyfile+:' '--sshuser+:')
+        ;;
+    show-component-status)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    start-cluster)
+        _command_args=('--autohadboverride+:autohadboverride:(true false)' '--host+:' '--port+:' '--verbose+:verbose:(true false)')
+        ;;
+    start-database)
+        _command_args=('--dbhome+:' '--dbhost+:' '--dbport+:' '--jvmoptions+:')
+        ;;
+    start-domain)
+        _command_args=('--debug+:debug:(true false)' '--domaindir+:' '--upgrade+:upgrade:(true false)' '--verbose+:verbose:(true false)')
+        ;;
+    start-instance)
+        _command_args=('--debug+:debug:(true false)' '--host+:' '--port+:' '--setenv+:' '--sync+:sync:(none normal full)' '--terse+:terse:(true false)')
+        ;;
+    start-local-instance)
+        _command_args=('--debug+:debug:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:' '--sync+:sync:(none normal full)' '--verbose+:verbose:(true false)')
+        ;;
+    stop-cluster)
+        _command_args=('--autohadboverride+:autohadboverride:(true false)' '--host+:' '--kill+:kill:(true false)' '--port+:' '--verbose+:verbose:(true false)')
+        ;;
+    stop-database)
+        _command_args=('--dbhost+:' '--dbport+:' '--dbuser+:')
+        ;;
+    stop-domain)
+        _command_args=('--domaindir+:' '--force+:force:(true false)' '--kill+:kill:(true false)')
+        ;;
+    stop-instance)
+        _command_args=('--force+:force:(true false)' '--host+:' '--kill+:kill:(true false)' '--port+:')
+        ;;
+    stop-local-instance)
+        _command_args=('--force+:force:(true false)' '--kill+:kill:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:')
+        ;;
+    test-upgrade)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    undeploy)
+        _command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--port+:' '--properties+:' '--target+:')
+        ;;
+    unfreeze-transaction-service)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    uninstall-node)
+        _command_args=('--force+:force:(true false)' '--installdir+:' '--sshkeyfile+:' '--sshport+:' '--sshuser+:')
+        ;;
+    uninstall-node-dcom)
+        _command_args=('--force+:force:(true false)' '--installdir+:' '--windowsdomain+:' '--windowsuser+:')
+        ;;
+    uninstall-node-ssh)
+        _command_args=('--force+:force:(true false)' '--installdir+:' '--sshkeyfile+:' '--sshport+:' '--sshuser+:')
+        ;;
+    unset-web-context-param)
+        _command_args=('--host+:' '--name+:' '--port+:')
+        ;;
+    unset-web-env-entry)
+        _command_args=('--host+:' '--name+:' '--port+:')
+        ;;
+    update-connector-security-map)
+        _command_args=('--addprincipals+:' '--addusergroups+:' '--host+:' '--mappedpassword+:' '--mappedusername+:' '--poolname+:' '--port+:' '--removeprincipals+:' '--removeusergroups+:' '--target+:')
+        ;;
+    update-connector-work-security-map)
+        _command_args=('--addgroups+:' '--addprincipals+:' '--host+:' '--port+:' '--raname+:' '--removegroups+:' '--removeprincipals+:')
+        ;;
+    update-file-user)
+        _command_args=('--authrealmname+:' '--groups+:' '--host+:' '--port+:' '--target+:' '--userpassword+:')
+        ;;
+    update-node-config)
+        _command_args=('--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:')
+        ;;
+    update-node-dcom)
+        _command_args=('--force+:force:(true false)' '--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
+        ;;
+    update-node-ssh)
+        _command_args=('--force+:force:(true false)' '--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:' '--sshkeyfile+:' '--sshkeypassphrase+:' '--sshpassword+:' '--sshport+:' '--sshuser+:')
+        ;;
+    update-password-alias)
+        _command_args=('--aliaspassword+:' '--host+:' '--port+:')
+        ;;
+    uptime)
+        _command_args=('--host+:' '--milliseconds+:milliseconds:(true false)' '--port+:')
+        ;;
+    validate-dcom)
+        _command_args=('--host+:' '--port+:' '--remotetestdir+:' '--verbose+:verbose:(true false)' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
+        ;;
+    validate-multicast)
+        _command_args=('--bindaddress+:' '--multicastaddress+:' '--multicastport+:' '--sendperiod+:' '--timeout+:' '--timetolive+:' '--verbose+:verbose:(true false)')
+        ;;
+    verify-domain-xml)
+        _command_args=('--domaindir+:')
+        ;;
+    version)
+        _command_args=('--local+:local:(true false)' '--terse+:terse:(true false)' '--verbose+:verbose:(true false)')
+        ;;
 esac
 
+
+_asadmin_instances() {
+    compadd $(command asadmin list-instances --terse --nostatus domain)
+}
+
+_asadmin_libraries() {
+    compadd $(command asadmin list-libraries --terse)
+}
+
+_asadmin_nodes() {
+    compadd $(command asadmin list-nodes --terse)
+}
+
+compadd '--help'
 _arguments \
     $_command_args \
-    &&  return 0
+    &&  return 0;

From 0ebeb562523a33e636309a07b37fc1c291643f22 Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Tue, 24 Jul 2012 16:16:55 +0200
Subject: [PATCH 068/364] node completion

---
 plugins/glassfish/_asadmin | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/plugins/glassfish/_asadmin b/plugins/glassfish/_asadmin
index b29d65d3b..32b15b61d 100644
--- a/plugins/glassfish/_asadmin
+++ b/plugins/glassfish/_asadmin
@@ -559,13 +559,13 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:' '--target+:')
         ;;
     delete-node-config)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:nodes:_asadmin_nodes_config' '--host+:' '--port+:')
         ;;
     delete-node-dcom)
-        _command_args=('--force+:force:(true false)' '--host+:' '--port+:' '--uninstall+:uninstall:(true false)')
+        _command_args=('*:nodes:_asadmin_nodes_dcom' '--force+:force:(true false)' '--host+:' '--port+:' '--uninstall+:uninstall:(true false)')
         ;;
     delete-node-ssh)
-        _command_args=('--force+:force:(true false)' '--host+:' '--port+:' '--uninstall+:uninstall:(true false)')
+        _command_args=('*:nodes:_asadmin_nodes_ssh' '--force+:force:(true false)' '--host+:' '--port+:' '--uninstall+:uninstall:(true false)')
         ;;
     delete-password-alias)
         _command_args=('--host+:' '--port+:')
@@ -889,10 +889,10 @@ case "$words[1]" in
         _command_args=('--appname+:' '--host+:' '--modulename+:' '--port+:' '--target+:')
         ;;
     ping-node-dcom)
-        _command_args=('--host+:' '--port+:' '--validate+:validate:(true false)')
+        _command_args=('*:nodes:_asadmin_nodes_dcom' '--host+:' '--port+:' '--validate+:validate:(true false)')
         ;;
     ping-node-ssh)
-        _command_args=('--host+:' '--port+:' '--validate+:validate:(true false)')
+        _command_args=('*:nodes:_asadmin_nodes_ssh' '--host+:' '--port+:' '--validate+:validate:(true false)')
         ;;
     recover-transactions)
         _command_args=('--host+:' '--port+:' '--target+:' '--transactionlogdir+:')
@@ -1006,13 +1006,13 @@ case "$words[1]" in
         _command_args=('--authrealmname+:' '--groups+:' '--host+:' '--port+:' '--target+:' '--userpassword+:')
         ;;
     update-node-config)
-        _command_args=('--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:')
+        _command_args=('*:nodes:_asadmin_nodes_config' '--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:')
         ;;
     update-node-dcom)
-        _command_args=('--force+:force:(true false)' '--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
+        _command_args=('*:nodes:_asadmin_nodes_dcom' '--force+:force:(true false)' '--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
         ;;
     update-node-ssh)
-        _command_args=('--force+:force:(true false)' '--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:' '--sshkeyfile+:' '--sshkeypassphrase+:' '--sshpassword+:' '--sshport+:' '--sshuser+:')
+        _command_args=('*:nodes:_asadmin_nodes_ssh' '--force+:force:(true false)' '--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:' '--sshkeyfile+:' '--sshkeypassphrase+:' '--sshpassword+:' '--sshport+:' '--sshuser+:')
         ;;
     update-password-alias)
         _command_args=('--aliaspassword+:' '--host+:' '--port+:')
@@ -1047,6 +1047,18 @@ _asadmin_nodes() {
     compadd $(command asadmin list-nodes --terse)
 }
 
+_asadmin_nodes_config() {
+    compadd $(command asadmin list-nodes-config --terse)
+}
+
+_asadmin_nodes_dcom() {
+    compadd $(command asadmin list-nodes-dcom --terse)
+}
+
+_asadmin_nodes_ssh() {
+    compadd $(command asadmin list-nodes-ssh --terse)
+}
+
 compadd '--help'
 _arguments \
     $_command_args \

From fb3cae1b8f9740e03c8e107727c810feb97b5ec2 Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Tue, 31 Jul 2012 15:02:12 +0200
Subject: [PATCH 069/364] instance and cluster completion

---
 plugins/glassfish/_asadmin | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/plugins/glassfish/_asadmin b/plugins/glassfish/_asadmin
index 32b15b61d..1623cd274 100644
--- a/plugins/glassfish/_asadmin
+++ b/plugins/glassfish/_asadmin
@@ -307,7 +307,7 @@ case "$words[1]" in
         _command_args=('--clustertype+:' '--configstoretype+:' '--dburl+:' '--dbuser+:' '--dbvendor+:' '--host+:' '--jmsdbpassword+:' '--messagestoretype+:' '--port+:' '--property+:')
         ;;
     configure-lb-weight)
-        _command_args=('--cluster+:' '--host+:' '--port+:')
+        _command_args=('--cluster+:cluster:_asadmin_clusters' '--host+:' '--port+:')
         ;;
     configure-ldap-for-admin)
         _command_args=('--basedn+:' '--host+:' '--ldap-group+:' '--port+:' '--target+:' '--url+:')
@@ -370,7 +370,7 @@ case "$words[1]" in
         _command_args=('--enabled+:enabled:(true false)' '--host+:' '--iiopport+:' '--listeneraddress+:' '--port+:' '--property+:' '--securityenabled+:securityenabled:(true false)' '--target+:')
         ;;
     create-instance)
-        _command_args=('--checkports+:checkports:(true false)' '--cluster+:' '--config+:' '--host+:' '--lbenabled+:lbenabled:(true false)' '--node+:node:_asadmin_nodes' '--port+:' '--portbase+:' '--systemproperties+:' '--terse+:terse:(true false)')
+        _command_args=('--checkports+:checkports:(true false)' '--cluster+:cluster:_asadmin_clusters' '--config+:' '--host+:' '--lbenabled+:lbenabled:(true false)' '--node+:node:_asadmin_nodes' '--port+:' '--portbase+:' '--systemproperties+:' '--terse+:terse:(true false)')
         ;;
     create-jacc-provider)
         _command_args=('--host+:' '--policyconfigfactoryclass+:' '--policyproviderclass+:' '--port+:' '--property+:' '--target+:')
@@ -403,7 +403,7 @@ case "$words[1]" in
         _command_args=('--classname+:' '--classpath+:' '--description+:' '--enabled+:enabled:(true false)' '--failurefatal+:failurefatal:(true false)' '--host+:' '--loadorder+:' '--port+:' '--property+:' '--target+:')
         ;;
     create-local-instance)
-        _command_args=('--checkports+:checkports:(true false)' '--cluster+:' '--config+:' '--lbenabled+:lbenabled:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:' '--portbase+:' '--savemasterpassword+:savemasterpassword:(true false)' '--systemproperties+:' '--usemasterpassword+:usemasterpassword:(true false)')
+        _command_args=('--checkports+:checkports:(true false)' '--cluster+:cluster:_asadmin_clusters' '--config+:' '--lbenabled+:lbenabled:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:' '--portbase+:' '--savemasterpassword+:savemasterpassword:(true false)' '--systemproperties+:' '--usemasterpassword+:usemasterpassword:(true false)')
         ;;
     create-message-security-provider)
         _command_args=('--classname+:' '--host+:' '--isdefaultprovider+:isdefaultprovider:(true false)' '--layer+:layer:(SOAP HttpServlet)' '--port+:' '--property+:' '--providertype+:providertype:(client server client-server)' '--requestauthrecipient+:' '--requestauthsource+:' '--responseauthrecipient+:' '--responseauthsource+:' '--target+:')
@@ -442,7 +442,7 @@ case "$words[1]" in
         _command_args=('--enabled+:enabled:(true false)' '--host+:' '--port+:' '--target+:')
         ;;
     create-service)
-        _command_args=('--domaindir+:domaindir:directory:_files' '--dry-run+:dry-run:(true false)' '--force+:force:(true false)' '--name+:' '--node+:node:_asadmin_nodes' '--nodedir+:' '--serviceproperties+:' '--serviceuser+:')
+        _command_args=('*:instances:_asadmin_instances' '--domaindir+:domaindir:directory:_files' '--dry-run+:dry-run:(true false)' '--force+:force:(true false)' '--name+:' '--node+:node:_asadmin_nodes' '--nodedir+:' '--serviceproperties+:' '--serviceuser+:')
         ;;
     create-ssl)
         _command_args=('--certname+:' '--clientauthenabled+:clientauthenabled:(true false)' '--host+:' '--port+:' '--ssl2ciphers+:' '--ssl2enabled+:ssl2enabled:(true false)' '--ssl3enabled+:ssl3enabled:(true false)' '--ssl3tlsciphers+:' '--target+:' '--tlsenabled+:tlsenabled:(true false)' '--tlsrollbackenabled+:tlsrollbackenabled:(true false)' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
@@ -514,7 +514,7 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:' '--target+:')
         ;;
     delete-instance)
-        _command_args=('--host+:' '--port+:' '--terse+:terse:(true false)')
+        _command_args=('*:instances:_asadmin_instances' '--host+:' '--port+:' '--terse+:terse:(true false)')
         ;;
     delete-jacc-provider)
         _command_args=('--host+:' '--port+:' '--target+:')
@@ -547,7 +547,7 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:' '--target+:')
         ;;
     delete-local-instance)
-        _command_args=('--node+:node:_asadmin_nodes' '--nodedir+:')
+        _command_args=('*:instances:_asadmin_instances' '--node+:node:_asadmin_nodes' '--nodedir+:')
         ;;
     delete-log-levels)
         _command_args=('--host+:' '--port+:' '--target+:')
@@ -907,10 +907,10 @@ case "$words[1]" in
         _command_args=('--debug+:debug:(true false)' '--domaindir+:' '--force+:force:(true false)' '--kill+:kill:(true false)')
         ;;
     restart-instance)
-        _command_args=('--debug+:' '--host+:' '--port+:')
+        _command_args=('*:instances:_asadmin_instances' '--debug+:' '--host+:' '--port+:')
         ;;
     restart-local-instance)
-        _command_args=('--debug+:debug:(true false)' '--force+:force:(true false)' '--kill+:kill:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:')
+        _command_args=('*:instances:_asadmin_instances' '--debug+:debug:(true false)' '--force+:force:(true false)' '--kill+:kill:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:')
         ;;
     restore-domain)
         _command_args=('--backupconfig+:' '--backupdir+:' '--description+:' '--domaindir+:' '--filename+:' '--force+:force:(true false)' '--long+:long:(true false)')
@@ -943,7 +943,7 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:' '--target+:')
         ;;
     start-cluster)
-        _command_args=('--autohadboverride+:autohadboverride:(true false)' '--host+:' '--port+:' '--verbose+:verbose:(true false)')
+        _command_args=('*:clusters:_asadmin_clusters' '--autohadboverride+:autohadboverride:(true false)' '--host+:' '--port+:' '--verbose+:verbose:(true false)')
         ;;
     start-database)
         _command_args=('--dbhome+:' '--dbhost+:' '--dbport+:' '--jvmoptions+:')
@@ -952,13 +952,13 @@ case "$words[1]" in
         _command_args=('--debug+:debug:(true false)' '--domaindir+:' '--upgrade+:upgrade:(true false)' '--verbose+:verbose:(true false)')
         ;;
     start-instance)
-        _command_args=('--debug+:debug:(true false)' '--host+:' '--port+:' '--setenv+:' '--sync+:sync:(none normal full)' '--terse+:terse:(true false)')
+        _command_args=('*:instances:_asadmin_instances' '--debug+:debug:(true false)' '--host+:' '--port+:' '--setenv+:' '--sync+:sync:(none normal full)' '--terse+:terse:(true false)')
         ;;
     start-local-instance)
-        _command_args=('--debug+:debug:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:' '--sync+:sync:(none normal full)' '--verbose+:verbose:(true false)')
+        _command_args=('*:instances:_asadmin_instances' '--debug+:debug:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:' '--sync+:sync:(none normal full)' '--verbose+:verbose:(true false)')
         ;;
     stop-cluster)
-        _command_args=('--autohadboverride+:autohadboverride:(true false)' '--host+:' '--kill+:kill:(true false)' '--port+:' '--verbose+:verbose:(true false)')
+        _command_args=('*:clusters:_asadmin_clusters' '--autohadboverride+:autohadboverride:(true false)' '--host+:' '--kill+:kill:(true false)' '--port+:' '--verbose+:verbose:(true false)')
         ;;
     stop-database)
         _command_args=('--dbhost+:' '--dbport+:' '--dbuser+:')
@@ -967,10 +967,10 @@ case "$words[1]" in
         _command_args=('--domaindir+:' '--force+:force:(true false)' '--kill+:kill:(true false)')
         ;;
     stop-instance)
-        _command_args=('--force+:force:(true false)' '--host+:' '--kill+:kill:(true false)' '--port+:')
+        _command_args=('*:instances:_asadmin_instances' '--force+:force:(true false)' '--host+:' '--kill+:kill:(true false)' '--port+:')
         ;;
     stop-local-instance)
-        _command_args=('--force+:force:(true false)' '--kill+:kill:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:')
+        _command_args=('*:instances:_asadmin_instances' '--force+:force:(true false)' '--kill+:kill:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:')
         ;;
     test-upgrade)
         _command_args=('--host+:' '--port+:')
@@ -1035,6 +1035,10 @@ case "$words[1]" in
 esac
 
 
+_asadmin_clusters() {
+    compadd $(command asadmin list-clusters --terse | sed 's/ .*//')
+}
+
 _asadmin_instances() {
     compadd $(command asadmin list-instances --terse --nostatus domain)
 }

From a4e6a2ce9fe2edd98dd654763fac87cc08660dc3 Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Tue, 31 Jul 2012 16:59:56 +0200
Subject: [PATCH 070/364] completion of targets

---
 plugins/glassfish/_asadmin | 323 +++++++++++++++++++++++--------------
 1 file changed, 200 insertions(+), 123 deletions(-)

diff --git a/plugins/glassfish/_asadmin b/plugins/glassfish/_asadmin
index 1623cd274..9d6b5687b 100644
--- a/plugins/glassfish/_asadmin
+++ b/plugins/glassfish/_asadmin
@@ -283,7 +283,7 @@ case "$words[1]" in
         _command_args=('*:directory:_files' '--host+:' '--port+:' '--type+:type:(common ext app)')
         ;;
     add-resources)
-        _command_args=('*:directory:_files' '--host+:' '--port+:' '--target+:')
+        _command_args=('*:directory:_files' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     apply-http-lb-changes)
         _command_args=('--host+:' '--ping+:' '--port+:')
@@ -310,28 +310,28 @@ case "$words[1]" in
         _command_args=('--cluster+:cluster:_asadmin_clusters' '--host+:' '--port+:')
         ;;
     configure-ldap-for-admin)
-        _command_args=('--basedn+:' '--host+:' '--ldap-group+:' '--port+:' '--target+:' '--url+:')
+        _command_args=('--basedn+:' '--host+:' '--ldap-group+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--url+:')
         ;;
     copy-config)
         _command_args=('--host+:' '--port+:' '--systemproperties+:')
         ;;
     create-admin-object)
-        _command_args=('--classname+:' '--description+:' '--enabled+:enabled:(true false)' '--host+:' '--port+:' '--property+:' '--raname+:' '--restype+:' '--target+:')
+        _command_args=('--classname+:' '--description+:' '--enabled+:enabled:(true false)' '--host+:' '--port+:' '--property+:' '--raname+:' '--restype+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-application-ref)
-        _command_args=('--enabled+:enabled:(true false)' '--host+:' '--lbenabled+:lbenabled:(true false)' '--port+:' '--target+:' '--virtualservers+:')
+        _command_args=('--enabled+:enabled:(true false)' '--host+:' '--lbenabled+:lbenabled:(true false)' '--port+:' '--target+:target:_asadmin_targets_cluster_das_standalone_instance' '--virtualservers+:')
         ;;
     create-audit-module)
-        _command_args=('--classname+:' '--host+:' '--port+:' '--property+:' '--target+:')
+        _command_args=('--classname+:' '--host+:' '--port+:' '--property+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-auth-realm)
-        _command_args=('--classname+:' '--host+:' '--port+:' '--property+:' '--target+:')
+        _command_args=('--classname+:' '--host+:' '--port+:' '--property+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-connector-connection-pool)
         _command_args=('--associatewiththread+:associatewiththread:(true false)' '--connectiondefinition+:' '--creationretryattempts+:' '--creationretryinterval+:' '--description+:' '--failconnection+:failconnection:(true false)' '--host+:' '--idletimeout+:' '--isconnectvalidatereq+:isconnectvalidatereq:(true false)' '--lazyconnectionassociation+:lazyconnectionassociation:(true false)' '--lazyconnectionenlistment+:lazyconnectionenlistment:(true false)' '--leakreclaim+:leakreclaim:(true false)' '--leaktimeout+:' '--matchconnections+:matchconnections:(true false)' '--maxconnectionusagecount+:' '--maxpoolsize+:' '--maxwait+:' '--ping+:ping:(true false)' '--pooling+:pooling:(true false)' '--poolresize+:' '--port+:' '--property+:' '--raname+:' '--steadypoolsize+:' '--target+:' '--transactionsupport+:transactionsupport:(XATransaction LocalTransaction NoTransaction)' '--validateatmostonceperiod+:')
         ;;
     create-connector-resource)
-        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--host+:' '--objecttype+:' '--poolname+:' '--port+:' '--property+:' '--target+:')
+        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--host+:' '--objecttype+:' '--poolname+:' '--port+:' '--property+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     create-connector-security-map)
         _command_args=('--host+:' '--mappedpassword+:' '--mappedusername+:' '--poolname+:' '--port+:' '--principals+:' '--target+:' '--usergroups+:')
@@ -340,76 +340,76 @@ case "$words[1]" in
         _command_args=('--description+:' '--groupsmap+:' '--host+:' '--port+:' '--principalsmap+:' '--raname+:')
         ;;
     create-custom-resource)
-        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--factoryclass+:' '--host+:' '--port+:' '--property+:' '--restype+:' '--target+:')
+        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--factoryclass+:' '--host+:' '--port+:' '--property+:' '--restype+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     create-domain)
         _command_args=('--adminport+:' '--checkports+:checkports:(true false)' '--domaindir+:' '--domainproperties+:' '--instanceport+:' '--keytooloptions+:' '--nopassword+:nopassword:(true false)' '--portbase+:' '--profile+:' '--savelogin+:savelogin:(true false)' '--savemasterpassword+:savemasterpassword:(true false)' '--template+:' '--usemasterpassword+:usemasterpassword:(true false)')
         ;;
     create-file-user)
-        _command_args=('--authrealmname+:' '--groups+:' '--host+:' '--port+:' '--target+:' '--userpassword+:')
+        _command_args=('--authrealmname+:' '--groups+:' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--userpassword+:')
         ;;
     create-http)
-        _command_args=('--default-virtual-server+:' '--dns-lookup-enabled+:dns-lookup-enabled:(true false)' '--host+:' '--max-connection+:' '--port+:' '--request-timeout-seconds+:' '--servername+:' '--target+:' '--timeout-seconds+:' '--xpowered+:xpowered:(true false)')
+        _command_args=('--default-virtual-server+:' '--dns-lookup-enabled+:dns-lookup-enabled:(true false)' '--host+:' '--max-connection+:' '--port+:' '--request-timeout-seconds+:' '--servername+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--timeout-seconds+:' '--xpowered+:xpowered:(true false)')
         ;;
     create-http-health-checker)
         _command_args=('--config+:' '--host+:' '--interval+:' '--port+:' '--timeout+:' '--url+:')
         ;;
     create-http-lb)
-        _command_args=('--autoapplyenabled+:autoapplyenabled:(true false)' '--devicehost+:' '--deviceport+:' '--healthcheckerinterval+:' '--healthcheckertimeout+:' '--healthcheckerurl+:' '--host+:' '--httpsrouting+:httpsrouting:(true false)' '--lbenableallapplications+:' '--lbenableallinstances+:' '--lbpolicy+:' '--lbpolicymodule+:' '--lbweight+:' '--monitor+:monitor:(true false)' '--port+:' '--property+:' '--reloadinterval+:' '--responsetimeout+:' '--routecookie+:routecookie:(true false)' '--sslproxyhost+:' '--sslproxyport+:' '--target+:')
+        _command_args=('--autoapplyenabled+:autoapplyenabled:(true false)' '--devicehost+:' '--deviceport+:' '--healthcheckerinterval+:' '--healthcheckertimeout+:' '--healthcheckerurl+:' '--host+:' '--httpsrouting+:httpsrouting:(true false)' '--lbenableallapplications+:' '--lbenableallinstances+:' '--lbpolicy+:' '--lbpolicymodule+:' '--lbweight+:' '--monitor+:monitor:(true false)' '--port+:' '--property+:' '--reloadinterval+:' '--responsetimeout+:' '--routecookie+:routecookie:(true false)' '--sslproxyhost+:' '--sslproxyport+:' '--target+:target:_asadmin_targets_cluster_standalone_instance')
         ;;
     create-http-lb-ref)
         _command_args=('--config+:' '--healthcheckerinterval+:' '--healthcheckertimeout+:' '--healthcheckerurl+:' '--host+:' '--lbenableallapplications+:' '--lbenableallinstances+:' '--lbname+:' '--lbpolicy+:' '--lbpolicymodule+:' '--lbweight+:' '--port+:')
         ;;
     create-http-listener)
-        _command_args=('--acceptorthreads+:' '--default-virtual-server+:' '--defaultvs+:' '--enabled+:enabled:(true false)' '--host+:' '--listeneraddress+:' '--listenerport+:' '--port+:' '--redirectport+:' '--secure+:secure:(true false)' '--securityenabled+:securityenabled:(true false)' '--servername+:' '--target+:' '--xpowered+:xpowered:(true false)')
+        _command_args=('--acceptorthreads+:' '--default-virtual-server+:' '--defaultvs+:' '--enabled+:enabled:(true false)' '--host+:' '--listeneraddress+:' '--listenerport+:' '--port+:' '--redirectport+:' '--secure+:secure:(true false)' '--securityenabled+:securityenabled:(true false)' '--servername+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--xpowered+:xpowered:(true false)')
         ;;
     create-http-redirect)
-        _command_args=('--host+:' '--port+:' '--redirect-port+:' '--secure-redirect+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--redirect-port+:' '--secure-redirect+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-iiop-listener)
-        _command_args=('--enabled+:enabled:(true false)' '--host+:' '--iiopport+:' '--listeneraddress+:' '--port+:' '--property+:' '--securityenabled+:securityenabled:(true false)' '--target+:')
+        _command_args=('--enabled+:enabled:(true false)' '--host+:' '--iiopport+:' '--listeneraddress+:' '--port+:' '--property+:' '--securityenabled+:securityenabled:(true false)' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-instance)
         _command_args=('--checkports+:checkports:(true false)' '--cluster+:cluster:_asadmin_clusters' '--config+:' '--host+:' '--lbenabled+:lbenabled:(true false)' '--node+:node:_asadmin_nodes' '--port+:' '--portbase+:' '--systemproperties+:' '--terse+:terse:(true false)')
         ;;
     create-jacc-provider)
-        _command_args=('--host+:' '--policyconfigfactoryclass+:' '--policyproviderclass+:' '--port+:' '--property+:' '--target+:')
+        _command_args=('--host+:' '--policyconfigfactoryclass+:' '--policyproviderclass+:' '--port+:' '--property+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-javamail-resource)
-        _command_args=('--debug+:debug:(true false)' '--description+:' '--enabled+:enabled:(true false)' '--fromaddress+:' '--host+:' '--mailhost+:' '--mailuser+:' '--port+:' '--property+:' '--storeprotocol+:' '--storeprotocolclass+:' '--target+:' '--transprotocol+:' '--transprotocolclass+:')
+        _command_args=('--debug+:debug:(true false)' '--description+:' '--enabled+:enabled:(true false)' '--fromaddress+:' '--host+:' '--mailhost+:' '--mailuser+:' '--port+:' '--property+:' '--storeprotocol+:' '--storeprotocolclass+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance' '--transprotocol+:' '--transprotocolclass+:')
         ;;
     create-jdbc-connection-pool)
         _command_args=('--allownoncomponentcallers+:allownoncomponentcallers:(true false)' '--associatewiththread+:associatewiththread:(true false)' '--creationretryattempts+:' '--creationretryinterval+:' '--datasourceclassname+:' '--description+:' '--driverclassname+:' '--failconnection+:failconnection:(true false)' '--host+:' '--idletimeout+:' '--initsql+:' '--isconnectvalidatereq+:isconnectvalidatereq:(true false)' '--isisolationguaranteed+:isisolationguaranteed:(true false)' '--isolationlevel+:' '--lazyconnectionassociation+:lazyconnectionassociation:(true false)' '--lazyconnectionenlistment+:lazyconnectionenlistment:(true false)' '--leakreclaim+:leakreclaim:(true false)' '--leaktimeout+:' '--matchconnections+:matchconnections:(true false)' '--maxconnectionusagecount+:' '--maxpoolsize+:' '--maxwait+:' '--nontransactionalconnections+:nontransactionalconnections:(true false)' '--ping+:ping:(true false)' '--pooling+:pooling:(true false)' '--poolresize+:' '--port+:' '--property+:' '--restype+:restype:(javax.sql.DataSource javax.sql.XADataSource javax.sql.ConnectionPoolDataSource java.sql.Driver)' '--sqltracelisteners+:' '--statementcachesize+:' '--statementleakreclaim+:statementleakreclaim:(true false)' '--statementleaktimeout+:' '--statementtimeout+:' '--steadypoolsize+:' '--target+:' '--validateatmostonceperiod+:' '--validationclassname+:' '--validationmethod+:validationmethod:(auto-commit meta-data table custom-validation)' '--validationtable+:' '--wrapjdbcobjects+:wrapjdbcobjects:(true false)')
         ;;
     create-jdbc-resource)
-        _command_args=('--connectionpoolid+:' '--description+:' '--enabled+:enabled:(true false)' '--host+:' '--port+:' '--property+:' '--target+:')
+        _command_args=('--connectionpoolid+:' '--description+:' '--enabled+:enabled:(true false)' '--host+:' '--port+:' '--property+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     create-jms-host)
-        _command_args=('--host+:' '--mqhost+:' '--mqpassword+:' '--mqport+:' '--mquser+:' '--port+:' '--property+:' '--target+:')
+        _command_args=('--host+:' '--mqhost+:' '--mqpassword+:' '--mqport+:' '--mquser+:' '--port+:' '--property+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-jms-resource)
-        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--host+:' '--port+:' '--property+:' '--restype+:' '--target+:')
+        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--host+:' '--port+:' '--property+:' '--restype+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     create-jmsdest)
-        _command_args=('--desttype+:' '--host+:' '--port+:' '--property+:' '--target+:')
+        _command_args=('--desttype+:' '--host+:' '--port+:' '--property+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-jndi-resource)
-        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--factoryclass+:' '--host+:' '--jndilookupname+:' '--port+:' '--property+:' '--restype+:' '--target+:')
+        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--factoryclass+:' '--host+:' '--jndilookupname+:' '--port+:' '--property+:' '--restype+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     create-jvm-options)
-        _command_args=('--host+:' '--port+:' '--profiler+:profiler:(true false)' '--target+:')
+        _command_args=('--host+:' '--port+:' '--profiler+:profiler:(true false)' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-lifecycle-module)
-        _command_args=('--classname+:' '--classpath+:' '--description+:' '--enabled+:enabled:(true false)' '--failurefatal+:failurefatal:(true false)' '--host+:' '--loadorder+:' '--port+:' '--property+:' '--target+:')
+        _command_args=('--classname+:' '--classpath+:' '--description+:' '--enabled+:enabled:(true false)' '--failurefatal+:failurefatal:(true false)' '--host+:' '--loadorder+:' '--port+:' '--property+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     create-local-instance)
         _command_args=('--checkports+:checkports:(true false)' '--cluster+:cluster:_asadmin_clusters' '--config+:' '--lbenabled+:lbenabled:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:' '--portbase+:' '--savemasterpassword+:savemasterpassword:(true false)' '--systemproperties+:' '--usemasterpassword+:usemasterpassword:(true false)')
         ;;
     create-message-security-provider)
-        _command_args=('--classname+:' '--host+:' '--isdefaultprovider+:isdefaultprovider:(true false)' '--layer+:layer:(SOAP HttpServlet)' '--port+:' '--property+:' '--providertype+:providertype:(client server client-server)' '--requestauthrecipient+:' '--requestauthsource+:' '--responseauthrecipient+:' '--responseauthsource+:' '--target+:')
+        _command_args=('--classname+:' '--host+:' '--isdefaultprovider+:isdefaultprovider:(true false)' '--layer+:layer:(SOAP HttpServlet)' '--port+:' '--property+:' '--providertype+:providertype:(client server client-server)' '--requestauthrecipient+:' '--requestauthsource+:' '--responseauthrecipient+:' '--responseauthsource+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-network-listener)
-        _command_args=('--address+:' '--enabled+:enabled:(true false)' '--host+:' '--jkenabled+:jkenabled:(true false)' '--listenerport+:' '--port+:' '--protocol+:' '--target+:' '--threadpool+:' '--transport+:')
+        _command_args=('--address+:' '--enabled+:enabled:(true false)' '--host+:' '--jkenabled+:jkenabled:(true false)' '--listenerport+:' '--port+:' '--protocol+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--threadpool+:' '--transport+:')
         ;;
     create-node-config)
         _command_args=('--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:')
@@ -424,52 +424,52 @@ case "$words[1]" in
         _command_args=('--aliaspassword+:' '--host+:' '--port+:')
         ;;
     create-profiler)
-        _command_args=('--classpath+:' '--enabled+:enabled:(true false)' '--host+:' '--nativelibrarypath+:' '--port+:' '--property+:' '--target+:')
+        _command_args=('--classpath+:' '--enabled+:enabled:(true false)' '--host+:' '--nativelibrarypath+:' '--port+:' '--property+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-protocol)
-        _command_args=('--host+:' '--port+:' '--securityenabled+:securityenabled:(true false)' '--target+:')
+        _command_args=('--host+:' '--port+:' '--securityenabled+:securityenabled:(true false)' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-protocol-filter)
-        _command_args=('--classname+:' '--host+:' '--port+:' '--protocol+:' '--target+:')
+        _command_args=('--classname+:' '--host+:' '--port+:' '--protocol+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-protocol-finder)
-        _command_args=('--classname+:' '--host+:' '--port+:' '--protocol+:' '--target+:' '--targetprotocol+:')
+        _command_args=('--classname+:' '--host+:' '--port+:' '--protocol+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--targetprotocol+:')
         ;;
     create-resource-adapter-config)
         _command_args=('--host+:' '--objecttype+:' '--port+:' '--property+:' '--target+:' '--threadpoolid+:')
         ;;
     create-resource-ref)
-        _command_args=('--enabled+:enabled:(true false)' '--host+:' '--port+:' '--target+:')
+        _command_args=('--enabled+:enabled:(true false)' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_standalone_instance')
         ;;
     create-service)
         _command_args=('*:instances:_asadmin_instances' '--domaindir+:domaindir:directory:_files' '--dry-run+:dry-run:(true false)' '--force+:force:(true false)' '--name+:' '--node+:node:_asadmin_nodes' '--nodedir+:' '--serviceproperties+:' '--serviceuser+:')
         ;;
     create-ssl)
-        _command_args=('--certname+:' '--clientauthenabled+:clientauthenabled:(true false)' '--host+:' '--port+:' '--ssl2ciphers+:' '--ssl2enabled+:ssl2enabled:(true false)' '--ssl3enabled+:ssl3enabled:(true false)' '--ssl3tlsciphers+:' '--target+:' '--tlsenabled+:tlsenabled:(true false)' '--tlsrollbackenabled+:tlsrollbackenabled:(true false)' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
+        _command_args=('--certname+:' '--clientauthenabled+:clientauthenabled:(true false)' '--host+:' '--port+:' '--ssl2ciphers+:' '--ssl2enabled+:ssl2enabled:(true false)' '--ssl3enabled+:ssl3enabled:(true false)' '--ssl3tlsciphers+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--tlsenabled+:tlsenabled:(true false)' '--tlsrollbackenabled+:tlsrollbackenabled:(true false)' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
         ;;
     create-system-properties)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_config_das_domain_standalone_instance')
         ;;
     create-threadpool)
-        _command_args=('--host+:' '--idletimeout+:' '--maxqueuesize+:' '--maxthreadpoolsize+:' '--minthreadpoolsize+:' '--port+:' '--target+:' '--workqueues+:')
+        _command_args=('--host+:' '--idletimeout+:' '--maxqueuesize+:' '--maxthreadpoolsize+:' '--minthreadpoolsize+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--workqueues+:')
         ;;
     create-transport)
-        _command_args=('--acceptorthreads+:' '--buffersizebytes+:' '--bytebuffertype+:' '--classname+:' '--displayconfiguration+:displayconfiguration:(true false)' '--enablesnoop+:enablesnoop:(true false)' '--host+:' '--idlekeytimeoutseconds+:' '--maxconnectionscount+:' '--port+:' '--readtimeoutmillis+:' '--selectionkeyhandler+:' '--selectorpolltimeoutmillis+:' '--target+:' '--tcpnodelay+:tcpnodelay:(true false)' '--writetimeoutmillis+:')
+        _command_args=('--acceptorthreads+:' '--buffersizebytes+:' '--bytebuffertype+:' '--classname+:' '--displayconfiguration+:displayconfiguration:(true false)' '--enablesnoop+:enablesnoop:(true false)' '--host+:' '--idlekeytimeoutseconds+:' '--maxconnectionscount+:' '--port+:' '--readtimeoutmillis+:' '--selectionkeyhandler+:' '--selectorpolltimeoutmillis+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--tcpnodelay+:tcpnodelay:(true false)' '--writetimeoutmillis+:')
         ;;
     create-virtual-server)
-        _command_args=('--defaultwebmodule+:' '--host+:' '--hosts+:' '--httplisteners+:' '--logfile+:' '--networklisteners+:' '--port+:' '--property+:' '--state+:state:(on off disabled)' '--target+:')
+        _command_args=('--defaultwebmodule+:' '--host+:' '--hosts+:' '--httplisteners+:' '--logfile+:' '--networklisteners+:' '--port+:' '--property+:' '--state+:state:(on off disabled)' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-admin-object)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-application-ref)
-        _command_args=('--cascade+:cascade:(true false)' '--host+:' '--port+:' '--target+:')
+        _command_args=('--cascade+:cascade:(true false)' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_standalone_instance')
         ;;
     delete-audit-module)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-auth-realm)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-config)
         _command_args=('--host+:' '--port+:')
@@ -478,7 +478,7 @@ case "$words[1]" in
         _command_args=('--cascade+:cascade:(true false)' '--host+:' '--port+:' '--target+:')
         ;;
     delete-connector-resource)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     delete-connector-security-map)
         _command_args=('--host+:' '--poolname+:' '--port+:' '--target+:')
@@ -487,16 +487,16 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:' '--raname+:')
         ;;
     delete-custom-resource)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     delete-domain)
         _command_args=('--domaindir+:')
         ;;
     delete-file-user)
-        _command_args=('--authrealmname+:' '--host+:' '--port+:' '--target+:')
+        _command_args=('--authrealmname+:' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-http)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-http-health-checker)
         _command_args=('--config+:' '--host+:' '--port+:')
@@ -505,58 +505,58 @@ case "$words[1]" in
         _command_args=('--config+:' '--force+:' '--host+:' '--lbname+:' '--port+:')
         ;;
     delete-http-listener)
-        _command_args=('--host+:' '--port+:' '--secure+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--secure+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-http-redirect)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-iiop-listener)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-instance)
         _command_args=('*:instances:_asadmin_instances' '--host+:' '--port+:' '--terse+:terse:(true false)')
         ;;
     delete-jacc-provider)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-javamail-resource)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     delete-jdbc-connection-pool)
         _command_args=('--cascade+:cascade:(true false)' '--host+:' '--port+:' '--target+:')
         ;;
     delete-jdbc-resource)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     delete-jms-host)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-jms-resource)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     delete-jmsdest)
-        _command_args=('--desttype+:' '--host+:' '--port+:' '--target+:')
+        _command_args=('--desttype+:' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-jndi-resource)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     delete-jvm-options)
-        _command_args=('--host+:' '--port+:' '--profiler+:profiler:(true false)' '--target+:')
+        _command_args=('--host+:' '--port+:' '--profiler+:profiler:(true false)' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-lifecycle-module)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     delete-local-instance)
         _command_args=('*:instances:_asadmin_instances' '--node+:node:_asadmin_nodes' '--nodedir+:')
         ;;
     delete-log-levels)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-message-security-provider)
-        _command_args=('--host+:' '--layer+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--layer+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-network-listener)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-node-config)
         _command_args=('*:nodes:_asadmin_nodes_config' '--host+:' '--port+:')
@@ -571,46 +571,46 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:')
         ;;
     delete-profiler)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-protocol)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-protocol-filter)
-        _command_args=('--host+:' '--port+:' '--protocol+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--protocol+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-protocol-finder)
-        _command_args=('--host+:' '--port+:' '--protocol+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--protocol+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-resource-adapter-config)
         _command_args=('--host+:' '--port+:' '--target+:')
         ;;
     delete-resource-ref)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_standalone_instance')
         ;;
     delete-ssl)
-        _command_args=('--host+:' '--port+:' '--target+:' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
         ;;
     delete-system-property)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_config_das_domain_standalone_instance')
         ;;
     delete-threadpool)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-transport)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-virtual-server)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     deploy)
-        _command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--port+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
+        _command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--port+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
         ;;
     deploydir)
-        _command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--port+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
+        _command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--port+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
         ;;
     disable)
-        _command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--isundeploy+:isundeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--port+:' '--properties+:' '--target+:')
+        _command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--isundeploy+:isundeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--port+:' '--properties+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance')
         ;;
     disable-http-lb-application)
         _command_args=('--host+:' '--name+:' '--port+:' '--timeout+:')
@@ -619,13 +619,13 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:' '--timeout+:')
         ;;
     disable-monitoring)
-        _command_args=('--host+:' '--modules+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--modules+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     disable-secure-admin)
         _command_args=('--host+:' '--port+:')
         ;;
     enable)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance')
         ;;
     enable-http-lb-application)
         _command_args=('--host+:' '--name+:' '--port+:')
@@ -634,7 +634,7 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:')
         ;;
     enable-monitoring)
-        _command_args=('--dtrace+:dtrace:(true false)' '--host+:' '--mbean+:mbean:(true false)' '--modules+:' '--options+:' '--pid+:' '--port+:' '--target+:')
+        _command_args=('--dtrace+:dtrace:(true false)' '--host+:' '--mbean+:mbean:(true false)' '--modules+:' '--options+:' '--pid+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     enable-secure-admin)
         _command_args=('--adminalias+:' '--host+:' '--instancealias+:' '--port+:')
@@ -649,16 +649,16 @@ case "$words[1]" in
         _command_args=('--appname+:' '--host+:' '--modulename+:' '--port+:')
         ;;
     flush-jmsdest)
-        _command_args=('--desttype+:' '--host+:' '--port+:' '--target+:')
+        _command_args=('--desttype+:' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     freeze-transaction-service)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance')
         ;;
     generate-domain-schema)
         _command_args=('--format+:' '--host+:' '--port+:' '--showdeprecated+:showdeprecated:(true false)' '--showsubclasses+:showsubclasses:(true false)')
         ;;
     generate-jvm-report)
-        _command_args=('--host+:' '--port+:' '--target+:' '--type+:type:(summary thread class memory log)')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_clustered_instance_das_standalone_instance' '--type+:type:(summary thread class memory log)')
         ;;
     get)
         _command_args=('--host+:' '--monitor+:monitor:(true false)' '--port+:')
@@ -685,25 +685,25 @@ case "$words[1]" in
         _command_args=('--archive+:' '--create+:create:(true false)' '--force+:force:(true false)' '--installdir+:' '--save+:save:(true false)' '--sshkeyfile+:' '--sshport+:' '--sshuser+:')
         ;;
     jms-ping)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance')
         ;;
     list)
         _command_args=('--host+:' '--monitor+:monitor:(true false)' '--port+:')
         ;;
     list-admin-objects)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance' '--host+:' '--port+:')
         ;;
     list-application-refs)
-        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--terse+:terse:(true false)')
+        _command_args=('*:targets:_asadmin_targets_cluster_das_standalone_instance' '--host+:' '--long+:long:(true false)' '--port+:' '--terse+:terse:(true false)')
         ;;
     list-applications)
-        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--resources+:resources:(true false)' '--subcomponents+:subcomponents:(true false)' '--terse+:terse:(true false)' '--type+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_das_domain_standalone_instance' '--host+:' '--long+:long:(true false)' '--port+:' '--resources+:resources:(true false)' '--subcomponents+:subcomponents:(true false)' '--terse+:terse:(true false)' '--type+:')
         ;;
     list-audit-modules)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance' '--host+:' '--port+:')
         ;;
     list-auth-realms)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance' '--host+:' '--port+:')
         ;;
     list-backups)
         _command_args=('--backupconfig+:' '--backupdir+:' '--domaindir+:' '--long+:long:(true false)')
@@ -715,19 +715,19 @@ case "$words[1]" in
         _command_args=('--localonly+:localonly:(true false)' '--remoteonly+:remoteonly:(true false)')
         ;;
     list-components)
-        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--resources+:resources:(true false)' '--subcomponents+:subcomponents:(true false)' '--terse+:terse:(true false)' '--type+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_das_domain_standalone_instance' '--host+:' '--long+:long:(true false)' '--port+:' '--resources+:resources:(true false)' '--subcomponents+:subcomponents:(true false)' '--terse+:terse:(true false)' '--type+:')
         ;;
     list-configs)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_config_das_domain_standalone_instance' '--host+:' '--port+:')
         ;;
     list-connector-connection-pools)
         _command_args=('--host+:' '--port+:')
         ;;
     list-connector-resources)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance' '--host+:' '--port+:')
         ;;
     list-connector-security-maps)
-        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--securitymap+:' '--target+:')
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--securitymap+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance')
         ;;
     list-connector-work-security-maps)
         _command_args=('--host+:' '--port+:' '--securitymap+:')
@@ -736,7 +736,7 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:')
         ;;
     list-custom-resources)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance')
         ;;
     list-descriptors)
         _command_args=('--host+:' '--port+:')
@@ -748,25 +748,25 @@ case "$words[1]" in
         _command_args=('--authrealmname+:' '--host+:' '--name+:' '--port+:')
         ;;
     list-file-users)
-        _command_args=('--authrealmname+:' '--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance' '--authrealmname+:' '--host+:' '--port+:')
         ;;
     list-http-lb-configs)
         _command_args=('--host+:' '--port+:')
         ;;
     list-http-listeners)
-        _command_args=('--host+:' '--long+:long:(true false)' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_config_das_standalone_instance' '--host+:' '--long+:long:(true false)' '--port+:')
         ;;
     list-iiop-listeners)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_config_das_domain_standalone_instance' '--host+:' '--port+:')
         ;;
     list-instances)
         _command_args=('--host+:' '--long+:long:(true false)' '--nostatus+:nostatus:(true false)' '--port+:' '--standaloneonly+:standaloneonly:(true false)' '--timeoutmsec+:')
         ;;
     list-jacc-providers)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance' '--host+:' '--port+:')
         ;;
     list-javamail-resources)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance')
         ;;
     list-jdbc-connection-pools)
         _command_args=('--host+:' '--port+:')
@@ -775,43 +775,43 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:')
         ;;
     list-jms-hosts)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     list-jms-resources)
-        _command_args=('--host+:' '--port+:' '--restype+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_das_domain_standalone_instance' '--host+:' '--port+:' '--restype+:')
         ;;
     list-jmsdest)
-        _command_args=('--desttype+:' '--host+:' '--port+:' '--property+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_config_das_standalone_instance' '--desttype+:' '--host+:' '--port+:' '--property+:')
         ;;
     list-jndi-entries)
-        _command_args=('--context+:' '--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance' '--context+:' '--host+:' '--port+:')
         ;;
     list-jndi-resources)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance')
         ;;
     list-jvm-options)
-        _command_args=('--host+:' '--port+:' '--profiler+:profiler:(true false)' '--target+:')
+        _command_args=('--host+:' '--port+:' '--profiler+:profiler:(true false)' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     list-libraries)
         _command_args=('--host+:' '--port+:' '--type+:type:(common ext app)')
         ;;
     list-lifecycle-modules)
-        _command_args=('--host+:' '--port+:' '--terse+:terse:(true false)')
+        _command_args=('*:targets:_asadmin_targets_cluster_das_domain_standalone_instance' '--host+:' '--port+:' '--terse+:terse:(true false)')
         ;;
     list-log-attributes)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance' '--host+:' '--port+:')
         ;;
     list-log-levels)
         _command_args=('--host+:' '--port+:')
         ;;
     list-message-security-providers)
-        _command_args=('--host+:' '--layer+:layer:(SOAP HttpServlet)' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance' '--host+:' '--layer+:layer:(SOAP HttpServlet)' '--port+:')
         ;;
     list-modules)
         _command_args=('--host+:' '--port+:')
         ;;
     list-network-listeners)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_config_das_standalone_instance' '--host+:' '--port+:')
         ;;
     list-nodes)
         _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--terse+:terse:(true false)')
@@ -832,19 +832,19 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:' '--type+:')
         ;;
     list-protocol-filters)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     list-protocol-finders)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     list-protocols)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_config_das_standalone_instance' '--host+:' '--port+:')
         ;;
     list-resource-adapter-configs)
         _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--raname+:')
         ;;
     list-resource-refs)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_das_standalone_instance' '--host+:' '--port+:')
         ;;
     list-sub-components)
         _command_args=('--appname+:' '--host+:' '--port+:' '--resources+:resources:(true false)' '--terse+:terse:(true false)' '--type+:')
@@ -853,19 +853,19 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:')
         ;;
     list-system-properties)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_config_das_domain_standalone_instance' '--host+:' '--port+:')
         ;;
     list-threadpools)
         _command_args=('--host+:' '--port+:')
         ;;
     list-timers)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_das_standalone_instance' '--host+:' '--port+:')
         ;;
     list-transports)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_config_das_standalone_instance' '--host+:' '--port+:')
         ;;
     list-virtual-servers)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_config_das_standalone_instance' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     list-web-context-param)
         _command_args=('--host+:' '--name+:' '--port+:')
@@ -874,10 +874,10 @@ case "$words[1]" in
         _command_args=('--host+:' '--name+:' '--port+:')
         ;;
     login)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_standalone_instance')
         ;;
     migrate-timers)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_clustered_instance_das')
         ;;
     monitor)
         _command_args=('--filename+:filename:directory:_files' '--filter+:' '--interval+:' '--type+:')
@@ -895,10 +895,10 @@ case "$words[1]" in
         _command_args=('*:nodes:_asadmin_nodes_ssh' '--host+:' '--port+:' '--validate+:validate:(true false)')
         ;;
     recover-transactions)
-        _command_args=('--host+:' '--port+:' '--target+:' '--transactionlogdir+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_clustered_instance_das_standalone_instance' '--transactionlogdir+:')
         ;;
     redeploy)
-        _command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--port+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
+        _command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--port+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
         ;;
     remove-library)
         _command_args=('--host+:' '--port+:' '--type+:type:(common ext app)')
@@ -916,19 +916,19 @@ case "$words[1]" in
         _command_args=('--backupconfig+:' '--backupdir+:' '--description+:' '--domaindir+:' '--filename+:' '--force+:force:(true false)' '--long+:long:(true false)')
         ;;
     rollback-transaction)
-        _command_args=('--host+:' '--port+:' '--target+:' '--transaction_id+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_clustered_instance_das_standalone_instance' '--transaction_id+:')
         ;;
     rotate-log)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_das_standalone_instance')
         ;;
     set)
         _command_args=('--host+:' '--port+:')
         ;;
     set-log-attributes)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     set-log-levels)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     set-web-context-param)
         _command_args=('--description+:' '--host+:' '--ignoredescriptoritem+:ignoredescriptoritem:(true false)' '--name+:' '--port+:' '--value+:')
@@ -940,7 +940,7 @@ case "$words[1]" in
         _command_args=('--generatekey+:generatekey:(true false)' '--sshkeyfile+:' '--sshport+:' '--sshpublickeyfile+:' '--sshuser+:')
         ;;
     show-component-status)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance')
         ;;
     start-cluster)
         _command_args=('*:clusters:_asadmin_clusters' '--autohadboverride+:autohadboverride:(true false)' '--host+:' '--port+:' '--verbose+:verbose:(true false)')
@@ -976,10 +976,10 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:')
         ;;
     undeploy)
-        _command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--port+:' '--properties+:' '--target+:')
+        _command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--port+:' '--properties+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     unfreeze-transaction-service)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance')
         ;;
     uninstall-node)
         _command_args=('--force+:force:(true false)' '--installdir+:' '--sshkeyfile+:' '--sshport+:' '--sshuser+:')
@@ -1003,7 +1003,7 @@ case "$words[1]" in
         _command_args=('--addgroups+:' '--addprincipals+:' '--host+:' '--port+:' '--raname+:' '--removegroups+:' '--removeprincipals+:')
         ;;
     update-file-user)
-        _command_args=('--authrealmname+:' '--groups+:' '--host+:' '--port+:' '--target+:' '--userpassword+:')
+        _command_args=('--authrealmname+:' '--groups+:' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--userpassword+:')
         ;;
     update-node-config)
         _command_args=('*:nodes:_asadmin_nodes_config' '--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:')
@@ -1039,10 +1039,18 @@ _asadmin_clusters() {
     compadd $(command asadmin list-clusters --terse | sed 's/ .*//')
 }
 
+_asadmin_configs() {
+    compadd $(command asadmin list-configs --terse)
+}
+
 _asadmin_instances() {
     compadd $(command asadmin list-instances --terse --nostatus domain)
 }
 
+_asadmin_instances_standalone() {
+    compadd $(command asadmin list-instances --terse --standaloneonly --nostatus domain)
+}
+
 _asadmin_libraries() {
     compadd $(command asadmin list-libraries --terse)
 }
@@ -1063,6 +1071,75 @@ _asadmin_nodes_ssh() {
     compadd $(command asadmin list-nodes-ssh --terse)
 }
 
+_asadmin_targets() {
+    _asadmin_instances
+    _asadmin_clusters
+    _asadmin_configs
+    compadd domain server
+}
+
+_asadmin_targets_cluster_clustered_instance_config_das_domain_standalone_instance() {
+    _asadmin_instances
+    _asadmin_clusters
+    _asadmin_configs
+    compadd domain server
+}
+
+_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance() {
+    _asadmin_instances
+    _asadmin_clusters
+    _asadmin_configs
+    compadd server
+}
+
+_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance() {
+    _asadmin_instances
+    _asadmin_clusters
+    compadd domain server
+}
+
+_asadmin_targets_cluster_clustered_instance_das_standalone_instance() {
+    _asadmin_instances
+    _asadmin_clusters
+    _asadmin_configs
+    compadd server
+}
+
+_asadmin_targets_cluster_config_das_standalone_instance() {
+    _asadmin_instances_standalone
+    _asadmin_clusters
+    _asadmin_configs
+    compadd server
+}
+
+_asadmin_targets_cluster_das_domain_standalone_instance() {
+    _asadmin_instances_standalone
+    _asadmin_clusters
+    compadd domain server
+}
+
+_asadmin_targets_cluster_das_standalone_instance() {
+    _asadmin_instances_standalone
+    _asadmin_clusters
+    compadd server
+}
+
+_asadmin_targets_clustered_instance_das() {
+    _asadmin_instances
+    compadd server
+}
+
+_asadmin_targets_clustered_instance_das_standalone_instance() {
+    _asadmin_instances
+    compadd server
+}
+
+_asadmin_targets_cluster_standalone_instance() {
+    _asadmin_clusters
+    _asadmin_instances_standalone
+}
+
+
 compadd '--help'
 _arguments \
     $_command_args \

From 8f0c617f6a7bdee3d6b3e61794f7035ceb90d545 Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Fri, 3 Aug 2012 10:02:19 +0200
Subject: [PATCH 071/364] in hindsight, this is probably a bad idea

---
 plugins/glassfish/glassfish.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/glassfish/glassfish.plugin.zsh b/plugins/glassfish/glassfish.plugin.zsh
index 49ca23299..fde2edb2a 100644
--- a/plugins/glassfish/glassfish.plugin.zsh
+++ b/plugins/glassfish/glassfish.plugin.zsh
@@ -1,3 +1,3 @@
 # if there is a user named 'glassfish' on the system, we'll assume
 # that is the user asadmin should be run as
-grep -e '^glassfish' /etc/passwd > /dev/null && alias asadmin='sudo -u glassfish asadmin'
\ No newline at end of file
+# grep -e '^glassfish' /etc/passwd > /dev/null && alias asadmin='sudo -u glassfish asadmin'
\ No newline at end of file

From c24d7f75d325b9d869036ecb06dcf020edec916c Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Fri, 3 Aug 2012 10:02:27 +0200
Subject: [PATCH 072/364] library completion

---
 plugins/glassfish/_asadmin | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/glassfish/_asadmin b/plugins/glassfish/_asadmin
index 9d6b5687b..e5401c918 100644
--- a/plugins/glassfish/_asadmin
+++ b/plugins/glassfish/_asadmin
@@ -901,7 +901,7 @@ case "$words[1]" in
         _command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--port+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
         ;;
     remove-library)
-        _command_args=('--host+:' '--port+:' '--type+:type:(common ext app)')
+        _command_args=('*:libraries:_asadmin_libraries' '--host+:' '--port+:' '--type+:type:(common ext app)')
         ;;
     restart-domain)
         _command_args=('--debug+:debug:(true false)' '--domaindir+:' '--force+:force:(true false)' '--kill+:kill:(true false)')

From 265b2a559b60d1a36c63a82ab2c2071faf81e3fe Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Fri, 3 Aug 2012 10:15:01 +0200
Subject: [PATCH 073/364] application completion

---
 plugins/glassfish/_asadmin | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/plugins/glassfish/_asadmin b/plugins/glassfish/_asadmin
index e5401c918..a6a7af549 100644
--- a/plugins/glassfish/_asadmin
+++ b/plugins/glassfish/_asadmin
@@ -976,7 +976,7 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:')
         ;;
     undeploy)
-        _command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--port+:' '--properties+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
+        _command_args=('*:applications:_asadmin_applications' '--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--port+:' '--properties+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     unfreeze-transaction-service)
         _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance')
@@ -1035,8 +1035,12 @@ case "$words[1]" in
 esac
 
 
+_asadmin_applications() {
+    compadd $(command asadmin list-applications --terse | sed 's/\s.*//')
+}
+
 _asadmin_clusters() {
-    compadd $(command asadmin list-clusters --terse | sed 's/ .*//')
+    compadd $(command asadmin list-clusters --terse | sed 's/\s.*//')
 }
 
 _asadmin_configs() {

From 97ec5de7244c419c4ca484f318e15062910247ba Mon Sep 17 00:00:00 2001
From: cybozuty <ty_c@cybozu.co.jp>
Date: Mon, 3 Sep 2012 15:31:54 +0900
Subject: [PATCH 074/364] Rendering the 'vagrant box (remove|repackage)'
 completion code independant of Vagrant implementation details.

---
 plugins/vagrant/_vagrant | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/vagrant/_vagrant b/plugins/vagrant/_vagrant
index 483b29c53..b161ba2be 100644
--- a/plugins/vagrant/_vagrant
+++ b/plugins/vagrant/_vagrant
@@ -43,7 +43,7 @@ __task_list ()
 
 __box_list ()
 {
-    _wanted application expl 'command' compadd $(command ls -1 $HOME/.vagrant/boxes 2>/dev/null| sed -e 's/ /\\ /g')
+    _wanted application expl 'command' compadd $(command vagrant box list | sed -e 's/ /\\ /g')
 }
 
 __vagrant-box ()

From 68cec79d32baeb96efc357ba94c0bfe5b4059c90 Mon Sep 17 00:00:00 2001
From: Kyle West <kswest@gmail.com>
Date: Mon, 30 Jan 2012 22:51:58 -0500
Subject: [PATCH 075/364] Added documentation to key bindings.

Conflicts:
	lib/key-bindings.zsh
---
 lib/key-bindings.zsh | 50 --------------------------------------------
 1 file changed, 50 deletions(-)

diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
index 5f499f3e8..e69de29bb 100644
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@@ -1,50 +0,0 @@
-# TODO: Explain what some of this does..
-
-bindkey -e
-bindkey '\ew' kill-region
-bindkey -s '\el' "ls\n"
-bindkey '^r' history-incremental-search-backward
-bindkey "^[[5~" up-line-or-history
-bindkey "^[[6~" down-line-or-history
-
-# make search up and down work, so partially type and hit up/down to find relevant stuff
-bindkey '^[[A' up-line-or-search
-bindkey '^[[B' down-line-or-search
-
-bindkey "^[[H" beginning-of-line
-bindkey "^[[1~" beginning-of-line
-bindkey "^[OH" beginning-of-line
-bindkey "^[[F"  end-of-line
-bindkey "^[[4~" end-of-line
-bindkey "^[OF" end-of-line
-bindkey ' ' magic-space    # also do history expansion on space
-
-bindkey "^[[1;5C" forward-word
-bindkey "^[[1;5D" backward-word
-
-bindkey '^[[Z' reverse-menu-complete
-
-# Make the delete key (or Fn + Delete on the Mac) work instead of outputting a ~
-bindkey '^?' backward-delete-char
-bindkey "^[[3~" delete-char
-bindkey "^[3;5~" delete-char
-bindkey "\e[3~" delete-char
-
-# consider emacs keybindings:
-
-#bindkey -e  ## emacs key bindings
-#
-#bindkey '^[[A' up-line-or-search
-#bindkey '^[[B' down-line-or-search
-#bindkey '^[^[[C' emacs-forward-word
-#bindkey '^[^[[D' emacs-backward-word
-#
-#bindkey -s '^X^Z' '%-^M'
-#bindkey '^[e' expand-cmd-path
-#bindkey '^[^I' reverse-menu-complete
-#bindkey '^X^N' accept-and-infer-next-history
-#bindkey '^W' kill-region
-#bindkey '^I' complete-word
-## Fix weird sequence that rxvt produces
-#bindkey -s '^[[Z' '\t'
-#

From f7708d4181374cfbd223e071f7253018f28e5509 Mon Sep 17 00:00:00 2001
From: Kyle West <kswest@gmail.com>
Date: Mon, 30 Jan 2012 23:04:06 -0500
Subject: [PATCH 076/364] forgot to save before committing. doh

---
 lib/key-bindings.zsh | 54 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
index e69de29bb..195bbb38e 100644
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@@ -0,0 +1,54 @@
+# http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html
+# http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html#Zle-Builtins
+# http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html#Standard-Widgets
+
+bindkey -e                                          # Use emacs key bindings
+
+bindkey '\ew' kill-region                           # [Esc-w] - Kill from the cursor to the mark
+bindkey -s '\el' 'ls\n'                             # [Esc-l] - run command: ls
+bindkey -s '\e.' '..\n'                             # [Esc-.] - run command: .. (up directory)
+bindkey '^r' history-incremental-search-backward    # [Ctrl-r] - Search backward incrementally for a specified string. The string may begin with ^ to anchor the search to the beginning of the line.
+bindkey '^[[5~' up-line-or-history                  # [PageUp] - Up a line of history
+bindkey '^[[6~' down-line-or-history                # [PageDown] - Down a line of history
+
+bindkey '^[[A' up-line-or-search                    # start typing + [Up-Arrow] - fuzzy find history forward
+bindkey '^[[B' down-line-or-search                  # start typing + [Down-Arrow] - fuzzy find history backward
+
+bindkey '^[[H' beginning-of-line                    # [Home] - Go to beginning of line
+bindkey '^[[1~' beginning-of-line                   # [Home] - Go to beginning of line
+bindkey '^[OH' beginning-of-line                    # [Home] - Go to beginning of line
+bindkey '^[[F'  end-of-line                         # [End] - Go to end of line
+bindkey '^[[4~' end-of-line                         # [End] - Go to end of line
+bindkey '^[OF' end-of-line                          # [End] - Go to end of line
+
+bindkey ' ' magic-space                             # [Space] - do history expansion
+
+bindkey '^[[1;5C' forward-word                      # [Ctrl-RightArrow] - move forward one word
+bindkey '^[[1;5D' backward-word                     # [Ctrl-LeftArrow] - move backward one word
+
+bindkey '^[[Z' reverse-menu-complete                # [TODO] - Perform menu completion, like menu-complete, except that if a menu completion is already in progress, move to the previous completion rather than the next.
+
+# Make the delete key (or Fn + Delete on the Mac) work instead of outputting a ~
+bindkey '^?' backward-delete-char                   # [Delete] - delete backward
+bindkey '^[[3~' delete-char                         # [fn-Delete] - delete forward
+bindkey '^[3;5~' delete-char                        # [TODO] - delete forward
+bindkey '\e[3~' delete-char                         # [TODO] - delete forward
+
+# consider emacs keybindings:
+
+#bindkey -e  ## emacs key bindings
+#
+#bindkey '^[[A' up-line-or-search
+#bindkey '^[[B' down-line-or-search
+#bindkey '^[^[[C' emacs-forward-word
+#bindkey '^[^[[D' emacs-backward-word
+#
+#bindkey -s '^X^Z' '%-^M'
+#bindkey '^[e' expand-cmd-path
+#bindkey '^[^I' reverse-menu-complete
+#bindkey '^X^N' accept-and-infer-next-history
+#bindkey '^W' kill-region
+#bindkey '^I' complete-word
+## Fix weird sequence that rxvt produces
+#bindkey -s '^[[Z' '\t'
+#

From 3839c6e9e62a2671b1d3f5662e4d2bc3984c3f9e Mon Sep 17 00:00:00 2001
From: Mat Schaffer <mat@schaffer.me>
Date: Sat, 17 Mar 2012 22:03:01 -0300
Subject: [PATCH 077/364] Don't clobber standard Esc+. behavior

Esc+. works as "last arg" on both bash and zsh. Seems like a shame to introduce a new standard.

Conflicts:
	lib/key-bindings.zsh
---
 lib/key-bindings.zsh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
index 195bbb38e..8168c8d90 100644
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@@ -6,7 +6,6 @@ bindkey -e                                          # Use emacs key bindings
 
 bindkey '\ew' kill-region                           # [Esc-w] - Kill from the cursor to the mark
 bindkey -s '\el' 'ls\n'                             # [Esc-l] - run command: ls
-bindkey -s '\e.' '..\n'                             # [Esc-.] - run command: .. (up directory)
 bindkey '^r' history-incremental-search-backward    # [Ctrl-r] - Search backward incrementally for a specified string. The string may begin with ^ to anchor the search to the beginning of the line.
 bindkey '^[[5~' up-line-or-history                  # [PageUp] - Up a line of history
 bindkey '^[[6~' down-line-or-history                # [PageDown] - Down a line of history

From ff0cafa14db5b728f823ee486ec1bf5a9d2725eb Mon Sep 17 00:00:00 2001
From: Felix Dreissig <f30@f30.me>
Date: Sun, 14 Oct 2012 00:07:47 +0200
Subject: [PATCH 078/364] Make sure the terminal is always in application mode
 when zle is active.

---
 lib/key-bindings.zsh | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
index 8168c8d90..a57b04122 100644
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@@ -2,6 +2,19 @@
 # http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html#Zle-Builtins
 # http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html#Standard-Widgets
 
+# Make sure that the terminal is in application mode when zle is active, since
+# only then values from $terminfo are valid
+if (( ${+terminfo[smkx]} )) && (( ${+terminfo[rmkx]} )); then
+  function zle-line-init() {
+    echoti smkx
+  }
+  function zle-line-finish() {
+    echoti rmkx
+  }
+  zle -N zle-line-init
+  zle -N zle-line-finish
+fi
+
 bindkey -e                                          # Use emacs key bindings
 
 bindkey '\ew' kill-region                           # [Esc-w] - Kill from the cursor to the mark

From 174c9177aa34b4c05bb5a1c6f637e6fa479a8e10 Mon Sep 17 00:00:00 2001
From: Felix Dreissig <f30@f30.me>
Date: Sun, 14 Oct 2012 02:32:48 +0200
Subject: [PATCH 079/364] Replace hardcoded key escape sequeneces with dynamic
 ones from terminfo.

---
 lib/key-bindings.zsh | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
index a57b04122..4a00764da 100644
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@@ -20,31 +20,24 @@ bindkey -e                                          # Use emacs key bindings
 bindkey '\ew' kill-region                           # [Esc-w] - Kill from the cursor to the mark
 bindkey -s '\el' 'ls\n'                             # [Esc-l] - run command: ls
 bindkey '^r' history-incremental-search-backward    # [Ctrl-r] - Search backward incrementally for a specified string. The string may begin with ^ to anchor the search to the beginning of the line.
-bindkey '^[[5~' up-line-or-history                  # [PageUp] - Up a line of history
-bindkey '^[[6~' down-line-or-history                # [PageDown] - Down a line of history
+bindkey "${terminfo[kpp]}" up-line-or-history       # [PageUp] - Up a line of history
+bindkey "${terminfo[knp]}" down-line-or-history     # [PageDown] - Down a line of history
 
-bindkey '^[[A' up-line-or-search                    # start typing + [Up-Arrow] - fuzzy find history forward
-bindkey '^[[B' down-line-or-search                  # start typing + [Down-Arrow] - fuzzy find history backward
+bindkey "${terminfo[kcuu1]}" up-line-or-search      # start typing + [Up-Arrow] - fuzzy find history forward
+bindkey "${terminfo[kcud1]}" down-line-or-search    # start typing + [Down-Arrow] - fuzzy find history backward
 
-bindkey '^[[H' beginning-of-line                    # [Home] - Go to beginning of line
-bindkey '^[[1~' beginning-of-line                   # [Home] - Go to beginning of line
-bindkey '^[OH' beginning-of-line                    # [Home] - Go to beginning of line
-bindkey '^[[F'  end-of-line                         # [End] - Go to end of line
-bindkey '^[[4~' end-of-line                         # [End] - Go to end of line
-bindkey '^[OF' end-of-line                          # [End] - Go to end of line
+bindkey "${terminfo[khome]}" beginning-of-line      # [Home] - Go to beginning of line
+bindkey "${terminfo[kend]}"  end-of-line            # [End] - Go to end of line
 
 bindkey ' ' magic-space                             # [Space] - do history expansion
 
 bindkey '^[[1;5C' forward-word                      # [Ctrl-RightArrow] - move forward one word
 bindkey '^[[1;5D' backward-word                     # [Ctrl-LeftArrow] - move backward one word
 
-bindkey '^[[Z' reverse-menu-complete                # [TODO] - Perform menu completion, like menu-complete, except that if a menu completion is already in progress, move to the previous completion rather than the next.
+bindkey "${terminfo[kcbt]}" reverse-menu-complete   # [Shift-Tab] - move through the completion menu backwards
 
-# Make the delete key (or Fn + Delete on the Mac) work instead of outputting a ~
-bindkey '^?' backward-delete-char                   # [Delete] - delete backward
-bindkey '^[[3~' delete-char                         # [fn-Delete] - delete forward
-bindkey '^[3;5~' delete-char                        # [TODO] - delete forward
-bindkey '\e[3~' delete-char                         # [TODO] - delete forward
+bindkey '^?' backward-delete-char                   # [Backspace] - delete backward
+bindkey "${terminfo[kdch1]}" delete-char            # [Delete] - delete forward
 
 # consider emacs keybindings:
 

From ebeae4abe9b3ef2e626eb545e991bb5696c57de0 Mon Sep 17 00:00:00 2001
From: Sergey Lukin <contact@sergeylukinlukinlukin.com>
Date: Fri, 9 Nov 2012 23:53:22 +0200
Subject: [PATCH 080/364] Fix /bin/sh compatibility issue in install.sh

---
 tools/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/install.sh b/tools/install.sh
index b080be3a1..0558c96ce 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -36,4 +36,4 @@ echo "\033[0;32m"'                        /____/                       '"\033[0m
 
 echo "\n\n \033[0;32m....is now installed.\033[0m"
 /usr/bin/env zsh
-source ~/.zshrc
+. ~/.zshrc

From 46ad7338333b57ce5966ca481d132d8626304d83 Mon Sep 17 00:00:00 2001
From: Gambhiro <gambhiro@ratanagiri.org.uk>
Date: Tue, 18 Dec 2012 08:16:28 +0000
Subject: [PATCH 081/364] more catspeak

---
 plugins/lol/lol.plugin.zsh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/plugins/lol/lol.plugin.zsh b/plugins/lol/lol.plugin.zsh
index ae065c12f..3b92533a8 100644
--- a/plugins/lol/lol.plugin.zsh
+++ b/plugins/lol/lol.plugin.zsh
@@ -36,3 +36,12 @@ alias nomnom='killall'
 alias byes='exit'
 alias cya='reboot'
 alias kthxbai='halt'
+
+alias pwned='ssh'
+
+alias hackzor='git init'
+alias rulz='git push'
+alias bringz='git pull'
+alias moarhack='git checkout'
+alias chicken='git add'
+

From c95b6d91f7e45ac4ca9a1ce2207db7d515ba450b Mon Sep 17 00:00:00 2001
From: Gambhiro <gambhiro@ratanagiri.org.uk>
Date: Tue, 18 Dec 2012 08:47:04 +0000
Subject: [PATCH 082/364] git lol

---
 plugins/lol/lol.plugin.zsh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/lol/lol.plugin.zsh b/plugins/lol/lol.plugin.zsh
index 3b92533a8..1b32ec2e4 100644
--- a/plugins/lol/lol.plugin.zsh
+++ b/plugins/lol/lol.plugin.zsh
@@ -42,6 +42,9 @@ alias pwned='ssh'
 alias hackzor='git init'
 alias rulz='git push'
 alias bringz='git pull'
-alias moarhack='git checkout'
 alias chicken='git add'
+alias oanward='git commit -m'
+alias ooanward='git commit -am'
+alias letcat='git checkout'
+alias violenz='git rebase'
 

From e7f24a831990f7dc87b7931aac2a3c2cd6b6c7e8 Mon Sep 17 00:00:00 2001
From: Jack Henahan <jhenahan@uvm.edu>
Date: Mon, 24 Dec 2012 13:43:45 -0500
Subject: [PATCH 083/364] add symbol in darcs repos to match git and mercurial

---
 themes/smt.zsh-theme | 1 +
 1 file changed, 1 insertion(+)

diff --git a/themes/smt.zsh-theme b/themes/smt.zsh-theme
index 7a287523e..bbd1031e1 100644
--- a/themes/smt.zsh-theme
+++ b/themes/smt.zsh-theme
@@ -29,6 +29,7 @@ ZSH_THEME_GIT_PROMPT_SHA_AFTER="%{$reset_color%}"
 function prompt_char() {
   git branch >/dev/null 2>/dev/null && echo "%{$fg[green]%}±%{$reset_color%}" && return
   hg root >/dev/null 2>/dev/null && echo "%{$fg_bold[red]%}☿%{$reset_color%}" && return
+  darcs show repo >/dev/null 2>/dev/null && echo "%{$fg_bold[green]%}❉%{$reset_color%}" && return
   echo "%{$fg[cyan]%}◯%{$reset_color%}"
 }
 

From 76e828691bedc345904716b04cfa746fd043e0e7 Mon Sep 17 00:00:00 2001
From: Adolfo Benedetti <adolfo.benedetti@gmail.com>
Date: Wed, 30 Jan 2013 18:58:58 +0100
Subject: [PATCH 084/364] updated adben theme: added offline content,
 subversion support, refactored prompt

---
 themes/adben.zsh-theme | 145 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 120 insertions(+), 25 deletions(-)

diff --git a/themes/adben.zsh-theme b/themes/adben.zsh-theme
index 9f777e847..b64714f32 100644
--- a/themes/adben.zsh-theme
+++ b/themes/adben.zsh-theme
@@ -1,26 +1,121 @@
 #!/usr/bin/env zsh
-local USER_HOST='%{$terminfo[bold]$fg[yellow]%}%n@%m%{$reset_color%}'
-local RETURN_CODE="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
-local GIT_BRANCH='%{$terminfo[bold]$fg[red]%}$(git_prompt_info)%{$reset_color%}'
-local CURRENT_DIR='%{$terminfo[bold]$fg[green]%} %~%{$reset_color%}'
-local RUBY_RVM='%{$fg[gray]%}‹$(rvm-prompt i v g)›%{$reset_color%}'
-local COMMAND_TIP='%{$terminfo[bold]$fg[blue]%}$(wget -qO - http://www.commandlinefu.com/commands/random/plaintext | sed 1d | sed '/^$/d' | sed 's/^/║/g')%{$reset_color%}'
-######### PROMPT #########
-PROMPT="%{$terminfo[bold]$fg[blue]%}╔═ %{$reset_color%}${USER_HOST} ${CURRENT_DIR} ${RUBY_RVM} ${GIT_BRANCH}
-${COMMAND_TIP}
-%{$terminfo[bold]$fg[blue]%}╚═ %{$reset_color%}%B%{$terminfo[bold]$fg[white]%}$%b%{$reset_color%} "
-RPS1='${RETURN_CODE}'
-RPROMPT='%{$fg[green]%}[%*]%{$reset_color%}'
-######### PROMPT #########
-########## GIT ###########
-ZSH_THEME_GIT_PROMPT_PREFIX="‹"
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$GIT_PROMPT_INFO%}›"
-ZSH_THEME_GIT_PROMPT_DIRTY=" %{$GIT_DIRTY_COLOR%}✘"
-ZSH_THEME_GIT_PROMPT_CLEAN=" %{$GIT_CLEAN_COLOR%}✔"
-ZSH_THEME_GIT_PROMPT_ADDED="%{$FG[082]%}✚%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_MODIFIED="%{$FG[166]%}✹%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_DELETED="%{$FG[160]%}✖%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_RENAMED="%{$FG[220]%}➜%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_UNMERGED="%{$FG[082]%}═%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$FG[190]%}✭%{$reset_color%}"
-########## GIT ###########
+# #
+# # #README
+# #
+# # This theme provides two customizable header functionalities : 
+# # a) displaying a pseudo-random message from a database of quotations
+# # (https://en.wikipedia.org/wiki/Fortune_%28Unix%29)
+# # b) displaying randomly command line tips from The command line fu 
+# # (http://www.commandlinefu.com) community: in order to make use of this functionality
+# # you will need Internet connection. 
+# # This theme provides as well information for the current user's context, like;
+# # branch and status for the current version control system (git and svn currently
+# # supported) and time, presented to the user in a non invasive volatile way.
+# #
+# # #REQUIREMENTS
+# # This theme requires wget::
+# # -Homebrew-osx- brew install wget
+# # -Debian/Ubuntu- apt-get install wget
+# # and fortune ::
+# # -Homebrew-osx- brew install fortune
+# # -Debian/Ubuntu- apt-get install fortune
+# #
+# # optionally:
+# # -Oh-myzsh vcs plug-ins git and svn.
+# # -Solarized theme (https://github.com/altercation/solarized/)
+# # -OS X: iTerm 2 (http://www.iterm2.com/)
+# # -font Source code pro (https://github.com/adobe/source-code-pro)
+# # 
+# # Author: Adolfo Benedetti
+# # email: adolfo.benedetti@gmail.com
+# # License: Public Domain
+# # This theme's look and feel is based on the Aaron Toponce's zsh theme , more info: 
+# # http://pthree.org/2008/11/23/727/
+# # enjoy!
+########## COLOR ###########
+for COLOR in CYAN WHITE YELLOW MAGENTA BLACK BLUE RED DEFAULT GREEN GREY; do
+    eval PR_$COLOR='%{$fg[${(L)COLOR}]%}'
+    eval PR_BRIGHT_$COLOR='%{$fg_bold[${(L)COLOR}]%}'
+done
+PR_RESET="%{$reset_color%}"
+RED_START="${PR_RESET}${PR_GREY}<${PR_RESET}${PR_RED}<${PR_BRIGHT_RED}<${PR_RESET} "
+RED_END="${PR_RESET}${PR_BRIGHT_RED}>${PR_RESET}${PR_RED}>${PR_GREY}>${PR_RESET} "
+GREEN_END="${PR_RESET}${PR_BRIGHT_GREEN}>${PR_RESET}${PR_GREEN}>${PR_GREY}>${PR_RESET} "
+GREEN_BASE_START="${PR_RESET}${PR_GREY}>${PR_RESET}${PR_GREEN}>${PR_BRIGHT_GREEN}>${PR_RESET}"
+GREEN_START_P1="${PR_RESET}${GREEN_BASE_START}${PR_RESET} "
+DIVISION="${PR_RESET}${PR_RED} < ${PR_RESET}"
+VCS_DIRTY_COLOR="${PR_RESET}${PR_YELLOW}"
+Vcs_CLEAN_COLOR="${PR_RESET}${PR_GREEN}"
+VCS_SUFIX_COLOR="${PR_RESET}${PR_RED}› ${PR_RESET}"
+# ########## COLOR ###########
+# ########## SVN ###########
+ZSH_THEME_SVN_PROMPT_PREFIX="${PR_RESET}${PR_RED}‹svn:"
+ZSH_THEME_SVN_PROMPT_SUFFIX=""
+ZSH_THEME_SVN_PROMPT_DIRTY="${VCS_DIRTY_COLOR} ✘${VCS_SUFIX_COLOR}"
+ZSH_THEME_SVN_PROMPT_CLEAN="${VCS_CLEAN_COLOR} ✔${VCS_SUFIX_COLOR}"
+# ########## SVN ###########
+# ########## GIT ###########
+ZSH_THEME_GIT_PROMPT_PREFIX="${PR_RESET}${PR_RED}‹git:"
+ZSH_THEME_GIT_PROMPT_SUFFIX=""
+ZSH_THEME_GIT_PROMPT_DIRTY="${VCS_DIRTY_COLOR} ✘${VCS_SUFIX_COLOR}"
+ZSH_THEME_GIT_PROMPT_CLEAN="${VCS_CLEAN_COLOR} ✔${VCS_SUFIX_COLOR}"
+ZSH_THEME_GIT_PROMPT_ADDED="${PR_RESET}${PR_YELLOW} ✚${PR_RESET}"
+ZSH_THEME_GIT_PROMPT_MODIFIED="${PR_RESET}${PR_YELLOW} ✹${PR_RESET}"
+ZSH_THEME_GIT_PROMPT_DELETED="${PR_RESET}${PR_YELLOW} ✖${PR_RESET}"
+ZSH_THEME_GIT_PROMPT_RENAMED="${PR_RESET}${PR_YELLOW} ➜${PR_RESET}"
+ZSH_THEME_GIT_PROMPT_UNMERGED="${PR_RESET}${PR_YELLOW} ═${PR_RESET}"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="${PR_RESET}${PR_YELLOW} ✭${PR_RESET}"
+# ########## GIT ###########
+function precmd {
+    #gets the fortune
+    ps1_fortune () {
+        #Choose from all databases, regardless of whether they are considered "offensive"
+        fortune -a
+    }
+    #obtains the tip 
+    ps1_command_tip () {
+        wget -qO - http://www.commandlinefu.com/commands/random/plaintext | sed 1d | sed '/^$/d'
+    }  
+    prompt_header () {
+        if [[ "true" == "$ENABLE_COMMAND_TIP" ]]; then
+            ps1_command_tip
+        else
+            ps1_fortune
+        fi 
+    }   
+    PROMPT_HEAD="${RED_START}${PR_YELLOW}$(prompt_header)${PR_RESET}"
+    # set a simple variable to show when in screen
+    if [[ -n "${WINDOW}" ]]; then
+        SCREEN=""
+    fi
+}
+
+# Context: user@directory or just directory
+prompt_context () {
+    local user=`whoami`
+    if [[ "$user" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then
+        echo -n "${PR_RESET}${PR_RED}$user@%m${PR_RESET}${PR_BRIGHT_YELLOW}%~%<<${PR_RESET}"
+    else
+        echo -n "${PR_RESET}${PR_BRIGHT_YELLOW}%~%<<${PR_RESET}"
+    fi
+}
+
+set_prompt () {
+    # required for the prompt
+    setopt prompt_subst
+    autoload colors zsh/terminfo
+    if [[ "$terminfo[colors]" -gt 8 ]]; then
+        colors
+    fi 
+    
+    # ######### PROMPT #########
+    PROMPT='${PROMPT_HEAD}
+${RED_START}$(prompt_context)
+${GREEN_START_P1}'
+    RPROMPT='${PR_RESET}$(git_prompt_info)$(svn_prompt_info)${PR_YELLOW}%D{%R.%S %a %b %d %Y} ${GREEN_END}${PR_RESET}'
+    # Matching continuation prompt
+    PROMPT2='${GREEN_BASE_START}${PR_RESET} %_ ${GREEN_BASE_START}${PR_RESET} '
+    # ######### PROMPT #########
+}
+
+set_prompt

From 0744acd663216b8e1c0c75878c166d53684d75bc Mon Sep 17 00:00:00 2001
From: Jim Hester <james.f.hester@gmail.com>
Date: Thu, 28 Feb 2013 10:28:08 -0500
Subject: [PATCH 085/364] Update to latest per-directory-history

See [https://github.com/jimhester/per-directory-history]
---
 plugins/per-directory-history/README.md       |  56 +++++++
 .../per-directory-history.plugin.zsh          | 150 +-----------------
 .../per-directory-history.zsh                 | 149 +++++++++++++++++
 3 files changed, 206 insertions(+), 149 deletions(-)
 create mode 100644 plugins/per-directory-history/README.md
 mode change 100644 => 120000 plugins/per-directory-history/per-directory-history.plugin.zsh
 create mode 100644 plugins/per-directory-history/per-directory-history.zsh

diff --git a/plugins/per-directory-history/README.md b/plugins/per-directory-history/README.md
new file mode 100644
index 000000000..d8ff93dc0
--- /dev/null
+++ b/plugins/per-directory-history/README.md
@@ -0,0 +1,56 @@
+[Per-Directory-History][6]
+=========================
+
+Per directory history for zsh, as well as global history, and the
+ability to toggle between them with ^G.
+
+This is a implementation of per directory history for zsh, some 
+implementations of which exist in bash[1][],[2][].  It also implements 
+a per-directory-history-toggle-history function to change from using the 
+directory history to using the global history.  In both cases the history is 
+always saved to both the global history and the directory history, so the 
+toggle state will not effect the saved histories.  Being able to switch 
+between global and directory histories on the fly is a novel feature as far 
+as I am aware.
+
+This is a standalone repository for the script, however it is also included in
+[oh-my-zsh][4] as a plugin.
+
+----------------------------------------------------------------------------
+Usage
+----------------------------------------------------------------------------
+
+1.  Load this script into your interactive ZSH session:
+
+        % source zsh-per-directory-history.zsh
+
+2.  The default mode if per directory history, interact with your history as normal.
+
+3.  Press ^G (the Control and G keys simultaneously) to toggle between local
+    and global histories. 
+
+
+
+-------------------------------------------------------------------------------
+Configuration
+-------------------------------------------------------------------------------
+
+* HISTORY_BASE a global variable that defines the base directory in which the 
+  directory histories are stored
+* per-directory-history-toggle-history is the function to toggle the history
+
+-------------------------------------------------------------------------------
+History
+-------------------------------------------------------------------------------
+
+The idea/inspiration for a per directory history is from [Stewart MacArthur][1] 
+and [Dieter][2], the implementation idea is from [Bart Schaefer][3].  The 
+implementation is by [Jim Hester][5] in September 2012.
+
+[1]: http://www.compbiome.com/2010/07/bash-per-directory-bash-history.html
+[2]: http://dieter.plaetinck.be/per_directory_bash
+[3]: http://www.zsh.org/mla/users/1997/msg00226.html
+[4]: https://github.com/robbyrussell/oh-my-zsh
+[5]: http://jimhester.com
+[6]: http://github.com/jimhester/per-directory-history
+
diff --git a/plugins/per-directory-history/per-directory-history.plugin.zsh b/plugins/per-directory-history/per-directory-history.plugin.zsh
deleted file mode 100644
index 61e8b5a62..000000000
--- a/plugins/per-directory-history/per-directory-history.plugin.zsh
+++ /dev/null
@@ -1,149 +0,0 @@
-#!/usr/bin/env zsh
-#
-# This is a implementation of per directory history for zsh, some 
-# implementations of which exist in bash[1,2].  It also implements 
-# a per-directory-history-toggle-history function to change from using the 
-# directory history to using the global history.  In both cases the history is 
-# always saved to both the global history and the directory history, so the 
-# toggle state will not effect the saved histories.  Being able to switch 
-# between global and directory histories on the fly is a novel feature as far 
-# as I am aware.
-#
-#-------------------------------------------------------------------------------
-# Configuration
-#-------------------------------------------------------------------------------
-#
-# HISTORY_BASE a global variable that defines the base directory in which the 
-# directory histories are stored
-#
-#-------------------------------------------------------------------------------
-# History
-#-------------------------------------------------------------------------------
-#
-# The idea/inspiration for a per directory history is from Stewart MacArthur[1] 
-# and Dieter[2], the implementation idea is from Bart Schaefer on the the zsh 
-# mailing list[3].  The implementation is by Jim Hester in September 2012.
-#
-# [1]: http://www.compbiome.com/2010/07/bash-per-directory-bash-history.html
-# [2]: http://dieter.plaetinck.be/per_directory_bash
-# [3]: http://www.zsh.org/mla/users/1997/msg00226.html
-#
-################################################################################
-#
-# Copyright (c) 2012 Jim Hester
-#
-# This software is provided 'as-is', without any express or implied warranty.  
-# In no event will the authors be held liable for any damages arising from the 
-# use of this software.
-#
-# Permission is granted to anyone to use this software for any purpose, 
-# including commercial applications, and to alter it and redistribute it 
-# freely, subject to the following restrictions:
-#
-# 1. The origin of this software must not be misrepresented; you must not claim 
-# that you wrote the original software. If you use this software in a product, 
-# an acknowledgment in the product documentation would be appreciated but is 
-# not required.
-#
-# 2. Altered source versions must be plainly marked as such, and must not be 
-# misrepresented as being the original software.
-#
-# 3. This notice may not be removed or altered from any source distribution..
-#
-################################################################################
-
-#-------------------------------------------------------------------------------
-# configuration, the base under which the directory histories are stored
-#-------------------------------------------------------------------------------
-
-[[ -z $HISTORY_BASE ]] && HISTORY_BASE="$HOME/.directory_history"
-
-#-------------------------------------------------------------------------------
-# toggle global/directory history used for searching - ctrl-G by default
-#-------------------------------------------------------------------------------
-
-function per-directory-history-toggle-history() {
-  if [[ $_per_directory_history_is_global == true ]]; then
-    _per-directory-history-set-directory-history
-    print "\nusing local history\n"
-  else
-    _per-directory-history-set-global-history
-    print "\nusing global history\n"
-  fi
-  zle .push-line
-  zle .accept-line
-}
-
-autoload per-directory-history-toggle-history
-zle -N per-directory-history-toggle-history
-bindkey '^G' per-directory-history-toggle-history
-
-#-------------------------------------------------------------------------------
-# implementation details
-#-------------------------------------------------------------------------------
-
-_per_directory_history_directory="$HISTORY_BASE${PWD:A}/history"
-
-function _per-directory-history-change-directory() {
-  _per_directory_history_directory="$HISTORY_BASE${PWD:A}/history"
-  mkdir -p ${_per_directory_history_directory:h}
-  if [[ $_per_directory_history_is_global == false ]]; then
-    #save to the global history
-    fc -AI $HISTFILE
-    #save history to previous file
-    local prev="$HISTORY_BASE${OLDPWD:A}/history"
-    mkdir -p ${prev:h}
-    fc -AI $prev
-
-    #discard previous directory's history
-    local original_histsize=$HISTSIZE
-    HISTSIZE=0
-    HISTSIZE=$original_histsize
-    
-    #read history in new file
-    if [[ -e $_per_directory_history_directory ]]; then
-      fc -R $_per_directory_history_directory
-    fi
-  fi
-}
-
-function _per-directory-history-addhistory() {
-  print -sr -- ${1%%$'\n'}
-  fc -p $_per_directory_history_directory
-}
-
-
-function _per-directory-history-set-directory-history() {
-  if [[ $_per_directory_history_is_global == true ]]; then
-    fc -AI $HISTFILE
-    local original_histsize=$HISTSIZE
-    HISTSIZE=0
-    HISTSIZE=$original_histsize
-    if [[ -e "$_per_directory_history_directory" ]]; then
-      fc -R "$_per_directory_history_directory"
-    fi
-  fi
-  _per_directory_history_is_global=false
-}
-function _per-directory-history-set-global-history() {
-  if [[ $_per_directory_history_is_global == false ]]; then
-    fc -AI $_per_directory_history_directory
-    local original_histsize=$HISTSIZE
-    HISTSIZE=0
-    HISTSIZE=$original_histsize
-    if [[ -e "$HISTFILE" ]]; then
-      fc -R "$HISTFILE"
-    fi
-  fi
-  _per_directory_history_is_global=true
-}
-
-
-#add functions to the exec list for chpwd and zshaddhistory
-chpwd_functions=(${chpwd_functions[@]} "_per-directory-history-change-directory")
-zshaddhistory_functions=(${zshaddhistory_functions[@]} "_per-directory-history-addhistory")
-
-#start in directory mode
-mkdir -p ${_per_directory_history_directory:h}
-_per_directory_history_is_global=true
-_per-directory-history-set-directory-history
diff --git a/plugins/per-directory-history/per-directory-history.plugin.zsh b/plugins/per-directory-history/per-directory-history.plugin.zsh
new file mode 120000
index 000000000..142d9541d
--- /dev/null
+++ b/plugins/per-directory-history/per-directory-history.plugin.zsh
@@ -0,0 +1 @@
+per-directory-history.zsh
\ No newline at end of file
diff --git a/plugins/per-directory-history/per-directory-history.zsh b/plugins/per-directory-history/per-directory-history.zsh
new file mode 100644
index 000000000..d50009080
--- /dev/null
+++ b/plugins/per-directory-history/per-directory-history.zsh
@@ -0,0 +1,149 @@
+#!/usr/bin/env zsh
+#
+# This is a implementation of per directory history for zsh, some 
+# implementations of which exist in bash[1,2].  It also implements 
+# a per-directory-history-toggle-history function to change from using the 
+# directory history to using the global history.  In both cases the history is 
+# always saved to both the global history and the directory history, so the 
+# toggle state will not effect the saved histories.  Being able to switch 
+# between global and directory histories on the fly is a novel feature as far 
+# as I am aware.
+#
+#-------------------------------------------------------------------------------
+# Configuration
+#-------------------------------------------------------------------------------
+#
+# HISTORY_BASE a global variable that defines the base directory in which the 
+# directory histories are stored
+#
+#-------------------------------------------------------------------------------
+# History
+#-------------------------------------------------------------------------------
+#
+# The idea/inspiration for a per directory history is from Stewart MacArthur[1] 
+# and Dieter[2], the implementation idea is from Bart Schaefer on the the zsh 
+# mailing list[3].  The implementation is by Jim Hester in September 2012.
+#
+# [1]: http://www.compbiome.com/2010/07/bash-per-directory-bash-history.html
+# [2]: http://dieter.plaetinck.be/per_directory_bash
+# [3]: http://www.zsh.org/mla/users/1997/msg00226.html
+#
+################################################################################
+#
+# Copyright (c) 2012 Jim Hester
+#
+# This software is provided 'as-is', without any express or implied warranty.  
+# In no event will the authors be held liable for any damages arising from the 
+# use of this software.
+#
+# Permission is granted to anyone to use this software for any purpose, 
+# including commercial applications, and to alter it and redistribute it 
+# freely, subject to the following restrictions:
+#
+# 1. The origin of this software must not be misrepresented; you must not claim 
+# that you wrote the original software. If you use this software in a product, 
+# an acknowledgment in the product documentation would be appreciated but is 
+# not required.
+#
+# 2. Altered source versions must be plainly marked as such, and must not be 
+# misrepresented as being the original software.
+#
+# 3. This notice may not be removed or altered from any source distribution..
+#
+################################################################################
+
+#-------------------------------------------------------------------------------
+# configuration, the base under which the directory histories are stored
+#-------------------------------------------------------------------------------
+
+[[ -z $HISTORY_BASE ]] && HISTORY_BASE="$HOME/.directory_history"
+
+#-------------------------------------------------------------------------------
+# toggle global/directory history used for searching - ctrl-G by default
+#-------------------------------------------------------------------------------
+
+function per-directory-history-toggle-history() {
+  if [[ $_per_directory_history_is_global == true ]]; then
+    _per-directory-history-set-directory-history
+    print -n "\nusing local history"
+  else
+    _per-directory-history-set-global-history
+    print -n "\nusing global history"
+  fi
+  zle .push-line
+  zle .accept-line
+}
+
+autoload per-directory-history-toggle-history
+zle -N per-directory-history-toggle-history
+bindkey '^G' per-directory-history-toggle-history
+
+#-------------------------------------------------------------------------------
+# implementation details
+#-------------------------------------------------------------------------------
+
+_per_directory_history_directory="$HISTORY_BASE${PWD:A}/history"
+
+function _per-directory-history-change-directory() {
+  _per_directory_history_directory="$HISTORY_BASE${PWD:A}/history"
+  mkdir -p ${_per_directory_history_directory:h}
+  if [[ $_per_directory_history_is_global == false ]]; then
+    #save to the global history
+    fc -AI $HISTFILE
+    #save history to previous file
+    local prev="$HISTORY_BASE${OLDPWD:A}/history"
+    mkdir -p ${prev:h}
+    fc -AI $prev
+
+    #discard previous directory's history
+    local original_histsize=$HISTSIZE
+    HISTSIZE=0
+    HISTSIZE=$original_histsize
+    
+    #read history in new file
+    if [[ -e $_per_directory_history_directory ]]; then
+      fc -R $_per_directory_history_directory
+    fi
+  fi
+}
+
+function _per-directory-history-addhistory() {
+  print -sr -- ${1%%$'\n'}
+  fc -a -p $_per_directory_history_directory
+}
+
+
+function _per-directory-history-set-directory-history() {
+  if [[ $_per_directory_history_is_global == true ]]; then
+    fc -AI $HISTFILE
+    local original_histsize=$HISTSIZE
+    HISTSIZE=0
+    HISTSIZE=$original_histsize
+    if [[ -e "$_per_directory_history_directory" ]]; then
+      fc -R "$_per_directory_history_directory"
+    fi
+  fi
+  _per_directory_history_is_global=false
+}
+function _per-directory-history-set-global-history() {
+  if [[ $_per_directory_history_is_global == false ]]; then
+    fc -AI $_per_directory_history_directory
+    local original_histsize=$HISTSIZE
+    HISTSIZE=0
+    HISTSIZE=$original_histsize
+    if [[ -e "$HISTFILE" ]]; then
+      fc -R "$HISTFILE"
+    fi
+  fi
+  _per_directory_history_is_global=true
+}
+
+
+#add functions to the exec list for chpwd and zshaddhistory
+chpwd_functions=(${chpwd_functions[@]} "_per-directory-history-change-directory")
+zshaddhistory_functions=(${zshaddhistory_functions[@]} "_per-directory-history-addhistory")
+
+#start in directory mode
+mkdir -p ${_per_directory_history_directory:h}
+_per_directory_history_is_global=true
+_per-directory-history-set-directory-history

From ac6f1a045c5511cda60167ab978cf127c370d955 Mon Sep 17 00:00:00 2001
From: Jim Hester <james.f.hester@gmail.com>
Date: Wed, 13 Mar 2013 13:07:32 -0400
Subject: [PATCH 086/364] Update to latest per-directory-history

---
 .../per-directory-history.zsh                 | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/plugins/per-directory-history/per-directory-history.zsh b/plugins/per-directory-history/per-directory-history.zsh
index d50009080..bdee341bd 100644
--- a/plugins/per-directory-history/per-directory-history.zsh
+++ b/plugins/per-directory-history/per-directory-history.zsh
@@ -1,27 +1,27 @@
 #!/usr/bin/env zsh
 #
-# This is a implementation of per directory history for zsh, some 
-# implementations of which exist in bash[1,2].  It also implements 
-# a per-directory-history-toggle-history function to change from using the 
-# directory history to using the global history.  In both cases the history is 
-# always saved to both the global history and the directory history, so the 
-# toggle state will not effect the saved histories.  Being able to switch 
-# between global and directory histories on the fly is a novel feature as far 
+# This is a implementation of per directory history for zsh, some
+# implementations of which exist in bash[1,2].  It also implements
+# a per-directory-history-toggle-history function to change from using the
+# directory history to using the global history.  In both cases the history is
+# always saved to both the global history and the directory history, so the
+# toggle state will not effect the saved histories.  Being able to switch
+# between global and directory histories on the fly is a novel feature as far
 # as I am aware.
 #
 #-------------------------------------------------------------------------------
 # Configuration
 #-------------------------------------------------------------------------------
 #
-# HISTORY_BASE a global variable that defines the base directory in which the 
+# HISTORY_BASE a global variable that defines the base directory in which the
 # directory histories are stored
 #
 #-------------------------------------------------------------------------------
 # History
 #-------------------------------------------------------------------------------
 #
-# The idea/inspiration for a per directory history is from Stewart MacArthur[1] 
-# and Dieter[2], the implementation idea is from Bart Schaefer on the the zsh 
+# The idea/inspiration for a per directory history is from Stewart MacArthur[1]
+# and Dieter[2], the implementation idea is from Bart Schaefer on the the zsh
 # mailing list[3].  The implementation is by Jim Hester in September 2012.
 #
 # [1]: http://www.compbiome.com/2010/07/bash-per-directory-bash-history.html
@@ -32,20 +32,20 @@
 #
 # Copyright (c) 2012 Jim Hester
 #
-# This software is provided 'as-is', without any express or implied warranty.  
-# In no event will the authors be held liable for any damages arising from the 
+# This software is provided 'as-is', without any express or implied warranty. 
+# In no event will the authors be held liable for any damages arising from the
 # use of this software.
 #
-# Permission is granted to anyone to use this software for any purpose, 
-# including commercial applications, and to alter it and redistribute it 
+# Permission is granted to anyone to use this software for any purpose,
+# including commercial applications, and to alter it and redistribute it
 # freely, subject to the following restrictions:
 #
-# 1. The origin of this software must not be misrepresented; you must not claim 
-# that you wrote the original software. If you use this software in a product, 
-# an acknowledgment in the product documentation would be appreciated but is 
+# 1. The origin of this software must not be misrepresented; you must not claim
+# that you wrote the original software. If you use this software in a product,
+# an acknowledgment in the product documentation would be appreciated but is
 # not required.
 #
-# 2. Altered source versions must be plainly marked as such, and must not be 
+# 2. Altered source versions must be plainly marked as such, and must not be
 # misrepresented as being the original software.
 #
 # 3. This notice may not be removed or altered from any source distribution..
@@ -99,7 +99,7 @@ function _per-directory-history-change-directory() {
     local original_histsize=$HISTSIZE
     HISTSIZE=0
     HISTSIZE=$original_histsize
-    
+
     #read history in new file
     if [[ -e $_per_directory_history_directory ]]; then
       fc -R $_per_directory_history_directory
@@ -108,8 +108,8 @@ function _per-directory-history-change-directory() {
 }
 
 function _per-directory-history-addhistory() {
-  print -sr -- ${1%%$'\n'}
-  fc -a -p $_per_directory_history_directory
+  print -Sr -- ${1%%$'\n'}
+  fc -p $_per_directory_history_directory
 }
 
 

From f358f614149e4f25b53abe140e0d0b8bc46928d6 Mon Sep 17 00:00:00 2001
From: Nicolas Jeker <n.jeker@gmx.net>
Date: Tue, 2 Apr 2013 12:33:06 +0300
Subject: [PATCH 087/364] use hostname instead of hostname -s

hostname -s is not available on every implementation of hostname, e.g. Cygwin uses hostname from coreutils which doesn't work.
---
 themes/ys.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/ys.zsh-theme b/themes/ys.zsh-theme
index 3d316390e..43c101c2a 100644
--- a/themes/ys.zsh-theme
+++ b/themes/ys.zsh-theme
@@ -8,7 +8,7 @@
 
 # Machine name.
 function box_name {
-    [ -f ~/.box-name ] && cat ~/.box-name || hostname -s
+    [ -f ~/.box-name ] && cat ~/.box-name || hostname
 }
 
 # Directory info.

From ae1973de443525daeb87df9973ae83c6c9210cfe Mon Sep 17 00:00:00 2001
From: Ron Shapiro <shapiro.rd@gmail.com>
Date: Mon, 29 Apr 2013 10:18:32 -0400
Subject: [PATCH 088/364] plugged_in function

---
 plugins/battery/battery.plugin.zsh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh
index 0c7c9421f..785386a12 100644
--- a/plugins/battery/battery.plugin.zsh
+++ b/plugins/battery/battery.plugin.zsh
@@ -16,12 +16,16 @@ if [[ $(uname) == "Darwin" ]] ; then
     integer i=$(((currentcapacity/maxcapacity) * 100))
     echo $i
   }
+
+  function plugged_in() {
+    [ $(ioreg -rc AppleSmartBattery | grep -c '^.*"ExternalConnected"\ =\ Yes') -eq 1 ]
+  }
   
   function battery_pct_remaining() {
-    if [[ $(ioreg -rc AppleSmartBattery | grep -c '^.*"ExternalConnected"\ =\ No') -eq 1 ]] ; then
-      battery_pct
-    else
+    if plugged_in ; then
       echo "External Power"
+    else
+      battery_pct
     fi
   }
 

From 3f44f51e9ca1b196e4c3caa439558996abdac273 Mon Sep 17 00:00:00 2001
From: Gaetan Semet <gaetan@xeberon.net>
Date: Tue, 11 Jun 2013 14:50:32 +0200
Subject: [PATCH 089/364] source ~/.profile for upgrading (to source the proxy
 configuration)

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
---
 tools/check_for_upgrade.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 581f03a07..14d294328 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -20,6 +20,8 @@ if [[ -z "$epoch_target" ]]; then
   epoch_target=13
 fi
 
+[ ~/.profile ] && source ~/.profile
+
 if [ -f ~/.zsh-update ]
 then
   . ~/.zsh-update

From b832ec92086df4648e270b3d44a10fe058ffd8f4 Mon Sep 17 00:00:00 2001
From: Gaetan Semet <gaetan@xeberon.net>
Date: Tue, 11 Jun 2013 14:58:25 +0200
Subject: [PATCH 090/364] New plugin 'common-aliases' for optional cutting edge
 zsh aliases

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
---
 .../common-aliases/common-aliases.plugin.zsh  | 94 +++++++++++++++++++
 1 file changed, 94 insertions(+)
 create mode 100644 plugins/common-aliases/common-aliases.plugin.zsh

diff --git a/plugins/common-aliases/common-aliases.plugin.zsh b/plugins/common-aliases/common-aliases.plugin.zsh
new file mode 100644
index 000000000..4ac8178b6
--- /dev/null
+++ b/plugins/common-aliases/common-aliases.plugin.zsh
@@ -0,0 +1,94 @@
+# Advanced Aliases.
+# Use with caution
+#
+
+# ls, the common ones I use a lot shortened for rapid fire usage
+alias ls='ls --color' #I like color
+alias l='ls -lFh'     #size,show type,human readable
+alias la='ls -lAFh'   #long list,show almost all,show type,human readable
+alias lr='ls -tRFh'   #sorted by date,recursive,show type,human readable
+alias lt='ls -ltFh'   #long list,sorted by date,show type,human readable
+alias ll='ls -l'      #long list
+alias ldot='ls -ld .*'
+alias lS='ls -1FSsh'
+alias lart='ls -1Fcart'
+alias lrt='ls -1Fcrt'
+
+alias zshrc='vim ~/.zshrc' # Quick access to the ~/.zshrc file
+
+alias grep='grep --color'
+alias sgrep='grep -R -n -H -C 5'
+
+alias t='tail -f'
+
+# because typing 'cd' is A LOT of work!!
+alias ..='cd ../'
+alias ...='cd ../../'
+alias ....='cd ../../../'
+alias .....='cd ../../../../'
+
+# Command line head / tail shortcuts
+alias -g H='| head'
+alias -g T='| tail'
+alias -g G='| grep'
+alias -g L="| less"
+alias -g M="| most"
+alias -g LL="2>&1 | less"
+alias -g CA="2>&1 | cat -A"
+alias -g NE="2> /dev/null"
+alias -g NUL="> /dev/null 2>&1"
+alias -g P="2>&1| pygmentize -l pytb"
+
+alias dud='du --max-depth=1 -h'
+alias duf='du -sh *'
+alias fd='find . -type d -name'
+alias ff='find . -type f -name'
+
+alias h='history'
+alias hgrep="fc -El 0 | grep"
+alias help='man'
+alias j='jobs'
+alias p='ps -f'
+alias sortnr='sort -n -r'
+alias unexport='unset'
+
+alias whereami=display_info
+
+alias rm='rm -i'
+alias cp='cp -i'
+alias mv='mv -i'
+
+# zsh is able to auto-do some kungfoo
+# depends on the SUFFIX :)
+if [ ${ZSH_VERSION//\./} -ge 420 ]; then
+  # open browser on urls
+  _browser_fts=(htm html de org net com at cx nl se dk dk php)
+  for ft in $_browser_fts ; do alias -s $ft=$BROWSER ; done
+
+  _editor_fts=(cpp cxx cc c hh h inl asc txt TXT tex)
+  for ft in $_editor_fts ; do alias -s $ft=$EDITOR ; done
+
+  _image_fts=(jpg jpeg png gif mng tiff tif xpm)
+  for ft in $_image_fts ; do alias -s $ft=$XIVIEWER; done
+
+  _media_fts=(avi mpg mpeg ogm mp3 wav ogg ape rm mov mkv)
+  for ft in $_media_fts ; do alias -s $ft=mplayer ; done
+
+  #read documents
+  alias -s pdf=acroread
+  alias -s ps=gv
+  alias -s dvi=xdvi
+  alias -s chm=xchm
+  alias -s djvu=djview
+
+  #list whats inside packed file
+  alias -s zip="unzip -l"
+  alias -s rar="unrar l"
+  alias -s tar="tar tf"
+  alias -s tar.gz="echo "
+  alias -s ace="unace l"
+fi
+
+# Make zsh know about hosts already accessed by SSH
+zstyle -e ':completion:*:(ssh|scp|sftp|rsh|rsync):hosts' hosts 'reply=(${=${${(f)"$(cat {/etc/ssh_,~/.ssh/known_}hosts(|2)(N) /dev/null)"}%%[# ]*}//,/ })'
+

From dbcaafd03b084b94ebef9b04e91b3f04ad05d374 Mon Sep 17 00:00:00 2001
From: Gaetan Semet <gaetan@xeberon.net>
Date: Wed, 12 Jun 2013 11:54:08 +0200
Subject: [PATCH 091/364] Better super-grep

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
---
 plugins/common-aliases/common-aliases.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/common-aliases/common-aliases.plugin.zsh b/plugins/common-aliases/common-aliases.plugin.zsh
index 4ac8178b6..75899ca2c 100644
--- a/plugins/common-aliases/common-aliases.plugin.zsh
+++ b/plugins/common-aliases/common-aliases.plugin.zsh
@@ -17,7 +17,7 @@ alias lrt='ls -1Fcrt'
 alias zshrc='vim ~/.zshrc' # Quick access to the ~/.zshrc file
 
 alias grep='grep --color'
-alias sgrep='grep -R -n -H -C 5'
+alias sgrep='grep -R -n -H -C 5 --exclude-dir={.git,.svn,CVS} '
 
 alias t='tail -f'
 

From 15509ce0472a431867cc2ff21ca5ef0a1c1e855f Mon Sep 17 00:00:00 2001
From: dongweiming <ciici123@hotmail.com>
Date: Sun, 30 Jun 2013 17:29:02 +0800
Subject: [PATCH 092/364] Update gem completion

---
 plugins/gem/_gem | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/gem/_gem b/plugins/gem/_gem
index 83cba40d1..279181e70 100644
--- a/plugins/gem/_gem
+++ b/plugins/gem/_gem
@@ -4,11 +4,13 @@
 # gem zsh completion, based on homebrew completion
 
 _gem_installed() {
-  installed_gems=(`gem list --local --no-versions`)
+  installed_gems=(${(f)"$(gem list --local --no-versions)"})
 }
 
 local -a _1st_arguments
+
 _1st_arguments=(
+  'build:Build a gem from a gemspec'
   'cert:Manage RubyGems certificates and signing settings'
   'check:Check installed gems'
   'cleanup:Clean up old versions of installed gems in the local repository'
@@ -37,6 +39,7 @@ _1st_arguments=(
   'unpack:Unpack an installed gem to the current directory'
   'update:Update the named gems (or all installed gems) in the local repository'
   'which:Find the location of a library file you can require'
+  'yank:Remove a specific gem version release from RubyGems.org'
 )
 
 local expl

From d4a9467f89115c1e60b51d8c068ec4e5e1c5b195 Mon Sep 17 00:00:00 2001
From: dongweiming <ciici123@hotmail.com>
Date: Sun, 30 Jun 2013 18:08:48 +0800
Subject: [PATCH 093/364] Modify determine the oh-my-zsh installed in
 non-default path of the installed

---
 tools/install.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index a2bd5665a..5af038fd9 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -1,6 +1,11 @@
-if [ -d ~/.oh-my-zsh ]
+ZSH=`/usr/bin/env|grep 'ZSH='|cut -d '=' -f 2`
+if [ -d "$ZSH" ]
 then
-  echo "\033[0;33mYou already have Oh My Zsh installed.\033[0m You'll need to remove ~/.oh-my-zsh if you want to install"
+  echo "\033[0;33mYou already have Oh My Zsh installed.\033[0m You'll need to remove $ZSH if you want to install"
+  exit
+elif [ -d ~/.oh-my-zsh ]
+then
+  echo "\033[0;33mYou already have One Oh My Zsh Directory.\033[0m You'll need to remove  ~/.oh-my-zsh if you want to clone"
   exit
 fi
 

From 77cf8696053d5256b4deb7cddc79c31d26158451 Mon Sep 17 00:00:00 2001
From: dongweiming <ciici123@hotmail.com>
Date: Sun, 30 Jun 2013 20:46:10 +0800
Subject: [PATCH 094/364] Add option for show in the command execution time
 stamp in the history

---
 lib/aliases.zsh              | 14 ++++++++++++--
 templates/zshrc.zsh-template |  5 +++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/lib/aliases.zsh b/lib/aliases.zsh
index 9b3709172..b279bf855 100644
--- a/lib/aliases.zsh
+++ b/lib/aliases.zsh
@@ -13,8 +13,18 @@ alias please='sudo'
 #alias g='grep -in'
 
 # Show history
-alias history='fc -l 1'
-
+if [ "$HIST_STAMPS" = "mm/dd/yyyy" ]
+then
+    alias history='fc -fl 1'
+elif [ "$HIST_STAMPS" = "dd.mm.yyyy" ]
+then
+    alias history='fc -El 1'
+elif [ "$HIST_STAMPS" = "yyyy-mm-dd" ]
+then
+    alias history='fc -il 1'
+else
+    alias history='fc -l 1'
+fi
 # List direcory contents
 alias lsa='ls -lah'
 alias l='ls -la'
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index d4dded73a..3135df882 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -37,6 +37,11 @@ ZSH_THEME="robbyrussell"
 # much faster.
 # DISABLE_UNTRACKED_FILES_DIRTY="true"
 
+# Uncomment following line if you want to  shown in the command execution time stamp 
+# in the history command output. The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|
+# yyyy-mm-dd
+# HIST_STAMPS="mm/dd/yyyy"
+
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)

From c164f2aab693f4b32c209cb34784818fba434b2d Mon Sep 17 00:00:00 2001
From: dongweiming <ciici123@gmail.com>
Date: Tue, 2 Jul 2013 00:22:25 +0800
Subject: [PATCH 095/364] Add shell built method

---
 plugins/urltools/urltools.plugin.zsh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/urltools/urltools.plugin.zsh b/plugins/urltools/urltools.plugin.zsh
index 4ddfff8ce..22327334d 100644
--- a/plugins/urltools/urltools.plugin.zsh
+++ b/plugins/urltools/urltools.plugin.zsh
@@ -14,6 +14,9 @@ if [[ $(whence node) != "" && ( "x$URLTOOLS_METHOD" = "x"  || "x$URLTOOLS_METHOD
 elif [[ $(whence python) != "" && ( "x$URLTOOLS_METHOD" = "x" || "x$URLTOOLS_METHOD" = "xpython" ) ]]; then
     alias urlencode='python -c "import sys, urllib as ul; print ul.quote_plus(sys.argv[1])"'
     alias urldecode='python -c "import sys, urllib as ul; print ul.unquote_plus(sys.argv[1])"'
+elif [[ $(whence xxd) != "" && ( "x$URLTOOLS_METHOD" = "x" || "x$URLTOOLS_METHOD" = "xshell" ) ]]; then
+    function urlencode() {echo $@ | tr -d "\n" | xxd -plain | sed "s/\(..\)/%\1/g"}
+    function urldecode() {printf $(echo -n $@ | sed 's/\\/\\\\/g;s/\(%\)\([0-9a-fA-F][0-9a-fA-F]\)/\\x\2/g')"\n"}
 elif [[ $(whence ruby) != "" && ( "x$URLTOOLS_METHOD" = "x" || "x$URLTOOLS_METHOD" = "xruby" ) ]]; then
     alias urlencode='ruby -r cgi -e "puts CGI.escape(ARGV[0])"'
     alias urldecode='ruby -r cgi -e "puts CGI.unescape(ARGV[0])"'
@@ -33,4 +36,4 @@ elif [[ $(whence perl) != "" && ( "x$URLTOOLS_METHOD" = "x" || "x$URLTOOLS_METHO
     fi
 fi
 
-unset URLTOOLS_METHOD
\ No newline at end of file
+unset URLTOOLS_METHOD

From 44a26df8fdd85c3eeb774a6913b9102106228ebb Mon Sep 17 00:00:00 2001
From: dongweiming <ciici123@hotmail.com>
Date: Wed, 3 Jul 2013 11:57:31 +0800
Subject: [PATCH 096/364] Add version option

---
 plugins/supervisor/_supervisord | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/supervisor/_supervisord b/plugins/supervisor/_supervisord
index 34d27805d..e0cb670e1 100644
--- a/plugins/supervisor/_supervisord
+++ b/plugins/supervisor/_supervisord
@@ -7,6 +7,7 @@ _arguments \
     {--configuration,-c}"[configuration file]:FILENAME:_files" \
     {--nodaemon,-n}"[run in the foreground (same as 'nodaemon true' in config file)]" \
     {--help,-h}"[print this usage message and exit]:" \
+    {--version,-v}"[print supervisord version number and exit]:" \
     {--user,-u}"[run supervisord as this user]:USER:_users" \
     {--umask,-m}"[use this umask for daemon subprocess (default is 022)]" \
     {--directory,-d}"[directory to chdir to when daemonized]" \

From 426f5f483925f5bd9d3f78fa03d6f7d9818bb288 Mon Sep 17 00:00:00 2001
From: dongweiming <ciici123@gmail.com>
Date: Wed, 3 Jul 2013 22:29:42 +0800
Subject: [PATCH 097/364] Update powify for displayed parameter is not enough,
 and when there is no directory error

---
 plugins/powify/_powify | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/powify/_powify b/plugins/powify/_powify
index d23c46513..9507f400e 100644
--- a/plugins/powify/_powify
+++ b/plugins/powify/_powify
@@ -1,7 +1,7 @@
 #compdef powify
 
 _powify_all_servers() {
-  all_servers=(`ls $HOME/.pow/`)
+  all_servers=(`ls $HOME/.pow/ 2>/dev/null`)
 }
 
 local -a all_servers
@@ -30,7 +30,7 @@ fi
 
 case "$words[1]" in
   server)
-    _values \
+    _values , \
       'install[install pow server]' \
       'reinstall[reinstall pow server]' \
       'update[update pow server]' \
@@ -45,7 +45,7 @@ case "$words[1]" in
       'config[print the current server configuration]' \
       'logs[tails the pow server logs]' ;;
   utils)
-    _values \
+    _values , \
       'install[install powify.dev server management tool]' \
       'reinstall[reinstall powify.dev server management tool]' \
       'uninstall[uninstall powify.dev server management tool]' ;;

From 744f3654e2bfb4806381ca4f0a5dfcfa5b1c3b83 Mon Sep 17 00:00:00 2001
From: dongweiming <ciici123@hotmail.com>
Date: Thu, 4 Jul 2013 19:18:52 +0800
Subject: [PATCH 098/364] Add sudo plugin

---
 plugins/sudo/sudo.zsh | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 plugins/sudo/sudo.zsh

diff --git a/plugins/sudo/sudo.zsh b/plugins/sudo/sudo.zsh
new file mode 100644
index 000000000..d12e06853
--- /dev/null
+++ b/plugins/sudo/sudo.zsh
@@ -0,0 +1,22 @@
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+# sudo will be inserted before the command
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+# * Dongweiming <ciici123@gmail.com>
+#
+# ------------------------------------------------------------------------------
+
+sudo-command-line() {
+[[ -z $BUFFER ]] && zle up-history
+[[ $BUFFER != sudo\ * ]] && BUFFER="sudo $BUFFER"
+zle end-of-line 
+}
+zle -N sudo-command-line
+# Defined shortcut keys: [Esc] [Esc]
+bindkey "\e\e" sudo-command-line

From 4d6b59f041f2d5eb9b61608a0ff33160faf48afa Mon Sep 17 00:00:00 2001
From: dongweiming <ciici123@hotmail.com>
Date: Fri, 5 Jul 2013 19:27:43 +0800
Subject: [PATCH 099/364] Add a plugin for systemadmin ops and developer

---
 plugins/systemadmin/systemadmin.zsh | 159 ++++++++++++++++++++++++++++
 1 file changed, 159 insertions(+)
 create mode 100644 plugins/systemadmin/systemadmin.zsh

diff --git a/plugins/systemadmin/systemadmin.zsh b/plugins/systemadmin/systemadmin.zsh
new file mode 100644
index 000000000..f5e44c66f
--- /dev/null
+++ b/plugins/systemadmin/systemadmin.zsh
@@ -0,0 +1,159 @@
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+# This is one for the system administrator, operation and maintenance.
+# Some of which come from http://justinlilly.com/dotfiles/zsh.html
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+# * Dongweiming <ciici123@gmail.com>
+#
+# ------------------------------------------------------------------------------
+
+function retval() {
+    if [[ -z $1 ]];then
+        echo '.'
+    else
+        echo $1
+    fi
+}
+
+function retlog() {
+    if [[ -z $1 ]];then
+        echo '/var/log/nginx/access.log'
+    else
+        echo $1
+    fi
+}
+
+alias ping='ping -c 5'
+alias clr='clear;echo "Currently logged in on $(tty), as $(whoami) in directory $(pwd)."'
+alias path='echo -e ${PATH//:/\\n}'
+alias mkdir='mkdir -pv'
+# get top process eating memory
+alias psmem='ps -e -orss=,args= | sort -b -k1,1n'
+alias psmem10='ps -e -orss=,args= | sort -b -k1,1n| head -10'
+# get top process eating cpu if not work try excute : export LC_ALL='C'
+alias pscpu='ps -e -o pcpu,cpu,nice,state,cputime,args|sort -k1 -nr'
+alias pscpu10='ps -e -o pcpu,cpu,nice,state,cputime,args|sort -k1 -nr | head -10'
+# top10 of the history
+alias hist10='print -l ${(o)history%% *} | uniq -c | sort -nr | head -n 10'
+
+# directory LS
+dls () {
+    ls -l | grep "^d" | awk '{ print $9 }' | tr -d "/"
+}
+psgrep() {
+    ps aux | grep "$(retval $1)" | grep -v grep
+}
+# Kills any process that matches a regexp passed to it
+killit() {
+    ps aux | grep -v "grep" | grep "$@" | awk '{print $2}' | xargs sudo kill
+}
+
+# list contents of directories in a tree-like format
+if [ -z "\${which tree}" ]; then
+  tree () {
+      find $@ -print | sed -e 's;[^/]*/;|____;g;s;____|; |;g'
+  }
+fi
+
+# Sort connection state
+sortcons() {
+    netstat -nat |awk '{print $6}'|sort|uniq -c|sort -rn
+}
+
+# View all 80 Port Connections
+con80() {
+    netstat -nat|grep -i ":80"|wc -l
+}
+
+# On the connected IP sorted by the number of connections
+sortconip() {
+    netstat -ntu | awk '{print $5}' | cut -d: -f1 | sort | uniq -c | sort -n
+}
+
+# top20 of Find the number of requests on 80 port
+req20() {
+    netstat -anlp|grep 80|grep tcp|awk '{print $5}'|awk -F: '{print $1}'|sort|uniq -c|sort -nr|head -n20
+}
+
+# top20 of Using tcpdump port 80 access to view
+http20() {
+    sudo tcpdump -i eth0 -tnn dst port 80 -c 1000 | awk -F"." '{print $1"."$2"."$3"."$4}' | sort | uniq -c | sort -nr |head -20
+}
+
+# top20 of Find time_wait connection
+timewait20() {
+    netstat -n|grep TIME_WAIT|awk '{print $5}'|sort|uniq -c|sort -rn|head -n20
+}
+
+# top20 of Find SYN connection
+syn20() {
+    netstat -an | grep SYN | awk '{print $5}' | awk -F: '{print $1}' | sort | uniq -c | sort -nr|head -n20
+}
+
+# Printing process according to the port number
+port_pro() {
+    netstat -ntlp | grep "$(retval $1)" | awk '{print $7}' | cut -d/ -f1
+}
+
+# top10 of gain access to the ip address
+accessip10() {
+    awk '{counts[$(11)]+=1}; END {for(url in counts) print counts[url], url}' "$(retlog)"
+}
+
+# top20 of Most Visited file or page
+visitpage20() {
+    awk '{print $11}' "$(retlog)"|sort|uniq -c|sort -nr|head -20
+}
+
+# top100 of Page lists the most time-consuming (more than 60 seconds) as well as the corresponding page number of occurrences
+consume100() {
+    awk '($NF > 60 && $7~/\.php/){print $7}' "$(retlog)" |sort -n|uniq -c|sort -nr|head -100
+    # if django website or other webiste make by no suffix language
+    # awk '{print $7}' "$(retlog)" |sort -n|uniq -c|sort -nr|head -100
+}
+
+# Website traffic statistics (G)
+webtraffic() {
+    awk "{sum+=$10} END {print sum/1024/1024/1024}" "$(retlog)"
+}
+
+# Statistical connections 404
+c404() {
+    awk '($9 ~/404/)' "$(retlog)" | awk '{print $9,$7}' | sort
+}
+
+# Statistical http status.
+httpstatus() {
+    awk '{counts[$(9)]+=1}; END {for(code in counts) print code, counts[code]}' "$(retlog)"
+}
+
+# Delete 0 byte file
+d0() {
+    find "$(retval $1)" -type f -size 0 -exec rm -rf {} \;
+}
+
+# gather external ip address
+geteip() {
+    curl http://ifconfig.me
+}
+
+# determine local IP address
+getip() {
+    ifconfig  | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1}'
+}
+
+# Clear zombie processes
+clrz() {
+    ps -eal | awk '{ if ($2 == "Z") {print $4}}' | kill -9
+}
+
+# Second concurrent
+conssec() {
+    awk '{if($9~/200|30|404/)COUNT[$4]++}END{for( a in COUNT) print a,COUNT[a]}' "$(retlog)"|sort -k 2 -nr|head -n10
+}

From 2defe0b5c54b08fc599005197761edf162600c78 Mon Sep 17 00:00:00 2001
From: Vincent <emesix@xs4all.nl>
Date: Mon, 8 Jul 2013 01:17:33 +0200
Subject: [PATCH 100/364] Update jonathan.zsh-theme

Made it work with UTF-8 Console.
Thanks goes to http://blog.ganneff.de/blog/2013/03/zsh-config---and-prompt.html
---
 themes/jonathan.zsh-theme | 59 ++++++++++++++++++++++++---------------
 1 file changed, 36 insertions(+), 23 deletions(-)

diff --git a/themes/jonathan.zsh-theme b/themes/jonathan.zsh-theme
index 9f0f30271..bca92970c 100644
--- a/themes/jonathan.zsh-theme
+++ b/themes/jonathan.zsh-theme
@@ -71,17 +71,30 @@ setprompt () {
 
     ###
     # See if we can use extended characters to look nicer.
+    # UTF-8 Fixed
 
-    typeset -A altchar
-    set -A altchar ${(s..)terminfo[acsc]}
-    PR_SET_CHARSET="%{$terminfo[enacs]%}"
-    PR_SHIFT_IN="%{$terminfo[smacs]%}"
-    PR_SHIFT_OUT="%{$terminfo[rmacs]%}"
-    PR_HBAR=${altchar[q]:--}
-    PR_ULCORNER=${altchar[l]:--}
-    PR_LLCORNER=${altchar[m]:--}
-    PR_LRCORNER=${altchar[j]:--}
-    PR_URCORNER=${altchar[k]:--}
+    if [[ $(locale charmap) == "UTF-8" ]]; then
+	PR_SET_CHARSET=""
+	PR_SHIFT_IN=""
+	PR_SHIFT_OUT=""
+	PR_HBAR="─"
+        PR_ULCORNER="┌"
+        PR_LLCORNER="└"
+        PR_LRCORNER="┘"
+        PR_URCORNER="┐"
+    else
+        typeset -A altchar
+        set -A altchar ${(s..)terminfo[acsc]}
+        # Some stuff to help us draw nice lines
+        PR_SET_CHARSET="%{$terminfo[enacs]%}"
+        PR_SHIFT_IN="%{$terminfo[smacs]%}"
+        PR_SHIFT_OUT="%{$terminfo[rmacs]%}"
+        PR_HBAR='$PR_SHIFT_IN${altchar[q]:--}$PR_SHIFT_OUT'
+        PR_ULCORNER='$PR_SHIFT_IN${altchar[l]:--}$PR_SHIFT_OUT'
+        PR_LLCORNER='$PR_SHIFT_IN${altchar[m]:--}$PR_SHIFT_OUT'
+        PR_LRCORNER='$PR_SHIFT_IN${altchar[j]:--}$PR_SHIFT_OUT'
+        PR_URCORNER='$PR_SHIFT_IN${altchar[k]:--}$PR_SHIFT_OUT'
+     fi
 
 
     ###
@@ -113,31 +126,31 @@ setprompt () {
     # Finally, the prompt.
 
     PROMPT='$PR_SET_CHARSET$PR_STITLE${(e)PR_TITLEBAR}\
-$PR_CYAN$PR_SHIFT_IN$PR_ULCORNER$PR_HBAR$PR_SHIFT_OUT$PR_GREY(\
+$PR_CYAN$PR_ULCORNER$PR_HBAR$PR_GREY(\
 $PR_GREEN%$PR_PWDLEN<...<%~%<<\
-$PR_GREY)`rvm_prompt_info || rbenv_prompt_info`$PR_CYAN$PR_SHIFT_IN$PR_HBAR$PR_HBAR${(e)PR_FILLBAR}$PR_HBAR$PR_SHIFT_OUT$PR_GREY(\
+$PR_GREY)`rvm_prompt_info || rbenv_prompt_info`$PR_CYAN$PR_HBAR$PR_HBAR${(e)PR_FILLBAR}$PR_HBAR$PR_GREY(\
 $PR_CYAN%(!.%SROOT%s.%n)$PR_GREY@$PR_GREEN%m:%l\
-$PR_GREY)$PR_CYAN$PR_SHIFT_IN$PR_HBAR$PR_URCORNER$PR_SHIFT_OUT\
+$PR_GREY)$PR_CYAN$PR_HBAR$PR_URCORNER\
 
-$PR_CYAN$PR_SHIFT_IN$PR_LLCORNER$PR_BLUE$PR_HBAR$PR_SHIFT_OUT(\
+$PR_CYAN$PR_LLCORNER$PR_BLUE$PR_HBAR(\
 $PR_YELLOW%D{%H:%M:%S}\
-$PR_LIGHT_BLUE%{$reset_color%}`git_prompt_info``git_prompt_status`$PR_BLUE)$PR_CYAN$PR_SHIFT_IN$PR_HBAR\
-$PR_SHIFT_IN$PR_HBAR$PR_SHIFT_OUT\
+$PR_LIGHT_BLUE%{$reset_color%}`git_prompt_info``git_prompt_status`$PR_BLUE)$PR_CYAN$PR_HBAR\
+$PR_HBAR\
 >$PR_NO_COLOUR '
 
     # display exitcode on the right when >0
     return_code="%(?..%{$fg[red]%}%? ↵ %{$reset_color%})"
-    RPROMPT=' $return_code$PR_CYAN$PR_SHIFT_IN$PR_HBAR$PR_BLUE$PR_HBAR$PR_SHIFT_OUT\
-($PR_YELLOW%D{%a,%b%d}$PR_BLUE)$PR_SHIFT_IN$PR_HBAR$PR_CYAN$PR_LRCORNER$PR_SHIFT_OUT$PR_NO_COLOUR'
+    RPROMPT=' $return_code$PR_CYAN$PR_HBAR$PR_BLUE$PR_HBAR\
+($PR_YELLOW%D{%a,%b%d}$PR_BLUE)$PR_HBAR$PR_CYAN$PR_LRCORNER$PR_NO_COLOUR'
 
-    PS2='$PR_CYAN$PR_SHIFT_IN$PR_HBAR$PR_SHIFT_OUT\
-$PR_BLUE$PR_SHIFT_IN$PR_HBAR$PR_SHIFT_OUT(\
-$PR_LIGHT_GREEN%_$PR_BLUE)$PR_SHIFT_IN$PR_HBAR$PR_SHIFT_OUT\
-$PR_CYAN$PR_SHIFT_IN$PR_HBAR$PR_SHIFT_OUT$PR_NO_COLOUR '
+    PS2='$PR_CYAN$PR_HBAR\
+$PR_BLUE$PR_HBAR(\
+$PR_LIGHT_GREEN%_$PR_BLUE)$PR_HBAR\
+$PR_CYAN$PR_HBAR$PR_NO_COLOUR '
 }
 
 setprompt
 
 autoload -U add-zsh-hook
 add-zsh-hook precmd  theme_precmd
-add-zsh-hook preexec theme_preexec
\ No newline at end of file
+add-zsh-hook preexec theme_preexec

From 5bad3f890de691194b77cfc33846e2102e21ea93 Mon Sep 17 00:00:00 2001
From: Steven De Coeyer <steven@banteng.be>
Date: Mon, 5 Aug 2013 21:15:28 +0200
Subject: [PATCH 101/364] Updates Zhann theme

---
 themes/zhann.zsh-theme | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/themes/zhann.zsh-theme b/themes/zhann.zsh-theme
index 5c49fe79b..5c0854730 100644
--- a/themes/zhann.zsh-theme
+++ b/themes/zhann.zsh-theme
@@ -1,15 +1,25 @@
-PROMPT='%{$fg_bold[green]%}%p %{$fg[cyan]%}%c%{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
+autoload -U colors && colors
 
-if [ -e ~/.rvm/bin/rvm-prompt ]; then
-  RPROMPT='%{$reset_color%} %{$fg[red]%}$(~/.rvm/bin/rvm-prompt i v g) %{$reset_color%}'
-else
-  if which rbenv &> /dev/null; then
-    RPROMPT='%{$reset_color%} %{$fg[red]%}$(rbenv version | sed -e "s/ (set.*$//") %{$reset_color%}'
-  fi
-fi
+autoload -Uz vcs_info
 
+zstyle ':vcs_info:*' stagedstr '%F{green}●'
+zstyle ':vcs_info:*' unstagedstr '%F{yellow}●'
+zstyle ':vcs_info:*' check-for-changes true
+zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{11}%r'
+zstyle ':vcs_info:*' enable git svn
+theme_precmd () {
+    if [[ -z $(git ls-files --other --exclude-standard 2> /dev/null) ]] {
+        zstyle ':vcs_info:*' formats ' [%b%c%u%B%F{green}]'
+    } else {
+        zstyle ':vcs_info:*' formats ' [%b%c%u%B%F{red}●%F{green}]'
+    }
+
+    vcs_info
+}
+
+setopt prompt_subst
+PROMPT='%B%F{blue}%c%B%F{green}${vcs_info_msg_0_}%B%F{magenta} %{$reset_color%}% '
+
+autoload -U add-zsh-hook
+add-zsh-hook precmd  theme_precmd
 
-ZSH_THEME_GIT_PROMPT_PREFIX=" (%{$fg[red]%}"
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})"

From 2c56345917624bd94bfc05fe7bdbb2051421d5e7 Mon Sep 17 00:00:00 2001
From: Kasper Kronborg Isager <kasperisager@gmail.com>
Date: Sat, 10 Aug 2013 19:19:30 -0400
Subject: [PATCH 102/364] Add Pure theme

---
 themes/pure.zsh-theme | 128 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 128 insertions(+)
 create mode 100644 themes/pure.zsh-theme

diff --git a/themes/pure.zsh-theme b/themes/pure.zsh-theme
new file mode 100644
index 000000000..d7ed624e4
--- /dev/null
+++ b/themes/pure.zsh-theme
@@ -0,0 +1,128 @@
+#!/usr/bin/env zsh
+
+# ------------------------------------------------------------------------------
+#
+# Pure - A minimal and beautiful theme for oh-my-zsh
+#
+# Based on the custom Zsh-prompt of the same name by Sindre Sorhus. A huge
+# thanks goes out to him for designing the fantastic Pure prompt in the first
+# place! I'd also like to thank Julien Nicoulaud for his "nicoulaj" theme from
+# which I've borrowed both some ideas and some actual code. You can find out
+# more about both of these fantastic two people here:
+#
+# Sindre Sorhus
+#   Github:   https://github.com/sindresorhus
+#   Twitter:  https://twitter.com/sindresorhus
+#
+# Julien Nicoulaud
+#   Github:   https://github.com/nicoulaj
+#   Twitter:  https://twitter.com/nicoulaj
+#
+# License
+#
+# Copyright (c) 2013 Kasper Kronborg Isager
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+# ------------------------------------------------------------------------------
+
+# Set required options
+#
+setopt prompt_subst
+
+# Load required modules
+#
+autoload -Uz vcs_info
+
+# Set vcs_info parameters
+#
+zstyle ':vcs_info:*' enable hg bzr git
+zstyle ':vcs_info:*:*' unstagedstr '!'
+zstyle ':vcs_info:*:*' stagedstr '+'
+zstyle ':vcs_info:*:*' formats "$FX[bold]%r$FX[no-bold]/%S" "%s/%b" "%%u%c"
+zstyle ':vcs_info:*:*' actionformats "$FX[bold]%r$FX[no-bold]/%S" "%s/%b" "%u%c (%a)"
+zstyle ':vcs_info:*:*' nvcsformats "%~" "" ""
+
+# Fastest possible way to check if repo is dirty
+#
+git_dirty() {
+    # Check if we're in a git repo
+    command git rev-parse --is-inside-work-tree &>/dev/null || return
+    # Check if it's dirty
+    command git diff --quiet --ignore-submodules HEAD &>/dev/null; [ $? -eq 1 ] && echo "*"
+}
+
+# Display information about the current repository
+#
+repo_information() {
+    echo "%F{blue}${vcs_info_msg_0_%%/.} %F{8}$vcs_info_msg_1_`git_dirty` $vcs_info_msg_2_%f"
+}
+
+# Displays the exec time of the last command if set threshold was exceeded
+#
+cmd_exec_time() {
+    local stop=`date +%s`
+    local start=${cmd_timestamp:-$stop}
+    let local elapsed=$stop-$start
+    [ $elapsed -gt 5 ] && echo ${elapsed}s
+}
+
+# Get the intial timestamp for cmd_exec_time
+#
+preexec() {
+    cmd_timestamp=`date +%s`
+}
+
+# Output additional information about paths, repos and exec time
+#
+precmd() {
+    vcs_info # Get version control info before we start outputting stuff
+    print -P "\n$(repo_information) %F{yellow}$(cmd_exec_time)%f"
+}
+
+# Define prompts
+#
+PROMPT="%(?.%F{magenta}.%F{red})❯%f " # Display a red prompt char on failure
+RPROMPT="%F{8}${SSH_TTY:+%n@%m}%f"    # Display username if connected via SSH
+
+# ------------------------------------------------------------------------------
+#
+# List of vcs_info format strings:
+#
+# %b => current branch
+# %a => current action (rebase/merge)
+# %s => current version control system
+# %r => name of the root directory of the repository
+# %S => current path relative to the repository root directory
+# %m => in case of Git, show information about stashes
+# %u => show unstaged changes in the repository
+# %c => show staged changes in the repository
+#
+# List of prompt format strings:
+#
+# prompt:
+# %F => color dict
+# %f => reset color
+# %~ => current path
+# %* => time
+# %n => username
+# %m => shortname host
+# %(?..) => prompt conditional - %(condition.true.false)
+#
+# ------------------------------------------------------------------------------

From 9ebdbec58979b077e4790387b5927c74ce7184ef Mon Sep 17 00:00:00 2001
From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Fri, 23 Aug 2013 21:58:29 -0500
Subject: [PATCH 103/364] gitfast: update to upstream v1.8.4

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 plugins/gitfast/_git                | 163 +++++++++++--
 plugins/gitfast/git-completion.bash | 301 ++++++++---------------
 plugins/gitfast/git-prompt.sh       | 362 ++++++++++++++++------------
 3 files changed, 449 insertions(+), 377 deletions(-)

diff --git a/plugins/gitfast/_git b/plugins/gitfast/_git
index cf8116d47..fac5e711e 100644
--- a/plugins/gitfast/_git
+++ b/plugins/gitfast/_git
@@ -2,18 +2,19 @@
 
 # zsh completion wrapper for git
 #
-# You need git's bash completion script installed somewhere, by default on the
-# same directory as this script.
+# Copyright (c) 2012-2013 Felipe Contreras <felipe.contreras@gmail.com>
 #
-# If your script is on ~/.git-completion.sh instead, you can configure it on
-# your ~/.zshrc:
+# You need git's bash completion script installed somewhere, by default it
+# would be the location bash-completion uses.
+#
+# If your script is somewhere else, you can configure it on your ~/.zshrc:
 #
 #  zstyle ':completion:*:*:git:*' script ~/.git-completion.sh
 #
-# The recommended way to install this script is to copy to
-# '~/.zsh/completion/_git', and then add the following to your ~/.zshrc file:
+# The recommended way to install this script is to copy to '~/.zsh/_git', and
+# then add the following to your ~/.zshrc file:
 #
-#  fpath=(~/.zsh/completion $fpath)
+#  fpath=(~/.zsh $fpath)
 
 complete ()
 {
@@ -21,8 +22,23 @@ complete ()
 	return 0
 }
 
+zstyle -T ':completion:*:*:git:*' tag-order && \
+	zstyle ':completion:*:*:git:*' tag-order 'common-commands'
+
 zstyle -s ":completion:*:*:git:*" script script
-test -z "$script" && script="$(dirname ${funcsourcetrace[1]%:*})"/git-completion.bash
+if [ -z "$script" ]; then
+	local -a locations
+	local e
+	locations=(
+		'/etc/bash_completion.d/git' # fedora, old debian
+		'/usr/share/bash-completion/completions/git' # arch, ubuntu, new debian
+		'/usr/share/bash-completion/git' # gentoo
+		$(dirname ${funcsourcetrace[1]%:*})/git-completion.bash
+		)
+	for e in $locations; do
+		test -f $e && script="$e" && break
+	done
+fi
 ZSH_VERSION='' . "$script"
 
 __gitcomp ()
@@ -69,18 +85,131 @@ __gitcomp_file ()
 	compadd -Q -p "${2-}" -f -- ${=1} && _ret=0
 }
 
+__git_zsh_bash_func ()
+{
+	emulate -L ksh
+
+	local command=$1
+
+	local completion_func="_git_${command//-/_}"
+	declare -f $completion_func >/dev/null && $completion_func && return
+
+	local expansion=$(__git_aliased_command "$command")
+	if [ -n "$expansion" ]; then
+		completion_func="_git_${expansion//-/_}"
+		declare -f $completion_func >/dev/null && $completion_func
+	fi
+}
+
+__git_zsh_cmd_common ()
+{
+	local -a list
+	list=(
+	add:'add file contents to the index'
+	bisect:'find by binary search the change that introduced a bug'
+	branch:'list, create, or delete branches'
+	checkout:'checkout a branch or paths to the working tree'
+	clone:'clone a repository into a new directory'
+	commit:'record changes to the repository'
+	diff:'show changes between commits, commit and working tree, etc'
+	fetch:'download objects and refs from another repository'
+	grep:'print lines matching a pattern'
+	init:'create an empty Git repository or reinitialize an existing one'
+	log:'show commit logs'
+	merge:'join two or more development histories together'
+	mv:'move or rename a file, a directory, or a symlink'
+	pull:'fetch from and merge with another repository or a local branch'
+	push:'update remote refs along with associated objects'
+	rebase:'forward-port local commits to the updated upstream head'
+	reset:'reset current HEAD to the specified state'
+	rm:'remove files from the working tree and from the index'
+	show:'show various types of objects'
+	status:'show the working tree status'
+	tag:'create, list, delete or verify a tag object signed with GPG')
+	_describe -t common-commands 'common commands' list && _ret=0
+}
+
+__git_zsh_cmd_alias ()
+{
+	local -a list
+	list=(${${${(0)"$(git config -z --get-regexp '^alias\.')"}#alias.}%$'\n'*})
+	_describe -t alias-commands 'aliases' list $* && _ret=0
+}
+
+__git_zsh_cmd_all ()
+{
+	local -a list
+	emulate ksh -c __git_compute_all_commands
+	list=( ${=__git_all_commands} )
+	_describe -t all-commands 'all commands' list && _ret=0
+}
+
+__git_zsh_main ()
+{
+	local curcontext="$curcontext" state state_descr line
+	typeset -A opt_args
+	local -a orig_words
+
+	orig_words=( ${words[@]} )
+
+	_arguments -C \
+		'(-p --paginate --no-pager)'{-p,--paginate}'[pipe all output into ''less'']' \
+		'(-p --paginate)--no-pager[do not pipe git output into a pager]' \
+		'--git-dir=-[set the path to the repository]: :_directories' \
+		'--bare[treat the repository as a bare repository]' \
+		'(- :)--version[prints the git suite version]' \
+		'--exec-path=-[path to where your core git programs are installed]:: :_directories' \
+		'--html-path[print the path where git''s HTML documentation is installed]' \
+		'--info-path[print the path where the Info files are installed]' \
+		'--man-path[print the manpath (see `man(1)`) for the man pages]' \
+		'--work-tree=-[set the path to the working tree]: :_directories' \
+		'--namespace=-[set the git namespace]' \
+		'--no-replace-objects[do not use replacement refs to replace git objects]' \
+		'(- :)--help[prints the synopsis and a list of the most commonly used commands]: :->arg' \
+		'(-): :->command' \
+		'(-)*:: :->arg' && return
+
+	case $state in
+	(command)
+		_alternative \
+                         'alias-commands:alias:__git_zsh_cmd_alias' \
+                         'common-commands:common:__git_zsh_cmd_common' \
+                         'all-commands:all:__git_zsh_cmd_all' && _ret=0
+		;;
+	(arg)
+		local command="${words[1]}" __git_dir
+
+		if (( $+opt_args[--bare] )); then
+			__git_dir='.'
+		else
+			__git_dir=${opt_args[--git-dir]}
+		fi
+
+		(( $+opt_args[--help] )) && command='help'
+
+		words=( ${orig_words[@]} )
+
+		__git_zsh_bash_func $command
+		;;
+	esac
+}
+
 _git ()
 {
 	local _ret=1
-	() {
-		emulate -L ksh
-		local cur cword prev
-		cur=${words[CURRENT-1]}
-		prev=${words[CURRENT-2]}
-		let cword=CURRENT-1
-		__${service}_main
-	}
-	let _ret && _default -S '' && _ret=0
+	local cur cword prev
+
+	cur=${words[CURRENT]}
+	prev=${words[CURRENT-1]}
+	let cword=CURRENT-1
+
+	if (( $+functions[__${service}_zsh_main] )); then
+		__${service}_zsh_main
+	else
+		emulate ksh -c __${service}_main
+	fi
+
+	let _ret && _default && _ret=0
 	return _ret
 }
 
diff --git a/plugins/gitfast/git-completion.bash b/plugins/gitfast/git-completion.bash
index 93eba4675..5da920ecd 100644
--- a/plugins/gitfast/git-completion.bash
+++ b/plugins/gitfast/git-completion.bash
@@ -33,8 +33,6 @@ esac
 # returns location of .git repo
 __gitdir ()
 {
-	# Note: this function is duplicated in git-prompt.sh
-	# When updating it, make sure you update the other one to match.
 	if [ -z "${1-}" ]; then
 		if [ -n "${__git_dir-}" ]; then
 			echo "$__git_dir"
@@ -53,19 +51,6 @@ __gitdir ()
 	fi
 }
 
-__gitcomp_1 ()
-{
-	local c IFS=$' \t\n'
-	for c in $1; do
-		c="$c$2"
-		case $c in
-		--*=*|*.) ;;
-		*) c="$c " ;;
-		esac
-		printf '%s\n' "$c"
-	done
-}
-
 # The following function is based on code from:
 #
 #   bash_completion - programmable completion functions for bash 3.2+
@@ -195,8 +180,18 @@ _get_comp_words_by_ref ()
 }
 fi
 
-# Generates completion reply with compgen, appending a space to possible
-# completion words, if necessary.
+__gitcompadd ()
+{
+	local i=0
+	for x in $1; do
+		if [[ "$x" == "$3"* ]]; then
+			COMPREPLY[i++]="$2$x$4"
+		fi
+	done
+}
+
+# Generates completion reply, appending a space to possible completion words,
+# if necessary.
 # It accepts 1 to 4 arguments:
 # 1: List of possible completion words.
 # 2: A prefix to be added to each possible completion word (optional).
@@ -208,19 +203,25 @@ __gitcomp ()
 
 	case "$cur_" in
 	--*=)
-		COMPREPLY=()
 		;;
 	*)
-		local IFS=$'\n'
-		COMPREPLY=($(compgen -P "${2-}" \
-			-W "$(__gitcomp_1 "${1-}" "${4-}")" \
-			-- "$cur_"))
+		local c i=0 IFS=$' \t\n'
+		for c in $1; do
+			c="$c${4-}"
+			if [[ $c == "$cur_"* ]]; then
+				case $c in
+				--*=*|*.) ;;
+				*) c="$c " ;;
+				esac
+				COMPREPLY[i++]="${2-}$c"
+			fi
+		done
 		;;
 	esac
 }
 
-# Generates completion reply with compgen from newline-separated possible
-# completion words by appending a space to all of them.
+# Generates completion reply from newline-separated possible completion words
+# by appending a space to all of them.
 # It accepts 1 to 4 arguments:
 # 1: List of possible completion words, separated by a single newline.
 # 2: A prefix to be added to each possible completion word (optional).
@@ -231,7 +232,7 @@ __gitcomp ()
 __gitcomp_nl ()
 {
 	local IFS=$'\n'
-	COMPREPLY=($(compgen -P "${2-}" -S "${4- }" -W "$1" -- "${3-$cur}"))
+	__gitcompadd "$1" "${2-}" "${3-$cur}" "${4- }"
 }
 
 # Generates completion reply with compgen from newline-separated possible
@@ -249,106 +250,50 @@ __gitcomp_file ()
 	# since tilde expansion is not applied.
 	# This means that COMPREPLY will be empty and Bash default
 	# completion will be used.
-	COMPREPLY=($(compgen -P "${2-}" -W "$1" -- "${3-$cur}"))
+	__gitcompadd "$1" "${2-}" "${3-$cur}" ""
 
-	# Tell Bash that compspec generates filenames.
-	compopt -o filenames 2>/dev/null
+	# use a hack to enable file mode in bash < 4
+	compopt -o filenames +o nospace 2>/dev/null ||
+	compgen -f /non-existing-dir/ > /dev/null
 }
 
-__git_index_file_list_filter_compat ()
-{
-	local path
-
-	while read -r path; do
-		case "$path" in
-		?*/*) echo "${path%%/*}/" ;;
-		*) echo "$path" ;;
-		esac
-	done
-}
-
-__git_index_file_list_filter_bash ()
-{
-	local path
-
-	while read -r path; do
-		case "$path" in
-		?*/*)
-			# XXX if we append a slash to directory names when using
-			# `compopt -o filenames`, Bash will append another slash.
-			# This is pretty stupid, and this the reason why we have to
-			# define a compatible version for this function.
-			echo "${path%%/*}" ;;
-		*)
-			echo "$path" ;;
-		esac
-	done
-}
-
-# Process path list returned by "ls-files" and "diff-index --name-only"
-# commands, in order to list only file names relative to a specified
-# directory, and append a slash to directory names.
-__git_index_file_list_filter ()
-{
-	# Default to Bash >= 4.x
-	__git_index_file_list_filter_bash
-}
-
-# Execute git ls-files, returning paths relative to the directory
-# specified in the first argument, and using the options specified in
-# the second argument.
+# Execute 'git ls-files', unless the --committable option is specified, in
+# which case it runs 'git diff-index' to find out the files that can be
+# committed.  It return paths relative to the directory specified in the first
+# argument, and using the options specified in the second argument.
 __git_ls_files_helper ()
 {
 	(
 		test -n "${CDPATH+set}" && unset CDPATH
-		# NOTE: $2 is not quoted in order to support multiple options
-		cd "$1" && git ls-files --exclude-standard $2
+		cd "$1"
+		if [ "$2" == "--committable" ]; then
+			git diff-index --name-only --relative HEAD
+		else
+			# NOTE: $2 is not quoted in order to support multiple options
+			git ls-files --exclude-standard $2
+		fi
 	) 2>/dev/null
 }
 
 
-# Execute git diff-index, returning paths relative to the directory
-# specified in the first argument, and using the tree object id
-# specified in the second argument.
-__git_diff_index_helper ()
-{
-	(
-		test -n "${CDPATH+set}" && unset CDPATH
-		cd "$1" && git diff-index --name-only --relative "$2"
-	) 2>/dev/null
-}
-
 # __git_index_files accepts 1 or 2 arguments:
 # 1: Options to pass to ls-files (required).
-#    Supported options are --cached, --modified, --deleted, --others,
-#    and --directory.
 # 2: A directory path (optional).
 #    If provided, only files within the specified directory are listed.
 #    Sub directories are never recursed.  Path must have a trailing
 #    slash.
 __git_index_files ()
 {
-	local dir="$(__gitdir)" root="${2-.}"
+	local dir="$(__gitdir)" root="${2-.}" file
 
 	if [ -d "$dir" ]; then
-		__git_ls_files_helper "$root" "$1" | __git_index_file_list_filter |
-			sort | uniq
-	fi
-}
-
-# __git_diff_index_files accepts 1 or 2 arguments:
-# 1) The id of a tree object.
-# 2) A directory path (optional).
-#    If provided, only files within the specified directory are listed.
-#    Sub directories are never recursed.  Path must have a trailing
-#    slash.
-__git_diff_index_files ()
-{
-	local dir="$(__gitdir)" root="${2-.}"
-
-	if [ -d "$dir" ]; then
-		__git_diff_index_helper "$root" "$1" | __git_index_file_list_filter |
-			sort | uniq
+		__git_ls_files_helper "$root" "$1" |
+		while read -r file; do
+			case "$file" in
+			?*/*) echo "${file%%/*}" ;;
+			*) echo "$file" ;;
+			esac
+		done | sort | uniq
 	fi
 }
 
@@ -424,14 +369,8 @@ __git_refs ()
 		done
 		;;
 	*)
-		git ls-remote "$dir" HEAD ORIG_HEAD 'refs/tags/*' 'refs/heads/*' 'refs/remotes/*' 2>/dev/null | \
-		while read -r hash i; do
-			case "$i" in
-			*^{}) ;;
-			refs/*) echo "${i#refs/*/}" ;;
-			*) echo "$i" ;;
-			esac
-		done
+		echo "HEAD"
+		git for-each-ref --format="%(refname:short)" -- "refs/remotes/$dir/" | sed -e "s#^$dir/##"
 		;;
 	esac
 }
@@ -549,44 +488,23 @@ __git_complete_revlist_file ()
 }
 
 
-# __git_complete_index_file requires 1 argument: the options to pass to
-# ls-file
+# __git_complete_index_file requires 1 argument:
+# 1: the options to pass to ls-file
+#
+# The exception is --committable, which finds the files appropriate commit.
 __git_complete_index_file ()
 {
-	local pfx cur_="$cur"
+	local pfx="" cur_="$cur"
 
 	case "$cur_" in
 	?*/*)
 		pfx="${cur_%/*}"
 		cur_="${cur_##*/}"
 		pfx="${pfx}/"
-
-		__gitcomp_file "$(__git_index_files "$1" "$pfx")" "$pfx" "$cur_"
-		;;
-	*)
-		__gitcomp_file "$(__git_index_files "$1")" "" "$cur_"
 		;;
 	esac
-}
 
-# __git_complete_diff_index_file requires 1 argument: the id of a tree
-# object
-__git_complete_diff_index_file ()
-{
-	local pfx cur_="$cur"
-
-	case "$cur_" in
-	?*/*)
-		pfx="${cur_%/*}"
-		cur_="${cur_##*/}"
-		pfx="${pfx}/"
-
-		__gitcomp_file "$(__git_diff_index_files "$1" "$pfx")" "$pfx" "$cur_"
-		;;
-	*)
-		__gitcomp_file "$(__git_diff_index_files "$1")" "" "$cur_"
-		;;
-	esac
+	__gitcomp_file "$(__git_index_files "$1" "$pfx")" "$pfx" "$cur_"
 }
 
 __git_complete_file ()
@@ -614,7 +532,6 @@ __git_complete_remote_or_refspec ()
 			case "$cmd" in
 			push) no_complete_refspec=1 ;;
 			fetch)
-				COMPREPLY=()
 				return
 				;;
 			*) ;;
@@ -630,7 +547,6 @@ __git_complete_remote_or_refspec ()
 		return
 	fi
 	if [ $no_complete_refspec = 1 ]; then
-		COMPREPLY=()
 		return
 	fi
 	[ "$remote" = "." ] && remote=
@@ -732,6 +648,7 @@ __git_list_porcelain_commands ()
 		cat-file)         : plumbing;;
 		check-attr)       : plumbing;;
 		check-ignore)     : plumbing;;
+		check-mailmap)    : plumbing;;
 		check-ref-format) : plumbing;;
 		checkout-index)   : plumbing;;
 		commit-tree)      : plumbing;;
@@ -951,7 +868,6 @@ _git_am ()
 			"
 		return
 	esac
-	COMPREPLY=()
 }
 
 _git_apply ()
@@ -971,7 +887,6 @@ _git_apply ()
 			"
 		return
 	esac
-	COMPREPLY=()
 }
 
 _git_add ()
@@ -1031,7 +946,6 @@ _git_bisect ()
 		__gitcomp_nl "$(__git_refs)"
 		;;
 	*)
-		COMPREPLY=()
 		;;
 	esac
 }
@@ -1124,9 +1038,14 @@ _git_cherry ()
 
 _git_cherry_pick ()
 {
+	local dir="$(__gitdir)"
+	if [ -f "$dir"/CHERRY_PICK_HEAD ]; then
+		__gitcomp "--continue --quit --abort"
+		return
+	fi
 	case "$cur" in
 	--*)
-		__gitcomp "--edit --no-commit"
+		__gitcomp "--edit --no-commit --signoff --strategy= --mainline"
 		;;
 	*)
 		__gitcomp_nl "$(__git_refs)"
@@ -1170,7 +1089,6 @@ _git_clone ()
 		return
 		;;
 	esac
-	COMPREPLY=()
 }
 
 _git_commit ()
@@ -1182,13 +1100,6 @@ _git_commit ()
 		;;
 	esac
 
-	case "$prev" in
-	-c|-C)
-		__gitcomp_nl "$(__git_refs)" "" "${cur}"
-		return
-		;;
-	esac
-
 	case "$cur" in
 	--cleanup=*)
 		__gitcomp "default strip verbatim whitespace
@@ -1218,7 +1129,7 @@ _git_commit ()
 	esac
 
 	if git rev-parse --verify --quiet HEAD >/dev/null; then
-		__git_complete_diff_index_file "HEAD"
+		__git_complete_index_file "--committable"
 	else
 		# This is the first commit
 		__git_complete_index_file "--cached"
@@ -1251,7 +1162,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
 			--no-prefix --src-prefix= --dst-prefix=
 			--inter-hunk-context=
 			--patience --histogram --minimal
-			--raw
+			--raw --word-diff
 			--dirstat --dirstat= --dirstat-by-file
 			--dirstat-by-file= --cumulative
 			--diff-algorithm=
@@ -1299,7 +1210,7 @@ _git_difftool ()
 		return
 		;;
 	esac
-	__git_complete_file
+	__git_complete_revlist_file
 }
 
 __git_fetch_options="
@@ -1319,11 +1230,12 @@ _git_fetch ()
 }
 
 __git_format_patch_options="
-	--stdout --attach --no-attach --thread --thread= --output-directory
+	--stdout --attach --no-attach --thread --thread= --no-thread
 	--numbered --start-number --numbered-files --keep-subject --signoff
 	--signature --no-signature --in-reply-to= --cc= --full-index --binary
 	--not --all --cover-letter --no-prefix --src-prefix= --dst-prefix=
 	--inline --suffix= --ignore-if-in-upstream --subject-prefix=
+	--output-directory --reroll-count --to= --quiet --notes
 "
 
 _git_format_patch ()
@@ -1354,7 +1266,6 @@ _git_fsck ()
 		return
 		;;
 	esac
-	COMPREPLY=()
 }
 
 _git_gc ()
@@ -1365,7 +1276,6 @@ _git_gc ()
 		return
 		;;
 	esac
-	COMPREPLY=()
 }
 
 _git_gitk ()
@@ -1442,7 +1352,6 @@ _git_init ()
 		return
 		;;
 	esac
-	COMPREPLY=()
 }
 
 _git_ls_files ()
@@ -1578,7 +1487,6 @@ _git_mergetool ()
 		return
 		;;
 	esac
-	COMPREPLY=()
 }
 
 _git_merge_base ()
@@ -1819,7 +1727,7 @@ __git_config_get_set_variables ()
 _git_config ()
 {
 	case "$prev" in
-	branch.*.remote)
+	branch.*.remote|branch.*.pushremote)
 		__gitcomp_nl "$(__git_remotes)"
 		return
 		;;
@@ -1827,11 +1735,19 @@ _git_config ()
 		__gitcomp_nl "$(__git_refs)"
 		return
 		;;
+	branch.*.rebase)
+		__gitcomp "false true"
+		return
+		;;
+	remote.pushdefault)
+		__gitcomp_nl "$(__git_remotes)"
+		return
+		;;
 	remote.*.fetch)
 		local remote="${prev#remote.}"
 		remote="${remote%.fetch}"
 		if [ -z "$cur" ]; then
-			COMPREPLY=("refs/heads/")
+			__gitcomp_nl "refs/heads/" "" "" ""
 			return
 		fi
 		__gitcomp_nl "$(__git_refs_remotes "$remote")"
@@ -1866,6 +1782,10 @@ _git_config ()
 			"
 		return
 		;;
+	diff.submodule)
+		__gitcomp "log short"
+		return
+		;;
 	help.format)
 		__gitcomp "man info web html"
 		return
@@ -1891,7 +1811,6 @@ _git_config ()
 		return
 		;;
 	*.*)
-		COMPREPLY=()
 		return
 		;;
 	esac
@@ -1908,7 +1827,7 @@ _git_config ()
 		;;
 	branch.*.*)
 		local pfx="${cur%.*}." cur_="${cur##*.}"
-		__gitcomp "remote merge mergeoptions rebase" "$pfx" "$cur_"
+		__gitcomp "remote pushremote merge mergeoptions rebase" "$pfx" "$cur_"
 		return
 		;;
 	branch.*)
@@ -2039,7 +1958,6 @@ _git_config ()
 		core.fileMode
 		core.fsyncobjectfiles
 		core.gitProxy
-		core.ignoreCygwinFSTricks
 		core.ignoreStat
 		core.ignorecase
 		core.logAllRefUpdates
@@ -2061,13 +1979,14 @@ _git_config ()
 		core.whitespace
 		core.worktree
 		diff.autorefreshindex
-		diff.statGraphWidth
 		diff.external
 		diff.ignoreSubmodules
 		diff.mnemonicprefix
 		diff.noprefix
 		diff.renameLimit
 		diff.renames
+		diff.statGraphWidth
+		diff.submodule
 		diff.suppressBlankEmpty
 		diff.tool
 		diff.wordRegex
@@ -2202,6 +2121,7 @@ _git_config ()
 		receive.fsckObjects
 		receive.unpackLimit
 		receive.updateserverinfo
+		remote.pushdefault
 		remotes.
 		repack.usedeltabaseoffset
 		rerere.autoupdate
@@ -2272,7 +2192,6 @@ _git_remote ()
 		__gitcomp "$c"
 		;;
 	*)
-		COMPREPLY=()
 		;;
 	esac
 }
@@ -2356,7 +2275,7 @@ _git_show ()
 		return
 		;;
 	esac
-	__git_complete_file
+	__git_complete_revlist_file
 }
 
 _git_show_branch ()
@@ -2388,8 +2307,6 @@ _git_stash ()
 		*)
 			if [ -z "$(__git_find_on_cmdline "$save_opts")" ]; then
 				__gitcomp "$subcommands"
-			else
-				COMPREPLY=()
 			fi
 			;;
 		esac
@@ -2402,14 +2319,12 @@ _git_stash ()
 			__gitcomp "--index --quiet"
 			;;
 		show,--*|drop,--*|branch,--*)
-			COMPREPLY=()
 			;;
 		show,*|apply,*|drop,*|pop,*|branch,*)
 			__gitcomp_nl "$(git --git-dir="$(__gitdir)" stash list \
 					| sed -n -e 's/:.*//p')"
 			;;
 		*)
-			COMPREPLY=()
 			;;
 		esac
 	fi
@@ -2419,7 +2334,7 @@ _git_submodule ()
 {
 	__git_has_doubledash && return
 
-	local subcommands="add status init update summary foreach sync"
+	local subcommands="add status init deinit update summary foreach sync"
 	if [ -z "$(__git_find_on_cmdline "$subcommands")" ]; then
 		case "$cur" in
 		--*)
@@ -2451,7 +2366,7 @@ _git_svn ()
 			--no-metadata --use-svm-props --use-svnsync-props
 			--log-window-size= --no-checkout --quiet
 			--repack-flags --use-log-author --localtime
-			--ignore-paths= $remote_opts
+			--ignore-paths= --include-paths= $remote_opts
 			"
 		local init_opts="
 			--template= --shared= --trunk= --tags=
@@ -2526,7 +2441,6 @@ _git_svn ()
 			__gitcomp "--revision= --parent"
 			;;
 		*)
-			COMPREPLY=()
 			;;
 		esac
 	fi
@@ -2551,13 +2465,10 @@ _git_tag ()
 
 	case "$prev" in
 	-m|-F)
-		COMPREPLY=()
 		;;
 	-*|tag)
 		if [ $f = 1 ]; then
 			__gitcomp_nl "$(__git_tags)"
-		else
-			COMPREPLY=()
 		fi
 		;;
 	*)
@@ -2579,9 +2490,10 @@ __git_main ()
 		i="${words[c]}"
 		case "$i" in
 		--git-dir=*) __git_dir="${i#--git-dir=}" ;;
+		--git-dir)   ((c++)) ; __git_dir="${words[c]}" ;;
 		--bare)      __git_dir="." ;;
 		--help) command="help"; break ;;
-		-c) c=$((++c)) ;;
+		-c|--work-tree|--namespace) ((c++)) ;;
 		-*) ;;
 		*) command="$i"; break ;;
 		esac
@@ -2599,6 +2511,7 @@ __git_main ()
 			--exec-path
 			--exec-path=
 			--html-path
+			--man-path
 			--info-path
 			--work-tree=
 			--namespace=
@@ -2693,35 +2606,19 @@ if [[ -n ${ZSH_VERSION-} ]]; then
 		compadd -Q -p "${2-}" -f -- ${=1} && _ret=0
 	}
 
-	__git_zsh_helper ()
-	{
-		emulate -L ksh
-		local cur cword prev
-		cur=${words[CURRENT-1]}
-		prev=${words[CURRENT-2]}
-		let cword=CURRENT-1
-		__${service}_main
-	}
-
 	_git ()
 	{
-		emulate -L zsh
-		local _ret=1
-		__git_zsh_helper
-		let _ret && _default -S '' && _ret=0
+		local _ret=1 cur cword prev
+		cur=${words[CURRENT]}
+		prev=${words[CURRENT-1]}
+		let cword=CURRENT-1
+		emulate ksh -c __${service}_main
+		let _ret && _default && _ret=0
 		return _ret
 	}
 
 	compdef _git git gitk
 	return
-elif [[ -n ${BASH_VERSION-} ]]; then
-	if ((${BASH_VERSINFO[0]} < 4)); then
-		# compopt is not supported
-		__git_index_file_list_filter ()
-		{
-			__git_index_file_list_filter_compat
-		}
-	fi
 fi
 
 __git_func_wrap ()
diff --git a/plugins/gitfast/git-prompt.sh b/plugins/gitfast/git-prompt.sh
index 65f8368f1..a81ef5a48 100644
--- a/plugins/gitfast/git-prompt.sh
+++ b/plugins/gitfast/git-prompt.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2006,2007 Shawn O. Pearce <spearce@spearce.org>
 # Distributed under the GNU General Public License, version 2.0.
 #
-# This script allows you to see the current branch in your prompt.
+# This script allows you to see repository status in your prompt.
 #
 # To enable:
 #
@@ -13,23 +13,27 @@
 #    3a) Change your PS1 to call __git_ps1 as
 #        command-substitution:
 #        Bash: PS1='[\u@\h \W$(__git_ps1 " (%s)")]\$ '
-#        ZSH:  PS1='[%n@%m %c$(__git_ps1 " (%s)")]\$ '
+#        ZSH:  setopt PROMPT_SUBST ; PS1='[%n@%m %c$(__git_ps1 " (%s)")]\$ '
 #        the optional argument will be used as format string.
-#    3b) Alternatively, if you are using bash, __git_ps1 can be
-#        used for PROMPT_COMMAND with two parameters, <pre> and
-#        <post>, which are strings you would put in $PS1 before
-#        and after the status string generated by the git-prompt
-#        machinery.  e.g.
-#           PROMPT_COMMAND='__git_ps1 "\u@\h:\w" "\\\$ "'
-#        will show username, at-sign, host, colon, cwd, then
-#        various status string, followed by dollar and SP, as
-#        your prompt.
+#    3b) Alternatively, for a slightly faster prompt, __git_ps1 can
+#        be used for PROMPT_COMMAND in Bash or for precmd() in Zsh
+#        with two parameters, <pre> and <post>, which are strings
+#        you would put in $PS1 before and after the status string
+#        generated by the git-prompt machinery.  e.g.
+#        Bash: PROMPT_COMMAND='__git_ps1 "\u@\h:\w" "\\\$ "'
+#          will show username, at-sign, host, colon, cwd, then
+#          various status string, followed by dollar and SP, as
+#          your prompt.
+#        ZSH:  precmd () { __git_ps1 "%n" ":%~$ " "|%s" }
+#          will show username, pipe, then various status string,
+#          followed by colon, cwd, dollar and SP, as your prompt.
 #        Optionally, you can supply a third argument with a printf
 #        format string to finetune the output of the branch status
 #
-# The argument to __git_ps1 will be displayed only if you are currently
-# in a git repository.  The %s token will be the name of the current
-# branch.
+# The repository status will be displayed only if you are currently in a
+# git repository. The %s token is the placeholder for the shown status.
+#
+# The prompt status always includes the current branch name.
 #
 # In addition, if you set GIT_PS1_SHOWDIRTYSTATE to a nonempty value,
 # unstaged (*) and staged (+) changes will be shown next to the branch
@@ -77,31 +81,8 @@
 #
 # If you would like a colored hint about the current dirty state, set
 # GIT_PS1_SHOWCOLORHINTS to a nonempty value. The colors are based on
-# the colored output of "git status -sb".
-
-# __gitdir accepts 0 or 1 arguments (i.e., location)
-# returns location of .git repo
-__gitdir ()
-{
-	# Note: this function is duplicated in git-completion.bash
-	# When updating it, make sure you update the other one to match.
-	if [ -z "${1-}" ]; then
-		if [ -n "${__git_dir-}" ]; then
-			echo "$__git_dir"
-		elif [ -n "${GIT_DIR-}" ]; then
-			test -d "${GIT_DIR-}" || return 1
-			echo "$GIT_DIR"
-		elif [ -d .git ]; then
-			echo .git
-		else
-			git rev-parse --git-dir 2>/dev/null
-		fi
-	elif [ -d "$1/.git" ]; then
-		echo "$1/.git"
-	else
-		echo "$1"
-	fi
-}
+# the colored output of "git status -sb" and are available only when
+# using __git_ps1 for PROMPT_COMMAND or precmd.
 
 # stores the divergence from upstream in $p
 # used by GIT_PS1_SHOWUPSTREAM
@@ -124,7 +105,7 @@ __git_ps1_show_upstream ()
 			fi
 			;;
 		svn-remote.*.url)
-			svn_remote[ $((${#svn_remote[@]} + 1)) ]="$value"
+			svn_remote[$((${#svn_remote[@]} + 1))]="$value"
 			svn_url_pattern+="\\|$value"
 			upstream=svn+git # default upstream is SVN if available, else git
 			;;
@@ -146,10 +127,11 @@ __git_ps1_show_upstream ()
 	svn*)
 		# get the upstream from the "git-svn-id: ..." in a commit message
 		# (git-svn uses essentially the same procedure internally)
-		local svn_upstream=($(git log --first-parent -1 \
+		local -a svn_upstream
+		svn_upstream=($(git log --first-parent -1 \
 					--grep="^git-svn-id: \(${svn_url_pattern#??}\)" 2>/dev/null))
 		if [[ 0 -ne ${#svn_upstream[@]} ]]; then
-			svn_upstream=${svn_upstream[ ${#svn_upstream[@]} - 2 ]}
+			svn_upstream=${svn_upstream[${#svn_upstream[@]} - 2]}
 			svn_upstream=${svn_upstream%@*}
 			local n_stop="${#svn_remote[@]}"
 			for ((n=1; n <= n_stop; n++)); do
@@ -222,6 +204,51 @@ __git_ps1_show_upstream ()
 
 }
 
+# Helper function that is meant to be called from __git_ps1.  It
+# injects color codes into the appropriate gitstring variables used
+# to build a gitstring.
+__git_ps1_colorize_gitstring ()
+{
+	if [[ -n ${ZSH_VERSION-} ]]; then
+		local c_red='%F{red}'
+		local c_green='%F{green}'
+		local c_lblue='%F{blue}'
+		local c_clear='%f'
+	else
+		# Using \[ and \] around colors is necessary to prevent
+		# issues with command line editing/browsing/completion!
+		local c_red='\[\e[31m\]'
+		local c_green='\[\e[32m\]'
+		local c_lblue='\[\e[1;34m\]'
+		local c_clear='\[\e[0m\]'
+	fi
+	local bad_color=$c_red
+	local ok_color=$c_green
+	local flags_color="$c_lblue"
+
+	local branch_color=""
+	if [ $detached = no ]; then
+		branch_color="$ok_color"
+	else
+		branch_color="$bad_color"
+	fi
+	c="$branch_color$c"
+
+	z="$c_clear$z"
+	if [ "$w" = "*" ]; then
+		w="$bad_color$w"
+	fi
+	if [ -n "$i" ]; then
+		i="$ok_color$i"
+	fi
+	if [ -n "$s" ]; then
+		s="$flags_color$s"
+	fi
+	if [ -n "$u" ]; then
+		u="$bad_color$u"
+	fi
+	r="$c_clear$r"
+}
 
 # __git_ps1 accepts 0 or 1 arguments (i.e., format string)
 # when called from PS1 using command substitution
@@ -254,39 +281,83 @@ __git_ps1 ()
 		;;
 	esac
 
-	local g="$(__gitdir)"
-	if [ -z "$g" ]; then
+	local repo_info rev_parse_exit_code
+	repo_info="$(git rev-parse --git-dir --is-inside-git-dir \
+		--is-bare-repository --is-inside-work-tree \
+		--short HEAD 2>/dev/null)"
+	rev_parse_exit_code="$?"
+
+	if [ -z "$repo_info" ]; then
 		if [ $pcmode = yes ]; then
 			#In PC mode PS1 always needs to be set
 			PS1="$ps1pc_start$ps1pc_end"
 		fi
-	else
-		local r=""
-		local b=""
+		return
+	fi
+
+	local short_sha
+	if [ "$rev_parse_exit_code" = "0" ]; then
+		short_sha="${repo_info##*$'\n'}"
+		repo_info="${repo_info%$'\n'*}"
+	fi
+	local inside_worktree="${repo_info##*$'\n'}"
+	repo_info="${repo_info%$'\n'*}"
+	local bare_repo="${repo_info##*$'\n'}"
+	repo_info="${repo_info%$'\n'*}"
+	local inside_gitdir="${repo_info##*$'\n'}"
+	local g="${repo_info%$'\n'*}"
+
+	local r=""
+	local b=""
+	local step=""
+	local total=""
+	if [ -d "$g/rebase-merge" ]; then
+		read b 2>/dev/null <"$g/rebase-merge/head-name"
+		read step 2>/dev/null <"$g/rebase-merge/msgnum"
+		read total 2>/dev/null <"$g/rebase-merge/end"
 		if [ -f "$g/rebase-merge/interactive" ]; then
 			r="|REBASE-i"
-			b="$(cat "$g/rebase-merge/head-name")"
-		elif [ -d "$g/rebase-merge" ]; then
-			r="|REBASE-m"
-			b="$(cat "$g/rebase-merge/head-name")"
 		else
-			if [ -d "$g/rebase-apply" ]; then
-				if [ -f "$g/rebase-apply/rebasing" ]; then
-					r="|REBASE"
-				elif [ -f "$g/rebase-apply/applying" ]; then
-					r="|AM"
-				else
-					r="|AM/REBASE"
-				fi
-			elif [ -f "$g/MERGE_HEAD" ]; then
-				r="|MERGING"
-			elif [ -f "$g/CHERRY_PICK_HEAD" ]; then
-				r="|CHERRY-PICKING"
-			elif [ -f "$g/BISECT_LOG" ]; then
-				r="|BISECTING"
+			r="|REBASE-m"
+		fi
+	else
+		if [ -d "$g/rebase-apply" ]; then
+			read step 2>/dev/null <"$g/rebase-apply/next"
+			read total 2>/dev/null <"$g/rebase-apply/last"
+			if [ -f "$g/rebase-apply/rebasing" ]; then
+				read b 2>/dev/null <"$g/rebase-apply/head-name"
+				r="|REBASE"
+			elif [ -f "$g/rebase-apply/applying" ]; then
+				r="|AM"
+			else
+				r="|AM/REBASE"
 			fi
+		elif [ -f "$g/MERGE_HEAD" ]; then
+			r="|MERGING"
+		elif [ -f "$g/CHERRY_PICK_HEAD" ]; then
+			r="|CHERRY-PICKING"
+		elif [ -f "$g/REVERT_HEAD" ]; then
+			r="|REVERTING"
+		elif [ -f "$g/BISECT_LOG" ]; then
+			r="|BISECTING"
+		fi
 
-			b="$(git symbolic-ref HEAD 2>/dev/null)" || {
+		if [ -n "$b" ]; then
+			:
+		elif [ -h "$g/HEAD" ]; then
+			# symlink symbolic ref
+			b="$(git symbolic-ref HEAD 2>/dev/null)"
+		else
+			local head=""
+			if ! read head 2>/dev/null <"$g/HEAD"; then
+				if [ $pcmode = yes ]; then
+					PS1="$ps1pc_start$ps1pc_end"
+				fi
+				return
+			fi
+			# is it a symbolic ref?
+			b="${head#ref: }"
+			if [ "$head" = "$b" ]; then
 				detached=yes
 				b="$(
 				case "${GIT_PS1_DESCRIBE_STYLE-}" in
@@ -300,100 +371,75 @@ __git_ps1 ()
 					git describe --tags --exact-match HEAD ;;
 				esac 2>/dev/null)" ||
 
-				b="$(cut -c1-7 "$g/HEAD" 2>/dev/null)..." ||
-				b="unknown"
+				b="$short_sha..."
 				b="($b)"
-			}
-		fi
-
-		local w=""
-		local i=""
-		local s=""
-		local u=""
-		local c=""
-		local p=""
-
-		if [ "true" = "$(git rev-parse --is-inside-git-dir 2>/dev/null)" ]; then
-			if [ "true" = "$(git rev-parse --is-bare-repository 2>/dev/null)" ]; then
-				c="BARE:"
-			else
-				b="GIT_DIR!"
 			fi
-		elif [ "true" = "$(git rev-parse --is-inside-work-tree 2>/dev/null)" ]; then
-			if [ -n "${GIT_PS1_SHOWDIRTYSTATE-}" ] &&
-			   [ "$(git config --bool bash.showDirtyState)" != "false" ]
-			then
-				git diff --no-ext-diff --quiet --exit-code || w="*"
-				if git rev-parse --quiet --verify HEAD >/dev/null; then
-					git diff-index --cached --quiet HEAD -- || i="+"
-				else
-					i="#"
-				fi
-			fi
-			if [ -n "${GIT_PS1_SHOWSTASHSTATE-}" ]; then
-				git rev-parse --verify refs/stash >/dev/null 2>&1 && s="$"
-			fi
-
-			if [ -n "${GIT_PS1_SHOWUNTRACKEDFILES-}" ] &&
-			   [ "$(git config --bool bash.showUntrackedFiles)" != "false" ] &&
-			   [ -n "$(git ls-files --others --exclude-standard)" ]
-			then
-				u="%%"
-			fi
-
-			if [ -n "${GIT_PS1_SHOWUPSTREAM-}" ]; then
-				__git_ps1_show_upstream
-			fi
-		fi
-
-		local f="$w$i$s$u"
-		if [ $pcmode = yes ]; then
-			local gitstring=
-			if [ -n "${GIT_PS1_SHOWCOLORHINTS-}" ]; then
-				local c_red='\e[31m'
-				local c_green='\e[32m'
-				local c_lblue='\e[1;34m'
-				local c_clear='\e[0m'
-				local bad_color=$c_red
-				local ok_color=$c_green
-				local branch_color="$c_clear"
-				local flags_color="$c_lblue"
-				local branchstring="$c${b##refs/heads/}"
-
-				if [ $detached = no ]; then
-					branch_color="$ok_color"
-				else
-					branch_color="$bad_color"
-				fi
-
-				# Setting gitstring directly with \[ and \] around colors
-				# is necessary to prevent wrapping issues!
-				gitstring="\[$branch_color\]$branchstring\[$c_clear\]"
-
-				if [ -n "$w$i$s$u$r$p" ]; then
-					gitstring="$gitstring "
-				fi
-				if [ "$w" = "*" ]; then
-					gitstring="$gitstring\[$bad_color\]$w"
-				fi
-				if [ -n "$i" ]; then
-					gitstring="$gitstring\[$ok_color\]$i"
-				fi
-				if [ -n "$s" ]; then
-					gitstring="$gitstring\[$flags_color\]$s"
-				fi
-				if [ -n "$u" ]; then
-					gitstring="$gitstring\[$bad_color\]$u"
-				fi
-				gitstring="$gitstring\[$c_clear\]$r$p"
-			else
-				gitstring="$c${b##refs/heads/}${f:+ $f}$r$p"
-			fi
-			gitstring=$(printf -- "$printf_format" "$gitstring")
-			PS1="$ps1pc_start$gitstring$ps1pc_end"
-		else
-			# NO color option unless in PROMPT_COMMAND mode
-			printf -- "$printf_format" "$c${b##refs/heads/}${f:+ $f}$r$p"
 		fi
 	fi
+
+	if [ -n "$step" ] && [ -n "$total" ]; then
+		r="$r $step/$total"
+	fi
+
+	local w=""
+	local i=""
+	local s=""
+	local u=""
+	local c=""
+	local p=""
+
+	if [ "true" = "$inside_gitdir" ]; then
+		if [ "true" = "$bare_repo" ]; then
+			c="BARE:"
+		else
+			b="GIT_DIR!"
+		fi
+	elif [ "true" = "$inside_worktree" ]; then
+		if [ -n "${GIT_PS1_SHOWDIRTYSTATE-}" ] &&
+		   [ "$(git config --bool bash.showDirtyState)" != "false" ]
+		then
+			git diff --no-ext-diff --quiet --exit-code || w="*"
+			if [ -n "$short_sha" ]; then
+				git diff-index --cached --quiet HEAD -- || i="+"
+			else
+				i="#"
+			fi
+		fi
+		if [ -n "${GIT_PS1_SHOWSTASHSTATE-}" ] &&
+		   [ -r "$g/refs/stash" ]; then
+			s="$"
+		fi
+
+		if [ -n "${GIT_PS1_SHOWUNTRACKEDFILES-}" ] &&
+		   [ "$(git config --bool bash.showUntrackedFiles)" != "false" ] &&
+		   git ls-files --others --exclude-standard --error-unmatch -- '*' >/dev/null 2>/dev/null
+		then
+			u="%${ZSH_VERSION+%}"
+		fi
+
+		if [ -n "${GIT_PS1_SHOWUPSTREAM-}" ]; then
+			__git_ps1_show_upstream
+		fi
+	fi
+
+	local z="${GIT_PS1_STATESEPARATOR-" "}"
+
+	# NO color option unless in PROMPT_COMMAND mode
+	if [ $pcmode = yes ] && [ -n "${GIT_PS1_SHOWCOLORHINTS-}" ]; then
+		__git_ps1_colorize_gitstring
+	fi
+
+	local f="$w$i$s$u"
+	local gitstring="$c${b##refs/heads/}${f:+$z$f}$r$p"
+
+	if [ $pcmode = yes ]; then
+		if [[ -n ${ZSH_VERSION-} ]]; then
+			gitstring=$(printf -- "$printf_format" "$gitstring")
+		else
+			printf -v gitstring -- "$printf_format" "$gitstring"
+		fi
+		PS1="$ps1pc_start$gitstring$ps1pc_end"
+	else
+		printf -- "$printf_format" "$gitstring"
+	fi
 }

From dd220152be26163c93ed1c0f9f98e7bad0653941 Mon Sep 17 00:00:00 2001
From: Dimitri Jorge <jorge.dimitri@gmail.com>
Date: Sun, 1 Sep 2013 18:20:08 +0200
Subject: [PATCH 104/364] Add autocompletion plugin for meteor command

---
 plugins/meteor/_meteor | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 plugins/meteor/_meteor

diff --git a/plugins/meteor/_meteor b/plugins/meteor/_meteor
new file mode 100644
index 000000000..c90ed6caf
--- /dev/null
+++ b/plugins/meteor/_meteor
@@ -0,0 +1,32 @@
+#compdef meteor
+#autoload
+
+# Meteor Autocomplete plugin for Oh-My-Zsh, based on homebrew completion
+# Original author: Dimitri JORGE (https://github.com/jorge-d)
+
+local -a _1st_arguments
+_1st_arguments=(
+  'run:[Default] Run this project in local development mode'
+  'create:Create a new project'
+  'update:Upgrade this project to the latest version of Meteor'
+  'add:Add a package to this project'
+  'remove:Remove a package from this project'
+  'list:List available packages'
+  'help:Display Meteor help'
+  'bundle:Pack this project up into a tarball'
+  'mongo:Connect to the Mongo database for the specified site'
+  'deploy:Deploy this project to Meteor'
+  'logs:Show logs for specified site'
+  'reset:Reset the project state. Erases the local database.'
+  'test-packages:Test one or more packages'
+)
+
+if (( CURRENT == 2 )); then
+  _describe -t commands "meteor subcommand" _1st_arguments
+  return
+fi
+
+case "$words[2]" in
+    help)
+      _describe -t commands "brew subcommand" _1st_arguments
+esac
\ No newline at end of file

From 90b83b81017bbf55d5c10e6bced835f6d184499d Mon Sep 17 00:00:00 2001
From: Dimitri Jorge <jorge.dimitri@gmail.com>
Date: Sun, 1 Sep 2013 19:23:21 +0200
Subject: [PATCH 105/364] Add completion for package add and remove

---
 plugins/meteor/_meteor | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/plugins/meteor/_meteor b/plugins/meteor/_meteor
index c90ed6caf..cd7fc304f 100644
--- a/plugins/meteor/_meteor
+++ b/plugins/meteor/_meteor
@@ -4,6 +4,13 @@
 # Meteor Autocomplete plugin for Oh-My-Zsh, based on homebrew completion
 # Original author: Dimitri JORGE (https://github.com/jorge-d)
 
+_meteor_all_packages() {
+  packages=(`meteor list | cut -d" " -f1`)
+}
+_meteor_installed_packages() {
+  installed_packages=(`meteor list --using`)
+}
+
 local -a _1st_arguments
 _1st_arguments=(
   'run:[Default] Run this project in local development mode'
@@ -21,6 +28,9 @@ _1st_arguments=(
   'test-packages:Test one or more packages'
 )
 
+local expl
+local -a packages installed_packages
+
 if (( CURRENT == 2 )); then
   _describe -t commands "meteor subcommand" _1st_arguments
   return
@@ -28,5 +38,11 @@ fi
 
 case "$words[2]" in
     help)
-      _describe -t commands "brew subcommand" _1st_arguments
+      _describe -t commands "meteor subcommand" _1st_arguments ;;
+    remove)
+      _meteor_installed_packages
+      _wanted installed_packages expl 'installed packages' compadd -a installed_packages ;;
+    add)
+      _meteor_all_packages
+      _wanted packages expl 'all packages' compadd -a packages ;;
 esac
\ No newline at end of file

From f6fb34845d31a840c73416f138dae1761ea4adb9 Mon Sep 17 00:00:00 2001
From: Alexandre Joly <alexandre.joly@futurecom.ch>
Date: Tue, 10 Sep 2013 09:14:24 +0200
Subject: [PATCH 106/364] updated the arguments list to the newest version
 (0.24.0) of cocoapods

---
 plugins/pod/_pod | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/pod/_pod b/plugins/pod/_pod
index 563fa5e66..6dd8b6371 100644
--- a/plugins/pod/_pod
+++ b/plugins/pod/_pod
@@ -3,18 +3,19 @@
 
 # -----------------------------------------------------------------------------
 #          FILE:  _pod
-#   DESCRIPTION:  Cocoapods autocomplete plugin for Oh-My-Zsh
+#   DESCRIPTION:  Cocoapods (0.24.0) autocomplete plugin for Oh-My-Zsh
 #                 http://cocoapods.org
 #        AUTHOR:  Alexandre Joly (alexandre.joly@mekanics.ch)
 #        GITHUB:  https://github.com/mekanics
 #       TWITTER:  @jolyAlexandre
-#       VERSION:  0.0.1
+#       VERSION:  0.0.2
 #       LICENSE:  MIT
 # -----------------------------------------------------------------------------
 
 local -a _1st_arguments
 _1st_arguments=(
     'help:Show help for the given command.'
+    'init:Generate a Podfile for the current directory.'
     'install:Install project dependencies'
     'ipc:Inter-process communication'
     'list:List pods'

From bdb2cabaa68a8c3af72df5a10bb3925fe1eda45e Mon Sep 17 00:00:00 2001
From: Alexandre Joly <alexandre.joly@futurecom.ch>
Date: Tue, 10 Sep 2013 09:17:09 +0200
Subject: [PATCH 107/364] typo

---
 plugins/pod/_pod | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/pod/_pod b/plugins/pod/_pod
index 6dd8b6371..745e9b15d 100644
--- a/plugins/pod/_pod
+++ b/plugins/pod/_pod
@@ -14,8 +14,8 @@
 
 local -a _1st_arguments
 _1st_arguments=(
-    'help:Show help for the given command.'
-    'init:Generate a Podfile for the current directory.'
+    'help:Show help for the given command'
+    'init:Generate a Podfile for the current directory'
     'install:Install project dependencies'
     'ipc:Inter-process communication'
     'list:List pods'

From 8735dfd87e98d79aa3a809117630cec907c1a86d Mon Sep 17 00:00:00 2001
From: Gaetan Semet <gaetan@xeberon.net>
Date: Tue, 10 Sep 2013 11:19:00 +0200
Subject: [PATCH 108/364] New aliases for repo plugin

This helps a lot in day to day android development:
- rs: repo sync (git fetch on all projects)
- rra: auto rebase for all projet without loosing uncommited changes
- rsrra: do both steps at once

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
---
 plugins/repo/repo.plugin.zsh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/plugins/repo/repo.plugin.zsh b/plugins/repo/repo.plugin.zsh
index 9cc336959..d690a9d22 100644
--- a/plugins/repo/repo.plugin.zsh
+++ b/plugins/repo/repo.plugin.zsh
@@ -1,2 +1,12 @@
 # Aliases
 alias r='repo'
+compdef _repo r=repo
+
+alias rra='repo rebase --auto-stash'
+compdef _repo rra='repo rebase --auto-stash'
+
+alias rs='repo sync'
+compdef _repo rs='repo sync'
+
+alias rsrra='repo sync ; repo rebase --auto-stash'
+compdef _repo rsrra='repo sync ; repo rebase --auto-stash'

From 45438528761b0bbc143f8f2f013ee01917eb48cc Mon Sep 17 00:00:00 2001
From: Gaetan Semet <gaetan@xeberon.net>
Date: Tue, 10 Sep 2013 11:33:58 +0200
Subject: [PATCH 109/364] Completion for python, pep8, autopep8 and pylint

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
---
 plugins/autopep8/_autopep8           | 32 +++++++++++++++++
 plugins/autopep8/autopep8.plugin.zsh |  0
 plugins/pep8/_pep8                   | 34 ++++++++++++++++++
 plugins/pylint/_pylint               | 31 ++++++++++++++++
 plugins/pylint/pylint.plugin.zsh     |  3 ++
 plugins/python/_python               | 54 ++++++++++++++++++++++++++++
 plugins/python/python.plugin.zsh     |  1 +
 7 files changed, 155 insertions(+)
 create mode 100644 plugins/autopep8/_autopep8
 create mode 100644 plugins/autopep8/autopep8.plugin.zsh
 create mode 100644 plugins/pep8/_pep8
 create mode 100644 plugins/pylint/_pylint
 create mode 100644 plugins/pylint/pylint.plugin.zsh
 create mode 100644 plugins/python/_python

diff --git a/plugins/autopep8/_autopep8 b/plugins/autopep8/_autopep8
new file mode 100644
index 000000000..c14d06d66
--- /dev/null
+++ b/plugins/autopep8/_autopep8
@@ -0,0 +1,32 @@
+#compdef autopep8
+#
+# this is zsh completion function file.
+# generated by genzshcomp(ver: 0.5.1)
+#
+
+typeset -A opt_args
+local context state line
+
+_arguments -s -S \
+  "--help[show this help message and exit]:" \
+  "-h[show this help message and exit]:" \
+  "--version[show program's version number and exit]:" \
+  "--verbose[print verbose messages; multiple -v result in more verbose messages]" \
+  "-v[print verbose messages; multiple -v result in more verbose messages]" \
+  "--diff[print the diff for the fixed source]" \
+  "-d[print the diff for the fixed source]" \
+  "--in-place[make changes to files in place]" \
+  "-i[make changes to files in place]" \
+  "--recursive[run recursively; must be used with --in-place or --diff]" \
+  "-r[run recursively; must be used with --in-place or --diff]" \
+  "--jobs[number of parallel jobs; match CPU count if value is less than 1]::n        number of parallel jobs; match CPU count if value is:_files" \
+  "-j[number of parallel jobs; match CPU count if value is less than 1]::n        number of parallel jobs; match CPU count if value is:_files" \
+  "--pep8-passes[maximum number of additional pep8 passes (default: 100)]::n:_files" \
+  "-p[maximum number of additional pep8 passes (default: 100)]::n:_files" \
+  "-a[-a result in more aggressive changes]::result:_files" \
+  "--exclude[exclude files/directories that match these comma- separated globs]::globs:_files" \
+  "--list-fixes[list codes for fixes; used by --ignore and --select]" \
+  "--ignore[do not fix these errors/warnings (default E226,E24)]::errors:_files" \
+  "--select[fix only these errors/warnings (e.g. E4,W)]::errors:_files" \
+  "--max-line-length[set maximum allowed line length (default: 79)]::n:_files" \
+  "*::args:_files"
diff --git a/plugins/autopep8/autopep8.plugin.zsh b/plugins/autopep8/autopep8.plugin.zsh
new file mode 100644
index 000000000..e69de29bb
diff --git a/plugins/pep8/_pep8 b/plugins/pep8/_pep8
new file mode 100644
index 000000000..ce19951dc
--- /dev/null
+++ b/plugins/pep8/_pep8
@@ -0,0 +1,34 @@
+#compdef pep8
+#
+# this is zsh completion function file.
+# generated by genzshcomp(ver: 0.5.1)
+#
+
+typeset -A opt_args
+local context state line
+
+_arguments -s -S \
+  "--help[show this help message and exit]:" \
+  "-h[show this help message and exit]:" \
+  "--version[show program's version number and exit]:" \
+  "--verbose[print status messages, or debug with -vv]" \
+  "-v[print status messages, or debug with -vv]" \
+  "--quiet[report only file names, or nothing with -qq]" \
+  "-q[report only file names, or nothing with -qq]" \
+  "--repeat[(obsolete) show all occurrences of the same error]" \
+  "-r[(obsolete) show all occurrences of the same error]" \
+  "--first[show first occurrence of each error]" \
+  "--exclude[exclude files or directories which match these comma separated patterns (default: .svn,CVS,.bzr,.hg,.git,__pycache__)]::patterns:_files" \
+  "--filename[when parsing directories, only check filenames matching these comma separated patterns (default: *.py)]::patterns:_files" \
+  "--select[select errors and warnings (e.g. E,W6)]::errors:_files" \
+  "--ignore[skip errors and warnings (e.g. E4,W)]::errors:_files" \
+  "--show-source[show source code for each error]" \
+  "--show-pep8[show text of PEP 8 for each error (implies --first)]" \
+  "--statistics[count errors and warnings]" \
+  "--count[print total number of errors and warnings to standard error and set exit code to 1 if total is not null]" \
+  "--max-line-length[set maximum allowed line length (default: 79)]::n:_files" \
+  "--format[set the error format \[default|pylint|<custom>\]]::format:_files" \
+  "--diff[report only lines changed according to the unified diff received on STDIN]" \
+  "--benchmark[measure processing speed   are read from the \[pep8\] section of the tox.ini fg file located in any parent folder of the path(s) llowed options are: exclude, filename, select, ngth, count, format, quiet, show-pep8, show-source, .]" \
+  "--config[user config file location (default: /home/gsemet/.config/pep8)]::path:_files" \
+  "*::args:_files"
diff --git a/plugins/pylint/_pylint b/plugins/pylint/_pylint
new file mode 100644
index 000000000..e466d051b
--- /dev/null
+++ b/plugins/pylint/_pylint
@@ -0,0 +1,31 @@
+#compdef pylint
+#
+# this is zsh completion function file.
+# generated by genzshcomp(ver: 0.5.1)
+#
+
+typeset -A opt_args
+local context state line
+
+_arguments -s -S \
+  "--help[show this help message and exit]:" \
+  "-h[show this help message and exit]:" \
+  "--version[show program's version number and exit]:" \
+  "--long-help[more verbose help.]" \
+  "--rcfile[Specify a configuration file.]::<file>:_files" \
+  "--errors-only[In error mode, checkers without error messages are disabled and for others, only the ERROR messages are displayed, and no reports are done by default]" \
+  "-E[In error mode, checkers without error messages are disabled and for others, only the ERROR messages are displayed, and no reports are done by default]" \
+  "--ignore[Add files or directories to the blacklist. They should be base names, not paths. \[current: CVS\]]::<file>[,<file>...]:_files" \
+  "--help-msg[Display a help message for the given message id and exit. The value may be a comma separated list of message ids.]::<msg-id>:_files" \
+  "--generate-rcfile[Generate a sample configuration file according to the current configuration. You can put other options before this one to get them in the generated configuration.]" \
+  "--enable[Enable the message, report, category or checker with the given id(s). You can either give multiple identifier separated by comma (,) or put this option multiple time.]::<msg ids>:_files" \
+  "-e[Enable the message, report, category or checker with the given id(s). You can either give multiple identifier separated by comma (,) or put this option multiple time.]::<msg ids>:_files" \
+  "--disable[Disable the message, report, category or checker with the given id(s). You can either give multiple identifier separated by comma (,) or put this option multiple time (only on the command line, not in the configuration file where it should appear only once).]::<msg ids>:_files" \
+  "-d[Disable the message, report, category or checker with the given id(s). You can either give multiple identifier separated by comma (,) or put this option multiple time (only on the command line, not in the configuration file where it should appear only once).]::<msg ids>:_files" \
+  "--output-format[Set the output format. Available formats are text, parseable, colorized, msvs (visual studio) and html \[current: text\]]::<format>:_files" \
+  "-f[Set the output format. Available formats are text, parseable, colorized, msvs (visual studio) and html \[current: text\]]::<format>:_files" \
+  "--include-ids[Include message's id in output \[current: no\]]::<y_or_n>:_files" \
+  "-i[Include message's id in output \[current: no\]]::<y_or_n>:_files" \
+  "--reports[Tells whether to display a full report or only the messages \[current: yes\]]::<y_or_n>:_files" \
+  "-r[Tells whether to display a full report or only the messages \[current: yes\]]::<y_or_n>:_files" \
+  "*::args:_files"
diff --git a/plugins/pylint/pylint.plugin.zsh b/plugins/pylint/pylint.plugin.zsh
new file mode 100644
index 000000000..6760c67b0
--- /dev/null
+++ b/plugins/pylint/pylint.plugin.zsh
@@ -0,0 +1,3 @@
+# Aliases
+alias pylint-quick='pylint --reports=n --include-ids=y'
+compdef _pylint-quick pylint-quick='pylint --reports=n --include-ids=y'
\ No newline at end of file
diff --git a/plugins/python/_python b/plugins/python/_python
new file mode 100644
index 000000000..f517d4806
--- /dev/null
+++ b/plugins/python/_python
@@ -0,0 +1,54 @@
+#compdef python
+
+# Python 2.6
+# Python 3.0
+
+local curcontext="$curcontext" state line expl
+typeset -A opt_args
+
+local -a args
+
+if _pick_variant python3=Python\ 3 python2 --version; then
+  args=(
+    '(-bb)-b[issue warnings about str(bytes_instance), str(bytearray_instance) and comparing bytes/bytearray with str]'
+    '(-b)-bb[issue errors about str(bytes_instance), str(bytearray_instance) and comparing bytes/bytearray with str]'
+  )
+else
+  args=(
+    '-Q+[division options]:division option:(old warn warnall new)'
+    '(-tt)-t[issue warnings about inconsistent tab usage]'
+    '(-t)-tt[issue errors about inconsistent tab usage]'
+    '-3[warn about Python 3.x incompatibilities]'
+  )
+fi
+
+_arguments -C -s -S "$args[@]" \
+  "-B[don't write .py\[co\] files on import]" \
+  '(1 -)-c+[program passed in as string (terminates option list)]:python command:' \
+  '-d[debug output from parser]' \
+  '-E[ignore PYTHON* environment variables (such as PYTHONPATH)]' \
+  '(1 * -)-h[display help information]' \
+  '-i[inspect interactively after running script]' \
+  '(1 * -)-m[run library module as a script (terminates option list)]:module:->modules' \
+  '-O[optimize generated bytecode slightly]' \
+  '-OO[remove doc-strings in addition to the -O optimizations]' \
+  "-s[don't add user site directory to sys.path]" \
+  "-S[don't imply 'import site' on initialization]" \
+  '-u[unbuffered binary stdout and stderr]' \
+  '-v[verbose (trace import statements)]' \
+  '(1 * -)'{-V,--version}'[display version information]' \
+  '-W+[warning control]:warning filter (action\:message\:category\:module\:lineno):(default always ignore module once error)' \
+  '-x[skip first line of source, allowing use of non-Unix forms of #!cmd]' \
+  '(-)1:script file:_files -g "*.py(|c|o)(-.)"' \
+  '*::script argument: _normal' && return
+
+if [[ "$state" = modules ]]; then
+  local -a modules
+  modules=(
+    ${${=${(f)"$(_call_program modules $words[1] -c \
+      'from\ pydoc\ import\ help\;\ help\(\"modules\"\)')"}[2,-3]}:#\(package\)}
+  )
+  _wanted modules expl module compadd -a modules && return
+fi
+
+return 1
diff --git a/plugins/python/python.plugin.zsh b/plugins/python/python.plugin.zsh
index 852c8b919..319bf0bf0 100644
--- a/plugins/python/python.plugin.zsh
+++ b/plugins/python/python.plugin.zsh
@@ -10,3 +10,4 @@ function pyclean() {
 
 # Grep among .py files
 alias pygrep='grep --include="*.py"'
+

From 40b1cf01035a3d74395b5d9def4f79af17fca4c8 Mon Sep 17 00:00:00 2001
From: Alexandre Joly <alexandre.joly@futurecom.ch>
Date: Tue, 10 Sep 2013 15:20:57 +0200
Subject: [PATCH 110/364] repo list search one level deeper

the folder structure changed '.cocoapods/' -> '.cocoapods/repos'
---
 plugins/pod/_pod | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/pod/_pod b/plugins/pod/_pod
index 745e9b15d..ba0c9ab30 100644
--- a/plugins/pod/_pod
+++ b/plugins/pod/_pod
@@ -159,7 +159,7 @@ __first_command_list ()
 }
 
 __repo_list() {
-    _wanted application expl 'repo' compadd $(command ls -1 ~/.cocoapods 2>/dev/null | sed -e 's/ /\\ /g')
+    _wanted application expl 'repo' compadd $(command ls -1 ~/.cocoapods/repos 2>/dev/null | sed -e 's/ /\\ /g')
 }
 
 __pod-repo() {

From dfe36d7b7b6d70e5179f57afadfd923a36b3ff5a Mon Sep 17 00:00:00 2001
From: Nathan Cox <akujin@akujin.com>
Date: Wed, 18 Sep 2013 08:09:15 -0700
Subject: [PATCH 111/364] Added virtualenv plugin data to af-magic theme.

---
 themes/af-magic.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/af-magic.zsh-theme b/themes/af-magic.zsh-theme
index c1b00c62b..4cf282590 100644
--- a/themes/af-magic.zsh-theme
+++ b/themes/af-magic.zsh-theme
@@ -27,7 +27,7 @@ eval my_gray='$FG[237]'
 eval my_orange='$FG[214]'
 
 # right prompt
-RPROMPT='$my_gray%n@%m%{$reset_color%}%'
+PROMPT='$(virtualenv_prompt_info)$my_gray%n@%m%{$reset_color%}%'
 
 # git settings
 ZSH_THEME_GIT_PROMPT_PREFIX="$FG[075](branch:"

From 05b3ea342ad581d02ed652a4bbe29786026a5b50 Mon Sep 17 00:00:00 2001
From: Steven Schmid <stevschmid@gmail.com>
Date: Tue, 1 Oct 2013 18:08:15 +0200
Subject: [PATCH 112/364] Fix work_in_progress in empty git repos

I noticed that the function ``work_in_progress``, which is used in the "gallois"-theme, would print ``fatal: bad default revision 'HEAD'`` in a new folder after ``git init``.

This is the fix.
---
 plugins/git/git.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index d8ea3ae0c..14172b881 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -138,7 +138,7 @@ compdef _git glp=git-log
 #
 # This function return a warning if the current branch is a wip
 function work_in_progress() {
-  if $(git log -n 1 | grep -q -c wip); then
+  if $(git log -n 1 2>/dev/null | grep -q -c wip); then
     echo "WIP!!"
   fi
 }

From 190fcdffa7bc413dc7a9ebef4a6eaed37beb6896 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20M=C4=83gheru=C8=99an-Stanciu?=
 <cristi.magherusan@gmail.com>
Date: Wed, 9 Oct 2013 16:42:28 +0200
Subject: [PATCH 113/364] Added a completion plugin for the new aws-cli tool

It also supports quickly switching AWS profiles defined in
~/.aws/config using the asp alias
---
 plugins/aws/aws.plugin.zsh | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 plugins/aws/aws.plugin.zsh

diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
new file mode 100644
index 000000000..3f7fb1995
--- /dev/null
+++ b/plugins/aws/aws.plugin.zsh
@@ -0,0 +1,17 @@
+export AWS_HOME=~/.aws
+
+function agp {
+  echo $AWS_DEFAULT_PROFILE
+  
+}
+function asp {
+  export AWS_DEFAULT_PROFILE=$1
+    export RPROMPT="<aws:$AWS_DEFAULT_PROFILE>"
+    
+}
+function aws_profiles {
+  reply=($(grep profile $AWS_HOME/config|sed -e 's/.*profile \([a-zA-Z0-9_-]*\).*/\1/'))
+}
+
+compctl -K aws_profiles asp
+source `which aws_zsh_completer.sh`

From 1dddec6f0f947ed80eed128033e4ebc4d4448138 Mon Sep 17 00:00:00 2001
From: Puneet Goyal <pungoyal@gmail.com>
Date: Sat, 12 Oct 2013 07:30:16 +0530
Subject: [PATCH 114/364] removing a github redirect during install

---
 README.textile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.textile b/README.textile
index 86dd5da22..810569486 100644
--- a/README.textile
+++ b/README.textile
@@ -14,11 +14,11 @@ You can install this via the command line with either `curl` or `wget`.
 
 h4. via `curl`
 
-@curl -L https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh | sh@
+@curl -L https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh | sh@
 
 h4. via `wget`
 
-@wget --no-check-certificate https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh -O - | sh@
+@wget --no-check-certificate https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O - | sh@
 
 h3. The manual way
 

From 3ca3c5a126a937dc6d6d3daba241f9a0f5a4c2f2 Mon Sep 17 00:00:00 2001
From: Wes Morgan <cap10morgan@gmail.com>
Date: Mon, 14 Oct 2013 09:59:20 -0600
Subject: [PATCH 115/364] don't clobber existing RBENV_ROOT & follow Homebrew's
 default behavior

---
 plugins/rbenv/rbenv.plugin.zsh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/plugins/rbenv/rbenv.plugin.zsh b/plugins/rbenv/rbenv.plugin.zsh
index 78f76c3a3..57ae2ca1f 100644
--- a/plugins/rbenv/rbenv.plugin.zsh
+++ b/plugins/rbenv/rbenv.plugin.zsh
@@ -10,12 +10,18 @@ FOUND_RBENV=0
 rbenvdirs=("$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv")
 if _homebrew-installed && _rbenv-from-homebrew-installed ; then
     rbenvdirs=($(brew --prefix rbenv) "${rbenvdirs[@]}")
+    if [[ $RBENV_ROOT = '' ]]; then 
+      RBENV_ROOT="$HOME/.rbenv"
+    fi
 fi
 
 for rbenvdir in "${rbenvdirs[@]}" ; do
   if [ -d $rbenvdir/bin -a $FOUND_RBENV -eq 0 ] ; then
     FOUND_RBENV=1
-    export RBENV_ROOT=$rbenvdir
+    if [[ $RBENV_ROOT = '' ]]; then
+      RBENV_ROOT=$rbenvdir
+    fi
+    export RBENV_ROOT
     export PATH=${rbenvdir}/bin:$PATH
     eval "$(rbenv init --no-rehash - zsh)"
 

From c0c9fc02543eb14de49b0416e3df1100845633d8 Mon Sep 17 00:00:00 2001
From: Lei Zhang <zhang.lei.fly@gmail.com>
Date: Wed, 16 Oct 2013 15:44:49 +0800
Subject: [PATCH 116/364] Add support .venv folder as virtual env

---
 plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
index 670c287bd..16f32da6e 100644
--- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
@@ -17,6 +17,8 @@ if (( $+commands[$virtualenvwrapper] )); then
             # Check for virtualenv name override
             if [[ -f "$PROJECT_ROOT/.venv" ]]; then
                 ENV_NAME=`cat "$PROJECT_ROOT/.venv"`
+            elif [[ -f "$PROJECT_ROOT/.venv/bin/activate" ]];then 
+                ENV_NAME="$PROJECT_ROOT/.venv"
             elif [[ "$PROJECT_ROOT" != "." ]]; then
                 ENV_NAME=`basename "$PROJECT_ROOT"`
             else
@@ -27,6 +29,8 @@ if (( $+commands[$virtualenvwrapper] )); then
                 if [[ "$VIRTUAL_ENV" != "$WORKON_HOME/$ENV_NAME" ]]; then
                     if [[ -e "$WORKON_HOME/$ENV_NAME/bin/activate" ]]; then
                         workon "$ENV_NAME" && export CD_VIRTUAL_ENV="$ENV_NAME"
+                    elif [[ -e "$ENV_NAME/bin/activate" ]]; then
+                        source $ENV_NAME/bin/activate && export CD_VIRTUAL_ENV="$ENV_NAME"
                     fi
                 fi
             elif [ $CD_VIRTUAL_ENV ]; then

From f057737e57b3e3acbd32614b4f4f03103ce764aa Mon Sep 17 00:00:00 2001
From: dejan <dejan@proteansec.comi>
Date: Wed, 16 Oct 2013 12:36:48 +0200
Subject: [PATCH 117/364] Added the spectrum_bls function, which prints all 256
 colors set as the background.

We can easily see which color we want to set when changing the PS1 shell variable,
since the colors are more distinctive.
---
 lib/spectrum.zsh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/spectrum.zsh b/lib/spectrum.zsh
index 2fdf537ef..166c942fb 100644
--- a/lib/spectrum.zsh
+++ b/lib/spectrum.zsh
@@ -26,3 +26,10 @@ function spectrum_ls() {
   done
 }
 
+# Show all 256 colors where the background is set to specific color
+function spectrum_bls() {
+  for code in {000..255}; do
+    ((cc = code + 1))
+    print -P -- "$BG[$code]$code: Test %{$reset_color%}"
+  done
+}

From e3c489bd08236828286e01b4561e6b73b5e518bd Mon Sep 17 00:00:00 2001
From: Kaiwen Xu <kevin@kevxu.net>
Date: Fri, 25 Oct 2013 01:40:55 -0400
Subject: [PATCH 118/364] Minor gitignore fix.

(Sorry my bad).
---
 .gitignore | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index c2b47bba7..51a5ee6c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,9 @@
 locals.zsh
 log/.zsh_history
 projects.zsh
--custom/*
--!custom/example
--!custom/example.zsh
+custom/*
+!custom/example
+!custom/example.zsh
 *.swp
 !custom/example.zshcache
 cache/

From 03dc3a84630a1e3227bd0e772cca5d5f1fd4a9d4 Mon Sep 17 00:00:00 2001
From: Kevin Bongart <contact@kevinbongart.net>
Date: Fri, 25 Oct 2013 11:54:56 -0400
Subject: [PATCH 119/364] Add command blacklist support to bundler plugin

---
 plugins/bundler/bundler.plugin.zsh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index 5bd28cbdc..9b589c5a8 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -13,9 +13,13 @@ fi
 eval "alias bi='bundle install --jobs=$cores_num'"
 
 # The following is based on https://github.com/gma/bundler-exec
-
 bundled_commands=(annotate berks cap capify cucumber foodcritic foreman guard jekyll kitchen knife middleman nanoc rackup rainbows rake rspec ruby shotgun spec spin spork strainer tailor taps thin thor unicorn unicorn_rails puma)
 
+# Remove $UNBUNDLED_COMMANDS from the bundled_commands list
+for cmd in $UNBUNDLED_COMMANDS; do
+  bundled_commands=(${bundled_commands#$cmd});
+done
+
 ## Functions
 
 _bundler-installed() {

From 7567fd7f27f80bb6f168cd8fcf589157348b069f Mon Sep 17 00:00:00 2001
From: Kevin Bongart <contact@kevinbongart.net>
Date: Fri, 25 Oct 2013 12:01:28 -0400
Subject: [PATCH 120/364] Re-add whitespace

---
 plugins/bundler/bundler.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index 9b589c5a8..10b1e21cf 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -13,6 +13,7 @@ fi
 eval "alias bi='bundle install --jobs=$cores_num'"
 
 # The following is based on https://github.com/gma/bundler-exec
+
 bundled_commands=(annotate berks cap capify cucumber foodcritic foreman guard jekyll kitchen knife middleman nanoc rackup rainbows rake rspec ruby shotgun spec spin spork strainer tailor taps thin thor unicorn unicorn_rails puma)
 
 # Remove $UNBUNDLED_COMMANDS from the bundled_commands list

From 1e9f55f09ddae273836ad1a69a0068b039de9fcd Mon Sep 17 00:00:00 2001
From: Andrew Vit <andrew@avit.ca>
Date: Mon, 23 Apr 2012 14:03:26 -0700
Subject: [PATCH 121/364] Add configuration placeholders to installer template

Although the zshrc template adds a PATH= string, this is overwritten by the installer script.
This allows it to be placed anywhere in the file instead of having to append at the end.
---
 templates/zshrc.zsh-template | 19 ++++++++++++++++++-
 tools/install.sh             |  5 ++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 1dfb6998c..2ebfaf3e7 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -44,4 +44,21 @@ plugins=(git)
 
 source $ZSH/oh-my-zsh.sh
 
-# Customize to your needs...
+# User configuration
+
+export PATH=$HOME/bin:/usr/local/bin:$PATH
+# export MANPATH="/usr/local/man:$MANPATH"
+
+# # Preferred editor for local and remote sessions
+# if [[ -n $SSH_CONNECTION ]]; then
+#   export EDITOR='vim'
+# else
+#   export EDITOR='mvim'
+# fi
+
+# Compilation flags
+# export ARCHFLAGS="-arch x86_64"
+
+# ssh
+# export SSH_KEY_PATH="~/.ssh/dsa_id"
+
diff --git a/tools/install.sh b/tools/install.sh
index a2bd5665a..9017bd302 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -21,7 +21,9 @@ echo "\033[0;34mUsing the Oh My Zsh template file and adding it to ~/.zshrc\033[
 cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc
 
 echo "\033[0;34mCopying your current PATH and adding it to the end of ~/.zshrc for you.\033[0m"
-echo "export PATH=\$PATH:$PATH" >> ~/.zshrc
+sed -i -e "/export PATH=/ c\\
+export PATH=\"$PATH\"
+" ~/.zshrc
 
 echo "\033[0;34mTime to change your default shell to zsh!\033[0m"
 chsh -s `which zsh`
@@ -34,5 +36,6 @@ echo "\033[0;32m"'\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/  '"\033[0m
 echo "\033[0;32m"'                        /____/                       '"\033[0m"
 
 echo "\n\n \033[0;32m....is now installed.\033[0m"
+echo "\n\n \033[0;32mPlease look over the ~/.zshrc file to select plugins, themes, and options.\033[0m"
 /usr/bin/env zsh
 source ~/.zshrc

From 103fc334d6ccb04120b87596e82b5ddaca6d6d44 Mon Sep 17 00:00:00 2001
From: Adrien Dudouit-Exposito <capitaine.gloumi@gmail.com>
Date: Sat, 26 Oct 2013 11:43:59 +0200
Subject: [PATCH 122/364] Add "options" as a valide 1st argument

---
 plugins/brew/_brew | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/brew/_brew b/plugins/brew/_brew
index bf0a286c1..a25caf40c 100644
--- a/plugins/brew/_brew
+++ b/plugins/brew/_brew
@@ -26,6 +26,7 @@ _1st_arguments=(
   'list:list files in a formula or not-installed formulae'
   'log:git commit log for a formula'
   'missing:check all installed formuale for missing dependencies.'
+  'options:display install options specific to formula.'
   'outdated:list formulas for which a newer version is available'
   'prune:remove dead links'
   'reinstall:reinstall a formula'

From f731d6c16fd49e8140250a90e91d01f49d13da17 Mon Sep 17 00:00:00 2001
From: Kaiwen Xu <kevin@kevxu.net>
Date: Mon, 28 Oct 2013 11:06:10 -0400
Subject: [PATCH 123/364] themes plugin now picks a random theme if no argument
 is provided.

---
 plugins/themes/themes.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/themes/themes.plugin.zsh b/plugins/themes/themes.plugin.zsh
index 8bab257ea..7519b0253 100644
--- a/plugins/themes/themes.plugin.zsh
+++ b/plugins/themes/themes.plugin.zsh
@@ -1,6 +1,6 @@
 function theme
 {
-    if [ "$1" = "random" ]; then
+    if [ -z "$1" ] || [ "$1" = "random" ]; then
 	themes=($ZSH/themes/*zsh-theme)
 	N=${#themes[@]}
 	((N=(RANDOM%N)+1))

From 0eb86f82d6d3a6cf05b11818bb69ba4de80124da Mon Sep 17 00:00:00 2001
From: Alexandre Joly <alexandre.joly@futurecom.ch>
Date: Tue, 29 Oct 2013 10:33:37 +0100
Subject: [PATCH 124/364] updated to the latest version of cocoapods 0.27.1

---
 plugins/pod/_pod | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/plugins/pod/_pod b/plugins/pod/_pod
index ba0c9ab30..8c0f4460f 100644
--- a/plugins/pod/_pod
+++ b/plugins/pod/_pod
@@ -3,12 +3,12 @@
 
 # -----------------------------------------------------------------------------
 #          FILE:  _pod
-#   DESCRIPTION:  Cocoapods (0.24.0) autocomplete plugin for Oh-My-Zsh
+#   DESCRIPTION:  Cocoapods (0.27.1) autocomplete plugin for Oh-My-Zsh
 #                 http://cocoapods.org
 #        AUTHOR:  Alexandre Joly (alexandre.joly@mekanics.ch)
 #        GITHUB:  https://github.com/mekanics
 #       TWITTER:  @jolyAlexandre
-#       VERSION:  0.0.2
+#       VERSION:  0.0.3
 #       LICENSE:  MIT
 # -----------------------------------------------------------------------------
 
@@ -33,6 +33,7 @@ local -a _repo_arguments
 _repo_arguments=(
     'add:Add a spec repo'
     'lint:Validates all specs in a repo'
+    'remove:Remove a spec repo.'
     'update:Update a spec repo'
 )
 
@@ -194,6 +195,12 @@ __pod-repo() {
                 (add)
                     _arguments \
                         $_inherited_options
+
+                (remove)
+                    _arguments \
+                        $_inherited_options \
+                        ':feature:__repo_list'
+                ;;
             esac
         ;;
     esac

From c81e42f050b9b7152d9ebfa4a3d5a0442159b8d1 Mon Sep 17 00:00:00 2001
From: onemouth <and.liting@gmail.com>
Date: Wed, 30 Oct 2013 11:05:35 +0800
Subject: [PATCH 125/364] Update git.plugin.zsh

add command to ignore changes to file temporarily
---
 plugins/git/git.plugin.zsh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index c7e98654a..d0b51434d 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -149,3 +149,12 @@ function work_in_progress() {
 # these alias commit and uncomit wip branches
 alias gwip='git add -A; git ls-files --deleted -z | xargs -0 git rm; git commit -m "wip"'
 alias gunwip='git log -n 1 | grep -q -c wip && git reset HEAD~1'
+
+# these alias ignore changes to file
+alias gignore='git update-index --assume-unchanged'
+alias gunignore='git update-index --no-assume-unchanged'
+# list temporarily ignored files
+alias gignored='git ls-files -v | grep "^[[:lower:]]"'
+
+
+

From 78df6e96f5ad2d6df77af39f70f4906a09700849 Mon Sep 17 00:00:00 2001
From: Brandon W Maister <quodlibetor@gmail.com>
Date: Tue, 29 Oct 2013 23:02:44 -0400
Subject: [PATCH 126/364] pip: successfully cache all the packages

Switch to using curl and regular expressions to generate a local cache
file so that we don't need to hit pypi.python.org every time.
This (obviously) results in a massive speed improvement, especially if
you spawn new shells frequently.

This also makes the autocompletion work for me, it didn't before. (pip
would always time out.)

And, also, for fun: This allows you to explicitly set which pip indexes
to use. Technically the old version of the plugin should have had this
behavior automatically -- without having to do more than configure pip
-- but the install completion never worked for me so this is a net gain
in functionality.
---
 plugins/pip/_pip           |  4 ++--
 plugins/pip/pip.plugin.zsh | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 plugins/pip/pip.plugin.zsh

diff --git a/plugins/pip/_pip b/plugins/pip/_pip
index fb8765c7e..967da48ca 100644
--- a/plugins/pip/_pip
+++ b/plugins/pip/_pip
@@ -6,8 +6,8 @@
 _pip_all() {
   # we cache the list of packages (originally from the macports plugin)
   if (( ! $+piplist )); then
-      echo -n " (caching package index...)"
-      piplist=($(pip search * | cut -d ' ' -f 1 | tr '[A-Z]' '[a-z]'))
+      zsh-pip-cache-packages
+      piplist=($(cat $ZSH_PIP_CACHE_FILE))
   fi
 }
 
diff --git a/plugins/pip/pip.plugin.zsh b/plugins/pip/pip.plugin.zsh
new file mode 100644
index 000000000..78532a6d3
--- /dev/null
+++ b/plugins/pip/pip.plugin.zsh
@@ -0,0 +1,37 @@
+# Usage:
+# Just add pip to your installed plugins.
+
+# If you would like to change the cheeseshops used for autocomplete set
+# ZSH_PIP_INDEXES in your zshrc. If one of your indexes are bogus you won't get
+# any kind of error message, pip will just not autocomplete from them. Double
+# check!
+#
+# If you would like to clear your cache, go ahead and do a
+# "zsh-pip-clear-cache".
+
+ZSH_PIP_CACHE_FILE=~/.pip/zsh-cache
+ZSH_PIP_INDEXES=(https://pypi.python.org/simple/)
+
+zsh-pip-clear-cache() {
+  rm $ZSH_PIP_CACHE_FILE
+  unset piplist
+}
+
+zsh-pip-cache-packages() {
+  if [[ ! -d ${PIP_CACHE_FILE:h} ]]; then
+      mkdir -p ${PIP_CACHE_FILE:h}
+  fi
+
+  if [[ ! -f $ZSH_PIP_CACHE_FILE ]]; then
+      echo -n "(...caching package index...)"
+      tmp_cache=/tmp/zsh_tmp_cache
+      for index in $ZSH_PIP_INDEXES ; do
+          # well... I've already got two problems
+          curl $index 2>/dev/null | \
+              sed -nr '/^<a href/ s/.*>([^<]+).*/\1/p' \
+               >> $tmp_cache
+      done
+      sort $tmp_cache | uniq | tr '\n' ' ' > $ZSH_PIP_CACHE_FILE
+      rm $tmp_cache
+  fi
+}

From 008e57aa5aec0f38445785da58a11462ef9451f9 Mon Sep 17 00:00:00 2001
From: Brandon W Maister <quodlibetor@gmail.com>
Date: Wed, 30 Oct 2013 21:00:08 -0400
Subject: [PATCH 127/364] Make the pip cache work with djangopypi2

Also add a test function that allows messing with the cache-creating
regex with some assurance that you're not trampling other people's
index-parsing.
---
 plugins/pip/pip.plugin.zsh | 43 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/plugins/pip/pip.plugin.zsh b/plugins/pip/pip.plugin.zsh
index 78532a6d3..71f977bbf 100644
--- a/plugins/pip/pip.plugin.zsh
+++ b/plugins/pip/pip.plugin.zsh
@@ -17,6 +17,10 @@ zsh-pip-clear-cache() {
   unset piplist
 }
 
+zsh-pip-clean-packages() {
+    sed -nr '/<a href/ s/.*>([^<]+).*/\1/p'
+}
+
 zsh-pip-cache-packages() {
   if [[ ! -d ${PIP_CACHE_FILE:h} ]]; then
       mkdir -p ${PIP_CACHE_FILE:h}
@@ -28,10 +32,47 @@ zsh-pip-cache-packages() {
       for index in $ZSH_PIP_INDEXES ; do
           # well... I've already got two problems
           curl $index 2>/dev/null | \
-              sed -nr '/^<a href/ s/.*>([^<]+).*/\1/p' \
+              zsh-pip-clean-packages \
                >> $tmp_cache
       done
       sort $tmp_cache | uniq | tr '\n' ' ' > $ZSH_PIP_CACHE_FILE
       rm $tmp_cache
   fi
 }
+
+# A test function that validates the regex against known forms of the simple
+# index. If you modify the regex to make it work for you, you should add a test
+# case in here and make sure that your changes don't break things for someone
+# else.
+zsh-pip-test-clean-packages() {
+    local expected
+    local actual
+    expected="0x10c-asm
+1009558_nester"
+
+    actual=$(echo -n "<html><head><title>Simple Index</title><meta name=\"api-version\" value=\"2\" /></head><body>
+<a href='0x10c-asm'>0x10c-asm</a><br/>
+<a href='1009558_nester'>1009558_nester</a><br/>
+</body></html>" | zsh-pip-clean-packages)
+
+    if [[ $actual != $expected ]] ; then
+        echo -e "python's simple index is broken:\n$actual\n  !=\n$expected"
+    else
+        echo "python's simple index is fine"
+    fi
+
+    actual=$(echo -n '<html>
+  <head>
+    <title>Simple Package Index</title>
+  </head>
+  <body>
+    <a href="0x10c-asm">0x10c-asm</a><br/>
+    <a href="1009558_nester">1009558_nester</a><br/>
+</body></html>' | zsh-pip-clean-packages)
+
+    if [[ $actual != $expected ]] ; then
+        echo -e "the djangopypi2 index is broken:\n$actual\n  !=\n$expected"
+    else
+        echo "the djangopypi2 index is fine"
+    fi
+}

From 37be62ffb7856cda96a187f4acf79afe2fed2514 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Thu, 31 Oct 2013 13:38:12 +0100
Subject: [PATCH 128/364] randquote plugin correcting an issue about encoding
 some people was having added a message when the user doesn't have curl added
 varibles for colors->easier to customize

---
 plugins/rand-quote/rand-quote.plugin.zsh | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/plugins/rand-quote/rand-quote.plugin.zsh b/plugins/rand-quote/rand-quote.plugin.zsh
index 5544ca565..c3bf6234e 100644
--- a/plugins/rand-quote/rand-quote.plugin.zsh
+++ b/plugins/rand-quote/rand-quote.plugin.zsh
@@ -5,13 +5,24 @@
 # Don't remove this header, thank you
 # Usage: quote
 
+WHO_COLOR="\e[0;33m"
+TEXT_COLOR="\e[0;35m"
+COLON_COLOR="\e[0;35m"
+END_COLOR="\e[m"
+
 if [[ -x `which curl` ]]; then
     function quote()
     {
-        Q=$(curl -s --connect-timeout 2 "http://www.quotationspage.com/random.php3" | grep -m 1 "dt ")
+        Q=$(curl -s --connect-timeout 2 "http://www.quotationspage.com/random.php3" | iconv -c -f ISO-8859-1 -t UTF-8 | grep -m 1 "dt ")
         TXT=$(echo "$Q" | sed -e 's/<\/dt>.*//g' -e 's/.*html//g' -e 's/^[^a-zA-Z]*//' -e 's/<\/a..*$//g')
         W=$(echo "$Q" | sed -e 's/.*\/quotes\///g' -e 's/<.*//g' -e 's/.*">//g')
-        echo "\e[0;33m${W}\e[0;30m: \e[0;35m“${TXT}”\e[m"
+        if [ "$W" -a "$TXT" ]; then
+          echo "${WHO_COLOR}${W}${COLON_COLOR}: ${TEXT_COLOR}“${TXT}”${END_COLOR}"
+        else
+          quote
+        fi
     }
     #quote
+else
+    echo "rand-quote plugin needs curl to work" >&2
 fi

From 7eb2f528a65a45b88fdda6bdeb76ceb5ea16f5e3 Mon Sep 17 00:00:00 2001
From: Wari Wahab <wahabmw@i2r.a-star.edu.sg>
Date: Mon, 4 Nov 2013 23:20:12 +0800
Subject: [PATCH 129/364] `linuxonly` doesn't work unless renamed properly

Unlike all other files listed in the themes directory, this file is the only
one that's "doing it's own thing"
---
 themes/{linuxonly => linuxonly.zsh-theme} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename themes/{linuxonly => linuxonly.zsh-theme} (100%)

diff --git a/themes/linuxonly b/themes/linuxonly.zsh-theme
similarity index 100%
rename from themes/linuxonly
rename to themes/linuxonly.zsh-theme

From 5718d2b688e1711cdc571fa0ab39871dd4e5bb48 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Mon, 4 Nov 2013 23:35:42 +0100
Subject: [PATCH 130/364] Forgot one symbol for hg.

---
 themes/agnoster.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index 7df4ec1e8..54916a95d 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -124,7 +124,7 @@ prompt_hg() {
 			else
 				prompt_segment green black
 			fi
-			echo -n " $rev@$branch" $st
+			echo -n "☿ $rev@$branch" $st
 		fi
 	fi
 }

From 8cfc7d66774e12c8502b63ed0c48f3a216c33acf Mon Sep 17 00:00:00 2001
From: James Seward <james@jamesoff.net>
Date: Mon, 4 Nov 2013 21:00:11 -0500
Subject: [PATCH 131/364] Prevent errors in prompts if no info available.
 Define empty functions instead of none at all if we can't figure out the
 platform.

---
 plugins/battery/battery.plugin.zsh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh
index 66bf46d13..9f053383a 100644
--- a/plugins/battery/battery.plugin.zsh
+++ b/plugins/battery/battery.plugin.zsh
@@ -79,4 +79,14 @@ elif [[ $(uname) == "Linux"  ]] ; then
       echo "∞"
     fi
   }
+else
+	# Empty functions so we don't cause errors in prompts
+	function battery_pct_remaining() {
+	}
+
+	function battery_time_remaining() {
+	}
+
+	function battery_pct_prompt() {
+	}
 fi

From efc37c1f715eb77be5f30411fa36589727643126 Mon Sep 17 00:00:00 2001
From: Pablo Rubianes <pablorubianes@gmail.com>
Date: Wed, 6 Nov 2013 20:10:59 -0200
Subject: [PATCH 132/364] Modification to the frisk theme to work with the BZR
 lib

---
 lib/bzr.zsh | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 lib/bzr.zsh

diff --git a/lib/bzr.zsh b/lib/bzr.zsh
new file mode 100644
index 000000000..005a16500
--- /dev/null
+++ b/lib/bzr.zsh
@@ -0,0 +1,10 @@
+## Bazaar integration
+## Just works with the GIT integration just add $(bzr_prompt_info) to the PROMPT
+function bzr_prompt_info() {
+	BZR_CB=`bzr nick 2> /dev/null | grep -v "ERROR" | cut -d ":" -f2 | awk -F / '{print "bzr::"$1}'`
+	if [ -n "$BZR_CB" ]; then
+		BZR_DIRTY=""
+		[[ -n `bzr status` ]] && BZR_DIRTY=" %{$fg[red]%} * %{$fg[green]%}"
+		echo "$ZSH_THEME_SCM_PROMPT_PREFIX$BZR_CB$BZR_DIRTY$ZSH_THEME_GIT_PROMPT_SUFFIX"
+	fi
+}
\ No newline at end of file

From 248890b6e699365dee469178ec96f5d1fad91871 Mon Sep 17 00:00:00 2001
From: Pablo Rubianes <pablorubianes@gmail.com>
Date: Wed, 6 Nov 2013 20:16:09 -0200
Subject: [PATCH 133/364] Modification to the frisk theme to work with the BZR
 lib

---
 themes/frisk.zsh-theme | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/themes/frisk.zsh-theme b/themes/frisk.zsh-theme
index 2c999a6a6..653c7461f 100644
--- a/themes/frisk.zsh-theme
+++ b/themes/frisk.zsh-theme
@@ -10,13 +10,3 @@ ZSH_THEME_GIT_PROMPT_PREFIX=$ZSH_THEME_SCM_PROMPT_PREFIX$GIT_CB
 ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}*%{$fg[green]%}"
 ZSH_THEME_GIT_PROMPT_CLEAN=""
-
-## Bazaar integration
-bzr_prompt_info() {
-	BZR_CB=`bzr nick 2> /dev/null | grep -v "ERROR" | cut -d ":" -f2 | awk -F / '{print "bzr::"$1}'`
-	if [ -n "$BZR_CB" ]; then
-		BZR_DIRTY=""
-		[[ -n `bzr status` ]] && BZR_DIRTY="%{$fg[red]%} *%{$reset_color%}"
-		echo "$ZSH_THEME_SCM_PROMPT_PREFIX$BZR_CB$BZR_DIRTY$ZSH_THEME_GIT_PROMPT_SUFFIX"
-	fi
-}

From 5c73cb671bde7a151a7a36fe782ce44dba1b0531 Mon Sep 17 00:00:00 2001
From: isquariel <tavsophi@gmail.com>
Date: Fri, 8 Nov 2013 23:26:05 +0400
Subject: [PATCH 134/364] Added nvm.zsh to detect current Node.js version

---
 lib/nvm.zsh | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 lib/nvm.zsh

diff --git a/lib/nvm.zsh b/lib/nvm.zsh
new file mode 100644
index 000000000..5cadf7061
--- /dev/null
+++ b/lib/nvm.zsh
@@ -0,0 +1,9 @@
+# get the node.js version
+function nvm_prompt_info() {
+  [ -f $HOME/.nvm/nvm.sh ] || return
+  local nvm_prompt
+  nvm_prompt=$(node -v 2>/dev/null)
+  [[ "${nvm_prompt}x" == "x" ]] && return
+  nvm_prompt=${nvm_prompt:1}
+  echo "${ZSH_THEME_NVM_PROMPT_PREFIX}${nvm_prompt}${ZSH_THEME_NVM_PROMPT_SUFFIX}"
+}

From d34ab7f3732b49fd624c80e950aae3f166800a24 Mon Sep 17 00:00:00 2001
From: isquariel <tavsophi@gmail.com>
Date: Fri, 8 Nov 2013 23:26:25 +0400
Subject: [PATCH 135/364] Added the Bureau theme

---
 themes/bureau.zsh-theme | 113 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 113 insertions(+)
 create mode 100644 themes/bureau.zsh-theme

diff --git a/themes/bureau.zsh-theme b/themes/bureau.zsh-theme
new file mode 100644
index 000000000..1d88f54d0
--- /dev/null
+++ b/themes/bureau.zsh-theme
@@ -0,0 +1,113 @@
+# oh-my-zsh Bureau Theme
+
+### NVM
+
+ZSH_THEME_NVM_PROMPT_PREFIX="%B⬡%b "
+ZSH_THEME_NVM_PROMPT_SUFFIX=""
+
+### Git [±master ▾●]
+
+ZSH_THEME_GIT_PROMPT_PREFIX="[%{$fg_bold[green]%}±%{$reset_color%}%{$fg_bold[white]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}]"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[green]%}✓%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_AHEAD="%{$fg[cyan]%}▴%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_BEHIND="%{$fg[magenta]%}▾%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_STAGED="%{$fg_bold[green]%}●%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_UNSTAGED="%{$fg_bold[yellow]%}●%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg_bold[red]%}●%{$reset_color%}"
+
+bureau_git_branch () {
+  ref=$(command git symbolic-ref HEAD 2> /dev/null) || \
+  ref=$(command git rev-parse --short HEAD 2> /dev/null) || return
+  echo "${ref#refs/heads/}"
+}
+
+bureau_git_status () {
+  _INDEX=$(command git status --porcelain -b 2> /dev/null)
+  _STATUS=""
+  if $(echo "$_INDEX" | grep '^[AMRD]. ' &> /dev/null); then
+    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_STAGED"
+  fi
+  if $(echo "$_INDEX" | grep '^.[MTD] ' &> /dev/null); then
+    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNSTAGED"
+  fi
+  if $(echo "$_INDEX" | grep -E '^\?\? ' &> /dev/null); then
+    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNTRACKED"
+  fi
+  if $(echo "$_INDEX" | grep '^UU ' &> /dev/null); then
+    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNMERGED"
+  fi
+  if $(command git rev-parse --verify refs/stash >/dev/null 2>&1); then
+    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_STASHED"
+  fi
+  if $(echo "$_INDEX" | grep '^## .*ahead' &> /dev/null); then
+    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_AHEAD"
+  fi
+  if $(echo "$_INDEX" | grep '^## .*behind' &> /dev/null); then
+    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_BEHIND"
+  fi
+  if $(echo "$_INDEX" | grep '^## .*diverged' &> /dev/null); then
+    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_DIVERGED"
+  fi
+
+  echo $_STATUS
+}
+
+bureau_git_prompt () {
+  local _branch=$(bureau_git_branch)
+  local _status=$(bureau_git_status)
+  local _result=""
+  if [[ "${_branch}x" != "x" ]]; then
+    _result="$ZSH_THEME_GIT_PROMPT_PREFIX$_branch"
+    if [[ "${_status}x" != "x" ]]; then
+      _result="$_result $_status"
+    fi
+    _result="$_result$ZSH_THEME_GIT_PROMPT_SUFFIX"
+  fi
+  echo $_result
+}
+
+
+_PATH="%{$fg_bold[white]%}%~%{$reset_color%}"
+
+if [[ "%#" == "#" ]]; then
+  _USERNAME="%{$fg_bold[red]%}%n"
+  _LIBERTY="%{$fg[red]%}#"
+else
+  _USERNAME="%{$fg_bold[white]%}%n"
+  _LIBERTY="%{$fg[green]%}$"
+fi
+_USERNAME="$_USERNAME%{$reset_color%}@%m"
+_LIBERTY="$_LIBERTY%{$reset_color%}"
+
+
+get_space () {
+  local STR=$1$2
+  local zero='%([BSUbfksu]|([FB]|){*})'
+  local LENGTH=${#${(S%%)STR//$~zero/}} 
+  local SPACES=""
+  (( LENGTH = ${COLUMNS} - $LENGTH - 1))
+  
+  for i in {0..$LENGTH}
+    do
+      SPACES="$SPACES "
+    done
+
+  echo $SPACES
+}
+
+_1LEFT="$_USERNAME $_PATH"
+_1RIGHT="[%*] "
+
+bureau_precmd () {
+  _1SPACES=`get_space $_1LEFT $_1RIGHT`
+  echo
+}
+
+setopt prompt_subst
+PROMPT='$_1LEFT$_1SPACES$_1RIGHT
+> $_LIBERTY '
+RPROMPT='$(nvm_prompt_info) $(bureau_git_prompt)'
+
+autoload -U add-zsh-hook
+add-zsh-hook precmd bureau_precmd

From 009b906111ba0c71d3b2a5c6dd7a8f68ce3f521f Mon Sep 17 00:00:00 2001
From: Leonardo Santagada <santagada@gmail.com>
Date: Sat, 9 Nov 2013 13:02:38 -0200
Subject: [PATCH 136/364] agnoster theme not showing virtualenv status

agnoster theme was checking if the default virtualenv prompt was turned off and not showing its own... so there was no way to see which virtualenv was selected.
---
 themes/agnoster.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index 2db565266..2836de4b7 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -137,7 +137,7 @@ prompt_dir() {
 # Virtualenv: current working virtualenv
 prompt_virtualenv() {
   local virtualenv_path="$VIRTUAL_ENV"
-  if [[ -n $virtualenv_path && -z $VIRTUAL_ENV_DISABLE_PROMPT ]]; then
+  if [[ -n $virtualenv_path && -n $VIRTUAL_ENV_DISABLE_PROMPT ]]; then
     prompt_segment blue black "(`basename $virtualenv_path`)"
   fi
 }

From 96798c42f046fec7f01f53d10dd63f30ed6a1e07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zsolt=20Sz=2E=20Sztup=C3=A1k?= <zsolt.sztupak@gamesys.co.uk>
Date: Mon, 11 Nov 2013 18:09:33 +0000
Subject: [PATCH 137/364] Fix issues with special characters when running mvn

Setting the locale to C will stabilize sed, so it won't stop processing
the mvn output when it encounters invalid characters (like binary data)

This makes it also more viable to add the `alias mvn='mvn-color`, as
the coloring is less obtrusive, and there won't be any issues with sed
breaking because of an invalid character inside the stream
---
 plugins/mvn/mvn.plugin.zsh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index 799f6fc8c..0c9141907 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -24,16 +24,18 @@ export RESET_FORMATTING=`tput sgr0`
 # Wrapper function for Maven's mvn command.
 mvn-color()
 {
-  # Filter mvn output using sed
-  mvn $@ | sed -e "s/\(\[INFO\]\ \-.*\)/${TEXT_BLUE}${BOLD}\1/g" \
-               -e "s/\(\[INFO\]\ \[.*\)/${RESET_FORMATTING}${BOLD}\1${RESET_FORMATTING}/g" \
+  (
+  # Filter mvn output using sed. Before filtering set the locale to C, so invalid characters won't break some sed implementations
+  unset LANG
+  LC_CTYPE=C mvn $@ | sed -e "s/\(\[INFO\]\)\(.*\)/${TEXT_BLUE}${BOLD}\1${RESET_FORMATTING}\2/g" \
                -e "s/\(\[INFO\]\ BUILD SUCCESSFUL\)/${BOLD}${TEXT_GREEN}\1${RESET_FORMATTING}/g" \
-               -e "s/\(\[WARNING\].*\)/${BOLD}${TEXT_YELLOW}\1${RESET_FORMATTING}/g" \
-               -e "s/\(\[ERROR\].*\)/${BOLD}${TEXT_RED}\1${RESET_FORMATTING}/g" \
+               -e "s/\(\[WARNING\]\)\(.*\)/${BOLD}${TEXT_YELLOW}\1${RESET_FORMATTING}\2/g" \
+               -e "s/\(\[ERROR\]\)\(.*\)/${BOLD}${TEXT_RED}\1${RESET_FORMATTING}\2/g" \
                -e "s/Tests run: \([^,]*\), Failures: \([^,]*\), Errors: \([^,]*\), Skipped: \([^,]*\)/${BOLD}${TEXT_GREEN}Tests run: \1${RESET_FORMATTING}, Failures: ${BOLD}${TEXT_RED}\2${RESET_FORMATTING}, Errors: ${BOLD}${TEXT_RED}\3${RESET_FORMATTING}, Skipped: ${BOLD}${TEXT_YELLOW}\4${RESET_FORMATTING}/g"
  
   # Make sure formatting is reset
   echo -ne ${RESET_FORMATTING}
+  )
 }
  
 # Override the mvn command with the colorized one.

From 27f9747143e421e6908e9c2d0eb6247df4a3af8c Mon Sep 17 00:00:00 2001
From: Sabarish Kumar R <skumar@crri.co.in>
Date: Tue, 12 Nov 2013 12:31:13 +0530
Subject: [PATCH 138/364] bundle plugin throwing error when bundle is not in
 path while initializing

---
 plugins/bundler/bundler.plugin.zsh | 44 ++++++++++++++++--------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index 2e657e5a8..e390f8620 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -4,18 +4,6 @@ alias bp="bundle package"
 alias bo="bundle open"
 alias bu="bundle update"
 
-bundler_version=`bundle version | cut -d' ' -f3`
-if [[ $bundler_version > '1.4.0' || $bundler_version = '1.4.0' ]]; then
-  if [[ "$(uname)" == 'Darwin' ]]
-  then
-    local cores_num="$(sysctl hw.ncpu | awk '{print $2}')"
-  else
-    local cores_num="$(nproc)"
-  fi
-  eval "alias bi='bundle install --jobs=$cores_num'"
-else
-  alias bi='bundle install' 
-fi
 
 # The following is based on https://github.com/gma/bundler-exec
 
@@ -44,14 +32,28 @@ _run-with-bundler() {
   fi
 }
 
-## Main program
-for cmd in $bundled_commands; do
-  eval "function unbundled_$cmd () { $cmd \$@ }"
-  eval "function bundled_$cmd () { _run-with-bundler $cmd \$@}"
-  alias $cmd=bundled_$cmd
+if _bundler-installed; then
+	bundler_version=`bundle version | cut -d' ' -f3`
+	if [[ $bundler_version > '1.4.0' || $bundler_version = '1.4.0' ]]; then
+		if [[ "$(uname)" == 'Darwin' ]]
+		then
+			local cores_num="$(sysctl hw.ncpu | awk '{print $2}')"
+		else
+			local cores_num="$(nproc)"
+		fi
+		eval "alias bi='bundle install --jobs=$cores_num'"
+	else
+		alias bi='bundle install' 
+	fi
 
-  if which _$cmd > /dev/null 2>&1; then
-        compdef _$cmd bundled_$cmd=$cmd
-  fi
-done
+	## Main program
+	for cmd in $bundled_commands; do
+		eval "function unbundled_$cmd () { $cmd \$@ }"
+		eval "function bundled_$cmd () { _run-with-bundler $cmd \$@}"
+		alias $cmd=bundled_$cmd
 
+		if which _$cmd > /dev/null 2>&1; then
+			compdef _$cmd bundled_$cmd=$cmd
+		fi
+	done
+fi

From bb2064e92bdb2f64dfeb148bc0b9a61dfeff8f43 Mon Sep 17 00:00:00 2001
From: Marco Chan <marco.cc.chan@gmail.com>
Date: Tue, 12 Nov 2013 15:55:16 +0800
Subject: [PATCH 139/364] Use environment specific open command when creating a
 new Jira issue.

---
 plugins/jira/jira.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh
index 9aa192c1e..739ee7142 100644
--- a/plugins/jira/jira.plugin.zsh
+++ b/plugins/jira/jira.plugin.zsh
@@ -31,7 +31,7 @@ open_jira_issue () {
 
   if [ -z "$1" ]; then
     echo "Opening new issue"
-    `open $jira_url/secure/CreateIssue!default.jspa`
+    $open_cmd "$jira_url/secure/CreateIssue!default.jspa"
   else
     echo "Opening issue #$1"
     if [[ "x$JIRA_RAPID_BOARD" = "xtrue" ]]; then

From 4e7b0fe083ecc99c1ea8c250d8b9cfcde09f2cd3 Mon Sep 17 00:00:00 2001
From: Amila Perera <perera.amila@gmail.com>
Date: Wed, 13 Nov 2013 00:35:19 +0530
Subject: [PATCH 140/364] getting the projects name correctly and making
 compdef to work with mux alias

---
 plugins/tmuxinator/_tmuxinator | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/tmuxinator/_tmuxinator b/plugins/tmuxinator/_tmuxinator
index f0ff304dd..117685279 100644
--- a/plugins/tmuxinator/_tmuxinator
+++ b/plugins/tmuxinator/_tmuxinator
@@ -1,4 +1,4 @@
-#compdef tmuxinator
+#compdef tmuxinator mux
 #autoload
 
 local curcontext="$curcontext" state line ret=1
@@ -25,7 +25,7 @@ case $state in
   args)
     case $line[1] in
       start|open|copy|delete)
-        _configs=(`tmuxinator list | sed -n 's/^[ \t]\+//p'`)
+        _configs=(`find ~/.tmuxinator/ -name \*.yml | cut -d/ -f5 | sed s:.yml::g`)
         _values 'configs' $_configs
         ret=0
         ;;
@@ -33,4 +33,4 @@ case $state in
     ;;
 esac
 
-return ret
\ No newline at end of file
+return ret

From c6dce05fabd31c018cd77197329a6d5212e56787 Mon Sep 17 00:00:00 2001
From: Carlos Cardoso <cadu@oscardoso.com.br>
Date: Tue, 12 Nov 2013 22:55:28 -0200
Subject: [PATCH 141/364] python3 clean updated.

---
 plugins/python/python.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/python/python.plugin.zsh b/plugins/python/python.plugin.zsh
index 852c8b919..a8f9760ad 100644
--- a/plugins/python/python.plugin.zsh
+++ b/plugins/python/python.plugin.zsh
@@ -6,6 +6,7 @@ alias pyfind='find . -name "*.py"'
 function pyclean() {
     ZSH_PYCLEAN_PLACES=${*:-'.'}
     find ${ZSH_PYCLEAN_PLACES} -type f -name "*.py[co]" -delete
+    find ${ZSH_PYCLEAN_PLACES} -type d -name "__pycache__" -delete
 }
 
 # Grep among .py files

From a7540844d5142d0ab3fae38b660c690859435bb5 Mon Sep 17 00:00:00 2001
From: Petter Abrahamsson <petter@jebus.nu>
Date: Thu, 14 Nov 2013 07:06:54 -0500
Subject: [PATCH 142/364] Add support for colored ls output on OpenBSD

---
 lib/theme-and-appearance.zsh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/theme-and-appearance.zsh b/lib/theme-and-appearance.zsh
index 2677615c0..0353f9db4 100644
--- a/lib/theme-and-appearance.zsh
+++ b/lib/theme-and-appearance.zsh
@@ -11,6 +11,10 @@ then
     # On NetBSD, test if "gls" (GNU ls) is installed (this one supports colors); 
     # otherwise, leave ls as is, because NetBSD's ls doesn't support -G
     gls --color -d . &>/dev/null 2>&1 && alias ls='gls --color=tty'
+  elif [[ "$(uname -s)" == "OpenBSD" ]]; then
+    # On OpenBSD, test if "colorls" is installed (this one supports colors);
+    # otherwise, leave ls as is, because OpenBSD's ls doesn't support -G
+    colorls -G -d . &>/dev/null 2>&1 && alias ls='colorls -G'
   else
     ls --color -d . &>/dev/null 2>&1 && alias ls='ls --color=tty' || alias ls='ls -G'
   fi

From ae6b26327a01211e7109c00c36650db05be75a55 Mon Sep 17 00:00:00 2001
From: Pedro Henrique Passalini <hen‍rique.passalini@gmail.com>
Date: Thu, 14 Nov 2013 14:30:21 -0200
Subject: [PATCH 143/364] add new alias to zeus

---
 plugins/zeus/zeus.plugin.zsh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/plugins/zeus/zeus.plugin.zsh b/plugins/zeus/zeus.plugin.zsh
index eddfb4f94..5ec9fa579 100644
--- a/plugins/zeus/zeus.plugin.zsh
+++ b/plugins/zeus/zeus.plugin.zsh
@@ -53,3 +53,17 @@ alias zall='zeus test test/unit/*; zeus test test/functional/; zeus cucumber'
 # Clean up crashed zeus instances.
 alias zsw='rm .zeus.sock'
 alias zweep='rm .zeus.sock'
+
+# Reset database
+alias zdbr='zeus rake db:reset db:test:prepare'
+alias zdbreset='zeus rake db:reset db:test:prepare'
+
+# Migrate and prepare database
+alias zdbm='zeus rake db:migrate db:test:prepare'
+alias zdbmigrate='zeus rake db:migrate db:test:prepare'
+
+# Create database
+alias zdbc='zeus rake db:create'
+
+# Create, migrate and prepare database
+alias zdbcm='zeus rake db:create db:migrate db:test:prepare'
\ No newline at end of file

From dcf7c7cce0c4824a728de9ed0cabdfa073829e8d Mon Sep 17 00:00:00 2001
From: Pedro Henrique Passalini <hen‍rique.passalini@gmail.com>
Date: Thu, 14 Nov 2013 14:36:20 -0200
Subject: [PATCH 144/364] add aliases to readme

---
 plugins/zeus/README.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/plugins/zeus/README.md b/plugins/zeus/README.md
index d7c2aef80..8964eaaec 100644
--- a/plugins/zeus/README.md
+++ b/plugins/zeus/README.md
@@ -41,3 +41,13 @@
 
 * `zsw` aliases `rm .zeus.sock`
 * `zweep` aliases `rm .zeus.sock`
+
+`zdbr` aliases `zeus rake db:reset db:test:prepare`
+`zdbreset` aliases `zeus rake db:reset db:test:prepare`
+
+`zdbm` aliases `zeus rake db:migrate db:test:prepare`
+`zdbmigrate` aliases `zeus rake db:migrate db:test:prepare`
+
+`zdbc` aliases `zeus rake db:create`
+
+`zdbcm` aliases `zeus rake db:create db:migrate db:test:prepare`

From 51b273a66f0b99202e79807c0651e2afd2399d1b Mon Sep 17 00:00:00 2001
From: Chris Martin <christopher.martin2@nike.com>
Date: Thu, 14 Nov 2013 16:04:38 -0800
Subject: [PATCH 145/364] basic command line xcode functionality

---
 plugins/xcode/xcode.plugin.zsh | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 plugins/xcode/xcode.plugin.zsh

diff --git a/plugins/xcode/xcode.plugin.zsh b/plugins/xcode/xcode.plugin.zsh
new file mode 100644
index 000000000..f137253f3
--- /dev/null
+++ b/plugins/xcode/xcode.plugin.zsh
@@ -0,0 +1,18 @@
+#xc function courtesy of http://gist.github.com/subdigital/5420709
+function xc {
+  xcode_proj=`find . -name "*.xc*" -d 1 | sort -r | head -1`
+  if [[ `echo -n $xcode_proj | wc -m` == 0 ]]
+  then
+    echo "No xcworkspace/xcodeproj file found in the current directory."
+  else
+    echo "Found $xcode_proj" 
+    open "$xcode_proj" 
+  fi
+}
+
+function xcsel {
+  sudo xcode-select --switch "$*"
+}
+
+alias xcb='xcodebuild'
+alias xcp='xcode-select --print-path'

From 3930a63253c08eafb5baf73508031932e0ed7437 Mon Sep 17 00:00:00 2001
From: Eddie Monge <eddie@eddiemonge.com>
Date: Thu, 14 Nov 2013 16:17:23 -0800
Subject: [PATCH 146/364] no tabs in a space-d file

---
 themes/agnoster.zsh-theme | 64 +++++++++++++++++++--------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index 762f63c5b..01cdc80e5 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -95,38 +95,38 @@ prompt_git() {
 }
 
 prompt_hg() {
-	local rev status
-	if $(hg id >/dev/null 2>&1); then
-		if $(hg prompt >/dev/null 2>&1); then
-			if [[ $(hg prompt "{status|unknown}") = "?" ]]; then
-				# if files are not added
-				prompt_segment red white
-				st='±'
-			elif [[ -n $(hg prompt "{status|modified}") ]]; then
-				# if any modification
-				prompt_segment yellow black
-				st='±'
-			else
-				# if working copy is clean
-				prompt_segment green black
-			fi
-			echo -n $(hg prompt "☿ {rev}@{branch}") $st
-		else
-			st=""
-			rev=$(hg id -n 2>/dev/null | sed 's/[^-0-9]//g')
-			branch=$(hg id -b 2>/dev/null)
-			if `hg st | grep -Eq "^\?"`; then
-				prompt_segment red black
-				st='±'
-			elif `hg st | grep -Eq "^(M|A)"`; then
-				prompt_segment yellow black
-				st='±'
-			else
-				prompt_segment green black
-			fi
-			echo -n "☿ $rev@$branch" $st
-		fi
-	fi
+  local rev status
+  if $(hg id >/dev/null 2>&1); then
+    if $(hg prompt >/dev/null 2>&1); then
+      if [[ $(hg prompt "{status|unknown}") = "?" ]]; then
+        # if files are not added
+        prompt_segment red white
+        st='±'
+      elif [[ -n $(hg prompt "{status|modified}") ]]; then
+        # if any modification
+        prompt_segment yellow black
+        st='±'
+      else
+        # if working copy is clean
+        prompt_segment green black
+      fi
+      echo -n $(hg prompt "☿ {rev}@{branch}") $st
+    else
+      st=""
+      rev=$(hg id -n 2>/dev/null | sed 's/[^-0-9]//g')
+      branch=$(hg id -b 2>/dev/null)
+      if `hg st | grep -Eq "^\?"`; then
+        prompt_segment red black
+        st='±'
+      elif `hg st | grep -Eq "^(M|A)"`; then
+        prompt_segment yellow black
+        st='±'
+      else
+        prompt_segment green black
+      fi
+      echo -n "☿ $rev@$branch" $st
+    fi
+  fi
 }
 
 # Dir: current working directory

From 1f334ba66053038bfd5236ffa8e1000c5adf1b44 Mon Sep 17 00:00:00 2001
From: Atem18 <messer.kevin@gmail.com>
Date: Fri, 15 Nov 2013 02:36:15 +0100
Subject: [PATCH 147/364] Rebranded plugin according to Zypper's official alias

---
 plugins/suse/suse.plugin.zsh | 68 ++++++++++++++++++++++++++++++++----
 1 file changed, 61 insertions(+), 7 deletions(-)

diff --git a/plugins/suse/suse.plugin.zsh b/plugins/suse/suse.plugin.zsh
index d46286948..3fdb8a032 100644
--- a/plugins/suse/suse.plugin.zsh
+++ b/plugins/suse/suse.plugin.zsh
@@ -1,7 +1,61 @@
-alias zi='sudo zypper install'
-alias zrf='sudo zypper refresh'
-alias zs='zypper search'
-alias zup='sudo zypper dist-upgrade'
-alias zrm='sudo zypper remove'
-alias zp='sudo zypper patch'
-alias zps='sudo zypper ps'
+#Alias for Zypper according to the offical Zypper's alias
+
+#Main commands
+alias z='sudo zypper' #call zypper
+alias zh='sudo zypper -h' #print help
+alias zhse='sudo zypper -h se' #print help for the search command
+alias zlicenses='sudo zypper licenses' #prints a report about licenses and EULAs of installed packages
+alias zps='sudo zypper ps' #list process using deleted files
+alias zshell='sudo zypper shell' #open a zypper shell session
+alias zsource-download='sudo zypper source-download' #download source rpms for all installed packages
+alias ztos='sudo zypper tos' #shows  the  ID string of the target operating system
+alias zvcmp='sudo zypper vcmp' #tell whether version1 is older or newer than version2
+
+#Packages commands
+alias zin='sudo zypper in' #install packages
+alias zinr='sudo zypper inr' #install newly added packages recommended by already installed ones
+alias zrm='sudo zypper rm' #remove packages
+alias zsi='sudo zypper si' #install source of a package
+alias zve='sudo zypper ve' #verify dependencies of installed packages
+
+#Updates commands
+alias zdup='sudo zypper dup' #upgrade packages
+alias zlp='sudo zypper lp' #list necessary patchs
+alias zlu='sudo zypper lu' #list updates
+alias zpchk='sudo zypper pchk' #check for patches
+alias zup='sudo zypper up' #update packages
+alias zpatch='sudo zypper patch' #install patches
+
+#Request commands
+alias zif='sudo zypper if' #display info about packages
+alias zpa='sudo zypper pa' #list packages
+alias zpatch-info='sudo zyper patch-info' #display info about patches
+alias zpattern-info='sudo zyper patch-info' #display info about patterns
+alias zproduct-info='sudo zyper patch-info' #display info about products
+alias zpch='sudo zypper pch' #list all patches
+alias zpd='sudo zypper pd' #list products
+alias zpt='sudo zypper pt' #list patterns
+alias zse='sudo zypper se' #search for packages
+alias zwp='sudo zypper wp' #list all packages providing the specified capability
+
+#Repositories commands
+alias zar='sudo zypper ar' #add a repository
+alias zcl='sudo zypper clean' #clean cache
+alias zlr='sudo zypper lr' #list repositories
+alias zmr='sudo zypper mr' #modify repositories
+alias znr='sudo zypper nr' #rename repositories (for the alias only)
+alias zref='sudo zypper ref' #refresh repositories
+alias zrr='sudo zypper rr' #remove repositories
+
+#Services commands
+alias zas='sudo zypper as' #adds a service specified by URI to the system
+alias zms='sudo zypper ms' #modify properties of specified services
+alias zrefs='sudo zypper refs' #refreshing a service mean executing the service's special task
+alias zrs='sudo zypper rs' #remove specified repository index service from the sytem
+alias zls='sudo zypper ls' #list services defined on the system
+
+#Package Locks Management commands
+alias zal='sudo zypper al' #add a package lock
+alias zcl='sudo zypper cl' #Remove unused locks
+alias zll='sudo zypper ll' #list currently active package locks
+alias zrl='sudo zypper rl' #remove specified package lock

From 6f48f586ba55507bb90fa8dd078b01c0333b907d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20F=C3=A6revaag?= <mf@bitblueprint.com>
Date: Sat, 16 Nov 2013 02:15:17 +0100
Subject: [PATCH 148/364] Added wd plugin

---
 plugins/wd2/wd2/wd.plugin.zsh |   9 ++
 plugins/wd2/wd2/wd.sh         | 201 ++++++++++++++++++++++++++++++++++
 2 files changed, 210 insertions(+)
 create mode 100755 plugins/wd2/wd2/wd.plugin.zsh
 create mode 100755 plugins/wd2/wd2/wd.sh

diff --git a/plugins/wd2/wd2/wd.plugin.zsh b/plugins/wd2/wd2/wd.plugin.zsh
new file mode 100755
index 000000000..e0846ffd9
--- /dev/null
+++ b/plugins/wd2/wd2/wd.plugin.zsh
@@ -0,0 +1,9 @@
+#!/bin/zsh
+
+# WARP
+# ====
+# oh-my-zsh plugin
+#
+# @github.com/mfaerevaag/wd
+
+alias wd='. ~/.oh-my-zsh/plugins/wd/wd.sh'
diff --git a/plugins/wd2/wd2/wd.sh b/plugins/wd2/wd2/wd.sh
new file mode 100755
index 000000000..7852028c0
--- /dev/null
+++ b/plugins/wd2/wd2/wd.sh
@@ -0,0 +1,201 @@
+#!/bin/zsh
+
+# WARP
+# ====
+# Jump to custom directories in terminal
+# because `cd` takes too long...
+#
+# @github.com/mfaerevaag/wd
+
+
+## variables
+CONFIG=$HOME/.warprc
+
+## colors
+BLUE="\033[96m"
+GREEN="\033[92m"
+YELLOW="\033[93m"
+RED="\033[91m"
+NOC="\033[m"
+
+
+## load warp points
+typeset -A points
+while read line
+do
+    arr=(${(s,:,)line})
+    key=${arr[1]}
+    val=${arr[2]}
+
+    points[$key]=$val
+done < $CONFIG
+
+
+## functions
+# prepended wd_ to not conflict with your environment (no sub shell)
+
+wd_warp()
+{
+    if [[ $1 =~ "^\.+$" ]]
+    then
+        if [[ $#1 < 2 ]]
+        then
+            wd_print_msg $YELLOW "Warping to current directory?"
+        else
+            (( n = $#1 - 1 ))
+            wd_print_msg $BLUE "Warping..."
+            cd -$n > /dev/null
+        fi
+    elif [[ ${points[$1]} != "" ]]
+    then
+        wd_print_msg $BLUE "Warping..."
+        cd ${points[$1]}
+    else
+        wd_print_msg $RED "Unkown warp point '$1'"
+    fi
+}
+
+wd_add()
+{
+    if [[ $1 =~ "^\.+$" ]]
+    then
+        wd_print_msg $RED "Illeagal warp point (see README)."
+    elif [[ ${points[$1]} == "" ]] || $2
+    then
+        wd_remove $1 > /dev/null
+        print "$1:$PWD" >> $CONFIG
+        wd_print_msg $GREEN "Warp point added"
+    else
+        wd_print_msg $YELLOW "Warp point '$1' alredy exists. Use 'add!' to overwrite."
+    fi
+}
+
+wd_remove()
+{
+    if [[ ${points[$1]} != "" ]]
+    then
+        if wd_tmp=`sed "/^$1:/d" $CONFIG`
+        then
+            echo $wd_tmp > $CONFIG
+            wd_print_msg $GREEN "Warp point removed"
+        else
+            wd_print_msg $RED "Warp point unsuccessfully removed. Sorry!"
+        fi
+    else
+        wd_print_msg $RED "Warp point was not found"
+    fi
+}
+
+wd_show()
+{
+    wd_print_msg $BLUE "Warp points to current directory:"
+    wd_list_all | grep $PWD$
+}
+
+wd_list_all()
+{
+    wd_print_msg $BLUE "All warp points:"
+    while read line
+    do
+        if [[ $line != "" ]]
+        then
+            arr=(${(s,:,)line})
+            key=${arr[1]}
+            val=${arr[2]}
+
+            print "\t" $key "\t -> \t" $val
+        fi
+    done < $CONFIG
+}
+
+wd_print_msg()
+{
+    if [[ $1 == "" || $2 == "" ]]
+    then
+        print " $RED*$NOC Could not print message. Sorry!"
+    else
+        print " $1*$NOC $2"
+    fi
+}
+
+wd_print_usage()
+{
+		print "Usage: wd [add|-a|--add] [rm|-r|--remove] [ls|-l|--list] <point>"
+    print "\nCommands:"
+    print "\t add \t Adds the current working directory to your warp points"
+    print "\t add! \t Overwrites existing warp point"
+    print "\t remove  Removes the given warp point"
+    print "\t list \t Outputs all stored warp points"
+    print "\t help \t Show this extremely helpful text"
+}
+
+
+## run
+
+# get opts
+args=`getopt -o a:r:lhs -l add:,remove:,list,help,show -- $*`
+
+if [[ $? -ne 0 || $#* -eq 0 ]]
+then
+    wd_print_usage
+else
+    # can't exit, as this would exit the excecuting shell
+    # e.i. your terminal
+
+    #set -- $args # WTF
+
+    for i
+    do
+		    case "$i"
+		        in
+			      -a|--add|add)
+                wd_add $2 false
+				        shift
+                shift
+                break
+                ;;
+            -a!|--add!|add!)
+                wd_add $2 true
+				        shift
+                shift
+                break
+                ;;
+			      -r|--remove|rm)
+				        wd_remove $2
+                shift
+				        shift
+                break
+                ;;
+			      -l|--list|ls)
+				        wd_list_all
+				        shift
+                break
+                ;;
+			      -h|--help|help)
+				        wd_print_usage
+				        shift
+                break
+                ;;
+			      -s|--show|show)
+				        wd_show
+				        shift
+                break
+                ;;
+            *)
+                wd_warp $i
+                shift
+                break
+                ;;
+			      --)
+				        shift; break;;
+		    esac
+    done
+fi
+
+
+## garbage collection
+# if not, next time warp will pick up variables from this run
+# remember, there's no sub shell
+points=""
+args=""
+unhash -d val &> /dev/null # fixes issue #1

From 81192343568b924c901e260f7b6beda887e43fff Mon Sep 17 00:00:00 2001
From: Eddie Monge <eddie@eddiemonge.com>
Date: Sat, 16 Nov 2013 11:59:15 -0800
Subject: [PATCH 149/364] standardize logic blocks

---
 oh-my-zsh.sh | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 15c1dce44..2ae07668c 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -1,6 +1,5 @@
 # Check for updates on initial load...
-if [ "$DISABLE_AUTO_UPDATE" != "true" ]
-then
+if [ "$DISABLE_AUTO_UPDATE" != "true" ]; then
   /usr/bin/env ZSH=$ZSH DISABLE_UPDATE_PROMPT=$DISABLE_UPDATE_PROMPT zsh $ZSH/tools/check_for_upgrade.sh
 fi
 
@@ -69,8 +68,7 @@ done
 unset config_file
 
 # Load the theme
-if [ "$ZSH_THEME" = "random" ]
-then
+if [ "$ZSH_THEME" = "random" ]; then
   themes=($ZSH/themes/*zsh-theme)
   N=${#themes[@]}
   ((N=(RANDOM%N)+1))
@@ -78,13 +76,10 @@ then
   source "$RANDOM_THEME"
   echo "[oh-my-zsh] Random theme '$RANDOM_THEME' loaded..."
 else
-  if [ ! "$ZSH_THEME" = ""  ]
-  then
-    if [ -f "$ZSH_CUSTOM/$ZSH_THEME.zsh-theme" ]
-    then
+  if [ ! "$ZSH_THEME" = ""  ]; then
+    if [ -f "$ZSH_CUSTOM/$ZSH_THEME.zsh-theme" ]; then
       source "$ZSH_CUSTOM/$ZSH_THEME.zsh-theme"
-    elif [ -f "$ZSH_CUSTOM/themes/$ZSH_THEME.zsh-theme" ]
-    then
+    elif [ -f "$ZSH_CUSTOM/themes/$ZSH_THEME.zsh-theme" ]; then
       source "$ZSH_CUSTOM/themes/$ZSH_THEME.zsh-theme"
     else
       source "$ZSH/themes/$ZSH_THEME.zsh-theme"

From ae1fe0029c63debfe44dcba52761389c6c876b31 Mon Sep 17 00:00:00 2001
From: Gaetan Semet <gaetan@xeberon.net>
Date: Sun, 17 Nov 2013 00:03:16 +0100
Subject: [PATCH 150/364] Add support for sublime 3

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
---
 plugins/sublime/sublime.plugin.zsh | 38 ++++++++++++++++--------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index 72f56754c..566279183 100755
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -2,30 +2,32 @@
 
 local _sublime_darwin_paths > /dev/null 2>&1
 _sublime_darwin_paths=(
-	"/usr/local/bin/subl"
-	"$HOME/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl"
-	"$HOME/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
-	"/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl"
-	"/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
+    "/usr/local/bin/subl"
+    "$HOME/Applications/Sublime Text 3.app/Contents/SharedSupport/bin/subl"
+    "$HOME/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl"
+    "$HOME/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
+    "/Applications/Sublime Text 3.app/Contents/SharedSupport/bin/subl"
+    "/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl"
+    "/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
 )
 
 if [[ $('uname') == 'Linux' ]]; then
-	if [ -f '/usr/bin/sublime_text' ]; then
-		st_run() { nohup /usr/bin/sublime_text $@ > /dev/null & }
-	else
-		st_run() { nohup /usr/bin/sublime-text $@ > /dev/null & }
-	fi
-	alias st=st_run
+    if [ -f '/usr/bin/sublime_text' ]; then
+        st_run() { nohup /usr/bin/sublime_text $@ > /dev/null & }
+    else
+        st_run() { nohup /usr/bin/sublime-text $@ > /dev/null & }
+    fi
+    alias st=st_run
 
 elif  [[ $('uname') == 'Darwin' ]]; then
 
-	for _sublime_path in $_sublime_darwin_paths; do
-		if [[ -a $_sublime_path ]]; then
-			alias subl="'$_sublime_path'"
-			alias st=subl
-			break
-		fi
-	done
+    for _sublime_path in $_sublime_darwin_paths; do
+        if [[ -a $_sublime_path ]]; then
+            alias subl="'$_sublime_path'"
+            alias st=subl
+            break
+        fi
+    done
 fi
 
 alias stt='st .'

From 037b39a8172b8a268ca5c857e5badee047b32929 Mon Sep 17 00:00:00 2001
From: Sean Escriva <sean.escriva@gmail.com>
Date: Sat, 16 Nov 2013 15:39:01 -0800
Subject: [PATCH 151/364] Add simple plugin for chruby ruby version manager

---
 plugins/chruby/chruby.plugin.zsh | 99 ++++++++++++++++++++++++++++++++
 1 file changed, 99 insertions(+)
 create mode 100644 plugins/chruby/chruby.plugin.zsh

diff --git a/plugins/chruby/chruby.plugin.zsh b/plugins/chruby/chruby.plugin.zsh
new file mode 100644
index 000000000..2a2c80cf6
--- /dev/null
+++ b/plugins/chruby/chruby.plugin.zsh
@@ -0,0 +1,99 @@
+#
+# INSTRUCTIONS
+#
+#  With either a manual or brew installed chruby things should just work.
+#
+#  If you'd prefer to specify an explicit path to load chruby from
+#  you can set variables like so:
+#
+#    zstyle :omz:plugins:chruby path /local/path/to/chruby.sh
+#    zstyle :omz:plugins:chruby auto /local/path/to/auto.sh
+# 
+# TODO
+#  - autodetermine correct source path on non OS X systems
+#  - completion if ruby-install exists
+
+# rvm and rbenv plugins also provide this alias
+alias rubies='chruby'
+
+local _chruby_path
+local _chruby_auto
+
+_homebrew-installed() {
+    whence brew &> /dev/null
+}
+
+_chruby-from-homebrew-installed() {
+    brew --prefix chruby &> /dev/null
+}
+
+_ruby-build_installed() {
+    whence ruby-build &> /dev/null
+}
+
+_ruby-install-installed() {
+    whence ruby-install &> /dev/null
+}
+
+# Simple definition completer for ruby-build
+if _ruby-build_installed; then
+    _ruby-build() { compadd $(ruby-build --definitions) }
+    compdef _ruby-build ruby-build
+fi
+
+_source_from_omz_settings() {
+    zstyle -s :omz:plugins:chruby path _chruby_path
+    zstyle -s :omz:plugins:chruby auto _chruby_auto
+
+    if _chruby_path && [[ -r _chruby_path ]]; then
+        source ${_chruby_path}
+    fi
+
+    if _chruby_auto && [[ -r _chruby_auto ]]; then
+        source ${_chruby_auto}
+    fi
+}
+
+_chruby_dirs() {
+    chrubydirs=($HOME/.rubies/ $PREFIX/opt/rubies)
+    for dir in chrubydirs; do
+        if [[ -d $dir ]]; then
+            RUBIES+=$dir
+        fi
+    done
+}
+
+if _homebrew-installed && _chruby-from-homebrew-installed ; then
+    source $(brew --prefix chruby)/share/chruby/chruby.sh
+    source $(brew --prefix chruby)/share/chruby/auto.sh
+    _chruby_dirs
+elif [[ -r "/usr/local/share/chruby/chruby.sh" ]] ; then
+    source /usr/local/share/chruby/chruby.sh
+    source /usr/local/share/chruby/auto.sh
+    _chruby_dirs
+else
+    _source_from_omz_settings
+    _chruby_dirs
+fi
+
+function ensure_chruby() {
+    $(whence chruby)
+}
+
+function current_ruby() {
+    local _ruby
+    _ruby="$(chruby |grep \* |tr -d '* ')"
+    if [[ $(chruby |grep -c \*) -eq 1 ]]; then
+        echo ${_ruby}
+    else
+        echo "system"
+    fi
+}
+
+function chruby_prompt_info() {
+    echo "$(current_ruby)"
+}
+
+# complete on installed rubies
+_chruby() { compadd $(chruby | tr -d '* ') }
+compdef _chruby chruby

From 613d116cda381b9747e22d13ed1381cec26eb8e3 Mon Sep 17 00:00:00 2001
From: Stig Sandbeck Mathisen <ssm@fnord.no>
Date: Tue, 19 Nov 2013 09:12:05 +0100
Subject: [PATCH 152/364] Add pyenv plugin

---
 plugins/pyenv/pyenv.plugin.zsh | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 plugins/pyenv/pyenv.plugin.zsh

diff --git a/plugins/pyenv/pyenv.plugin.zsh b/plugins/pyenv/pyenv.plugin.zsh
new file mode 100644
index 000000000..b3dc7aa17
--- /dev/null
+++ b/plugins/pyenv/pyenv.plugin.zsh
@@ -0,0 +1,31 @@
+_homebrew-installed() {
+    type brew &> /dev/null
+}
+
+_pyenv-from-homebrew-installed() {
+    brew --prefix pyenv &> /dev/null
+}
+
+FOUND_PYENV=0
+pyenvdirs=("$HOME/.pyenv" "/usr/local/pyenv" "/opt/pyenv")
+if _homebrew-installed && _pyenv-from-homebrew-installed ; then
+    pyenvdirs=($(brew --prefix pyenv) "${pyenvdirs[@]}")
+fi
+
+for pyenvdir in "${pyenvdirs[@]}" ; do
+    if [ -d $pyenvdir/bin -a $FOUND_PYENV -eq 0 ] ; then
+        FOUND_PYENV=1
+        export PYENV_ROOT=$pyenvdir
+        export PATH=${pyenvdir}/bin:$PATH
+        eval "$(pyenv init --no-rehash - zsh)"
+
+        function pyenv_prompt_info() {
+            echo "$(pyenv version-name)"
+        }
+    fi
+done
+unset pyenvdir
+
+if [ $FOUND_PYENV -eq 0 ] ; then
+    function pyenv_prompt_info() { echo "system: $(python -V 2>&1 | cut -f 2 -d ' ')" }
+fi

From 9b37fcba5e350d049d4bbf145672cecd37356c23 Mon Sep 17 00:00:00 2001
From: Thomas Kriechbaumer <kriechbaumer@gmail.com>
Date: Tue, 19 Nov 2013 17:05:48 +0100
Subject: [PATCH 153/364] unified and improved Rails plugin

---
 plugins/{rails3/_rails3 => rails/_rails} | 17 ++++--
 plugins/rails/rails.plugin.zsh           | 68 ++++++++++++++++++++----
 plugins/rails3/rails3.plugin.zsh         | 32 -----------
 plugins/rails4/rails4.plugin.zsh         | 32 -----------
 4 files changed, 71 insertions(+), 78 deletions(-)
 rename plugins/{rails3/_rails3 => rails/_rails} (80%)
 delete mode 100644 plugins/rails3/rails3.plugin.zsh
 delete mode 100644 plugins/rails4/rails4.plugin.zsh

diff --git a/plugins/rails3/_rails3 b/plugins/rails/_rails
similarity index 80%
rename from plugins/rails3/_rails3
rename to plugins/rails/_rails
index 97915e68b..96f57ce64 100644
--- a/plugins/rails3/_rails3
+++ b/plugins/rails/_rails
@@ -1,10 +1,6 @@
 #compdef rails
 #autoload
 
-# rails 3 zsh completion, based on homebrew completion
-# Extracted from https://github.com/robbyrussell/oh-my-zsh/blob/30620d463850c17f86e7a56fbf6a8b5e793a4e07/plugins/rails3/_rails3
-# Published by Christopher Chow
-
 local -a _1st_arguments
 _1st_arguments=(
     'generate:Generate new code (short-cut alias: "g")'
@@ -14,14 +10,20 @@ _1st_arguments=(
     'new:Create a new Rails application. "rails new my_app" creates a new application called MyApp in "./my_app"'
     'application:Generate the Rails application code'
     'destroy:Undo code generated with "generate"'
+
     'benchmarker:See how fast a piece of code runs'
     'profiler:Get profile information from a piece of code'
     'plugin:Install a plugin'
+
+    'plugin new:Generates skeleton for developing a Rails plugin'
+    'runner:Run a piece of code in the application environment (short-cut alias: "r")'
 )
 
 _rails_generate_arguments() {
     generate_arguments=(
+        assets
         controller
+        decorator
         generator
         helper
         integration_test
@@ -36,9 +38,11 @@ _rails_generate_arguments() {
         scaffold_controller
         session_migration
         stylesheets
+        task
     )
 }
 
+
 _arguments \
     '(--version)--version[show version]' \
     '(--help)--help[show help]' \
@@ -50,7 +54,10 @@ if (( CURRENT == 1 )); then
 fi
 
 case "$words[1]" in
-  generate)
+  g|generate)
+    _rails_generate_arguments
+    _wanted generate_arguments expl 'all generate' compadd -a generate_arguments ;;
+  d|destroy)
     _rails_generate_arguments
     _wanted generate_arguments expl 'all generate' compadd -a generate_arguments ;;
 esac
diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
index dd8b174b2..23d15a9a1 100644
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@@ -1,20 +1,70 @@
+function _rails_command () {
+  if [ -e "script/server" ]; then
+    ruby script/$@
+  elif [ -e "script/rails" ]; then
+    ruby script/rails $@
+  elif [ -e "bin/rails" ]; then
+    bin/rails $@
+  else
+    rails $@
+  fi
+}
+
+function _rake_command () {
+  if [ -e "bin/rake" ]; then
+    bin/rake $@
+  else
+    rake $@
+  fi
+}
+
+alias rails='_rails_command'
+compdef _rails_command=rails
+
+alias rake='_rake_command'
+compdef _rake_command=rake
+
+alias devlog='tail -f log/development.log'
+alias prodlog='tail -f log/production.log'
+alias testlog='tail -f log/test.log'
+
+alias -g RED='RAILS_ENV=development'
+alias -g REP='RAILS_ENV=production'
+alias -g RET='RAILS_ENV=test'
+
+# Rails aliases
+alias rc='rails console'
+alias rd='rails destroy'
+alias rdb='rails dbconsole'
+alias rg='rails generate'
+alias rgm='rails generate migration'
+alias rp='rails plugin'
+alias ru='rails runner'
+alias rs='rails server'
+alias rsd='rails server --debugger'
+
+# Rake aliases
+alias rdm='rake db:migrate'
+alias rdr='rake db:rollback'
+alias rdc='rake db:create'
+alias rds='rake db:seed'
+alias rdd='rake db:drop'
+alias rdtc='rake db:test:clone'
+alias rdtp='rake db:test:prepare'
+
+alias rlc='rake log:clear'
+alias rn='rake notes'
+alias rr='rake routes'
+
+# legacy stuff
 alias ss='thin --stats "/thin/stats" start'
 alias sg='ruby script/generate'
 alias sd='ruby script/destroy'
 alias sp='ruby script/plugin'
 alias sr='ruby script/runner'
 alias ssp='ruby script/spec'
-alias rdbm='rake db:migrate'
-alias rdbtp='rake db:test:prepare'
-alias migrate='rake db:migrate && rake db:test:prepare'
 alias sc='ruby script/console'
 alias sd='ruby script/server --debugger'
-alias devlog='tail -f log/development.log'
-alias testlog='tail -f log/test.log'
-alias prodlog='tail -f log/production.log'
-alias -g RET='RAILS_ENV=test'
-alias -g REP='RAILS_ENV=production'
-alias -g RED='RAILS_ENV=development'
 
 function remote_console() {
   /usr/bin/env ssh $1 "( cd $2 && ruby script/console production )"
diff --git a/plugins/rails3/rails3.plugin.zsh b/plugins/rails3/rails3.plugin.zsh
deleted file mode 100644
index b53d18d08..000000000
--- a/plugins/rails3/rails3.plugin.zsh
+++ /dev/null
@@ -1,32 +0,0 @@
-# Rails 3 aliases, backwards-compatible with Rails 2.
-
-function _rails_command () {
-  if [ -e "script/server" ]; then
-    ruby script/$@
-  else
-    if [ -e "bin/rails" ]; then
-      bin/rails $@
-    else
-      rails $@
-    fi
-  fi
-}
-
-alias rc='_rails_command console'
-alias rd='_rails_command destroy'
-alias rdb='_rails_command dbconsole'
-alias rdbm='rake db:migrate db:test:clone'
-alias rg='_rails_command generate'
-alias rgm='_rails_command generate migration'
-alias rp='_rails_command plugin'
-alias ru='_rails_command runner'
-alias rs='_rails_command server'
-alias rsd='_rails_command server --debugger'
-alias devlog='tail -f log/development.log'
-alias testlog='tail -f log/test.log'
-alias prodlog='tail -f log/production.log'
-alias rdm='rake db:migrate'
-alias rdr='rake db:rollback'
-alias -g RET='RAILS_ENV=test'
-alias -g REP='RAILS_ENV=production'
-alias -g RED='RAILS_ENV=development'
diff --git a/plugins/rails4/rails4.plugin.zsh b/plugins/rails4/rails4.plugin.zsh
deleted file mode 100644
index cb6cf816d..000000000
--- a/plugins/rails4/rails4.plugin.zsh
+++ /dev/null
@@ -1,32 +0,0 @@
-# Rails 4 aliases
-
-function _rails_command () {
-  if [ -e "script/server" ]; then
-    ruby script/$@
-  elif [ -e "script/rails" ]; then
-    ruby script/rails $@
-  else
-    ruby bin/rails $@  
-  fi
-}
-
-alias rc='_rails_command console'
-alias rd='_rails_command destroy'
-alias rdb='_rails_command dbconsole'
-alias rdbm='rake db:migrate db:test:clone'
-alias rg='_rails_command generate'
-alias rgm='_rails_command generate migration'
-alias rp='_rails_command plugin'
-alias ru='_rails_command runner'
-alias rs='_rails_command server'
-alias rsd='_rails_command server --debugger'
-alias devlog='tail -f log/development.log'
-alias testlog='tail -f log/test.log'
-alias prodlog='tail -f log/production.log'
-alias rdm='rake db:migrate'
-alias rdc='rake db:create'
-alias rdr='rake db:rollback'
-alias rds='rake db:seed'
-alias rlc='rake log:clear'
-alias rn='rake notes'
-alias rr='rake routes'

From fbd479b68e2c58068666f738a009ef7a1ca8abde Mon Sep 17 00:00:00 2001
From: Michael Orr <michael.orr@coxinc.com>
Date: Wed, 20 Nov 2013 12:30:55 -0500
Subject: [PATCH 154/364] adding a check for git config option to disable
 git_prompt_info() on a per repo basis

---
 lib/git.zsh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index df0fcedbb..305a77aff 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -1,8 +1,10 @@
 # get the name of the branch we are on
 function git_prompt_info() {
-  ref=$(command git symbolic-ref HEAD 2> /dev/null) || \
-  ref=$(command git rev-parse --short HEAD 2> /dev/null) || return
-  echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"
+  if [[ "$(git config --get oh-my-zsh.hide-status)" != "1" ]]; then
+    ref=$(command git symbolic-ref HEAD 2> /dev/null) || \
+    ref=$(command git rev-parse --short HEAD 2> /dev/null) || return
+    echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"
+  fi
 }
 
 

From 4d3fb286d84846b2c64368c38dd8b728da466eac Mon Sep 17 00:00:00 2001
From: aph <a.hewson@gmail.com>
Date: Thu, 21 Nov 2013 16:58:57 +0000
Subject: [PATCH 155/364] fix pip plugin

---
 plugins/pip/pip.plugin.zsh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/pip/pip.plugin.zsh b/plugins/pip/pip.plugin.zsh
index 71f977bbf..b5433ae9d 100644
--- a/plugins/pip/pip.plugin.zsh
+++ b/plugins/pip/pip.plugin.zsh
@@ -18,12 +18,12 @@ zsh-pip-clear-cache() {
 }
 
 zsh-pip-clean-packages() {
-    sed -nr '/<a href/ s/.*>([^<]+).*/\1/p'
+    sed -n '/<a href/ s/.*>\([^<]\{1,\}\).*/\1/p'
 }
 
 zsh-pip-cache-packages() {
-  if [[ ! -d ${PIP_CACHE_FILE:h} ]]; then
-      mkdir -p ${PIP_CACHE_FILE:h}
+  if [[ ! -d ${ZSH_PIP_CACHE_FILE:h} ]]; then
+      mkdir -p ${ZSH_PIP_CACHE_FILE:h}
   fi
 
   if [[ ! -f $ZSH_PIP_CACHE_FILE ]]; then

From 7c56364dc4a432a0ef2972ea1a6043e6154499df Mon Sep 17 00:00:00 2001
From: Valentin Shevko <tuikiken@gmail.com>
Date: Fri, 22 Nov 2013 02:34:33 +0300
Subject: [PATCH 156/364] Add update statistics

After the upgrade is interesting to know what's new.
---
 tools/upgrade.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index e04fc672f..9a8497d96 100644
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -1,6 +1,6 @@
 printf '\033[0;34m%s\033[0m\n' "Upgrading Oh My Zsh"
 cd "$ZSH"
-if git pull --rebase origin master
+if git pull --rebase --stat origin master
 then
   printf '\033[0;32m%s\033[0m\n' '         __                                     __   '
   printf '\033[0;32m%s\033[0m\n' '  ____  / /_     ____ ___  __  __   ____  _____/ /_  '

From b5b3519ac7c163b62bfc01a42a87a7a745d9df6d Mon Sep 17 00:00:00 2001
From: Thibaud Guillaume-Gentil <thibaud@thibaud.me>
Date: Fri, 22 Nov 2013 09:48:51 +0100
Subject: [PATCH 157/364] Update _heroku config arguments (Heroku Client v3)

---
 plugins/heroku/_heroku | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/heroku/_heroku b/plugins/heroku/_heroku
index a95c38647..46663303a 100644
--- a/plugins/heroku/_heroku
+++ b/plugins/heroku/_heroku
@@ -23,8 +23,10 @@ _1st_arguments=(
   "auth\:login":"log in with your heroku credentials"
   "auth\:logout":"clear local authentication credentials"
   "config":"display the config vars for an app"
-  "config\:add":"add one or more config vars"
-  "config\:remove":"remove a config var"
+  "config\:pull":"pull heroku config vars down to the local environment"
+  "config\:push":"push local config vars to heroku"
+  "config\:set":"set one or more config vars"
+  "config\:unset":"unset one or more config vars"
   "db\:push":"push local data up to your app"
   "db\:pull":"pull heroku data down into your local database"
   "domains":"list custom domains for an app"

From d12113a9e89fed866db625f7e110fb62333b2746 Mon Sep 17 00:00:00 2001
From: Johann Visagie <johann@visagie.za.net>
Date: Fri, 22 Nov 2013 14:59:04 +0100
Subject: [PATCH 158/364] Use precmd hook for updating OS X proxy icon

Using the chpwd hook function causes some junk to be printed to STDOUT after
returning from a subshell wherein the working directory was changed. In rare
cases, this can cause issues with 3rd party tools. An example is this issue
with the Python virtualenvwrapper tool:

https://bitbucket.org/dhellmann/virtualenvwrapper/issue/216/lsvirtualenv-and-workon-output-broken-in
---
 plugins/terminalapp/terminalapp.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/terminalapp/terminalapp.plugin.zsh b/plugins/terminalapp/terminalapp.plugin.zsh
index 2249b1e2f..6e47ee188 100644
--- a/plugins/terminalapp/terminalapp.plugin.zsh
+++ b/plugins/terminalapp/terminalapp.plugin.zsh
@@ -32,7 +32,7 @@ if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]] && [[ -z "$INSIDE_EMACS" ]]; then
     # Register the function so it is called whenever the working
     # directory changes.
     autoload add-zsh-hook
-    add-zsh-hook chpwd update_terminal_cwd
+    add-zsh-hook precmd update_terminal_cwd
 
     # Tell the terminal about the initial directory.
     update_terminal_cwd

From ec779d5f737f0f70a7353bb0e78dc2d38606c8d9 Mon Sep 17 00:00:00 2001
From: christianschmidt <cs@chrische.net>
Date: Sat, 23 Nov 2013 15:32:22 +0100
Subject: [PATCH 159/364] Update _pass to follow symlinks for completion

Based on: http://comments.gmane.org/gmane.comp.encryption.pass/235
---
 plugins/pass/_pass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/pass/_pass b/plugins/pass/_pass
index f6c1a6c4b..d8ec38828 100644
--- a/plugins/pass/_pass
+++ b/plugins/pass/_pass
@@ -101,7 +101,7 @@ _pass_cmd_show () {
 _pass_complete_entries_helper () {
 	local IFS=$'\n'
 	local prefix="${PASSWORD_STORE_DIR:-$HOME/.password-store}"
-	_values -C 'passwords' $(find "$prefix" \( -name .git -o -name .gpg-id \) -prune -o $@ -print | sed -e "s#${prefix}.##" -e 's#\.gpg##' | sort)
+	_values -C 'passwords' $(find -L "$prefix" \( -name .git -o -name .gpg-id \) -prune -o $@ -print | sed -e "s#${prefix}.##" -e 's#\.gpg##' | sort)
 }
 
 _pass_complete_entries_with_subdirs () {

From 240b25daaaee81ccdb9e6e2016667a60f5241f83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20F=C3=A6revaag?= <mf@bitblueprint.com>
Date: Tue, 26 Nov 2013 00:45:24 +0100
Subject: [PATCH 160/364] wd.plugin: Fixed nested dirs

---
 plugins/{wd2/wd2 => wd}/wd.plugin.zsh |  2 +-
 plugins/{wd2/wd2 => wd}/wd.sh         | 23 +++++++++++++++++++----
 2 files changed, 20 insertions(+), 5 deletions(-)
 rename plugins/{wd2/wd2 => wd}/wd.plugin.zsh (63%)
 rename plugins/{wd2/wd2 => wd}/wd.sh (88%)

diff --git a/plugins/wd2/wd2/wd.plugin.zsh b/plugins/wd/wd.plugin.zsh
similarity index 63%
rename from plugins/wd2/wd2/wd.plugin.zsh
rename to plugins/wd/wd.plugin.zsh
index e0846ffd9..bbec4a715 100755
--- a/plugins/wd2/wd2/wd.plugin.zsh
+++ b/plugins/wd/wd.plugin.zsh
@@ -6,4 +6,4 @@
 #
 # @github.com/mfaerevaag/wd
 
-alias wd='. ~/.oh-my-zsh/plugins/wd/wd.sh'
+alias wd='. $ZSH/plugins/wd/wd.sh'
diff --git a/plugins/wd2/wd2/wd.sh b/plugins/wd/wd.sh
similarity index 88%
rename from plugins/wd2/wd2/wd.sh
rename to plugins/wd/wd.sh
index 7852028c0..744f58bc2 100755
--- a/plugins/wd2/wd2/wd.sh
+++ b/plugins/wd/wd.sh
@@ -19,6 +19,13 @@ RED="\033[91m"
 NOC="\033[m"
 
 
+# check if config file exists
+if [[ ! -a $CONFIG ]]
+then
+  # if not: create config file
+  touch $CONFIG
+fi
+
 ## load warp points
 typeset -A points
 while read line
@@ -120,11 +127,12 @@ wd_print_msg()
 
 wd_print_usage()
 {
-		print "Usage: wd [add|-a|--add] [rm|-r|--remove] [ls|-l|--list] <point>"
+    print "Usage: wd [add|-a|--add] [rm|-r|--remove] [ls|-l|--list] <point>"
     print "\nCommands:"
     print "\t add \t Adds the current working directory to your warp points"
     print "\t add! \t Overwrites existing warp point"
     print "\t remove  Removes the given warp point"
+    print "\t show \t Outputs warp points to current directory"
     print "\t list \t Outputs all stored warp points"
     print "\t help \t Show this extremely helpful text"
 }
@@ -135,13 +143,20 @@ wd_print_usage()
 # get opts
 args=`getopt -o a:r:lhs -l add:,remove:,list,help,show -- $*`
 
+# check if no arguments were given
 if [[ $? -ne 0 || $#* -eq 0 ]]
 then
     wd_print_usage
-else
-    # can't exit, as this would exit the excecuting shell
-    # e.i. your terminal
 
+# check if config file is writeable
+elif [[ ! -w $CONFIG ]]
+then
+    wd_print_msg $RED "\'$CONFIG\' is not writeable."
+    # do nothing => exit
+    # can't run `exit`, as this would exit the executing shell
+    # i.e. your terminal
+
+else
     #set -- $args # WTF
 
     for i

From b4ffe5cf0a9e0a076fc1c52f6a46eefe05ad5627 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20F=C3=A6revaag?= <mf@bitblueprint.com>
Date: Tue, 26 Nov 2013 00:46:13 +0100
Subject: [PATCH 161/364] wd.plugin: Added checks, readme and completion

---
 plugins/wd/README.md | 38 +++++++++++++++++++++++++++++++++++
 plugins/wd/_wd.sh    | 48 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 86 insertions(+)
 create mode 100644 plugins/wd/README.md
 create mode 100644 plugins/wd/_wd.sh

diff --git a/plugins/wd/README.md b/plugins/wd/README.md
new file mode 100644
index 000000000..f9f4e7ac1
--- /dev/null
+++ b/plugins/wd/README.md
@@ -0,0 +1,38 @@
+## wd
+
+**Maintainer:** [mfaerevaag](https://github.com/mfaerevaag)
+
+`wd` (warp directory) lets you jump to custom directories in zsh, without using cd. Why? Because cd seems ineffecient when the folder is frequently visited or has a long path. [Source](https://github.com/mfaerevaag/wd)
+
+### Usage
+
+ * Add warp point to current working directory:
+
+        wd add test
+
+    If a warp point with the same name exists, use `add!` to overwrite it.
+
+ * From an other directory, warp to test with:
+
+        wd test
+
+ * You can warp back to previous directory, and so on, with the puncticulation syntax:
+
+        wd ..
+        wd ...
+
+    This is a wrapper for the zsh `dirs` function.
+
+ * Remove warp point test point:
+
+        wd rm test
+
+ * List warp points to current directory (stored in `~/.warprc`):
+
+        wd show
+
+ * List all warp points (stored in `~/.warprc`):
+
+        wd ls
+
+ * Print usage with no opts or the `help` argument.
diff --git a/plugins/wd/_wd.sh b/plugins/wd/_wd.sh
new file mode 100644
index 000000000..950564435
--- /dev/null
+++ b/plugins/wd/_wd.sh
@@ -0,0 +1,48 @@
+#compdef wd.sh
+
+zstyle ":completion:*:descriptions" format "%B%d%b"
+
+CONFIG=$HOME/.warprc
+
+local -a main_commands
+main_commands=(
+    add:'Adds the current working directory to your warp points'
+    #add'\!':'Overwrites existing warp point' # TODO: Fix
+    rm:'Removes the given warp point'
+    ls:'Outputs all stored warp points'
+    show:'Outputs warp points to current directory'
+)
+
+local -a points
+while read line
+do
+    points+=$(awk "{ gsub(/\/Users\/$USER|\/home\/$USER/,\"~\"); print }" <<< $line)
+done < $CONFIG
+
+_wd()
+{
+    # init variables
+    local curcontext="$curcontext" state line
+    typeset -A opt_args
+
+    # init state
+    _arguments \
+        '1: :->command' \
+        '2: :->argument'
+
+    case $state in
+        command)
+            compadd "$@" add rm ls show
+            _describe -t warp-points 'Warp points:' points && ret=0
+            ;;
+        argument)
+            case $words[2] in
+                rm|add!)
+                    _describe -t warp-points 'warp points' points && ret=0
+                    ;;
+                *)
+            esac
+    esac
+}
+
+_wd "$@"

From 3d851daf456f4ba418fb00eccb20ea2f4f7dd4b5 Mon Sep 17 00:00:00 2001
From: Dhruva Sagar <dhruva.sagar@gmail.com>
Date: Fri, 29 Nov 2013 12:28:52 +0530
Subject: [PATCH 162/364] Added Amuse zsh theme

---
 themes/amuse.zsh-theme | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 themes/amuse.zsh-theme

diff --git a/themes/amuse.zsh-theme b/themes/amuse.zsh-theme
new file mode 100644
index 000000000..548f6d39d
--- /dev/null
+++ b/themes/amuse.zsh-theme
@@ -0,0 +1,21 @@
+# vim:ft=zsh ts=2 sw=2 sts=2
+
+rvm_current() {
+  rvm current 2>/dev/null
+}
+
+rbenv_version() {
+  rbenv version 2>/dev/null | awk '{print $1}'
+}
+
+PROMPT='
+%{$fg_bold[green]%}${PWD/#$HOME/~}%{$reset_color%}$(git_prompt_info) ⌚ %{$fg_bold[red]%}%*%{$reset_color%}
+$ '
+
+ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[magenta]%}⭠ "
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}!"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[green]%}?"
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+RPROMPT='%{$fg_bold[red]%}$(rbenv_version)%{$reset_color%}'

From 699c82eb89094e3c2ca81dfd96b44d155bca6fba Mon Sep 17 00:00:00 2001
From: ych <ych@cs.nctu.edu.tw>
Date: Fri, 29 Nov 2013 18:34:12 +0800
Subject: [PATCH 163/364] Add FreeBSD support for autojump plugin

---
 plugins/autojump/autojump.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh
index f856f2f01..0aa14959d 100644
--- a/plugins/autojump/autojump.plugin.zsh
+++ b/plugins/autojump/autojump.plugin.zsh
@@ -5,6 +5,8 @@ if [ $commands[autojump] ]; then # check if autojump is installed
     . /etc/profile.d/autojump.zsh
   elif [ -f /etc/profile.d/autojump.sh ]; then # gentoo installation
     . /etc/profile.d/autojump.sh
+  elif [ -f /usr/local/share/autojump/autojump.zsh ]; then # freebsd installation
+    . /usr/local/share/autojump/autojump.zsh
   elif [ -f $HOME/.autojump/etc/profile.d/autojump.zsh ]; then # manual user-local installation
     . $HOME/.autojump/etc/profile.d/autojump.zsh
   elif [ -f /opt/local/etc/profile.d/autojump.zsh ]; then # mac os x with ports

From c9f2c947e4bdc94676aeaf989ba16dbe35aa45ee Mon Sep 17 00:00:00 2001
From: Stefan Tatschner <stefan@sevenbyte.org>
Date: Fri, 29 Nov 2013 14:24:14 +0100
Subject: [PATCH 164/364] Added/modified some useful aliases.

---
 lib/aliases.zsh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/aliases.zsh b/lib/aliases.zsh
index 9b3709172..517e4daf7 100644
--- a/lib/aliases.zsh
+++ b/lib/aliases.zsh
@@ -6,6 +6,11 @@ alias po='popd'
 alias ...='cd ../..'
 alias -- -='cd -'
 
+# Prevent headaches
+alias cp='cp -v'
+alias rm='rm -v'
+alias mv='mv -v'
+
 # Super user
 alias _='sudo'
 alias please='sudo'
@@ -17,9 +22,9 @@ alias history='fc -l 1'
 
 # List direcory contents
 alias lsa='ls -lah'
-alias l='ls -la'
-alias ll='ls -l'
-alias la='ls -lA'
+alias l='ls -lah'
+alias ll='ls -lh'
+alias la='ls -lAh'
 alias sl=ls # often screw this up
 
 alias afind='ack-grep -il'

From 1493d88e3f92c7034da5c1b1638ba19544aa3ccb Mon Sep 17 00:00:00 2001
From: Thomas Kriechbaumer <kriechbaumer@gmail.com>
Date: Sun, 1 Dec 2013 15:31:48 +0100
Subject: [PATCH 165/364] Added migration notification for rails plugin

---
 plugins/rails3/rails3.plugin.zsh | 4 ++++
 plugins/rails4/rails4.plugin.zsh | 4 ++++
 2 files changed, 8 insertions(+)
 create mode 100644 plugins/rails3/rails3.plugin.zsh
 create mode 100644 plugins/rails4/rails4.plugin.zsh

diff --git a/plugins/rails3/rails3.plugin.zsh b/plugins/rails3/rails3.plugin.zsh
new file mode 100644
index 000000000..261b92108
--- /dev/null
+++ b/plugins/rails3/rails3.plugin.zsh
@@ -0,0 +1,4 @@
+echo "It looks like you have been using the 'rails3' plugin,"
+echo "which has been deprecated in favor of a newly consolidated 'rails' plugin."
+echo "You will want to modify your ~/.zshrc configuration to begin using it."
+echo "Learn more at https://github.com/robbyrussell/oh-my-zsh/pull/2240"
diff --git a/plugins/rails4/rails4.plugin.zsh b/plugins/rails4/rails4.plugin.zsh
new file mode 100644
index 000000000..5452c242c
--- /dev/null
+++ b/plugins/rails4/rails4.plugin.zsh
@@ -0,0 +1,4 @@
+echo "It looks like you have been using the 'rails4' plugin,"
+echo "which has been deprecated in favor of a newly consolidated 'rails' plugin."
+echo "You will want to modify your ~/.zshrc configuration to begin using it."
+echo "Learn more at https://github.com/robbyrussell/oh-my-zsh/pull/2240"

From 96bd365542dd9df0afe37e944996936bdaa17969 Mon Sep 17 00:00:00 2001
From: Jens Tinfors <jens.tinfors@gmail.com>
Date: Sun, 1 Dec 2013 15:33:23 +0100
Subject: [PATCH 166/364] Adds the hgsl alias for one-line shortlog convenience

---
 plugins/mercurial/mercurial.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
index c18aa726c..d2db89d04 100644
--- a/plugins/mercurial/mercurial.plugin.zsh
+++ b/plugins/mercurial/mercurial.plugin.zsh
@@ -13,6 +13,7 @@ alias hglr='hg pull --rebase'
 alias hgo='hg outgoing'
 alias hgp='hg push'
 alias hgs='hg status'
+alias hgsl='log --limit 20 --template "{node|short} | {date|isodatesec} | {author|user}: {desc|strip|firstline}\n" '
 # this is the 'git commit --amend' equivalent
 alias hgca='hg qimport -r tip ; hg qrefresh -e ; hg qfinish tip'
 

From 84e178fa3d5e6e5bc36cb353c5c051d4f12ec35d Mon Sep 17 00:00:00 2001
From: Kevin Messer <messer.kevin@gmail.com>
Date: Sun, 1 Dec 2013 23:29:55 +0100
Subject: [PATCH 167/364] Fixed lines 32, 33, 34 where one 'p' was missing in
 'zypper' command.

---
 plugins/suse/suse.plugin.zsh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/suse/suse.plugin.zsh b/plugins/suse/suse.plugin.zsh
index 3fdb8a032..afd8ecabd 100644
--- a/plugins/suse/suse.plugin.zsh
+++ b/plugins/suse/suse.plugin.zsh
@@ -29,9 +29,9 @@ alias zpatch='sudo zypper patch' #install patches
 #Request commands
 alias zif='sudo zypper if' #display info about packages
 alias zpa='sudo zypper pa' #list packages
-alias zpatch-info='sudo zyper patch-info' #display info about patches
-alias zpattern-info='sudo zyper patch-info' #display info about patterns
-alias zproduct-info='sudo zyper patch-info' #display info about products
+alias zpatch-info='sudo zypper patch-info' #display info about patches
+alias zpattern-info='sudo zypper patch-info' #display info about patterns
+alias zproduct-info='sudo zypper patch-info' #display info about products
 alias zpch='sudo zypper pch' #list all patches
 alias zpd='sudo zypper pd' #list products
 alias zpt='sudo zypper pt' #list patterns

From 22c0db64eed9b771a4d83abfd6f4cb8980d82229 Mon Sep 17 00:00:00 2001
From: Brandon Siegel <brandon@smartercode.net>
Date: Wed, 30 Oct 2013 11:01:49 -0400
Subject: [PATCH 168/364] Change `bi` alias to a function

Only check the bundler version when we call bi. This fixes two issues:
First, if there is no bundler available system-wide this will cause an
error each time zsh loads. Second, if new bundler is installed
system-wide but you change into an rbenv with an older version, the
alias will no longer work.
---
 plugins/bundler/bundler.plugin.zsh | 52 ++++++++++++++++--------------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index e390f8620..4c3580cac 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -4,13 +4,31 @@ alias bp="bundle package"
 alias bo="bundle open"
 alias bu="bundle update"
 
-
 # The following is based on https://github.com/gma/bundler-exec
 
 bundled_commands=(annotate berks cap capify cucumber foodcritic foreman guard jekyll kitchen knife middleman nanoc rackup rainbows rake rspec ruby shotgun spec spin spork strainer tailor taps thin thor unicorn unicorn_rails puma)
 
 ## Functions
 
+bi() {
+  if _bundler-installed && _within-bundled-project; then
+    local bundler_version=`bundle version | cut -d' ' -f3`
+    if [[ $bundler_version > '1.4.0' || $bundler_version = '1.4.0' ]]; then
+      if [[ "$(uname)" == 'Darwin' ]]
+      then
+        local cores_num="$(sysctl hw.ncpu | awk '{print $2}')"
+      else
+        local cores_num="$(nproc)"
+      fi
+      bundle install --jobs=$cores_num $@
+    else
+      bundle install $@
+    fi
+  else
+    echo "Can't 'bundle install' outside a bundled project"
+  fi
+}
+
 _bundler-installed() {
   which bundle > /dev/null 2>&1
 }
@@ -32,28 +50,14 @@ _run-with-bundler() {
   fi
 }
 
-if _bundler-installed; then
-	bundler_version=`bundle version | cut -d' ' -f3`
-	if [[ $bundler_version > '1.4.0' || $bundler_version = '1.4.0' ]]; then
-		if [[ "$(uname)" == 'Darwin' ]]
-		then
-			local cores_num="$(sysctl hw.ncpu | awk '{print $2}')"
-		else
-			local cores_num="$(nproc)"
-		fi
-		eval "alias bi='bundle install --jobs=$cores_num'"
-	else
-		alias bi='bundle install' 
-	fi
+## Main program
+for cmd in $bundled_commands; do
+  eval "function unbundled_$cmd () { $cmd \$@ }"
+  eval "function bundled_$cmd () { _run-with-bundler $cmd \$@}"
+  alias $cmd=bundled_$cmd
 
-	## Main program
-	for cmd in $bundled_commands; do
-		eval "function unbundled_$cmd () { $cmd \$@ }"
-		eval "function bundled_$cmd () { _run-with-bundler $cmd \$@}"
-		alias $cmd=bundled_$cmd
+  if which _$cmd > /dev/null 2>&1; then
+        compdef _$cmd bundled_$cmd=$cmd
+  fi
+done
 
-		if which _$cmd > /dev/null 2>&1; then
-			compdef _$cmd bundled_$cmd=$cmd
-		fi
-	done
-fi

From 858c515df2d8ce1f75ac3d505f77a71984653929 Mon Sep 17 00:00:00 2001
From: Patrick Stadler <patrick.stadler@gmail.com>
Date: Tue, 3 Dec 2013 09:52:51 +0100
Subject: [PATCH 169/364] source ~/.profile only if it exists

---
 tools/check_for_upgrade.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 14d294328..0f8c9c391 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -20,7 +20,7 @@ if [[ -z "$epoch_target" ]]; then
   epoch_target=13
 fi
 
-[ ~/.profile ] && source ~/.profile
+[ -f ~/.profile ] && source ~/.profile
 
 if [ -f ~/.zsh-update ]
 then

From 2ffca0680623d2a3875ac6a8bb9458a06aa57938 Mon Sep 17 00:00:00 2001
From: Peter van der Does <github@avirtualhome.com>
Date: Tue, 3 Dec 2013 08:56:18 -0500
Subject: [PATCH 170/364] Update git-flow-avh 1.7.0

---
 plugins/git-flow-avh/git-flow-avh.plugin.zsh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/git-flow-avh/git-flow-avh.plugin.zsh b/plugins/git-flow-avh/git-flow-avh.plugin.zsh
index d76f55ef6..ba98fff01 100644
--- a/plugins/git-flow-avh/git-flow-avh.plugin.zsh
+++ b/plugins/git-flow-avh/git-flow-avh.plugin.zsh
@@ -41,6 +41,9 @@ _git-flow ()
 				'hotfix:Manage your hotfix branches.'
 				'support:Manage your support branches.'
 				'version:Shows version information.'
+				'finish:Finish the branch you are currently on.'
+				'delete:Delete the branch you are currently on.'
+				'publish:Publish the branch you are currently on.'
 			)
 			_describe -t commands 'git flow' subcommands
 		;;
@@ -95,7 +98,7 @@ __git-flow-release ()
 				'list:List all your release branches. (Alias to `git flow release`)'
 				'publish:Publish release branch to remote.'
 				'track:Checkout remote release branch.'
-				'delet:Delete a release branch.'
+				'delete:Delete a release branch.'
 			)
 			_describe -t commands 'git flow release' subcommands
 			_arguments \

From f082d7a245da8767a11dcc20a7e68ababefa5f34 Mon Sep 17 00:00:00 2001
From: Bob Bonifield <bobbonifield@gmail.com>
Date: Wed, 4 Dec 2013 20:59:57 -0700
Subject: [PATCH 171/364] Making auto-correction off by default

- Allows for the user to turn on auto-correction using the
$ENABLE_CORRECTION variable
- Adds aliases regardless of variable assignment to aid users that use
setopt to turn correction back on in their zshrc
---
 lib/correction.zsh | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/lib/correction.zsh b/lib/correction.zsh
index 436446101..47eb83b1d 100644
--- a/lib/correction.zsh
+++ b/lib/correction.zsh
@@ -1,14 +1,13 @@
-if [[ "$DISABLE_CORRECTION" == "true" ]]; then
-  return
-else
+alias man='nocorrect man'
+alias mv='nocorrect mv'
+alias mysql='nocorrect mysql'
+alias mkdir='nocorrect mkdir'
+alias gist='nocorrect gist'
+alias heroku='nocorrect heroku'
+alias ebuild='nocorrect ebuild'
+alias hpodder='nocorrect hpodder'
+alias sudo='nocorrect sudo'
+
+if [[ "$ENABLE_CORRECTION" == "true" ]]; then
   setopt correct_all
-  alias man='nocorrect man'
-  alias mv='nocorrect mv'
-  alias mysql='nocorrect mysql'
-  alias mkdir='nocorrect mkdir'
-  alias gist='nocorrect gist'
-  alias heroku='nocorrect heroku'
-  alias ebuild='nocorrect ebuild'
-  alias hpodder='nocorrect hpodder'
-  alias sudo='nocorrect sudo'
 fi

From be6b1b3b8fda01bebc499e02b6945eaddaf45b84 Mon Sep 17 00:00:00 2001
From: Foivos <foivos@zakkak.net>
Date: Sun, 8 Dec 2013 07:11:33 +0200
Subject: [PATCH 172/364] Improve comments

---
 templates/zshrc.zsh-template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index b2cad20e8..869bd52c3 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -11,13 +11,13 @@ ZSH_THEME="robbyrussell"
 # alias zshconfig="mate ~/.zshrc"
 # alias ohmyzsh="mate ~/.oh-my-zsh"
 
-# Set to this to use case-sensitive completion
+# Set this to use case-sensitive completion
 # CASE_SENSITIVE="true"
 
 # Uncomment this to disable bi-weekly auto-update checks
 # DISABLE_AUTO_UPDATE="true"
 
-# Uncomment to change how often before auto-updates occur? (in days)
+# Uncomment to change how often to auto-update? (in days)
 # export UPDATE_ZSH_DAYS=13
 
 # Uncomment following line if you want to disable colors in ls
@@ -37,9 +37,9 @@ ZSH_THEME="robbyrussell"
 # much faster.
 # DISABLE_UNTRACKED_FILES_DIRTY="true"
 
-# Uncomment following line if you want to  shown in the command execution time stamp 
-# in the history command output. The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|
-# yyyy-mm-dd
+# Uncomment following line if you want to the command execution time stamp shown 
+# in the history command output.
+# The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
 # HIST_STAMPS="mm/dd/yyyy"
 
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)

From e97811913b9349349e35853a8c2fe3e93cabacd9 Mon Sep 17 00:00:00 2001
From: Foivos <foivos@zakkak.net>
Date: Sun, 8 Dec 2013 07:16:40 +0200
Subject: [PATCH 173/364] Improve comments

---
 templates/zshrc.zsh-template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 869bd52c3..c2254d055 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -66,4 +66,3 @@ export PATH=$HOME/bin:/usr/local/bin:$PATH
 
 # ssh
 # export SSH_KEY_PATH="~/.ssh/dsa_id"
-

From 0185d9920b7d6c380277a4a15c9e4818df41700a Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Mon, 9 Dec 2013 08:54:38 +0100
Subject: [PATCH 174/364] catimg plugin allow to print an image to the stdout
 using convert

---
 plugins/catimg/catimg.plugin.zsh |  16 ++++++
 plugins/catimg/catimg.sh         |  87 +++++++++++++++++++++++++++++++
 plugins/catimg/colors.png        | Bin 0 -> 353 bytes
 3 files changed, 103 insertions(+)
 create mode 100644 plugins/catimg/catimg.plugin.zsh
 create mode 100755 plugins/catimg/catimg.sh
 create mode 100644 plugins/catimg/colors.png

diff --git a/plugins/catimg/catimg.plugin.zsh b/plugins/catimg/catimg.plugin.zsh
new file mode 100644
index 000000000..01e81eca7
--- /dev/null
+++ b/plugins/catimg/catimg.plugin.zsh
@@ -0,0 +1,16 @@
+################################################################################
+# catimg script by Eduardo San Martin Morote aka Posva                         #
+# http://posva.net                                                             #
+#                                                                              #
+# Ouput the content of an image to the stdout using the 256 colors of the      #
+# terminal.                                                                    #
+# Github: https://github.com/posva/catimg                                      #
+################################################################################
+
+if [[ -x  `which convert` ]]; then
+  function catimg() {
+    source $(dirname $0)/catimg.sh $@
+  }
+else
+  echo "catimg need convert (ImageMagick) to work)"
+fi
diff --git a/plugins/catimg/catimg.sh b/plugins/catimg/catimg.sh
new file mode 100755
index 000000000..f9e067e34
--- /dev/null
+++ b/plugins/catimg/catimg.sh
@@ -0,0 +1,87 @@
+################################################################################
+# catimg script by Eduardo San Martin Morote aka Posva                         #
+# http://posva.net                                                             #
+#                                                                              #
+# Ouput the content of an image to the stdout using the 256 colors of the      #
+# terminal.                                                                    #
+# Github: https://github.com/posva/catimg                                      #
+################################################################################
+
+function help() {
+  echo "Usage catimg [-h] [-w width] [-c char] img"
+  echo "By default char is \"  \" and w is the terminal width"
+}
+
+# VARIABLES
+COLOR_FILE=$(dirname $0)/colors.png
+CHAR="  "
+
+WIDTH=""
+IMG=""
+
+while getopts qw:c:h opt; do
+  case "$opt" in
+    w) WIDTH="$OPTARG" ;;
+    c) CHAR="$OPTARG" ;;
+    h) help; exit ;;
+    *) help ; exit 1;;
+    esac
+  done
+
+while [ "$1" ]; do
+  IMG="$1"
+  shift
+done
+
+if [ "$IMG" = "" -o ! -f "$IMG" ]; then
+  help
+  exit 1
+fi
+
+if [ ! "$WIDTH" ]; then
+  COLS=$(expr $(tput cols) "/" $(echo -n "$CHAR" | wc -c))
+else
+  COLS=$(expr $WIDTH "/" $(echo -n "$CHAR" | wc -c))
+fi
+WIDTH=$(convert ${IMG} -print "%w\n" /dev/null)
+if [ "$WIDTH" -gt "$COLS" ]; then
+  WIDTH=$COLS
+fi
+
+REMAP=""
+if convert "$IMG" -resize $COLS\> +dither -remap $COLOR_FILE /dev/null ; then
+  REMAP="-remap $COLOR_FILE"
+else
+  echo "The version of convert is too old, don't expect good results :(" >&2
+  #convert "$IMG" -colors 256 PNG8:tmp.png
+  #IMG="tmp.png"
+fi
+
+# Display the image
+convert "$IMG" -resize $COLS\> +dither `echo $REMAP` txt:- |
+sed -e 's/.*none.*/NO NO NO/g' -e '1d;s/^.*(\(.*\)[,)].*$/\1/g;y/,/ /' |
+while read R G B f; do
+  if [ ! "$R" = "NO" ]; then
+    if [ "$R" -eq "$G" -a "$G" -eq "$B" ]; then
+      ((
+      I++,
+      IDX = 232 + R * 23 / 255
+      ))
+    else
+      ((
+      I++,
+      IDX = 16
+      + R * 5 / 255 * 36
+      + G * 5 / 255 * 6
+      + B * 5 / 255
+      ))
+    fi
+    #echo "$R,$G,$B: $IDX"
+    echo -ne "\e[48;5;${IDX}m${CHAR}"
+  else
+    (( I++ ))
+    echo -ne "\e[0m${CHAR}"
+  fi
+  # New lines
+  (( $I % $WIDTH )) || echo -e "\e[0m"
+done
diff --git a/plugins/catimg/colors.png b/plugins/catimg/colors.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f2c8126bc0d8911a9de5d3ffbd4e37372b41671
GIT binary patch
literal 353
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7H9TD$Ln`8u|NQ@N&#bKc
z_<sc(8=I>_8haA2${CI+9qz)+Cykjz%^8kLO5T$EmmJCv;@V^J`0Hz){|D6`T{v*^
z<iP_+kG2XMyScdhiQm{XmvMFOjye4)lHNP)teyATF*BQm$D}LhoZGaJX%R;XgO78O
zk@4YbLBX~IdU|XD4vicE4B=)Ac8M&R_tD<@cfFg^oGu~b6LB{-%xi3vSgzDA=u=y6
zZp?i8^71`A?;97^2zE%CIIe796h2~{z?$kXeZ!o8I%gMrloaB-e%q7Z=h*-2*Z-#<
znaF0ApT>6Fo|~JSSz20pMs7lb)P$bvlIxs>gl00HWa4spqTy1`yO1G`^IBS)da#?K
z<D_7f<eK0A|4Y5FoN%It#c%Kb_5Y7cb{xn#cfx^zf#JxJghSG&FP>sxU|{fc^>bP0
Hl+XkKlf#Hs

literal 0
HcmV?d00001


From cbd63f220dff93ad6c9d00734949106443a5b03b Mon Sep 17 00:00:00 2001
From: Andy Fleming <afleming@variableaction.com>
Date: Mon, 9 Dec 2013 19:38:27 +0000
Subject: [PATCH 175/364] Fix for virtualenv support - fixes #2328, fixes
 #2297, resolves #2319

---
 themes/af-magic.zsh-theme | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/themes/af-magic.zsh-theme b/themes/af-magic.zsh-theme
index 4cf282590..cd90b106e 100644
--- a/themes/af-magic.zsh-theme
+++ b/themes/af-magic.zsh-theme
@@ -27,7 +27,12 @@ eval my_gray='$FG[237]'
 eval my_orange='$FG[214]'
 
 # right prompt
-PROMPT='$(virtualenv_prompt_info)$my_gray%n@%m%{$reset_color%}%'
+if type "virtualenv_prompt" > /dev/null
+then
+	RPROMPT='$(virtualenv_prompt_info)$my_gray%n@%m%{$reset_color%}%'
+else
+	RPROMPT='$my_gray%n@%m%{$reset_color%}%'
+fi
 
 # git settings
 ZSH_THEME_GIT_PROMPT_PREFIX="$FG[075](branch:"

From 349fa15b187a1b2c411db90f2022013caf3479e8 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Mon, 9 Dec 2013 22:07:19 +0100
Subject: [PATCH 176/364] Fixed a dirs bug for catimg

---
 plugins/catimg/catimg.plugin.zsh | 2 +-
 plugins/catimg/catimg.sh         | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/catimg/catimg.plugin.zsh b/plugins/catimg/catimg.plugin.zsh
index 01e81eca7..ee721cd03 100644
--- a/plugins/catimg/catimg.plugin.zsh
+++ b/plugins/catimg/catimg.plugin.zsh
@@ -9,7 +9,7 @@
 
 if [[ -x  `which convert` ]]; then
   function catimg() {
-    source $(dirname $0)/catimg.sh $@
+    source $ZSH/plugins/catimg/catimg.sh $@
   }
 else
   echo "catimg need convert (ImageMagick) to work)"
diff --git a/plugins/catimg/catimg.sh b/plugins/catimg/catimg.sh
index f9e067e34..c05fddcd4 100755
--- a/plugins/catimg/catimg.sh
+++ b/plugins/catimg/catimg.sh
@@ -43,7 +43,7 @@ if [ ! "$WIDTH" ]; then
 else
   COLS=$(expr $WIDTH "/" $(echo -n "$CHAR" | wc -c))
 fi
-WIDTH=$(convert ${IMG} -print "%w\n" /dev/null)
+WIDTH=$(convert "$IMG" -print "%w\n" /dev/null)
 if [ "$WIDTH" -gt "$COLS" ]; then
   WIDTH=$COLS
 fi
@@ -58,6 +58,7 @@ else
 fi
 
 # Display the image
+I=0
 convert "$IMG" -resize $COLS\> +dither `echo $REMAP` txt:- |
 sed -e 's/.*none.*/NO NO NO/g' -e '1d;s/^.*(\(.*\)[,)].*$/\1/g;y/,/ /' |
 while read R G B f; do

From 44b23ae194a1580a6af6d692e4ba268d61828929 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Mon, 9 Dec 2013 22:18:20 +0100
Subject: [PATCH 177/364] catimg: fix exit without using source supresses
 errors from convert whilen converting, as they are usually just warnings

---
 plugins/catimg/catimg.plugin.zsh | 2 +-
 plugins/catimg/catimg.sh         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/catimg/catimg.plugin.zsh b/plugins/catimg/catimg.plugin.zsh
index ee721cd03..70ef9a63c 100644
--- a/plugins/catimg/catimg.plugin.zsh
+++ b/plugins/catimg/catimg.plugin.zsh
@@ -9,7 +9,7 @@
 
 if [[ -x  `which convert` ]]; then
   function catimg() {
-    source $ZSH/plugins/catimg/catimg.sh $@
+    zsh $ZSH/plugins/catimg/catimg.sh $@
   }
 else
   echo "catimg need convert (ImageMagick) to work)"
diff --git a/plugins/catimg/catimg.sh b/plugins/catimg/catimg.sh
index c05fddcd4..cd0f2e333 100755
--- a/plugins/catimg/catimg.sh
+++ b/plugins/catimg/catimg.sh
@@ -59,7 +59,7 @@ fi
 
 # Display the image
 I=0
-convert "$IMG" -resize $COLS\> +dither `echo $REMAP` txt:- |
+convert "$IMG" -resize $COLS\> +dither `echo $REMAP` txt:- 2>/dev/null |
 sed -e 's/.*none.*/NO NO NO/g' -e '1d;s/^.*(\(.*\)[,)].*$/\1/g;y/,/ /' |
 while read R G B f; do
   if [ ! "$R" = "NO" ]; then

From c05a28a7d9c5ca86b66b0fdf2f509e07b2a7b616 Mon Sep 17 00:00:00 2001
From: Andy Fleming <afleming@variableaction.com>
Date: Tue, 10 Dec 2013 00:11:22 +0000
Subject: [PATCH 178/364] typo fix

---
 themes/af-magic.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/af-magic.zsh-theme b/themes/af-magic.zsh-theme
index cd90b106e..f40aa284a 100644
--- a/themes/af-magic.zsh-theme
+++ b/themes/af-magic.zsh-theme
@@ -27,7 +27,7 @@ eval my_gray='$FG[237]'
 eval my_orange='$FG[214]'
 
 # right prompt
-if type "virtualenv_prompt" > /dev/null
+if type "virtualenv_prompt_info" > /dev/null
 then
 	RPROMPT='$(virtualenv_prompt_info)$my_gray%n@%m%{$reset_color%}%'
 else

From fdfc90705242841d7491bb945c35a3601d1c8996 Mon Sep 17 00:00:00 2001
From: Mikhail Nikalyukin <idups1k@gmail.com>
Date: Fri, 6 Dec 2013 12:20:38 +0200
Subject: [PATCH 179/364] Add rdmtc alias for rails plugin.

---
 plugins/rails/rails.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
index 23d15a9a1..4a96754e4 100644
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@@ -51,6 +51,7 @@ alias rds='rake db:seed'
 alias rdd='rake db:drop'
 alias rdtc='rake db:test:clone'
 alias rdtp='rake db:test:prepare'
+alias rdmtc='rake db:migrate db:test:clone'
 
 alias rlc='rake log:clear'
 alias rn='rake notes'

From dbdd23d0fa1309444d01d7540a0f3065d514e741 Mon Sep 17 00:00:00 2001
From: Juan Ignacio Donoso <jidonoso@gmail.com>
Date: Fri, 13 Dec 2013 19:05:35 -0300
Subject: [PATCH 180/364] Prevents oh-my-zsh loading the .zshenv twice

---
 oh-my-zsh.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 2ae07668c..3c0f4f8f5 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -1,6 +1,6 @@
 # Check for updates on initial load...
 if [ "$DISABLE_AUTO_UPDATE" != "true" ]; then
-  /usr/bin/env ZSH=$ZSH DISABLE_UPDATE_PROMPT=$DISABLE_UPDATE_PROMPT zsh $ZSH/tools/check_for_upgrade.sh
+  /usr/bin/env ZSH=$ZSH DISABLE_UPDATE_PROMPT=$DISABLE_UPDATE_PROMPT zsh -f $ZSH/tools/check_for_upgrade.sh
 fi
 
 # Initializes Oh My Zsh

From 152e1e07e0397ecc3f1778ea597d081c33ee8ff4 Mon Sep 17 00:00:00 2001
From: "n.st" <git@n-st.de>
Date: Wed, 18 Dec 2013 18:27:20 +0100
Subject: [PATCH 181/364] Cancel update if the current user doesn't have write
 permissions for the oh-my-zsh directory.

---
 tools/check_for_upgrade.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 0f8c9c391..d877e2a89 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -26,6 +26,13 @@ if [ -f ~/.zsh-update ]
 then
   . ~/.zsh-update
 
+  # cancel update if the current user doesn't have write permissions for the
+  # oh-my-zsh directory
+  if [ -n $(find -not -writable "$ZSH") ]
+  then
+    return 0;
+  fi
+
   if [[ -z "$LAST_EPOCH" ]]; then
     _update_zsh_update && return 0;
   fi

From a38af27991d15d14ac4ca55c919bb694d7eafb7a Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Wed, 18 Dec 2013 17:03:33 -0800
Subject: [PATCH 182/364] Revert "Cancel update if the current user doesn't
 have write permissions for the oh-my-zsh directory."

This reverts commit 152e1e07e0397ecc3f1778ea597d081c33ee8ff4.
---
 tools/check_for_upgrade.sh | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index d877e2a89..0f8c9c391 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -26,13 +26,6 @@ if [ -f ~/.zsh-update ]
 then
   . ~/.zsh-update
 
-  # cancel update if the current user doesn't have write permissions for the
-  # oh-my-zsh directory
-  if [ -n $(find -not -writable "$ZSH") ]
-  then
-    return 0;
-  fi
-
   if [[ -z "$LAST_EPOCH" ]]; then
     _update_zsh_update && return 0;
   fi

From e41b6acd2a34bd2ad2a092b94629c95b1f932f82 Mon Sep 17 00:00:00 2001
From: chuancong <chuancong@users.noreply.github.com>
Date: Thu, 19 Dec 2013 11:24:38 -0800
Subject: [PATCH 183/364] Add support to command "show"

---
 plugins/pip/_pip | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/pip/_pip b/plugins/pip/_pip
index 967da48ca..7c1238db7 100644
--- a/plugins/pip/_pip
+++ b/plugins/pip/_pip
@@ -20,6 +20,7 @@ _1st_arguments=(
   'bundle:create pybundles (archives containing multiple packages)'
   'freeze:output all currently installed packages (exact versions) to stdout'
   'help:show available commands'
+  'show:show information about installed packages'
   'install:install packages'
   'search:search PyPI'
   'uninstall:uninstall packages'
@@ -76,4 +77,7 @@ case "$words[1]" in
   uninstall)
     _pip_installed
     _wanted installed_pkgs expl 'installed packages' compadd -a installed_pkgs ;;
+  show)
+    _pip_installed
+    _wanted installed_pkgs expl 'installed packages' compadd -a installed_pkgs ;;
 esac

From b58b996b40f8de1f030d59336e3594b63ef598ee Mon Sep 17 00:00:00 2001
From: lumbric <lumbric@gmail.com>
Date: Sat, 21 Dec 2013 19:49:44 +0100
Subject: [PATCH 184/364] fix name schema for sudo plugin

Plugin won't load automatically if added to variable $plugins, if name schema different than $name/$name.plugin.zsh is used (see is_plugin() in oh-my-zsh.sh).
---
 plugins/sudo/{sudo.zsh => sudo.plugin.zsh} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename plugins/sudo/{sudo.zsh => sudo.plugin.zsh} (100%)

diff --git a/plugins/sudo/sudo.zsh b/plugins/sudo/sudo.plugin.zsh
similarity index 100%
rename from plugins/sudo/sudo.zsh
rename to plugins/sudo/sudo.plugin.zsh

From f6bb74e452590c18b8545cb444a998448c7ae4f0 Mon Sep 17 00:00:00 2001
From: Konstantin Haase <konstantin.mailinglists@googlemail.com>
Date: Fri, 27 Dec 2013 14:25:06 +0100
Subject: [PATCH 185/364] add chruby info to gallois theme

---
 themes/gallois.zsh-theme | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/themes/gallois.zsh-theme b/themes/gallois.zsh-theme
index d624e3afc..1ff86b54c 100644
--- a/themes/gallois.zsh-theme
+++ b/themes/gallois.zsh-theme
@@ -18,7 +18,11 @@ else
   if which rbenv &> /dev/null; then
     RPS1='$(git_custom_status)%{$fg[red]%}[`rbenv version | sed -e "s/ (set.*$//"`]%{$reset_color%} $EPS1'
   else
-    RPS1='$(git_custom_status) $EPS1'
+    if which chruby_prompt_info &> /dev/null; then
+      RPS1='$(git_custom_status)%{$fg[red]%}[`chruby_prompt_info`]%{$reset_color%} $EPS1'
+    else
+      RPS1='$(git_custom_status) $EPS1'
+    fi
   fi
 fi
 

From bbbff94cca497103d0f9854f9d8a67b9049f59c9 Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Tue, 31 Dec 2013 00:35:57 +0100
Subject: [PATCH 186/364] Fixes rvm_prompt_info() in lib/rvm.zsh

---
 lib/rvm.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/rvm.zsh b/lib/rvm.zsh
index e8744e61e..d14b45632 100644
--- a/lib/rvm.zsh
+++ b/lib/rvm.zsh
@@ -2,7 +2,7 @@
 function rvm_prompt_info() {
   [ -f $HOME/.rvm/bin/rvm-prompt ] || return
   local rvm_prompt
-  rvm_prompt=$($HOME/.rvm/bin/rvm-prompt ${ZSH_THEME_RVM_PROMPT_OPTIONS} 2>/dev/null)
+  rvm_prompt=$(eval "$HOME/.rvm/bin/rvm-prompt $ZSH_THEME_RVM_PROMPT_OPTIONS" 2>/dev/null)
   [[ "${rvm_prompt}x" == "x" ]] && return
   echo "${ZSH_THEME_RVM_PROMPT_PREFIX:=(}${rvm_prompt}${ZSH_THEME_RVM_PROMPT_SUFFIX:=)}"
 }

From 468b24a8d54f294ab9802cac3801ba580c5c4397 Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Tue, 31 Dec 2013 01:06:14 +0100
Subject: [PATCH 187/364] Returns false when rvm is not found.

---
 lib/rvm.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/rvm.zsh b/lib/rvm.zsh
index d14b45632..04d116397 100644
--- a/lib/rvm.zsh
+++ b/lib/rvm.zsh
@@ -1,8 +1,8 @@
 # get the name of the ruby version
 function rvm_prompt_info() {
-  [ -f $HOME/.rvm/bin/rvm-prompt ] || return
+  [ -f $HOME/.rvm/bin/rvm-prompt ] || return 1
   local rvm_prompt
   rvm_prompt=$(eval "$HOME/.rvm/bin/rvm-prompt $ZSH_THEME_RVM_PROMPT_OPTIONS" 2>/dev/null)
-  [[ "${rvm_prompt}x" == "x" ]] && return
+  [[ "${rvm_prompt}x" == "x" ]] && return 1
   echo "${ZSH_THEME_RVM_PROMPT_PREFIX:=(}${rvm_prompt}${ZSH_THEME_RVM_PROMPT_SUFFIX:=)}"
 }

From ae6ded5ad795a7f4174bc10a5a02e1c0502e1352 Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Tue, 31 Dec 2013 01:15:35 +0100
Subject: [PATCH 188/364] Returns false when rbenv is not found.

---
 lib/rbenv.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/rbenv.zsh b/lib/rbenv.zsh
index a8b6c323c..f58074b83 100644
--- a/lib/rbenv.zsh
+++ b/lib/rbenv.zsh
@@ -1,2 +1,4 @@
 # using the rbenv plugin will override this with a real implementation
-function rbenv_prompt_info() {}
+function rbenv_prompt_info() {
+  return 1
+}

From 7aa766168cead04f677b4828cc5c837f823f7cd7 Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Tue, 31 Dec 2013 01:44:51 +0100
Subject: [PATCH 189/364] Adds chruby_prompt_info dummy function.

---
 lib/chruby.zsh | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 lib/chruby.zsh

diff --git a/lib/chruby.zsh b/lib/chruby.zsh
new file mode 100644
index 000000000..b78d04f86
--- /dev/null
+++ b/lib/chruby.zsh
@@ -0,0 +1,4 @@
+# using the chruby plugin will override this with a real implementation
+function chruby_prompt_info() {
+  return 1
+}

From 8a887c505282b771193ac3ee6df05a1fa3f8426a Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Tue, 31 Dec 2013 02:11:02 +0100
Subject: [PATCH 190/364] Joins ruby prompt files and adds ruby_prompt_info.

---
 lib/chruby.zsh       |  4 ----
 lib/rbenv.zsh        |  4 ----
 lib/ruby_prompts.zsh | 22 ++++++++++++++++++++++
 lib/rvm.zsh          |  8 --------
 4 files changed, 22 insertions(+), 16 deletions(-)
 delete mode 100644 lib/chruby.zsh
 delete mode 100644 lib/rbenv.zsh
 create mode 100644 lib/ruby_prompts.zsh
 delete mode 100644 lib/rvm.zsh

diff --git a/lib/chruby.zsh b/lib/chruby.zsh
deleted file mode 100644
index b78d04f86..000000000
--- a/lib/chruby.zsh
+++ /dev/null
@@ -1,4 +0,0 @@
-# using the chruby plugin will override this with a real implementation
-function chruby_prompt_info() {
-  return 1
-}
diff --git a/lib/rbenv.zsh b/lib/rbenv.zsh
deleted file mode 100644
index f58074b83..000000000
--- a/lib/rbenv.zsh
+++ /dev/null
@@ -1,4 +0,0 @@
-# using the rbenv plugin will override this with a real implementation
-function rbenv_prompt_info() {
-  return 1
-}
diff --git a/lib/ruby_prompts.zsh b/lib/ruby_prompts.zsh
new file mode 100644
index 000000000..287b3ff0a
--- /dev/null
+++ b/lib/ruby_prompts.zsh
@@ -0,0 +1,22 @@
+# get the name of the rvm ruby version
+function rvm_prompt_info() {
+  [ -f $HOME/.rvm/bin/rvm-prompt ] || return 1
+  local rvm_prompt
+  rvm_prompt=$(eval "$HOME/.rvm/bin/rvm-prompt $ZSH_THEME_RVM_PROMPT_OPTIONS" 2>/dev/null)
+  [[ "${rvm_prompt}x" == "x" ]] && return 1
+  echo "${ZSH_THEME_RVM_PROMPT_PREFIX:=(}${rvm_prompt}${ZSH_THEME_RVM_PROMPT_SUFFIX:=)}"
+}
+
+# using the rbenv plugin will override this with a real implementation
+function rbenv_prompt_info() {
+  return 1
+}
+
+# using the chruby plugin will override this with a real implementation
+function chruby_prompt_info() {
+  return 1
+}
+
+function ruby_prompt_info() {
+  echo $(rvm_prompt_info || rbenv_prompt_info || chruby_prompt_info)
+}
diff --git a/lib/rvm.zsh b/lib/rvm.zsh
deleted file mode 100644
index 04d116397..000000000
--- a/lib/rvm.zsh
+++ /dev/null
@@ -1,8 +0,0 @@
-# get the name of the ruby version
-function rvm_prompt_info() {
-  [ -f $HOME/.rvm/bin/rvm-prompt ] || return 1
-  local rvm_prompt
-  rvm_prompt=$(eval "$HOME/.rvm/bin/rvm-prompt $ZSH_THEME_RVM_PROMPT_OPTIONS" 2>/dev/null)
-  [[ "${rvm_prompt}x" == "x" ]] && return 1
-  echo "${ZSH_THEME_RVM_PROMPT_PREFIX:=(}${rvm_prompt}${ZSH_THEME_RVM_PROMPT_SUFFIX:=)}"
-}

From c6aacf611d51f7c00d216f77c3b32174cc3bed9c Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Tue, 31 Dec 2013 02:45:09 +0100
Subject: [PATCH 191/364] Refactors ruby_prompts.zsh

---
 lib/ruby_prompts.zsh | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/lib/ruby_prompts.zsh b/lib/ruby_prompts.zsh
index 287b3ff0a..2ef334d5f 100644
--- a/lib/ruby_prompts.zsh
+++ b/lib/ruby_prompts.zsh
@@ -7,13 +7,9 @@ function rvm_prompt_info() {
   echo "${ZSH_THEME_RVM_PROMPT_PREFIX:=(}${rvm_prompt}${ZSH_THEME_RVM_PROMPT_SUFFIX:=)}"
 }
 
-# using the rbenv plugin will override this with a real implementation
-function rbenv_prompt_info() {
-  return 1
-}
-
-# using the chruby plugin will override this with a real implementation
-function chruby_prompt_info() {
+# using the chruby and/or rbenv plugins will override
+# these with real implementations
+function chruby_prompt_info rbenv_prompt_info {
   return 1
 }
 

From 3e5e2d45e95f0ee523ce2572a5e88f6e761e7067 Mon Sep 17 00:00:00 2001
From: Daniele <raiervol@gmail.com>
Date: Tue, 31 Dec 2013 12:41:28 +0100
Subject: [PATCH 192/364] Fix bad right prompt placing.

---
 themes/af-magic.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/af-magic.zsh-theme b/themes/af-magic.zsh-theme
index 4cf282590..f241efb6a 100644
--- a/themes/af-magic.zsh-theme
+++ b/themes/af-magic.zsh-theme
@@ -27,7 +27,7 @@ eval my_gray='$FG[237]'
 eval my_orange='$FG[214]'
 
 # right prompt
-PROMPT='$(virtualenv_prompt_info)$my_gray%n@%m%{$reset_color%}%'
+RPROMPT='$(virtualenv_prompt_info)$my_gray%n@%m%{$reset_color%}%'
 
 # git settings
 ZSH_THEME_GIT_PROMPT_PREFIX="$FG[075](branch:"

From 6a40557a8bc5411881682e3993333da8fbe64e68 Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Tue, 31 Dec 2013 14:54:34 +0100
Subject: [PATCH 193/364] Updates spectrum.zsh

---
 lib/spectrum.zsh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/spectrum.zsh b/lib/spectrum.zsh
index 166c942fb..b683aca29 100644
--- a/lib/spectrum.zsh
+++ b/lib/spectrum.zsh
@@ -19,17 +19,19 @@ for color in {000..255}; do
     BG[$color]="%{[48;5;${color}m%}"
 done
 
+
+ZSH_SPECTRUM_TEXT=${ZSH_SPECTRUM_TEXT:-Arma virumque cano Troiae qui primus ab oris}
+
 # Show all 256 colors with color number
 function spectrum_ls() {
   for code in {000..255}; do
-    print -P -- "$code: %F{$code}Test%f"
+    print -P -- "$code: %F{$code}$ZSH_SPECTRUM_TEXT%f"
   done
 }
 
 # Show all 256 colors where the background is set to specific color
 function spectrum_bls() {
   for code in {000..255}; do
-    ((cc = code + 1))
-    print -P -- "$BG[$code]$code: Test %{$reset_color%}"
+    print -P -- "$BG[$code]$code: $ZSH_SPECTRUM_TEXT %{$reset_color%}"
   done
 }

From 827d9dfcb406c5d25470010933fc6fde85a7ded7 Mon Sep 17 00:00:00 2001
From: Sam O <soluwalana@gmail.com>
Date: Thu, 2 Jan 2014 15:48:09 -0800
Subject: [PATCH 194/364] Update git.plugin.zsh

---
 plugins/git/git.plugin.zsh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index fde22a37d..42b4698f9 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -142,13 +142,13 @@ compdef _git glp=git-log
 #
 # This function return a warning if the current branch is a wip
 function work_in_progress() {
-  if $(git log -n 1 2>/dev/null | grep -q -c wip); then
+  if $(git log -n 1 2>/dev/null | grep -q -c "--wip--"); then
     echo "WIP!!"
   fi
 }
 # these alias commit and uncomit wip branches
-alias gwip='git add -A; git ls-files --deleted -z | xargs -0 git rm; git commit -m "wip"'
-alias gunwip='git log -n 1 | grep -q -c wip && git reset HEAD~1'
+alias gwip='git add -A; git ls-files --deleted -z | xargs -0 git rm; git commit -m "--wip--"'
+alias gunwip='git log -n 1 | grep -q -c "--wip--" && git reset HEAD~1'
 
 # these alias ignore changes to file
 alias gignore='git update-index --assume-unchanged'

From d60522c7a290565c9de7594817a9d201732d5dd9 Mon Sep 17 00:00:00 2001
From: Sam O <soluwalana@gmail.com>
Date: Thu, 2 Jan 2014 15:53:34 -0800
Subject: [PATCH 195/364] escape dashes

---
 plugins/git/git.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 42b4698f9..1285a3247 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -142,13 +142,13 @@ compdef _git glp=git-log
 #
 # This function return a warning if the current branch is a wip
 function work_in_progress() {
-  if $(git log -n 1 2>/dev/null | grep -q -c "--wip--"); then
+  if $(git log -n 1 2>/dev/null | grep -q -c "\-\-wip\-\-"); then
     echo "WIP!!"
   fi
 }
 # these alias commit and uncomit wip branches
 alias gwip='git add -A; git ls-files --deleted -z | xargs -0 git rm; git commit -m "--wip--"'
-alias gunwip='git log -n 1 | grep -q -c "--wip--" && git reset HEAD~1'
+alias gunwip='git log -n 1 | grep -q -c "\-\-wip\-\-" && git reset HEAD~1'
 
 # these alias ignore changes to file
 alias gignore='git update-index --assume-unchanged'

From 288604ef1a19c5808eff439acf32330fda126f93 Mon Sep 17 00:00:00 2001
From: Patrick Stadler <patrick.stadler@gmail.com>
Date: Fri, 3 Jan 2014 14:32:49 +0100
Subject: [PATCH 196/364] add brew-cask plugin

---
 plugins/brew-cask/brew-cask.plugin.zsh | 80 ++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 plugins/brew-cask/brew-cask.plugin.zsh

diff --git a/plugins/brew-cask/brew-cask.plugin.zsh b/plugins/brew-cask/brew-cask.plugin.zsh
new file mode 100644
index 000000000..ef4f5208d
--- /dev/null
+++ b/plugins/brew-cask/brew-cask.plugin.zsh
@@ -0,0 +1,80 @@
+# Autocompletion for homebrew-cask.
+#
+# This script intercepts calls to the brew plugin and adds autocompletion
+# for the cask subcommand.
+#
+# Author: https://github.com/pstadler
+
+compdef _brew-cask brew
+
+_brew-cask()
+{
+	local curcontext="$curcontext" state line
+	typeset -A opt_args
+
+	_arguments -C \
+		':command:->command' \
+		':subcmd:->subcmd' \
+		'*::options:->options'
+
+	case $state in
+		(command)
+			__call_original_brew
+			cask_commands=(
+				'cask:manage casks'
+			)
+			_describe -t commands 'brew cask command' cask_commands ;;
+
+		(subcmd)
+			case "$line[1]" in
+				cask)
+					if (( CURRENT == 3 )); then
+						local -a subcommands
+						subcommands=(
+							"alfred:used to modify Alfred's scope to include the Caskroom"
+							'audit:verifies installability of casks'
+							'checklinks:checks for bad cask links'
+							'create:creates a cask of the given name and opens it in an editor'
+							'edit:edits the cask of the given name'
+							'home:opens the homepage of the cask of the given name'
+							'info:displays information about the cask of the given name'
+							'install:installs the cask of the given name'
+							'list:with no args, lists installed casks; given installed casks, lists installed files'
+							'search:searches all known casks'
+							'uninstall:uninstalls the cask of the given name'
+						)
+						_describe -t commands "brew cask subcommand" subcommands
+					fi ;;
+
+				*)
+					__call_original_brew ;;
+			esac ;;
+
+		(options)
+			local -a casks installed_casks
+			local expl
+			case "$line[2]" in
+				list|uninstall)
+					__brew_installed_casks
+					_wanted installed_casks expl 'installed casks' compadd -a installed_casks ;;
+				audit|edit|home|info|install)
+					__brew_all_casks
+					_wanted casks expl 'all casks' compadd -a casks ;;
+			esac ;;
+	esac
+}
+
+__brew_all_casks() {
+	casks=(`brew cask search`)
+}
+
+__brew_installed_casks() {
+	installed_casks=(`brew cask list`)
+}
+
+__call_original_brew()
+{
+	local ret=1
+	_call_function ret _brew
+	compdef _brew-cask brew
+}

From 4354f911710572f9ec0a8e4435571ea3c19cb0f8 Mon Sep 17 00:00:00 2001
From: Pablo Cantero <pablo@pablocantero.com>
Date: Fri, 3 Jan 2014 11:52:33 -0200
Subject: [PATCH 197/364] Fixes tmuxinator plugin find on OSX

---
 plugins/tmuxinator/_tmuxinator | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/tmuxinator/_tmuxinator b/plugins/tmuxinator/_tmuxinator
index 117685279..cd227b7df 100644
--- a/plugins/tmuxinator/_tmuxinator
+++ b/plugins/tmuxinator/_tmuxinator
@@ -25,7 +25,7 @@ case $state in
   args)
     case $line[1] in
       start|open|copy|delete)
-        _configs=(`find ~/.tmuxinator/ -name \*.yml | cut -d/ -f5 | sed s:.yml::g`)
+        _configs=(`find ~/.tmuxinator -name \*.yml | cut -d/ -f5 | sed s:.yml::g`)
         _values 'configs' $_configs
         ret=0
         ;;

From 9ce1b6289aebc8e19b8bb25e4f7ac1cbc84e83de Mon Sep 17 00:00:00 2001
From: Brice Dutheil <brice.dutheil@gmail.com>
Date: Sat, 4 Jan 2014 22:06:09 +0100
Subject: [PATCH 198/364] new faster SVN plugin

---
 .../svn-fast-info/svn-fast-info.plugin.zsh    | 64 +++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 plugins/svn-fast-info/svn-fast-info.plugin.zsh

diff --git a/plugins/svn-fast-info/svn-fast-info.plugin.zsh b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
new file mode 100644
index 000000000..d8fc53989
--- /dev/null
+++ b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
@@ -0,0 +1,64 @@
+# vim:ft=zsh ts=2 sw=2 sts=2
+#
+# Faster alternative to the current SVN plugin implementation.
+#
+# Works with svn 1.6, 1.7, 1.8.
+# Use `svn_prompt_info` method to enquire the svn data.
+# It's faster because his efficient use of svn (single svn call) done in the `parse_svn` function
+# Also changed prompt suffix *after* the svn dirty marker
+#
+# *** IMPORTANT *** DO NO USE with the simple svn plugin, this plugin acts as a replacement of it.
+
+function parse_svn() {
+    info=$(svn info 2> /dev/null) || return
+    in_svn=true
+	repo_need_upgrade="$(svn_repo_need_upgrade $info)"
+    svn_branch_name="$(svn_get_branch_name $info)"
+    svn_dirty="$(svn_dirty_choose)"
+    svn_repo_name="$(svn_get_repo_name $info)"
+    svn_rev="$(svn_get_revision $info)"
+}
+
+function svn_prompt_info() {
+    eval parse_svn
+
+    if [ ${in_svn} ]; then
+        echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\
+$ZSH_THEME_REPO_NAME_COLOR${svn_branch_name}\
+$ZSH_PROMPT_BASE_COLOR${svn_dirty}\
+$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX\
+$ZSH_PROMPT_BASE_COLOR"
+    fi
+}
+
+
+function svn_repo_need_upgrade() {
+	info=$1
+	[ -z "${info}" ] && info=$(svn info 2> /dev/null)
+	[ "${info}" = "E155036" ] && echo "upgrade repo with svn upgrade"
+}
+
+function svn_get_branch_name() {
+	info=$1
+	[ -z "${info}" ] && info=$(svn info 2> /dev/null)
+    echo $info | grep '^URL:' | egrep -o '(tags|branches)/[^/]+|trunk' | egrep -o '[^/]+$' | read SVN_URL
+    echo $SVN_URL
+}
+
+function svn_get_repo_name() {
+	info=$1
+	[ -z "${info}" ] && info=$(svn info 2> /dev/null)
+    echo $info | sed -n 's/Repository\ Root:\ .*\///p' | read SVN_ROOT
+    echo $info | sed -n "s/URL:\ .*$SVN_ROOT\///p"
+}
+
+function svn_get_revision() {
+	info=$1
+	[ -z "${info}" ] && info=$(svn info 2> /dev/null)
+    echo $info 2> /dev/null | sed -n s/Revision:\ //p
+}
+
+function svn_dirty_choose() {
+    svn status | grep -E '^\s*[ACDIM!?L]' > /dev/null 2>/dev/null && echo $ZSH_THEME_SVN_PROMPT_DIRTY && return
+    echo $ZSH_THEME_SVN_PROMPT_CLEAN
+}
\ No newline at end of file

From 72392a2c27386706c78efe1ace9b84e602d9d1ff Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Mon, 6 Jan 2014 09:57:09 +0100
Subject: [PATCH 199/364] Adds all other dummy implementations.

---
 lib/ruby_prompts.zsh | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/lib/ruby_prompts.zsh b/lib/ruby_prompts.zsh
index 2ef334d5f..9ca6e1fc7 100644
--- a/lib/ruby_prompts.zsh
+++ b/lib/ruby_prompts.zsh
@@ -1,3 +1,10 @@
+function chruby_prompt_info hg_prompt_info pyenv_prompt_info \
+  rbenv_prompt_info svn_prompt_info vi_mode_prompt_info \
+  virtualenv_prompt_info {
+  return 1
+}
+
+# oh-my-zsh supports an rvm prompt by default
 # get the name of the rvm ruby version
 function rvm_prompt_info() {
   [ -f $HOME/.rvm/bin/rvm-prompt ] || return 1
@@ -7,12 +14,8 @@ function rvm_prompt_info() {
   echo "${ZSH_THEME_RVM_PROMPT_PREFIX:=(}${rvm_prompt}${ZSH_THEME_RVM_PROMPT_SUFFIX:=)}"
 }
 
-# using the chruby and/or rbenv plugins will override
-# these with real implementations
-function chruby_prompt_info rbenv_prompt_info {
-  return 1
-}
-
+# use this to enable users to see their ruby version, no matter which
+# version management system they use
 function ruby_prompt_info() {
   echo $(rvm_prompt_info || rbenv_prompt_info || chruby_prompt_info)
 }

From 082607c165c6ae16b7b059e941c8bfa3eddabbb8 Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Mon, 6 Jan 2014 09:57:23 +0100
Subject: [PATCH 200/364] Adds documentation.

---
 lib/ruby_prompts.zsh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lib/ruby_prompts.zsh b/lib/ruby_prompts.zsh
index 9ca6e1fc7..1aaf9de17 100644
--- a/lib/ruby_prompts.zsh
+++ b/lib/ruby_prompts.zsh
@@ -1,3 +1,15 @@
+# *_prompt_info functions for usage in your prompt
+#
+# Plugin creators, please add your *_prompt_info function to the list
+# of dummy implementations to help theme creators not receiving errors
+# without the need of implementing conditional clauses.
+#
+# See also lib/bzr.zsh, lib/git.zsh and lib/nvm.zsh for
+# git_prompt_info, bzr_prompt_info and nvm_prompt_info
+
+# Dummy implementations that return false to prevent command_not_found
+# errors with themes, that implement these functions
+# Real implementations will be used when the respective plugins are loaded
 function chruby_prompt_info hg_prompt_info pyenv_prompt_info \
   rbenv_prompt_info svn_prompt_info vi_mode_prompt_info \
   virtualenv_prompt_info {

From 85fde31991dc04f34450390e7d20992a7334c90a Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Mon, 6 Jan 2014 09:58:40 +0100
Subject: [PATCH 201/364] Renames the file to prompt_info_functions.zsh

---
 lib/{ruby_prompts.zsh => prompt_info_functions.zsh} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename lib/{ruby_prompts.zsh => prompt_info_functions.zsh} (100%)

diff --git a/lib/ruby_prompts.zsh b/lib/prompt_info_functions.zsh
similarity index 100%
rename from lib/ruby_prompts.zsh
rename to lib/prompt_info_functions.zsh

From 2d6d9d525fbf791affef71e2d7fd0a0f2cd0c30c Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Mon, 6 Jan 2014 09:59:50 +0100
Subject: [PATCH 202/364] Fixes RPROMPT in af-magic.zsh-theme

---
 themes/af-magic.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/af-magic.zsh-theme b/themes/af-magic.zsh-theme
index 4cf282590..f241efb6a 100644
--- a/themes/af-magic.zsh-theme
+++ b/themes/af-magic.zsh-theme
@@ -27,7 +27,7 @@ eval my_gray='$FG[237]'
 eval my_orange='$FG[214]'
 
 # right prompt
-PROMPT='$(virtualenv_prompt_info)$my_gray%n@%m%{$reset_color%}%'
+RPROMPT='$(virtualenv_prompt_info)$my_gray%n@%m%{$reset_color%}%'
 
 # git settings
 ZSH_THEME_GIT_PROMPT_PREFIX="$FG[075](branch:"

From 1304ed8d2521e452615bcf7563700018443f5470 Mon Sep 17 00:00:00 2001
From: Brice Dutheil <brice.dutheil@gmail.com>
Date: Mon, 6 Jan 2014 14:09:40 +0100
Subject: [PATCH 203/364] Report the SVN need upgrade

This happen when subversion 1.7+ is used on a repository created with subversion up to 1.6
---
 plugins/svn-fast-info/svn-fast-info.plugin.zsh | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/plugins/svn-fast-info/svn-fast-info.plugin.zsh b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
index d8fc53989..1027bcac2 100644
--- a/plugins/svn-fast-info/svn-fast-info.plugin.zsh
+++ b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
@@ -10,7 +10,7 @@
 # *** IMPORTANT *** DO NO USE with the simple svn plugin, this plugin acts as a replacement of it.
 
 function parse_svn() {
-    info=$(svn info 2> /dev/null) || return
+	info=$(svn info 2>&1) || return; # capture stdout and stdout
     in_svn=true
 	repo_need_upgrade="$(svn_repo_need_upgrade $info)"
     svn_branch_name="$(svn_get_branch_name $info)"
@@ -22,7 +22,13 @@ function parse_svn() {
 function svn_prompt_info() {
     eval parse_svn
 
-    if [ ${in_svn} ]; then
+	if [ ! -z $repo_need_upgrade ]; then
+		echo $ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX$ZSH_PROMPT_BASE_COLOR\
+$repo_need_upgrade\
+$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR
+	fi
+
+    if [[ ${in_svn} == true && -z $repo_need_upgrade ]]; then
         echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\
 $ZSH_THEME_REPO_NAME_COLOR${svn_branch_name}\
 $ZSH_PROMPT_BASE_COLOR${svn_dirty}\
@@ -34,8 +40,8 @@ $ZSH_PROMPT_BASE_COLOR"
 
 function svn_repo_need_upgrade() {
 	info=$1
-	[ -z "${info}" ] && info=$(svn info 2> /dev/null)
-	[ "${info}" = "E155036" ] && echo "upgrade repo with svn upgrade"
+	[ -z "${info}" ] && info=$(svn info 2>&1)
+	if grep -q "E155036" <<< $info; then echo "E155036: upgrade repo with svn upgrade"; fi
 }
 
 function svn_get_branch_name() {
@@ -61,4 +67,4 @@ function svn_get_revision() {
 function svn_dirty_choose() {
     svn status | grep -E '^\s*[ACDIM!?L]' > /dev/null 2>/dev/null && echo $ZSH_THEME_SVN_PROMPT_DIRTY && return
     echo $ZSH_THEME_SVN_PROMPT_CLEAN
-}
\ No newline at end of file
+}

From 642ae64bc50f93739ca280e8dcb1d6dbb5932f58 Mon Sep 17 00:00:00 2001
From: Brice Dutheil <brice.dutheil@gmail.com>
Date: Tue, 7 Jan 2014 02:10:34 +0100
Subject: [PATCH 204/364] Inline `parse_svn` to avoid leaky state

As noted in review, `in_svn` is not properly reset to false. This is better anyway to not leak state.
---
 .../svn-fast-info/svn-fast-info.plugin.zsh    | 38 +++++++++----------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/plugins/svn-fast-info/svn-fast-info.plugin.zsh b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
index 1027bcac2..e75f21599 100644
--- a/plugins/svn-fast-info/svn-fast-info.plugin.zsh
+++ b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
@@ -9,18 +9,14 @@
 #
 # *** IMPORTANT *** DO NO USE with the simple svn plugin, this plugin acts as a replacement of it.
 
-function parse_svn() {
-	info=$(svn info 2>&1) || return; # capture stdout and stdout
-    in_svn=true
-	repo_need_upgrade="$(svn_repo_need_upgrade $info)"
-    svn_branch_name="$(svn_get_branch_name $info)"
-    svn_dirty="$(svn_dirty_choose)"
-    svn_repo_name="$(svn_get_repo_name $info)"
-    svn_rev="$(svn_get_revision $info)"
-}
-
 function svn_prompt_info() {
-    eval parse_svn
+	info=$(svn info 2>&1) || return; # capture stdout and stdout
+	in_svn=true
+	repo_need_upgrade="$(svn_repo_need_upgrade $info)"
+	svn_branch_name="$(svn_get_branch_name $info)"
+	svn_dirty="$(svn_dirty_choose)"
+	svn_repo_name="$(svn_get_repo_name $info)"
+	svn_rev="$(svn_get_revision $info)"
 
 	if [ ! -z $repo_need_upgrade ]; then
 		echo $ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX$ZSH_PROMPT_BASE_COLOR\
@@ -28,13 +24,13 @@ $repo_need_upgrade\
 $ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR
 	fi
 
-    if [[ ${in_svn} == true && -z $repo_need_upgrade ]]; then
-        echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\
+	if [[ ${in_svn} == true && -z $repo_need_upgrade ]]; then
+		echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\
 $ZSH_THEME_REPO_NAME_COLOR${svn_branch_name}\
 $ZSH_PROMPT_BASE_COLOR${svn_dirty}\
 $ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX\
 $ZSH_PROMPT_BASE_COLOR"
-    fi
+	fi
 }
 
 
@@ -47,24 +43,24 @@ function svn_repo_need_upgrade() {
 function svn_get_branch_name() {
 	info=$1
 	[ -z "${info}" ] && info=$(svn info 2> /dev/null)
-    echo $info | grep '^URL:' | egrep -o '(tags|branches)/[^/]+|trunk' | egrep -o '[^/]+$' | read SVN_URL
-    echo $SVN_URL
+	echo $info | grep '^URL:' | egrep -o '(tags|branches)/[^/]+|trunk' | egrep -o '[^/]+$' | read SVN_URL
+	echo $SVN_URL
 }
 
 function svn_get_repo_name() {
 	info=$1
 	[ -z "${info}" ] && info=$(svn info 2> /dev/null)
-    echo $info | sed -n 's/Repository\ Root:\ .*\///p' | read SVN_ROOT
-    echo $info | sed -n "s/URL:\ .*$SVN_ROOT\///p"
+	echo $info | sed -n 's/Repository\ Root:\ .*\///p' | read SVN_ROOT
+	echo $info | sed -n "s/URL:\ .*$SVN_ROOT\///p"
 }
 
 function svn_get_revision() {
 	info=$1
 	[ -z "${info}" ] && info=$(svn info 2> /dev/null)
-    echo $info 2> /dev/null | sed -n s/Revision:\ //p
+	echo $info 2> /dev/null | sed -n s/Revision:\ //p
 }
 
 function svn_dirty_choose() {
-    svn status | grep -E '^\s*[ACDIM!?L]' > /dev/null 2>/dev/null && echo $ZSH_THEME_SVN_PROMPT_DIRTY && return
-    echo $ZSH_THEME_SVN_PROMPT_CLEAN
+	svn status | grep -E '^\s*[ACDIM!?L]' > /dev/null 2>/dev/null && echo $ZSH_THEME_SVN_PROMPT_DIRTY && return
+	echo $ZSH_THEME_SVN_PROMPT_CLEAN
 }

From 8bf8e1ecf9eeb4117b1196a5fd02d788979f05f7 Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Tue, 7 Jan 2014 10:07:02 +0100
Subject: [PATCH 205/364] Heavy refactor of svn-fast-info

---
 .../svn-fast-info/svn-fast-info.plugin.zsh    | 88 +++++++++++--------
 1 file changed, 50 insertions(+), 38 deletions(-)

diff --git a/plugins/svn-fast-info/svn-fast-info.plugin.zsh b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
index e75f21599..2183010ba 100644
--- a/plugins/svn-fast-info/svn-fast-info.plugin.zsh
+++ b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
@@ -1,4 +1,4 @@
-# vim:ft=zsh ts=2 sw=2 sts=2
+# vim:ft=zsh ts=2 sw=2 sts=2 et
 #
 # Faster alternative to the current SVN plugin implementation.
 #
@@ -10,57 +10,69 @@
 # *** IMPORTANT *** DO NO USE with the simple svn plugin, this plugin acts as a replacement of it.
 
 function svn_prompt_info() {
-	info=$(svn info 2>&1) || return; # capture stdout and stdout
-	in_svn=true
-	repo_need_upgrade="$(svn_repo_need_upgrade $info)"
-	svn_branch_name="$(svn_get_branch_name $info)"
-	svn_dirty="$(svn_dirty_choose)"
-	svn_repo_name="$(svn_get_repo_name $info)"
-	svn_rev="$(svn_get_revision $info)"
+  local info
+  info=$(svn info 2>&1) || return 1; # capture stdout and stderr
+  local repo_need_upgrade=$(svn_repo_need_upgrade $info)
 
-	if [ ! -z $repo_need_upgrade ]; then
-		echo $ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX$ZSH_PROMPT_BASE_COLOR\
-$repo_need_upgrade\
-$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR
-	fi
-
-	if [[ ${in_svn} == true && -z $repo_need_upgrade ]]; then
-		echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\
-$ZSH_THEME_REPO_NAME_COLOR${svn_branch_name}\
-$ZSH_PROMPT_BASE_COLOR${svn_dirty}\
-$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX\
-$ZSH_PROMPT_BASE_COLOR"
-	fi
+  if [ -n $repo_need_upgrade ]; then
+    printf '%s%s%s%s%s%s%s\n' \
+      $ZSH_PROMPT_BASE_COLOR \
+      $ZSH_THEME_SVN_PROMPT_PREFIX \
+      $ZSH_PROMPT_BASE_COLOR \
+      $repo_need_upgrade \
+      $ZSH_PROMPT_BASE_COLOR \
+      $ZSH_THEME_SVN_PROMPT_SUFFIX \
+      $ZSH_PROMPT_BASE_COLOR \
+  else
+    # something left for you to fix -
+    # repo name and rev aren't used here, did you forget them?
+    # especially since you set a repo name color
+    # if the prompt is alright this way, leave it as is and just
+    # delete the comment. The functions itself could stay imo,
+    # gives others the chance to use them.
+    printf '%s%s%s%s%s%s%s%s%s\n' \
+      $ZSH_PROMPT_BASE_COLOR \
+      $ZSH_THEME_SVN_PROMPT_PREFIX \
+      $ZSH_THEME_REPO_NAME_COLOR \
+      $(svn_get_branch_name $info)
+      ${svn_branch_name}\
+      $ZSH_PROMPT_BASE_COLOR
+      $(svn_dirty_choose $info)
+      $ZSH_PROMPT_BASE_COLOR
+      $ZSH_THEME_SVN_PROMPT_SUFFIX\
+      $ZSH_PROMPT_BASE_COLOR
+  fi
 }
 
-
 function svn_repo_need_upgrade() {
-	info=$1
-	[ -z "${info}" ] && info=$(svn info 2>&1)
-	if grep -q "E155036" <<< $info; then echo "E155036: upgrade repo with svn upgrade"; fi
+  grep -q "E155036" <<< ${1:-$(svn info 2> /dev/null)} && \
+    echo "E155036: upgrade repo with svn upgrade"
 }
 
 function svn_get_branch_name() {
-	info=$1
-	[ -z "${info}" ] && info=$(svn info 2> /dev/null)
-	echo $info | grep '^URL:' | egrep -o '(tags|branches)/[^/]+|trunk' | egrep -o '[^/]+$' | read SVN_URL
-	echo $SVN_URL
+  echo ${1:-$(svn info 2> /dev/null)} |\
+    grep '^URL:' | egrep -o '(tags|branches)/[^/]+|trunk' |\
+    egrep -o '[^/]+$'
 }
 
 function svn_get_repo_name() {
-	info=$1
-	[ -z "${info}" ] && info=$(svn info 2> /dev/null)
-	echo $info | sed -n 's/Repository\ Root:\ .*\///p' | read SVN_ROOT
-	echo $info | sed -n "s/URL:\ .*$SVN_ROOT\///p"
+  # I think this can be further cleaned up as well, not sure how,
+  # as I can't test it
+  local svn_root
+  local info=${1:-$(svn info 2> /dev/null)}
+  echo $info | sed 's/Repository\ Root:\ .*\///p' | read svn_root
+  echo $info | sed "s/URL:\ .*$svn_root\///p"
 }
 
 function svn_get_revision() {
-	info=$1
-	[ -z "${info}" ] && info=$(svn info 2> /dev/null)
-	echo $info 2> /dev/null | sed -n s/Revision:\ //p
+  # does this work as it should?
+  echo ${1:-$(svn info 2> /dev/null)} | sed 's/Revision: //p'
 }
 
 function svn_dirty_choose() {
-	svn status | grep -E '^\s*[ACDIM!?L]' > /dev/null 2>/dev/null && echo $ZSH_THEME_SVN_PROMPT_DIRTY && return
-	echo $ZSH_THEME_SVN_PROMPT_CLEAN
+  if svn status | grep -E '^\s*[ACDIM!?L]' &> /dev/null; then
+    echo $ZSH_THEME_SVN_PROMPT_DIRTY
+  else
+    echo $ZSH_THEME_SVN_PROMPT_CLEAN
+  fi
 }

From b0b79e0abae5f1d228e16c36174bad2bf7ba5fee Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Tue, 7 Jan 2014 19:08:20 +0100
Subject: [PATCH 206/364] No need to eval in rvm_prompt_info!

Just activate word-splitting.
---
 lib/prompt_info_functions.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/prompt_info_functions.zsh b/lib/prompt_info_functions.zsh
index 1aaf9de17..335c02a3d 100644
--- a/lib/prompt_info_functions.zsh
+++ b/lib/prompt_info_functions.zsh
@@ -21,7 +21,7 @@ function chruby_prompt_info hg_prompt_info pyenv_prompt_info \
 function rvm_prompt_info() {
   [ -f $HOME/.rvm/bin/rvm-prompt ] || return 1
   local rvm_prompt
-  rvm_prompt=$(eval "$HOME/.rvm/bin/rvm-prompt $ZSH_THEME_RVM_PROMPT_OPTIONS" 2>/dev/null)
+  rvm_prompt=$($HOME/.rvm/bin/rvm-prompt ${=ZSH_THEME_RVM_PROMPT_OPTIONS} 2>/dev/null)
   [[ "${rvm_prompt}x" == "x" ]] && return 1
   echo "${ZSH_THEME_RVM_PROMPT_PREFIX:=(}${rvm_prompt}${ZSH_THEME_RVM_PROMPT_SUFFIX:=)}"
 }

From 8ede6c6af3b3f11d9b688e4bf9c97be8a54c6c4d Mon Sep 17 00:00:00 2001
From: Brice Dutheil <brice.dutheil@gmail.com>
Date: Wed, 8 Jan 2014 02:50:58 +0100
Subject: [PATCH 207/364] Added further cleanup and svn status information

---
 .../svn-fast-info/svn-fast-info.plugin.zsh    | 64 +++++++++----------
 1 file changed, 30 insertions(+), 34 deletions(-)

diff --git a/plugins/svn-fast-info/svn-fast-info.plugin.zsh b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
index 2183010ba..2d43d365b 100644
--- a/plugins/svn-fast-info/svn-fast-info.plugin.zsh
+++ b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
@@ -14,7 +14,7 @@ function svn_prompt_info() {
   info=$(svn info 2>&1) || return 1; # capture stdout and stderr
   local repo_need_upgrade=$(svn_repo_need_upgrade $info)
 
-  if [ -n $repo_need_upgrade ]; then
+  if [[ -n $repo_need_upgrade ]]; then
     printf '%s%s%s%s%s%s%s\n' \
       $ZSH_PROMPT_BASE_COLOR \
       $ZSH_THEME_SVN_PROMPT_PREFIX \
@@ -22,57 +22,53 @@ function svn_prompt_info() {
       $repo_need_upgrade \
       $ZSH_PROMPT_BASE_COLOR \
       $ZSH_THEME_SVN_PROMPT_SUFFIX \
-      $ZSH_PROMPT_BASE_COLOR \
+      $ZSH_PROMPT_BASE_COLOR
   else
-    # something left for you to fix -
-    # repo name and rev aren't used here, did you forget them?
-    # especially since you set a repo name color
-    # if the prompt is alright this way, leave it as is and just
-    # delete the comment. The functions itself could stay imo,
-    # gives others the chance to use them.
-    printf '%s%s%s%s%s%s%s%s%s\n' \
+    printf '%s%s%s %s%s:%s%s%s%s%s' \
       $ZSH_PROMPT_BASE_COLOR \
       $ZSH_THEME_SVN_PROMPT_PREFIX \
-      $ZSH_THEME_REPO_NAME_COLOR \
-      $(svn_get_branch_name $info)
-      ${svn_branch_name}\
-      $ZSH_PROMPT_BASE_COLOR
-      $(svn_dirty_choose $info)
-      $ZSH_PROMPT_BASE_COLOR
-      $ZSH_THEME_SVN_PROMPT_SUFFIX\
+      \
+      "$(svn_status_info $info)" \
+      $ZSH_PROMPT_BASE_COLOR \
+      \
+      $ZSH_THEME_BRANCH_NAME_COLOR \
+      $(svn_get_branch_name $info) \
+      $ZSH_PROMPT_BASE_COLOR \
+      \
+      $(svn_get_revision $info) \
+      $ZSH_PROMPT_BASE_COLOR \
+      \
+      $ZSH_THEME_SVN_PROMPT_SUFFIX \
       $ZSH_PROMPT_BASE_COLOR
   fi
 }
 
+
 function svn_repo_need_upgrade() {
   grep -q "E155036" <<< ${1:-$(svn info 2> /dev/null)} && \
     echo "E155036: upgrade repo with svn upgrade"
 }
 
 function svn_get_branch_name() {
-  echo ${1:-$(svn info 2> /dev/null)} |\
-    grep '^URL:' | egrep -o '(tags|branches)/[^/]+|trunk' |\
-    egrep -o '[^/]+$'
+  grep '^URL:' <<< "${1:-$(svn info 2> /dev/null)}" | egrep -o '(tags|branches)/[^/]+|trunk'	
 }
 
-function svn_get_repo_name() {
-  # I think this can be further cleaned up as well, not sure how,
-  # as I can't test it
-  local svn_root
-  local info=${1:-$(svn info 2> /dev/null)}
-  echo $info | sed 's/Repository\ Root:\ .*\///p' | read svn_root
-  echo $info | sed "s/URL:\ .*$svn_root\///p"
+function svn_get_repo_root_name() {
+  grep '^Repository\ Root:' <<< "${1:-$(svn info 2> /dev/null)}" | sed 's#.*/##'
 }
 
 function svn_get_revision() {
-  # does this work as it should?
-  echo ${1:-$(svn info 2> /dev/null)} | sed 's/Revision: //p'
+  echo "${1:-$(svn info 2> /dev/null)}" | sed -n 's/Revision: //p'
 }
 
-function svn_dirty_choose() {
-  if svn status | grep -E '^\s*[ACDIM!?L]' &> /dev/null; then
-    echo $ZSH_THEME_SVN_PROMPT_DIRTY
-  else
-    echo $ZSH_THEME_SVN_PROMPT_CLEAN
-  fi
+function svn_status_info() {
+  local svn_status_string="$ZSH_THEME_SVN_PROMPT_CLEAN"
+  local svn_status="$(svn status 2> /dev/null)";
+  if grep -E '^\s*A' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_ADDITIONS:-+}"; fi
+  if grep -E '^\s*D' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_DELETIONS:-✖}"; fi
+  if grep -E '^\s*M' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_MODIFICATIONS:-✎}"; fi
+  if grep -E '^\s*[R~]' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_REPLACEMENTS:-∿}"; fi
+  if grep -E '^\s*\?' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_UNTRACKED:-?}"; fi
+  if grep -E '^\s*[CI!L]' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_DIRTY:-'!'}"; fi
+  echo $svn_status_string
 }

From f66ab7f98f9be0486b3a55858d9466232fc97ef6 Mon Sep 17 00:00:00 2001
From: Brice Dutheil <brice.dutheil@gmail.com>
Date: Wed, 8 Jan 2014 03:04:54 +0100
Subject: [PATCH 208/364] Renamed the methods of this script

---
 .../svn-fast-info/svn-fast-info.plugin.zsh    | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/plugins/svn-fast-info/svn-fast-info.plugin.zsh b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
index 2d43d365b..a12007ec6 100644
--- a/plugins/svn-fast-info/svn-fast-info.plugin.zsh
+++ b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
@@ -4,12 +4,10 @@
 #
 # Works with svn 1.6, 1.7, 1.8.
 # Use `svn_prompt_info` method to enquire the svn data.
-# It's faster because his efficient use of svn (single svn call) done in the `parse_svn` function
-# Also changed prompt suffix *after* the svn dirty marker
-#
-# *** IMPORTANT *** DO NO USE with the simple svn plugin, this plugin acts as a replacement of it.
+# It's faster because his efficient use of svn (single svn call) which saves a lot on a huge codebase
+# It displays the current status of the local files (added, deleted, modified, replaced, or else...)
 
-function svn_prompt_info() {
+function svn_fast_info() {
   local info
   info=$(svn info 2>&1) || return 1; # capture stdout and stderr
   local repo_need_upgrade=$(svn_repo_need_upgrade $info)
@@ -32,10 +30,10 @@ function svn_prompt_info() {
       $ZSH_PROMPT_BASE_COLOR \
       \
       $ZSH_THEME_BRANCH_NAME_COLOR \
-      $(svn_get_branch_name $info) \
+      $(svn_current_branch_name $info) \
       $ZSH_PROMPT_BASE_COLOR \
       \
-      $(svn_get_revision $info) \
+      $(svn_current_revision $info) \
       $ZSH_PROMPT_BASE_COLOR \
       \
       $ZSH_THEME_SVN_PROMPT_SUFFIX \
@@ -43,21 +41,20 @@ function svn_prompt_info() {
   fi
 }
 
-
 function svn_repo_need_upgrade() {
   grep -q "E155036" <<< ${1:-$(svn info 2> /dev/null)} && \
     echo "E155036: upgrade repo with svn upgrade"
 }
 
-function svn_get_branch_name() {
+function svn_current_branch_name() {
   grep '^URL:' <<< "${1:-$(svn info 2> /dev/null)}" | egrep -o '(tags|branches)/[^/]+|trunk'	
 }
 
-function svn_get_repo_root_name() {
+function svn_repo_root_name() {
   grep '^Repository\ Root:' <<< "${1:-$(svn info 2> /dev/null)}" | sed 's#.*/##'
 }
 
-function svn_get_revision() {
+function svn_current_revision() {
   echo "${1:-$(svn info 2> /dev/null)}" | sed -n 's/Revision: //p'
 }
 

From ca129bb55085cf93510346dcd70b1190b87d5bc0 Mon Sep 17 00:00:00 2001
From: Brice Dutheil <brice.dutheil@gmail.com>
Date: Fri, 10 Jan 2014 14:03:10 +0100
Subject: [PATCH 209/364] Renames main plugin function to `svn_prompt_info`

---
 plugins/svn-fast-info/svn-fast-info.plugin.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/svn-fast-info/svn-fast-info.plugin.zsh b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
index a12007ec6..ea19bcea0 100644
--- a/plugins/svn-fast-info/svn-fast-info.plugin.zsh
+++ b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
@@ -6,8 +6,10 @@
 # Use `svn_prompt_info` method to enquire the svn data.
 # It's faster because his efficient use of svn (single svn call) which saves a lot on a huge codebase
 # It displays the current status of the local files (added, deleted, modified, replaced, or else...)
+#
+# Use as a drop-in replacement of the svn plugin not as complementary plugin
 
-function svn_fast_info() {
+function svn_prompt_info() {
   local info
   info=$(svn info 2>&1) || return 1; # capture stdout and stderr
   local repo_need_upgrade=$(svn_repo_need_upgrade $info)

From a6671919ab2a5b0732dbc07d6f8becd9346917da Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Fri, 10 Jan 2014 22:52:18 +0100
Subject: [PATCH 210/364] Fixes _rails_command

Changes precedence of the conditional clause, more recent versions come
first now. Fixes problems when users update their app and still have
the old rails files inside of their file tree.
Closes #2405 - check the discussion there for further info.
---
 plugins/rails/rails.plugin.zsh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
index 23d15a9a1..210fdfcf7 100644
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@@ -1,10 +1,10 @@
 function _rails_command () {
-  if [ -e "script/server" ]; then
-    ruby script/$@
+  if [ -e "bin/rails" ]; then
+    bin/rails $@
   elif [ -e "script/rails" ]; then
     ruby script/rails $@
-  elif [ -e "bin/rails" ]; then
-    bin/rails $@
+  elif [ -e "script/server" ]; then
+    ruby script/$@
   else
     rails $@
   fi

From 23e57c177c44b3177c0545acaf9f6211db78f774 Mon Sep 17 00:00:00 2001
From: Tomas Pelka <tpelka@redhat.com>
Date: Thu, 16 Jan 2014 12:15:41 +0100
Subject: [PATCH 211/364] Adding commit hash to branch name in my favorit
 rjk-repos theme.

---
 themes/rkj-repos.zsh-theme | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/themes/rkj-repos.zsh-theme b/themes/rkj-repos.zsh-theme
index 4ab3bc757..6289427c2 100644
--- a/themes/rkj-repos.zsh-theme
+++ b/themes/rkj-repos.zsh-theme
@@ -18,8 +18,11 @@ ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[magenta]%}✂"
 ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[grey]%}✈"
 
 function mygit() {
-  ref=$(git symbolic-ref HEAD 2> /dev/null) || return
-  echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$( git_prompt_status )%{$reset_color%}$ZSH_THEME_GIT_PROMPT_SUFFIX"
+  ref1=$(git symbolic-ref HEAD 2> /dev/null) || return
+  ref2=$(git rev-parse HEAD | head -c 6) || return
+  ref="$ref1 %{$fg[grey]%}$ref2"
+  #ref=$(git symbolic-ref HEAD 2> /dev/null) $(git rev-parse HEAD | head -c 6) || return
+  echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$( git_prompt_status )%{$reset_color%}$ZSH_THEME_GIT_PROMPT_SUFFIX "
 }
 
 function retcode() {}

From 7b9e48992fa82a72587e451018926e2607172e95 Mon Sep 17 00:00:00 2001
From: Evgeny Golubev <evgeny@golubev.eu>
Date: Fri, 17 Jan 2014 12:59:14 +0300
Subject: [PATCH 212/364] Add Laravel4 plugin

---
 plugins/laravel4/laravel4.plugin.zsh | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 plugins/laravel4/laravel4.plugin.zsh

diff --git a/plugins/laravel4/laravel4.plugin.zsh b/plugins/laravel4/laravel4.plugin.zsh
new file mode 100644
index 000000000..4b1022b66
--- /dev/null
+++ b/plugins/laravel4/laravel4.plugin.zsh
@@ -0,0 +1,20 @@
+# Laravel4 basic command completion
+_laravel4_get_command_list () {
+	php artisan --no-ansi | sed "1,/Available commands/d" | awk '/^  [a-z]+/ { print $1 }'
+}
+
+_laravel4 () {
+  if [ -f artisan ]; then
+    compadd `_laravel4_get_command_list`
+  fi
+}
+
+compdef _laravel4 artisan
+compdef _laravel4 la4
+
+#Alias
+alias la4='php artisan'
+
+alias la4dump='php artisan dump-autoload'
+alias la4cache='php artisan cache:clear'
+alias la4routes='php artisan routes'

From cc8b09366b62d8f260e1cdd3d4a1acd868e5c9e0 Mon Sep 17 00:00:00 2001
From: Brice Dutheil <brice.dutheil@gmail.com>
Date: Mon, 6 Jan 2014 02:09:15 +0100
Subject: [PATCH 213/364] Adds a method that print a battery gauge

It is especially useful for themes, this function is a port of the code written by Steve Losh
and made available on [this blog entry](http://stevelosh.com/blog/2010/02/my-extravagant-zsh-prompt/#my-right-prompt-battery-capacity)
---
 plugins/battery/battery.plugin.zsh | 80 ++++++++++++++++++++++++++----
 1 file changed, 69 insertions(+), 11 deletions(-)

diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh
index 9f053383a..16ad3e651 100644
--- a/plugins/battery/battery.plugin.zsh
+++ b/plugins/battery/battery.plugin.zsh
@@ -11,8 +11,9 @@
 if [[ $(uname) == "Darwin" ]] ; then
 
   function battery_pct() {
-    typeset -F maxcapacity=$(ioreg -rc "AppleSmartBattery"| grep '^.*"MaxCapacity"\ =\ ' | sed -e 's/^.*"MaxCapacity"\ =\ //')
-    typeset -F currentcapacity=$(ioreg -rc "AppleSmartBattery"| grep '^.*"CurrentCapacity"\ =\ ' | sed -e 's/^.*CurrentCapacity"\ =\ //')
+    local smart_battery_status="$(ioreg -rc "AppleSmartBattery")"
+    typeset -F maxcapacity=$(echo $smart_battery_status | grep '^.*"MaxCapacity"\ =\ ' | sed -e 's/^.*"MaxCapacity"\ =\ //')
+    typeset -F currentcapacity=$(echo $smart_battery_status | grep '^.*"CurrentCapacity"\ =\ ' | sed -e 's/^.*CurrentCapacity"\ =\ //')
     integer i=$(((currentcapacity/maxcapacity) * 100))
     echo $i
   }
@@ -26,8 +27,9 @@ if [[ $(uname) == "Darwin" ]] ; then
   }
 
   function battery_time_remaining() {
-    if [[ $(ioreg -rc AppleSmartBattery | grep -c '^.*"ExternalConnected"\ =\ No') -eq 1 ]] ; then
-      timeremaining=$(ioreg -rc "AppleSmartBattery"| grep '^.*"AvgTimeToEmpty"\ =\ ' | sed -e 's/^.*"AvgTimeToEmpty"\ =\ //')
+  	local smart_battery_status="$(ioreg -rc "AppleSmartBattery")"
+    if [[ $(echo $smart_battery_status | grep -c '^.*"ExternalConnected"\ =\ No') -eq 1 ]] ; then
+      timeremaining=$(echo $smart_battery_status | grep '^.*"AvgTimeToEmpty"\ =\ ' | sed -e 's/^.*"AvgTimeToEmpty"\ =\ //')
       echo "~$((timeremaining / 60)):$((timeremaining % 60))"
     else
       echo "∞"
@@ -49,6 +51,10 @@ if [[ $(uname) == "Darwin" ]] ; then
       echo "∞"
     fi
   }
+  
+  function battery_is_charging() {
+	  [[ $(ioreg -rc "AppleSmartBattery"| grep '^.*"IsCharging"\ =\ ' | sed -e 's/^.*"IsCharging"\ =\ //') == "Yes" ]]
+  }
 
 elif [[ $(uname) == "Linux"  ]] ; then
 
@@ -79,14 +85,66 @@ elif [[ $(uname) == "Linux"  ]] ; then
       echo "∞"
     fi
   }
+  
+  function battery_pct() {
+    # todo for on linux
+  }
+  
+  function battery_is_charging() {
+    # todo on linux
+	false
+  }
+
 else
-	# Empty functions so we don't cause errors in prompts
-	function battery_pct_remaining() {
-	}
+  # Empty functions so we don't cause errors in prompts
+  function battery_pct_remaining() {
+  }
 
-	function battery_time_remaining() {
-	}
+  function battery_time_remaining() {
+  }
 
-	function battery_pct_prompt() {
-	}
+  function battery_pct_prompt() {
+  }
 fi
+
+function battery_level_gauge() {
+  local gauge_slots=${BATTERY_GAUGE_SLOTS:-10};
+  local green_threshold=${BATTERY_GREEN_THRESHOLD:-6};
+  local yellow_threshold=${BATTERY_YELLOW_THRESHOLD:-4};
+  local color_green=${BATTERY_COLOR_GREEN:-%F{green}};
+  local color_yellow=${BATTERY_COLOR_YELLOW:-%F{yellow}};
+  local color_red=${BATTERY_COLOR_RED:-%F{red}};
+  local color_reset=${BATTERY_COLOR_RESET:-%{%f%k%b%}};
+  local battery_prefix=${BATTERY_GAUGE_PREFIX:-'['};
+  local battery_suffix=${BATTERY_GAUGE_SUFFIX:-']'};
+  local filled_symbol=${BATTERY_GAUGE_FILLED_SYMBOL:-'▶'};
+  local empty_symbol=${BATTERY_GAUGE_EMPTY_SYMBOL:-'▷'};
+  local charging_color=${BATTERY_CHARGING_COLOR:-$color_yellow};
+  local charging_symbol=${BATTERY_CHARGING_SYMBOL:-'⚡'};
+
+  local battery_remaining_percentage=$(battery_pct);
+
+  if [[ $battery_remaining_percentage =~ [0-9]+ ]]; then
+    local filled=$(((( $battery_remaining_percentage + $gauge_slots - 1) / $gauge_slots)));
+    local empty=$(($gauge_slots - $filled));
+	
+    if [[ $filled -gt $green_threshold ]]; then local gauge_color=$color_green;
+    elif [[ $filled -gt $yellow_threshold ]]; then local gauge_color=$color_yellow;
+    else local gauge_color=$color_red;
+    fi
+  else
+    local filled=$gauge_slots;
+    local empty=0;
+  	filled_symbol=${BATTERY_UNKNOWN_SYMBOL:-'.'};
+  fi
+
+  
+  local charging=' ' && battery_is_charging && charging=$charging_symbol;
+
+  printf ${charging_color//\%/\%\%}$charging${color_reset//\%/\%\%}${battery_prefix//\%/\%\%}${gauge_color//\%/\%\%}
+  printf ${filled_symbol//\%/\%\%}'%.0s' {1..$filled}
+  [[ $filled -lt $gauge_slots ]] && printf ${empty_symbol//\%/\%\%}'%.0s' {1..$empty}
+  printf ${color_reset//\%/\%\%}${battery_suffix//\%/\%\%}${color_reset//\%/\%\%}
+}
+
+

From 9b3344dd8085bdcb16d08b5e47492b275e44955e Mon Sep 17 00:00:00 2001
From: Kevin Lange <k@dakko.us>
Date: Thu, 23 Jan 2014 20:58:23 -0800
Subject: [PATCH 214/364] change nyancat telnet server

miku.acm.uiuc.edu was decommissioned a while ago; this is a sanctioned mirror
---
 plugins/nyan/nyan.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/nyan/nyan.plugin.zsh b/plugins/nyan/nyan.plugin.zsh
index 6321e5f5a..af01c9605 100644
--- a/plugins/nyan/nyan.plugin.zsh
+++ b/plugins/nyan/nyan.plugin.zsh
@@ -1,5 +1,5 @@
 if [[ -x `which nc` ]]; then
-  alias nyan='nc -v miku.acm.uiuc.edu 23' # nyan cat
+  alias nyan='nc -v nyan.howes.net.nz 23' # nyan cat
 fi
 
 

From a48fd1e80882e1f3008d5ee027b3e41d38844414 Mon Sep 17 00:00:00 2001
From: Kevin Lange <k@dakko.us>
Date: Fri, 24 Jan 2014 10:27:41 -0800
Subject: [PATCH 215/364] Update nyan.plugin.zsh

---
 plugins/nyan/nyan.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/nyan/nyan.plugin.zsh b/plugins/nyan/nyan.plugin.zsh
index af01c9605..ac9d0017e 100644
--- a/plugins/nyan/nyan.plugin.zsh
+++ b/plugins/nyan/nyan.plugin.zsh
@@ -1,5 +1,5 @@
 if [[ -x `which nc` ]]; then
-  alias nyan='nc -v nyan.howes.net.nz 23' # nyan cat
+  alias nyan='nc -v nyancat.dakko.us 23' # nyan cat
 fi
 
 

From 3d41804fbce109a09f8d9549e875b428621cd85b Mon Sep 17 00:00:00 2001
From: Christoph Heer <Christoph.Heer@gmail.com>
Date: Fri, 24 Jan 2014 23:01:35 +0100
Subject: [PATCH 216/364] Improve virtualenv prompt in steeef theme

---
 themes/steeef.zsh-theme | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/themes/steeef.zsh-theme b/themes/steeef.zsh-theme
index 312229e9f..e0080b8a5 100644
--- a/themes/steeef.zsh-theme
+++ b/themes/steeef.zsh-theme
@@ -8,7 +8,7 @@
 # http://briancarper.net/blog/570/git-info-in-your-zsh-prompt
 
 function virtualenv_info {
-    [ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`') '
+    [ $VIRTUAL_ENV ] && echo '('$fg[blue]`basename $VIRTUAL_ENV`%{$reset_color%}') '
 }
 PR_GIT_UPDATE=1
 
@@ -87,7 +87,7 @@ function steeef_precmd {
         else
             FMT_BRANCH="(%{$turquoise%}%b%u%c${PR_RST})"
         fi
-        zstyle ':vcs_info:*:prompt:*' formats       "${FMT_BRANCH}"
+        zstyle ':vcs_info:*:prompt:*' formats "${FMT_BRANCH} "
 
         vcs_info 'prompt'
         PR_GIT_UPDATE=
@@ -96,5 +96,5 @@ function steeef_precmd {
 add-zsh-hook precmd steeef_precmd
 
 PROMPT=$'
-%{$purple%}%n%{$reset_color%} at %{$orange%}%m%{$reset_color%} in %{$limegreen%}%~%{$reset_color%} $vcs_info_msg_0_
-$(virtualenv_info)$ '
+%{$purple%}%n%{$reset_color%} at %{$orange%}%m%{$reset_color%} in %{$limegreen%}%~%{$reset_color%} $vcs_info_msg_0_$(virtualenv_info)%{$reset_color%}
+$ '

From 78ffa71cb6ecb40ec8ca97d5fb9682ceb74a05b7 Mon Sep 17 00:00:00 2001
From: mrbfrank <mrbfrank@gmail.com>
Date: Tue, 28 Jan 2014 18:02:40 -0600
Subject: [PATCH 217/364] updated url to latest powerline-patched fonts

clearing up some confusion in issue#1906
---
 themes/agnoster.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index 01cdc80e5..a0d60ea88 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -6,7 +6,7 @@
 # # README
 #
 # In order for this theme to render correctly, you will need a
-# [Powerline-patched font](https://gist.github.com/1595572).
+# [Powerline-patched font](https://github.com/Lokaltog/powerline-fonts).
 #
 # In addition, I recommend the
 # [Solarized theme](https://github.com/altercation/solarized/) and, if you're

From 7daaa188da6255ef89f3076ad70370dd31762437 Mon Sep 17 00:00:00 2001
From: mrbfrank <mrbfrank@gmail.com>
Date: Tue, 28 Jan 2014 21:54:00 -0600
Subject: [PATCH 218/364] corrected branch character
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

changed ± to 
---
 themes/agnoster.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index a0d60ea88..a5c47f9b5 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -90,7 +90,7 @@ prompt_git() {
     zstyle ':vcs_info:*' formats ' %u%c'
     zstyle ':vcs_info:*' actionformats '%u%c'
     vcs_info
-    echo -n "${ref/refs\/heads\//± }${vcs_info_msg_0_}"
+    echo -n "${ref/refs\/heads\// }${vcs_info_msg_0_}"
   fi
 }
 

From 685ea4a36162a0bca9b0176b268c25e45023e97e Mon Sep 17 00:00:00 2001
From: mrbfrank <mrbfrank@gmail.com>
Date: Wed, 29 Jan 2014 13:35:21 -0600
Subject: [PATCH 219/364] theme agnoster: remove trailing space

re-implemented expired pull request https://github.com/robbyrussell/oh-my-zsh/pull/1759
---
 themes/agnoster.zsh-theme | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index a5c47f9b5..85b846cb5 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -88,9 +88,9 @@ prompt_git() {
     zstyle ':vcs_info:*' stagedstr '✚'
     zstyle ':vcs_info:git:*' unstagedstr '●'
     zstyle ':vcs_info:*' formats ' %u%c'
-    zstyle ':vcs_info:*' actionformats '%u%c'
+    zstyle ':vcs_info:*' actionformats ' %u%c'
     vcs_info
-    echo -n "${ref/refs\/heads\// }${vcs_info_msg_0_}"
+    echo -n "${ref/refs\/heads\// }${vcs_info_msg_0_%% }"
   fi
 }
 

From 4d83da770a85f4d2e6b0e0990cb83c925de128bd Mon Sep 17 00:00:00 2001
From: Felds Liscia <felds@carbon6.cc>
Date: Thu, 30 Jan 2014 15:04:09 -0200
Subject: [PATCH 220/364] highlight the username when root

---
 themes/ys.zsh-theme | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/themes/ys.zsh-theme b/themes/ys.zsh-theme
index 43c101c2a..a44f295f4 100644
--- a/themes/ys.zsh-theme
+++ b/themes/ys.zsh-theme
@@ -32,3 +32,16 @@ PROMPT="
 ${git_info} \
 %{$fg[white]%}[%*]
 %{$terminfo[bold]$fg[red]%}$ %{$reset_color%}"
+
+if [[ "$(whoami)" == "root" ]]; then
+PROMPT="
+%{$terminfo[bold]$fg[blue]%}#%{$reset_color%} \
+%{$bg[yellow]%}%{$fg[cyan]%}%n%{$reset_color%} \
+%{$fg[white]%}at \
+%{$fg[green]%}$(box_name) \
+%{$fg[white]%}in \
+%{$terminfo[bold]$fg[yellow]%}${current_dir}%{$reset_color%}\
+${git_info} \
+%{$fg[white]%}[%*]
+%{$terminfo[bold]$fg[red]%}$ %{$reset_color%}"
+fi

From 217d8f0540a41b2927caf986561e45634fa1952a Mon Sep 17 00:00:00 2001
From: "Huang, Tao" <tech@huangtao.me>
Date: Thu, 6 Feb 2014 17:29:33 +0800
Subject: [PATCH 221/364] `fc -l 1` instead of `history` in zsh_stats #2501

$HIST_STAMP breaks zsh_stats. see #2501
---
 lib/functions.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/functions.zsh b/lib/functions.zsh
index aaf8a03e3..fda84a953 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -1,5 +1,5 @@
 function zsh_stats() {
-  history | awk '{CMD[$2]++;count++;}END { for (a in CMD)print CMD[a] " " CMD[a]/count*100 "% " a;}' | grep -v "./" | column -c3 -s " " -t | sort -nr | nl |  head -n20
+  fc -l 1 | awk '{CMD[$2]++;count++;}END { for (a in CMD)print CMD[a] " " CMD[a]/count*100 "% " a;}' | grep -v "./" | column -c3 -s " " -t | sort -nr | nl |  head -n20
 }
 
 function uninstall_oh_my_zsh() {

From ed19ffee5ecc0db6617c1ae753e515d60cb486c6 Mon Sep 17 00:00:00 2001
From: Pavol Juhas <pavol.juhas@gmail.com>
Date: Sat, 8 Feb 2014 19:49:54 -0500
Subject: [PATCH 222/364] Add scd plugin for smart change of directory.

Synced with the scd-tracker branch pavoljuhas/oh-my-zsh@9d04d8ca78030d4c9af4bf0f58b49532a6ef1b35
---
 plugins/scd/README.md      | 123 +++++++++++++
 plugins/scd/scd            | 350 +++++++++++++++++++++++++++++++++++++
 plugins/scd/scd.plugin.zsh |  19 ++
 3 files changed, 492 insertions(+)
 create mode 100644 plugins/scd/README.md
 create mode 100755 plugins/scd/scd
 create mode 100644 plugins/scd/scd.plugin.zsh

diff --git a/plugins/scd/README.md b/plugins/scd/README.md
new file mode 100644
index 000000000..ea7c72464
--- /dev/null
+++ b/plugins/scd/README.md
@@ -0,0 +1,123 @@
+# scd - smart change of directory
+
+Define `scd` shell function for changing to any directory with
+a few keystrokes.
+
+`scd` keeps history of the visited directories, which serves as an index of
+the known paths.  The directory index is updated after every `cd` command in
+the shell and can be also filled manually by running `scd -a`.  To switch to
+some directory, `scd` needs few fragments of the desired path to match with
+the index.  A selection menu is displayed in case of several matches, with a
+preference given to recently visited paths.  `scd` can create permanent
+directory aliases, which appear as named directories in zsh session.
+
+## INSTALLATION
+
+For oh-my-zsh, add `scd` to the `plugins` array in the ~/.zshrc file as in the
+[template file](../../templates/zshrc.zsh-template#L45).
+
+Besides zsh, `scd` can be used with *bash*, *dash* or *tcsh*
+shells and is also available as [Vim](http://www.vim.org/) plugin and
+[IPython](http://ipython.org/) extension.  For installation details, see
+https://github.com/pavoljuhas/smart-change-directory.
+
+## SYNOPSIS
+
+```sh
+scd [options] [pattern1 pattern2 ...]
+```
+
+## OPTIONS
+
+<dl><dt>
+-a, --add</dt><dd>
+  add specified directories to the directory index.</dd><dt>
+
+--unindex</dt><dd>
+  remove specified directories from the index.</dd><dt>
+
+-r, --recursive</dt><dd>
+  apply options <em>--add</em> or <em>--unindex</em> recursively.</dd><dt>
+
+--alias=ALIAS</dt><dd>
+  create alias for the current or specified directory and save it to
+  <em>~/.scdalias.zsh</em>.</dd><dt>
+
+--unalias</dt><dd>
+  remove ALIAS definition for the current or specified directory from
+  <em>~/.scdalias.zsh</em>.</dd><dt>
+
+--list</dt><dd>
+  show matching directories and exit.</dd><dt>
+
+-v, --verbose</dt><dd>
+  display directory rank in the selection menu.</dd><dt>
+
+-h, --help</dt><dd>
+  display this options summary and exit.</dd>
+</dl>
+
+## Examples
+
+```sh
+# Index recursively some paths for the very first run
+scd -ar ~/Documents/
+
+# Change to a directory path matching "doc"
+scd doc
+
+# Change to a path matching all of "a", "b" and "c"
+scd a b c
+
+# Change to a directory path that ends with "ts"
+scd "ts(#e)"
+
+# Show selection menu and ranking of 20 most likely directories
+scd -v
+
+# Alias current directory as "xray"
+scd --alias=xray
+
+# Jump to a previously defined aliased directory
+scd xray
+```
+
+# FILES
+
+<dl><dt>
+~/.scdhistory</dt><dd>
+    time-stamped index of visited directories.</dd><dt>
+
+~/.scdalias.zsh</dt><dd>
+    scd-generated definitions of directory aliases.</dd>
+</dl>
+
+# ENVIRONMENT
+
+<dl><dt>
+SCD_HISTFILE</dt><dd>
+    path to the scd index file (by default ~/.scdhistory).</dd><dt>
+
+SCD_HISTSIZE</dt><dd>
+    maximum number of entries in the index (5000).  Index is trimmed when it
+    exceeds <em>SCD_HISTSIZE</em> by more than 20%.</dd><dt>
+
+SCD_MENUSIZE</dt><dd>
+    maximum number of items for directory selection menu (20).</dd><dt>
+
+SCD_MEANLIFE</dt><dd>
+    mean lifetime in seconds for exponential decay of directory
+    likelihood (86400).</dd><dt>
+
+SCD_THRESHOLD</dt><dd>
+    threshold for cumulative directory likelihood.  Directories with
+    lower likelihood are excluded unless they are the only match to
+    scd patterns.
+    </dd><dt>
+
+SCD_SCRIPT</dt><dd>
+    command script file where scd writes the final <code>cd</code>
+    command.  This variable must be defined when scd runs in its own
+    process rather than as a shell function.  It is up to the
+    scd caller to use the output in <em>SCD_SCRIPT</em>.</dd>
+</dl>
diff --git a/plugins/scd/scd b/plugins/scd/scd
new file mode 100755
index 000000000..9e055eadd
--- /dev/null
+++ b/plugins/scd/scd
@@ -0,0 +1,350 @@
+#!/bin/zsh -f
+
+emulate -L zsh
+if [[ $(whence -w $0) == *:' 'command ]]; then
+    emulate -R zsh
+    alias return=exit
+    local RUNNING_AS_COMMAND=1
+fi
+
+local DOC='scd -- smart change to a recently used directory
+usage: scd [options] [pattern1 pattern2 ...]
+Go to a directory path that contains all fixed string patterns.  Prefer
+recently visited directories and directories with patterns in their tail
+component.  Display a selection menu in case of multiple matches.
+
+Options:
+  -a, --add         add specified directories to the directory index
+  --unindex         remove specified directories from the index
+  -r, --recursive   apply options --add or --unindex recursively
+  --alias=ALIAS     create alias for the current or specified directory and
+                    store it in ~/.scdalias.zsh
+  --unalias         remove ALIAS definition for the current or specified
+                    directory from ~/.scdalias.zsh
+  --list            show matching directories and exit
+  -v, --verbose     display directory rank in the selection menu
+  -h, --help        display this message and exit
+'
+
+local SCD_HISTFILE=${SCD_HISTFILE:-${HOME}/.scdhistory}
+local SCD_HISTSIZE=${SCD_HISTSIZE:-5000}
+local SCD_MENUSIZE=${SCD_MENUSIZE:-20}
+local SCD_MEANLIFE=${SCD_MEANLIFE:-86400}
+local SCD_THRESHOLD=${SCD_THRESHOLD:-0.005}
+local SCD_SCRIPT=${RUNNING_AS_COMMAND:+$SCD_SCRIPT}
+local SCD_ALIAS=~/.scdalias.zsh
+
+local ICASE a d m p i tdir maxrank threshold
+local opt_help opt_add opt_unindex opt_recursive opt_verbose
+local opt_alias opt_unalias opt_list
+local -A drank dalias dkey
+local dmatching
+
+setopt extendedhistory extendedglob noautonamedirs brace_ccl
+
+# If SCD_SCRIPT is defined make sure the file exists and is empty.
+# This removes any previous old commands.
+[[ -n "$SCD_SCRIPT" ]] && [[ -s $SCD_SCRIPT || ! -f $SCD_SCRIPT ]] && (
+    umask 077
+    : >| $SCD_SCRIPT
+)
+
+# process command line options
+zmodload -i zsh/zutil
+zmodload -i zsh/datetime
+zparseopts -D -- a=opt_add -add=opt_add -unindex=opt_unindex \
+    r=opt_recursive -recursive=opt_recursive \
+    -alias:=opt_alias -unalias=opt_unalias -list=opt_list \
+    v=opt_verbose -verbose=opt_verbose h=opt_help -help=opt_help \
+    || return $?
+
+if [[ -n $opt_help ]]; then
+    print $DOC
+    return
+fi
+
+# load directory aliases if they exist
+[[ -r $SCD_ALIAS ]] && source $SCD_ALIAS
+
+# works faster than the (:a) modifier and is compatible with zsh 4.2.6
+_scd_Y19oug_abspath() {
+    set -A $1 ${(ps:\0:)"$(
+        unfunction -m "*"; shift
+        for d; do
+            cd $d && print -Nr -- $PWD && cd $OLDPWD
+        done
+        )"}
+}
+
+# define directory alias
+if [[ -n $opt_alias ]]; then
+    if [[ -n $1 && ! -d $1 ]]; then
+        print -u2 "'$1' is not a directory"
+        return 1
+    fi
+    a=${opt_alias[-1]#=}
+    _scd_Y19oug_abspath d ${1:-$PWD}
+    # alias in the current shell, update alias file if successful
+    hash -d -- $a=$d &&
+    (
+        umask 077
+        hash -dr
+        [[ -r $SCD_ALIAS ]] && source $SCD_ALIAS
+        hash -d -- $a=$d
+        hash -dL >| $SCD_ALIAS
+    )
+    return $?
+fi
+
+# undefine directory alias
+if [[ -n $opt_unalias ]]; then
+    if [[ -n $1 && ! -d $1 ]]; then
+        print -u2 "'$1' is not a directory"
+        return 1
+    fi
+    _scd_Y19oug_abspath a ${1:-$PWD}
+    a=$(print -rD ${a})
+    if [[ $a != [~][^/]## ]]; then
+        return
+    fi
+    a=${a#[~]}
+    # unalias in the current shell, update alias file if successful
+    if unhash -d -- $a 2>/dev/null && [[ -r $SCD_ALIAS ]]; then
+        (
+            umask 077
+            hash -dr
+            source $SCD_ALIAS
+            unhash -d -- $a 2>/dev/null &&
+            hash -dL >| $SCD_ALIAS
+        )
+    fi
+    return $?
+fi
+
+# Rewrite the history file if it is at least 20% oversized
+if [[ -s $SCD_HISTFILE ]] && \
+(( $(wc -l <$SCD_HISTFILE) > 1.2 * $SCD_HISTSIZE )); then
+    m=( ${(f)"$(<$SCD_HISTFILE)"} )
+    print -lr -- ${m[-$SCD_HISTSIZE,-1]} >| ${SCD_HISTFILE}
+fi
+
+# Internal functions are prefixed with "_scd_Y19oug_".
+# The "record" function adds a non-repeating directory to the history
+# and turns on history writing.
+_scd_Y19oug_record() {
+    while [[ -n $1 && $1 == ${history[$HISTCMD]} ]]; do
+        shift
+    done
+    if [[ $# != 0 ]]; then
+        ( umask 077; : >>| $SCD_HISTFILE )
+        p=": ${EPOCHSECONDS}:0;"
+        print -lr -- ${p}${^*} >> $SCD_HISTFILE
+    fi
+}
+
+if [[ -n $opt_add ]]; then
+    for a; do
+        if [[ ! -d $a ]]; then
+            print -u 2 "Directory $a does not exist"
+            return 2
+        fi
+    done
+    _scd_Y19oug_abspath m ${*:-$PWD}
+    _scd_Y19oug_record $m
+    if [[ -n $opt_recursive ]]; then
+        for d in $m; do
+            print -n "scanning ${d} ... "
+            _scd_Y19oug_record ${d}/**/*(-/N)
+            print "[done]"
+        done
+    fi
+    return
+fi
+
+# take care of removing entries from the directory index
+if [[ -n $opt_unindex ]]; then
+    if [[ ! -s $SCD_HISTFILE ]]; then
+        return
+    fi
+    # expand existing directories in the argument list
+    for i in {1..$#}; do
+        if [[ -d ${argv[i]} ]]; then
+            _scd_Y19oug_abspath d ${argv[i]}
+            argv[i]=${d}
+        fi
+    done
+    m="$(awk -v recursive=${opt_recursive} '
+        BEGIN {
+            for (i = 2; i < ARGC; ++i) {
+                argset[ARGV[i]] = 1;
+                delete ARGV[i];
+            }
+        }
+        1 {
+            d = $0;  sub(/^[^;]*;/, "", d);
+            if (d in argset)  next;
+        }
+        recursive {
+            for (a in argset) {
+                if (substr(d, 1, length(a) + 1) == a"/")  next;
+            }
+        }
+        { print $0 }
+        ' $SCD_HISTFILE ${*:-$PWD} )" || return $?
+    : >| ${SCD_HISTFILE}
+    [[ ${#m} == 0 ]] || print -r -- $m >> ${SCD_HISTFILE}
+    return
+fi
+
+# The "action" function is called when there is just one target directory.
+_scd_Y19oug_action() {
+    if [[ -n $opt_list ]]; then
+        for d; do
+            a=${(k)dalias[(r)${d}]}
+            print -r -- "# $a"
+            print -r -- $d
+        done
+    elif [[ $# == 1 ]]; then
+        if [[ -z $SCD_SCRIPT && -n $RUNNING_AS_COMMAND ]]; then
+            print -u2 "Warning: running as command with SCD_SCRIPT undefined."
+        fi
+        [[ -n $SCD_SCRIPT ]] && (umask 077;
+            print -r "cd ${(q)1}" >| $SCD_SCRIPT)
+        [[ -N $SCD_HISTFILE ]] && touch -a $SCD_HISTFILE
+        cd $1
+        # record the new directory unless already done in some chpwd hook
+        [[ -N $SCD_HISTFILE ]] || _scd_Y19oug_record $PWD
+    fi
+}
+
+# handle different argument scenarios ----------------------------------------
+
+## single argument that is an existing directory
+if [[ $# == 1 && -d $1 && -x $1 ]]; then
+    _scd_Y19oug_action $1
+    return $?
+## single argument that is an alias
+elif [[ $# == 1 && -d ${d::=${nameddirs[$1]}} ]]; then
+    _scd_Y19oug_action $d
+    return $?
+fi
+
+# ignore case unless there is an argument with an uppercase letter
+[[ "$*" == *[[:upper:]]* ]] || ICASE='(#i)'
+
+# calculate rank of all directories in the SCD_HISTFILE and keep it as drank
+# include a dummy entry for splitting of an empty string is buggy
+[[ -s $SCD_HISTFILE ]] && drank=( ${(f)"$(
+    print -l /dev/null -10
+    <$SCD_HISTFILE \
+    awk -v epochseconds=$EPOCHSECONDS -v meanlife=$SCD_MEANLIFE '
+        BEGIN { FS = "[:;]"; }
+        length($0) < 4096 && $2 > 0 {
+            tau = 1.0 * ($2 - epochseconds) / meanlife;
+            if (tau < -4.61)  tau = -4.61;
+            prec = exp(tau);
+            sub(/^[^;]*;/, "");
+            if (NF)  ptot[$0] += prec;
+        }
+        END { for (di in ptot)  { print di; print ptot[di]; } }'
+    )"}
+)
+unset "drank[/dev/null]"
+
+# filter drank to the entries that match all arguments
+for a; do
+    p=${ICASE}"*${a}*"
+    drank=( ${(kv)drank[(I)${~p}]} )
+done
+
+# build a list of matching directories reverse-sorted by their probabilities
+dmatching=( ${(f)"$(
+    for d p in ${(kv)drank}; do
+        print -r -- "$p $d";
+    done | sort -grk1 | cut -d ' ' -f 2-
+    )"}
+)
+
+# if some directory paths match all patterns in order, discard all others
+p=${ICASE}"*${(j:*:)argv}*"
+m=( ${(M)dmatching:#${~p}} )
+[[ -d ${m[1]} ]] && dmatching=( $m )
+# if some directory names match last pattern, discard all others
+p=${ICASE}"*${(j:*:)argv}[^/]#"
+m=( ${(M)dmatching:#${~p}} )
+[[ -d ${m[1]} ]] && dmatching=( $m )
+# if some directory names match all patterns, discard all others
+m=( $dmatching )
+for a; do
+    p=${ICASE}"*/[^/]#${a}[^/]#"
+    m=( ${(M)m:#${~p}} )
+done
+[[ -d ${m[1]} ]] && dmatching=( $m )
+# if some directory names match all patterns in order, discard all others
+p=${ICASE}"/*${(j:[^/]#:)argv}[^/]#"
+m=( ${(M)dmatching:#${~p}} )
+[[ -d ${m[1]} ]] && dmatching=( $m )
+
+# do not match $HOME or $PWD when run without arguments
+if [[ $# == 0 ]]; then
+    dmatching=( ${dmatching:#(${HOME}|${PWD})} )
+fi
+
+# keep at most SCD_MENUSIZE of matching and valid directories
+m=( )
+for d in $dmatching; do
+    [[ ${#m} == $SCD_MENUSIZE ]] && break
+    [[ -d $d && -x $d ]] && m+=$d
+done
+dmatching=( $m )
+
+# find the maximum rank
+maxrank=0.0
+for d in $dmatching; do
+    [[ ${drank[$d]} -lt maxrank ]] || maxrank=${drank[$d]}
+done
+
+# discard all directories below the rank threshold
+threshold=$(( maxrank * SCD_THRESHOLD ))
+dmatching=( ${^dmatching}(Ne:'(( ${drank[$REPLY]} >= threshold ))':) )
+
+## process whatever directories that remained
+case ${#dmatching} in
+(0)
+    print -u2 "no matching directory"
+    return 1
+    ;;
+(1)
+    _scd_Y19oug_action $dmatching
+    return $?
+    ;;
+(*)
+    # build a list of strings to be displayed in the selection menu
+    m=( ${(f)"$(print -lD ${dmatching})"} )
+    if [[ -n $opt_verbose ]]; then
+        for i in {1..${#dmatching}}; do
+            d=${dmatching[i]}
+            m[i]=$(printf "%.3g %s" ${drank[$d]} $d)
+        done
+    fi
+    # build a map of string names to actual directory paths
+    for i in {1..${#m}}; dalias[${m[i]}]=${dmatching[i]}
+    # opt_list - output matching directories and exit
+    if [[ -n $opt_list ]]; then
+        _scd_Y19oug_action ${dmatching}
+        return
+    fi
+    # finally use the selection menu to get the answer
+    a=( {a-z} {A-Z} )
+    p=( )
+    for i in {1..${#m}}; do
+        [[ -n ${a[i]} ]] || break
+        dkey[${a[i]}]=${dalias[$m[i]]}
+        p+="${a[i]}) ${m[i]}"
+    done
+    print -c -r -- $p
+    if read -s -k 1 d && [[ -n ${dkey[$d]} ]]; then
+        _scd_Y19oug_action ${dkey[$d]}
+    fi
+    return $?
+esac
diff --git a/plugins/scd/scd.plugin.zsh b/plugins/scd/scd.plugin.zsh
new file mode 100644
index 000000000..0197c53a1
--- /dev/null
+++ b/plugins/scd/scd.plugin.zsh
@@ -0,0 +1,19 @@
+## The scd script should autoload as a shell function.
+autoload scd
+
+
+## If the scd function exists, define a change-directory-hook function
+## to record visited directories in the scd index.
+if [[ ${+functions[scd]} == 1 ]]; then
+    scd_chpwd_hook() { scd --add $PWD }
+    autoload add-zsh-hook
+    add-zsh-hook chpwd scd_chpwd_hook
+fi
+
+
+## Allow scd usage with unquoted wildcard characters such as "*" or "?".
+alias scd='noglob scd'
+
+
+## Load the directory aliases created by scd if any.
+if [[ -s ~/.scdalias.zsh ]]; then source ~/.scdalias.zsh; fi

From c563fe95fbf58721caa7de0ffe5d8117a6ada51a Mon Sep 17 00:00:00 2001
From: Florian Franzen <FlorianFranzen@gmail.com>
Date: Sun, 9 Feb 2014 14:06:58 +0100
Subject: [PATCH 223/364] Makes history-substring-search use term specific up
 and down buttons. Fixes #2089.

---
 .../history-substring-search/history-substring-search.zsh    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/history-substring-search/history-substring-search.zsh b/plugins/history-substring-search/history-substring-search.zsh
index 53f707c79..405eeaade 100644
--- a/plugins/history-substring-search/history-substring-search.zsh
+++ b/plugins/history-substring-search/history-substring-search.zsh
@@ -163,8 +163,9 @@ function history-substring-search-down() {
 zle -N history-substring-search-up
 zle -N history-substring-search-down
 
-bindkey '\e[A' history-substring-search-up
-bindkey '\e[B' history-substring-search-down
+zmodload zsh/terminfo
+bindkey "$terminfo[kcuu1]" history-substring-search-up
+bindkey "$terminfo[kcud1]" history-substring-search-down
 
 #-----------------------------------------------------------------------------
 # implementation details

From 0cb2ecff8002e478f5e7e64cb529eb2af71b0299 Mon Sep 17 00:00:00 2001
From: Tobias Kirschstein <lev@ideegeo.com>
Date: Tue, 11 Feb 2014 19:56:13 +1300
Subject: [PATCH 224/364] provides iwhois command to use CNAMES under
 whois.geek.nz to find most accurate whois server

---
 plugins/iwhois/iwhois.plugin.zsh | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 plugins/iwhois/iwhois.plugin.zsh

diff --git a/plugins/iwhois/iwhois.plugin.zsh b/plugins/iwhois/iwhois.plugin.zsh
new file mode 100644
index 000000000..38790bf28
--- /dev/null
+++ b/plugins/iwhois/iwhois.plugin.zsh
@@ -0,0 +1,8 @@
+# provide a whois command with a more accurate and up to date list of whois
+# servers using CNAMES via whois.geek.nz
+
+function iwhois() {
+    resolver="whois.geek.nz"
+    tld=`echo ${@: -1} | awk -F "." '{print $NF}'`
+    whois -h ${tld}.${resolver} "$@" ;
+}

From 0d212bb218617dfb62c9c31a19b64e321cb1d9b6 Mon Sep 17 00:00:00 2001
From: Luke Steensen <luke.steensen@gmail.com>
Date: Tue, 11 Feb 2014 21:14:02 -0600
Subject: [PATCH 225/364] Add 'services' command to homebrew completion

---
 plugins/brew/_brew | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/brew/_brew b/plugins/brew/_brew
index a25caf40c..d4306f223 100644
--- a/plugins/brew/_brew
+++ b/plugins/brew/_brew
@@ -33,6 +33,7 @@ _1st_arguments=(
   'remove:remove a formula'
   'search:search for a formula (/regex/ or string)'
   'server:start a local web app that lets you browse formulae (requires Sinatra)'
+  'services:manage background services via launchctl'
   'unlink:unlink a formula'
   'update:freshen up links'
   'upgrade:upgrade outdated formulae'

From f3f0a54259f384c35dad48a40d6e931df079b3c9 Mon Sep 17 00:00:00 2001
From: Ed Lui <edmund.lui@gmail.com>
Date: Tue, 11 Feb 2014 22:45:41 -0500
Subject: [PATCH 226/364] Updated _brew zsh autocompletion to latest Homebrew
 upstream

---
 plugins/brew/_brew | 75 ++++++++++++++++++++++++++++++++++++----------
 1 file changed, 59 insertions(+), 16 deletions(-)

diff --git a/plugins/brew/_brew b/plugins/brew/_brew
index d4306f223..9eb3bb557 100644
--- a/plugins/brew/_brew
+++ b/plugins/brew/_brew
@@ -11,10 +11,25 @@ _brew_installed_formulae() {
   installed_formulae=(`brew list`)
 }
 
+_brew_installed_taps() {
+  installed_taps=(`brew tap`)
+}
+
+_brew_outdated_formulae() {
+  outdated_formulae=(`brew outdated`)
+}
+
+_brew_running_services() {
+  running_services=(`brew services list | awk '{print $1}'`)
+}
+
 local -a _1st_arguments
 _1st_arguments=(
+  'audit:check formulae for Homebrew coding style'
+  'bundle:look for a Brewfile and run each line as a brew command'
   'cat:display formula file for a formula'
   'cleanup:uninstall unused and old versions of packages'
+  'commands:show a list of commands'
   'create:create a new formula'
   'deps:list dependencies and dependants of a formula'
   'doctor:audits your installation for common issues'
@@ -22,27 +37,38 @@ _1st_arguments=(
   'home:visit the homepage of a formula or the brew project'
   'info:information about a formula'
   'install:install a formula'
+  'reinstall:install a formula anew; re-using its current options'
   'link:link a formula'
   'list:list files in a formula or not-installed formulae'
   'log:git commit log for a formula'
   'missing:check all installed formuale for missing dependencies.'
-  'options:display install options specific to formula.'
-  'outdated:list formulas for which a newer version is available'
+  'outdated:list formulae for which a newer version is available'
+  'pin:pin specified formulae'
   'prune:remove dead links'
-  'reinstall:reinstall a formula'
   'remove:remove a formula'
   'search:search for a formula (/regex/ or string)'
   'server:start a local web app that lets you browse formulae (requires Sinatra)'
-  'services:manage background services via launchctl'
+  'services:small wrapper around `launchctl` for supported formulae'
+  'tap:tap a new formula repository from GitHub, or list existing taps'
   'unlink:unlink a formula'
+  'unpin:unpin specified formulae'
+  'untap:remove a tapped repository'
   'update:freshen up links'
   'upgrade:upgrade outdated formulae'
-  'uses:show formulas which depend on a formula'
-  'versions:show all available formula versions'
+  'uses:show formulae which depend on a formula'
+)
+
+local -a _service_arguments
+_service_arguments=(
+  'cleanup:get rid of stale services and unused plists'
+  'list:list all services managed by `brew services`'
+  'restart:gracefully restart selected service'
+  'start:start selected service'
+  'stop:stop selected service'
 )
 
 local expl
-local -a formulae installed_formulae
+local -a formulae installed_formulae installed_taps outdated_formulae running_services
 
 _arguments \
   '(-v)-v[verbose]' \
@@ -61,24 +87,41 @@ if (( CURRENT == 1 )); then
 fi
 
 case "$words[1]" in
-  search|-S)
-    _arguments \
-      '(--macports)--macports[search the macports repository]' \
-      '(--fink)--fink[search the fink repository]' ;;
+  install|reinstall|audit|home|homepage|log|info|abv|uses|cat|deps|edit|options)
+    _brew_all_formulae
+    _wanted formulae expl 'all formulae' compadd -a formulae ;;
   list|ls)
     _arguments \
       '(--unbrewed)--unbrewed[files in brew --prefix not controlled by brew]' \
+      '(--pinned)--pinned[list all versions of pinned formulae]' \
       '(--versions)--versions[list all installed versions of a formula]' \
-      '1: :->forms' &&  return 0
+      '1: :->forms' && return 0
 
       if [[ "$state" == forms ]]; then
         _brew_installed_formulae
         _wanted installed_formulae expl 'installed formulae' compadd -a installed_formulae
       fi ;;
-  install|home|homepage|log|info|abv|uses|cat|deps|edit|options|versions)
-    _brew_all_formulae
-    _wanted formulae expl 'all formulae' compadd -a formulae ;;
-  reinstall|remove|rm|uninstall|unlink|cleanup|link|ln)
+  remove|rm|uninstall|unlink|cleanup|link|ln|pin|unpin)
     _brew_installed_formulae
     _wanted installed_formulae expl 'installed formulae' compadd -a installed_formulae ;;
+  search|-S)
+    _arguments \
+      '(--macports)--macports[search the macports repository]' \
+      '(--fink)--fink[search the fink repository]' ;;
+  services)
+    if [[ -n "$words[2]" ]]; then
+      case "$words[2]" in
+        restart|start|stop)
+          _brew_running_services
+          _wanted running_services expl 'running services' compadd -a running_services ;;
+      esac
+    else
+      _describe -t commands "brew services subcommand" _service_arguments
+    fi ;;
+  untap)
+    _brew_installed_taps
+    _wanted installed_taps expl 'installed taps' compadd -a installed_taps ;;
+  upgrade)
+    _brew_outdated_formulae
+    _wanted outdated_formulae expl 'outdated formulae' compadd -a outdated_formulae ;;
 esac

From 2078e7d4deac2546deea6b707837b39c535eaa78 Mon Sep 17 00:00:00 2001
From: Luke Steensen <luke.steensen@gmail.com>
Date: Wed, 12 Feb 2014 20:09:44 -0600
Subject: [PATCH 227/364] remove duplicate 'go' plugin, symlink to 'golang'

---
 plugins/go/go.plugin.zsh | 152 +--------------------------------------
 1 file changed, 1 insertion(+), 151 deletions(-)
 mode change 100644 => 120000 plugins/go/go.plugin.zsh

diff --git a/plugins/go/go.plugin.zsh b/plugins/go/go.plugin.zsh
deleted file mode 100644
index 23afa9656..000000000
--- a/plugins/go/go.plugin.zsh
+++ /dev/null
@@ -1,151 +0,0 @@
-# install in /etc/zsh/zshrc or your personal .zshrc
-
-# gc
-prefixes=(5 6 8)
-for p in $prefixes; do
-	compctl -g "*.${p}" ${p}l
-	compctl -g "*.go" ${p}g
-done
-
-# standard go tools
-compctl -g "*.go" gofmt
-
-# gccgo
-compctl -g "*.go" gccgo
-
-# go tool
-__go_tool_complete() {
-  typeset -a commands build_flags
-  commands+=(
-    'build[compile packages and dependencies]'
-    'clean[remove object files]'
-    'doc[run godoc on package sources]'
-    'fix[run go tool fix on packages]'
-    'fmt[run gofmt on package sources]'
-    'get[download and install packages and dependencies]'
-    'help[display help]'
-    'install[compile and install packages and dependencies]'
-    'list[list packages]'
-    'run[compile and run Go program]'
-    'test[test packages]'
-    'tool[run specified go tool]'
-    'version[print Go version]'
-    'vet[run go tool vet on packages]'
-  )
-  if (( CURRENT == 2 )); then
-    # explain go commands
-    _values 'go tool commands' ${commands[@]}
-    return
-  fi
-  build_flags=(
-    '-a[force reinstallation of packages that are already up-to-date]'
-    '-n[print the commands but do not run them]'
-    "-p[number of parallel builds]:number"
-    '-x[print the commands]'
-    "-work[print temporary directory name and keep it]"
-    "-gcflags[flags for 5g/6g/8g]:flags"
-    "-ldflags[flags for 5l/6l/8l]:flags"
-    "-gccgoflags[flags for gccgo]:flags"
-  )
-  __go_list() {
-      local expl importpaths
-      declare -a importpaths
-      importpaths=($(go list ${words[$CURRENT]}... 2>/dev/null))
-      _wanted importpaths expl 'import paths' compadd "$@" - "${importpaths[@]}"
-  }
-  case ${words[2]} in
-  clean|doc)
-      _arguments -s -w : '*:importpaths:__go_list'
-      ;;
-  fix|fmt|list|vet)
-      _alternative ':importpaths:__go_list' ':files:_path_files -g "*.go"'
-      ;;
-  install)
-      _arguments -s -w : ${build_flags[@]} \
-        "-v[show package names]" \
-	'*:importpaths:__go_list'
-      ;;
-  get)
-      _arguments -s -w : \
-        ${build_flags[@]}
-      ;;
-  build)
-      _arguments -s -w : \
-        ${build_flags[@]} \
-        "-v[show package names]" \
-        "-o[output file]:file:_files" \
-        "*:args:{ _alternative ':importpaths:__go_list' ':files:_path_files -g \"*.go\"' }"
-      ;;
-  test)
-      _arguments -s -w : \
-        ${build_flags[@]} \
-        "-c[do not run, compile the test binary]" \
-        "-i[do not run, install dependencies]" \
-        "-v[print test output]" \
-        "-x[print the commands]" \
-        "-short[use short mode]" \
-        "-parallel[number of parallel tests]:number" \
-        "-cpu[values of GOMAXPROCS to use]:number list" \
-        "-run[run tests and examples matching regexp]:regexp" \
-        "-bench[run benchmarks matching regexp]:regexp" \
-        "-benchtime[run each benchmark during n seconds]:duration" \
-        "-timeout[kill test after that duration]:duration" \
-        "-cpuprofile[write CPU profile to file]:file:_files" \
-        "-memprofile[write heap profile to file]:file:_files" \
-        "-memprofilerate[set heap profiling rate]:number" \
-        "*:args:{ _alternative ':importpaths:__go_list' ':files:_path_files -g \"*.go\"' }"
-      ;;
-  help)
-      _values "${commands[@]}" \
-        'gopath[GOPATH environment variable]' \
-        'importpath[description of import paths]' \
-        'remote[remote import path syntax]' \
-        'testflag[description of testing flags]' \
-        'testfunc[description of testing functions]'
-      ;;
-  run)
-      _arguments -s -w : \
-          ${build_flags[@]} \
-          '*:file:_path_files -g "*.go"'
-      ;;
-  tool)
-      if (( CURRENT == 3 )); then
-          _values "go tool" $(go tool)
-          return
-      fi
-      case ${words[3]} in
-      [568]g)
-          _arguments -s -w : \
-              '-I[search for packages in DIR]:includes:_path_files -/' \
-              '-L[show full path in file:line prints]' \
-              '-S[print the assembly language]' \
-              '-V[print the compiler version]' \
-              '-e[no limit on number of errors printed]' \
-              '-h[panic on an error]' \
-              '-l[disable inlining]' \
-              '-m[print optimization decisions]' \
-              '-o[file specify output file]:file' \
-              '-p[assumed import path for this code]:importpath' \
-              '-u[disable package unsafe]' \
-              "*:file:_files -g '*.go'"
-          ;;
-      [568]l)
-          local O=${words[3]%l}
-          _arguments -s -w : \
-              '-o[file specify output file]:file' \
-              '-L[search for packages in DIR]:includes:_path_files -/' \
-              "*:file:_files -g '*.[ao$O]'"
-          ;;
-      dist)
-          _values "dist tool" banner bootstrap clean env install version
-          ;;
-      *)
-          # use files by default
-          _files
-          ;;
-      esac
-      ;;
-  esac
-}
-
-compdef __go_tool_complete go
diff --git a/plugins/go/go.plugin.zsh b/plugins/go/go.plugin.zsh
new file mode 120000
index 000000000..cf943e2e1
--- /dev/null
+++ b/plugins/go/go.plugin.zsh
@@ -0,0 +1 @@
+../golang/golang.plugin.zsh
\ No newline at end of file

From aa9db3e8f9e03156f350b5d32fdf5dfde76a6038 Mon Sep 17 00:00:00 2001
From: Luke Steensen <luke.steensen@gmail.com>
Date: Wed, 12 Feb 2014 20:13:00 -0600
Subject: [PATCH 228/364] update golang plugin to match official version

---
 plugins/golang/golang.plugin.zsh | 34 +++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/plugins/golang/golang.plugin.zsh b/plugins/golang/golang.plugin.zsh
index e60c4afe4..18bcaaff2 100644
--- a/plugins/golang/golang.plugin.zsh
+++ b/plugins/golang/golang.plugin.zsh
@@ -1,9 +1,10 @@
-# From : http://golang.org/misc/zsh/go?m=text
+# install in /etc/zsh/zshrc or your personal .zshrc
+
 # gc
 prefixes=(5 6 8)
 for p in $prefixes; do
-    compctl -g "*.${p}" ${p}l
-    compctl -g "*.go" ${p}g
+	compctl -g "*.${p}" ${p}l
+	compctl -g "*.go" ${p}g
 done
 
 # standard go tools
@@ -19,6 +20,7 @@ __go_tool_complete() {
     'build[compile packages and dependencies]'
     'clean[remove object files]'
     'doc[run godoc on package sources]'
+    'env[print Go environment information]'
     'fix[run go tool fix on packages]'
     'fmt[run gofmt on package sources]'
     'get[download and install packages and dependencies]'
@@ -39,12 +41,17 @@ __go_tool_complete() {
   build_flags=(
     '-a[force reinstallation of packages that are already up-to-date]'
     '-n[print the commands but do not run them]'
-    "-p[number of parallel builds]:number"
+    '-p[number of parallel builds]:number'
+    '-race[enable data race detection]'
     '-x[print the commands]'
-    "-work[print temporary directory name and keep it]"
-    "-gcflags[flags for 5g/6g/8g]:flags"
-    "-ldflags[flags for 5l/6l/8l]:flags"
-    "-gccgoflags[flags for gccgo]:flags"
+    '-work[print temporary directory name and keep it]'
+    '-ccflags[flags for 5c/6c/8c]:flags'
+    '-gcflags[flags for 5g/6g/8g]:flags'
+    '-ldflags[flags for 5l/6l/8l]:flags'
+    '-gccgoflags[flags for gccgo]:flags'
+    '-compiler[name of compiler to use]:name'
+    '-installsuffix[suffix to add to package directory]:suffix'
+    '-tags[list of build tags to consider satisfied]:tags'
   )
   __go_list() {
       local expl importpaths
@@ -62,7 +69,7 @@ __go_tool_complete() {
   install)
       _arguments -s -w : ${build_flags[@]} \
         "-v[show package names]" \
-    '*:importpaths:__go_list'
+        '*:importpaths:__go_list'
       ;;
   get)
       _arguments -s -w : \
@@ -87,7 +94,10 @@ __go_tool_complete() {
         "-cpu[values of GOMAXPROCS to use]:number list" \
         "-run[run tests and examples matching regexp]:regexp" \
         "-bench[run benchmarks matching regexp]:regexp" \
-        "-benchtime[run each benchmark during n seconds]:duration" \
+        "-benchmem[print memory allocation stats]" \
+        "-benchtime[run each benchmark until taking this long]:duration" \
+        "-blockprofile[write goroutine blocking profile to file]:file" \
+        "-blockprofilerate[set sampling rate of goroutine blocking profile]:number" \
         "-timeout[kill test after that duration]:duration" \
         "-cpuprofile[write CPU profile to file]:file:_files" \
         "-memprofile[write heap profile to file]:file:_files" \
@@ -97,7 +107,7 @@ __go_tool_complete() {
   help)
       _values "${commands[@]}" \
         'gopath[GOPATH environment variable]' \
-        'importpath[description of import paths]' \
+        'packages[description of package lists]' \
         'remote[remote import path syntax]' \
         'testflag[description of testing flags]' \
         'testfunc[description of testing functions]'
@@ -147,4 +157,4 @@ __go_tool_complete() {
   esac
 }
 
-compdef __go_tool_complete go
\ No newline at end of file
+compdef __go_tool_complete go

From f6f3e9301940dc21680aa50156355c8dba61b441 Mon Sep 17 00:00:00 2001
From: Emanuele Zattin <emanuelez@gmail.com>
Date: Thu, 13 Feb 2014 10:32:52 +0100
Subject: [PATCH 229/364] Improve oneline logs

Add decorate and color to the normal oneline and add a new alias for graph oneline logs.
---
 plugins/git/git.plugin.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 1285a3247..2b5983f33 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -62,8 +62,10 @@ alias glgg='git log --graph --max-count=10'
 compdef _git glgg=git-log
 alias glgga='git log --graph --decorate --all'
 compdef _git glgga=git-log
-alias glo='git log --oneline'
+alias glo='git log --oneline --decorate --color'
 compdef _git glo=git-log
+alias glog='git log --oneline --decorate --color --graph'
+compdef _git glog=git-log
 alias gss='git status -s'
 compdef _git gss=git-status
 alias ga='git add'

From 1a029f293541d37e545f4706791ca41ce129600b Mon Sep 17 00:00:00 2001
From: Kevin Bongart <contact@kevinbongart.net>
Date: Thu, 13 Feb 2014 12:27:00 -0500
Subject: [PATCH 230/364] Add rake-fast plugin for fast rake autocompletion

---
 plugins/rake-fast/rake-fast.plugin.zsh | 56 ++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 plugins/rake-fast/rake-fast.plugin.zsh

diff --git a/plugins/rake-fast/rake-fast.plugin.zsh b/plugins/rake-fast/rake-fast.plugin.zsh
new file mode 100644
index 000000000..0c268355e
--- /dev/null
+++ b/plugins/rake-fast/rake-fast.plugin.zsh
@@ -0,0 +1,56 @@
+# rake-fast
+# Fast rake autocompletion plugin for oh-my-zsh
+
+# This script caches the output for later usage and significantly speeds it up.
+# It generates a .rake_tasks file in parallel to the Rakefile.
+
+# You'll want to add `.rake_tasks` to your global .git_ignore file:
+# https://help.github.com/articles/ignoring-files#global-gitignore
+
+# You can force .rake_tasks to refresh with:
+# $ rake_refresh
+
+# This is entirely based on Ullrich Schäfer's work
+# (https://github.com/robb/.dotfiles/pull/10/),
+# which is inspired by this Ruby on Rails trick from 2006:
+# http://weblog.rubyonrails.org/2006/3/9/fast-rake-task-completion-for-zsh/
+
+# Author: Kevin Bongart
+# contact@kevinbongart.net
+# http://kevinbongart.net
+# https://github.com/KevinBongart
+
+_rake_refresh () {
+  if [ -f .rake_tasks ]; then
+    rm .rake_tasks
+  fi
+  echo "Generating .rake_tasks..." > /dev/stderr
+  _rake_generate
+  cat .rake_tasks
+}
+
+_rake_does_task_list_need_generating () {
+  if [ ! -f .rake_tasks ]; then return 0;
+  else
+    accurate=$(stat -f%m .rake_tasks)
+    changed=$(stat -f%m Rakefile)
+    return $(expr $accurate '>=' $changed)
+  fi
+}
+
+_rake_generate () {
+  rake --silent --tasks | cut -d " " -f 2 > .rake_tasks
+}
+
+_rake () {
+  if [ -f Rakefile ]; then
+    if _rake_does_task_list_need_generating; then
+      echo "\nGenerating .rake_tasks..." > /dev/stderr
+      _rake_generate
+    fi
+    compadd `cat .rake_tasks`
+  fi
+}
+
+compdef _rake rake
+alias rake_refresh='_rake_refresh'

From 354593e9b2b3a7ec3a0840eeadbc7d760cdd7263 Mon Sep 17 00:00:00 2001
From: Igor Timoshenko <igor.timoshenko@i.ua>
Date: Fri, 14 Feb 2014 14:54:28 +0000
Subject: [PATCH 231/364] Added Yii basic command completion

---
 plugins/yii/yii.plugin.zsh | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 plugins/yii/yii.plugin.zsh

diff --git a/plugins/yii/yii.plugin.zsh b/plugins/yii/yii.plugin.zsh
new file mode 100644
index 000000000..b816160f0
--- /dev/null
+++ b/plugins/yii/yii.plugin.zsh
@@ -0,0 +1,17 @@
+# Yii basic command completion
+
+_yii_get_command_list () {
+	protected/yiic | awk '/^ - [a-z]+/ { print $2 }'
+}
+
+_yii () {
+  if [ -f protected/yiic ]; then
+    compadd `_yii_get_command_list`
+  fi
+}
+
+compdef _yii protected/yiic
+compdef _yii yiic
+
+# Aliases
+alias yiic='protected/yiic'

From fdd864bd5b5444848c492454e025257f3c4fa675 Mon Sep 17 00:00:00 2001
From: Chris Wiggins <chris@chriswiggins.co.nz>
Date: Mon, 17 Feb 2014 13:32:24 +1300
Subject: [PATCH 232/364] Update battery plugin to show calculating - OSX

Instantly after removing the charger, I have found that the "AvgTimeToEmpty" value can swing to rediculous values. Apple's current claim is that the max battery life is 12 hours, so any value larger than this is considered a "time is being calculated" value.
---
 plugins/battery/battery.plugin.zsh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh
index 16ad3e651..2c00ff141 100644
--- a/plugins/battery/battery.plugin.zsh
+++ b/plugins/battery/battery.plugin.zsh
@@ -30,7 +30,11 @@ if [[ $(uname) == "Darwin" ]] ; then
   	local smart_battery_status="$(ioreg -rc "AppleSmartBattery")"
     if [[ $(echo $smart_battery_status | grep -c '^.*"ExternalConnected"\ =\ No') -eq 1 ]] ; then
       timeremaining=$(echo $smart_battery_status | grep '^.*"AvgTimeToEmpty"\ =\ ' | sed -e 's/^.*"AvgTimeToEmpty"\ =\ //')
-      echo "~$((timeremaining / 60)):$((timeremaining % 60))"
+      if [ $timeremaining -gt 720 ] ; then
+        echo "::"
+      else
+        echo "~$((timeremaining / 60)):$((timeremaining % 60))"
+      fi
     else
       echo "∞"
     fi

From 358b6ffcde9e3732ed08387fc176851e07c1862f Mon Sep 17 00:00:00 2001
From: Brian McKenna <brian@simpleenergy.com>
Date: Tue, 18 Feb 2014 14:37:59 -0700
Subject: [PATCH 233/364] Add cabal_sandbox_info function

Reports whether the current working directory is within a
sandbox. Useful to check before installing Cabal packages into the
global registry.
---
 plugins/cabal/cabal.plugin.zsh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/plugins/cabal/cabal.plugin.zsh b/plugins/cabal/cabal.plugin.zsh
index 8d3c64587..9f76add7a 100644
--- a/plugins/cabal/cabal.plugin.zsh
+++ b/plugins/cabal/cabal.plugin.zsh
@@ -1,3 +1,14 @@
+function cabal_sandbox_info() {
+    cabal_files=(*.cabal(N))
+    if [ $#cabal_files -gt 0 ]; then
+        if [ -f cabal.sandbox.config ]; then
+            echo "%{$fg[green]%}sandboxed%{$reset_color%}"
+        else
+            echo "%{$fg[red]%}not sandboxed%{$reset_color%}"
+        fi
+    fi
+}
+
 function _cabal_commands() {
     local ret=1 state
     _arguments ':subcommand:->subcommand' && ret=0

From 1df7d01618f06cc80b7f9d14bd088c70e6382d33 Mon Sep 17 00:00:00 2001
From: Brian McKenna <brian@simpleenergy.com>
Date: Tue, 18 Feb 2014 14:43:42 -0700
Subject: [PATCH 234/364] Fix URL to gi (gitignore) function

Previous URL doesn't seem to work because the host requires a www
prefix.
---
 plugins/gitignore/gitignore.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/gitignore/gitignore.plugin.zsh b/plugins/gitignore/gitignore.plugin.zsh
index 332497cec..be3c3a635 100644
--- a/plugins/gitignore/gitignore.plugin.zsh
+++ b/plugins/gitignore/gitignore.plugin.zsh
@@ -1,4 +1,4 @@
-function gi() { curl http://gitignore.io/api/$@ ;}
+function gi() { curl http://www.gitignore.io/api/$@ ;}
 
 _gitignireio_get_command_list() {
   curl -s http://gitignore.io/api/list | tr "," "\n"

From bd4f7e24ea1451eeab351b0a68ac3729213b369b Mon Sep 17 00:00:00 2001
From: Alexander Hramov <alexander.hramov@gmail.com>
Date: Wed, 19 Feb 2014 15:08:47 +0300
Subject: [PATCH 235/364] Update gitignore.plugin.zsh

Fix URL to gi (gitignore) function in _gitignireio_get_command_list function
---
 plugins/gitignore/gitignore.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/gitignore/gitignore.plugin.zsh b/plugins/gitignore/gitignore.plugin.zsh
index be3c3a635..be037d87a 100644
--- a/plugins/gitignore/gitignore.plugin.zsh
+++ b/plugins/gitignore/gitignore.plugin.zsh
@@ -1,7 +1,7 @@
 function gi() { curl http://www.gitignore.io/api/$@ ;}
 
 _gitignireio_get_command_list() {
-  curl -s http://gitignore.io/api/list | tr "," "\n"
+  curl -s http://www.gitignore.io/api/list | tr "," "\n"
 }
 
 _gitignireio () {
@@ -9,4 +9,4 @@ _gitignireio () {
   compadd -S '' `_gitignireio_get_command_list`
 }
 
-compdef _gitignireio gi
\ No newline at end of file
+compdef _gitignireio gi

From c0f716b2e5ce7bd36baf812e8b6175a65bb1097e Mon Sep 17 00:00:00 2001
From: Brian McKenna <brian@simpleenergy.com>
Date: Wed, 19 Feb 2014 13:33:02 -0700
Subject: [PATCH 236/364] Fix remaining broken URL in gitignore function

---
 plugins/gitignore/gitignore.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/gitignore/gitignore.plugin.zsh b/plugins/gitignore/gitignore.plugin.zsh
index be3c3a635..4f68831da 100644
--- a/plugins/gitignore/gitignore.plugin.zsh
+++ b/plugins/gitignore/gitignore.plugin.zsh
@@ -1,7 +1,7 @@
 function gi() { curl http://www.gitignore.io/api/$@ ;}
 
 _gitignireio_get_command_list() {
-  curl -s http://gitignore.io/api/list | tr "," "\n"
+  curl -s http://www.gitignore.io/api/list | tr "," "\n"
 }
 
 _gitignireio () {

From 840ae4382ec5b60f9a5f4ef500e40b7193c4ee87 Mon Sep 17 00:00:00 2001
From: Brandon Beacher <brandon.beacher@gmail.com>
Date: Wed, 19 Feb 2014 18:55:52 -0500
Subject: [PATCH 237/364] Remove mailcatcher from the bundler plugin.

Recommended by @sj26 per https://github.com/sj26/mailcatcher#bundler.
---
 plugins/bundler/bundler.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index 9dfed61a4..df30ed7c7 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -6,7 +6,7 @@ alias bu="bundle update"
 
 # The following is based on https://github.com/gma/bundler-exec
 
-bundled_commands=(annotate berks cap capify cucumber foodcritic foreman guard jekyll kitchen knife middleman nanoc rackup rainbows rake rspec ruby shotgun spec spin spork strainer tailor taps thin thor unicorn unicorn_rails puma)
+bundled_commands=(annotate berks cap capify cucumber foodcritic foreman guard jekyll kitchen knife mailcatcher middleman nanoc rackup rainbows rake rspec ruby shotgun spec spin spork strainer tailor taps thin thor unicorn unicorn_rails puma)
 
 # Remove $UNBUNDLED_COMMANDS from the bundled_commands list
 for cmd in $UNBUNDLED_COMMANDS; do

From 598a9c6f990756386517d66b6bcf77e53791e905 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Thu, 20 Feb 2014 10:18:53 -0800
Subject: [PATCH 238/364] Adieu l'ami.

 @jimweirich -- You will be missed.
---
 plugins/rake/rake.plugin.zsh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/rake/rake.plugin.zsh b/plugins/rake/rake.plugin.zsh
index 16b933c14..121150017 100644
--- a/plugins/rake/rake.plugin.zsh
+++ b/plugins/rake/rake.plugin.zsh
@@ -1,3 +1,7 @@
+# Thank you Jim for everything you contributed to the Ruby and open source community 
+# over the years. We will miss you dearly.
+alias jimweirich="rake"  
+
 alias rake="noglob rake" # allows square brackts for rake task invocation
 alias brake='noglob bundle exec rake' # execute the bundled rake gem
 alias srake='noglob sudo rake' # noglob must come before sudo

From b0fbe0d11ac60074b4fdc20e332bc2db3e0c0066 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Thu, 12 Dec 2013 23:27:22 +0100
Subject: [PATCH 239/364] Avoid evaluating special chars in $LINE on title
 command (fixes #2234)

---
 lib/termsupport.zsh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 80319e1a8..6eba8f69a 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -27,9 +27,8 @@ function omz_termsupport_preexec {
   emulate -L zsh
   setopt extended_glob
   local CMD=${1[(wr)^(*=*|sudo|ssh|rake|-*)]} #cmd name only, or if this is sudo or ssh, the next cmd
-  local LINE="${2:gs/$/\\$}"
-  LINE="${LINE:gs/%/%%}"
-  title "$CMD" "%100>...>$LINE%<<"
+  local LINE="${2}"
+  title "$CMD" '%100>...>$LINE%<<'
 }
 
 autoload -U add-zsh-hook

From b73ced397fc74618d92f748e2744e65f901b368f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 14 Dec 2013 02:13:18 +0100
Subject: [PATCH 240/364] Use single quotes also in $LINE definiton

---
 lib/termsupport.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 6eba8f69a..d3d8c967f 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -27,7 +27,7 @@ function omz_termsupport_preexec {
   emulate -L zsh
   setopt extended_glob
   local CMD=${1[(wr)^(*=*|sudo|ssh|rake|-*)]} #cmd name only, or if this is sudo or ssh, the next cmd
-  local LINE="${2}"
+  local LINE='${2}'
   title "$CMD" '%100>...>$LINE%<<'
 }
 

From 3e5de21dc5b71e332a1526ae14beb662a66d6e26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 14 Dec 2013 04:30:29 +0100
Subject: [PATCH 241/364] Revert previous commit, escape %

---
 lib/termsupport.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index d3d8c967f..623bf1f09 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -27,7 +27,7 @@ function omz_termsupport_preexec {
   emulate -L zsh
   setopt extended_glob
   local CMD=${1[(wr)^(*=*|sudo|ssh|rake|-*)]} #cmd name only, or if this is sudo or ssh, the next cmd
-  local LINE='${2}'
+  local LINE="${2:gs/%/%%}"
   title "$CMD" '%100>...>$LINE%<<'
 }
 

From a951600b4e81d73d71a098e48aa8d296be853bc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Mon, 16 Dec 2013 09:24:24 +0100
Subject: [PATCH 242/364] Avoid 'title:parse error' with single quotes in $CMD
 Fixes #2182

---
 lib/termsupport.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 623bf1f09..5f2fe63d4 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -28,7 +28,7 @@ function omz_termsupport_preexec {
   setopt extended_glob
   local CMD=${1[(wr)^(*=*|sudo|ssh|rake|-*)]} #cmd name only, or if this is sudo or ssh, the next cmd
   local LINE="${2:gs/%/%%}"
-  title "$CMD" '%100>...>$LINE%<<'
+  title '$CMD' '%100>...>$LINE%<<'
 }
 
 autoload -U add-zsh-hook

From 7a546362d35d6c74f9c301aa477594fdf2cc1bfc Mon Sep 17 00:00:00 2001
From: Chris Jones <chris@brack3t.com>
Date: Fri, 21 Feb 2014 22:47:56 -0800
Subject: [PATCH 243/364] Much needed PEP8 love. Use spaces, not tabs.

---
 plugins/git-prompt/gitstatus.py | 88 +++++++++++++++++++--------------
 1 file changed, 51 insertions(+), 37 deletions(-)

diff --git a/plugins/git-prompt/gitstatus.py b/plugins/git-prompt/gitstatus.py
index ee6fab9bd..6d64e8277 100644
--- a/plugins/git-prompt/gitstatus.py
+++ b/plugins/git-prompt/gitstatus.py
@@ -1,20 +1,30 @@
 #!/usr/bin/env python
 # -*- coding: UTF-8 -*-
+from subprocess import Popen, PIPE
+import re
 
 # change those symbols to whatever you prefer
-symbols = {'ahead of': '↑', 'behind': '↓', 'staged':'♦', 'changed':'‣', 'untracked':'…', 'clean':'⚡', 'unmerged':'≠', 'sha1':':'}
+symbols = {
+    'ahead of': '↑',
+    'behind': '↓',
+    'staged': '♦',
+    'changed': '‣',
+    'untracked': '…',
+    'clean': '⚡',
+    'unmerged': '≠',
+    'sha1': ':'
+}
 
-from subprocess import Popen, PIPE
-
-output,error = Popen(['git','status'], stdout=PIPE, stderr=PIPE).communicate()
+output, error = Popen(
+    ['git', 'status'], stdout=PIPE, stderr=PIPE).communicate()
 
 if error:
-	import sys
-	sys.exit(0)
+    import sys
+    sys.exit(0)
 lines = output.splitlines()
 
-import re
-behead_re = re.compile(r"^# Your branch is (ahead of|behind) '(.*)' by (\d+) commit")
+behead_re = re.compile(
+    r"^# Your branch is (ahead of|behind) '(.*)' by (\d+) commit")
 diverge_re = re.compile(r"^# and have (\d+) and (\d+) different")
 
 status = ''
@@ -23,46 +33,50 @@ changed = re.compile(r'^# Changed but not updated:$', re.MULTILINE)
 untracked = re.compile(r'^# Untracked files:$', re.MULTILINE)
 unmerged = re.compile(r'^# Unmerged paths:$', re.MULTILINE)
 
+
 def execute(*command):
-	out, err = Popen(stdout=PIPE, stderr=PIPE, *command).communicate()
-	if not err:
-		nb = len(out.splitlines())
-	else:
-		nb = '?'
-	return nb
+    out, err = Popen(stdout=PIPE, stderr=PIPE, *command).communicate()
+    if not err:
+        nb = len(out.splitlines())
+    else:
+        nb = '?'
+    return nb
 
 if staged.search(output):
-	nb = execute(['git','diff','--staged','--name-only','--diff-filter=ACDMRT'])
-	status += '%s%s' % (symbols['staged'], nb)
+    nb = execute(
+        ['git', 'diff', '--staged', '--name-only', '--diff-filter=ACDMRT'])
+    status += '%s%s' % (symbols['staged'], nb)
 if unmerged.search(output):
-	nb = execute(['git','diff', '--staged','--name-only', '--diff-filter=U'])
-	status += '%s%s' % (symbols['unmerged'], nb)
+    nb = execute(['git', 'diff', '--staged', '--name-only', '--diff-filter=U'])
+    status += '%s%s' % (symbols['unmerged'], nb)
 if changed.search(output):
-	nb = execute(['git','diff','--name-only', '--diff-filter=ACDMRT'])
-	status += '%s%s' % (symbols['changed'], nb)
+    nb = execute(['git', 'diff', '--name-only', '--diff-filter=ACDMRT'])
+    status += '%s%s' % (symbols['changed'], nb)
 if untracked.search(output):
-## 		nb = len(Popen(['git','ls-files','--others','--exclude-standard'],stdout=PIPE).communicate()[0].splitlines())
-## 		status += "%s" % (symbols['untracked']*(nb//3 + 1), )
-	status += symbols['untracked']
+    status += symbols['untracked']
 if status == '':
-	status = symbols['clean']
+    status = symbols['clean']
 
 remote = ''
 
 bline = lines[0]
 if bline.find('Not currently on any branch') != -1:
-	branch = symbols['sha1']+ Popen(['git','rev-parse','--short','HEAD'], stdout=PIPE).communicate()[0][:-1]
+    branch = symbols['sha1'] + Popen([
+        'git',
+        'rev-parse',
+        '--short',
+        'HEAD'], stdout=PIPE).communicate()[0][:-1]
 else:
-	branch = bline.split(' ')[3]
-	bstatusline = lines[1]
-	match = behead_re.match(bstatusline)
-	if match:
-		remote = symbols[match.groups()[0]]
-		remote += match.groups()[2]
-	elif lines[2:]:
-		div_match = diverge_re.match(lines[2])
-	 	if div_match:
-			remote = "{behind}{1}{ahead of}{0}".format(*div_match.groups(), **symbols)
-
-print '\n'.join([branch,remote,status])
+    branch = bline.split(' ')[3]
+    bstatusline = lines[1]
+    match = behead_re.match(bstatusline)
+    if match:
+        remote = symbols[match.groups()[0]]
+        remote += match.groups()[2]
+    elif lines[2:]:
+        div_match = diverge_re.match(lines[2])
+        if div_match:
+            remote = "{behind}{1}{ahead of}{0}".format(
+                *div_match.groups(), **symbols)
 
+print('\n'.join([branch, remote, status]))

From c397000b3b0c1cf3bceb95dfc5fcdaf1844aa751 Mon Sep 17 00:00:00 2001
From: Chris Jones <chris@brack3t.com>
Date: Fri, 21 Feb 2014 22:48:38 -0800
Subject: [PATCH 244/364] grab last item in list which is the branch instead of
 relying on position.

---
 plugins/git-prompt/gitstatus.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/git-prompt/gitstatus.py b/plugins/git-prompt/gitstatus.py
index 6d64e8277..ef894bff2 100644
--- a/plugins/git-prompt/gitstatus.py
+++ b/plugins/git-prompt/gitstatus.py
@@ -67,7 +67,7 @@ if bline.find('Not currently on any branch') != -1:
         '--short',
         'HEAD'], stdout=PIPE).communicate()[0][:-1]
 else:
-    branch = bline.split(' ')[3]
+    branch = bline.split(' ')[-1]
     bstatusline = lines[1]
     match = behead_re.match(bstatusline)
     if match:

From 8309b0a19baa351d643194f897d59de7b3d3b3dd Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Sun, 23 Feb 2014 10:07:26 +0100
Subject: [PATCH 245/364] Verification of convert inside the function

Depending on when the path is declared this solution would work in any case
---
 plugins/catimg/catimg.plugin.zsh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/plugins/catimg/catimg.plugin.zsh b/plugins/catimg/catimg.plugin.zsh
index 70ef9a63c..cb92f5986 100644
--- a/plugins/catimg/catimg.plugin.zsh
+++ b/plugins/catimg/catimg.plugin.zsh
@@ -7,10 +7,11 @@
 # Github: https://github.com/posva/catimg                                      #
 ################################################################################
 
-if [[ -x  `which convert` ]]; then
-  function catimg() {
+
+function catimg() {
+  if [[ -x  `which convert` ]]; then
     zsh $ZSH/plugins/catimg/catimg.sh $@
-  }
-else
-  echo "catimg need convert (ImageMagick) to work)"
-fi
+  else
+    echo "catimg need convert (ImageMagick) to work)"
+  fi
+}

From 6cc240811fd5756a7e2fd1a79ac529ca5f284e1d Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Tue, 25 Feb 2014 20:27:33 -0800
Subject: [PATCH 246/364] ..a fundamental piece of matter.

---
 plugins/atom/atom.plugin.zsh | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 plugins/atom/atom.plugin.zsh

diff --git a/plugins/atom/atom.plugin.zsh b/plugins/atom/atom.plugin.zsh
new file mode 100644
index 000000000..048fd7521
--- /dev/null
+++ b/plugins/atom/atom.plugin.zsh
@@ -0,0 +1,4 @@
+#
+# Your guess is as good as mine. Let's just assume that we will need this...
+#   - For more info visit... http://atom.io/
+#
\ No newline at end of file

From 56babe6538450f85ac2e8ef3dd04bf1654c46d75 Mon Sep 17 00:00:00 2001
From: Bob Williams <bobwilliams.ii@gmail.com>
Date: Wed, 26 Feb 2014 19:35:24 -0500
Subject: [PATCH 247/364] Adds command line aliases useful for dealing with
 JSON

---
 plugins/jsontools/jsontools.plugin.zsh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 plugins/jsontools/jsontools.plugin.zsh

diff --git a/plugins/jsontools/jsontools.plugin.zsh b/plugins/jsontools/jsontools.plugin.zsh
new file mode 100644
index 000000000..51578b349
--- /dev/null
+++ b/plugins/jsontools/jsontools.plugin.zsh
@@ -0,0 +1,14 @@
+# JSON Tools
+# Adds command line aliases useful for dealing with JSON
+
+if [[ $(whence $JSONTOOLS_METHOD) = "" ]]; then
+    JSONTOOLS_METHOD=""
+fi
+
+if [[ $(whence python) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xpython" ) ]]; then
+	alias pp_json='python -mjson.tool'
+elif [[ $(whence ruby) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xruby" ) ]]; then
+	alias pp_json='ruby -e "require \"json\"; require \"yaml\"; puts JSON.parse(STDIN.read).to_yaml"'
+fi
+
+unset JSONTOOLS_METHOD
\ No newline at end of file

From f139401485ba389cbec5c83357e8827b1c53447b Mon Sep 17 00:00:00 2001
From: Josh Burns <admin@joshburns.ml>
Date: Fri, 28 Feb 2014 01:26:17 +1100
Subject: [PATCH 248/364] add gem build alias

---
 plugins/gem/gem.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 plugins/gem/gem.plugin.zsh

diff --git a/plugins/gem/gem.plugin.zsh b/plugins/gem/gem.plugin.zsh
new file mode 100644
index 000000000..5b14fe7d0
--- /dev/null
+++ b/plugins/gem/gem.plugin.zsh
@@ -0,0 +1 @@
+alias gb="gem build *.gemspec"
\ No newline at end of file

From da573f635648efb07603d7172bb08c2f271e1164 Mon Sep 17 00:00:00 2001
From: Josh Burns <admin@joshburns.ml>
Date: Fri, 28 Feb 2014 01:26:54 +1100
Subject: [PATCH 249/364] add gem push alias

---
 plugins/gem/gem.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/gem/gem.plugin.zsh b/plugins/gem/gem.plugin.zsh
index 5b14fe7d0..ca2900353 100644
--- a/plugins/gem/gem.plugin.zsh
+++ b/plugins/gem/gem.plugin.zsh
@@ -1 +1,2 @@
-alias gb="gem build *.gemspec"
\ No newline at end of file
+alias gemb="gem build *.gemspec"
+alias gemp="gem push *.gem"
\ No newline at end of file

From fdbf0cbe4687c32846764695fabdf4acdb63a62f Mon Sep 17 00:00:00 2001
From: Josh Burns <admin@joshburns.ml>
Date: Fri, 28 Feb 2014 01:32:01 +1100
Subject: [PATCH 250/364] gem push alias and gem yank alias

---
 plugins/gem/gem.plugin.zsh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/plugins/gem/gem.plugin.zsh b/plugins/gem/gem.plugin.zsh
index ca2900353..938f5c993 100644
--- a/plugins/gem/gem.plugin.zsh
+++ b/plugins/gem/gem.plugin.zsh
@@ -1,2 +1,7 @@
 alias gemb="gem build *.gemspec"
-alias gemp="gem push *.gem"
\ No newline at end of file
+alias gemp="gem push *.gem"
+
+# gemy GEM 0.0.0 = gem yank GEM -v 0.0.0
+function gemy {
+	gem yank $1 -v $2
+}
\ No newline at end of file

From 185cb6e37352cc0d92042e35d259b0de3f5f3886 Mon Sep 17 00:00:00 2001
From: Bob Williams <bobwilliams.ii@gmail.com>
Date: Thu, 27 Feb 2014 10:56:07 -0500
Subject: [PATCH 251/364] adding support for node

---
 plugins/jsontools/jsontools.plugin.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/jsontools/jsontools.plugin.zsh b/plugins/jsontools/jsontools.plugin.zsh
index 51578b349..7b6f8c585 100644
--- a/plugins/jsontools/jsontools.plugin.zsh
+++ b/plugins/jsontools/jsontools.plugin.zsh
@@ -5,7 +5,9 @@ if [[ $(whence $JSONTOOLS_METHOD) = "" ]]; then
     JSONTOOLS_METHOD=""
 fi
 
-if [[ $(whence python) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xpython" ) ]]; then
+if [[ $(whence node) != "" && ( "x$JSONTOOLS_METHOD" = "x"  || "x$JSONTOOLS_METHOD" = "xnode" ) ]]; then
+    alias pp_json='node -e "console.log(JSON.stringify(process.argv[1]), null, 4)"'
+elif [[ $(whence python) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xpython" ) ]]; then
 	alias pp_json='python -mjson.tool'
 elif [[ $(whence ruby) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xruby" ) ]]; then
 	alias pp_json='ruby -e "require \"json\"; require \"yaml\"; puts JSON.parse(STDIN.read).to_yaml"'

From 6dcdfe61e2005728ff7e1e48d452de4b38294799 Mon Sep 17 00:00:00 2001
From: Michael Nikitochkin <miry.sof@gmail.com>
Date: Thu, 27 Feb 2014 11:52:21 +0200
Subject: [PATCH 252/364] :panda_face: Added simulator alias for Xcode plugin

It is often required to start simulator without Xcode.
---
 plugins/xcode/xcode.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/xcode/xcode.plugin.zsh b/plugins/xcode/xcode.plugin.zsh
index f137253f3..4816ab0ed 100644
--- a/plugins/xcode/xcode.plugin.zsh
+++ b/plugins/xcode/xcode.plugin.zsh
@@ -16,3 +16,4 @@ function xcsel {
 
 alias xcb='xcodebuild'
 alias xcp='xcode-select --print-path'
+alias simulator='open $(xcode-select  -p)/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone\ Simulator.app'

From 5ba96e9a053514d6beb25e5c27cf4af746f142ef Mon Sep 17 00:00:00 2001
From: Kaiwen Xu <kevin@kevxu.net>
Date: Sun, 2 Mar 2014 03:59:27 -0500
Subject: [PATCH 253/364] Fixed sublime plugin behaviors.

- Fixed subl search path order in Mac because Sublime Text 3 is named
  Sublime Text.app by default instead of Sublime Text 3.app and they are
  mostly likely to be placed in /Applications instead of
  $HOME/Applications.
- Fixed sublime text binary path in Linux. The sublime_text binary
  installed by Ubuntu installer is placed in /opt/sublime_text/sublime_text
  instead of /usr/bin/sublime_text.
- Use zsh's built-in process detach syntax instead of nohup.
---
 plugins/sublime/sublime.plugin.zsh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index 566279183..6ca5892e5 100755
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -3,19 +3,19 @@
 local _sublime_darwin_paths > /dev/null 2>&1
 _sublime_darwin_paths=(
     "/usr/local/bin/subl"
-    "$HOME/Applications/Sublime Text 3.app/Contents/SharedSupport/bin/subl"
-    "$HOME/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl"
-    "$HOME/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
+    "/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
     "/Applications/Sublime Text 3.app/Contents/SharedSupport/bin/subl"
     "/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl"
-    "/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
+    "$HOME/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
+    "$HOME/Applications/Sublime Text 3.app/Contents/SharedSupport/bin/subl"
+    "$HOME/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl"
 )
 
 if [[ $('uname') == 'Linux' ]]; then
-    if [ -f '/usr/bin/sublime_text' ]; then
-        st_run() { nohup /usr/bin/sublime_text $@ > /dev/null & }
+    if [ -f '/opt/sublime_text/sublime_text' ]; then
+        st_run() { /opt/sublime_text/sublime_text $@ &| }
     else
-        st_run() { nohup /usr/bin/sublime-text $@ > /dev/null & }
+        st_run() { /usr/bin/sublime-text $@ &| }
     fi
     alias st=st_run
 

From 564a708d6af90b1bc5bf4d13e7ad80abca92ad74 Mon Sep 17 00:00:00 2001
From: Thiago Perrotta <thiagoperrotta95@gmail.com>
Date: Sun, 2 Mar 2014 14:47:35 -0300
Subject: [PATCH 254/364] added the linux implementation to the battery plugin

---
 plugins/battery/battery.plugin.zsh | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh
index 16ad3e651..670c6a47d 100644
--- a/plugins/battery/battery.plugin.zsh
+++ b/plugins/battery/battery.plugin.zsh
@@ -58,9 +58,19 @@ if [[ $(uname) == "Darwin" ]] ; then
 
 elif [[ $(uname) == "Linux"  ]] ; then
 
+  function battery_is_charging() {
+    ! [[ $(acpi 2&>/dev/null | grep -c '^Battery.*Discharging') -gt 0 ]]
+  }
+
+  function battery_pct() {
+    echo "$(acpi | cut -f2 -d ',' | tr -cd '[:digit:]')" 
+  }
+
   function battery_pct_remaining() {
-    if [[ $(acpi 2&>/dev/null | grep -c '^Battery.*Discharging') -gt 0 ]] ; then
-      echo "$(acpi | cut -f2 -d ',' | tr -cd '[:digit:]')" 
+    if [ ! $(battery_is_charging) ] ; then
+      battery_pct
+    else
+      echo "External Power"
     fi
   }
 
@@ -86,15 +96,6 @@ elif [[ $(uname) == "Linux"  ]] ; then
     fi
   }
   
-  function battery_pct() {
-    # todo for on linux
-  }
-  
-  function battery_is_charging() {
-    # todo on linux
-	false
-  }
-
 else
   # Empty functions so we don't cause errors in prompts
   function battery_pct_remaining() {

From 2691520d6f84fd0022fcb82a497042bb92c777b7 Mon Sep 17 00:00:00 2001
From: Kaiwen Xu <kevin@kevxu.net>
Date: Sun, 2 Mar 2014 14:13:55 -0500
Subject: [PATCH 255/364] Integrate changes from #1841.

---
 plugins/sublime/sublime.plugin.zsh | 41 +++++++++++++++++-------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index 6ca5892e5..a2042343a 100755
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -1,25 +1,32 @@
 # Sublime Text 2 Aliases
 
-local _sublime_darwin_paths > /dev/null 2>&1
-_sublime_darwin_paths=(
-    "/usr/local/bin/subl"
-    "/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
-    "/Applications/Sublime Text 3.app/Contents/SharedSupport/bin/subl"
-    "/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl"
-    "$HOME/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
-    "$HOME/Applications/Sublime Text 3.app/Contents/SharedSupport/bin/subl"
-    "$HOME/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl"
-)
-
 if [[ $('uname') == 'Linux' ]]; then
-    if [ -f '/opt/sublime_text/sublime_text' ]; then
-        st_run() { /opt/sublime_text/sublime_text $@ &| }
-    else
-        st_run() { /usr/bin/sublime-text $@ &| }
-    fi
-    alias st=st_run
+    local _sublime_linux_paths > /dev/null 2>&1
+    _sublime_linux_paths=(
+        "$HOME/bin/sublime_text"
+        "/opt/sublime_text/sublime_text"
+        "/usr/bin/sublime_text"
+        "/usr/local/bin/sublime_text"
+    )
+    for _sublime_path in $_sublime_linux_paths; do
+        if [[ -a $_sublime_path ]]; then
+            st_run() { $_sublime_path $@ >/dev/null 2>&1 &| }
+            alias st=st_run
+            break
+        fi
+    done
 
 elif  [[ $('uname') == 'Darwin' ]]; then
+    local _sublime_darwin_paths > /dev/null 2>&1
+    _sublime_darwin_paths=(
+        "/usr/local/bin/subl"
+        "/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
+        "/Applications/Sublime Text 3.app/Contents/SharedSupport/bin/subl"
+        "/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl"
+        "$HOME/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
+        "$HOME/Applications/Sublime Text 3.app/Contents/SharedSupport/bin/subl"
+        "$HOME/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl"
+    )
 
     for _sublime_path in $_sublime_darwin_paths; do
         if [[ -a $_sublime_path ]]; then

From c0b98cd6aca5b6148a5ee147b087772bfb9f5e21 Mon Sep 17 00:00:00 2001
From: Jeff Williams <jeffsmessages@gmail.com>
Date: Mon, 3 Mar 2014 10:18:10 -0500
Subject: [PATCH 256/364] Added dirhistory plugin.

This plugin navigates directory history using ALT-LEFT and ALT-RIGHT.
---
 plugins/dirhistory/dirhistory.plugin.zsh | 132 +++++++++++++++++++++++
 1 file changed, 132 insertions(+)
 create mode 100644 plugins/dirhistory/dirhistory.plugin.zsh

diff --git a/plugins/dirhistory/dirhistory.plugin.zsh b/plugins/dirhistory/dirhistory.plugin.zsh
new file mode 100644
index 000000000..504d7ec14
--- /dev/null
+++ b/plugins/dirhistory/dirhistory.plugin.zsh
@@ -0,0 +1,132 @@
+## 
+#   Navigate directory history using ALT-LEFT and ALT-RIGHT. ALT-LEFT moves back to directories 
+#   that the user has changed to in the past, and ALT-RIGHT undoes ALT-LEFT.
+# 
+
+dirhistory_past=(`pwd`)
+dirhistory_future=()
+export dirhistory_past
+export dirhistory_future
+
+export DIRHISTORY_SIZE=30
+
+# Pop the last element of dirhistory_past. 
+# Pass the name of the variable to return the result in. 
+# Returns the element if the array was not empty,
+# otherwise returns empty string.
+function pop_past() {
+  eval "$1='$dirhistory_past[$#dirhistory_past]'"
+  if [[ $#dirhistory_past -gt 0 ]]; then
+    dirhistory_past[$#dirhistory_past]=()
+  fi
+}
+
+function pop_future() {
+  eval "$1='$dirhistory_future[$#dirhistory_future]'"
+  if [[ $#dirhistory_future -gt 0 ]]; then
+    dirhistory_future[$#dirhistory_future]=()
+  fi
+}
+
+# Push a new element onto the end of dirhistory_past. If the size of the array 
+# is >= DIRHISTORY_SIZE, the array is shifted
+function push_past() {
+  if [[ $#dirhistory_past -ge $DIRHISTORY_SIZE ]]; then
+    shift dirhistory_past
+  fi
+  if [[ $#dirhistory_past -eq 0 || $dirhistory_past[$#dirhistory_past] != "$1" ]]; then
+    dirhistory_past+=($1)
+  fi
+}
+
+function push_future() {
+  if [[ $#dirhistory_future -ge $DIRHISTORY_SIZE ]]; then
+    shift dirhistory_future
+  fi
+  if [[ $#dirhistory_future -eq 0 || $dirhistory_futuret[$#dirhistory_future] != "$1" ]]; then
+    dirhistory_future+=($1)
+  fi
+}
+
+# Called by zsh when directory changes
+function chpwd() {
+  push_past `pwd`
+  # If DIRHISTORY_CD is not set...
+  if [[ -z "${DIRHISTORY_CD+x}" ]]; then
+    # ... clear future.
+    dirhistory_future=()
+  fi
+}
+
+function dirhistory_cd(){
+  DIRHISTORY_CD="1"
+  cd $1
+  unset DIRHISTORY_CD
+}
+
+# Move backward in directory history
+function dirhistory_back() {
+  local cw=""
+  local d=""
+  # Last element in dirhistory_past is the cwd.
+
+  pop_past cw 
+  if [[ "" == "$cw" ]]; then
+    # Someone overwrote our variable. Recover it.
+    dirhistory_past=(`pwd`)
+    return
+  fi
+
+  pop_past d
+  if [[ "" != "$d" ]]; then
+    dirhistory_cd $d
+    push_future $cw
+  else
+    push_past $cw
+  fi
+}
+
+
+# Move forward in directory history
+function dirhistory_forward() {
+  local d=""
+
+  pop_future d
+  if [[ "" != "$d" ]]; then
+    dirhistory_cd $d
+    push_past $d
+  fi
+}
+
+
+# Bind keys to history navigation
+function dirhistory_zle_dirhistory_back() {
+  # Erase current line in buffer
+  zle kill-buffer
+  dirhistory_back 
+  zle accept-line
+}
+
+function dirhistory_zle_dirhistory_future() {
+  # Erase current line in buffer
+  zle kill-buffer
+  dirhistory_forward
+  zle accept-line
+}
+
+zle -N dirhistory_zle_dirhistory_back
+# xterm in normal mode
+bindkey "\e[3D" dirhistory_zle_dirhistory_back
+bindkey "\e[1;3D" dirhistory_zle_dirhistory_back
+# Putty:
+bindkey "\e\e[D" dirhistory_zle_dirhistory_back
+# GNU screen:
+bindkey "\eO3D" dirhistory_zle_dirhistory_back
+
+zle -N dirhistory_zle_dirhistory_future
+bindkey "\e[3C" dirhistory_zle_dirhistory_future
+bindkey "\e[1;3C" dirhistory_zle_dirhistory_future
+bindkey "\e\e[C" dirhistory_zle_dirhistory_future
+bindkey "\eO3C" dirhistory_zle_dirhistory_future
+
+

From d41ac7fe3e52783054610c2cc57bbbfcdb2202b0 Mon Sep 17 00:00:00 2001
From: Markus Faerevaag <mf@bitblueprint.com>
Date: Tue, 4 Mar 2014 20:25:54 +0100
Subject: [PATCH 257/364] Updated wd plugin to v0.3.0

---
 plugins/wd/_wd.sh        | 96 ++++++++++++++++++++++++----------------
 plugins/wd/wd.plugin.zsh |  4 +-
 plugins/wd/wd.sh         | 75 ++++++++++++++-----------------
 3 files changed, 95 insertions(+), 80 deletions(-)

diff --git a/plugins/wd/_wd.sh b/plugins/wd/_wd.sh
index 950564435..29df63520 100644
--- a/plugins/wd/_wd.sh
+++ b/plugins/wd/_wd.sh
@@ -1,48 +1,68 @@
-#compdef wd.sh
+#compdef wd
 
-zstyle ":completion:*:descriptions" format "%B%d%b"
+zstyle ':completion:*:descriptions' format '%B%d%b'
+zstyle ':completion::complete:wd:*:commands' group-name commands
+zstyle ':completion::complete:wd:*:warp_points' group-name warp_points
+zstyle ':completion::complete:wd::' list-grouped
 
-CONFIG=$HOME/.warprc
+# Call `_wd()` when when trying to complete the command `wd`
 
-local -a main_commands
-main_commands=(
-    add:'Adds the current working directory to your warp points'
-    #add'\!':'Overwrites existing warp point' # TODO: Fix
-    rm:'Removes the given warp point'
-    ls:'Outputs all stored warp points'
-    show:'Outputs warp points to current directory'
-)
+zmodload zsh/mapfile
+function _wd() {
+  local ret=1
+  local CONFIG=$HOME/.warprc
 
-local -a points
-while read line
-do
-    points+=$(awk "{ gsub(/\/Users\/$USER|\/home\/$USER/,\"~\"); print }" <<< $line)
-done < $CONFIG
+  # Stolen from
+  # http://stackoverflow.com/questions/9000698/completion-when-program-has-sub-commands
 
-_wd()
-{
-    # init variables
-    local curcontext="$curcontext" state line
-    typeset -A opt_args
+  # local curcontext="$curcontext" state line
+  # typeset -A opt_args
 
-    # init state
-    _arguments \
-        '1: :->command' \
-        '2: :->argument'
+  local -a commands
+  local -a warp_points
+  warp_points=( "${(f)mapfile[$CONFIG]}" )
+  # LIST="${mapfile[$FNAME]}" # Not required unless stuff uses it
 
-    case $state in
-        command)
-            compadd "$@" add rm ls show
-            _describe -t warp-points 'Warp points:' points && ret=0
-            ;;
-        argument)
-            case $words[2] in
-                rm|add!)
-                    _describe -t warp-points 'warp points' points && ret=0
-                    ;;
-                *)
-            esac
-    esac
+  commands=(
+    'add:Adds the current working directory to your warp points'
+    'add!:Overwrites existing warp point'
+    'rm:Removes the given warp point'
+    'ls:Outputs all stored warp points'
+    'show:Outputs all warp points that point to the current directory'
+    'help:Show this extremely helpful text'
+    '..:Go back to last directory'
+  )
+
+  _arguments -C \
+    '1: :->first_arg' \
+    '2: :->second_arg' && ret=0
+
+  case $state in
+    first_arg)
+      _describe -t warp_points "Warp points" warp_points && ret=0
+      _describe -t commands "Commands" commands && ret=0
+      ;;
+    second_arg)
+      case $words[2] in
+        add\!|rm)
+          _describe -t points "Warp points" warp_points && ret=0
+          ;;
+        add)
+          _message 'Write the name of your warp point' && ret=0
+          ;;
+      esac
+      ;;
+  esac
+
+  return $ret
 }
 
 _wd "$@"
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/plugins/wd/wd.plugin.zsh b/plugins/wd/wd.plugin.zsh
index bbec4a715..9800335fc 100755
--- a/plugins/wd/wd.plugin.zsh
+++ b/plugins/wd/wd.plugin.zsh
@@ -6,4 +6,6 @@
 #
 # @github.com/mfaerevaag/wd
 
-alias wd='. $ZSH/plugins/wd/wd.sh'
+wd() {
+    . $ZSH/plugins/wd/wd.sh
+}
diff --git a/plugins/wd/wd.sh b/plugins/wd/wd.sh
index 744f58bc2..96a3426fc 100755
--- a/plugins/wd/wd.sh
+++ b/plugins/wd/wd.sh
@@ -50,12 +50,12 @@ wd_warp()
             wd_print_msg $YELLOW "Warping to current directory?"
         else
             (( n = $#1 - 1 ))
-            wd_print_msg $BLUE "Warping..."
+            #wd_print_msg $BLUE "Warping..."
             cd -$n > /dev/null
         fi
     elif [[ ${points[$1]} != "" ]]
     then
-        wd_print_msg $BLUE "Warping..."
+        #wd_print_msg $BLUE "Warping..."
         cd ${points[$1]}
     else
         wd_print_msg $RED "Unkown warp point '$1'"
@@ -64,16 +64,16 @@ wd_warp()
 
 wd_add()
 {
-    if [[ $1 =~ "^\.+$" ]]
+    if [[ $2 =~ "^\.+$" || $2 =~ "^\s*$" ]]
     then
-        wd_print_msg $RED "Illeagal warp point (see README)."
-    elif [[ ${points[$1]} == "" ]] || $2
+        wd_print_msg $RED "Illegal warp point (see README)."
+    elif [[ ${points[$2]} == "" ]] || $1
     then
-        wd_remove $1 > /dev/null
-        print "$1:$PWD" >> $CONFIG
+        wd_remove $2 > /dev/null
+        print "$2:$PWD" >> $CONFIG
         wd_print_msg $GREEN "Warp point added"
     else
-        wd_print_msg $YELLOW "Warp point '$1' alredy exists. Use 'add!' to overwrite."
+        wd_print_msg $YELLOW "Warp point '$2' already exists. Use 'add!' to overwrite."
     fi
 }
 
@@ -83,7 +83,9 @@ wd_remove()
     then
         if wd_tmp=`sed "/^$1:/d" $CONFIG`
         then
-            echo $wd_tmp > $CONFIG
+            # `>!` forces overwrite
+            # we need this if people use `setopt NO_CLOBBER`
+            echo $wd_tmp >! $CONFIG
             wd_print_msg $GREEN "Warp point removed"
         else
             wd_print_msg $RED "Warp point unsuccessfully removed. Sorry!"
@@ -131,9 +133,9 @@ wd_print_usage()
     print "\nCommands:"
     print "\t add \t Adds the current working directory to your warp points"
     print "\t add! \t Overwrites existing warp point"
-    print "\t remove  Removes the given warp point"
+    print "\t rm \t  Removes the given warp point"
     print "\t show \t Outputs warp points to current directory"
-    print "\t list \t Outputs all stored warp points"
+    print "\t ls \t Outputs all stored warp points"
     print "\t help \t Show this extremely helpful text"
 }
 
@@ -141,7 +143,7 @@ wd_print_usage()
 ## run
 
 # get opts
-args=`getopt -o a:r:lhs -l add:,remove:,list,help,show -- $*`
+args=`getopt -o a:r:lhs -l add:,rm:,ls,help,show -- $*`
 
 # check if no arguments were given
 if [[ $? -ne 0 || $#* -eq 0 ]]
@@ -161,49 +163,40 @@ else
 
     for i
     do
-		    case "$i"
-		        in
-			      -a|--add|add)
-                wd_add $2 false
-				        shift
-                shift
+        case "$i"
+            in
+            -a|--add|add)
+                wd_add false $2
                 break
                 ;;
             -a!|--add!|add!)
-                wd_add $2 true
-				        shift
-                shift
+                wd_add true $2
                 break
                 ;;
-			      -r|--remove|rm)
-				        wd_remove $2
-                shift
-				        shift
+            -r|--remove|rm)
+                wd_remove $2
                 break
                 ;;
-			      -l|--list|ls)
-				        wd_list_all
-				        shift
+            -l|--list|ls)
+                wd_list_all
                 break
                 ;;
-			      -h|--help|help)
-				        wd_print_usage
-				        shift
+            -h|--help|help)
+                wd_print_usage
                 break
                 ;;
-			      -s|--show|show)
-				        wd_show
-				        shift
+            -s|--show|show)
+                wd_show
                 break
                 ;;
             *)
                 wd_warp $i
-                shift
                 break
                 ;;
-			      --)
-				        shift; break;;
-		    esac
+            --)
+                break
+                ;;
+        esac
     done
 fi
 
@@ -211,6 +204,6 @@ fi
 ## garbage collection
 # if not, next time warp will pick up variables from this run
 # remember, there's no sub shell
-points=""
-args=""
-unhash -d val &> /dev/null # fixes issue #1
+unset points
+unset args
+unset val &> /dev/null # fixes issue #1

From 8b667b229973dee2abb52edacbd056cbe52bb8f7 Mon Sep 17 00:00:00 2001
From: Jouko Johansson <jouko.johansson@sanoma.fi>
Date: Fri, 7 Mar 2014 01:09:04 +0200
Subject: [PATCH 258/364] added mvn-update

---
 plugins/mvn/mvn.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index 0c9141907..4ef342e60 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -52,7 +52,7 @@ alias mvnc='mvn clean'
 alias mvncom='mvn compile'
 alias mvnt='mvn test'
 alias mvnag='mvn archetype:generate'
-
+alias mvn-updates='mvn versions:display-dependency-updates'
 function listMavenCompletions { 
      reply=(
         # common lifecycle

From 7378765a79491c836831543a6da3d88dac9b7568 Mon Sep 17 00:00:00 2001
From: Jouko Johansson <jouko.johansson@sanoma.fi>
Date: Fri, 7 Mar 2014 01:22:37 +0200
Subject: [PATCH 259/364] added aliases for tomcat:run tomcat7:run

---
 plugins/mvn/mvn.plugin.zsh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index 4ef342e60..e9d7c0fc1 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -53,6 +53,10 @@ alias mvncom='mvn compile'
 alias mvnt='mvn test'
 alias mvnag='mvn archetype:generate'
 alias mvn-updates='mvn versions:display-dependency-updates'
+alias mvntc7='mvn tomcat7:run' 
+alias mvntc='mvn tomcat:run'
+
+
 function listMavenCompletions { 
      reply=(
         # common lifecycle

From fd8ce7f8e3ea96a7746e46339e447f7cbb83aa57 Mon Sep 17 00:00:00 2001
From: Jouko Johansson <jouko.johansson@sanoma.fi>
Date: Fri, 7 Mar 2014 01:23:37 +0200
Subject: [PATCH 260/364] added mvnjetty alias

---
 plugins/mvn/mvn.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index e9d7c0fc1..ed7968534 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -55,6 +55,7 @@ alias mvnag='mvn archetype:generate'
 alias mvn-updates='mvn versions:display-dependency-updates'
 alias mvntc7='mvn tomcat7:run' 
 alias mvntc='mvn tomcat:run'
+alias mvnjetty='mvn jetty:run'
 
 
 function listMavenCompletions { 

From c249c69065f1216bd83f5bd92e87f560e42675fb Mon Sep 17 00:00:00 2001
From: Dan Kerimdzhanov <kerimdzhanov@gmail.com>
Date: Sat, 8 Mar 2014 23:51:16 +0600
Subject: [PATCH 261/364] Remove all copyright information in themes. Closes
 #2587

---
 themes/adben.zsh-theme         | 13 +++++--------
 themes/af-magic.zsh-theme      |  6 ------
 themes/avit.zsh-theme          | 18 ------------------
 themes/candy-kingdom.zsh-theme |  7 -------
 themes/dogenpunk.zsh-theme     |  8 +-------
 themes/duellj.zsh-theme        |  1 -
 themes/eastwood.zsh-theme      |  4 ++--
 themes/essembeh.zsh-theme      |  1 -
 themes/fino-time.zsh-theme     |  2 +-
 themes/fino.zsh-theme          |  5 ++---
 themes/fox.zsh-theme           |  3 ++-
 themes/gianu.zsh-theme         |  5 -----
 themes/intheloop.zsh-theme     |  3 +--
 themes/itchy.zsh-theme         |  1 -
 themes/jaischeema.zsh-theme    |  9 +--------
 themes/juanghurtado.zsh-theme  |  7 ++-----
 themes/junkfood.zsh-theme      |  4 ----
 themes/kphoen.zsh-theme        |  9 +--------
 themes/pure.zsh-theme          | 22 ----------------------
 themes/rixius.zsh-theme        |  3 ---
 themes/smt.zsh-theme           |  8 +-------
 themes/sorin.zsh-theme         | 10 ++--------
 themes/sunrise.zsh-theme       |  4 +---
 themes/trapd00r.zsh-theme      |  3 +--
 24 files changed, 23 insertions(+), 133 deletions(-)

diff --git a/themes/adben.zsh-theme b/themes/adben.zsh-theme
index b64714f32..aa3093f64 100644
--- a/themes/adben.zsh-theme
+++ b/themes/adben.zsh-theme
@@ -2,12 +2,12 @@
 # #
 # # #README
 # #
-# # This theme provides two customizable header functionalities : 
+# # This theme provides two customizable header functionalities:
 # # a) displaying a pseudo-random message from a database of quotations
 # # (https://en.wikipedia.org/wiki/Fortune_%28Unix%29)
-# # b) displaying randomly command line tips from The command line fu 
+# # b) displaying randomly command line tips from The command line fu
 # # (http://www.commandlinefu.com) community: in order to make use of this functionality
-# # you will need Internet connection. 
+# # you will need Internet connection.
 # # This theme provides as well information for the current user's context, like;
 # # branch and status for the current version control system (git and svn currently
 # # supported) and time, presented to the user in a non invasive volatile way.
@@ -25,11 +25,8 @@
 # # -Solarized theme (https://github.com/altercation/solarized/)
 # # -OS X: iTerm 2 (http://www.iterm2.com/)
 # # -font Source code pro (https://github.com/adobe/source-code-pro)
-# # 
-# # Author: Adolfo Benedetti
-# # email: adolfo.benedetti@gmail.com
-# # License: Public Domain
-# # This theme's look and feel is based on the Aaron Toponce's zsh theme , more info: 
+# #
+# # This theme's look and feel is based on the Aaron Toponce's zsh theme, more info:
 # # http://pthree.org/2008/11/23/727/
 # # enjoy!
 ########## COLOR ###########
diff --git a/themes/af-magic.zsh-theme b/themes/af-magic.zsh-theme
index 3c2f45658..97d142a0f 100644
--- a/themes/af-magic.zsh-theme
+++ b/themes/af-magic.zsh-theme
@@ -1,12 +1,6 @@
 # af-magic.zsh-theme
-#
-# Author: Andy Fleming
-# URL: http://andyfleming.com/
 # Repo: https://github.com/andyfleming/oh-my-zsh
 # Direct Link: https://github.com/andyfleming/oh-my-zsh/blob/master/themes/af-magic.zsh-theme
-#
-# Created on:		June 19, 2012
-# Last modified on:	June 20, 2012
 
 if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="green"; fi
 local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
diff --git a/themes/avit.zsh-theme b/themes/avit.zsh-theme
index 51f5e375a..a21a9c8c4 100644
--- a/themes/avit.zsh-theme
+++ b/themes/avit.zsh-theme
@@ -1,22 +1,4 @@
-#
-# Author:: Andrew Vit (<andrew@avit.ca>)
-#
 # AVIT ZSH Theme
-#
-# Copyright 2011, Andrew Vit
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
 
 PROMPT='
 $(_user_host)${_current_dir} $(git_prompt_info) $(_ruby_version)
diff --git a/themes/candy-kingdom.zsh-theme b/themes/candy-kingdom.zsh-theme
index 25aeb6597..718977d90 100644
--- a/themes/candy-kingdom.zsh-theme
+++ b/themes/candy-kingdom.zsh-theme
@@ -1,11 +1,4 @@
 # neuralsanwich.zsh-theme
-#
-# Author: Sean Jones
-# URL: http://www.neuralsandwich.com
-# Repo: 
-# Direct link:
-# Create:
-# Modified: 
 
 if [ "x$OH_MY_ZSH_HG" = "x" ]; then
     OH_MY_ZSH_HG="hg"
diff --git a/themes/dogenpunk.zsh-theme b/themes/dogenpunk.zsh-theme
index f4d65ab74..0bd38acc2 100644
--- a/themes/dogenpunk.zsh-theme
+++ b/themes/dogenpunk.zsh-theme
@@ -1,10 +1,4 @@
-# -----------------------------------------------------------------------------
-#          FILE: dogenpunk.zsh-theme
-#   DESCRIPTION: oh-my-zsh theme file.
-#        AUTHOR: Matthew Nelson (dogenpunk@gmail.com)
-#       VERSION: 0.1
-#    SCREENSHOT: coming soon
-# -----------------------------------------------------------------------------
+# dogenpunk.zsh-theme
 
 MODE_INDICATOR="%{$fg_bold[red]%}❮%{$reset_color%}%{$fg[red]%}❮❮%{$reset_color%}"
 local return_status="%{$fg[red]%}%(?..⏎)%{$reset_color%}"
diff --git a/themes/duellj.zsh-theme b/themes/duellj.zsh-theme
index 7350b4335..3849c35be 100644
--- a/themes/duellj.zsh-theme
+++ b/themes/duellj.zsh-theme
@@ -1,4 +1,3 @@
-
 # user, host, full path, and time/date
 # on two lines for easier vgrepping
 # entry in a nice long thread on the Arch Linux forums: http://bbs.archlinux.org/viewtopic.php?pid=521888#p521888
diff --git a/themes/eastwood.zsh-theme b/themes/eastwood.zsh-theme
index db2529990..1b284cdc2 100644
--- a/themes/eastwood.zsh-theme
+++ b/themes/eastwood.zsh-theme
@@ -1,4 +1,4 @@
-#RVM settings
+# RVM settings
 if [[ -s ~/.rvm/scripts/rvm ]] ; then 
   RPS1="%{$fg[yellow]%}rvm:%{$reset_color%}%{$fg[red]%}\$(~/.rvm/bin/rvm-prompt)%{$reset_color%} $EPS1"
 else
@@ -12,7 +12,7 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}*%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 
-#Customized git status, oh-my-zsh currently does not allow render dirty status before branch
+# Customized git status, oh-my-zsh currently does not allow render dirty status before branch
 git_custom_status() {
   local cb=$(current_branch)
   if [ -n "$cb" ]; then
diff --git a/themes/essembeh.zsh-theme b/themes/essembeh.zsh-theme
index 8c98ea1ed..939bb7a4c 100644
--- a/themes/essembeh.zsh-theme
+++ b/themes/essembeh.zsh-theme
@@ -1,7 +1,6 @@
 # Theme with full path names and hostname
 # Handy if you work on different servers all the time;
 
-
 local return_code="%(?..%{$fg_bold[red]%}%? ↵%{$reset_color%})"
 
 function my_git_prompt_info() {
diff --git a/themes/fino-time.zsh-theme b/themes/fino-time.zsh-theme
index 7154e09f1..901c4d99f 100644
--- a/themes/fino-time.zsh-theme
+++ b/themes/fino-time.zsh-theme
@@ -1,4 +1,4 @@
-# Fino-time theme by Aexander Berezovsky (http://berezovsky.me) based on Fino by Max Masnick (http://max.masnick.me)
+# fino-time.zsh-theme
 
 # Use with a dark background and 256-color terminal!
 # Meant for people with RVM and git. Tested only on OS X 10.7.
diff --git a/themes/fino.zsh-theme b/themes/fino.zsh-theme
index 4c7aabcff..35e6e02c1 100644
--- a/themes/fino.zsh-theme
+++ b/themes/fino.zsh-theme
@@ -1,4 +1,4 @@
-# Fino theme by Max Masnick (http://max.masnick.me)
+# fino.zsh-theme
 
 # Use with a dark background and 256-color terminal!
 # Meant for people with rbenv and git. Tested only on OS X 10.7.
@@ -11,7 +11,6 @@
 #
 # Also borrowing from http://stevelosh.com/blog/2010/02/my-extravagant-zsh-prompt/
 
-
 function prompt_char {
   git branch >/dev/null 2>/dev/null && echo "±" && return
   echo '○'
@@ -41,4 +40,4 @@ PROMPT="╭─%{$FG[040]%}%n%{$reset_color%} %{$FG[239]%}at%{$reset_color%} %{$F
 ZSH_THEME_GIT_PROMPT_PREFIX=" %{$FG[239]%}on%{$reset_color%} %{$fg[255]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$FG[202]%}✘✘✘"
-ZSH_THEME_GIT_PROMPT_CLEAN="%{$FG[040]%}✔"
\ No newline at end of file
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$FG[040]%}✔"
diff --git a/themes/fox.zsh-theme b/themes/fox.zsh-theme
index 1959853cf..3ecd4e204 100644
--- a/themes/fox.zsh-theme
+++ b/themes/fox.zsh-theme
@@ -1,4 +1,5 @@
-#fox theme
+# fox.zsh-theme
+
 PROMPT='%{$fg[cyan]%}┌[%{$fg_bold[white]%}%n%{$reset_color%}%{$fg[cyan]%}☮%{$fg_bold[white]%}%M%{$reset_color%}%{$fg[cyan]%}]%{$fg[white]%}-%{$fg[cyan]%}(%{$fg_bold[white]%}%~%{$reset_color%}%{$fg[cyan]%})$(git_prompt_info)
 └> % %{$reset_color%}'
 
diff --git a/themes/gianu.zsh-theme b/themes/gianu.zsh-theme
index c7fe40665..faa80218e 100644
--- a/themes/gianu.zsh-theme
+++ b/themes/gianu.zsh-theme
@@ -1,8 +1,3 @@
-# Oh-my-Zsh prompt created by gianu
-#
-# github.com/gianu
-# sgianazza@gmail.com
-
 PROMPT='[%{$fg_bold[white]%}%n%{$reset_color%}@%{$fg_bold[red]%}%m%{$reset_color%} %{$fg[cyan]%}%c%{$reset_color%} $(git_prompt_info)%{$reset_color%}]$ '
 
 ZSH_THEME_GIT_PROMPT_PREFIX="(%{$fg_bold[green]%}"
diff --git a/themes/intheloop.zsh-theme b/themes/intheloop.zsh-theme
index 85b4a4d95..7a98db27a 100644
--- a/themes/intheloop.zsh-theme
+++ b/themes/intheloop.zsh-theme
@@ -1,4 +1,3 @@
-# ZSH theme by James Smith (http://loopj.com)
 # A multiline prompt with username, hostname, full path, return status, git branch, git dirty status, git remote status
 
 local return_status="%{$fg[red]%}%(?..⏎)%{$reset_color%}"
@@ -21,4 +20,4 @@ ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[grey]%}) %{$fg[yellow]%}⚡%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[grey]%})"
 ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE="%{$fg_bold[magenta]%}↓%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE="%{$fg_bold[magenta]%}↑%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_DIVERGED_REMOTE="%{$fg_bold[magenta]%}↕%{$reset_color%}"
\ No newline at end of file
+ZSH_THEME_GIT_PROMPT_DIVERGED_REMOTE="%{$fg_bold[magenta]%}↕%{$reset_color%}"
diff --git a/themes/itchy.zsh-theme b/themes/itchy.zsh-theme
index afc2abf69..c23889edf 100644
--- a/themes/itchy.zsh-theme
+++ b/themes/itchy.zsh-theme
@@ -1,4 +1,3 @@
-# Created by Daniel Bayerlein https://github.com/danielbayerlein
 # Inspired by http://peepcode.com/blog/2012/my-command-line-prompt
 
 local smiley="%(?,%{$fg[green]%}☺%{$reset_color%},%{$fg[red]%}☹%{$reset_color%})"
diff --git a/themes/jaischeema.zsh-theme b/themes/jaischeema.zsh-theme
index aecc5b961..da1dd1e5d 100644
--- a/themes/jaischeema.zsh-theme
+++ b/themes/jaischeema.zsh-theme
@@ -1,11 +1,4 @@
-# ------------------------------------------------------------------------------
-#          FILE:  jaischeema.zsh-theme
-#   DESCRIPTION:  oh-my-zsh theme file.
-#        AUTHOR:  Jais Cheema
-#       VERSION:  0.0.1
-# ------------------------------------------------------------------------------
-
-
+# jaischeema.zsh-theme
 
 PROMPT='%{$fg_bold[magenta]%}%m%{$reset_color%} at %{$fg_bold[green]%}%~%{$reset_color%} %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%}% %{$reset_color%}%{$fg[red]%}❯%{$reset_color%} '
 
diff --git a/themes/juanghurtado.zsh-theme b/themes/juanghurtado.zsh-theme
index 2f715cc9e..bc470e838 100644
--- a/themes/juanghurtado.zsh-theme
+++ b/themes/juanghurtado.zsh-theme
@@ -1,7 +1,4 @@
-# ------------------------------------------------------------------------
-# Juan G. Hurtado oh-my-zsh theme
-# (Needs Git plugin for current_branch method)
-# ------------------------------------------------------------------------
+# Needs Git plugin for current_branch method
 
 # Color shortcuts
 RED=$fg[red]
@@ -43,4 +40,4 @@ ZSH_THEME_GIT_PROMPT_SHA_AFTER="%{$WHITE%}]"
 PROMPT='
 %{$GREEN_BOLD%}%n@%m%{$WHITE%}:%{$YELLOW%}%~%u$(parse_git_dirty)$(git_prompt_ahead)%{$RESET_COLOR%}
 %{$BLUE%}>%{$RESET_COLOR%} '
-RPROMPT='%{$GREEN_BOLD%}$(current_branch)$(git_prompt_short_sha)$(git_prompt_status)%{$RESET_COLOR%}'
\ No newline at end of file
+RPROMPT='%{$GREEN_BOLD%}$(current_branch)$(git_prompt_short_sha)$(git_prompt_status)%{$RESET_COLOR%}'
diff --git a/themes/junkfood.zsh-theme b/themes/junkfood.zsh-theme
index 57b4070dc..01fae4b95 100644
--- a/themes/junkfood.zsh-theme
+++ b/themes/junkfood.zsh-theme
@@ -1,8 +1,4 @@
-# ------------------------------------------------------------------------
-# Tyler Cipriani 
-# oh-my-zsh theme
 # Totally ripped off Dallas theme
-# ------------------------------------------------------------------------
 
 # Grab the current date (%W) and time (%t):
 JUNKFOOD_TIME_="%{$fg_bold[red]%}#%{$fg_bold[white]%}( %{$fg_bold[yellow]%}%W%{$reset_color%}@%{$fg_bold[white]%}%t )( %{$reset_color%}"
diff --git a/themes/kphoen.zsh-theme b/themes/kphoen.zsh-theme
index 0e9b5e73c..8e8894a34 100644
--- a/themes/kphoen.zsh-theme
+++ b/themes/kphoen.zsh-theme
@@ -1,11 +1,4 @@
-# ------------------------------------------------------------------------------
-#          FILE:  kphoen.zsh-theme
-#   DESCRIPTION:  oh-my-zsh theme file.
-#        AUTHOR:  Kévin Gomez (geek63@gmail.com)
-#       VERSION:  1.0.0
-#    SCREENSHOT:
-# ------------------------------------------------------------------------------
-
+# kphoen.zsh-theme
 
 if [[ "$TERM" != "dumb" ]] && [[ "$DISABLE_LS_COLORS" != "true" ]]; then
     PROMPT='[%{$fg[red]%}%n%{$reset_color%}@%{$fg[magenta]%}%m%{$reset_color%}:%{$fg[blue]%}%~%{$reset_color%}$(git_prompt_info)]
diff --git a/themes/pure.zsh-theme b/themes/pure.zsh-theme
index d7ed624e4..1473194a5 100644
--- a/themes/pure.zsh-theme
+++ b/themes/pure.zsh-theme
@@ -18,28 +18,6 @@
 #   Github:   https://github.com/nicoulaj
 #   Twitter:  https://twitter.com/nicoulaj
 #
-# License
-#
-# Copyright (c) 2013 Kasper Kronborg Isager
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
 # ------------------------------------------------------------------------------
 
 # Set required options
diff --git a/themes/rixius.zsh-theme b/themes/rixius.zsh-theme
index c0c5c9c71..b33f23e1c 100644
--- a/themes/rixius.zsh-theme
+++ b/themes/rixius.zsh-theme
@@ -1,6 +1,3 @@
-# /|/ Code by Stephen
-# /|/ "Rixius" Middleton
-# 
 # name in folder (github)
 # ± if in github repo, or ≥ if otherwise Time in 24-hour format is on right.
 function collapse_pwd {
diff --git a/themes/smt.zsh-theme b/themes/smt.zsh-theme
index bbd1031e1..f2b0526b7 100644
--- a/themes/smt.zsh-theme
+++ b/themes/smt.zsh-theme
@@ -1,10 +1,4 @@
-# -----------------------------------------------------------------------------
-#          FILE: smt.zsh-theme
-#   DESCRIPTION: oh-my-zsh theme file, based on dogenpunk by Matthew Nelson.
-#        AUTHOR: Stephen Tudor (stephen@tudorstudio.com
-#       VERSION: 0.1
-#    SCREENSHOT: coming soon
-# -----------------------------------------------------------------------------
+# smt.zsh-theme, based on dogenpunk by Matthew Nelson.
 
 MODE_INDICATOR="%{$fg_bold[red]%}❮%{$reset_color%}%{$fg[red]%}❮❮%{$reset_color%}"
 local return_status="%{$fg[red]%}%(?..⏎)%{$reset_color%} "
diff --git a/themes/sorin.zsh-theme b/themes/sorin.zsh-theme
index 601dbe5d7..ac6a49840 100644
--- a/themes/sorin.zsh-theme
+++ b/themes/sorin.zsh-theme
@@ -1,11 +1,5 @@
-# ------------------------------------------------------------------------------
-#          FILE:  sorin.zsh-theme
-#   DESCRIPTION:  oh-my-zsh theme file.
-#        AUTHOR:  Sorin Ionescu (sorin.ionescu@gmail.com)
-#       VERSION:  1.0.2
-#    SCREENSHOT:  http://i.imgur.com/aipDQ.png
-# ------------------------------------------------------------------------------
-
+# sorin.zsh-theme
+# screenshot: http://i.imgur.com/aipDQ.png
 
 if [[ "$TERM" != "dumb" ]] && [[ "$DISABLE_LS_COLORS" != "true" ]]; then
   MODE_INDICATOR="%{$fg_bold[red]%}❮%{$reset_color%}%{$fg[red]%}❮❮%{$reset_color%}"
diff --git a/themes/sunrise.zsh-theme b/themes/sunrise.zsh-theme
index acc6ed312..4bea20a1b 100644
--- a/themes/sunrise.zsh-theme
+++ b/themes/sunrise.zsh-theme
@@ -1,8 +1,6 @@
-#-------------------------------------------------------------------------------
-# Sunrise theme for oh-my-zsh by Adam Lindberg (eproxus@gmail.com)
+# Sunrise theme for oh-my-zsh
 # Intended to be used with Solarized: http://ethanschoonover.com/solarized
 # (Needs Git plugin for current_branch method)
-#-------------------------------------------------------------------------------
 
 # Color shortcuts
 R=$fg_no_bold[red]
diff --git a/themes/trapd00r.zsh-theme b/themes/trapd00r.zsh-theme
index cba14c42c..cb1c43c56 100644
--- a/themes/trapd00r.zsh-theme
+++ b/themes/trapd00r.zsh-theme
@@ -1,5 +1,4 @@
-# Name:   trapd00r zsh theme
-# Author: Magnus Woldrich <m@japh.se>
+# trapd00r.zsh-theme
 #
 # This theme needs a terminal supporting 256 colors as well as unicode. It also
 # needs the script that splits up the current path and makes it fancy as located

From 5bd590ceb30ca58d96ec8d5dcfc1fec71bc6ca1f Mon Sep 17 00:00:00 2001
From: Andrew Vit <andrew@avit.ca>
Date: Sat, 8 Mar 2014 13:13:52 -0800
Subject: [PATCH 262/364] Reference default install path from ZSH variable

---
 tools/install.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index b24bb4ad3..01984ea2b 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -1,16 +1,16 @@
-ZSH=`/usr/bin/env|grep 'ZSH='|cut -d '=' -f 2`
-if [ -d "$ZSH" ]
+if [ ! -n $ZSH ]
+then
+  ZSH=~/.oh-my-zsh
+fi
+
+if [ -d $ZSH ]
 then
   echo "\033[0;33mYou already have Oh My Zsh installed.\033[0m You'll need to remove $ZSH if you want to install"
   exit
-elif [ -d ~/.oh-my-zsh ]
-then
-  echo "\033[0;33mYou already have One Oh My Zsh Directory.\033[0m You'll need to remove  ~/.oh-my-zsh if you want to clone"
-  exit
 fi
 
 echo "\033[0;34mCloning Oh My Zsh...\033[0m"
-hash git >/dev/null && /usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh || {
+hash git >/dev/null && /usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git $ZSH || {
   echo "git not installed"
   exit
 }
@@ -23,7 +23,7 @@ then
 fi
 
 echo "\033[0;34mUsing the Oh My Zsh template file and adding it to ~/.zshrc\033[0m"
-cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc
+cp $ZSH/templates/zshrc.zsh-template ~/.zshrc
 
 echo "\033[0;34mCopying your current PATH and adding it to the end of ~/.zshrc for you.\033[0m"
 sed -i -e "/export PATH=/ c\\

From 2e11e2ab5adaea762b7f2eaa6c63332a9618bb3f Mon Sep 17 00:00:00 2001
From: Andrew Vit <andrew@avit.ca>
Date: Sat, 8 Mar 2014 13:15:18 -0800
Subject: [PATCH 263/364] Write install path into .zshrc

---
 tools/install.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/install.sh b/tools/install.sh
index 01984ea2b..5c7a5b6ca 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -24,6 +24,9 @@ fi
 
 echo "\033[0;34mUsing the Oh My Zsh template file and adding it to ~/.zshrc\033[0m"
 cp $ZSH/templates/zshrc.zsh-template ~/.zshrc
+sed -i -e "/^ZSH=/ c\\
+ZSH=$ZSH
+" ~/.zshrc
 
 echo "\033[0;34mCopying your current PATH and adding it to the end of ~/.zshrc for you.\033[0m"
 sed -i -e "/export PATH=/ c\\

From da1fa3b06a6369a5b3337025da164eeec275db70 Mon Sep 17 00:00:00 2001
From: Andrew Vit <andrew@avit.ca>
Date: Sat, 8 Mar 2014 13:17:16 -0800
Subject: [PATCH 264/364] Abort installer on errors

---
 tools/install.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/install.sh b/tools/install.sh
index 5c7a5b6ca..343f251ae 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -1,3 +1,5 @@
+set -e
+
 if [ ! -n $ZSH ]
 then
   ZSH=~/.oh-my-zsh

From 9f66d5b797ab73a54d944a7bd43d920a508625ea Mon Sep 17 00:00:00 2001
From: Andrew Vit <andrew@avit.ca>
Date: Mon, 23 Apr 2012 14:01:14 -0700
Subject: [PATCH 265/364] Document alternate install paths via ZSH variable

Uses environment variable $ZSH to configure install location.
---
 README.textile | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/README.textile b/README.textile
index 810569486..0fa9b30ec 100644
--- a/README.textile
+++ b/README.textile
@@ -20,8 +20,18 @@ h4. via `wget`
 
 @wget --no-check-certificate https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O - | sh@
 
-h3. The manual way
+h4. Optional: change the install directory
 
+The default location is `~/.oh-my-zsh` (hidden in your home directory).
+
+You can change the install directory with the ZSH environment variable, either
+by running `export ZSH=/your/path` before installing, or setting it before the
+end of the install pipeline like this:
+
+@curl -L https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh | ZSH=~/.dotfiles/zsh sh@
+
+
+h3. The manual way
 
 1. Clone the repository
 
@@ -35,7 +45,6 @@ h3. The manual way
 
   @cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc@
 
-
 4. Set zsh as your default shell:
 
   @chsh -s /bin/zsh@
@@ -46,6 +55,8 @@ h3. Problems?
 
 You _might_ need to modify your PATH in ~/.zshrc if you're not able to find some commands after switching to _Oh My Zsh_.
 
+If you installed manually or changed the install location, check ZSH in ~/.zshrc
+
 h2. Usage
 
 * enable the plugins you want in your @~/.zshrc@ (take a look at @plugins/@ to see what's possible)

From de0e7b5dc82ca3f18d20bc0d8aab8d9c5dd13ff9 Mon Sep 17 00:00:00 2001
From: Zhou Hua <zhouhua015@gmail.com>
Date: Mon, 10 Mar 2014 11:41:25 +0800
Subject: [PATCH 266/364] Fix hgsl alias.

The original 'hgsl' missed 'hg' part.
---
 plugins/mercurial/mercurial.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
index d2db89d04..2e99a12fb 100644
--- a/plugins/mercurial/mercurial.plugin.zsh
+++ b/plugins/mercurial/mercurial.plugin.zsh
@@ -13,7 +13,7 @@ alias hglr='hg pull --rebase'
 alias hgo='hg outgoing'
 alias hgp='hg push'
 alias hgs='hg status'
-alias hgsl='log --limit 20 --template "{node|short} | {date|isodatesec} | {author|user}: {desc|strip|firstline}\n" '
+alias hgsl='hg log --limit 20 --template "{node|short} | {date|isodatesec} | {author|user}: {desc|strip|firstline}\n" '
 # this is the 'git commit --amend' equivalent
 alias hgca='hg qimport -r tip ; hg qrefresh -e ; hg qfinish tip'
 

From b71a2b9d0f21c0b95840a2534eca2d866a48a941 Mon Sep 17 00:00:00 2001
From: Kaiwen Xu <kevin@kevxu.net>
Date: Mon, 10 Mar 2014 04:05:14 -0400
Subject: [PATCH 267/364] Removed unsolicited aliases.

Those aliases should be in user's .zshrc file, instead of being default.
---
 lib/aliases.zsh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/aliases.zsh b/lib/aliases.zsh
index 2094f60a0..3044c9660 100644
--- a/lib/aliases.zsh
+++ b/lib/aliases.zsh
@@ -6,11 +6,6 @@ alias po='popd'
 alias ...='cd ../..'
 alias -- -='cd -'
 
-# Prevent headaches
-alias cp='cp -v'
-alias rm='rm -v'
-alias mv='mv -v'
-
 # Super user
 alias _='sudo'
 alias please='sudo'

From 3c9a29b0d639f52162eb8056a9b657fe4b6f2850 Mon Sep 17 00:00:00 2001
From: Bob Maerten <bob.maerten@gmail.com>
Date: Mon, 10 Mar 2014 16:23:14 +0100
Subject: [PATCH 268/364] Fix typo in autocomplete arguments

---
 plugins/docker/_docker | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/docker/_docker b/plugins/docker/_docker
index f13f876cf..12eee7a15 100644
--- a/plugins/docker/_docker
+++ b/plugins/docker/_docker
@@ -111,7 +111,7 @@ __ps() {
         '-beforeId="[Show only container created before Id, include non-running ones.]' \
         '-l[Show only the latest created container, include non-running ones.]' \
         '-n=[Show n last created containers, include non-running ones.]' \
-        '-notrurrrrnc[Dont truncate output]' \
+        '-notrunc[Dont truncate output]' \
         '-q[Only display numeric IDs]' \
         '-s[Display sizes]' \
         '-sinceId="[Show only containers created since Id, include non-running ones.]'

From b9841b0bae97049d426c652f6a9be361c7492040 Mon Sep 17 00:00:00 2001
From: Samvel Khalatyan <sn.khalatyan@gmail.com>
Date: Mon, 10 Mar 2014 17:18:50 -0500
Subject: [PATCH 269/364] Add github url shortener

---
 plugins/github/github.plugin.zsh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/plugins/github/github.plugin.zsh b/plugins/github/github.plugin.zsh
index 66a10cfdb..25b1a1e1b 100644
--- a/plugins/github/github.plugin.zsh
+++ b/plugins/github/github.plugin.zsh
@@ -84,5 +84,14 @@ exist_gh() { # [DIRECTORY]
     git push -u origin master
 }
 
+# git.io "GitHub URL"
+#
+# Shorten GitHub url, example:
+#   https://github.com/nvogel/dotzsh    >   http://git.io/8nU25w  
+# source: https://github.com/nvogel/dotzsh
+# documentation: https://github.com/blog/985-git-io-github-url-shortener
+#
+git.io() {curl -i -s http://git.io -F "url=$1" | grep "Location" | cut -f 2 -d " "}
+
 # End Functions #############################################################
 

From c3c8cc318de898257fd7c5be6f862098966fbbdf Mon Sep 17 00:00:00 2001
From: Ryan Marsh <ryan.marsh@mac.com>
Date: Mon, 10 Mar 2014 18:36:51 -0500
Subject: [PATCH 270/364] Fixes #2467 tab completion scrolls back in terminal
 when using bureau theme

---
 themes/bureau.zsh-theme | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/themes/bureau.zsh-theme b/themes/bureau.zsh-theme
index 1d88f54d0..4d9cae0cc 100644
--- a/themes/bureau.zsh-theme
+++ b/themes/bureau.zsh-theme
@@ -101,12 +101,12 @@ _1RIGHT="[%*] "
 
 bureau_precmd () {
   _1SPACES=`get_space $_1LEFT $_1RIGHT`
-  echo
+  print 
+  print -rP "$_1LEFT$_1SPACES$_1RIGHT"
 }
 
 setopt prompt_subst
-PROMPT='$_1LEFT$_1SPACES$_1RIGHT
-> $_LIBERTY '
+PROMPT='> $_LIBERTY '
 RPROMPT='$(nvm_prompt_info) $(bureau_git_prompt)'
 
 autoload -U add-zsh-hook

From ae2f6f34e3c3a335d6cb16df8ea88a709ef6b36b Mon Sep 17 00:00:00 2001
From: Josh Chih-Hsueh Huang <huangjs@gmail.com>
Date: Tue, 11 Mar 2014 11:29:25 +0800
Subject: [PATCH 271/364] List pkgs by size

---
 plugins/debian/debian.plugin.zsh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index 1e15487ba..28dfb82a5 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -217,3 +217,11 @@ kerndeb () {
         "$revision" kernel_image kernel_headers
 }
 
+# List packages by size
+function apt-list-packages {
+    dpkg-query -W --showformat='${Installed-Size} ${Package} ${Status}\n' | \
+    grep -v deinstall | \
+    sort -n | \
+    awk '{print $1" "$2}'
+}
+

From b6cbba9dfee5985232b473e94595c2fb1ab83715 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Wed, 12 Mar 2014 07:52:20 -0700
Subject: [PATCH 272/364] Updating README to show the new install URL, which
 redirects to the raw files on github.

---
 README.textile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.textile b/README.textile
index 810569486..b80294c60 100644
--- a/README.textile
+++ b/README.textile
@@ -14,11 +14,11 @@ You can install this via the command line with either `curl` or `wget`.
 
 h4. via `curl`
 
-@curl -L https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh | sh@
+@curl -L http://install.ohmyz.sh | sh@
 
 h4. via `wget`
 
-@wget --no-check-certificate https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O - | sh@
+@wget --no-check-certificate http://install.ohmyz.sh -O - | sh@
 
 h3. The manual way
 

From 5f5e5508b0560339f7f57fa125496d0b9f1ea077 Mon Sep 17 00:00:00 2001
From: Jon Tewksbury <jontewks@gmail.com>
Date: Wed, 12 Mar 2014 22:37:25 -0700
Subject: [PATCH 273/364] Update license year

Fix outdated copyright year (updated to 2014).
The copyright year was out of date. Copyright notices must reflect the current year, so this commit updates the listed year to 2014.

See http://www.copyright.gov/circs/circ01.pdf for more info.
---
 MIT-LICENSE.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MIT-LICENSE.txt b/MIT-LICENSE.txt
index f6edab65b..6eb8aab34 100644
--- a/MIT-LICENSE.txt
+++ b/MIT-LICENSE.txt
@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2009-2013 Robby Russell and contributors (see https://github.com/robbyrussell/oh-my-zsh/contributors)
+Copyright (c) 2009-2014 Robby Russell and contributors (see https://github.com/robbyrussell/oh-my-zsh/contributors)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

From 71d94206370c258383beddfa6d3122524c26d8e8 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Mon, 17 Dec 2012 12:22:33 +0100
Subject: [PATCH 274/364] Use zsh's default for ':completion:*:hosts'

The manual configuration of ':completion:*:hosts' causes some problems
(e.g. issue #1337), and misses useful information (especially from
~/.ssh/known_hosts; issue #690 and issue #1009).

The best option appears to be using zsh's default configuration for
':completion:*:hosts'.

While rebasing this for a new pull request (#1498 got closed by accident
and then requests to re-open it got ignored), it also drops the `users
off` setting: completion of user names can be useful, and the commit
adding it (c4434d2) does not state why.
---
 lib/completion.zsh | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/lib/completion.zsh b/lib/completion.zsh
index e0cdcf626..6e18e9c82 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -31,22 +31,6 @@ zstyle ':completion:*:*:*:*:processes' command "ps -u `whoami` -o pid,user,comm
 zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-directories
 cdpath=(.)
 
-# use /etc/hosts and known_hosts for hostname completion
-[ -r /etc/ssh/ssh_known_hosts ] && _global_ssh_hosts=(${${${${(f)"$(</etc/ssh/ssh_known_hosts)"}:#[\|]*}%%\ *}%%,*}) || _global_ssh_hosts=()
-[ -r ~/.ssh/known_hosts ] && _ssh_hosts=(${${${${(f)"$(<$HOME/.ssh/known_hosts)"}:#[\|]*}%%\ *}%%,*}) || _ssh_hosts=()
-[ -r ~/.ssh/config ] && _ssh_config=($(cat ~/.ssh/config | sed -ne 's/Host[=\t ]//p')) || _ssh_config=()
-[ -r /etc/hosts ] && : ${(A)_etc_hosts:=${(s: :)${(ps:\t:)${${(f)~~"$(</etc/hosts)"}%%\#*}##[:blank:]#[^[:blank:]]#}}} || _etc_hosts=()
-hosts=(
-  "$_ssh_config[@]"
-  "$_global_ssh_hosts[@]"
-  "$_ssh_hosts[@]"
-  "$_etc_hosts[@]"
-  "$HOST"
-  localhost
-)
-zstyle ':completion:*:hosts' hosts $hosts
-zstyle ':completion:*' users off
-
 # Use caching so that commands like apt and dpkg complete are useable
 zstyle ':completion::complete:*' use-cache 1
 zstyle ':completion::complete:*' cache-path $ZSH/cache/

From 47b0d754ae368af16957903f203ee902c7faeec1 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Thu, 13 Mar 2014 10:15:18 -0700
Subject: [PATCH 275/364] Fixing a few quirks in the latest installer updates
 (quoting /Users/robbyrussell/.oh-my-zsh and such). Also mentioining our
 twitter account after install

---
 tools/install.sh | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index 343f251ae..71e19a389 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -1,12 +1,10 @@
 set -e
 
-if [ ! -n $ZSH ]
-then
+if [ ! -n "$ZSH" ]; then
   ZSH=~/.oh-my-zsh
 fi
 
-if [ -d $ZSH ]
-then
+if [ -d "$ZSH" ]; then
   echo "\033[0;33mYou already have Oh My Zsh installed.\033[0m You'll need to remove $ZSH if you want to install"
   exit
 fi
@@ -18,8 +16,7 @@ hash git >/dev/null && /usr/bin/env git clone https://github.com/robbyrussell/oh
 }
 
 echo "\033[0;34mLooking for an existing zsh config...\033[0m"
-if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]
-then
+if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]; then
   echo "\033[0;33mFound ~/.zshrc.\033[0m \033[0;32mBacking up to ~/.zshrc.pre-oh-my-zsh\033[0m";
   mv ~/.zshrc ~/.zshrc.pre-oh-my-zsh;
 fi
@@ -43,9 +40,8 @@ echo "\033[0;32m"'  ____  / /_     ____ ___  __  __   ____  _____/ /_  '"\033[0m
 echo "\033[0;32m"' / __ \/ __ \   / __ `__ \/ / / /  /_  / / ___/ __ \ '"\033[0m"
 echo "\033[0;32m"'/ /_/ / / / /  / / / / / / /_/ /    / /_(__  ) / / / '"\033[0m"
 echo "\033[0;32m"'\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/  '"\033[0m"
-echo "\033[0;32m"'                        /____/                       '"\033[0m"
-
-echo "\n\n \033[0;32m....is now installed.\033[0m"
+echo "\033[0;32m"'                        /____/                       ....is now installed!'"\033[0m"
 echo "\n\n \033[0;32mPlease look over the ~/.zshrc file to select plugins, themes, and options.\033[0m"
+echo "\n\n \033[0;32mp.s. Follow us at http://twitter.com/ohmyzsh.\033[0m"
 /usr/bin/env zsh
 . ~/.zshrc

From cfe468f6f6bf7cfecb2c832c39f4bf9a065ef6fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Ho=CC=88ltje?= <choltje@us.ibm.com>
Date: Thu, 13 Mar 2014 14:44:58 -0400
Subject: [PATCH 276/364] ssh-agent: prevent environment file from flapping

On an OS X laptop, the variable `$HOST` changes a lot depending
on what wifi network you're connected to.  This causes a lot
of `~/.ssh/environment-$HOST` files to be created and
causes multiple ssh-agents to created.

Instead, use `scutil --get ComputerName` to get something
more stable.
---
 plugins/ssh-agent/ssh-agent.plugin.zsh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index a1e64ad0f..2fb8d5462 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -27,7 +27,7 @@
 #   Florent Thoumie and Jonas Pfenniger
 #
 
-local _plugin__ssh_env=$HOME/.ssh/environment-$HOST
+local _plugin__ssh_env
 local _plugin__forwarding
 
 function _plugin__start_agent()
@@ -42,12 +42,20 @@ function _plugin__start_agent()
   . ${_plugin__ssh_env} > /dev/null
 
   # load identies
-  zstyle -a :omz:plugins:ssh-agent identities identities 
+  zstyle -a :omz:plugins:ssh-agent identities identities
   echo starting ssh-agent...
 
   /usr/bin/ssh-add $HOME/.ssh/${^identities}
 }
 
+# Get the filename to store/lookup the environment from
+if (( $+commands[scutil] )); then
+  # It's OS X!
+  _plugin__ssh_env="$HOME/.ssh/environment-$(scutil --get ComputerName)"
+else
+  _plugin__ssh_env="$HOME/.ssh/environment-$HOST"
+fi
+
 # test if agent-forwarding is enabled
 zstyle -b :omz:plugins:ssh-agent agent-forwarding _plugin__forwarding
 if [[ ${_plugin__forwarding} == "yes" && -n "$SSH_AUTH_SOCK" ]]; then

From 9e90bf0f23ff4343954e6533ccceace883cc16dd Mon Sep 17 00:00:00 2001
From: Michael Hauser-Raspe <michael.hauser-raspe@cantab.net>
Date: Fri, 14 Mar 2014 10:14:47 +0000
Subject: [PATCH 277/364] Added v as a keybinding to edit-command-line

taken from [here](http://www.zsh.org/mla/users/2008/msg01013.html)
We want pressing v in command mode to take us to an editor (defined by the $VISUAL or $EDITOR variable or vi) to edit the current contents of the command line which (I believe) is a standard feature of bash vi-mode or other readline prompts (see [here](http://www.catonmat.net/download/bash-vi-editing-mode-cheat-sheet.pdf) and [here](http://www.catonmat.net/blog/bash-vi-editing-mode-cheat-sheet/) for source).
---
 plugins/vi-mode/vi-mode.plugin.zsh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh
index a06100472..3ed32b3fb 100644
--- a/plugins/vi-mode/vi-mode.plugin.zsh
+++ b/plugins/vi-mode/vi-mode.plugin.zsh
@@ -17,9 +17,15 @@ function zle-keymap-select zle-line-init zle-line-finish {
 zle -N zle-line-init
 zle -N zle-line-finish
 zle -N zle-keymap-select
+zle -N edit-command-line
+
 
 bindkey -v
 
+# allow v to edit the command line (standard behaviour)
+autoload -Uz edit-command-line
+bindkey -M vicmd 'v' edit-command-line
+
 # if mode indicator wasn't setup by theme, define default
 if [[ "$MODE_INDICATOR" == "" ]]; then
   MODE_INDICATOR="%{$fg_bold[red]%}<%{$fg[red]%}<<%{$reset_color%}"

From 8f7971349b653706071bc41e2fdb953bb6f22678 Mon Sep 17 00:00:00 2001
From: Andrew vonderLuft <avonderluft@avlux.net>
Date: Fri, 7 Mar 2014 11:17:18 -0800
Subject: [PATCH 278/364] add option to show dirty status of current dir

---
 plugins/svn/svn.plugin.zsh | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
index 4f008ba4e..ef6da5bd3 100644
--- a/plugins/svn/svn.plugin.zsh
+++ b/plugins/svn/svn.plugin.zsh
@@ -9,7 +9,7 @@ function svn_prompt_info() {
       _DISPLAY=$(svn_get_repo_name)
     fi
     echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\
-$ZSH_THEME_REPO_NAME_COLOR$_DISPLAY$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(svn_dirty)$ZSH_PROMPT_BASE_COLOR"
+$ZSH_THEME_REPO_NAME_COLOR$_DISPLAY$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(svn_dirty)$(svn_dirty_pwd)$ZSH_PROMPT_BASE_COLOR"
     unset _DISPLAY
   fi
 }
@@ -74,3 +74,22 @@ function svn_dirty_choose() {
 function svn_dirty() {
   svn_dirty_choose $ZSH_THEME_SVN_PROMPT_DIRTY $ZSH_THEME_SVN_PROMPT_CLEAN
 }
+
+function svn_dirty_choose_pwd () {
+  if in_svn; then
+    root=`pwd`
+    if $(svn status $root 2> /dev/null | grep -Eq '^\s*[ACDIM!?L]'); then
+      # Grep exits with 0 when "One or more lines were selected", return "dirty".
+      echo $1
+    else
+      # Otherwise, no lines were found, or an error occurred. Return clean.
+      echo $2
+    fi
+  fi
+}
+
+function svn_dirty_pwd () {
+  svn_dirty_choose_pwd $ZSH_THEME_SVN_PROMPT_DIRTY_PWD $ZSH_THEME_SVN_PROMPT_CLEAN_PWD
+}
+
+

From b56e8fb47868f8433c7da809be3d4df833d9f59c Mon Sep 17 00:00:00 2001
From: Mariusz Fik <fisiu@opensuse.org>
Date: Sun, 16 Mar 2014 18:14:34 +0100
Subject: [PATCH 279/364] Ignore more users in ssh completion.

Signed-off-by: Mariusz Fik <fisiu@opensuse.org>
---
 lib/completion.zsh | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/completion.zsh b/lib/completion.zsh
index 6e18e9c82..c54249c52 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -37,13 +37,14 @@ zstyle ':completion::complete:*' cache-path $ZSH/cache/
 
 # Don't complete uninteresting users
 zstyle ':completion:*:*:*:users' ignored-patterns \
-        adm amanda apache avahi beaglidx bin cacti canna clamav daemon \
-        dbus distcache dovecot fax ftp games gdm gkrellmd gopher \
-        hacluster haldaemon halt hsqldb ident junkbust ldap lp mail \
-        mailman mailnull mldonkey mysql nagios \
-        named netdump news nfsnobody nobody nscd ntp nut nx openvpn \
-        operator pcap postfix postgres privoxy pulse pvm quagga radvd \
-        rpc rpcuser rpm shutdown squid sshd sync uucp vcsa xfs
+        adm amanda apache at avahi avahi-autoipd beaglidx bin cacti canna \
+        clamav daemon dbus distcache dnsmasq dovecot fax ftp games gdm \
+        gkrellmd gopher hacluster haldaemon halt hsqldb ident junkbust kdm \
+        ldap lp mail mailman mailnull man messagebus  mldonkey mysql nagios \
+        named netdump news nfsnobody nobody nscd ntp nut nx obsrun openvpn \
+        operator pcap polkitd postfix postgres privoxy pulse pvm quagga radvd \
+        rpc rpcuser rpm rtkit scard shutdown squid sshd statd svn sync tftp \
+        usbmux uucp vcsa wwwrun xfs
 
 # ... unless we really want to.
 zstyle '*' single-ignored show

From baeac5bec9cc9b2da5ac69054d91ae3838fde402 Mon Sep 17 00:00:00 2001
From: Kevin Bongart <contact@kevinbongart.net>
Date: Sun, 16 Mar 2014 16:52:37 -0400
Subject: [PATCH 280/364] Remove copyright information, as per #2588

---
 plugins/rake-fast/rake-fast.plugin.zsh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/plugins/rake-fast/rake-fast.plugin.zsh b/plugins/rake-fast/rake-fast.plugin.zsh
index 0c268355e..320855233 100644
--- a/plugins/rake-fast/rake-fast.plugin.zsh
+++ b/plugins/rake-fast/rake-fast.plugin.zsh
@@ -15,11 +15,6 @@
 # which is inspired by this Ruby on Rails trick from 2006:
 # http://weblog.rubyonrails.org/2006/3/9/fast-rake-task-completion-for-zsh/
 
-# Author: Kevin Bongart
-# contact@kevinbongart.net
-# http://kevinbongart.net
-# https://github.com/KevinBongart
-
 _rake_refresh () {
   if [ -f .rake_tasks ]; then
     rm .rake_tasks

From 3be2e34d9638b7e552208596eca49fbc66c05574 Mon Sep 17 00:00:00 2001
From: Felix Laurie von Massenbach <felix@erbridge.co.uk>
Date: Wed, 5 Mar 2014 12:58:18 +0000
Subject: [PATCH 281/364] Don't lazy load the virtualenvwrapper.

Fix robbyrussell#2355.
---
 plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
index 16f32da6e..f58bda1ad 100644
--- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
@@ -1,4 +1,4 @@
-virtualenvwrapper='virtualenvwrapper_lazy.sh'
+virtualenvwrapper='virtualenvwrapper.sh'
 if (( $+commands[$virtualenvwrapper] )); then
   source ${${virtualenvwrapper}:c}
 
@@ -17,7 +17,7 @@ if (( $+commands[$virtualenvwrapper] )); then
             # Check for virtualenv name override
             if [[ -f "$PROJECT_ROOT/.venv" ]]; then
                 ENV_NAME=`cat "$PROJECT_ROOT/.venv"`
-            elif [[ -f "$PROJECT_ROOT/.venv/bin/activate" ]];then 
+            elif [[ -f "$PROJECT_ROOT/.venv/bin/activate" ]];then
                 ENV_NAME="$PROJECT_ROOT/.venv"
             elif [[ "$PROJECT_ROOT" != "." ]]; then
                 ENV_NAME=`basename "$PROJECT_ROOT"`

From baf2ab1bf1096b954a759739cc41c587fb0cf5b2 Mon Sep 17 00:00:00 2001
From: Nicolas Cavigneaux <nicolas@synbioz.com>
Date: Mon, 17 Mar 2014 10:05:56 +0100
Subject: [PATCH 282/364] Don't set RBENV_ROOT to "$HOME/.rbenv" when using
 Homebrew rbenv

Hard setting RBENV_ROOT to "$HOME/.rbenv" when using Homebrew's rbenv
will breaks it. It has to be set to $(brew --prefix rbenv).
---
 plugins/rbenv/rbenv.plugin.zsh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/plugins/rbenv/rbenv.plugin.zsh b/plugins/rbenv/rbenv.plugin.zsh
index 57ae2ca1f..b6795b91c 100644
--- a/plugins/rbenv/rbenv.plugin.zsh
+++ b/plugins/rbenv/rbenv.plugin.zsh
@@ -10,9 +10,6 @@ FOUND_RBENV=0
 rbenvdirs=("$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv")
 if _homebrew-installed && _rbenv-from-homebrew-installed ; then
     rbenvdirs=($(brew --prefix rbenv) "${rbenvdirs[@]}")
-    if [[ $RBENV_ROOT = '' ]]; then 
-      RBENV_ROOT="$HOME/.rbenv"
-    fi
 fi
 
 for rbenvdir in "${rbenvdirs[@]}" ; do

From a869ec9bc848a011a3068fbaed52b4cbd04681aa Mon Sep 17 00:00:00 2001
From: Benoit Dubertret <benoit.dubertret@iscool-e.com>
Date: Mon, 17 Mar 2014 16:07:46 +0100
Subject: [PATCH 283/364] Fix gwip alias in git plugin when no files to rm

---
 plugins/git/git.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 2b5983f33..9f7819df3 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -149,7 +149,7 @@ function work_in_progress() {
   fi
 }
 # these alias commit and uncomit wip branches
-alias gwip='git add -A; git ls-files --deleted -z | xargs -0 git rm; git commit -m "--wip--"'
+alias gwip='git add -A; git ls-files --deleted -z | xargs -r0 git rm; git commit -m "--wip--"'
 alias gunwip='git log -n 1 | grep -q -c "\-\-wip\-\-" && git reset HEAD~1'
 
 # these alias ignore changes to file

From d3babe0d79dc7dbcce15c9285c4c5b604f595c9a Mon Sep 17 00:00:00 2001
From: Kory Prince <korylprince@gmail.com>
Date: Mon, 17 Mar 2014 11:02:47 -0500
Subject: [PATCH 284/364] Don't show useless '[]' when chruby_prompt_info is
 empty

---
 themes/gallois.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/gallois.zsh-theme b/themes/gallois.zsh-theme
index 1ff86b54c..f1057a9a9 100644
--- a/themes/gallois.zsh-theme
+++ b/themes/gallois.zsh-theme
@@ -18,7 +18,7 @@ else
   if which rbenv &> /dev/null; then
     RPS1='$(git_custom_status)%{$fg[red]%}[`rbenv version | sed -e "s/ (set.*$//"`]%{$reset_color%} $EPS1'
   else
-    if which chruby_prompt_info &> /dev/null; then
+    if [[ -n `which chruby_prompt_info` && -n `chruby_prompt_info` ]]; then
       RPS1='$(git_custom_status)%{$fg[red]%}[`chruby_prompt_info`]%{$reset_color%} $EPS1'
     else
       RPS1='$(git_custom_status) $EPS1'

From c1c107cfb9669beeda258efed9a17cc4bddf7aa7 Mon Sep 17 00:00:00 2001
From: Pavol Juhas <pavol.juhas@gmail.com>
Date: Mon, 17 Mar 2014 19:49:12 -0400
Subject: [PATCH 285/364] Add scd plugin for smart change of directory.

Synced with the scd-tracker branch
pavoljuhas/oh-my-zsh@2f78243cad3509058d142aa4b70a604e75ec741e.
---
 plugins/scd/README.md |   3 +-
 plugins/scd/scd       | 343 +++++++++++++++++++++---------------------
 2 files changed, 174 insertions(+), 172 deletions(-)

diff --git a/plugins/scd/README.md b/plugins/scd/README.md
index ea7c72464..197cea50a 100644
--- a/plugins/scd/README.md
+++ b/plugins/scd/README.md
@@ -111,8 +111,7 @@ SCD_MEANLIFE</dt><dd>
 
 SCD_THRESHOLD</dt><dd>
     threshold for cumulative directory likelihood.  Directories with
-    lower likelihood are excluded unless they are the only match to
-    scd patterns.
+    a lower likelihood compared to the best match are excluded (0.005).
     </dd><dt>
 
 SCD_SCRIPT</dt><dd>
diff --git a/plugins/scd/scd b/plugins/scd/scd
index 9e055eadd..1567d2736 100755
--- a/plugins/scd/scd
+++ b/plugins/scd/scd
@@ -1,10 +1,11 @@
 #!/bin/zsh -f
 
 emulate -L zsh
+local EXIT=return
 if [[ $(whence -w $0) == *:' 'command ]]; then
     emulate -R zsh
-    alias return=exit
     local RUNNING_AS_COMMAND=1
+    EXIT=exit
 fi
 
 local DOC='scd -- smart change to a recently used directory
@@ -37,8 +38,9 @@ local SCD_ALIAS=~/.scdalias.zsh
 local ICASE a d m p i tdir maxrank threshold
 local opt_help opt_add opt_unindex opt_recursive opt_verbose
 local opt_alias opt_unalias opt_list
-local -A drank dalias dkey
+local -A drank dalias
 local dmatching
+local last_directory
 
 setopt extendedhistory extendedglob noautonamedirs brace_ccl
 
@@ -56,11 +58,11 @@ zparseopts -D -- a=opt_add -add=opt_add -unindex=opt_unindex \
     r=opt_recursive -recursive=opt_recursive \
     -alias:=opt_alias -unalias=opt_unalias -list=opt_list \
     v=opt_verbose -verbose=opt_verbose h=opt_help -help=opt_help \
-    || return $?
+    || $EXIT $?
 
 if [[ -n $opt_help ]]; then
     print $DOC
-    return
+    $EXIT
 fi
 
 # load directory aliases if they exist
@@ -79,8 +81,8 @@ _scd_Y19oug_abspath() {
 # define directory alias
 if [[ -n $opt_alias ]]; then
     if [[ -n $1 && ! -d $1 ]]; then
-        print -u2 "'$1' is not a directory"
-        return 1
+        print -u2 "'$1' is not a directory."
+        $EXIT 1
     fi
     a=${opt_alias[-1]#=}
     _scd_Y19oug_abspath d ${1:-$PWD}
@@ -93,19 +95,19 @@ if [[ -n $opt_alias ]]; then
         hash -d -- $a=$d
         hash -dL >| $SCD_ALIAS
     )
-    return $?
+    $EXIT $?
 fi
 
 # undefine directory alias
 if [[ -n $opt_unalias ]]; then
     if [[ -n $1 && ! -d $1 ]]; then
-        print -u2 "'$1' is not a directory"
-        return 1
+        print -u2 "'$1' is not a directory."
+        $EXIT 1
     fi
     _scd_Y19oug_abspath a ${1:-$PWD}
     a=$(print -rD ${a})
     if [[ $a != [~][^/]## ]]; then
-        return
+        $EXIT
     fi
     a=${a#[~]}
     # unalias in the current shell, update alias file if successful
@@ -118,35 +120,39 @@ if [[ -n $opt_unalias ]]; then
             hash -dL >| $SCD_ALIAS
         )
     fi
-    return $?
+    $EXIT $?
 fi
 
-# Rewrite the history file if it is at least 20% oversized
+# Rewrite directory index if it is at least 20% oversized
 if [[ -s $SCD_HISTFILE ]] && \
 (( $(wc -l <$SCD_HISTFILE) > 1.2 * $SCD_HISTSIZE )); then
     m=( ${(f)"$(<$SCD_HISTFILE)"} )
     print -lr -- ${m[-$SCD_HISTSIZE,-1]} >| ${SCD_HISTFILE}
 fi
 
+# Determine the last recorded directory
+if [[ -s ${SCD_HISTFILE} ]]; then
+    last_directory=${"$(tail -1 ${SCD_HISTFILE})"#*;}
+fi
+
 # Internal functions are prefixed with "_scd_Y19oug_".
-# The "record" function adds a non-repeating directory to the history
-# and turns on history writing.
+# The "record" function adds its arguments to the directory index.
 _scd_Y19oug_record() {
-    while [[ -n $1 && $1 == ${history[$HISTCMD]} ]]; do
+    while [[ -n $last_directory && $1 == $last_directory ]]; do
         shift
     done
-    if [[ $# != 0 ]]; then
-        ( umask 077; : >>| $SCD_HISTFILE )
-        p=": ${EPOCHSECONDS}:0;"
-        print -lr -- ${p}${^*} >> $SCD_HISTFILE
+    if [[ $# -gt 0 ]]; then
+        ( umask 077
+          p=": ${EPOCHSECONDS}:0;"
+          print -lr -- ${p}${^*} >>| $SCD_HISTFILE )
     fi
 }
 
 if [[ -n $opt_add ]]; then
-    for a; do
-        if [[ ! -d $a ]]; then
-            print -u 2 "Directory $a does not exist"
-            return 2
+    for d; do
+        if [[ ! -d $d ]]; then
+            print -u2 "Directory '$d' does not exist."
+            $EXIT 2
         fi
     done
     _scd_Y19oug_abspath m ${*:-$PWD}
@@ -158,13 +164,13 @@ if [[ -n $opt_add ]]; then
             print "[done]"
         done
     fi
-    return
+    $EXIT
 fi
 
 # take care of removing entries from the directory index
 if [[ -n $opt_unindex ]]; then
     if [[ ! -s $SCD_HISTFILE ]]; then
-        return
+        $EXIT
     fi
     # expand existing directories in the argument list
     for i in {1..$#}; do
@@ -190,161 +196,158 @@ if [[ -n $opt_unindex ]]; then
             }
         }
         { print $0 }
-        ' $SCD_HISTFILE ${*:-$PWD} )" || return $?
+        ' $SCD_HISTFILE ${*:-$PWD} )" || $EXIT $?
     : >| ${SCD_HISTFILE}
     [[ ${#m} == 0 ]] || print -r -- $m >> ${SCD_HISTFILE}
-    return
+    $EXIT
 fi
 
 # The "action" function is called when there is just one target directory.
 _scd_Y19oug_action() {
-    if [[ -n $opt_list ]]; then
-        for d; do
-            a=${(k)dalias[(r)${d}]}
-            print -r -- "# $a"
-            print -r -- $d
-        done
-    elif [[ $# == 1 ]]; then
-        if [[ -z $SCD_SCRIPT && -n $RUNNING_AS_COMMAND ]]; then
-            print -u2 "Warning: running as command with SCD_SCRIPT undefined."
-        fi
-        [[ -n $SCD_SCRIPT ]] && (umask 077;
-            print -r "cd ${(q)1}" >| $SCD_SCRIPT)
-        [[ -N $SCD_HISTFILE ]] && touch -a $SCD_HISTFILE
-        cd $1
-        # record the new directory unless already done in some chpwd hook
-        [[ -N $SCD_HISTFILE ]] || _scd_Y19oug_record $PWD
+    cd $1 || return $?
+    if [[ -z $SCD_SCRIPT && -n $RUNNING_AS_COMMAND ]]; then
+        print -u2 "Warning: running as command with SCD_SCRIPT undefined."
+    fi
+    if [[ -n $SCD_SCRIPT ]]; then
+        print -r "cd ${(q)1}" >| $SCD_SCRIPT
     fi
 }
 
-# handle different argument scenarios ----------------------------------------
-
-## single argument that is an existing directory
-if [[ $# == 1 && -d $1 && -x $1 ]]; then
-    _scd_Y19oug_action $1
-    return $?
-## single argument that is an alias
-elif [[ $# == 1 && -d ${d::=${nameddirs[$1]}} ]]; then
-    _scd_Y19oug_action $d
-    return $?
-fi
-
-# ignore case unless there is an argument with an uppercase letter
-[[ "$*" == *[[:upper:]]* ]] || ICASE='(#i)'
-
-# calculate rank of all directories in the SCD_HISTFILE and keep it as drank
-# include a dummy entry for splitting of an empty string is buggy
-[[ -s $SCD_HISTFILE ]] && drank=( ${(f)"$(
-    print -l /dev/null -10
-    <$SCD_HISTFILE \
-    awk -v epochseconds=$EPOCHSECONDS -v meanlife=$SCD_MEANLIFE '
-        BEGIN { FS = "[:;]"; }
-        length($0) < 4096 && $2 > 0 {
-            tau = 1.0 * ($2 - epochseconds) / meanlife;
-            if (tau < -4.61)  tau = -4.61;
-            prec = exp(tau);
-            sub(/^[^;]*;/, "");
-            if (NF)  ptot[$0] += prec;
-        }
-        END { for (di in ptot)  { print di; print ptot[di]; } }'
-    )"}
-)
-unset "drank[/dev/null]"
-
-# filter drank to the entries that match all arguments
-for a; do
-    p=${ICASE}"*${a}*"
-    drank=( ${(kv)drank[(I)${~p}]} )
-done
-
-# build a list of matching directories reverse-sorted by their probabilities
-dmatching=( ${(f)"$(
-    for d p in ${(kv)drank}; do
-        print -r -- "$p $d";
-    done | sort -grk1 | cut -d ' ' -f 2-
-    )"}
-)
-
-# if some directory paths match all patterns in order, discard all others
-p=${ICASE}"*${(j:*:)argv}*"
-m=( ${(M)dmatching:#${~p}} )
-[[ -d ${m[1]} ]] && dmatching=( $m )
-# if some directory names match last pattern, discard all others
-p=${ICASE}"*${(j:*:)argv}[^/]#"
-m=( ${(M)dmatching:#${~p}} )
-[[ -d ${m[1]} ]] && dmatching=( $m )
-# if some directory names match all patterns, discard all others
-m=( $dmatching )
-for a; do
-    p=${ICASE}"*/[^/]#${a}[^/]#"
-    m=( ${(M)m:#${~p}} )
-done
-[[ -d ${m[1]} ]] && dmatching=( $m )
-# if some directory names match all patterns in order, discard all others
-p=${ICASE}"/*${(j:[^/]#:)argv}[^/]#"
-m=( ${(M)dmatching:#${~p}} )
-[[ -d ${m[1]} ]] && dmatching=( $m )
-
-# do not match $HOME or $PWD when run without arguments
-if [[ $# == 0 ]]; then
-    dmatching=( ${dmatching:#(${HOME}|${PWD})} )
-fi
-
-# keep at most SCD_MENUSIZE of matching and valid directories
-m=( )
-for d in $dmatching; do
-    [[ ${#m} == $SCD_MENUSIZE ]] && break
-    [[ -d $d && -x $d ]] && m+=$d
-done
-dmatching=( $m )
-
-# find the maximum rank
-maxrank=0.0
-for d in $dmatching; do
-    [[ ${drank[$d]} -lt maxrank ]] || maxrank=${drank[$d]}
-done
-
-# discard all directories below the rank threshold
-threshold=$(( maxrank * SCD_THRESHOLD ))
-dmatching=( ${^dmatching}(Ne:'(( ${drank[$REPLY]} >= threshold ))':) )
-
-## process whatever directories that remained
-case ${#dmatching} in
-(0)
-    print -u2 "no matching directory"
-    return 1
-    ;;
-(1)
-    _scd_Y19oug_action $dmatching
-    return $?
-    ;;
-(*)
-    # build a list of strings to be displayed in the selection menu
-    m=( ${(f)"$(print -lD ${dmatching})"} )
-    if [[ -n $opt_verbose ]]; then
-        for i in {1..${#dmatching}}; do
-            d=${dmatching[i]}
-            m[i]=$(printf "%.3g %s" ${drank[$d]} $d)
-        done
-    fi
-    # build a map of string names to actual directory paths
-    for i in {1..${#m}}; dalias[${m[i]}]=${dmatching[i]}
-    # opt_list - output matching directories and exit
-    if [[ -n $opt_list ]]; then
-        _scd_Y19oug_action ${dmatching}
+# Match and rank patterns to the index file
+# set global arrays dmatching and drank
+_scd_Y19oug_match() {
+    ## single argument that is an existing directory or directory alias
+    if [[ $# == 1 ]] && \
+        [[ -d ${d::=$1} || -d ${d::=${nameddirs[$1]}} ]] && [[ -x $d ]];
+    then
+        _scd_Y19oug_abspath dmatching $d
+        drank[${dmatching[1]}]=1
         return
     fi
-    # finally use the selection menu to get the answer
-    a=( {a-z} {A-Z} )
-    p=( )
-    for i in {1..${#m}}; do
-        [[ -n ${a[i]} ]] || break
-        dkey[${a[i]}]=${dalias[$m[i]]}
-        p+="${a[i]}) ${m[i]}"
+
+    # ignore case unless there is an argument with an uppercase letter
+    [[ "$*" == *[[:upper:]]* ]] || ICASE='(#i)'
+
+    # calculate rank of all directories in the SCD_HISTFILE and keep it as drank
+    # include a dummy entry for splitting of an empty string is buggy
+    [[ -s $SCD_HISTFILE ]] && drank=( ${(f)"$(
+        print -l /dev/null -10
+        <$SCD_HISTFILE \
+        awk -v epochseconds=$EPOCHSECONDS -v meanlife=$SCD_MEANLIFE '
+            BEGIN { FS = "[:;]"; }
+            length($0) < 4096 && $2 > 0 {
+                tau = 1.0 * ($2 - epochseconds) / meanlife;
+                if (tau < -4.61)  tau = -4.61;
+                prec = exp(tau);
+                sub(/^[^;]*;/, "");
+                if (NF)  ptot[$0] += prec;
+            }
+            END { for (di in ptot)  { print di; print ptot[di]; } }'
+        )"}
+    )
+    unset "drank[/dev/null]"
+
+    # filter drank to the entries that match all arguments
+    for a; do
+        p=${ICASE}"*${a}*"
+        drank=( ${(kv)drank[(I)${~p}]} )
     done
-    print -c -r -- $p
-    if read -s -k 1 d && [[ -n ${dkey[$d]} ]]; then
-        _scd_Y19oug_action ${dkey[$d]}
+
+    # build a list of matching directories reverse-sorted by their probabilities
+    dmatching=( ${(f)"$(
+        for d p in ${(kv)drank}; do
+            print -r -- "$p $d";
+        done | sort -grk1 | cut -d ' ' -f 2-
+        )"}
+    )
+
+    # if some directory paths match all patterns in order, discard all others
+    p=${ICASE}"*${(j:*:)argv}*"
+    m=( ${(M)dmatching:#${~p}} )
+    [[ -d ${m[1]} ]] && dmatching=( $m )
+    # if some directory names match last pattern, discard all others
+    p=${ICASE}"*${(j:*:)argv}[^/]#"
+    m=( ${(M)dmatching:#${~p}} )
+    [[ -d ${m[1]} ]] && dmatching=( $m )
+    # if some directory names match all patterns, discard all others
+    m=( $dmatching )
+    for a; do
+        p=${ICASE}"*/[^/]#${a}[^/]#"
+        m=( ${(M)m:#${~p}} )
+    done
+    [[ -d ${m[1]} ]] && dmatching=( $m )
+    # if some directory names match all patterns in order, discard all others
+    p=${ICASE}"/*${(j:[^/]#:)argv}[^/]#"
+    m=( ${(M)dmatching:#${~p}} )
+    [[ -d ${m[1]} ]] && dmatching=( $m )
+
+    # do not match $HOME or $PWD when run without arguments
+    if [[ $# == 0 ]]; then
+        dmatching=( ${dmatching:#(${HOME}|${PWD})} )
     fi
-    return $?
-esac
+
+    # keep at most SCD_MENUSIZE of matching and valid directories
+    m=( )
+    for d in $dmatching; do
+        [[ ${#m} == $SCD_MENUSIZE ]] && break
+        [[ -d $d && -x $d ]] && m+=$d
+    done
+    dmatching=( $m )
+
+    # find the maximum rank
+    maxrank=0.0
+    for d in $dmatching; do
+        [[ ${drank[$d]} -lt maxrank ]] || maxrank=${drank[$d]}
+    done
+
+    # discard all directories below the rank threshold
+    threshold=$(( maxrank * SCD_THRESHOLD ))
+    dmatching=( ${^dmatching}(Ne:'(( ${drank[$REPLY]} >= threshold ))':) )
+}
+
+_scd_Y19oug_match $*
+
+## process whatever directories that remained
+if [[ ${#dmatching} == 0 ]]; then
+    print -u2 "No matching directory."
+    $EXIT 1
+fi
+
+## build formatted directory aliases for selection menu or list display
+for d in $dmatching; do
+    if [[ -n ${opt_verbose} ]]; then
+        dalias[$d]=$(printf "%.3g %s" ${drank[$d]} $d)
+    else
+        dalias[$d]=$(print -Dr -- $d)
+    fi
+done
+
+## process the --list option
+if [[ -n $opt_list ]]; then
+    for d in $dmatching; do
+        print -r -- "# ${dalias[$d]}"
+        print -r -- $d
+    done
+    $EXIT
+fi
+
+## process single directory match
+if [[ ${#dmatching} == 1 ]]; then
+    _scd_Y19oug_action $dmatching
+    $EXIT $?
+fi
+
+## here we have multiple matches - display selection menu
+a=( {a-z} {A-Z} )
+p=( )
+for i in {1..${#dmatching}}; do
+    [[ -n ${a[i]} ]] || break
+    p+="${a[i]}) ${dalias[${dmatching[i]}]}"
+done
+
+print -c -r -- $p
+
+if read -s -k 1 d && [[ ${i::=${a[(I)$d]}} -gt 0 ]]; then
+    _scd_Y19oug_action ${dmatching[i]}
+    $EXIT $?
+fi

From 645fceb38b091e1dd5c9804a444730a9837bae07 Mon Sep 17 00:00:00 2001
From: Johan Svensson <jsv@one.com>
Date: Tue, 18 Mar 2014 10:52:25 +0100
Subject: [PATCH 286/364] Add chef-vault knife cmd support

---
 plugins/knife/_knife | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/knife/_knife b/plugins/knife/_knife
index b44283f78..163149267 100644
--- a/plugins/knife/_knife
+++ b/plugins/knife/_knife
@@ -31,7 +31,7 @@ _knife() {
   
   case $state in
   knifecmd)
-    compadd -Q "$@" bootstrap client configure cookbook "cookbook site" "data bag" diff exec environment index node recipe role search ssh status upload windows $cloudproviders
+    compadd -Q "$@" bootstrap client configure cookbook "cookbook site" "data bag" diff exec environment index node recipe role search ssh status upload vault windows $cloudproviders
   ;;
   knifesubcmd)
     case $words[2] in
@@ -65,6 +65,9 @@ _knife() {
     upload)
      _arguments '*:file or directory:_files -g "*"'
     ;;
+    vault)
+      compadd -Q "$@" create decrypt delete edit remove "rotate all keys" "rotate keys" show update
+    ;;
     windows)
       compadd "$@" bootstrap
     ;;

From fb2d6eb5679370b7e8c971ab75b85d8f57d0da1b Mon Sep 17 00:00:00 2001
From: Reed Riley <john.reed.riley@gmail.com>
Date: Mon, 17 Mar 2014 12:01:00 -0400
Subject: [PATCH 287/364] Fixed errors if acpitool isn't installed on linux

---
 plugins/battery/battery.plugin.zsh | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh
index b16a75c5b..32dd4b624 100644
--- a/plugins/battery/battery.plugin.zsh
+++ b/plugins/battery/battery.plugin.zsh
@@ -21,7 +21,7 @@ if [[ $(uname) == "Darwin" ]] ; then
   function plugged_in() {
     [ $(ioreg -rc AppleSmartBattery | grep -c '^.*"ExternalConnected"\ =\ Yes') -eq 1 ]
   }
-  
+
   function battery_pct_remaining() {
     if plugged_in ; then
       echo "External Power"
@@ -31,7 +31,7 @@ if [[ $(uname) == "Darwin" ]] ; then
   }
 
   function battery_time_remaining() {
-  	local smart_battery_status="$(ioreg -rc "AppleSmartBattery")"
+    local smart_battery_status="$(ioreg -rc "AppleSmartBattery")"
     if [[ $(echo $smart_battery_status | grep -c '^.*"ExternalConnected"\ =\ No') -eq 1 ]] ; then
       timeremaining=$(echo $smart_battery_status | grep '^.*"AvgTimeToEmpty"\ =\ ' | sed -e 's/^.*"AvgTimeToEmpty"\ =\ //')
       if [ $timeremaining -gt 720 ] ; then
@@ -59,9 +59,9 @@ if [[ $(uname) == "Darwin" ]] ; then
       echo "∞"
     fi
   }
-  
+
   function battery_is_charging() {
-	  [[ $(ioreg -rc "AppleSmartBattery"| grep '^.*"IsCharging"\ =\ ' | sed -e 's/^.*"IsCharging"\ =\ //') == "Yes" ]]
+    [[ $(ioreg -rc "AppleSmartBattery"| grep '^.*"IsCharging"\ =\ ' | sed -e 's/^.*"IsCharging"\ =\ //') == "Yes" ]]
   }
 
 elif [[ $(uname) == "Linux"  ]] ; then
@@ -71,7 +71,9 @@ elif [[ $(uname) == "Linux"  ]] ; then
   }
 
   function battery_pct() {
-    echo "$(acpi | cut -f2 -d ',' | tr -cd '[:digit:]')" 
+    if (( $+commands[acpi] )) ; then
+      echo "$(acpi | cut -f2 -d ',' | tr -cd '[:digit:]')"
+    fi
   }
 
   function battery_pct_remaining() {
@@ -103,7 +105,7 @@ elif [[ $(uname) == "Linux"  ]] ; then
       echo "∞"
     fi
   }
-  
+
 else
   # Empty functions so we don't cause errors in prompts
   function battery_pct_remaining() {
@@ -136,7 +138,7 @@ function battery_level_gauge() {
   if [[ $battery_remaining_percentage =~ [0-9]+ ]]; then
     local filled=$(((( $battery_remaining_percentage + $gauge_slots - 1) / $gauge_slots)));
     local empty=$(($gauge_slots - $filled));
-	
+
     if [[ $filled -gt $green_threshold ]]; then local gauge_color=$color_green;
     elif [[ $filled -gt $yellow_threshold ]]; then local gauge_color=$color_yellow;
     else local gauge_color=$color_red;
@@ -144,10 +146,9 @@ function battery_level_gauge() {
   else
     local filled=$gauge_slots;
     local empty=0;
-  	filled_symbol=${BATTERY_UNKNOWN_SYMBOL:-'.'};
+    filled_symbol=${BATTERY_UNKNOWN_SYMBOL:-'.'};
   fi
 
-  
   local charging=' ' && battery_is_charging && charging=$charging_symbol;
 
   printf ${charging_color//\%/\%\%}$charging${color_reset//\%/\%\%}${battery_prefix//\%/\%\%}${gauge_color//\%/\%\%}

From ef343eef307cf8d329240dcdf5e973f1d18d410e Mon Sep 17 00:00:00 2001
From: Antoine Dechaume <boolegue@gmail.com>
Date: Thu, 20 Mar 2014 10:43:33 +0100
Subject: [PATCH 288/364] Fix dirpersist plugin

This plugin did not work, I just found the same functionnality in grml, this one works.
---
 plugins/dirpersist/dirpersist.plugin.zsh | 52 ++++++++----------------
 1 file changed, 16 insertions(+), 36 deletions(-)

diff --git a/plugins/dirpersist/dirpersist.plugin.zsh b/plugins/dirpersist/dirpersist.plugin.zsh
index 0f6d9f435..88d1129d4 100644
--- a/plugins/dirpersist/dirpersist.plugin.zsh
+++ b/plugins/dirpersist/dirpersist.plugin.zsh
@@ -1,39 +1,19 @@
-#!/bin/zsh
-# 
-# Make the dirstack more persistant
-# 
-# Add dirpersist to $plugins in ~/.zshrc to load
-# 
+# Save dirstack history to .zdirs
+# adapted from:
+# github.com/grml/grml-etc-core/blob/master/etc/zsh/zshrc#L1547
 
-# $zdirstore is the file used to persist the stack
-zdirstore=~/.zdirstore
+DIRSTACKSIZE=${DIRSTACKSIZE:-20}
+dirstack_file=${dirstack_file:-${HOME}/.zdirs}
 
-dirpersistinstall () {
-    if grep 'dirpersiststore' ~/.zlogout > /dev/null; then
-    else
-        if read -q \?"Would you like to set up your .zlogout file for use with dirspersist? (y/n) "; then
-            echo "# Store dirs stack\n# See $ZSH/plugins/dirspersist.plugin.zsh\ndirpersiststore" >> ~/.zlogout
-        else
-            echo "If you don't want this message to appear, remove dirspersist from \$plugins"
-        fi
-    fi
+if [[ -f ${dirstack_file} ]] && [[ ${#dirstack[*]} -eq 0 ]] ; then
+  dirstack=( ${(f)"$(< $dirstack_file)"} )
+  # "cd -" won't work after login by just setting $OLDPWD, so
+  [[ -d $dirstack[1] ]] && cd $dirstack[1] && cd $OLDPWD
+fi
+
+chpwd() {
+  if (( $DIRSTACKSIZE <= 0 )) || [[ -z $dirstack_file ]]; then return; fi
+  local -ax my_stack
+  my_stack=( ${PWD} ${dirstack} )
+  builtin print -l ${(u)my_stack} >! ${dirstack_file}
 }
-
-dirpersiststore () {
-    dirs -p | perl -e 'foreach (reverse <STDIN>) {chomp;s/([& ])/\\$1/g ;print "if [ -d $_ ]; then pushd -q $_; fi\n"}' > $zdirstore
-}
-
-dirpersistrestore () {
-    if [ -f $zdirstore ]; then
-        source $zdirstore
-    fi
-}
-
-DIRSTACKSIZE=10
-setopt autopushd pushdminus pushdsilent pushdtohome pushdignoredups
-
-dirpersistinstall
-dirpersistrestore
-
-# Make popd changes permanent without having to wait for logout
-alias popd="popd;dirpersiststore"

From e537ee9db95966af3439b550c15d8971805c73cf Mon Sep 17 00:00:00 2001
From: Alexei Danchenkov <adanchenkov@gmail.com>
Date: Thu, 20 Mar 2014 19:10:44 -0700
Subject: [PATCH 289/364] added terminfo keys verification

---
 lib/key-bindings.zsh | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
index 94f1842f3..33046b0f1 100644
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@@ -20,24 +20,40 @@ bindkey -e                                          # Use emacs key bindings
 bindkey '\ew' kill-region                           # [Esc-w] - Kill from the cursor to the mark
 bindkey -s '\el' 'ls\n'                             # [Esc-l] - run command: ls
 bindkey '^r' history-incremental-search-backward    # [Ctrl-r] - Search backward incrementally for a specified string. The string may begin with ^ to anchor the search to the beginning of the line.
-bindkey "${terminfo[kpp]}" up-line-or-history       # [PageUp] - Up a line of history
-bindkey "${terminfo[knp]}" down-line-or-history     # [PageDown] - Down a line of history
+if [[ "${terminfo[kpp]}" != "" ]]; then
+  bindkey "${terminfo[kpp]}" up-line-or-history       # [PageUp] - Up a line of history
+fi
+if [[ "${terminfo[knp]}" != "" ]]; then
+  bindkey "${terminfo[knp]}" down-line-or-history     # [PageDown] - Down a line of history
+fi
 
-bindkey "${terminfo[kcuu1]}" up-line-or-search      # start typing + [Up-Arrow] - fuzzy find history forward
-bindkey "${terminfo[kcud1]}" down-line-or-search    # start typing + [Down-Arrow] - fuzzy find history backward
+if [[ "${terminfo[kcuu1]}" != "" ]]; then
+  bindkey "${terminfo[kcuu1]}" up-line-or-search      # start typing + [Up-Arrow] - fuzzy find history forward
+fi
+if [[ "${terminfo[kcud1]}" != "" ]]; then
+  bindkey "${terminfo[kcud1]}" down-line-or-search    # start typing + [Down-Arrow] - fuzzy find history backward
+fi
 
-bindkey "${terminfo[khome]}" beginning-of-line      # [Home] - Go to beginning of line
-bindkey "${terminfo[kend]}"  end-of-line            # [End] - Go to end of line
+if [[ "${terminfo[khome]}" != "" ]]; then
+  bindkey "${terminfo[khome]}" beginning-of-line      # [Home] - Go to beginning of line
+fi
+if [[ "${terminfo[kend]}" != "" ]]; then
+  bindkey "${terminfo[kend]}"  end-of-line            # [End] - Go to end of line
+fi
 
 bindkey ' ' magic-space                             # [Space] - do history expansion
 
 bindkey '^[[1;5C' forward-word                      # [Ctrl-RightArrow] - move forward one word
 bindkey '^[[1;5D' backward-word                     # [Ctrl-LeftArrow] - move backward one word
 
-bindkey "${terminfo[kcbt]}" reverse-menu-complete   # [Shift-Tab] - move through the completion menu backwards
+if [[ "${terminfo[kdch1]}" != "" ]]; then
+  bindkey "${terminfo[kdch1]}" reverse-menu-complete   # [Shift-Tab] - move through the completion menu backwards
+fi
 
 bindkey '^?' backward-delete-char                   # [Backspace] - delete backward
-bindkey "${terminfo[kdch1]}" delete-char            # [Delete] - delete forward
+if [[ "${terminfo[kdch1]}" != "" ]]; then
+  bindkey "${terminfo[kdch1]}" delete-char            # [Delete] - delete forward
+fi
 
 # Edit the current command line in $EDITOR
 autoload -U edit-command-line

From 55a9d685fd960390a4f400ac461d901049a78beb Mon Sep 17 00:00:00 2001
From: Alexei Danchenkov <adanchenkov@gmail.com>
Date: Thu, 20 Mar 2014 19:29:06 -0700
Subject: [PATCH 290/364] Update key-bindings.zsh

Aligned comments
---
 lib/key-bindings.zsh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
index 33046b0f1..49deb0587 100644
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@@ -15,11 +15,11 @@ if (( ${+terminfo[smkx]} )) && (( ${+terminfo[rmkx]} )); then
   zle -N zle-line-finish
 fi
 
-bindkey -e                                          # Use emacs key bindings
+bindkey -e                                          	# Use emacs key bindings
 
-bindkey '\ew' kill-region                           # [Esc-w] - Kill from the cursor to the mark
-bindkey -s '\el' 'ls\n'                             # [Esc-l] - run command: ls
-bindkey '^r' history-incremental-search-backward    # [Ctrl-r] - Search backward incrementally for a specified string. The string may begin with ^ to anchor the search to the beginning of the line.
+bindkey '\ew' kill-region                           	# [Esc-w] - Kill from the cursor to the mark
+bindkey -s '\el' 'ls\n'                								# [Esc-l] - run command: ls
+bindkey '^r' history-incremental-search-backward    	# [Ctrl-r] - Search backward incrementally for a specified string. The string may begin with ^ to anchor the search to the beginning of the line.
 if [[ "${terminfo[kpp]}" != "" ]]; then
   bindkey "${terminfo[kpp]}" up-line-or-history       # [PageUp] - Up a line of history
 fi
@@ -41,16 +41,16 @@ if [[ "${terminfo[kend]}" != "" ]]; then
   bindkey "${terminfo[kend]}"  end-of-line            # [End] - Go to end of line
 fi
 
-bindkey ' ' magic-space                             # [Space] - do history expansion
+bindkey ' ' magic-space                             	# [Space] - do history expansion
 
-bindkey '^[[1;5C' forward-word                      # [Ctrl-RightArrow] - move forward one word
-bindkey '^[[1;5D' backward-word                     # [Ctrl-LeftArrow] - move backward one word
+bindkey '^[[1;5C' forward-word                      	# [Ctrl-RightArrow] - move forward one word
+bindkey '^[[1;5D' backward-word                     	# [Ctrl-LeftArrow] - move backward one word
 
 if [[ "${terminfo[kdch1]}" != "" ]]; then
-  bindkey "${terminfo[kdch1]}" reverse-menu-complete   # [Shift-Tab] - move through the completion menu backwards
+  bindkey "${terminfo[kdch1]}" reverse-menu-complete	# [Shift-Tab] - move through the completion menu backwards
 fi
 
-bindkey '^?' backward-delete-char                   # [Backspace] - delete backward
+bindkey '^?' backward-delete-char                   	# [Backspace] - delete backward
 if [[ "${terminfo[kdch1]}" != "" ]]; then
   bindkey "${terminfo[kdch1]}" delete-char            # [Delete] - delete forward
 fi

From c5413d7dd18cad7cd4eb32ddf1b9976863b87dfa Mon Sep 17 00:00:00 2001
From: Alexei Danchenkov <adanchenkov@gmail.com>
Date: Thu, 20 Mar 2014 19:34:43 -0700
Subject: [PATCH 291/364] Aligned comments

---
 lib/key-bindings.zsh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
index 49deb0587..28af44949 100644
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@@ -15,11 +15,11 @@ if (( ${+terminfo[smkx]} )) && (( ${+terminfo[rmkx]} )); then
   zle -N zle-line-finish
 fi
 
-bindkey -e                                          	# Use emacs key bindings
+bindkey -e                                            # Use emacs key bindings
 
-bindkey '\ew' kill-region                           	# [Esc-w] - Kill from the cursor to the mark
-bindkey -s '\el' 'ls\n'                								# [Esc-l] - run command: ls
-bindkey '^r' history-incremental-search-backward    	# [Ctrl-r] - Search backward incrementally for a specified string. The string may begin with ^ to anchor the search to the beginning of the line.
+bindkey '\ew' kill-region                             # [Esc-w] - Kill from the cursor to the mark
+bindkey -s '\el' 'ls\n'                               # [Esc-l] - run command: ls
+bindkey '^r' history-incremental-search-backward      # [Ctrl-r] - Search backward incrementally for a specified string. The string may begin with ^ to anchor the search to the beginning of the line.
 if [[ "${terminfo[kpp]}" != "" ]]; then
   bindkey "${terminfo[kpp]}" up-line-or-history       # [PageUp] - Up a line of history
 fi
@@ -41,16 +41,16 @@ if [[ "${terminfo[kend]}" != "" ]]; then
   bindkey "${terminfo[kend]}"  end-of-line            # [End] - Go to end of line
 fi
 
-bindkey ' ' magic-space                             	# [Space] - do history expansion
+bindkey ' ' magic-space                               # [Space] - do history expansion
 
-bindkey '^[[1;5C' forward-word                      	# [Ctrl-RightArrow] - move forward one word
-bindkey '^[[1;5D' backward-word                     	# [Ctrl-LeftArrow] - move backward one word
+bindkey '^[[1;5C' forward-word                        # [Ctrl-RightArrow] - move forward one word
+bindkey '^[[1;5D' backward-word                       # [Ctrl-LeftArrow] - move backward one word
 
 if [[ "${terminfo[kdch1]}" != "" ]]; then
-  bindkey "${terminfo[kdch1]}" reverse-menu-complete	# [Shift-Tab] - move through the completion menu backwards
+  bindkey "${terminfo[kdch1]}" reverse-menu-complete  # [Shift-Tab] - move through the completion menu backwards
 fi
 
-bindkey '^?' backward-delete-char                   	# [Backspace] - delete backward
+bindkey '^?' backward-delete-char                     # [Backspace] - delete backward
 if [[ "${terminfo[kdch1]}" != "" ]]; then
   bindkey "${terminfo[kdch1]}" delete-char            # [Delete] - delete forward
 fi

From 5f31190ab9fd41fd1ffe2b0878674adc02933f9b Mon Sep 17 00:00:00 2001
From: Arno Fortelny <arno.fortelny@gmail.com>
Date: Fri, 21 Mar 2014 11:49:52 -0400
Subject: [PATCH 292/364] atom plugin

---
 plugins/atom/atom.plugin.zsh | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/plugins/atom/atom.plugin.zsh b/plugins/atom/atom.plugin.zsh
index 048fd7521..9adb9031a 100644
--- a/plugins/atom/atom.plugin.zsh
+++ b/plugins/atom/atom.plugin.zsh
@@ -1,4 +1,14 @@
-#
-# Your guess is as good as mine. Let's just assume that we will need this...
-#   - For more info visit... http://atom.io/
-#
\ No newline at end of file
+local _atom_paths > /dev/null 2>&1
+_atom_paths=(
+    "$HOME/Applications/Atom.app"
+    "/Applications/Atom.app"
+)
+
+for _atom_path in $_atom_paths; do
+    if [[ -a $_atom_path ]]; then
+        alias at="open -a '$_atom_path'"
+        break
+    fi
+done
+
+alias att='at .'

From 32a7824182731081c7cbeba363be7b6f56aeb2a5 Mon Sep 17 00:00:00 2001
From: Alexei Danchenkov <adanchenkov@gmail.com>
Date: Fri, 21 Mar 2014 09:24:59 -0700
Subject: [PATCH 293/364] Added a forward-delete fallback to bind Delete key

Delete key (of Fn+Delete on Mac) would print "~" instead of deletion.
---
 lib/key-bindings.zsh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
index 28af44949..5f3f237c7 100644
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@@ -53,6 +53,10 @@ fi
 bindkey '^?' backward-delete-char                     # [Backspace] - delete backward
 if [[ "${terminfo[kdch1]}" != "" ]]; then
   bindkey "${terminfo[kdch1]}" delete-char            # [Delete] - delete forward
+else
+  bindkey "^[[3~" delete-char
+  bindkey "^[3;5~" delete-char
+  bindkey "\e[3~" delete-char
 fi
 
 # Edit the current command line in $EDITOR

From 6a8f83bc5044f55e7386182683e853e6e7d2eebf Mon Sep 17 00:00:00 2001
From: Kevin Bongart <contact@kevinbongart.net>
Date: Fri, 21 Mar 2014 14:02:26 -0400
Subject: [PATCH 294/364] Add new brew cask commands

---
 plugins/brew-cask/brew-cask.plugin.zsh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/brew-cask/brew-cask.plugin.zsh b/plugins/brew-cask/brew-cask.plugin.zsh
index ef4f5208d..e0ee62293 100644
--- a/plugins/brew-cask/brew-cask.plugin.zsh
+++ b/plugins/brew-cask/brew-cask.plugin.zsh
@@ -34,14 +34,18 @@ _brew-cask()
 							"alfred:used to modify Alfred's scope to include the Caskroom"
 							'audit:verifies installability of casks'
 							'checklinks:checks for bad cask links'
+							'cleanup:cleans up cached downloads'
 							'create:creates a cask of the given name and opens it in an editor'
+							'doctor:checks for configuration issues'
 							'edit:edits the cask of the given name'
+							'fetch:downloads Cask resources to local cache'
 							'home:opens the homepage of the cask of the given name'
 							'info:displays information about the cask of the given name'
 							'install:installs the cask of the given name'
 							'list:with no args, lists installed casks; given installed casks, lists installed files'
 							'search:searches all known casks'
 							'uninstall:uninstalls the cask of the given name'
+							"update:a synonym for 'brew update'"
 						)
 						_describe -t commands "brew cask subcommand" subcommands
 					fi ;;

From c3150edad2b8d9494127afa9528519a07bf8a64a Mon Sep 17 00:00:00 2001
From: Miguel Flores Ruiz de Eguino <miguel.frde@gmail.com>
Date: Fri, 21 Mar 2014 19:18:29 -0600
Subject: [PATCH 295/364] Add irb to the list of bundled commands

---
 plugins/bundler/bundler.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index df30ed7c7..447a4bbec 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -6,7 +6,7 @@ alias bu="bundle update"
 
 # The following is based on https://github.com/gma/bundler-exec
 
-bundled_commands=(annotate berks cap capify cucumber foodcritic foreman guard jekyll kitchen knife mailcatcher middleman nanoc rackup rainbows rake rspec ruby shotgun spec spin spork strainer tailor taps thin thor unicorn unicorn_rails puma)
+bundled_commands=(annotate berks cap capify cucumber foodcritic foreman guard jekyll kitchen knife mailcatcher middleman nanoc rackup rainbows rake rspec ruby shotgun spec spin spork strainer tailor taps thin thor unicorn unicorn_rails puma irb)
 
 # Remove $UNBUNDLED_COMMANDS from the bundled_commands list
 for cmd in $UNBUNDLED_COMMANDS; do

From 1509ac9a0414801dbbe45060eae19ae6e6e9841c Mon Sep 17 00:00:00 2001
From: jieryn <jieryn@gmail.com>
Date: Sat, 22 Mar 2014 08:51:26 -0400
Subject: [PATCH 296/364] add common video formats FLV and WEBM

---
 plugins/common-aliases/common-aliases.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/common-aliases/common-aliases.plugin.zsh b/plugins/common-aliases/common-aliases.plugin.zsh
index 75899ca2c..b19650fee 100644
--- a/plugins/common-aliases/common-aliases.plugin.zsh
+++ b/plugins/common-aliases/common-aliases.plugin.zsh
@@ -71,7 +71,7 @@ if [ ${ZSH_VERSION//\./} -ge 420 ]; then
   _image_fts=(jpg jpeg png gif mng tiff tif xpm)
   for ft in $_image_fts ; do alias -s $ft=$XIVIEWER; done
 
-  _media_fts=(avi mpg mpeg ogm mp3 wav ogg ape rm mov mkv)
+  _media_fts=(ape avi flv mkv mov mp3 mpeg mpg ogg ogm rm wav webm)
   for ft in $_media_fts ; do alias -s $ft=mplayer ; done
 
   #read documents

From 610655e827e5f4e5d081b9b0cd78129751eab272 Mon Sep 17 00:00:00 2001
From: Miguel Flores Ruiz de Eguino <miguel.frde@gmail.com>
Date: Sat, 22 Mar 2014 10:24:58 -0600
Subject: [PATCH 297/364] Sort bundled commands alphabetically

---
 plugins/bundler/bundler.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index 447a4bbec..e4b03e7b0 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -6,7 +6,7 @@ alias bu="bundle update"
 
 # The following is based on https://github.com/gma/bundler-exec
 
-bundled_commands=(annotate berks cap capify cucumber foodcritic foreman guard jekyll kitchen knife mailcatcher middleman nanoc rackup rainbows rake rspec ruby shotgun spec spin spork strainer tailor taps thin thor unicorn unicorn_rails puma irb)
+bundled_commands=(annotate berks cap capify cucumber foodcritic foreman guard irb jekyll kitchen knife mailcatcher middleman nanoc puma rackup rainbows rake rspec ruby shotgun spec spin spork strainer tailor taps thin thor unicorn unicorn_rails)
 
 # Remove $UNBUNDLED_COMMANDS from the bundled_commands list
 for cmd in $UNBUNDLED_COMMANDS; do

From 12e30faaca13a2e931c4062fdc8a3589e8069460 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sun, 23 Mar 2014 02:03:12 +0100
Subject: [PATCH 298/364] Fix export syntax of $GREP_OPTIONS

Fixes #2641, #2642
---
 lib/grep.zsh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/grep.zsh b/lib/grep.zsh
index 25345bd06..977435ee4 100644
--- a/lib/grep.zsh
+++ b/lib/grep.zsh
@@ -8,5 +8,6 @@ GREP_OPTIONS=
 for PATTERN in .cvs .git .hg .svn; do
     GREP_OPTIONS+="--exclude-dir=$PATTERN "
 done
-export GREP_OPTIONS+='--color=auto '
-export GREP_COLOR='1;32'
\ No newline at end of file
+GREP_OPTIONS+="--color=auto"
+export GREP_OPTIONS="$GREP_OPTIONS"
+export GREP_COLOR='1;32'

From f9ad3686bbedea0ca2adf3bc4ab19c3e90e8800a Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Sun, 23 Mar 2014 14:39:38 +0100
Subject: [PATCH 299/364] suggest setting $LANG to fix #1286 and fix #1823

---
 templates/zshrc.zsh-template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index c25c20e75..5e1d9b2f1 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -54,6 +54,9 @@ source $ZSH/oh-my-zsh.sh
 export PATH=$HOME/bin:/usr/local/bin:$PATH
 # export MANPATH="/usr/local/man:$MANPATH"
 
+# You may need to manually set your language environment
+# export LANG=en_US.UTF-8
+
 # # Preferred editor for local and remote sessions
 # if [[ -n $SSH_CONNECTION ]]; then
 #   export EDITOR='vim'

From 04c2d293985adced1bd702fca16357b858002bb8 Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Sun, 23 Mar 2014 14:45:55 +0100
Subject: [PATCH 300/364] mention $ZSH_CUSTOM as suggested in #2295

---
 templates/zshrc.zsh-template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 5e1d9b2f1..48757ba0e 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -42,6 +42,9 @@ ZSH_THEME="robbyrussell"
 # The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
 # HIST_STAMPS="mm/dd/yyyy"
 
+# Would you like to use another custom folder than $ZSH/custom?
+# ZSH_CUSTOM=/path/to/new-custom-folder
+
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)

From 6889dfaa46858ddacc82549a57d73118c66a32b6 Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Sun, 23 Mar 2014 14:47:10 +0100
Subject: [PATCH 301/364] $ZSH is the OMZ installation folder, not
 configuration

---
 templates/zshrc.zsh-template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 48757ba0e..7b7f1df85 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -1,4 +1,4 @@
-# Path to your oh-my-zsh configuration.
+# Path to your oh-my-zsh installation.
 export ZSH=$HOME/.oh-my-zsh
 
 # Set name of the theme to load.

From 3bae9dd2bfc59e03a6aeded95ca45d2810058e09 Mon Sep 17 00:00:00 2001
From: Bob Williams <bobwilliams.ii@gmail.com>
Date: Sun, 23 Mar 2014 15:12:18 -0400
Subject: [PATCH 302/364] adding README.md for jsontools

---
 plugins/jsontools/README.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 plugins/jsontools/README.md

diff --git a/plugins/jsontools/README.md b/plugins/jsontools/README.md
new file mode 100644
index 000000000..ed7a19d29
--- /dev/null
+++ b/plugins/jsontools/README.md
@@ -0,0 +1,17 @@
+# jsontools
+
+# Plugin name
+
+A handy command line tool for dealing with json data.
+
+## Usage
+
+```sh
+# curl json data and pretty print the results
+curl https://coderwall.com/bobwilliams.json | pp_json
+
+# pretty print the contents of an existing json file
+less data.json | pp_json
+
+# json data directly from the command line
+echo '{"b":2, "a":1}' | pp_json
\ No newline at end of file

From 1fc40c60b506bc71f20efcafc7e7350ece3a1596 Mon Sep 17 00:00:00 2001
From: Bob Williams <bobwilliams.ii@gmail.com>
Date: Sun, 23 Mar 2014 15:13:41 -0400
Subject: [PATCH 303/364] updating README.md

---
 plugins/jsontools/README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/plugins/jsontools/README.md b/plugins/jsontools/README.md
index ed7a19d29..60f99c5be 100644
--- a/plugins/jsontools/README.md
+++ b/plugins/jsontools/README.md
@@ -1,7 +1,5 @@
 # jsontools
 
-# Plugin name
-
 A handy command line tool for dealing with json data.
 
 ## Usage

From c451ff4bf317188da20bfe18021a93640d54133b Mon Sep 17 00:00:00 2001
From: Jan Ehrhardt <jan.ehrhardt@gmail.com>
Date: Mon, 24 Mar 2014 12:10:18 +0100
Subject: [PATCH 304/364] Add check for display list equals nil

Emacs returns either a sequence of availbale displays or nil. Checking
nil fixes this script to work as expected.
---
 plugins/emacs/emacsclient.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/emacs/emacsclient.sh b/plugins/emacs/emacsclient.sh
index 38d419813..625201a16 100755
--- a/plugins/emacs/emacsclient.sh
+++ b/plugins/emacs/emacsclient.sh
@@ -3,7 +3,7 @@
 # get list of available X windows.
 x=`emacsclient --alternate-editor '' --eval '(x-display-list)' 2>/dev/null`
 
-if [ -z "$x" ] ;then
+if [ -z "$x" ] || [ "$x" = "nil" ] ;then
     # Create one if there is no X window yet.
     emacsclient --alternate-editor "" --create-frame "$@"
 else

From 8db3e6329d25ae3e7d6c4996b5a0c3a5f31d645e Mon Sep 17 00:00:00 2001
From: Bob Williams <bobwilliams.ii@gmail.com>
Date: Mon, 24 Mar 2014 13:36:26 -0400
Subject: [PATCH 305/364] bug fix for node pp_json version

---
 plugins/jsontools/jsontools.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/jsontools/jsontools.plugin.zsh b/plugins/jsontools/jsontools.plugin.zsh
index 7b6f8c585..ee092ff09 100644
--- a/plugins/jsontools/jsontools.plugin.zsh
+++ b/plugins/jsontools/jsontools.plugin.zsh
@@ -6,7 +6,7 @@ if [[ $(whence $JSONTOOLS_METHOD) = "" ]]; then
 fi
 
 if [[ $(whence node) != "" && ( "x$JSONTOOLS_METHOD" = "x"  || "x$JSONTOOLS_METHOD" = "xnode" ) ]]; then
-    alias pp_json='node -e "console.log(JSON.stringify(process.argv[1]), null, 4)"'
+    alias pp_json='node -e "console.log(JSON.stringify(JSON.parse(process.argv[1]), null, 4));"'
 elif [[ $(whence python) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xpython" ) ]]; then
 	alias pp_json='python -mjson.tool'
 elif [[ $(whence ruby) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xruby" ) ]]; then

From f8890f564648d647903f5b10358a4f25f312d54a Mon Sep 17 00:00:00 2001
From: Bob Williams <bobwilliams.ii@gmail.com>
Date: Mon, 24 Mar 2014 14:09:57 -0400
Subject: [PATCH 306/364] updated readme.md and using tab char for formatting
 with node

---
 plugins/jsontools/README.md            | 11 +++++++++--
 plugins/jsontools/jsontools.plugin.zsh |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/plugins/jsontools/README.md b/plugins/jsontools/README.md
index 60f99c5be..9f07194c9 100644
--- a/plugins/jsontools/README.md
+++ b/plugins/jsontools/README.md
@@ -1,9 +1,15 @@
 # jsontools
 
-A handy command line tool for dealing with json data.
+Handy command line tools for dealing with json data.
+
+## Tools
+
+- **pp_json** - pretty prints json
 
 ## Usage
 
+##### pp_json - examples
+
 ```sh
 # curl json data and pretty print the results
 curl https://coderwall.com/bobwilliams.json | pp_json
@@ -12,4 +18,5 @@ curl https://coderwall.com/bobwilliams.json | pp_json
 less data.json | pp_json
 
 # json data directly from the command line
-echo '{"b":2, "a":1}' | pp_json
\ No newline at end of file
+echo '{"b":2, "a":1}' | pp_json
+```
\ No newline at end of file
diff --git a/plugins/jsontools/jsontools.plugin.zsh b/plugins/jsontools/jsontools.plugin.zsh
index ee092ff09..34ff9cc75 100644
--- a/plugins/jsontools/jsontools.plugin.zsh
+++ b/plugins/jsontools/jsontools.plugin.zsh
@@ -6,7 +6,7 @@ if [[ $(whence $JSONTOOLS_METHOD) = "" ]]; then
 fi
 
 if [[ $(whence node) != "" && ( "x$JSONTOOLS_METHOD" = "x"  || "x$JSONTOOLS_METHOD" = "xnode" ) ]]; then
-    alias pp_json='node -e "console.log(JSON.stringify(JSON.parse(process.argv[1]), null, 4));"'
+    alias pp_json='node -e "console.log(JSON.stringify(JSON.parse(process.argv[1]), null, '\t'));"'
 elif [[ $(whence python) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xpython" ) ]]; then
 	alias pp_json='python -mjson.tool'
 elif [[ $(whence ruby) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xruby" ) ]]; then

From 64c3ce35e1493728c65191d9b16183841ad73ca7 Mon Sep 17 00:00:00 2001
From: Bob Williams <bobwilliams.ii@gmail.com>
Date: Mon, 24 Mar 2014 14:24:00 -0400
Subject: [PATCH 307/364] adding xargs -0 to node aliases

---
 plugins/jsontools/jsontools.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/jsontools/jsontools.plugin.zsh b/plugins/jsontools/jsontools.plugin.zsh
index 34ff9cc75..729763c33 100644
--- a/plugins/jsontools/jsontools.plugin.zsh
+++ b/plugins/jsontools/jsontools.plugin.zsh
@@ -6,7 +6,7 @@ if [[ $(whence $JSONTOOLS_METHOD) = "" ]]; then
 fi
 
 if [[ $(whence node) != "" && ( "x$JSONTOOLS_METHOD" = "x"  || "x$JSONTOOLS_METHOD" = "xnode" ) ]]; then
-    alias pp_json='node -e "console.log(JSON.stringify(JSON.parse(process.argv[1]), null, '\t'));"'
+	alias pp_json='xargs -0 node -e "console.log(JSON.stringify(JSON.parse(process.argv[1]), null, 4));"'
 elif [[ $(whence python) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xpython" ) ]]; then
 	alias pp_json='python -mjson.tool'
 elif [[ $(whence ruby) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xruby" ) ]]; then

From 5303793ef13b5dd3e7f52ac40f17fd37f015af44 Mon Sep 17 00:00:00 2001
From: Florian Franzen <FlorianFranzen@gmail.com>
Date: Mon, 24 Mar 2014 22:32:56 +0100
Subject: [PATCH 308/364] history-substring-search: bindkey now checks if
 terminfo is available first.

---
 .../history-substring-search/history-substring-search.zsh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/plugins/history-substring-search/history-substring-search.zsh b/plugins/history-substring-search/history-substring-search.zsh
index 405eeaade..22f03dd6d 100644
--- a/plugins/history-substring-search/history-substring-search.zsh
+++ b/plugins/history-substring-search/history-substring-search.zsh
@@ -164,8 +164,12 @@ zle -N history-substring-search-up
 zle -N history-substring-search-down
 
 zmodload zsh/terminfo
-bindkey "$terminfo[kcuu1]" history-substring-search-up
-bindkey "$terminfo[kcud1]" history-substring-search-down
+if [[ -n "$terminfo[kcuu1]" ]]; then
+  bindkey "$terminfo[kcuu1]" history-substring-search-up
+fi
+if [[ -n "$terminfo[kcud1]" ]]; then
+  bindkey "$terminfo[kcud1]" history-substring-search-down
+fi
 
 #-----------------------------------------------------------------------------
 # implementation details

From 5f09d0f6dd3ade4e2968a13ba93ceef4850dedee Mon Sep 17 00:00:00 2001
From: Luke Horvat <lukehorvat@gmail.com>
Date: Tue, 25 Mar 2014 01:24:04 +1100
Subject: [PATCH 309/364] Fixed typos + made wording more consistent in
 zshrc.zsh-template

---
 templates/zshrc.zsh-template | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 7b7f1df85..5b2a6cf49 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -11,34 +11,34 @@ ZSH_THEME="robbyrussell"
 # alias zshconfig="mate ~/.zshrc"
 # alias ohmyzsh="mate ~/.oh-my-zsh"
 
-# Set this to use case-sensitive completion
+# Uncomment the following line to use case-sensitive completion.
 # CASE_SENSITIVE="true"
 
-# Uncomment this to disable bi-weekly auto-update checks
+# Uncomment the following line to disable bi-weekly auto-update checks.
 # DISABLE_AUTO_UPDATE="true"
 
-# Uncomment to change how often to auto-update? (in days)
+# Uncomment the following line to change how often to auto-update (in days).
 # export UPDATE_ZSH_DAYS=13
 
-# Uncomment following line if you want to disable colors in ls
+# Uncomment the following line to disable colors in ls.
 # DISABLE_LS_COLORS="true"
 
-# Uncomment following line if you want to disable autosetting terminal title.
+# Uncomment the following line to disable auto-setting terminal title.
 # DISABLE_AUTO_TITLE="true"
 
-# Uncomment following line if you want to disable command autocorrection
+# Uncomment the following line to disable command auto-correction.
 # DISABLE_CORRECTION="true"
 
-# Uncomment following line if you want red dots to be displayed while waiting for completion
+# Uncomment the following line to display red dots whilst waiting for completion.
 # COMPLETION_WAITING_DOTS="true"
 
-# Uncomment following line if you want to disable marking untracked files under
-# VCS as dirty. This makes repository status check for large repositories much,
-# much faster.
+# Uncomment the following line if you want to disable marking untracked files
+# under VCS as dirty. This makes repository status check for large repositories
+# much, much faster.
 # DISABLE_UNTRACKED_FILES_DIRTY="true"
 
-# Uncomment following line if you want to the command execution time stamp shown 
-# in the history command output.
+# Uncomment the following line if you want to change the command execution time
+# stamp shown in the history command output.
 # The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
 # HIST_STAMPS="mm/dd/yyyy"
 
@@ -60,7 +60,7 @@ export PATH=$HOME/bin:/usr/local/bin:$PATH
 # You may need to manually set your language environment
 # export LANG=en_US.UTF-8
 
-# # Preferred editor for local and remote sessions
+# Preferred editor for local and remote sessions
 # if [[ -n $SSH_CONNECTION ]]; then
 #   export EDITOR='vim'
 # else

From 37e619ed9b7c3b1bda9788861a9a4c5ca4647ed0 Mon Sep 17 00:00:00 2001
From: Phil Eichinger <phil@zankapfel.net>
Date: Tue, 25 Mar 2014 13:43:36 +0100
Subject: [PATCH 310/364] New aliases for 'apt-get' and 'aptitude' as they were
 overwritten by later aliases

---
 plugins/debian/debian.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index 28dfb82a5..6e45e0521 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -21,8 +21,8 @@ fi
 # Aliases ###################################################################
 # These are for more obscure uses of apt-get and aptitude that aren't covered
 # below.
-alias ag='apt-get'
-alias ap='aptitude'
+alias age='apt-get'
+alias api='aptitude'
 
 # Some self-explanatory aliases
 alias acs="apt-cache search"

From 48f8f2809bf96033f92f95384fa51749d6985dda Mon Sep 17 00:00:00 2001
From: Leif Ringstad <leif@bitelm.com>
Date: Tue, 25 Mar 2014 16:36:39 +0100
Subject: [PATCH 311/364] Plugin: Rake-fast: Support both *nix and Darwin

---
 plugins/rake-fast/rake-fast.plugin.zsh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/plugins/rake-fast/rake-fast.plugin.zsh b/plugins/rake-fast/rake-fast.plugin.zsh
index 320855233..f4d969c11 100644
--- a/plugins/rake-fast/rake-fast.plugin.zsh
+++ b/plugins/rake-fast/rake-fast.plugin.zsh
@@ -27,8 +27,13 @@ _rake_refresh () {
 _rake_does_task_list_need_generating () {
   if [ ! -f .rake_tasks ]; then return 0;
   else
-    accurate=$(stat -f%m .rake_tasks)
-    changed=$(stat -f%m Rakefile)
+    if [[ $(uname -s) == 'Darwin' ]]; then
+      accurate=$(stat -f%m .rake_tasks)
+      changed=$(stat -f%m Rakefile)
+    else
+      accurate=$(stat -c%Y .rake_tasks)
+      changed=$(stat -c%Y Rakefile)
+    fi
     return $(expr $accurate '>=' $changed)
   fi
 }

From b578eea2739e707d5ecfb79f5b072876264d8f1c Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Fri, 16 Dec 2011 14:21:45 +0100
Subject: [PATCH 312/364] `setopt append_history` is not necessary.

Especially given the inc_append_history option, it is not necessary to
set the (default) append_history option.
---
 lib/history.zsh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/history.zsh b/lib/history.zsh
index 655945166..1d83e56e3 100644
--- a/lib/history.zsh
+++ b/lib/history.zsh
@@ -5,7 +5,6 @@ fi
 HISTSIZE=10000
 SAVEHIST=10000
 
-setopt append_history
 setopt extended_history
 setopt hist_expire_dups_first
 setopt hist_ignore_dups # ignore duplication command history list

From 95ffb167a1f7420b37ba74a4067d33ef6a71f3c5 Mon Sep 17 00:00:00 2001
From: David Lee <davidomundo@gmail.com>
Date: Sun, 26 Feb 2012 02:29:24 -0800
Subject: [PATCH 313/364] Add gem build autocompletion

---
 plugins/gem/_gem | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/gem/_gem b/plugins/gem/_gem
index 66c77b7d1..25967f1e7 100644
--- a/plugins/gem/_gem
+++ b/plugins/gem/_gem
@@ -56,6 +56,9 @@ if (( CURRENT == 1 )); then
 fi
 
 case "$words[1]" in
+  build)
+    _files -g "*.gemspec"
+    ;;
   list)
       if [[ "$state" == forms ]]; then
         _gem_installed

From c70fcd6f972473f1b0948143407656f4e58a3119 Mon Sep 17 00:00:00 2001
From: Tom Morris <tom@tommorris.org>
Date: Mon, 5 Mar 2012 11:55:30 +0000
Subject: [PATCH 314/364] Added link to wiki page for plugins to README.

The wiki is more readable than going to the plugins directory.
---
 README.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.textile b/README.textile
index c808fb5d7..4325c91eb 100644
--- a/README.textile
+++ b/README.textile
@@ -59,7 +59,7 @@ If you installed manually or changed the install location, check ZSH in ~/.zshrc
 
 h2. Usage
 
-* enable the plugins you want in your @~/.zshrc@ (take a look at @plugins/@ to see what's possible)
+* enable the plugins you want in your @~/.zshrc@ (take a look at the @plugins/@ directory and the "wiki":https://github.com/robbyrussell/oh-my-zsh/wiki/Plugins to see what's possible)
 ** example: @plugins=(git osx ruby)@
 * Theme support: Change the @ZSH_THEME@ environment variable in @~/.zshrc@.
 ** Take a look at the "current themes":https://wiki.github.com/robbyrussell/oh-my-zsh/themes that come bundled with _Oh My Zsh_.

From 48e53fb6ede984964bfb45021212f0097c9a3637 Mon Sep 17 00:00:00 2001
From: William Ting <william.h.ting@gmail.com>
Date: Tue, 6 Mar 2012 14:31:03 -1000
Subject: [PATCH 315/364] fix gnzh theme to detect local rvm installations

---
 themes/gnzh.zsh-theme | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/themes/gnzh.zsh-theme b/themes/gnzh.zsh-theme
index 3c6b8a409..33f187bc6 100644
--- a/themes/gnzh.zsh-theme
+++ b/themes/gnzh.zsh-theme
@@ -6,7 +6,7 @@ autoload -U colors zsh/terminfo # Used in the colour alias below
 colors
 setopt prompt_subst
 
-# make some aliases for the colours: (coud use normal escap.seq's too)
+# make some aliases for the colours: (could use normal escape sequences too)
 for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE; do
   eval PR_$color='%{$fg[${(L)color}]%}'
 done
@@ -25,7 +25,7 @@ elif [[ $UID -eq 0 ]]; then # root
 fi
 
 # Check if we are on SSH or not
-if [[ -n "$SSH_CLIENT"  ||  -n "$SSH2_CLIENT" ]]; then 
+if [[ -n "$SSH_CLIENT"  ||  -n "$SSH2_CLIENT" ]]; then
   eval PR_HOST='${PR_YELLOW}%M${PR_NO_COLOR}' #SSH
 else
   eval PR_HOST='${PR_GREEN}%M${PR_NO_COLOR}' # no SSH
@@ -36,12 +36,12 @@ local return_code="%(?..%{$PR_RED%}%? ↵%{$PR_NO_COLOR%})"
 local user_host='${PR_USER}${PR_CYAN}@${PR_HOST}'
 local current_dir='%{$PR_BOLD$PR_BLUE%}%~%{$PR_NO_COLOR%}'
 local rvm_ruby=''
-if which rvm-prompt &> /dev/null; then
+if ${HOME}/.rvm/bin/rvm-prompt &> /dev/null; then # detect local user rvm installation
+  rvm_ruby='%{$PR_RED%}‹$(${HOME}/.rvm/bin/rvm-prompt i v g s)›%{$PR_NO_COLOR%}'
+elif which rvm-prompt &> /dev/null; then # detect sysem-wide rvm installation
   rvm_ruby='%{$PR_RED%}‹$(rvm-prompt i v g s)›%{$PR_NO_COLOR%}'
-else
-  if which rbenv &> /dev/null; then
-    rvm_ruby='%{$PR_RED%}‹$(rbenv version | sed -e "s/ (set.*$//")›%{$PR_NO_COLOR%}'
-  fi
+elif which rbenv &> /dev/null; then # detect Simple Ruby Version management
+  rvm_ruby='%{$PR_RED%}‹$(rbenv version | sed -e "s/ (set.*$//")›%{$PR_NO_COLOR%}'
 fi
 local git_branch='$(git_prompt_info)%{$PR_NO_COLOR%}'
 

From 640e5da6885ac39697f7c4ad6683af21fa1b8b96 Mon Sep 17 00:00:00 2001
From: cmar <chris@spreecommerce.com>
Date: Fri, 9 Mar 2012 08:53:09 -0500
Subject: [PATCH 316/364] added powed command to list pow urls

---
 plugins/pow/pow.plugin.zsh | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/plugins/pow/pow.plugin.zsh b/plugins/pow/pow.plugin.zsh
index 399a54cb0..c823cdb22 100644
--- a/plugins/pow/pow.plugin.zsh
+++ b/plugins/pow/pow.plugin.zsh
@@ -8,18 +8,18 @@
 # Supports command completion.
 #
 # If you are not already using completion you might need to enable it with
-# 
+#
 #    autoload -U compinit compinit
 #
 # Changes:
 #
-# Defaults to the current application, and will walk up the tree to find 
+# Defaults to the current application, and will walk up the tree to find
 # a config.ru file and restart the corresponding app
 #
-# Will Detect if a app does not exist in pow and print a (slightly) helpful 
+# Will Detect if a app does not exist in pow and print a (slightly) helpful
 # error message
 
-rack_root_detect(){
+rack_root(){
   setopt chaselinks
   local orgdir=$(pwd)
   local basedir=$(pwd)
@@ -32,6 +32,11 @@ rack_root_detect(){
 
   builtin cd $orgdir 2>/dev/null
   [[ ${basedir} == "/" ]] && return 1
+  echo $basedir
+}
+
+rack_root_detect(){
+  basedir=$(rack_root)
   echo `basename $basedir | sed -E "s/.(com|net|org)//"`
 }
 
@@ -51,16 +56,21 @@ kapow(){
 compctl -W ~/.pow -/ kapow
 
 powit(){
-	local basedir=$(pwd)
+  local basedir=$(pwd)
   local vhost=$1
   [ ! -n "$vhost" ] && vhost=$(rack_root_detect)
   if [ ! -h ~/.pow/$vhost ]
-	then
-		echo "pow: Symlinking your app with pow. ${vhost}"
-	  [ ! -d ~/.pow/${vhost} ] && ln -s $basedir ~/.pow/$vhost
+  then
+    echo "pow: Symlinking your app with pow. ${vhost}"
+    [ ! -d ~/.pow/${vhost} ] && ln -s $basedir ~/.pow/$vhost
     return 1
   fi
 }
 
+powed(){
+  local basedir=$(rack_root)
+  find ~/.pow/ -type l -lname "*$basedir*" -exec basename {}'.dev' \;
+}
+
 # View the standard out (puts) from any pow app
-alias kaput="tail -f ~/Library/Logs/Pow/apps/*"
+alias kaput="tail -f ~/Library/Logs/Pow/apps/*"
\ No newline at end of file

From 8d1fa09007b3bbd67cbdcf191eb6cd6faa2af974 Mon Sep 17 00:00:00 2001
From: cmar <chris@spreecommerce.com>
Date: Wed, 4 Apr 2012 12:54:31 -0400
Subject: [PATCH 317/364] command to restart pow process

---
 plugins/pow/pow.plugin.zsh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/plugins/pow/pow.plugin.zsh b/plugins/pow/pow.plugin.zsh
index c823cdb22..7f86c0c76 100644
--- a/plugins/pow/pow.plugin.zsh
+++ b/plugins/pow/pow.plugin.zsh
@@ -72,5 +72,14 @@ powed(){
   find ~/.pow/ -type l -lname "*$basedir*" -exec basename {}'.dev' \;
 }
 
+# Restart pow process
+# taken from http://www.matthewratzloff.com/blog/2011/12/23/restarting-pow-when-dns-stops-responding
+repow(){
+  lsof | grep 20560 | awk '{print $2}' | xargs kill -9
+  launchctl unload ~/Library/LaunchAgents/cx.pow.powd.plist
+  launchctl load ~/Library/LaunchAgents/cx.pow.powd.plist
+  echo "restarted pow"
+}
+
 # View the standard out (puts) from any pow app
 alias kaput="tail -f ~/Library/Logs/Pow/apps/*"
\ No newline at end of file

From cdea478f0f20545473454c069d8d6bb860555021 Mon Sep 17 00:00:00 2001
From: Derek Wyatt <dwyatt@rim.com>
Date: Tue, 20 Mar 2012 08:16:44 -0400
Subject: [PATCH 318/364] A plugin that makes it easier to interact with the
 (single) running instance of gvim

---
 plugins/vim-interaction/README.md             | 69 +++++++++++++++++++
 .../vim-interaction.plugin.zsh                | 67 ++++++++++++++++++
 2 files changed, 136 insertions(+)
 create mode 100644 plugins/vim-interaction/README.md
 create mode 100644 plugins/vim-interaction/vim-interaction.plugin.zsh

diff --git a/plugins/vim-interaction/README.md b/plugins/vim-interaction/README.md
new file mode 100644
index 000000000..65e678b51
--- /dev/null
+++ b/plugins/vim-interaction/README.md
@@ -0,0 +1,69 @@
+# Vim Interaction #
+
+The plugin presents a function called `callvim` whose usage is:
+
+    usage: callvim [-b cmd] [-a cmd] [file ... fileN]
+    
+      -b cmd     Run this command in GVIM before editing the first file
+      -a cmd     Run this command in GVIM after editing the first file
+      file       The file to edit
+      ... fileN  The other files to add to the argslist
+
+## Rationale ##
+
+The idea for this script is to give you some decent interaction with a running
+GVim session.  Normally you'll be running around your filesystem doing any
+number of amazing things and you'll need to load some files into GVim for
+editing, inspecting, destruction, or other bits of mayhem.  This script lets you
+do that.
+
+## Aliases ##
+
+There are a few aliases presented as well:
+
+* `v` A shorthand for `callvim`
+* `vvsp` Edits the passed in file but first makes a vertical split
+* `vhsp` Edits the passed in file but first makes a horizontal split
+
+## Examples ##
+
+This will load `/tmp/myfile.scala` into the running GVim session:
+
+    > v /tmp/myfile.scala
+
+This will load it after first doing a vertical split:
+
+    > vvsp /tmp/myfile.scala
+    or
+    > v -b':vsp' /tmp/myfile.scala
+
+This will load it after doing a horizontal split, then moving to the bottom of
+the file:
+
+    > vhsp -aG /tmp/myfile.scala
+    or
+    > v -b':sp' -aG /tmp/myfile.scala
+
+This will load the file and then copy the first line to the end (Why you would
+ever want to do this... I dunno):
+
+    > v -a':1t$' /tmp/myfile.scala
+
+And this will load all of the `*.txt` files into the args list:
+
+    > v *.txt
+
+If you want to load files into areas that are already split, use one of the
+aliases for that:
+
+    # Do a ':wincmd h' first
+    > vh /tmp/myfile.scala
+
+    # Do a ':wincmd j' first
+    > vj /tmp/myfile.scala
+
+    # Do a ':wincmd k' first
+    > vk /tmp/myfile.scala
+
+    # Do a ':wincmd l' first
+    > vl /tmp/myfile.scala
diff --git a/plugins/vim-interaction/vim-interaction.plugin.zsh b/plugins/vim-interaction/vim-interaction.plugin.zsh
new file mode 100644
index 000000000..3f346dfc3
--- /dev/null
+++ b/plugins/vim-interaction/vim-interaction.plugin.zsh
@@ -0,0 +1,67 @@
+#
+# See README.md
+#
+# Derek Wyatt (derek@{myfirstnamemylastname}.org
+# 
+
+function resolveFile
+{
+  if [ -f "$1" ]; then
+    echo $(readlink -f "$1")
+  else
+    echo "$1"
+  fi
+}
+
+function callvim
+{
+  if [[ $# == 0 ]]; then
+    cat <<EOH
+usage: callvim [-b cmd] [-a cmd] [file ... fileN]
+
+  -b cmd     Run this command in GVIM before editing the first file
+  -a cmd     Run this command in GVIM after editing the first file
+  file       The file to edit
+  ... fileN  The other files to add to the argslist
+EOH
+    return 0
+  fi
+
+  local cmd=""
+  local before=""
+  local after=""
+  while getopts ":b:a:" option
+  do
+    case $option in
+      a) after="$OPTARG"
+         ;;
+      b) before="$OPTARG"
+         ;;
+    esac
+  done
+  shift $((OPTIND-1))
+  if [[ ${after#:} != $after && ${after%<cr>} == $after ]]; then
+    after="$after<cr>"
+  fi
+  if [[ ${before#:} != $before && ${before%<cr>} == $before ]]; then
+    before="$before<cr>"
+  fi
+  local files=""
+  for f in $@
+  do
+    files="$files $(resolveFile $f)"
+  done
+  if [[ -n $files ]]; then
+    files=':args! '"$files<cr>"
+  fi
+  cmd="$before$files$after"
+  gvim --remote-send "$cmd"
+}
+
+alias v=callvim
+alias vvsp="callvim -b':vsp'"
+alias vhsp="callvim -b':sp'"
+alias vk="callvim -b':wincmd k'"
+alias vj="callvim -b':wincmd j'"
+alias vl="callvim -b':wincmd l'"
+alias vh="callvim -b':wincmd h'"

From 83071a10e7bcb398269be37a77dd929cb9182434 Mon Sep 17 00:00:00 2001
From: Derek Wyatt <dwyatt@rim.com>
Date: Tue, 20 Mar 2012 09:55:25 -0400
Subject: [PATCH 319/364] Fixed: If you callvim on a non-existant file with a
 relative path, the CWD of the running gvim process is used, and that's not
 right.  We use the PWD explicitly instead, in this case

---
 plugins/vim-interaction/vim-interaction.plugin.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/vim-interaction/vim-interaction.plugin.zsh b/plugins/vim-interaction/vim-interaction.plugin.zsh
index 3f346dfc3..309012b34 100644
--- a/plugins/vim-interaction/vim-interaction.plugin.zsh
+++ b/plugins/vim-interaction/vim-interaction.plugin.zsh
@@ -8,8 +8,10 @@ function resolveFile
 {
   if [ -f "$1" ]; then
     echo $(readlink -f "$1")
+  elif [[ "${1#/}" == "$1" ]]; then
+    echo "$(pwd)/$1"
   else
-    echo "$1"
+    echo $1
   fi
 }
 

From 5a81fda42a48587fb27acb8c5d1e64e1d7c90b6c Mon Sep 17 00:00:00 2001
From: Derek Wyatt <derek@derekwyatt.org>
Date: Fri, 30 Mar 2012 06:33:06 -0400
Subject: [PATCH 320/364] Added an optional callout to the end of the
 interaction function. I put it in to allow me to put the window focus on
 MacVim / GVim depending on the different OS I happen to be on

---
 plugins/vim-interaction/vim-interaction.plugin.zsh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/vim-interaction/vim-interaction.plugin.zsh b/plugins/vim-interaction/vim-interaction.plugin.zsh
index 309012b34..af7e60c88 100644
--- a/plugins/vim-interaction/vim-interaction.plugin.zsh
+++ b/plugins/vim-interaction/vim-interaction.plugin.zsh
@@ -58,6 +58,9 @@ EOH
   fi
   cmd="$before$files$after"
   gvim --remote-send "$cmd"
+  if typeset -f postCallVim > /dev/null; then
+    postCallVim
+  fi
 }
 
 alias v=callvim

From 46c2af396a80a4dda8ce46577249b7aa81ea0849 Mon Sep 17 00:00:00 2001
From: Derek Wyatt <derek@derekwyatt.org>
Date: Fri, 30 Mar 2012 06:39:49 -0400
Subject: [PATCH 321/364] Updated the README to include documentation on the
 postCallVim callout

---
 plugins/vim-interaction/README.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/plugins/vim-interaction/README.md b/plugins/vim-interaction/README.md
index 65e678b51..681648018 100644
--- a/plugins/vim-interaction/README.md
+++ b/plugins/vim-interaction/README.md
@@ -25,6 +25,19 @@ There are a few aliases presented as well:
 * `vvsp` Edits the passed in file but first makes a vertical split
 * `vhsp` Edits the passed in file but first makes a horizontal split
 
+## Post Callout ##
+
+At the end of the `callvim` function we invoke the `postCallVim` function if it
+exists.  If you're using MacVim, for example, you could define a function that
+brings window focus to it after the file is loaded:
+
+    function postCallVim
+    {
+      osascript -e 'tell application "MacVim" to activate'
+    }
+
+This'll be different depending on your OS / Window Manager.
+
 ## Examples ##
 
 This will load `/tmp/myfile.scala` into the running GVim session:

From ee8f9eebb5ea0c5d2df8445a46f2d31fdb16efd6 Mon Sep 17 00:00:00 2001
From: Derek Wyatt <derek@derekwyatt.org>
Date: Sun, 1 Apr 2012 15:41:39 -0400
Subject: [PATCH 322/364] Added an <esc> to the begining of everything. I ran
 something when I was in insert mode once and all it did was shove !args...
 into the buffer.  <esc> first.

---
 plugins/vim-interaction/vim-interaction.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/vim-interaction/vim-interaction.plugin.zsh b/plugins/vim-interaction/vim-interaction.plugin.zsh
index af7e60c88..5142f1f9b 100644
--- a/plugins/vim-interaction/vim-interaction.plugin.zsh
+++ b/plugins/vim-interaction/vim-interaction.plugin.zsh
@@ -30,7 +30,7 @@ EOH
   fi
 
   local cmd=""
-  local before=""
+  local before="<esc>"
   local after=""
   while getopts ":b:a:" option
   do

From 7a94b760193306fd62c07c93e116439f2bd8059b Mon Sep 17 00:00:00 2001
From: William Roe <willroe@gmail.com>
Date: Thu, 23 Feb 2012 14:11:52 +0000
Subject: [PATCH 323/364] Add completion for pip install -r - so that it
 autocompletes requirements filenames

---
 plugins/pip/_pip | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/pip/_pip b/plugins/pip/_pip
index 7c1238db7..9892dd19c 100644
--- a/plugins/pip/_pip
+++ b/plugins/pip/_pip
@@ -59,6 +59,7 @@ case "$words[1]" in
   	_arguments \
       '(-U --upgrade)'{-U,--upgrade}'[upgrade all packages to the newest available version]' \
       '(-f --find-links)'{-f,--find-links}'[URL for finding packages]' \
+      '(-r --requirement)'{-r,--requirement}'[Requirements file for packages to install]:File:_files' \
       '(--no-deps --no-dependencies)'{--no-deps,--no-dependencies}'[iIgnore package dependencies]' \
       '(--no-install)--no-install[only download packages]' \
       '(--no-download)--no-download[only install downloaded packages]' \

From d1323edb499d5f9fbe7641bcab402229ad773195 Mon Sep 17 00:00:00 2001
From: Peter Jaros <peter.a.jaros@gmail.com>
Date: Wed, 16 May 2012 14:51:52 -0400
Subject: [PATCH 324/364] Move example plugin to the custom plugins dir.

---
 .gitignore                                      | 4 ++--
 custom/{ => plugins}/example/example.plugin.zsh | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename custom/{ => plugins}/example/example.plugin.zsh (100%)

diff --git a/.gitignore b/.gitignore
index 51a5ee6c3..8fa66f02f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,8 @@
 locals.zsh
 log/.zsh_history
 projects.zsh
-custom/*
-!custom/example
+custom
+!custom/plugins/example
 !custom/example.zsh
 *.swp
 !custom/example.zshcache
diff --git a/custom/example/example.plugin.zsh b/custom/plugins/example/example.plugin.zsh
similarity index 100%
rename from custom/example/example.plugin.zsh
rename to custom/plugins/example/example.plugin.zsh

From d2a765e12d8638354b3cdc71ca535964fc379599 Mon Sep 17 00:00:00 2001
From: nXqd <nxqd.inbox@gmail.com>
Date: Thu, 14 Jun 2012 08:06:36 +0300
Subject: [PATCH 325/364] avoid VCS folders

---
 lib/grep.zsh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/grep.zsh b/lib/grep.zsh
index 93c4270b6..25345bd06 100644
--- a/lib/grep.zsh
+++ b/lib/grep.zsh
@@ -2,5 +2,11 @@
 # Color grep results
 # Examples: http://rubyurl.com/ZXv
 #
-export GREP_OPTIONS='--color=auto'
+
+# avoid VCS folders
+GREP_OPTIONS=
+for PATTERN in .cvs .git .hg .svn; do
+    GREP_OPTIONS+="--exclude-dir=$PATTERN "
+done
+export GREP_OPTIONS+='--color=auto '
 export GREP_COLOR='1;32'
\ No newline at end of file

From 1988958a1f960fcd5911745667a682daca2d0139 Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Tue, 10 Jul 2012 14:49:32 +0200
Subject: [PATCH 326/364] added completion for all asadmin subcommands

---
 plugins/glassfish/_asadmin | 345 +++++++++++++++++++++++++++++++++++++
 1 file changed, 345 insertions(+)
 create mode 100644 plugins/glassfish/_asadmin

diff --git a/plugins/glassfish/_asadmin b/plugins/glassfish/_asadmin
new file mode 100644
index 000000000..c8f62c67c
--- /dev/null
+++ b/plugins/glassfish/_asadmin
@@ -0,0 +1,345 @@
+#compdef asadmin
+#autoload
+
+local -a _1st_arguments
+_1st_arguments=(
+    "add-library:adds one or more library JAR files to GlassFish Server"
+    "add-resources:creates the resources specified in an XML file"
+    "apply-http-lb-changes:applies load balancer configuration changes to the load balancer"
+    "backup-domain:performs a backup on the domain"
+    "change-admin-password:changes the administrator password"
+    "change-master-broker:changes the master broker in a Message Queue cluster providing JMS services for a GlassFish Server cluster."
+    "change-master-password:changes the master password"
+    "collect-log-files:creates a ZIP archive of all available log files"
+    "configure-jms-cluster:configures the Message Queue cluster providing JMS services to a GlassFish Server cluster"
+    "configure-lb-weight:sets load balancing weights for clustered instances"
+    "configure-ldap-for-admin:configures the authentication realm named admin-realm for the given LDAP"
+    "copy-config:copies an existing named configuration to create another configuration"
+    "create-admin-object:adds the administered object with the specified JNDI name for a resource adapter"
+    "create-application-ref:creates a reference to an application"
+    "create-audit-module:adds an audit module"
+    "create-auth-realm:adds the named authentication realm"
+    "create-cluster:creates a GlassFish Server cluster"
+    "create-connector-connection-pool:adds a connection pool with the specified connection pool name"
+    "create-connector-resource:registers the connector resource with the specified JNDI name"
+    "create-connector-security-map:creates a security map for the specified connector connection pool"
+    "create-connector-work-security-map:creates a work security map for the specified resource adapter"
+    "create-custom-resource:creates a custom resource"
+    "create-domain:creates a domain"
+    "create-file-user:creates a new file user"
+    "create-http:sets HTTP parameters for a protocol"
+    "create-http-health-checker:creates a health-checker for a specified load balancer configuration"
+    "create-http-lb:creates a load balancer"
+    "create-http-lb-config:creates a configuration for the load balancer"
+    "create-http-lb-ref:adds an existing cluster or server instance to an existing load balancer configuration or load balancer"
+    "create-http-listener:adds a new HTTP network listener socket"
+    "create-http-redirect:adds a new HTTP redirect"
+    "create-iiop-listener:adds an IIOP listener"
+    "create-instance:creates a GlassFish Server instance"
+    "create-jacc-provider:enables administrators to create a JACC provider that can be used by third-party authorization modules for applications running in GlassFish Server"
+    "create-javamail-resource:creates a JavaMail session resource"
+    "create-jdbc-connection-pool:registers a JDBC connection pool"
+    "create-jdbc-resource:creates a JDBC resource with the specified JNDI name"
+    "create-jms-host:creates a JMS host"
+    "create-jms-resource:creates a JMS resource"
+    "create-jmsdest:creates a JMS physical destination"
+    "create-jndi-resource:registers a JNDI resource"
+    "create-jvm-options:creates options for the Java application launcher"
+    "create-lifecycle-module:creates a lifecycle module"
+    "create-local-instance:creates a GlassFish Server instance on the host where the subcommand is run"
+    "create-message-security-provider:enables administrators to create a message security provider, which specifies how SOAP messages will be secured."
+    "create-network-listener:adds a new network listener socket"
+    "create-node-config:creates a node that is not enabled for remote communication"
+    "create-node-dcom:creates a node that is enabled for com munication over DCOM"
+    "create-node-ssh:creates a node that is enabled for communication over SSH"
+    "create-password-alias:creates a password alias"
+    "create-profiler:creates the profiler element"
+    "create-protocol:adds a new protocol"
+    "create-protocol-filter:adds a new protocol filter"
+    "create-protocol-finder:adds a new protocol finder"
+    "create-resource-adapter-config:creates the configuration information for the connector module"
+    "create-resource-ref:creates a reference to a resource"
+    "create-service:configures the starting of a DAS or a GlassFish Server instance on an unattended boot"
+    "create-ssl:creates and configures the SSL element in the selected HTTP listener, IIOP listener, or IIOP service"
+    "create-system-properties:adds one or more system property elements that can be referenced elsewhere in the configuration."
+    "create-threadpool:adds a thread pool"
+    "create-transport:adds a new transport"
+    "create-virtual-server:creates the named virtual server"
+    "delete-admin-object:removes the administered object with the specified JNDI name."
+    "delete-application-ref:removes a reference to an applica tion"
+    "delete-audit-module:removes the named audit-module"
+    "delete-auth-realm:removes the named authentication realm"
+    "delete-cluster:deletes a GlassFish Server cluster"
+    "delete-config:deletes an existing named configuration"
+    "delete-connector-connection-pool:removes the specified connector connection pool"
+    "delete-connector-resource:removes the connector resource with the specified JNDI name"
+    "delete-connector-security-map:deletes a security map for the specified connector connection pool"
+    "delete-connector-work-security-map:deletes a work security map for the specified resource adapter"
+    "delete-custom-resource:removes a custom resource"
+    "delete-domain:deletes a domain"
+    "delete-file-user:removes the named file user"
+    "delete-http:removes HTTP parameters from a protocol"
+    "delete-http-health-checker:deletes the health-checker for a specified load balancer configuration"
+    "delete-http-lb:deletes a load balancer"
+    "delete-http-lb-config:deletes a load balancer configuration"
+    "delete-http-lb-ref:deletes the cluster or server instance from a load balancer"
+    "delete-http-listener:removes a network listener"
+    "delete-http-redirect:removes an HTTP redirect"
+    "delete-iiop-listener:removes an IIOP listener"
+    "delete-instance:deletes a GlassFish Server instance"
+    "delete-jacc-provider:enables administrators to delete JACC providers defined for a domain"
+    "delete-javamail-resource:removes a JavaMail session resource"
+    "delete-jdbc-connection-pool:removes the specified JDBC connection pool"
+    "delete-jdbc-resource:removes a JDBC resource with the specified JNDI name"
+    "delete-jms-host:removes a JMS host"
+    "delete-jms-resource:removes a JMS resource"
+    "delete-jmsdest:removes a JMS physical destination"
+    "delete-jndi-resource:removes a JNDI resource"
+    "delete-jvm-options:removes one or more options for the Java application launcher"
+    "delete-lifecycle-module:removes the lifecycle module"
+    "delete-local-instance:deletes a GlassFish Server instance on the machine where the subcommand is run"
+    "delete-log-levels:"
+    "delete-message-security-provider:enables administrators to delete a message security provider"
+    "delete-network-listener:removes a network listener"
+    "delete-node-config:deletes a node that is not enabled for remote communication"
+    "delete-node-dcom:deletes a node that is enabled for communication over DCOM"
+    "delete-node-ssh:deletes a node that is enabled for communication over SSH"
+    "delete-password-alias:deletes a password alias"
+    "delete-profiler:removes the profiler element"
+    "delete-protocol:removes a protocol"
+    "delete-protocol-filter:removes a protocol filter"
+    "delete-protocol-finder:removes a protocol finder"
+    "delete-resource-adapter-config:deletes the resource adapter configuration"
+    "delete-resource-ref:removes a reference to a resource"
+    "delete-ssl:deletes the SSL element in the selected HTTP listener, IIOP listener, or IIOP service"
+    "delete-system-property:removes a system property of the domain, configuration, cluster, or server instance, one at a time"
+    "delete-threadpool:removes a thread pool"
+    "delete-transport:removes a transport"
+    "delete-virtual-server:removes a virtual server"
+    "deploy:deploys the specified component"
+    "deploydir:deploys an exploded format of application archive"
+    "environment variable"
+    "disable:disables the component"
+    "disable-http-lb-application:disables an application managed by a load balancer"
+    "disable-http-lb-server:disables a sever or cluster managed by a load balancer"
+    "disable-monitoring:disables monitoring for the server or for specific monitorable modules"
+    "disable-secure-admin:disables secure admin if it is already enabled."
+    "disable-secure-admin-internal-user:Instructs the GlassFish Server DAS and instances to not use the specified admin user to authenticate with each other and to authorize admin operations."
+    "disable-secure-admin-principal:disables the certificate for authorizing access in secure administration."
+    "enable:enables the component"
+    "enable-http-lb-application:enables a previously-disabled application managed by a load balancer"
+    "enable-http-lb-server:enables a previously disabled sever or cluster managed by a load balancer"
+    "enable-monitoring:enables monitoring for the server or for specific monitorable modules"
+    "enable-secure-admin:enables secure admin (if it is not already enabled), optionally changing the alias used for DAS-to-instance admin messages or the alias used for instance-to-DAS admin messages."
+    "enable-secure-admin-internal-user:Instructs the GlassFish Server DAS and instances to use the specified admin user and the password associated with the password alias to authenticate with each other and to authorize admin operations."
+    "enable-secure-admin-principal:Instructs GlassFish Server, when secure admin is enabled, to accept admin requests from clients identified by the specified SSL certificate."
+    "export:marks a variable name for automatic export to the environment of subsequent commands in multimode"
+    "export-http-lb-config:exports the load balancer configuration or load balancer to a file"
+    "export-sync-bundle:exports the configuration data of a cluster or standalone instance to an archive file"
+    "flush-connection-pool:reintializes all connections established in the specified connection pool"
+    "flush-jmsdest:purges messages in a JMS destination."
+    "freeze-transaction-service:freezes the transaction subsystem"
+    "generate-domain-schema:"
+    "generate-jvm-report:shows the JVM machine statistics for a given target instance"
+    "get:gets the values of configurable or monitorable attributes"
+    "get-client-stubs:retrieves the application JAR files needed to launch the application client."
+    "get-health:provides information on the cluster health"
+    "asadmin:utility for performing administrative tasks for Oracle GlassFish Server"
+    "import-sync-bundle:imports the configuration data of a clustered instance or standalone instance from an archive file"
+    "install-node:installs GlassFish Server software on specified SSH-enabled hosts"
+    "install-node-dcom:installs GlassFish Server software on specified DCOM-enabled hosts"
+    "install-node-ssh:installs GlassFish Server software on specified SSH-enabled hosts"
+    "jms-ping:checks if the JMS service is up and running"
+    "list:lists configurable or monitorable elements"
+    "list-admin-objects:gets all the administered objects"
+    "list-application-refs:lists the existing application references"
+    "list-applications:lists deployed applications"
+    "list-audit-modules:gets all audit modules and displays them"
+    "list-auth-realms:lists the authentication realms"
+    "list-backups:lists all backups"
+    "list-clusters:lists existing clusters in a domain"
+    "list-commands:lists available commands"
+    "list-components:lists deployed components"
+    "list-configs:lists named configurations"
+    "list-connector-connection-pools:lists the existing connector connection pools"
+    "list-connector-resources:lists all connector resources"
+    "list-connector-security-maps:lists the security maps belonging to the specified connector connection pool"
+    "list-connector-work-security-maps:lists the work security maps belonging to the specified resource adapter"
+    "list-containers:lists application containers"
+    "list-custom-resources:gets all custom resources"
+    "list-domains:lists the domains in the specified directory"
+    "list-file-groups:lists file groups"
+    "list-file-users:lists the file users"
+    "list-http-lb-configs:lists load balancer configurations"
+    "list-http-lbs:lists load balancers"
+    "list-http-listeners:lists the existing network listeners"
+    "list-iiop-listeners:lists the existing IIOP listeners"
+    "list-instances:lists GlassFish Server instances in a domain"
+    "list-jacc-providers:enables administrators to list JACC providers defined for a domain"
+    "list-javamail-resources:lists the existing JavaMail session resources"
+    "list-jdbc-connection-pools:lists all JDBC connection pools"
+    "list-jdbc-resources:lists all JDBC resources"
+    "list-jms-hosts:lists the existing JMS hosts"
+    "list-jms-resources:lists the JMS resources"
+    "list-jmsdest:lists the existing JMS physical destinations"
+    "list-jndi-entries:browses and queries the JNDI tree"
+    "list-jndi-resources:lists all existing JNDI resources"
+    "list-jvm-options:lists options for the Java application launcher"
+    "list-libraries:lists library JAR files on GlassFish Server"
+    "list-lifecycle-modules:lists the lifecycle modules"
+    "list-log-attributes:lists all logging attributes defined for a specified target in a domain"
+    "list-log-levels:lists the loggers and their log levels"
+    "list-message-security-providers:lists all security message providers for the given message layer"
+    "list-modules:lists GlassFish Server modules"
+    "list-network-listeners:lists the existing network listeners"
+    "list-nodes:lists all GlassFish Server nodes in a domain"
+    "list-nodes-config:lists all GlassFish Server nodes that do not support remote communication in a domain"
+    "list-nodes-dcom:lists all GlassFish Server nodes that support communication over DCOM in a domain"
+    "list-nodes-ssh:lists all GlassFish Server nodes that support communication over SSH in a domain"
+    "list-password-aliases:lists all password aliases"
+    "list-persistence-types:lists registered persistence types for HTTP sessions and SFSB instances"
+    "list-protocol-filters:lists the existing protocol filters"
+    "list-protocol-finders:lists the existing protocol finders"
+    "list-protocols:lists the existing protocols"
+    "list-resource-adapter-configs:lists the names of the current resource adapter configurations"
+    "list-resource-refs:lists existing resource references"
+    "list-secure-admin-internal-users:lists the user names that the GlassFish Server DAS and instances use to authenticate with each other and to authorize admin operations."
+    "list-secure-admin-principals:lists the certificates for which GlassFish Server accepts admin requests from clients."
+    "list-sub-components:lists EJB or servlet components in a deployed module or module of a deployed application"
+    "list-supported-cipher-suites:enables administrators to list the cipher suites that are supported and available to a specified GlassFish Server target"
+    "list-system-properties:lists the system properties of the domain, configuration, cluster, or server instance"
+    "list-threadpools:lists all the thread pools"
+    "list-timers:lists all of the persistent timers owned by server instance(s)"
+    "list-transports:lists the existing transports"
+    "list-virtual-servers:lists the existing virtual servers"
+    "list-web-context-param:lists servlet contextinitialization parameters of a deployed web application or module"
+    "list-web-env-entry:lists environment entries for a deployed web application or module"
+    "login:logs you into a domain"
+    "migrate-timers:moves EJB timers when a clustered instance was stopped or has crashed"
+    "monitor:displays monitoring data for commonly used components and services"
+    "multimode:allows multiple subcommands to be run while preserving environment settings and remaining in the asadmin utility"
+    "ping-connection-pool:tests if a connection pool is usable"
+    "ping-node-dcom:tests if a node that is enabled for communication over DCOM is usable"
+    "ping-node-ssh:tests if a node that is enabled for communication over SSH is usable"
+    "recover-transactions:manually recovers pending transactions"
+    "redeploy:redeploys the specified component"
+    "remove-library:removes one or more library JAR files from GlassFish Server"
+    "restart-domain:restarts the DAS of the specified domain"
+    "restart-instance:restarts a running GlassFish Server instance"
+    "restart-local-instance:restarts a running GlassFish Server instance on the host where the subcommand is run"
+    "restore-domain:restores files from backup"
+    "rollback-transaction:rolls back the named transaction"
+    "rotate-log:rotates the log file"
+    "set:sets the values of configurable attributes"
+    "set-log-attributes:sets the logging attributes for one or more loggers"
+    "set-log-levels:sets the log level for one or more loggers"
+    "set-web-context-param:sets a servlet context initialization parameter of a deployed web application or module"
+    "set-web-env-entry:sets an environment entry for a deployed web application or module"
+    "setup-ssh:sets up an SSH key on specified hosts"
+    "show-component-status:displays the status of the deployed component"
+    "start-cluster:starts a cluster"
+    "start-database:starts the Java DB"
+    "start-domain:starts the DAS of the specified domain"
+    "start-instance:starts a GlassFish Server instance"
+    "start-local-instance:starts a GlassFish Server instance on the host where the subcommand is run"
+    "stop-cluster:stops a GlassFish Server cluster"
+    "stop-database:stops the Java DB"
+    "stop-domain:stops the Domain Administration Server of the specified domain"
+    "stop-instance:stops a running GlassFish Server instance"
+    "stop-local-instance:stops a GlassFish Server instance on the machine where the subcommand is run"
+    "undeploy:removes a deployed component"
+    "unfreeze-transaction-service:resumes all suspended transactions"
+    "uninstall-node:uninstalls GlassFish Server software from specified hosts"
+    "uninstall-node-dcom:uninstalls GlassFish Server software from specified DCOM-enabled hosts"
+    "uninstall-node-ssh:uninstalls GlassFish Server software from specified SSH-enabled hosts"
+    "unset:removes one or more variables from the multimode environment"
+    "unset-web-context-param:unsets a servlet context initialization parameter of a deployed web application or module"
+    "unset-web-env-entry:unsets an environment entry for a deployed web application or module"
+    "update-connector-security-map:modifies a security map for the specified connector connection pool"
+    "update-connector-work-security-map:modifies a work security map for the specified resource adapter"
+    "update-file-user:updates a current file user as specified"
+    "update-node-config:updates the configuration data of anode"
+    "update-node-dcom:updates the configuration data of a node"
+    "update-node-ssh:updates the configuration data of a node"
+    "update-password-alias:updates a password alias"
+    "uptime:returns the length of time that the DAS has been running"
+    "validate-dcom:tests the connection over DCOM to a remote host"
+    "validate-multicast:validates that multicast transport is available for clusters"
+    "verify-domain-xml:verifies the content of the domain.xml file"
+    "version:displays version information forGlassFish Server"
+)
+
+_arguments '*:: :->command'
+
+if (( CURRENT == 1 )); then
+    _describe -t commands "glassfish command" _1st_arguments
+    return
+fi
+
+local -a _command_args
+case "$words[1]" in
+    apps:info)
+        _command_args=(
+            '(-r|--raw)'{-r,--raw}'[output info as raw key/value pairs]' \
+                )
+        ;;
+    apps:create)
+        _command_args=(
+            '(-a|--addons)'{-a,--addons}'[a list of addons to install]' \
+                '(-r|--remote)'{-r,--remote}'[the git remote to create, default "heroku"]' \
+                '(-s|--stack)'{-s,--stack}'[the stack on which to create the app]' \
+                )
+        ;;
+    config)
+        _command_args=(
+            '(-s|--shell)'{-s,--shell}'[output config vars in shell format]' \
+                )
+        ;;
+    db:push)
+        _command_args=(
+            '(-c|--chunksize)'{-c,--chunksize}'[specify the number of rows to send in each batch]' \
+                '(-d|--debug)'{-d,--debug}'[enable debugging output]' \
+                '(-e|--exclude)'{-e,--exclude}'[exclude the specified tables from the push]' \
+                '(-f|--filter)'{-f,--filter}'[only push certain tables]' \
+                '(-r|--resume)'{-r,--resume}'[resume transfer described by a .dat file]' \
+                '(-t|--tables)'{-t,--tables}'[only push the specified tables]' \
+                )
+        ;;
+    db:pull)
+        _command_args=(
+            '(-c|--chunksize)'{-c,--chunksize}'[specify the number of rows to send in each batch]' \
+                '(-d|--debug)'{-d,--debug}'[enable debugging output]' \
+                '(-e|--exclude)'{-e,--exclude}'[exclude the specified tables from the pull]' \
+                '(-f|--filter)'{-f,--filter}'[only pull certain tables]' \
+                '(-r|--resume)'{-r,--resume}'[resume transfer described by a .dat file]' \
+                '(-t|--tables)'{-t,--tables}'[only pull the specified tables]' \
+                )
+        ;;
+    keys)
+        _command_args=(
+            '(-l|--long)'{-l,--long}'[display extended information for each key]' \
+                )
+        ;;
+    logs)
+        _command_args=(
+            '(-n|--num)'{-n,--num}'[the number of lines to display]' \
+                '(-p|--ps)'{-p,--ps}'[only display logs from the given process]' \
+                '(-s|--source)'{-s,--source}'[only display logs from the given source]' \
+                '(-t|--tail)'{-t,--tail}'[continually stream logs]' \
+                )
+        ;;
+    pgbackups:capture)
+        _command_args=(
+            '(-e|--expire)'{-e,--expire}'[if no slots are available to capture, delete the oldest backup to make room]' \
+                )
+        ;;
+    stack)
+        _command_args=(
+            '(-a|--all)'{-a,--all}'[include deprecated stacks]' \
+                )
+        ;;
+esac
+
+_arguments \
+    $_command_args \
+    &&  return 0

From 7daf2f4a623e730c837299ce709c41a50d13e458 Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Tue, 10 Jul 2012 14:57:59 +0200
Subject: [PATCH 327/364] apparently, this file must exist for the plugin to
 load

---
 plugins/glassfish/_glassfish | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 plugins/glassfish/_glassfish

diff --git a/plugins/glassfish/_glassfish b/plugins/glassfish/_glassfish
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/plugins/glassfish/_glassfish
@@ -0,0 +1 @@
+

From 4dcdd13009d288bce3ba5a6157f408c15fb351c5 Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Thu, 12 Jul 2012 14:05:33 +0200
Subject: [PATCH 328/364] added completions for all known arguments to all
 known commands

---
 plugins/glassfish/_asadmin | 684 +++++++++++++++++++++++++++++++++----
 1 file changed, 624 insertions(+), 60 deletions(-)

diff --git a/plugins/glassfish/_asadmin b/plugins/glassfish/_asadmin
index c8f62c67c..08ae9d461 100644
--- a/plugins/glassfish/_asadmin
+++ b/plugins/glassfish/_asadmin
@@ -278,66 +278,630 @@ fi
 
 local -a _command_args
 case "$words[1]" in
-    apps:info)
-        _command_args=(
-            '(-r|--raw)'{-r,--raw}'[output info as raw key/value pairs]' \
-                )
-        ;;
-    apps:create)
-        _command_args=(
-            '(-a|--addons)'{-a,--addons}'[a list of addons to install]' \
-                '(-r|--remote)'{-r,--remote}'[the git remote to create, default "heroku"]' \
-                '(-s|--stack)'{-s,--stack}'[the stack on which to create the app]' \
-                )
-        ;;
-    config)
-        _command_args=(
-            '(-s|--shell)'{-s,--shell}'[output config vars in shell format]' \
-                )
-        ;;
-    db:push)
-        _command_args=(
-            '(-c|--chunksize)'{-c,--chunksize}'[specify the number of rows to send in each batch]' \
-                '(-d|--debug)'{-d,--debug}'[enable debugging output]' \
-                '(-e|--exclude)'{-e,--exclude}'[exclude the specified tables from the push]' \
-                '(-f|--filter)'{-f,--filter}'[only push certain tables]' \
-                '(-r|--resume)'{-r,--resume}'[resume transfer described by a .dat file]' \
-                '(-t|--tables)'{-t,--tables}'[only push the specified tables]' \
-                )
-        ;;
-    db:pull)
-        _command_args=(
-            '(-c|--chunksize)'{-c,--chunksize}'[specify the number of rows to send in each batch]' \
-                '(-d|--debug)'{-d,--debug}'[enable debugging output]' \
-                '(-e|--exclude)'{-e,--exclude}'[exclude the specified tables from the pull]' \
-                '(-f|--filter)'{-f,--filter}'[only pull certain tables]' \
-                '(-r|--resume)'{-r,--resume}'[resume transfer described by a .dat file]' \
-                '(-t|--tables)'{-t,--tables}'[only pull the specified tables]' \
-                )
-        ;;
-    keys)
-        _command_args=(
-            '(-l|--long)'{-l,--long}'[display extended information for each key]' \
-                )
-        ;;
-    logs)
-        _command_args=(
-            '(-n|--num)'{-n,--num}'[the number of lines to display]' \
-                '(-p|--ps)'{-p,--ps}'[only display logs from the given process]' \
-                '(-s|--source)'{-s,--source}'[only display logs from the given source]' \
-                '(-t|--tail)'{-t,--tail}'[continually stream logs]' \
-                )
-        ;;
-    pgbackups:capture)
-        _command_args=(
-            '(-e|--expire)'{-e,--expire}'[if no slots are available to capture, delete the oldest backup to make room]' \
-                )
-        ;;
-    stack)
-        _command_args=(
-            '(-a|--all)'{-a,--all}'[include deprecated stacks]' \
-                )
-        ;;
+	add-library)
+		_command_args=('--type')
+	;;
+	add-resources)
+		_command_args=('--target')
+	;;
+	apply-http-lb-changes)
+		_command_args=('--ping')
+	;;
+	backup-domain)
+		_command_args=('--backupconfig' '--backupdir' '--description' '--domaindir' '--long')
+	;;
+	change-admin-password)
+		_command_args=('--domain_name' '--domaindir')
+	;;
+	change-master-password)
+		_command_args=('--domaindir' '--nodedir' '--savemasterpassword')
+	;;
+	collect-log-files)
+		_command_args=('--retrieve' '--target')
+	;;
+	configure-jms-cluster)
+		_command_args=('--clustertype' '--configstoretype' '--dburl' '--dbuser' '--dbvendor' '--jmsdbpassword' '--messagestoretype' '--property')
+	;;
+	configure-lb-weight)
+		_command_args=('--cluster')
+	;;
+	configure-ldap-for-admin)
+		_command_args=('--basedn' '--ldap-group' '--target' '--url')
+	;;
+	copy-config)
+		_command_args=('--systemproperties')
+	;;
+	create-admin-object)
+		_command_args=('--classname' '--description' '--enabled' '--property' '--raname' '--restype' '--target')
+	;;
+	create-application-ref)
+		_command_args=('--enabled' '--lbenabled' '--target' '--virtualservers')
+	;;
+	create-audit-module)
+		_command_args=('--classname' '--property' '--target')
+	;;
+	create-auth-realm)
+		_command_args=('--classname' '--property' '--target')
+	;;
+	create-connector-connection-pool)
+		_command_args=('--associatewiththread' '--connectiondefinition' '--creationretryattempts' '--creationretryinterval' '--description' '--failconnection' '--idletimeout' '--isconnectvalidatereq' '--lazyconnectionassociation' '--lazyconnectionenlistment' '--leakreclaim' '--leaktimeout' '--matchconnections' '--maxconnectionusagecount' '--maxpoolsize' '--maxwait' '--ping' '--pooling' '--poolresize' '--property' '--raname' '--steadypoolsize' '--target' '--transactionsupport' '--validateatmostonceperiod')
+	;;
+	create-connector-resource)
+		_command_args=('--description' '--enabled' '--objecttype' '--poolname' '--property' '--target')
+	;;
+	create-connector-security-map)
+		_command_args=('--mappedpassword' '--mappedusername' '--poolname' '--principals' '--target' '--usergroups')
+	;;
+	create-connector-work-security-map)
+		_command_args=('--description' '--groupsmap' '--principalsmap' '--raname')
+	;;
+	create-custom-resource)
+		_command_args=('--description' '--enabled' '--factoryclass' '--property' '--restype' '--target')
+	;;
+	create-domain)
+		_command_args=('--adminport' '--checkports' '--domaindir' '--domainproperties' '--instanceport' '--keytooloptions' '--nopassword' '--portbase' '--profile' '--savelogin' '--savemasterpassword' '--template' '--usemasterpassword')
+	;;
+	create-file-user)
+		_command_args=('--authrealmname' '--groups' '--target' '--userpassword')
+	;;
+	create-http)
+		_command_args=('--default-virtual-server' '--dns-lookup-enabled' '--max-connection' '--request-timeout-seconds' '--servername' '--target' '--timeout-seconds' '--xpowered')
+	;;
+	create-http-health-checker)
+		_command_args=('--config' '--interval' '--timeout' '--url')
+	;;
+	create-http-lb)
+		_command_args=('--autoapplyenabled' '--devicehost' '--deviceport' '--healthcheckerinterval' '--healthcheckertimeout' '--healthcheckerurl' '--httpsrouting' '--lbenableallapplications' '--lbenableallinstances' '--lbpolicy' '--lbpolicymodule' '--lbweight' '--monitor' '--property' '--reloadinterval' '--responsetimeout' '--routecookie' '--sslproxyhost' '--sslproxyport' '--target')
+	;;
+	create-http-lb-ref)
+		_command_args=('--config' '--healthcheckerinterval' '--healthcheckertimeout' '--healthcheckerurl' '--lbenableallapplications' '--lbenableallinstances' '--lbname' '--lbpolicy' '--lbpolicymodule' '--lbweight')
+	;;
+	create-http-listener)
+		_command_args=('--acceptorthreads' '--default-virtual-server' '--defaultvs' '--enabled' '--listeneraddress' '--listenerport' '--redirectport' '--secure' '--securityenabled' '--servername' '--target' '--xpowered')
+	;;
+	create-http-redirect)
+		_command_args=('--redirect-port' '--secure-redirect' '--target')
+	;;
+	create-iiop-listener)
+		_command_args=('--enabled' '--iiopport' '--listeneraddress' '--property' '--securityenabled' '--target')
+	;;
+	create-instance)
+		_command_args=('--checkports' '--cluster' '--config' '--lbenabled' '--node' '--portbase' '--systemproperties' '--terse')
+	;;
+	create-jacc-provider)
+		_command_args=('--policyconfigfactoryclass' '--policyproviderclass' '--property' '--target')
+	;;
+	create-javamail-resource)
+		_command_args=('--debug' '--description' '--enabled' '--fromaddress' '--mailhost' '--mailuser' '--property' '--storeprotocol' '--storeprotocolclass' '--target' '--transprotocol' '--transprotocolclass')
+	;;
+	create-jdbc-connection-pool)
+		_command_args=('--allownoncomponentcallers' '--associatewiththread' '--creationretryattempts' '--creationretryinterval' '--datasourceclassname' '--description' '--driverclassname' '--failconnection' '--idletimeout' '--initsql' '--isconnectvalidatereq' '--isisolationguaranteed' '--isolationlevel' '--lazyconnectionassociation' '--lazyconnectionenlistment' '--leakreclaim' '--leaktimeout' '--matchconnections' '--maxconnectionusagecount' '--maxpoolsize' '--maxwait' '--nontransactionalconnections' '--ping' '--pooling' '--poolresize' '--property' '--restype' '--sqltracelisteners' '--statementcachesize' '--statementleakreclaim' '--statementleaktimeout' '--statementtimeout' '--steadypoolsize' '--target' '--validateatmostonceperiod' '--validationclassname' '--validationmethod' '--validationtable' '--wrapjdbcobjects')
+	;;
+	create-jdbc-resource)
+		_command_args=('--connectionpoolid' '--description' '--enabled' '--property' '--target')
+	;;
+	create-jms-host)
+		_command_args=('--mqhost' '--mqpassword' '--mqport' '--mquser' '--property' '--target')
+	;;
+	create-jms-resource)
+		_command_args=('--description' '--enabled' '--property' '--restype' '--target')
+	;;
+	create-jmsdest)
+		_command_args=('--desttype' '--property' '--target')
+	;;
+	create-jndi-resource)
+		_command_args=('--description' '--enabled' '--factoryclass' '--jndilookupname' '--property' '--restype' '--target')
+	;;
+	create-jvm-options)
+		_command_args=('--profiler' '--target')
+	;;
+	create-lifecycle-module)
+		_command_args=('--classname' '--classpath' '--description' '--enabled' '--failurefatal' '--loadorder' '--property' '--target')
+	;;
+	create-local-instance)
+		_command_args=('--checkports' '--cluster' '--config' '--lbenabled' '--node' '--nodedir' '--portbase' '--savemasterpassword' '--systemproperties' '--usemasterpassword')
+	;;
+	create-message-security-provider)
+		_command_args=('--classname' '--isdefaultprovider' '--layer' '--property' '--providertype' '--requestauthrecipient' '--requestauthsource' '--responseauthrecipient' '--responseauthsource' '--target')
+	;;
+	create-network-listener)
+		_command_args=('--address' '--enabled' '--jkenabled' '--listenerport' '--protocol' '--target' '--threadpool' '--transport')
+	;;
+	create-node-config)
+		_command_args=('--installdir' '--nodedir' '--nodehost')
+	;;
+	create-node-dcom)
+		_command_args=('--archive' '--force' '--install' '--installdir' '--nodedir' '--nodehost' '--windowsdomain' '--windowspassword' '--windowsuser')
+	;;
+	create-node-ssh)
+		_command_args=('--archive' '--force' '--install' '--installdir' '--nodedir' '--nodehost' '--sshkeyfile' '--sshkeypassphrase' '--sshpassword' '--sshport' '--sshuser')
+	;;
+	create-password-alias)
+		_command_args=('--aliaspassword')
+	;;
+	create-profiler)
+		_command_args=('--classpath' '--enabled' '--nativelibrarypath' '--property' '--target')
+	;;
+	create-protocol)
+		_command_args=('--securityenabled' '--target')
+	;;
+	create-protocol-filter)
+		_command_args=('--classname' '--protocol' '--target')
+	;;
+	create-protocol-finder)
+		_command_args=('--classname' '--protocol' '--target' '--targetprotocol')
+	;;
+	create-resource-adapter-config)
+		_command_args=('--objecttype' '--property' '--target' '--threadpoolid')
+	;;
+	create-resource-ref)
+		_command_args=('--enabled' '--target')
+	;;
+	create-service)
+		_command_args=('--domaindir' '--dry-run' '--force' '--name' '--node' '--nodedir' '--serviceproperties' '--serviceuser')
+	;;
+	create-ssl)
+		_command_args=('--certname' '--clientauthenabled' '--ssl2ciphers' '--ssl2enabled' '--ssl3enabled' '--ssl3tlsciphers' '--target' '--tlsenabled' '--tlsrollbackenabled' '--type')
+	;;
+	create-system-properties)
+		_command_args=('--target')
+	;;
+	create-threadpool)
+		_command_args=('--idletimeout' '--maxqueuesize' '--maxthreadpoolsize' '--minthreadpoolsize' '--target' '--workqueues')
+	;;
+	create-transport)
+		_command_args=('--acceptorthreads' '--buffersizebytes' '--bytebuffertype' '--classname' '--displayconfiguration' '--enablesnoop' '--idlekeytimeoutseconds' '--maxconnectionscount' '--readtimeoutmillis' '--selectionkeyhandler' '--selectorpolltimeoutmillis' '--target' '--tcpnodelay' '--writetimeoutmillis')
+	;;
+	create-virtual-server)
+		_command_args=('--defaultwebmodule' '--hosts' '--httplisteners' '--logfile' '--networklisteners' '--property' '--state' '--target')
+	;;
+	delete-admin-object)
+		_command_args=('--target')
+	;;
+	delete-application-ref)
+		_command_args=('--cascade' '--target')
+	;;
+	delete-audit-module)
+		_command_args=('--target')
+	;;
+	delete-auth-realm)
+		_command_args=('--target')
+	;;
+	delete-connector-connection-pool)
+		_command_args=('--cascade' '--target')
+	;;
+	delete-connector-resource)
+		_command_args=('--target')
+	;;
+	delete-connector-security-map)
+		_command_args=('--poolname' '--target')
+	;;
+	delete-connector-work-security-map)
+		_command_args=('--raname')
+	;;
+	delete-custom-resource)
+		_command_args=('--target')
+	;;
+	delete-domain)
+		_command_args=('--domaindir')
+	;;
+	delete-file-user)
+		_command_args=('--authrealmname' '--target')
+	;;
+	delete-http)
+		_command_args=('--target')
+	;;
+	delete-http-health-checker)
+		_command_args=('--config')
+	;;
+	delete-http-lb-ref)
+		_command_args=('--config' '--force' '--lbname')
+	;;
+	delete-http-listener)
+		_command_args=('--secure' '--target')
+	;;
+	delete-http-redirect)
+		_command_args=('--target')
+	;;
+	delete-iiop-listener)
+		_command_args=('--target')
+	;;
+	delete-instance)
+		_command_args=('--terse')
+	;;
+	delete-jacc-provider)
+		_command_args=('--target')
+	;;
+	delete-javamail-resource)
+		_command_args=('--target')
+	;;
+	delete-jdbc-connection-pool)
+		_command_args=('--cascade' '--target')
+	;;
+	delete-jdbc-resource)
+		_command_args=('--target')
+	;;
+	delete-jms-host)
+		_command_args=('--target')
+	;;
+	delete-jms-resource)
+		_command_args=('--target')
+	;;
+	delete-jmsdest)
+		_command_args=('--desttype' '--target')
+	;;
+	delete-jndi-resource)
+		_command_args=('--target')
+	;;
+	delete-jvm-options)
+		_command_args=('--profiler' '--target')
+	;;
+	delete-lifecycle-module)
+		_command_args=('--target')
+	;;
+	delete-local-instance)
+		_command_args=('--node' '--nodedir')
+	;;
+	delete-log-levels)
+		_command_args=('--target')
+	;;
+	delete-message-security-provider)
+		_command_args=('--layer' '--target')
+	;;
+	delete-network-listener)
+		_command_args=('--target')
+	;;
+	delete-profiler)
+		_command_args=('--target')
+	;;
+	delete-protocol)
+		_command_args=('--target')
+	;;
+	delete-protocol-filter)
+		_command_args=('--protocol' '--target')
+	;;
+	delete-protocol-finder)
+		_command_args=('--protocol' '--target')
+	;;
+	delete-resource-adapter-config)
+		_command_args=('--target')
+	;;
+	delete-resource-ref)
+		_command_args=('--target')
+	;;
+	delete-ssl)
+		_command_args=('--target' '--type')
+	;;
+	delete-system-property)
+		_command_args=('--target')
+	;;
+	delete-threadpool)
+		_command_args=('--target')
+	;;
+	delete-transport)
+		_command_args=('--target')
+	;;
+	delete-virtual-server)
+		_command_args=('--target')
+	;;
+	deploy)
+		_command_args=('--asyncreplication' '--availabilityenabled' '--contextroot' '--createtables' '--dbvendorname' '--deploymentplan' '--description' '--dropandcreatetables' '--enabled' '--force' '--generatermistubs' '--isredeploy' '--keepfailedstubs' '--keepreposdir' '--keepstate' '--lbenabled' '--libraries' '--logreportederrors' '--name' '--precompilejsp' '--properties' '--property' '--retrieve' '--target' '--type' '--uniquetablenames' '--verify' '--virtualservers')
+	;;
+	deploydir)
+		_command_args=('--asyncreplication' '--availabilityenabled' '--contextroot' '--createtables' '--dbvendorname' '--deploymentplan' '--description' '--dropandcreatetables' '--enabled' '--force' '--generatermistubs' '--isredeploy' '--keepfailedstubs' '--keepreposdir' '--keepstate' '--lbenabled' '--libraries' '--logreportederrors' '--name' '--precompilejsp' '--properties' '--property' '--retrieve' '--target' '--type' '--uniquetablenames' '--verify' '--virtualservers')
+	;;
+	disable)
+		_command_args=('--cascade' '--droptables' '--isredeploy' '--isundeploy' '--keepreposdir' '--keepstate' '--properties' '--target')
+	;;
+	disable-http-lb-application)
+		_command_args=('--name' '--timeout')
+	;;
+	disable-http-lb-server)
+		_command_args=('--timeout')
+	;;
+	disable-monitoring)
+		_command_args=('--modules' '--target')
+	;;
+	enable)
+		_command_args=('--target')
+	;;
+	enable-http-lb-application)
+		_command_args=('--name')
+	;;
+	enable-monitoring)
+		_command_args=('--dtrace' '--mbean' '--modules' '--options' '--pid' '--target')
+	;;
+	enable-secure-admin)
+		_command_args=('--adminalias' '--instancealias')
+	;;
+	export-http-lb-config)
+		_command_args=('--config' '--lbname' '--lbtargets' '--property' '--retrievefile')
+	;;
+	export-sync-bundle)
+		_command_args=('--retrieve' '--target')
+	;;
+	flush-connection-pool)
+		_command_args=('--appname' '--modulename')
+	;;
+	flush-jmsdest)
+		_command_args=('--desttype' '--target')
+	;;
+	freeze-transaction-service)
+		_command_args=('--target')
+	;;
+	generate-domain-schema)
+		_command_args=('--format' '--showdeprecated' '--showsubclasses')
+	;;
+	generate-jvm-report)
+		_command_args=('--target' '--type')
+	;;
+	get)
+		_command_args=('--monitor')
+	;;
+	get-client-stubs)
+		_command_args=('--appname')
+	;;
+	import-sync-bundle)
+		_command_args=('--instance' '--node' '--nodedir')
+	;;
+	install-node-dcom)
+		_command_args=('--archive' '--create' '--force' '--installdir' '--save' '--windowsdomain' '--windowsuser')
+	;;
+	install-node-ssh)
+		_command_args=('--archive' '--create' '--force' '--installdir' '--save' '--sshkeyfile' '--sshport' '--sshuser')
+	;;
+	jms-ping)
+		_command_args=('--target')
+	;;
+	list)
+		_command_args=('--monitor')
+	;;
+	list-application-refs)
+		_command_args=('--long' '--terse')
+	;;
+	list-backups)
+		_command_args=('--backupconfig' '--backupdir' '--domaindir' '--long')
+	;;
+	list-commands)
+		_command_args=('--localonly' '--remoteonly')
+	;;
+	list-components)
+		_command_args=('--long' '--resources' '--subcomponents' '--terse' '--type')
+	;;
+	list-connector-security-maps)
+		_command_args=('--long' '--securitymap' '--target')
+	;;
+	list-connector-work-security-maps)
+		_command_args=('--securitymap')
+	;;
+	list-custom-resources)
+		_command_args=('--target')
+	;;
+	list-domains)
+		_command_args=('--domaindir')
+	;;
+	list-file-groups)
+		_command_args=('--authrealmname' '--name')
+	;;
+	list-file-users)
+		_command_args=('--authrealmname')
+	;;
+	list-http-listeners)
+		_command_args=('--long')
+	;;
+	list-instances)
+		_command_args=('--long' '--nostatus' '--standaloneonly' '--timeoutmsec')
+	;;
+	list-javamail-resources)
+		_command_args=('--target')
+	;;
+	list-jms-hosts)
+		_command_args=('--target')
+	;;
+	list-jms-resources)
+		_command_args=('--restype')
+	;;
+	list-jmsdest)
+		_command_args=('--desttype' '--property')
+	;;
+	list-jndi-entries)
+		_command_args=('--context')
+	;;
+	list-jndi-resources)
+		_command_args=('--target')
+	;;
+	list-jvm-options)
+		_command_args=('--profiler' '--target')
+	;;
+	list-libraries)
+		_command_args=('--type')
+	;;
+	list-lifecycle-modules)
+		_command_args=('--terse')
+	;;
+	list-message-security-providers)
+		_command_args=('--layer')
+	;;
+	list-nodes)
+		_command_args=('--long' '--terse')
+	;;
+	list-nodes-config)
+		_command_args=('--long' '--terse')
+	;;
+	list-nodes-dcom)
+		_command_args=('--long' '--terse')
+	;;
+	list-nodes-ssh)
+		_command_args=('--long' '--terse')
+	;;
+	list-persistence-types)
+		_command_args=('--type')
+	;;
+	list-protocol-filters)
+		_command_args=('--target')
+	;;
+	list-protocol-finders)
+		_command_args=('--target')
+	;;
+	list-resource-adapter-configs)
+		_command_args=('--long' '--raname')
+	;;
+	list-sub-components)
+		_command_args=('--appname' '--resources' '--terse' '--type')
+	;;
+	list-virtual-servers)
+		_command_args=('--target')
+	;;
+	list-web-context-param)
+		_command_args=('--name')
+	;;
+	list-web-env-entry)
+		_command_args=('--name')
+	;;
+	login)
+		_command_args=('--target')
+	;;
+	migrate-timers)
+		_command_args=('--target')
+	;;
+	monitor)
+		_command_args=('--filename' '--filter' '--interval' '--type')
+	;;
+	multimode)
+		_command_args=('--encoding' '--file' '--printprompt')
+	;;
+	ping-connection-pool)
+		_command_args=('--appname' '--modulename' '--target')
+	;;
+	recover-transactions)
+		_command_args=('--target' '--transactionlogdir')
+	;;
+	redeploy)
+		_command_args=('--asyncreplication' '--availabilityenabled' '--contextroot' '--createtables' '--dbvendorname' '--deploymentplan' '--description' '--dropandcreatetables' '--enabled' '--force' '--generatermistubs' '--isredeploy' '--keepfailedstubs' '--keepreposdir' '--keepstate' '--lbenabled' '--libraries' '--logreportederrors' '--name' '--precompilejsp' '--properties' '--property' '--retrieve' '--target' '--type' '--uniquetablenames' '--verify' '--virtualservers')
+	;;
+	remove-library)
+		_command_args=('--type')
+	;;
+	restart-domain)
+		_command_args=('--debug' '--domaindir' '--force' '--kill')
+	;;
+	restart-instance)
+		_command_args=('--debug')
+	;;
+	restart-local-instance)
+		_command_args=('--debug' '--force' '--kill' '--node' '--nodedir')
+	;;
+	restore-domain)
+		_command_args=('--backupconfig' '--backupdir' '--description' '--domaindir' '--filename' '--force' '--long')
+	;;
+	rollback-transaction)
+		_command_args=('--target' '--transaction_id')
+	;;
+	rotate-log)
+		_command_args=('--target')
+	;;
+	set-log-attributes)
+		_command_args=('--target')
+	;;
+	set-log-levels)
+		_command_args=('--target')
+	;;
+	set-web-context-param)
+		_command_args=('--description' '--ignoredescriptoritem' '--name' '--value')
+	;;
+	set-web-env-entry)
+		_command_args=('--description' '--ignoredescriptoritem' '--name' '--type' '--value')
+	;;
+	setup-ssh)
+		_command_args=('--generatekey' '--sshkeyfile' '--sshport' '--sshpublickeyfile' '--sshuser')
+	;;
+	show-component-status)
+		_command_args=('--target')
+	;;
+	start-cluster)
+		_command_args=('--autohadboverride' '--verbose')
+	;;
+	start-database)
+		_command_args=('--dbhome' '--dbhost' '--dbport' '--jvmoptions')
+	;;
+	start-domain)
+		_command_args=('--debug' '--domaindir' '--upgrade' '--verbose')
+	;;
+	start-instance)
+		_command_args=('--debug' '--setenv' '--sync' '--terse')
+	;;
+	start-local-instance)
+		_command_args=('--debug' '--node' '--nodedir' '--sync' '--verbose')
+	;;
+	stop-cluster)
+		_command_args=('--autohadboverride' '--kill' '--verbose')
+	;;
+	stop-database)
+		_command_args=('--dbhost' '--dbport' '--dbuser')
+	;;
+	stop-domain)
+		_command_args=('--domaindir' '--force' '--kill')
+	;;
+	stop-instance)
+		_command_args=('--force' '--kill')
+	;;
+	stop-local-instance)
+		_command_args=('--force' '--kill' '--node' '--nodedir')
+	;;
+	undeploy)
+		_command_args=('--cascade' '--droptables' '--isredeploy' '--keepreposdir' '--keepstate' '--properties' '--target')
+	;;
+	unfreeze-transaction-service)
+		_command_args=('--target')
+	;;
+	uninstall-node-dcom)
+		_command_args=('--force' '--installdir' '--windowsdomain' '--windowsuser')
+	;;
+	uninstall-node-ssh)
+		_command_args=('--force' '--installdir' '--sshkeyfile' '--sshport' '--sshuser')
+	;;
+	unset-web-context-param)
+		_command_args=('--name')
+	;;
+	unset-web-env-entry)
+		_command_args=('--name')
+	;;
+	update-connector-security-map)
+		_command_args=('--addprincipals' '--addusergroups' '--mappedpassword' '--mappedusername' '--poolname' '--removeprincipals' '--removeusergroups' '--target')
+	;;
+	update-connector-work-security-map)
+		_command_args=('--addgroups' '--addprincipals' '--raname' '--removegroups' '--removeprincipals')
+	;;
+	update-file-user)
+		_command_args=('--authrealmname' '--groups' '--target' '--userpassword')
+	;;
+	update-node-config)
+		_command_args=('--installdir' '--nodedir' '--nodehost')
+	;;
+	update-node-dcom)
+		_command_args=('--force' '--installdir' '--nodedir' '--nodehost' '--windowsdomain' '--windowspassword' '--windowsuser')
+	;;
+	update-node-ssh)
+		_command_args=('--force' '--installdir' '--nodedir' '--nodehost' '--sshkeyfile' '--sshkeypassphrase' '--sshpassword' '--sshport' '--sshuser')
+	;;
+	update-password-alias)
+		_command_args=('--aliaspassword')
+	;;
+	uptime)
+		_command_args=('--milliseconds')
+	;;
+	validate-dcom)
+		_command_args=('--remotetestdir' '--verbose' '--windowsdomain' '--windowspassword' '--windowsuser')
+	;;
+	validate-multicast)
+		_command_args=('--bindaddress' '--multicastaddress' '--multicastport' '--sendperiod' '--timeout' '--timetolive' '--verbose')
+	;;
+	verify-domain-xml)
+		_command_args=('--domaindir')
+	;;
+	version)
+		_command_args=('--local' '--terse' '--verbose')
+	;;
 esac
 
 _arguments \

From f644d2eb6f6554de9f00c56b6356c306ce4c2c9f Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Thu, 12 Jul 2012 14:17:59 +0200
Subject: [PATCH 329/364] added alias

---
 plugins/glassfish/_glassfish           | 1 -
 plugins/glassfish/glassfish.plugin.zsh | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)
 delete mode 100644 plugins/glassfish/_glassfish
 create mode 100644 plugins/glassfish/glassfish.plugin.zsh

diff --git a/plugins/glassfish/_glassfish b/plugins/glassfish/_glassfish
deleted file mode 100644
index 8b1378917..000000000
--- a/plugins/glassfish/_glassfish
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/plugins/glassfish/glassfish.plugin.zsh b/plugins/glassfish/glassfish.plugin.zsh
new file mode 100644
index 000000000..49ca23299
--- /dev/null
+++ b/plugins/glassfish/glassfish.plugin.zsh
@@ -0,0 +1,3 @@
+# if there is a user named 'glassfish' on the system, we'll assume
+# that is the user asadmin should be run as
+grep -e '^glassfish' /etc/passwd > /dev/null && alias asadmin='sudo -u glassfish asadmin'
\ No newline at end of file

From 9b4cf96ac0e8a5d7f490a927e40e7931fff2d3c3 Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Fri, 13 Jul 2012 12:08:41 +0200
Subject: [PATCH 330/364] completion options

---
 plugins/glassfish/_asadmin | 418 ++++++++++++++++++-------------------
 1 file changed, 209 insertions(+), 209 deletions(-)

diff --git a/plugins/glassfish/_asadmin b/plugins/glassfish/_asadmin
index 08ae9d461..f0ebea9f2 100644
--- a/plugins/glassfish/_asadmin
+++ b/plugins/glassfish/_asadmin
@@ -272,635 +272,635 @@ _1st_arguments=(
 _arguments '*:: :->command'
 
 if (( CURRENT == 1 )); then
-    _describe -t commands "glassfish command" _1st_arguments
+    _describe -t commands "asadmin command" _1st_arguments
     return
 fi
 
 local -a _command_args
 case "$words[1]" in
 	add-library)
-		_command_args=('--type')
+		_command_args=('--type+:type:(common ext app)')
 	;;
 	add-resources)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	apply-http-lb-changes)
-		_command_args=('--ping')
+		_command_args=('--ping+:')
 	;;
 	backup-domain)
-		_command_args=('--backupconfig' '--backupdir' '--description' '--domaindir' '--long')
+		_command_args=('--backupconfig+:' '--backupdir+:' '--description+:' '--domaindir+:' '--long+:long:(true false)')
 	;;
 	change-admin-password)
-		_command_args=('--domain_name' '--domaindir')
+		_command_args=('--domain_name+:' '--domaindir+:')
 	;;
 	change-master-password)
-		_command_args=('--domaindir' '--nodedir' '--savemasterpassword')
+		_command_args=('--domaindir+:' '--nodedir+:' '--savemasterpassword+:savemasterpassword:(true false)')
 	;;
 	collect-log-files)
-		_command_args=('--retrieve' '--target')
+		_command_args=('--retrieve+:retrieve:(true false)' '--target+:')
 	;;
 	configure-jms-cluster)
-		_command_args=('--clustertype' '--configstoretype' '--dburl' '--dbuser' '--dbvendor' '--jmsdbpassword' '--messagestoretype' '--property')
+		_command_args=('--clustertype+:' '--configstoretype+:' '--dburl+:' '--dbuser+:' '--dbvendor+:' '--jmsdbpassword+:' '--messagestoretype+:' '--property+:')
 	;;
 	configure-lb-weight)
-		_command_args=('--cluster')
+		_command_args=('--cluster+:')
 	;;
 	configure-ldap-for-admin)
-		_command_args=('--basedn' '--ldap-group' '--target' '--url')
+		_command_args=('--basedn+:' '--ldap-group+:' '--target+:' '--url+:')
 	;;
 	copy-config)
-		_command_args=('--systemproperties')
+		_command_args=('--systemproperties+:')
 	;;
 	create-admin-object)
-		_command_args=('--classname' '--description' '--enabled' '--property' '--raname' '--restype' '--target')
+		_command_args=('--classname+:' '--description+:' '--enabled+:enabled:(true false)' '--property+:' '--raname+:' '--restype+:' '--target+:')
 	;;
 	create-application-ref)
-		_command_args=('--enabled' '--lbenabled' '--target' '--virtualservers')
+		_command_args=('--enabled+:enabled:(true false)' '--lbenabled+:lbenabled:(true false)' '--target+:' '--virtualservers+:')
 	;;
 	create-audit-module)
-		_command_args=('--classname' '--property' '--target')
+		_command_args=('--classname+:' '--property+:' '--target+:')
 	;;
 	create-auth-realm)
-		_command_args=('--classname' '--property' '--target')
+		_command_args=('--classname+:' '--property+:' '--target+:')
 	;;
 	create-connector-connection-pool)
-		_command_args=('--associatewiththread' '--connectiondefinition' '--creationretryattempts' '--creationretryinterval' '--description' '--failconnection' '--idletimeout' '--isconnectvalidatereq' '--lazyconnectionassociation' '--lazyconnectionenlistment' '--leakreclaim' '--leaktimeout' '--matchconnections' '--maxconnectionusagecount' '--maxpoolsize' '--maxwait' '--ping' '--pooling' '--poolresize' '--property' '--raname' '--steadypoolsize' '--target' '--transactionsupport' '--validateatmostonceperiod')
+		_command_args=('--associatewiththread+:associatewiththread:(true false)' '--connectiondefinition+:' '--creationretryattempts+:' '--creationretryinterval+:' '--description+:' '--failconnection+:failconnection:(true false)' '--idletimeout+:' '--isconnectvalidatereq+:isconnectvalidatereq:(true false)' '--lazyconnectionassociation+:lazyconnectionassociation:(true false)' '--lazyconnectionenlistment+:lazyconnectionenlistment:(true false)' '--leakreclaim+:leakreclaim:(true false)' '--leaktimeout+:' '--matchconnections+:matchconnections:(true false)' '--maxconnectionusagecount+:' '--maxpoolsize+:' '--maxwait+:' '--ping+:ping:(true false)' '--pooling+:pooling:(true false)' '--poolresize+:' '--property+:' '--raname+:' '--steadypoolsize+:' '--target+:' '--transactionsupport+:transactionsupport:(XATransaction LocalTransaction NoTransaction)' '--validateatmostonceperiod+:')
 	;;
 	create-connector-resource)
-		_command_args=('--description' '--enabled' '--objecttype' '--poolname' '--property' '--target')
+		_command_args=('--description+:' '--enabled+:enabled:(true false)' '--objecttype+:' '--poolname+:' '--property+:' '--target+:')
 	;;
 	create-connector-security-map)
-		_command_args=('--mappedpassword' '--mappedusername' '--poolname' '--principals' '--target' '--usergroups')
+		_command_args=('--mappedpassword+:' '--mappedusername+:' '--poolname+:' '--principals+:' '--target+:' '--usergroups+:')
 	;;
 	create-connector-work-security-map)
-		_command_args=('--description' '--groupsmap' '--principalsmap' '--raname')
+		_command_args=('--description+:' '--groupsmap+:' '--principalsmap+:' '--raname+:')
 	;;
 	create-custom-resource)
-		_command_args=('--description' '--enabled' '--factoryclass' '--property' '--restype' '--target')
+		_command_args=('--description+:' '--enabled+:enabled:(true false)' '--factoryclass+:' '--property+:' '--restype+:' '--target+:')
 	;;
 	create-domain)
-		_command_args=('--adminport' '--checkports' '--domaindir' '--domainproperties' '--instanceport' '--keytooloptions' '--nopassword' '--portbase' '--profile' '--savelogin' '--savemasterpassword' '--template' '--usemasterpassword')
+		_command_args=('--adminport+:' '--checkports+:checkports:(true false)' '--domaindir+:' '--domainproperties+:' '--instanceport+:' '--keytooloptions+:' '--nopassword+:nopassword:(true false)' '--portbase+:' '--profile+:' '--savelogin+:savelogin:(true false)' '--savemasterpassword+:savemasterpassword:(true false)' '--template+:' '--usemasterpassword+:usemasterpassword:(true false)')
 	;;
 	create-file-user)
-		_command_args=('--authrealmname' '--groups' '--target' '--userpassword')
+		_command_args=('--authrealmname+:' '--groups+:' '--target+:' '--userpassword+:')
 	;;
 	create-http)
-		_command_args=('--default-virtual-server' '--dns-lookup-enabled' '--max-connection' '--request-timeout-seconds' '--servername' '--target' '--timeout-seconds' '--xpowered')
+		_command_args=('--default-virtual-server+:' '--dns-lookup-enabled+:dns-lookup-enabled:(true false)' '--max-connection+:' '--request-timeout-seconds+:' '--servername+:' '--target+:' '--timeout-seconds+:' '--xpowered+:xpowered:(true false)')
 	;;
 	create-http-health-checker)
-		_command_args=('--config' '--interval' '--timeout' '--url')
+		_command_args=('--config+:' '--interval+:' '--timeout+:' '--url+:')
 	;;
 	create-http-lb)
-		_command_args=('--autoapplyenabled' '--devicehost' '--deviceport' '--healthcheckerinterval' '--healthcheckertimeout' '--healthcheckerurl' '--httpsrouting' '--lbenableallapplications' '--lbenableallinstances' '--lbpolicy' '--lbpolicymodule' '--lbweight' '--monitor' '--property' '--reloadinterval' '--responsetimeout' '--routecookie' '--sslproxyhost' '--sslproxyport' '--target')
+		_command_args=('--autoapplyenabled+:autoapplyenabled:(true false)' '--devicehost+:' '--deviceport+:' '--healthcheckerinterval+:' '--healthcheckertimeout+:' '--healthcheckerurl+:' '--httpsrouting+:httpsrouting:(true false)' '--lbenableallapplications+:' '--lbenableallinstances+:' '--lbpolicy+:' '--lbpolicymodule+:' '--lbweight+:' '--monitor+:monitor:(true false)' '--property+:' '--reloadinterval+:' '--responsetimeout+:' '--routecookie+:routecookie:(true false)' '--sslproxyhost+:' '--sslproxyport+:' '--target+:')
 	;;
 	create-http-lb-ref)
-		_command_args=('--config' '--healthcheckerinterval' '--healthcheckertimeout' '--healthcheckerurl' '--lbenableallapplications' '--lbenableallinstances' '--lbname' '--lbpolicy' '--lbpolicymodule' '--lbweight')
+		_command_args=('--config+:' '--healthcheckerinterval+:' '--healthcheckertimeout+:' '--healthcheckerurl+:' '--lbenableallapplications+:' '--lbenableallinstances+:' '--lbname+:' '--lbpolicy+:' '--lbpolicymodule+:' '--lbweight+:')
 	;;
 	create-http-listener)
-		_command_args=('--acceptorthreads' '--default-virtual-server' '--defaultvs' '--enabled' '--listeneraddress' '--listenerport' '--redirectport' '--secure' '--securityenabled' '--servername' '--target' '--xpowered')
+		_command_args=('--acceptorthreads+:' '--default-virtual-server+:' '--defaultvs+:' '--enabled+:enabled:(true false)' '--listeneraddress+:' '--listenerport+:' '--redirectport+:' '--secure+:secure:(true false)' '--securityenabled+:securityenabled:(true false)' '--servername+:' '--target+:' '--xpowered+:xpowered:(true false)')
 	;;
 	create-http-redirect)
-		_command_args=('--redirect-port' '--secure-redirect' '--target')
+		_command_args=('--redirect-port+:' '--secure-redirect+:' '--target+:')
 	;;
 	create-iiop-listener)
-		_command_args=('--enabled' '--iiopport' '--listeneraddress' '--property' '--securityenabled' '--target')
+		_command_args=('--enabled+:enabled:(true false)' '--iiopport+:' '--listeneraddress+:' '--property+:' '--securityenabled+:securityenabled:(true false)' '--target+:')
 	;;
 	create-instance)
-		_command_args=('--checkports' '--cluster' '--config' '--lbenabled' '--node' '--portbase' '--systemproperties' '--terse')
+		_command_args=('--checkports+:checkports:(true false)' '--cluster+:' '--config+:' '--lbenabled+:lbenabled:(true false)' '--node+:' '--portbase+:' '--systemproperties+:' '--terse+:terse:(true false)')
 	;;
 	create-jacc-provider)
-		_command_args=('--policyconfigfactoryclass' '--policyproviderclass' '--property' '--target')
+		_command_args=('--policyconfigfactoryclass+:' '--policyproviderclass+:' '--property+:' '--target+:')
 	;;
 	create-javamail-resource)
-		_command_args=('--debug' '--description' '--enabled' '--fromaddress' '--mailhost' '--mailuser' '--property' '--storeprotocol' '--storeprotocolclass' '--target' '--transprotocol' '--transprotocolclass')
+		_command_args=('--debug+:debug:(true false)' '--description+:' '--enabled+:enabled:(true false)' '--fromaddress+:' '--mailhost+:' '--mailuser+:' '--property+:' '--storeprotocol+:' '--storeprotocolclass+:' '--target+:' '--transprotocol+:' '--transprotocolclass+:')
 	;;
 	create-jdbc-connection-pool)
-		_command_args=('--allownoncomponentcallers' '--associatewiththread' '--creationretryattempts' '--creationretryinterval' '--datasourceclassname' '--description' '--driverclassname' '--failconnection' '--idletimeout' '--initsql' '--isconnectvalidatereq' '--isisolationguaranteed' '--isolationlevel' '--lazyconnectionassociation' '--lazyconnectionenlistment' '--leakreclaim' '--leaktimeout' '--matchconnections' '--maxconnectionusagecount' '--maxpoolsize' '--maxwait' '--nontransactionalconnections' '--ping' '--pooling' '--poolresize' '--property' '--restype' '--sqltracelisteners' '--statementcachesize' '--statementleakreclaim' '--statementleaktimeout' '--statementtimeout' '--steadypoolsize' '--target' '--validateatmostonceperiod' '--validationclassname' '--validationmethod' '--validationtable' '--wrapjdbcobjects')
+		_command_args=('--allownoncomponentcallers+:allownoncomponentcallers:(true false)' '--associatewiththread+:associatewiththread:(true false)' '--creationretryattempts+:' '--creationretryinterval+:' '--datasourceclassname+:' '--description+:' '--driverclassname+:' '--failconnection+:failconnection:(true false)' '--idletimeout+:' '--initsql+:' '--isconnectvalidatereq+:isconnectvalidatereq:(true false)' '--isisolationguaranteed+:isisolationguaranteed:(true false)' '--isolationlevel+:' '--lazyconnectionassociation+:lazyconnectionassociation:(true false)' '--lazyconnectionenlistment+:lazyconnectionenlistment:(true false)' '--leakreclaim+:leakreclaim:(true false)' '--leaktimeout+:' '--matchconnections+:matchconnections:(true false)' '--maxconnectionusagecount+:' '--maxpoolsize+:' '--maxwait+:' '--nontransactionalconnections+:nontransactionalconnections:(true false)' '--ping+:ping:(true false)' '--pooling+:pooling:(true false)' '--poolresize+:' '--property+:' '--restype+:restype:(javax.sql.DataSource javax.sql.XADataSource javax.sql.ConnectionPoolDataSource java.sql.Driver)' '--sqltracelisteners+:' '--statementcachesize+:' '--statementleakreclaim+:statementleakreclaim:(true false)' '--statementleaktimeout+:' '--statementtimeout+:' '--steadypoolsize+:' '--target+:' '--validateatmostonceperiod+:' '--validationclassname+:' '--validationmethod+:validationmethod:(auto-commit meta-data table custom-validation)' '--validationtable+:' '--wrapjdbcobjects+:wrapjdbcobjects:(true false)')
 	;;
 	create-jdbc-resource)
-		_command_args=('--connectionpoolid' '--description' '--enabled' '--property' '--target')
+		_command_args=('--connectionpoolid+:' '--description+:' '--enabled+:enabled:(true false)' '--property+:' '--target+:')
 	;;
 	create-jms-host)
-		_command_args=('--mqhost' '--mqpassword' '--mqport' '--mquser' '--property' '--target')
+		_command_args=('--mqhost+:' '--mqpassword+:' '--mqport+:' '--mquser+:' '--property+:' '--target+:')
 	;;
 	create-jms-resource)
-		_command_args=('--description' '--enabled' '--property' '--restype' '--target')
+		_command_args=('--description+:' '--enabled+:enabled:(true false)' '--property+:' '--restype+:' '--target+:')
 	;;
 	create-jmsdest)
-		_command_args=('--desttype' '--property' '--target')
+		_command_args=('--desttype+:' '--property+:' '--target+:')
 	;;
 	create-jndi-resource)
-		_command_args=('--description' '--enabled' '--factoryclass' '--jndilookupname' '--property' '--restype' '--target')
+		_command_args=('--description+:' '--enabled+:enabled:(true false)' '--factoryclass+:' '--jndilookupname+:' '--property+:' '--restype+:' '--target+:')
 	;;
 	create-jvm-options)
-		_command_args=('--profiler' '--target')
+		_command_args=('--profiler+:profiler:(true false)' '--target+:')
 	;;
 	create-lifecycle-module)
-		_command_args=('--classname' '--classpath' '--description' '--enabled' '--failurefatal' '--loadorder' '--property' '--target')
+		_command_args=('--classname+:' '--classpath+:' '--description+:' '--enabled+:enabled:(true false)' '--failurefatal+:failurefatal:(true false)' '--loadorder+:' '--property+:' '--target+:')
 	;;
 	create-local-instance)
-		_command_args=('--checkports' '--cluster' '--config' '--lbenabled' '--node' '--nodedir' '--portbase' '--savemasterpassword' '--systemproperties' '--usemasterpassword')
+		_command_args=('--checkports+:checkports:(true false)' '--cluster+:' '--config+:' '--lbenabled+:lbenabled:(true false)' '--node+:' '--nodedir+:' '--portbase+:' '--savemasterpassword+:savemasterpassword:(true false)' '--systemproperties+:' '--usemasterpassword+:usemasterpassword:(true false)')
 	;;
 	create-message-security-provider)
-		_command_args=('--classname' '--isdefaultprovider' '--layer' '--property' '--providertype' '--requestauthrecipient' '--requestauthsource' '--responseauthrecipient' '--responseauthsource' '--target')
+		_command_args=('--classname+:' '--isdefaultprovider+:isdefaultprovider:(true false)' '--layer+:layer:(SOAP HttpServlet)' '--property+:' '--providertype+:providertype:(client server client-server)' '--requestauthrecipient+:' '--requestauthsource+:' '--responseauthrecipient+:' '--responseauthsource+:' '--target+:')
 	;;
 	create-network-listener)
-		_command_args=('--address' '--enabled' '--jkenabled' '--listenerport' '--protocol' '--target' '--threadpool' '--transport')
+		_command_args=('--address+:' '--enabled+:enabled:(true false)' '--jkenabled+:jkenabled:(true false)' '--listenerport+:' '--protocol+:' '--target+:' '--threadpool+:' '--transport+:')
 	;;
 	create-node-config)
-		_command_args=('--installdir' '--nodedir' '--nodehost')
+		_command_args=('--installdir+:' '--nodedir+:' '--nodehost+:')
 	;;
 	create-node-dcom)
-		_command_args=('--archive' '--force' '--install' '--installdir' '--nodedir' '--nodehost' '--windowsdomain' '--windowspassword' '--windowsuser')
+		_command_args=('--archive+:' '--force+:force:(true false)' '--install+:install:(true false)' '--installdir+:' '--nodedir+:' '--nodehost+:' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
 	;;
 	create-node-ssh)
-		_command_args=('--archive' '--force' '--install' '--installdir' '--nodedir' '--nodehost' '--sshkeyfile' '--sshkeypassphrase' '--sshpassword' '--sshport' '--sshuser')
+		_command_args=('--archive+:' '--force+:force:(true false)' '--install+:install:(true false)' '--installdir+:' '--nodedir+:' '--nodehost+:' '--sshkeyfile+:' '--sshkeypassphrase+:' '--sshpassword+:' '--sshport+:' '--sshuser+:')
 	;;
 	create-password-alias)
-		_command_args=('--aliaspassword')
+		_command_args=('--aliaspassword+:')
 	;;
 	create-profiler)
-		_command_args=('--classpath' '--enabled' '--nativelibrarypath' '--property' '--target')
+		_command_args=('--classpath+:' '--enabled+:enabled:(true false)' '--nativelibrarypath+:' '--property+:' '--target+:')
 	;;
 	create-protocol)
-		_command_args=('--securityenabled' '--target')
+		_command_args=('--securityenabled+:securityenabled:(true false)' '--target+:')
 	;;
 	create-protocol-filter)
-		_command_args=('--classname' '--protocol' '--target')
+		_command_args=('--classname+:' '--protocol+:' '--target+:')
 	;;
 	create-protocol-finder)
-		_command_args=('--classname' '--protocol' '--target' '--targetprotocol')
+		_command_args=('--classname+:' '--protocol+:' '--target+:' '--targetprotocol+:')
 	;;
 	create-resource-adapter-config)
-		_command_args=('--objecttype' '--property' '--target' '--threadpoolid')
+		_command_args=('--objecttype+:' '--property+:' '--target+:' '--threadpoolid+:')
 	;;
 	create-resource-ref)
-		_command_args=('--enabled' '--target')
+		_command_args=('--enabled+:enabled:(true false)' '--target+:')
 	;;
 	create-service)
-		_command_args=('--domaindir' '--dry-run' '--force' '--name' '--node' '--nodedir' '--serviceproperties' '--serviceuser')
+		_command_args=('--domaindir+:' '--dry-run+:dry-run:(true false)' '--force+:force:(true false)' '--name+:' '--node+:' '--nodedir+:' '--serviceproperties+:' '--serviceuser+:')
 	;;
 	create-ssl)
-		_command_args=('--certname' '--clientauthenabled' '--ssl2ciphers' '--ssl2enabled' '--ssl3enabled' '--ssl3tlsciphers' '--target' '--tlsenabled' '--tlsrollbackenabled' '--type')
+		_command_args=('--certname+:' '--clientauthenabled+:clientauthenabled:(true false)' '--ssl2ciphers+:' '--ssl2enabled+:ssl2enabled:(true false)' '--ssl3enabled+:ssl3enabled:(true false)' '--ssl3tlsciphers+:' '--target+:' '--tlsenabled+:tlsenabled:(true false)' '--tlsrollbackenabled+:tlsrollbackenabled:(true false)' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
 	;;
 	create-system-properties)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	create-threadpool)
-		_command_args=('--idletimeout' '--maxqueuesize' '--maxthreadpoolsize' '--minthreadpoolsize' '--target' '--workqueues')
+		_command_args=('--idletimeout+:' '--maxqueuesize+:' '--maxthreadpoolsize+:' '--minthreadpoolsize+:' '--target+:' '--workqueues+:')
 	;;
 	create-transport)
-		_command_args=('--acceptorthreads' '--buffersizebytes' '--bytebuffertype' '--classname' '--displayconfiguration' '--enablesnoop' '--idlekeytimeoutseconds' '--maxconnectionscount' '--readtimeoutmillis' '--selectionkeyhandler' '--selectorpolltimeoutmillis' '--target' '--tcpnodelay' '--writetimeoutmillis')
+		_command_args=('--acceptorthreads+:' '--buffersizebytes+:' '--bytebuffertype+:' '--classname+:' '--displayconfiguration+:displayconfiguration:(true false)' '--enablesnoop+:enablesnoop:(true false)' '--idlekeytimeoutseconds+:' '--maxconnectionscount+:' '--readtimeoutmillis+:' '--selectionkeyhandler+:' '--selectorpolltimeoutmillis+:' '--target+:' '--tcpnodelay+:tcpnodelay:(true false)' '--writetimeoutmillis+:')
 	;;
 	create-virtual-server)
-		_command_args=('--defaultwebmodule' '--hosts' '--httplisteners' '--logfile' '--networklisteners' '--property' '--state' '--target')
+		_command_args=('--defaultwebmodule+:' '--hosts+:' '--httplisteners+:' '--logfile+:' '--networklisteners+:' '--property+:' '--state+:state:(on off disabled)' '--target+:')
 	;;
 	delete-admin-object)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-application-ref)
-		_command_args=('--cascade' '--target')
+		_command_args=('--cascade+:cascade:(true false)' '--target+:')
 	;;
 	delete-audit-module)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-auth-realm)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-connector-connection-pool)
-		_command_args=('--cascade' '--target')
+		_command_args=('--cascade+:cascade:(true false)' '--target+:')
 	;;
 	delete-connector-resource)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-connector-security-map)
-		_command_args=('--poolname' '--target')
+		_command_args=('--poolname+:' '--target+:')
 	;;
 	delete-connector-work-security-map)
-		_command_args=('--raname')
+		_command_args=('--raname+:')
 	;;
 	delete-custom-resource)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-domain)
-		_command_args=('--domaindir')
+		_command_args=('--domaindir+:')
 	;;
 	delete-file-user)
-		_command_args=('--authrealmname' '--target')
+		_command_args=('--authrealmname+:' '--target+:')
 	;;
 	delete-http)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-http-health-checker)
-		_command_args=('--config')
+		_command_args=('--config+:')
 	;;
 	delete-http-lb-ref)
-		_command_args=('--config' '--force' '--lbname')
+		_command_args=('--config+:' '--force+:' '--lbname+:')
 	;;
 	delete-http-listener)
-		_command_args=('--secure' '--target')
+		_command_args=('--secure+:' '--target+:')
 	;;
 	delete-http-redirect)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-iiop-listener)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-instance)
-		_command_args=('--terse')
+		_command_args=('--terse+:terse:(true false)')
 	;;
 	delete-jacc-provider)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-javamail-resource)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-jdbc-connection-pool)
-		_command_args=('--cascade' '--target')
+		_command_args=('--cascade+:cascade:(true false)' '--target+:')
 	;;
 	delete-jdbc-resource)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-jms-host)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-jms-resource)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-jmsdest)
-		_command_args=('--desttype' '--target')
+		_command_args=('--desttype+:' '--target+:')
 	;;
 	delete-jndi-resource)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-jvm-options)
-		_command_args=('--profiler' '--target')
+		_command_args=('--profiler+:profiler:(true false)' '--target+:')
 	;;
 	delete-lifecycle-module)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-local-instance)
-		_command_args=('--node' '--nodedir')
+		_command_args=('--node+:' '--nodedir+:')
 	;;
 	delete-log-levels)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-message-security-provider)
-		_command_args=('--layer' '--target')
+		_command_args=('--layer+:' '--target+:')
 	;;
 	delete-network-listener)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-profiler)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-protocol)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-protocol-filter)
-		_command_args=('--protocol' '--target')
+		_command_args=('--protocol+:' '--target+:')
 	;;
 	delete-protocol-finder)
-		_command_args=('--protocol' '--target')
+		_command_args=('--protocol+:' '--target+:')
 	;;
 	delete-resource-adapter-config)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-resource-ref)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-ssl)
-		_command_args=('--target' '--type')
+		_command_args=('--target+:' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
 	;;
 	delete-system-property)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-threadpool)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-transport)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-virtual-server)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	deploy)
-		_command_args=('--asyncreplication' '--availabilityenabled' '--contextroot' '--createtables' '--dbvendorname' '--deploymentplan' '--description' '--dropandcreatetables' '--enabled' '--force' '--generatermistubs' '--isredeploy' '--keepfailedstubs' '--keepreposdir' '--keepstate' '--lbenabled' '--libraries' '--logreportederrors' '--name' '--precompilejsp' '--properties' '--property' '--retrieve' '--target' '--type' '--uniquetablenames' '--verify' '--virtualservers')
+		_command_args=('--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
 	;;
 	deploydir)
-		_command_args=('--asyncreplication' '--availabilityenabled' '--contextroot' '--createtables' '--dbvendorname' '--deploymentplan' '--description' '--dropandcreatetables' '--enabled' '--force' '--generatermistubs' '--isredeploy' '--keepfailedstubs' '--keepreposdir' '--keepstate' '--lbenabled' '--libraries' '--logreportederrors' '--name' '--precompilejsp' '--properties' '--property' '--retrieve' '--target' '--type' '--uniquetablenames' '--verify' '--virtualservers')
+		_command_args=('--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
 	;;
 	disable)
-		_command_args=('--cascade' '--droptables' '--isredeploy' '--isundeploy' '--keepreposdir' '--keepstate' '--properties' '--target')
+		_command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--isredeploy+:isredeploy:(true false)' '--isundeploy+:isundeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--properties+:' '--target+:')
 	;;
 	disable-http-lb-application)
-		_command_args=('--name' '--timeout')
+		_command_args=('--name+:' '--timeout+:')
 	;;
 	disable-http-lb-server)
-		_command_args=('--timeout')
+		_command_args=('--timeout+:')
 	;;
 	disable-monitoring)
-		_command_args=('--modules' '--target')
+		_command_args=('--modules+:' '--target+:')
 	;;
 	enable)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	enable-http-lb-application)
-		_command_args=('--name')
+		_command_args=('--name+:')
 	;;
 	enable-monitoring)
-		_command_args=('--dtrace' '--mbean' '--modules' '--options' '--pid' '--target')
+		_command_args=('--dtrace+:dtrace:(true false)' '--mbean+:mbean:(true false)' '--modules+:' '--options+:' '--pid+:' '--target+:')
 	;;
 	enable-secure-admin)
-		_command_args=('--adminalias' '--instancealias')
+		_command_args=('--adminalias+:' '--instancealias+:')
 	;;
 	export-http-lb-config)
-		_command_args=('--config' '--lbname' '--lbtargets' '--property' '--retrievefile')
+		_command_args=('--config+:' '--lbname+:' '--lbtargets+:' '--property+:' '--retrievefile+:retrievefile:(true false)')
 	;;
 	export-sync-bundle)
-		_command_args=('--retrieve' '--target')
+		_command_args=('--retrieve+:retrieve:(true false)' '--target+:')
 	;;
 	flush-connection-pool)
-		_command_args=('--appname' '--modulename')
+		_command_args=('--appname+:' '--modulename+:')
 	;;
 	flush-jmsdest)
-		_command_args=('--desttype' '--target')
+		_command_args=('--desttype+:' '--target+:')
 	;;
 	freeze-transaction-service)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	generate-domain-schema)
-		_command_args=('--format' '--showdeprecated' '--showsubclasses')
+		_command_args=('--format+:' '--showdeprecated+:showdeprecated:(true false)' '--showsubclasses+:showsubclasses:(true false)')
 	;;
 	generate-jvm-report)
-		_command_args=('--target' '--type')
+		_command_args=('--target+:' '--type+:type:(summary thread class memory log)')
 	;;
 	get)
-		_command_args=('--monitor')
+		_command_args=('--monitor+:monitor:(true false)')
 	;;
 	get-client-stubs)
-		_command_args=('--appname')
+		_command_args=('--appname+:')
 	;;
 	import-sync-bundle)
-		_command_args=('--instance' '--node' '--nodedir')
+		_command_args=('--instance+:' '--node+:' '--nodedir+:')
 	;;
 	install-node-dcom)
-		_command_args=('--archive' '--create' '--force' '--installdir' '--save' '--windowsdomain' '--windowsuser')
+		_command_args=('--archive+:' '--create+:create:(true false)' '--force+:force:(true false)' '--installdir+:' '--save+:save:(true false)' '--windowsdomain+:' '--windowsuser+:')
 	;;
 	install-node-ssh)
-		_command_args=('--archive' '--create' '--force' '--installdir' '--save' '--sshkeyfile' '--sshport' '--sshuser')
+		_command_args=('--archive+:' '--create+:create:(true false)' '--force+:force:(true false)' '--installdir+:' '--save+:save:(true false)' '--sshkeyfile+:' '--sshport+:' '--sshuser+:')
 	;;
 	jms-ping)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	list)
-		_command_args=('--monitor')
+		_command_args=('--monitor+:monitor:(true false)')
 	;;
 	list-application-refs)
-		_command_args=('--long' '--terse')
+		_command_args=('--long+:long:(true false)' '--terse+:terse:(true false)')
 	;;
 	list-backups)
-		_command_args=('--backupconfig' '--backupdir' '--domaindir' '--long')
+		_command_args=('--backupconfig+:' '--backupdir+:' '--domaindir+:' '--long+:long:(true false)')
 	;;
 	list-commands)
-		_command_args=('--localonly' '--remoteonly')
+		_command_args=('--localonly+:localonly:(true false)' '--remoteonly+:remoteonly:(true false)')
 	;;
 	list-components)
-		_command_args=('--long' '--resources' '--subcomponents' '--terse' '--type')
+		_command_args=('--long+:long:(true false)' '--resources+:resources:(true false)' '--subcomponents+:subcomponents:(true false)' '--terse+:terse:(true false)' '--type+:')
 	;;
 	list-connector-security-maps)
-		_command_args=('--long' '--securitymap' '--target')
+		_command_args=('--long+:long:(true false)' '--securitymap+:' '--target+:')
 	;;
 	list-connector-work-security-maps)
-		_command_args=('--securitymap')
+		_command_args=('--securitymap+:')
 	;;
 	list-custom-resources)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	list-domains)
-		_command_args=('--domaindir')
+		_command_args=('--domaindir+:')
 	;;
 	list-file-groups)
-		_command_args=('--authrealmname' '--name')
+		_command_args=('--authrealmname+:' '--name+:')
 	;;
 	list-file-users)
-		_command_args=('--authrealmname')
+		_command_args=('--authrealmname+:')
 	;;
 	list-http-listeners)
-		_command_args=('--long')
+		_command_args=('--long+:long:(true false)')
 	;;
 	list-instances)
-		_command_args=('--long' '--nostatus' '--standaloneonly' '--timeoutmsec')
+		_command_args=('--long+:long:(true false)' '--nostatus+:nostatus:(true false)' '--standaloneonly+:standaloneonly:(true false)' '--timeoutmsec+:')
 	;;
 	list-javamail-resources)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	list-jms-hosts)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	list-jms-resources)
-		_command_args=('--restype')
+		_command_args=('--restype+:')
 	;;
 	list-jmsdest)
-		_command_args=('--desttype' '--property')
+		_command_args=('--desttype+:' '--property+:')
 	;;
 	list-jndi-entries)
-		_command_args=('--context')
+		_command_args=('--context+:')
 	;;
 	list-jndi-resources)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	list-jvm-options)
-		_command_args=('--profiler' '--target')
+		_command_args=('--profiler+:profiler:(true false)' '--target+:')
 	;;
 	list-libraries)
-		_command_args=('--type')
+		_command_args=('--type+:type:(common ext app)')
 	;;
 	list-lifecycle-modules)
-		_command_args=('--terse')
+		_command_args=('--terse+:terse:(true false)')
 	;;
 	list-message-security-providers)
-		_command_args=('--layer')
+		_command_args=('--layer+:layer:(SOAP HttpServlet)')
 	;;
 	list-nodes)
-		_command_args=('--long' '--terse')
+		_command_args=('--long+:long:(true false)' '--terse+:terse:(true false)')
 	;;
 	list-nodes-config)
-		_command_args=('--long' '--terse')
+		_command_args=('--long+:long:(true false)' '--terse+:terse:(true false)')
 	;;
 	list-nodes-dcom)
-		_command_args=('--long' '--terse')
+		_command_args=('--long+:long:(true false)' '--terse+:terse:(true false)')
 	;;
 	list-nodes-ssh)
-		_command_args=('--long' '--terse')
+		_command_args=('--long+:long:(true false)' '--terse+:terse:(true false)')
 	;;
 	list-persistence-types)
-		_command_args=('--type')
+		_command_args=('--type+:')
 	;;
 	list-protocol-filters)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	list-protocol-finders)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	list-resource-adapter-configs)
-		_command_args=('--long' '--raname')
+		_command_args=('--long+:long:(true false)' '--raname+:')
 	;;
 	list-sub-components)
-		_command_args=('--appname' '--resources' '--terse' '--type')
+		_command_args=('--appname+:' '--resources+:resources:(true false)' '--terse+:terse:(true false)' '--type+:')
 	;;
 	list-virtual-servers)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	list-web-context-param)
-		_command_args=('--name')
+		_command_args=('--name+:')
 	;;
 	list-web-env-entry)
-		_command_args=('--name')
+		_command_args=('--name+:')
 	;;
 	login)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	migrate-timers)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	monitor)
-		_command_args=('--filename' '--filter' '--interval' '--type')
+		_command_args=('--filename+:' '--filter+:' '--interval+:' '--type+:')
 	;;
 	multimode)
-		_command_args=('--encoding' '--file' '--printprompt')
+		_command_args=('--encoding+:' '--file+:' '--printprompt+:printprompt:(true false)')
 	;;
 	ping-connection-pool)
-		_command_args=('--appname' '--modulename' '--target')
+		_command_args=('--appname+:' '--modulename+:' '--target+:')
 	;;
 	recover-transactions)
-		_command_args=('--target' '--transactionlogdir')
+		_command_args=('--target+:' '--transactionlogdir+:')
 	;;
 	redeploy)
-		_command_args=('--asyncreplication' '--availabilityenabled' '--contextroot' '--createtables' '--dbvendorname' '--deploymentplan' '--description' '--dropandcreatetables' '--enabled' '--force' '--generatermistubs' '--isredeploy' '--keepfailedstubs' '--keepreposdir' '--keepstate' '--lbenabled' '--libraries' '--logreportederrors' '--name' '--precompilejsp' '--properties' '--property' '--retrieve' '--target' '--type' '--uniquetablenames' '--verify' '--virtualservers')
+		_command_args=('--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
 	;;
 	remove-library)
-		_command_args=('--type')
+		_command_args=('--type+:type:(common ext app)')
 	;;
 	restart-domain)
-		_command_args=('--debug' '--domaindir' '--force' '--kill')
+		_command_args=('--debug+:debug:(true false)' '--domaindir+:' '--force+:force:(true false)' '--kill+:kill:(true false)')
 	;;
 	restart-instance)
-		_command_args=('--debug')
+		_command_args=('--debug+:')
 	;;
 	restart-local-instance)
-		_command_args=('--debug' '--force' '--kill' '--node' '--nodedir')
+		_command_args=('--debug+:debug:(true false)' '--force+:force:(true false)' '--kill+:kill:(true false)' '--node+:' '--nodedir+:')
 	;;
 	restore-domain)
-		_command_args=('--backupconfig' '--backupdir' '--description' '--domaindir' '--filename' '--force' '--long')
+		_command_args=('--backupconfig+:' '--backupdir+:' '--description+:' '--domaindir+:' '--filename+:' '--force+:force:(true false)' '--long+:long:(true false)')
 	;;
 	rollback-transaction)
-		_command_args=('--target' '--transaction_id')
+		_command_args=('--target+:' '--transaction_id+:')
 	;;
 	rotate-log)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	set-log-attributes)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	set-log-levels)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	set-web-context-param)
-		_command_args=('--description' '--ignoredescriptoritem' '--name' '--value')
+		_command_args=('--description+:' '--ignoredescriptoritem+:ignoredescriptoritem:(true false)' '--name+:' '--value+:')
 	;;
 	set-web-env-entry)
-		_command_args=('--description' '--ignoredescriptoritem' '--name' '--type' '--value')
+		_command_args=('--description+:' '--ignoredescriptoritem+:ignoredescriptoritem:(true false)' '--name+:' '--type+:' '--value+:')
 	;;
 	setup-ssh)
-		_command_args=('--generatekey' '--sshkeyfile' '--sshport' '--sshpublickeyfile' '--sshuser')
+		_command_args=('--generatekey+:generatekey:(true false)' '--sshkeyfile+:' '--sshport+:' '--sshpublickeyfile+:' '--sshuser+:')
 	;;
 	show-component-status)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	start-cluster)
-		_command_args=('--autohadboverride' '--verbose')
+		_command_args=('--autohadboverride+:autohadboverride:(true false)' '--verbose+:verbose:(true false)')
 	;;
 	start-database)
-		_command_args=('--dbhome' '--dbhost' '--dbport' '--jvmoptions')
+		_command_args=('--dbhome+:' '--dbhost+:' '--dbport+:' '--jvmoptions+:')
 	;;
 	start-domain)
-		_command_args=('--debug' '--domaindir' '--upgrade' '--verbose')
+		_command_args=('--debug+:debug:(true false)' '--domaindir+:' '--upgrade+:upgrade:(true false)' '--verbose+:verbose:(true false)')
 	;;
 	start-instance)
-		_command_args=('--debug' '--setenv' '--sync' '--terse')
+		_command_args=('--debug+:debug:(true false)' '--setenv+:' '--sync+:sync:(none normal full)' '--terse+:terse:(true false)')
 	;;
 	start-local-instance)
-		_command_args=('--debug' '--node' '--nodedir' '--sync' '--verbose')
+		_command_args=('--debug+:debug:(true false)' '--node+:' '--nodedir+:' '--sync+:sync:(none normal full)' '--verbose+:verbose:(true false)')
 	;;
 	stop-cluster)
-		_command_args=('--autohadboverride' '--kill' '--verbose')
+		_command_args=('--autohadboverride+:autohadboverride:(true false)' '--kill+:kill:(true false)' '--verbose+:verbose:(true false)')
 	;;
 	stop-database)
-		_command_args=('--dbhost' '--dbport' '--dbuser')
+		_command_args=('--dbhost+:' '--dbport+:' '--dbuser+:')
 	;;
 	stop-domain)
-		_command_args=('--domaindir' '--force' '--kill')
+		_command_args=('--domaindir+:' '--force+:force:(true false)' '--kill+:kill:(true false)')
 	;;
 	stop-instance)
-		_command_args=('--force' '--kill')
+		_command_args=('--force+:force:(true false)' '--kill+:kill:(true false)')
 	;;
 	stop-local-instance)
-		_command_args=('--force' '--kill' '--node' '--nodedir')
+		_command_args=('--force+:force:(true false)' '--kill+:kill:(true false)' '--node+:' '--nodedir+:')
 	;;
 	undeploy)
-		_command_args=('--cascade' '--droptables' '--isredeploy' '--keepreposdir' '--keepstate' '--properties' '--target')
+		_command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--properties+:' '--target+:')
 	;;
 	unfreeze-transaction-service)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	uninstall-node-dcom)
-		_command_args=('--force' '--installdir' '--windowsdomain' '--windowsuser')
+		_command_args=('--force+:force:(true false)' '--installdir+:' '--windowsdomain+:' '--windowsuser+:')
 	;;
 	uninstall-node-ssh)
-		_command_args=('--force' '--installdir' '--sshkeyfile' '--sshport' '--sshuser')
+		_command_args=('--force+:force:(true false)' '--installdir+:' '--sshkeyfile+:' '--sshport+:' '--sshuser+:')
 	;;
 	unset-web-context-param)
-		_command_args=('--name')
+		_command_args=('--name+:')
 	;;
 	unset-web-env-entry)
-		_command_args=('--name')
+		_command_args=('--name+:')
 	;;
 	update-connector-security-map)
-		_command_args=('--addprincipals' '--addusergroups' '--mappedpassword' '--mappedusername' '--poolname' '--removeprincipals' '--removeusergroups' '--target')
+		_command_args=('--addprincipals+:' '--addusergroups+:' '--mappedpassword+:' '--mappedusername+:' '--poolname+:' '--removeprincipals+:' '--removeusergroups+:' '--target+:')
 	;;
 	update-connector-work-security-map)
-		_command_args=('--addgroups' '--addprincipals' '--raname' '--removegroups' '--removeprincipals')
+		_command_args=('--addgroups+:' '--addprincipals+:' '--raname+:' '--removegroups+:' '--removeprincipals+:')
 	;;
 	update-file-user)
-		_command_args=('--authrealmname' '--groups' '--target' '--userpassword')
+		_command_args=('--authrealmname+:' '--groups+:' '--target+:' '--userpassword+:')
 	;;
 	update-node-config)
-		_command_args=('--installdir' '--nodedir' '--nodehost')
+		_command_args=('--installdir+:' '--nodedir+:' '--nodehost+:')
 	;;
 	update-node-dcom)
-		_command_args=('--force' '--installdir' '--nodedir' '--nodehost' '--windowsdomain' '--windowspassword' '--windowsuser')
+		_command_args=('--force+:force:(true false)' '--installdir+:' '--nodedir+:' '--nodehost+:' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
 	;;
 	update-node-ssh)
-		_command_args=('--force' '--installdir' '--nodedir' '--nodehost' '--sshkeyfile' '--sshkeypassphrase' '--sshpassword' '--sshport' '--sshuser')
+		_command_args=('--force+:force:(true false)' '--installdir+:' '--nodedir+:' '--nodehost+:' '--sshkeyfile+:' '--sshkeypassphrase+:' '--sshpassword+:' '--sshport+:' '--sshuser+:')
 	;;
 	update-password-alias)
-		_command_args=('--aliaspassword')
+		_command_args=('--aliaspassword+:')
 	;;
 	uptime)
-		_command_args=('--milliseconds')
+		_command_args=('--milliseconds+:milliseconds:(true false)')
 	;;
 	validate-dcom)
-		_command_args=('--remotetestdir' '--verbose' '--windowsdomain' '--windowspassword' '--windowsuser')
+		_command_args=('--remotetestdir+:' '--verbose+:verbose:(true false)' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
 	;;
 	validate-multicast)
-		_command_args=('--bindaddress' '--multicastaddress' '--multicastport' '--sendperiod' '--timeout' '--timetolive' '--verbose')
+		_command_args=('--bindaddress+:' '--multicastaddress+:' '--multicastport+:' '--sendperiod+:' '--timeout+:' '--timetolive+:' '--verbose+:verbose:(true false)')
 	;;
 	verify-domain-xml)
-		_command_args=('--domaindir')
+		_command_args=('--domaindir+:')
 	;;
 	version)
-		_command_args=('--local' '--terse' '--verbose')
+		_command_args=('--local+:local:(true false)' '--terse+:terse:(true false)' '--verbose+:verbose:(true false)')
 	;;
 esac
 

From 95f83193dab1eab2ea6bfccec6119dc3ac412155 Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Fri, 13 Jul 2012 16:24:45 +0200
Subject: [PATCH 331/364] added _files values for certain options

---
 plugins/glassfish/_asadmin | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/glassfish/_asadmin b/plugins/glassfish/_asadmin
index f0ebea9f2..2ae6064e9 100644
--- a/plugins/glassfish/_asadmin
+++ b/plugins/glassfish/_asadmin
@@ -279,10 +279,10 @@ fi
 local -a _command_args
 case "$words[1]" in
 	add-library)
-		_command_args=('--type+:type:(common ext app)')
+		_command_args=('*:directory:_files' '--type+:type:(common ext app)')
 	;;
 	add-resources)
-		_command_args=('--target+:')
+		_command_args=('*:directory:_files' '--target+:')
 	;;
 	apply-http-lb-changes)
 		_command_args=('--ping+:')
@@ -438,7 +438,7 @@ case "$words[1]" in
 		_command_args=('--enabled+:enabled:(true false)' '--target+:')
 	;;
 	create-service)
-		_command_args=('--domaindir+:' '--dry-run+:dry-run:(true false)' '--force+:force:(true false)' '--name+:' '--node+:' '--nodedir+:' '--serviceproperties+:' '--serviceuser+:')
+		_command_args=('--domaindir+:domaindir:directory:_files' '--dry-run+:dry-run:(true false)' '--force+:force:(true false)' '--name+:' '--node+:' '--nodedir+:' '--serviceproperties+:' '--serviceuser+:')
 	;;
 	create-ssl)
 		_command_args=('--certname+:' '--clientauthenabled+:clientauthenabled:(true false)' '--ssl2ciphers+:' '--ssl2enabled+:ssl2enabled:(true false)' '--ssl3enabled+:ssl3enabled:(true false)' '--ssl3tlsciphers+:' '--target+:' '--tlsenabled+:tlsenabled:(true false)' '--tlsrollbackenabled+:tlsrollbackenabled:(true false)' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
@@ -585,10 +585,10 @@ case "$words[1]" in
 		_command_args=('--target+:')
 	;;
 	deploy)
-		_command_args=('--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
+		_command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
 	;;
 	deploydir)
-		_command_args=('--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
+		_command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
 	;;
 	disable)
 		_command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--isredeploy+:isredeploy:(true false)' '--isundeploy+:isundeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--properties+:' '--target+:')
@@ -765,10 +765,10 @@ case "$words[1]" in
 		_command_args=('--target+:')
 	;;
 	monitor)
-		_command_args=('--filename+:' '--filter+:' '--interval+:' '--type+:')
+		_command_args=('--filename+:filename:directory:_files' '--filter+:' '--interval+:' '--type+:')
 	;;
 	multimode)
-		_command_args=('--encoding+:' '--file+:' '--printprompt+:printprompt:(true false)')
+		_command_args=('--encoding+:' '--file+:file:directory:_files' '--printprompt+:printprompt:(true false)')
 	;;
 	ping-connection-pool)
 		_command_args=('--appname+:' '--modulename+:' '--target+:')
@@ -777,7 +777,7 @@ case "$words[1]" in
 		_command_args=('--target+:' '--transactionlogdir+:')
 	;;
 	redeploy)
-		_command_args=('--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
+		_command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
 	;;
 	remove-library)
 		_command_args=('--type+:type:(common ext app)')

From f88b6bdc5109ba09e45f4c19bc3ea14e51794cae Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Tue, 24 Jul 2012 12:15:36 +0200
Subject: [PATCH 332/364] help command, node completion

---
 plugins/glassfish/_asadmin | 1394 ++++++++++++++++++++----------------
 1 file changed, 769 insertions(+), 625 deletions(-)

diff --git a/plugins/glassfish/_asadmin b/plugins/glassfish/_asadmin
index 2ae6064e9..b29d65d3b 100644
--- a/plugins/glassfish/_asadmin
+++ b/plugins/glassfish/_asadmin
@@ -144,6 +144,7 @@ _1st_arguments=(
     "get:gets the values of configurable or monitorable attributes"
     "get-client-stubs:retrieves the application JAR files needed to launch the application client."
     "get-health:provides information on the cluster health"
+    "help"
     "asadmin:utility for performing administrative tasks for Oracle GlassFish Server"
     "import-sync-bundle:imports the configuration data of a clustered instance or standalone instance from an archive file"
     "install-node:installs GlassFish Server software on specified SSH-enabled hosts"
@@ -278,632 +279,775 @@ fi
 
 local -a _command_args
 case "$words[1]" in
-	add-library)
-		_command_args=('*:directory:_files' '--type+:type:(common ext app)')
-	;;
-	add-resources)
-		_command_args=('*:directory:_files' '--target+:')
-	;;
-	apply-http-lb-changes)
-		_command_args=('--ping+:')
-	;;
-	backup-domain)
-		_command_args=('--backupconfig+:' '--backupdir+:' '--description+:' '--domaindir+:' '--long+:long:(true false)')
-	;;
-	change-admin-password)
-		_command_args=('--domain_name+:' '--domaindir+:')
-	;;
-	change-master-password)
-		_command_args=('--domaindir+:' '--nodedir+:' '--savemasterpassword+:savemasterpassword:(true false)')
-	;;
-	collect-log-files)
-		_command_args=('--retrieve+:retrieve:(true false)' '--target+:')
-	;;
-	configure-jms-cluster)
-		_command_args=('--clustertype+:' '--configstoretype+:' '--dburl+:' '--dbuser+:' '--dbvendor+:' '--jmsdbpassword+:' '--messagestoretype+:' '--property+:')
-	;;
-	configure-lb-weight)
-		_command_args=('--cluster+:')
-	;;
-	configure-ldap-for-admin)
-		_command_args=('--basedn+:' '--ldap-group+:' '--target+:' '--url+:')
-	;;
-	copy-config)
-		_command_args=('--systemproperties+:')
-	;;
-	create-admin-object)
-		_command_args=('--classname+:' '--description+:' '--enabled+:enabled:(true false)' '--property+:' '--raname+:' '--restype+:' '--target+:')
-	;;
-	create-application-ref)
-		_command_args=('--enabled+:enabled:(true false)' '--lbenabled+:lbenabled:(true false)' '--target+:' '--virtualservers+:')
-	;;
-	create-audit-module)
-		_command_args=('--classname+:' '--property+:' '--target+:')
-	;;
-	create-auth-realm)
-		_command_args=('--classname+:' '--property+:' '--target+:')
-	;;
-	create-connector-connection-pool)
-		_command_args=('--associatewiththread+:associatewiththread:(true false)' '--connectiondefinition+:' '--creationretryattempts+:' '--creationretryinterval+:' '--description+:' '--failconnection+:failconnection:(true false)' '--idletimeout+:' '--isconnectvalidatereq+:isconnectvalidatereq:(true false)' '--lazyconnectionassociation+:lazyconnectionassociation:(true false)' '--lazyconnectionenlistment+:lazyconnectionenlistment:(true false)' '--leakreclaim+:leakreclaim:(true false)' '--leaktimeout+:' '--matchconnections+:matchconnections:(true false)' '--maxconnectionusagecount+:' '--maxpoolsize+:' '--maxwait+:' '--ping+:ping:(true false)' '--pooling+:pooling:(true false)' '--poolresize+:' '--property+:' '--raname+:' '--steadypoolsize+:' '--target+:' '--transactionsupport+:transactionsupport:(XATransaction LocalTransaction NoTransaction)' '--validateatmostonceperiod+:')
-	;;
-	create-connector-resource)
-		_command_args=('--description+:' '--enabled+:enabled:(true false)' '--objecttype+:' '--poolname+:' '--property+:' '--target+:')
-	;;
-	create-connector-security-map)
-		_command_args=('--mappedpassword+:' '--mappedusername+:' '--poolname+:' '--principals+:' '--target+:' '--usergroups+:')
-	;;
-	create-connector-work-security-map)
-		_command_args=('--description+:' '--groupsmap+:' '--principalsmap+:' '--raname+:')
-	;;
-	create-custom-resource)
-		_command_args=('--description+:' '--enabled+:enabled:(true false)' '--factoryclass+:' '--property+:' '--restype+:' '--target+:')
-	;;
-	create-domain)
-		_command_args=('--adminport+:' '--checkports+:checkports:(true false)' '--domaindir+:' '--domainproperties+:' '--instanceport+:' '--keytooloptions+:' '--nopassword+:nopassword:(true false)' '--portbase+:' '--profile+:' '--savelogin+:savelogin:(true false)' '--savemasterpassword+:savemasterpassword:(true false)' '--template+:' '--usemasterpassword+:usemasterpassword:(true false)')
-	;;
-	create-file-user)
-		_command_args=('--authrealmname+:' '--groups+:' '--target+:' '--userpassword+:')
-	;;
-	create-http)
-		_command_args=('--default-virtual-server+:' '--dns-lookup-enabled+:dns-lookup-enabled:(true false)' '--max-connection+:' '--request-timeout-seconds+:' '--servername+:' '--target+:' '--timeout-seconds+:' '--xpowered+:xpowered:(true false)')
-	;;
-	create-http-health-checker)
-		_command_args=('--config+:' '--interval+:' '--timeout+:' '--url+:')
-	;;
-	create-http-lb)
-		_command_args=('--autoapplyenabled+:autoapplyenabled:(true false)' '--devicehost+:' '--deviceport+:' '--healthcheckerinterval+:' '--healthcheckertimeout+:' '--healthcheckerurl+:' '--httpsrouting+:httpsrouting:(true false)' '--lbenableallapplications+:' '--lbenableallinstances+:' '--lbpolicy+:' '--lbpolicymodule+:' '--lbweight+:' '--monitor+:monitor:(true false)' '--property+:' '--reloadinterval+:' '--responsetimeout+:' '--routecookie+:routecookie:(true false)' '--sslproxyhost+:' '--sslproxyport+:' '--target+:')
-	;;
-	create-http-lb-ref)
-		_command_args=('--config+:' '--healthcheckerinterval+:' '--healthcheckertimeout+:' '--healthcheckerurl+:' '--lbenableallapplications+:' '--lbenableallinstances+:' '--lbname+:' '--lbpolicy+:' '--lbpolicymodule+:' '--lbweight+:')
-	;;
-	create-http-listener)
-		_command_args=('--acceptorthreads+:' '--default-virtual-server+:' '--defaultvs+:' '--enabled+:enabled:(true false)' '--listeneraddress+:' '--listenerport+:' '--redirectport+:' '--secure+:secure:(true false)' '--securityenabled+:securityenabled:(true false)' '--servername+:' '--target+:' '--xpowered+:xpowered:(true false)')
-	;;
-	create-http-redirect)
-		_command_args=('--redirect-port+:' '--secure-redirect+:' '--target+:')
-	;;
-	create-iiop-listener)
-		_command_args=('--enabled+:enabled:(true false)' '--iiopport+:' '--listeneraddress+:' '--property+:' '--securityenabled+:securityenabled:(true false)' '--target+:')
-	;;
-	create-instance)
-		_command_args=('--checkports+:checkports:(true false)' '--cluster+:' '--config+:' '--lbenabled+:lbenabled:(true false)' '--node+:' '--portbase+:' '--systemproperties+:' '--terse+:terse:(true false)')
-	;;
-	create-jacc-provider)
-		_command_args=('--policyconfigfactoryclass+:' '--policyproviderclass+:' '--property+:' '--target+:')
-	;;
-	create-javamail-resource)
-		_command_args=('--debug+:debug:(true false)' '--description+:' '--enabled+:enabled:(true false)' '--fromaddress+:' '--mailhost+:' '--mailuser+:' '--property+:' '--storeprotocol+:' '--storeprotocolclass+:' '--target+:' '--transprotocol+:' '--transprotocolclass+:')
-	;;
-	create-jdbc-connection-pool)
-		_command_args=('--allownoncomponentcallers+:allownoncomponentcallers:(true false)' '--associatewiththread+:associatewiththread:(true false)' '--creationretryattempts+:' '--creationretryinterval+:' '--datasourceclassname+:' '--description+:' '--driverclassname+:' '--failconnection+:failconnection:(true false)' '--idletimeout+:' '--initsql+:' '--isconnectvalidatereq+:isconnectvalidatereq:(true false)' '--isisolationguaranteed+:isisolationguaranteed:(true false)' '--isolationlevel+:' '--lazyconnectionassociation+:lazyconnectionassociation:(true false)' '--lazyconnectionenlistment+:lazyconnectionenlistment:(true false)' '--leakreclaim+:leakreclaim:(true false)' '--leaktimeout+:' '--matchconnections+:matchconnections:(true false)' '--maxconnectionusagecount+:' '--maxpoolsize+:' '--maxwait+:' '--nontransactionalconnections+:nontransactionalconnections:(true false)' '--ping+:ping:(true false)' '--pooling+:pooling:(true false)' '--poolresize+:' '--property+:' '--restype+:restype:(javax.sql.DataSource javax.sql.XADataSource javax.sql.ConnectionPoolDataSource java.sql.Driver)' '--sqltracelisteners+:' '--statementcachesize+:' '--statementleakreclaim+:statementleakreclaim:(true false)' '--statementleaktimeout+:' '--statementtimeout+:' '--steadypoolsize+:' '--target+:' '--validateatmostonceperiod+:' '--validationclassname+:' '--validationmethod+:validationmethod:(auto-commit meta-data table custom-validation)' '--validationtable+:' '--wrapjdbcobjects+:wrapjdbcobjects:(true false)')
-	;;
-	create-jdbc-resource)
-		_command_args=('--connectionpoolid+:' '--description+:' '--enabled+:enabled:(true false)' '--property+:' '--target+:')
-	;;
-	create-jms-host)
-		_command_args=('--mqhost+:' '--mqpassword+:' '--mqport+:' '--mquser+:' '--property+:' '--target+:')
-	;;
-	create-jms-resource)
-		_command_args=('--description+:' '--enabled+:enabled:(true false)' '--property+:' '--restype+:' '--target+:')
-	;;
-	create-jmsdest)
-		_command_args=('--desttype+:' '--property+:' '--target+:')
-	;;
-	create-jndi-resource)
-		_command_args=('--description+:' '--enabled+:enabled:(true false)' '--factoryclass+:' '--jndilookupname+:' '--property+:' '--restype+:' '--target+:')
-	;;
-	create-jvm-options)
-		_command_args=('--profiler+:profiler:(true false)' '--target+:')
-	;;
-	create-lifecycle-module)
-		_command_args=('--classname+:' '--classpath+:' '--description+:' '--enabled+:enabled:(true false)' '--failurefatal+:failurefatal:(true false)' '--loadorder+:' '--property+:' '--target+:')
-	;;
-	create-local-instance)
-		_command_args=('--checkports+:checkports:(true false)' '--cluster+:' '--config+:' '--lbenabled+:lbenabled:(true false)' '--node+:' '--nodedir+:' '--portbase+:' '--savemasterpassword+:savemasterpassword:(true false)' '--systemproperties+:' '--usemasterpassword+:usemasterpassword:(true false)')
-	;;
-	create-message-security-provider)
-		_command_args=('--classname+:' '--isdefaultprovider+:isdefaultprovider:(true false)' '--layer+:layer:(SOAP HttpServlet)' '--property+:' '--providertype+:providertype:(client server client-server)' '--requestauthrecipient+:' '--requestauthsource+:' '--responseauthrecipient+:' '--responseauthsource+:' '--target+:')
-	;;
-	create-network-listener)
-		_command_args=('--address+:' '--enabled+:enabled:(true false)' '--jkenabled+:jkenabled:(true false)' '--listenerport+:' '--protocol+:' '--target+:' '--threadpool+:' '--transport+:')
-	;;
-	create-node-config)
-		_command_args=('--installdir+:' '--nodedir+:' '--nodehost+:')
-	;;
-	create-node-dcom)
-		_command_args=('--archive+:' '--force+:force:(true false)' '--install+:install:(true false)' '--installdir+:' '--nodedir+:' '--nodehost+:' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
-	;;
-	create-node-ssh)
-		_command_args=('--archive+:' '--force+:force:(true false)' '--install+:install:(true false)' '--installdir+:' '--nodedir+:' '--nodehost+:' '--sshkeyfile+:' '--sshkeypassphrase+:' '--sshpassword+:' '--sshport+:' '--sshuser+:')
-	;;
-	create-password-alias)
-		_command_args=('--aliaspassword+:')
-	;;
-	create-profiler)
-		_command_args=('--classpath+:' '--enabled+:enabled:(true false)' '--nativelibrarypath+:' '--property+:' '--target+:')
-	;;
-	create-protocol)
-		_command_args=('--securityenabled+:securityenabled:(true false)' '--target+:')
-	;;
-	create-protocol-filter)
-		_command_args=('--classname+:' '--protocol+:' '--target+:')
-	;;
-	create-protocol-finder)
-		_command_args=('--classname+:' '--protocol+:' '--target+:' '--targetprotocol+:')
-	;;
-	create-resource-adapter-config)
-		_command_args=('--objecttype+:' '--property+:' '--target+:' '--threadpoolid+:')
-	;;
-	create-resource-ref)
-		_command_args=('--enabled+:enabled:(true false)' '--target+:')
-	;;
-	create-service)
-		_command_args=('--domaindir+:domaindir:directory:_files' '--dry-run+:dry-run:(true false)' '--force+:force:(true false)' '--name+:' '--node+:' '--nodedir+:' '--serviceproperties+:' '--serviceuser+:')
-	;;
-	create-ssl)
-		_command_args=('--certname+:' '--clientauthenabled+:clientauthenabled:(true false)' '--ssl2ciphers+:' '--ssl2enabled+:ssl2enabled:(true false)' '--ssl3enabled+:ssl3enabled:(true false)' '--ssl3tlsciphers+:' '--target+:' '--tlsenabled+:tlsenabled:(true false)' '--tlsrollbackenabled+:tlsrollbackenabled:(true false)' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
-	;;
-	create-system-properties)
-		_command_args=('--target+:')
-	;;
-	create-threadpool)
-		_command_args=('--idletimeout+:' '--maxqueuesize+:' '--maxthreadpoolsize+:' '--minthreadpoolsize+:' '--target+:' '--workqueues+:')
-	;;
-	create-transport)
-		_command_args=('--acceptorthreads+:' '--buffersizebytes+:' '--bytebuffertype+:' '--classname+:' '--displayconfiguration+:displayconfiguration:(true false)' '--enablesnoop+:enablesnoop:(true false)' '--idlekeytimeoutseconds+:' '--maxconnectionscount+:' '--readtimeoutmillis+:' '--selectionkeyhandler+:' '--selectorpolltimeoutmillis+:' '--target+:' '--tcpnodelay+:tcpnodelay:(true false)' '--writetimeoutmillis+:')
-	;;
-	create-virtual-server)
-		_command_args=('--defaultwebmodule+:' '--hosts+:' '--httplisteners+:' '--logfile+:' '--networklisteners+:' '--property+:' '--state+:state:(on off disabled)' '--target+:')
-	;;
-	delete-admin-object)
-		_command_args=('--target+:')
-	;;
-	delete-application-ref)
-		_command_args=('--cascade+:cascade:(true false)' '--target+:')
-	;;
-	delete-audit-module)
-		_command_args=('--target+:')
-	;;
-	delete-auth-realm)
-		_command_args=('--target+:')
-	;;
-	delete-connector-connection-pool)
-		_command_args=('--cascade+:cascade:(true false)' '--target+:')
-	;;
-	delete-connector-resource)
-		_command_args=('--target+:')
-	;;
-	delete-connector-security-map)
-		_command_args=('--poolname+:' '--target+:')
-	;;
-	delete-connector-work-security-map)
-		_command_args=('--raname+:')
-	;;
-	delete-custom-resource)
-		_command_args=('--target+:')
-	;;
-	delete-domain)
-		_command_args=('--domaindir+:')
-	;;
-	delete-file-user)
-		_command_args=('--authrealmname+:' '--target+:')
-	;;
-	delete-http)
-		_command_args=('--target+:')
-	;;
-	delete-http-health-checker)
-		_command_args=('--config+:')
-	;;
-	delete-http-lb-ref)
-		_command_args=('--config+:' '--force+:' '--lbname+:')
-	;;
-	delete-http-listener)
-		_command_args=('--secure+:' '--target+:')
-	;;
-	delete-http-redirect)
-		_command_args=('--target+:')
-	;;
-	delete-iiop-listener)
-		_command_args=('--target+:')
-	;;
-	delete-instance)
-		_command_args=('--terse+:terse:(true false)')
-	;;
-	delete-jacc-provider)
-		_command_args=('--target+:')
-	;;
-	delete-javamail-resource)
-		_command_args=('--target+:')
-	;;
-	delete-jdbc-connection-pool)
-		_command_args=('--cascade+:cascade:(true false)' '--target+:')
-	;;
-	delete-jdbc-resource)
-		_command_args=('--target+:')
-	;;
-	delete-jms-host)
-		_command_args=('--target+:')
-	;;
-	delete-jms-resource)
-		_command_args=('--target+:')
-	;;
-	delete-jmsdest)
-		_command_args=('--desttype+:' '--target+:')
-	;;
-	delete-jndi-resource)
-		_command_args=('--target+:')
-	;;
-	delete-jvm-options)
-		_command_args=('--profiler+:profiler:(true false)' '--target+:')
-	;;
-	delete-lifecycle-module)
-		_command_args=('--target+:')
-	;;
-	delete-local-instance)
-		_command_args=('--node+:' '--nodedir+:')
-	;;
-	delete-log-levels)
-		_command_args=('--target+:')
-	;;
-	delete-message-security-provider)
-		_command_args=('--layer+:' '--target+:')
-	;;
-	delete-network-listener)
-		_command_args=('--target+:')
-	;;
-	delete-profiler)
-		_command_args=('--target+:')
-	;;
-	delete-protocol)
-		_command_args=('--target+:')
-	;;
-	delete-protocol-filter)
-		_command_args=('--protocol+:' '--target+:')
-	;;
-	delete-protocol-finder)
-		_command_args=('--protocol+:' '--target+:')
-	;;
-	delete-resource-adapter-config)
-		_command_args=('--target+:')
-	;;
-	delete-resource-ref)
-		_command_args=('--target+:')
-	;;
-	delete-ssl)
-		_command_args=('--target+:' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
-	;;
-	delete-system-property)
-		_command_args=('--target+:')
-	;;
-	delete-threadpool)
-		_command_args=('--target+:')
-	;;
-	delete-transport)
-		_command_args=('--target+:')
-	;;
-	delete-virtual-server)
-		_command_args=('--target+:')
-	;;
-	deploy)
-		_command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
-	;;
-	deploydir)
-		_command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
-	;;
-	disable)
-		_command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--isredeploy+:isredeploy:(true false)' '--isundeploy+:isundeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--properties+:' '--target+:')
-	;;
-	disable-http-lb-application)
-		_command_args=('--name+:' '--timeout+:')
-	;;
-	disable-http-lb-server)
-		_command_args=('--timeout+:')
-	;;
-	disable-monitoring)
-		_command_args=('--modules+:' '--target+:')
-	;;
-	enable)
-		_command_args=('--target+:')
-	;;
-	enable-http-lb-application)
-		_command_args=('--name+:')
-	;;
-	enable-monitoring)
-		_command_args=('--dtrace+:dtrace:(true false)' '--mbean+:mbean:(true false)' '--modules+:' '--options+:' '--pid+:' '--target+:')
-	;;
-	enable-secure-admin)
-		_command_args=('--adminalias+:' '--instancealias+:')
-	;;
-	export-http-lb-config)
-		_command_args=('--config+:' '--lbname+:' '--lbtargets+:' '--property+:' '--retrievefile+:retrievefile:(true false)')
-	;;
-	export-sync-bundle)
-		_command_args=('--retrieve+:retrieve:(true false)' '--target+:')
-	;;
-	flush-connection-pool)
-		_command_args=('--appname+:' '--modulename+:')
-	;;
-	flush-jmsdest)
-		_command_args=('--desttype+:' '--target+:')
-	;;
-	freeze-transaction-service)
-		_command_args=('--target+:')
-	;;
-	generate-domain-schema)
-		_command_args=('--format+:' '--showdeprecated+:showdeprecated:(true false)' '--showsubclasses+:showsubclasses:(true false)')
-	;;
-	generate-jvm-report)
-		_command_args=('--target+:' '--type+:type:(summary thread class memory log)')
-	;;
-	get)
-		_command_args=('--monitor+:monitor:(true false)')
-	;;
-	get-client-stubs)
-		_command_args=('--appname+:')
-	;;
-	import-sync-bundle)
-		_command_args=('--instance+:' '--node+:' '--nodedir+:')
-	;;
-	install-node-dcom)
-		_command_args=('--archive+:' '--create+:create:(true false)' '--force+:force:(true false)' '--installdir+:' '--save+:save:(true false)' '--windowsdomain+:' '--windowsuser+:')
-	;;
-	install-node-ssh)
-		_command_args=('--archive+:' '--create+:create:(true false)' '--force+:force:(true false)' '--installdir+:' '--save+:save:(true false)' '--sshkeyfile+:' '--sshport+:' '--sshuser+:')
-	;;
-	jms-ping)
-		_command_args=('--target+:')
-	;;
-	list)
-		_command_args=('--monitor+:monitor:(true false)')
-	;;
-	list-application-refs)
-		_command_args=('--long+:long:(true false)' '--terse+:terse:(true false)')
-	;;
-	list-backups)
-		_command_args=('--backupconfig+:' '--backupdir+:' '--domaindir+:' '--long+:long:(true false)')
-	;;
-	list-commands)
-		_command_args=('--localonly+:localonly:(true false)' '--remoteonly+:remoteonly:(true false)')
-	;;
-	list-components)
-		_command_args=('--long+:long:(true false)' '--resources+:resources:(true false)' '--subcomponents+:subcomponents:(true false)' '--terse+:terse:(true false)' '--type+:')
-	;;
-	list-connector-security-maps)
-		_command_args=('--long+:long:(true false)' '--securitymap+:' '--target+:')
-	;;
-	list-connector-work-security-maps)
-		_command_args=('--securitymap+:')
-	;;
-	list-custom-resources)
-		_command_args=('--target+:')
-	;;
-	list-domains)
-		_command_args=('--domaindir+:')
-	;;
-	list-file-groups)
-		_command_args=('--authrealmname+:' '--name+:')
-	;;
-	list-file-users)
-		_command_args=('--authrealmname+:')
-	;;
-	list-http-listeners)
-		_command_args=('--long+:long:(true false)')
-	;;
-	list-instances)
-		_command_args=('--long+:long:(true false)' '--nostatus+:nostatus:(true false)' '--standaloneonly+:standaloneonly:(true false)' '--timeoutmsec+:')
-	;;
-	list-javamail-resources)
-		_command_args=('--target+:')
-	;;
-	list-jms-hosts)
-		_command_args=('--target+:')
-	;;
-	list-jms-resources)
-		_command_args=('--restype+:')
-	;;
-	list-jmsdest)
-		_command_args=('--desttype+:' '--property+:')
-	;;
-	list-jndi-entries)
-		_command_args=('--context+:')
-	;;
-	list-jndi-resources)
-		_command_args=('--target+:')
-	;;
-	list-jvm-options)
-		_command_args=('--profiler+:profiler:(true false)' '--target+:')
-	;;
-	list-libraries)
-		_command_args=('--type+:type:(common ext app)')
-	;;
-	list-lifecycle-modules)
-		_command_args=('--terse+:terse:(true false)')
-	;;
-	list-message-security-providers)
-		_command_args=('--layer+:layer:(SOAP HttpServlet)')
-	;;
-	list-nodes)
-		_command_args=('--long+:long:(true false)' '--terse+:terse:(true false)')
-	;;
-	list-nodes-config)
-		_command_args=('--long+:long:(true false)' '--terse+:terse:(true false)')
-	;;
-	list-nodes-dcom)
-		_command_args=('--long+:long:(true false)' '--terse+:terse:(true false)')
-	;;
-	list-nodes-ssh)
-		_command_args=('--long+:long:(true false)' '--terse+:terse:(true false)')
-	;;
-	list-persistence-types)
-		_command_args=('--type+:')
-	;;
-	list-protocol-filters)
-		_command_args=('--target+:')
-	;;
-	list-protocol-finders)
-		_command_args=('--target+:')
-	;;
-	list-resource-adapter-configs)
-		_command_args=('--long+:long:(true false)' '--raname+:')
-	;;
-	list-sub-components)
-		_command_args=('--appname+:' '--resources+:resources:(true false)' '--terse+:terse:(true false)' '--type+:')
-	;;
-	list-virtual-servers)
-		_command_args=('--target+:')
-	;;
-	list-web-context-param)
-		_command_args=('--name+:')
-	;;
-	list-web-env-entry)
-		_command_args=('--name+:')
-	;;
-	login)
-		_command_args=('--target+:')
-	;;
-	migrate-timers)
-		_command_args=('--target+:')
-	;;
-	monitor)
-		_command_args=('--filename+:filename:directory:_files' '--filter+:' '--interval+:' '--type+:')
-	;;
-	multimode)
-		_command_args=('--encoding+:' '--file+:file:directory:_files' '--printprompt+:printprompt:(true false)')
-	;;
-	ping-connection-pool)
-		_command_args=('--appname+:' '--modulename+:' '--target+:')
-	;;
-	recover-transactions)
-		_command_args=('--target+:' '--transactionlogdir+:')
-	;;
-	redeploy)
-		_command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
-	;;
-	remove-library)
-		_command_args=('--type+:type:(common ext app)')
-	;;
-	restart-domain)
-		_command_args=('--debug+:debug:(true false)' '--domaindir+:' '--force+:force:(true false)' '--kill+:kill:(true false)')
-	;;
-	restart-instance)
-		_command_args=('--debug+:')
-	;;
-	restart-local-instance)
-		_command_args=('--debug+:debug:(true false)' '--force+:force:(true false)' '--kill+:kill:(true false)' '--node+:' '--nodedir+:')
-	;;
-	restore-domain)
-		_command_args=('--backupconfig+:' '--backupdir+:' '--description+:' '--domaindir+:' '--filename+:' '--force+:force:(true false)' '--long+:long:(true false)')
-	;;
-	rollback-transaction)
-		_command_args=('--target+:' '--transaction_id+:')
-	;;
-	rotate-log)
-		_command_args=('--target+:')
-	;;
-	set-log-attributes)
-		_command_args=('--target+:')
-	;;
-	set-log-levels)
-		_command_args=('--target+:')
-	;;
-	set-web-context-param)
-		_command_args=('--description+:' '--ignoredescriptoritem+:ignoredescriptoritem:(true false)' '--name+:' '--value+:')
-	;;
-	set-web-env-entry)
-		_command_args=('--description+:' '--ignoredescriptoritem+:ignoredescriptoritem:(true false)' '--name+:' '--type+:' '--value+:')
-	;;
-	setup-ssh)
-		_command_args=('--generatekey+:generatekey:(true false)' '--sshkeyfile+:' '--sshport+:' '--sshpublickeyfile+:' '--sshuser+:')
-	;;
-	show-component-status)
-		_command_args=('--target+:')
-	;;
-	start-cluster)
-		_command_args=('--autohadboverride+:autohadboverride:(true false)' '--verbose+:verbose:(true false)')
-	;;
-	start-database)
-		_command_args=('--dbhome+:' '--dbhost+:' '--dbport+:' '--jvmoptions+:')
-	;;
-	start-domain)
-		_command_args=('--debug+:debug:(true false)' '--domaindir+:' '--upgrade+:upgrade:(true false)' '--verbose+:verbose:(true false)')
-	;;
-	start-instance)
-		_command_args=('--debug+:debug:(true false)' '--setenv+:' '--sync+:sync:(none normal full)' '--terse+:terse:(true false)')
-	;;
-	start-local-instance)
-		_command_args=('--debug+:debug:(true false)' '--node+:' '--nodedir+:' '--sync+:sync:(none normal full)' '--verbose+:verbose:(true false)')
-	;;
-	stop-cluster)
-		_command_args=('--autohadboverride+:autohadboverride:(true false)' '--kill+:kill:(true false)' '--verbose+:verbose:(true false)')
-	;;
-	stop-database)
-		_command_args=('--dbhost+:' '--dbport+:' '--dbuser+:')
-	;;
-	stop-domain)
-		_command_args=('--domaindir+:' '--force+:force:(true false)' '--kill+:kill:(true false)')
-	;;
-	stop-instance)
-		_command_args=('--force+:force:(true false)' '--kill+:kill:(true false)')
-	;;
-	stop-local-instance)
-		_command_args=('--force+:force:(true false)' '--kill+:kill:(true false)' '--node+:' '--nodedir+:')
-	;;
-	undeploy)
-		_command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--properties+:' '--target+:')
-	;;
-	unfreeze-transaction-service)
-		_command_args=('--target+:')
-	;;
-	uninstall-node-dcom)
-		_command_args=('--force+:force:(true false)' '--installdir+:' '--windowsdomain+:' '--windowsuser+:')
-	;;
-	uninstall-node-ssh)
-		_command_args=('--force+:force:(true false)' '--installdir+:' '--sshkeyfile+:' '--sshport+:' '--sshuser+:')
-	;;
-	unset-web-context-param)
-		_command_args=('--name+:')
-	;;
-	unset-web-env-entry)
-		_command_args=('--name+:')
-	;;
-	update-connector-security-map)
-		_command_args=('--addprincipals+:' '--addusergroups+:' '--mappedpassword+:' '--mappedusername+:' '--poolname+:' '--removeprincipals+:' '--removeusergroups+:' '--target+:')
-	;;
-	update-connector-work-security-map)
-		_command_args=('--addgroups+:' '--addprincipals+:' '--raname+:' '--removegroups+:' '--removeprincipals+:')
-	;;
-	update-file-user)
-		_command_args=('--authrealmname+:' '--groups+:' '--target+:' '--userpassword+:')
-	;;
-	update-node-config)
-		_command_args=('--installdir+:' '--nodedir+:' '--nodehost+:')
-	;;
-	update-node-dcom)
-		_command_args=('--force+:force:(true false)' '--installdir+:' '--nodedir+:' '--nodehost+:' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
-	;;
-	update-node-ssh)
-		_command_args=('--force+:force:(true false)' '--installdir+:' '--nodedir+:' '--nodehost+:' '--sshkeyfile+:' '--sshkeypassphrase+:' '--sshpassword+:' '--sshport+:' '--sshuser+:')
-	;;
-	update-password-alias)
-		_command_args=('--aliaspassword+:')
-	;;
-	uptime)
-		_command_args=('--milliseconds+:milliseconds:(true false)')
-	;;
-	validate-dcom)
-		_command_args=('--remotetestdir+:' '--verbose+:verbose:(true false)' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
-	;;
-	validate-multicast)
-		_command_args=('--bindaddress+:' '--multicastaddress+:' '--multicastport+:' '--sendperiod+:' '--timeout+:' '--timetolive+:' '--verbose+:verbose:(true false)')
-	;;
-	verify-domain-xml)
-		_command_args=('--domaindir+:')
-	;;
-	version)
-		_command_args=('--local+:local:(true false)' '--terse+:terse:(true false)' '--verbose+:verbose:(true false)')
-	;;
+    add-library)
+        _command_args=('*:directory:_files' '--host+:' '--port+:' '--type+:type:(common ext app)')
+        ;;
+    add-resources)
+        _command_args=('*:directory:_files' '--host+:' '--port+:' '--target+:')
+        ;;
+    apply-http-lb-changes)
+        _command_args=('--host+:' '--ping+:' '--port+:')
+        ;;
+    backup-domain)
+        _command_args=('--backupconfig+:' '--backupdir+:' '--description+:' '--domaindir+:' '--long+:long:(true false)')
+        ;;
+    change-admin-password)
+        _command_args=('--domain_name+:' '--domaindir+:')
+        ;;
+    change-master-broker)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    change-master-password)
+        _command_args=('--domaindir+:' '--nodedir+:' '--savemasterpassword+:savemasterpassword:(true false)')
+        ;;
+    collect-log-files)
+        _command_args=('--host+:' '--port+:' '--retrieve+:retrieve:(true false)' '--target+:')
+        ;;
+    configure-jms-cluster)
+        _command_args=('--clustertype+:' '--configstoretype+:' '--dburl+:' '--dbuser+:' '--dbvendor+:' '--host+:' '--jmsdbpassword+:' '--messagestoretype+:' '--port+:' '--property+:')
+        ;;
+    configure-lb-weight)
+        _command_args=('--cluster+:' '--host+:' '--port+:')
+        ;;
+    configure-ldap-for-admin)
+        _command_args=('--basedn+:' '--host+:' '--ldap-group+:' '--port+:' '--target+:' '--url+:')
+        ;;
+    copy-config)
+        _command_args=('--host+:' '--port+:' '--systemproperties+:')
+        ;;
+    create-admin-object)
+        _command_args=('--classname+:' '--description+:' '--enabled+:enabled:(true false)' '--host+:' '--port+:' '--property+:' '--raname+:' '--restype+:' '--target+:')
+        ;;
+    create-application-ref)
+        _command_args=('--enabled+:enabled:(true false)' '--host+:' '--lbenabled+:lbenabled:(true false)' '--port+:' '--target+:' '--virtualservers+:')
+        ;;
+    create-audit-module)
+        _command_args=('--classname+:' '--host+:' '--port+:' '--property+:' '--target+:')
+        ;;
+    create-auth-realm)
+        _command_args=('--classname+:' '--host+:' '--port+:' '--property+:' '--target+:')
+        ;;
+    create-connector-connection-pool)
+        _command_args=('--associatewiththread+:associatewiththread:(true false)' '--connectiondefinition+:' '--creationretryattempts+:' '--creationretryinterval+:' '--description+:' '--failconnection+:failconnection:(true false)' '--host+:' '--idletimeout+:' '--isconnectvalidatereq+:isconnectvalidatereq:(true false)' '--lazyconnectionassociation+:lazyconnectionassociation:(true false)' '--lazyconnectionenlistment+:lazyconnectionenlistment:(true false)' '--leakreclaim+:leakreclaim:(true false)' '--leaktimeout+:' '--matchconnections+:matchconnections:(true false)' '--maxconnectionusagecount+:' '--maxpoolsize+:' '--maxwait+:' '--ping+:ping:(true false)' '--pooling+:pooling:(true false)' '--poolresize+:' '--port+:' '--property+:' '--raname+:' '--steadypoolsize+:' '--target+:' '--transactionsupport+:transactionsupport:(XATransaction LocalTransaction NoTransaction)' '--validateatmostonceperiod+:')
+        ;;
+    create-connector-resource)
+        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--host+:' '--objecttype+:' '--poolname+:' '--port+:' '--property+:' '--target+:')
+        ;;
+    create-connector-security-map)
+        _command_args=('--host+:' '--mappedpassword+:' '--mappedusername+:' '--poolname+:' '--port+:' '--principals+:' '--target+:' '--usergroups+:')
+        ;;
+    create-connector-work-security-map)
+        _command_args=('--description+:' '--groupsmap+:' '--host+:' '--port+:' '--principalsmap+:' '--raname+:')
+        ;;
+    create-custom-resource)
+        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--factoryclass+:' '--host+:' '--port+:' '--property+:' '--restype+:' '--target+:')
+        ;;
+    create-domain)
+        _command_args=('--adminport+:' '--checkports+:checkports:(true false)' '--domaindir+:' '--domainproperties+:' '--instanceport+:' '--keytooloptions+:' '--nopassword+:nopassword:(true false)' '--portbase+:' '--profile+:' '--savelogin+:savelogin:(true false)' '--savemasterpassword+:savemasterpassword:(true false)' '--template+:' '--usemasterpassword+:usemasterpassword:(true false)')
+        ;;
+    create-file-user)
+        _command_args=('--authrealmname+:' '--groups+:' '--host+:' '--port+:' '--target+:' '--userpassword+:')
+        ;;
+    create-http)
+        _command_args=('--default-virtual-server+:' '--dns-lookup-enabled+:dns-lookup-enabled:(true false)' '--host+:' '--max-connection+:' '--port+:' '--request-timeout-seconds+:' '--servername+:' '--target+:' '--timeout-seconds+:' '--xpowered+:xpowered:(true false)')
+        ;;
+    create-http-health-checker)
+        _command_args=('--config+:' '--host+:' '--interval+:' '--port+:' '--timeout+:' '--url+:')
+        ;;
+    create-http-lb)
+        _command_args=('--autoapplyenabled+:autoapplyenabled:(true false)' '--devicehost+:' '--deviceport+:' '--healthcheckerinterval+:' '--healthcheckertimeout+:' '--healthcheckerurl+:' '--host+:' '--httpsrouting+:httpsrouting:(true false)' '--lbenableallapplications+:' '--lbenableallinstances+:' '--lbpolicy+:' '--lbpolicymodule+:' '--lbweight+:' '--monitor+:monitor:(true false)' '--port+:' '--property+:' '--reloadinterval+:' '--responsetimeout+:' '--routecookie+:routecookie:(true false)' '--sslproxyhost+:' '--sslproxyport+:' '--target+:')
+        ;;
+    create-http-lb-ref)
+        _command_args=('--config+:' '--healthcheckerinterval+:' '--healthcheckertimeout+:' '--healthcheckerurl+:' '--host+:' '--lbenableallapplications+:' '--lbenableallinstances+:' '--lbname+:' '--lbpolicy+:' '--lbpolicymodule+:' '--lbweight+:' '--port+:')
+        ;;
+    create-http-listener)
+        _command_args=('--acceptorthreads+:' '--default-virtual-server+:' '--defaultvs+:' '--enabled+:enabled:(true false)' '--host+:' '--listeneraddress+:' '--listenerport+:' '--port+:' '--redirectport+:' '--secure+:secure:(true false)' '--securityenabled+:securityenabled:(true false)' '--servername+:' '--target+:' '--xpowered+:xpowered:(true false)')
+        ;;
+    create-http-redirect)
+        _command_args=('--host+:' '--port+:' '--redirect-port+:' '--secure-redirect+:' '--target+:')
+        ;;
+    create-iiop-listener)
+        _command_args=('--enabled+:enabled:(true false)' '--host+:' '--iiopport+:' '--listeneraddress+:' '--port+:' '--property+:' '--securityenabled+:securityenabled:(true false)' '--target+:')
+        ;;
+    create-instance)
+        _command_args=('--checkports+:checkports:(true false)' '--cluster+:' '--config+:' '--host+:' '--lbenabled+:lbenabled:(true false)' '--node+:node:_asadmin_nodes' '--port+:' '--portbase+:' '--systemproperties+:' '--terse+:terse:(true false)')
+        ;;
+    create-jacc-provider)
+        _command_args=('--host+:' '--policyconfigfactoryclass+:' '--policyproviderclass+:' '--port+:' '--property+:' '--target+:')
+        ;;
+    create-javamail-resource)
+        _command_args=('--debug+:debug:(true false)' '--description+:' '--enabled+:enabled:(true false)' '--fromaddress+:' '--host+:' '--mailhost+:' '--mailuser+:' '--port+:' '--property+:' '--storeprotocol+:' '--storeprotocolclass+:' '--target+:' '--transprotocol+:' '--transprotocolclass+:')
+        ;;
+    create-jdbc-connection-pool)
+        _command_args=('--allownoncomponentcallers+:allownoncomponentcallers:(true false)' '--associatewiththread+:associatewiththread:(true false)' '--creationretryattempts+:' '--creationretryinterval+:' '--datasourceclassname+:' '--description+:' '--driverclassname+:' '--failconnection+:failconnection:(true false)' '--host+:' '--idletimeout+:' '--initsql+:' '--isconnectvalidatereq+:isconnectvalidatereq:(true false)' '--isisolationguaranteed+:isisolationguaranteed:(true false)' '--isolationlevel+:' '--lazyconnectionassociation+:lazyconnectionassociation:(true false)' '--lazyconnectionenlistment+:lazyconnectionenlistment:(true false)' '--leakreclaim+:leakreclaim:(true false)' '--leaktimeout+:' '--matchconnections+:matchconnections:(true false)' '--maxconnectionusagecount+:' '--maxpoolsize+:' '--maxwait+:' '--nontransactionalconnections+:nontransactionalconnections:(true false)' '--ping+:ping:(true false)' '--pooling+:pooling:(true false)' '--poolresize+:' '--port+:' '--property+:' '--restype+:restype:(javax.sql.DataSource javax.sql.XADataSource javax.sql.ConnectionPoolDataSource java.sql.Driver)' '--sqltracelisteners+:' '--statementcachesize+:' '--statementleakreclaim+:statementleakreclaim:(true false)' '--statementleaktimeout+:' '--statementtimeout+:' '--steadypoolsize+:' '--target+:' '--validateatmostonceperiod+:' '--validationclassname+:' '--validationmethod+:validationmethod:(auto-commit meta-data table custom-validation)' '--validationtable+:' '--wrapjdbcobjects+:wrapjdbcobjects:(true false)')
+        ;;
+    create-jdbc-resource)
+        _command_args=('--connectionpoolid+:' '--description+:' '--enabled+:enabled:(true false)' '--host+:' '--port+:' '--property+:' '--target+:')
+        ;;
+    create-jms-host)
+        _command_args=('--host+:' '--mqhost+:' '--mqpassword+:' '--mqport+:' '--mquser+:' '--port+:' '--property+:' '--target+:')
+        ;;
+    create-jms-resource)
+        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--host+:' '--port+:' '--property+:' '--restype+:' '--target+:')
+        ;;
+    create-jmsdest)
+        _command_args=('--desttype+:' '--host+:' '--port+:' '--property+:' '--target+:')
+        ;;
+    create-jndi-resource)
+        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--factoryclass+:' '--host+:' '--jndilookupname+:' '--port+:' '--property+:' '--restype+:' '--target+:')
+        ;;
+    create-jvm-options)
+        _command_args=('--host+:' '--port+:' '--profiler+:profiler:(true false)' '--target+:')
+        ;;
+    create-lifecycle-module)
+        _command_args=('--classname+:' '--classpath+:' '--description+:' '--enabled+:enabled:(true false)' '--failurefatal+:failurefatal:(true false)' '--host+:' '--loadorder+:' '--port+:' '--property+:' '--target+:')
+        ;;
+    create-local-instance)
+        _command_args=('--checkports+:checkports:(true false)' '--cluster+:' '--config+:' '--lbenabled+:lbenabled:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:' '--portbase+:' '--savemasterpassword+:savemasterpassword:(true false)' '--systemproperties+:' '--usemasterpassword+:usemasterpassword:(true false)')
+        ;;
+    create-message-security-provider)
+        _command_args=('--classname+:' '--host+:' '--isdefaultprovider+:isdefaultprovider:(true false)' '--layer+:layer:(SOAP HttpServlet)' '--port+:' '--property+:' '--providertype+:providertype:(client server client-server)' '--requestauthrecipient+:' '--requestauthsource+:' '--responseauthrecipient+:' '--responseauthsource+:' '--target+:')
+        ;;
+    create-network-listener)
+        _command_args=('--address+:' '--enabled+:enabled:(true false)' '--host+:' '--jkenabled+:jkenabled:(true false)' '--listenerport+:' '--port+:' '--protocol+:' '--target+:' '--threadpool+:' '--transport+:')
+        ;;
+    create-node-config)
+        _command_args=('--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:')
+        ;;
+    create-node-dcom)
+        _command_args=('--archive+:' '--force+:force:(true false)' '--host+:' '--install+:install:(true false)' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
+        ;;
+    create-node-ssh)
+        _command_args=('--archive+:' '--force+:force:(true false)' '--host+:' '--install+:install:(true false)' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:' '--sshkeyfile+:' '--sshkeypassphrase+:' '--sshpassword+:' '--sshport+:' '--sshuser+:')
+        ;;
+    create-password-alias)
+        _command_args=('--aliaspassword+:' '--host+:' '--port+:')
+        ;;
+    create-profiler)
+        _command_args=('--classpath+:' '--enabled+:enabled:(true false)' '--host+:' '--nativelibrarypath+:' '--port+:' '--property+:' '--target+:')
+        ;;
+    create-protocol)
+        _command_args=('--host+:' '--port+:' '--securityenabled+:securityenabled:(true false)' '--target+:')
+        ;;
+    create-protocol-filter)
+        _command_args=('--classname+:' '--host+:' '--port+:' '--protocol+:' '--target+:')
+        ;;
+    create-protocol-finder)
+        _command_args=('--classname+:' '--host+:' '--port+:' '--protocol+:' '--target+:' '--targetprotocol+:')
+        ;;
+    create-resource-adapter-config)
+        _command_args=('--host+:' '--objecttype+:' '--port+:' '--property+:' '--target+:' '--threadpoolid+:')
+        ;;
+    create-resource-ref)
+        _command_args=('--enabled+:enabled:(true false)' '--host+:' '--port+:' '--target+:')
+        ;;
+    create-service)
+        _command_args=('--domaindir+:domaindir:directory:_files' '--dry-run+:dry-run:(true false)' '--force+:force:(true false)' '--name+:' '--node+:node:_asadmin_nodes' '--nodedir+:' '--serviceproperties+:' '--serviceuser+:')
+        ;;
+    create-ssl)
+        _command_args=('--certname+:' '--clientauthenabled+:clientauthenabled:(true false)' '--host+:' '--port+:' '--ssl2ciphers+:' '--ssl2enabled+:ssl2enabled:(true false)' '--ssl3enabled+:ssl3enabled:(true false)' '--ssl3tlsciphers+:' '--target+:' '--tlsenabled+:tlsenabled:(true false)' '--tlsrollbackenabled+:tlsrollbackenabled:(true false)' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
+        ;;
+    create-system-properties)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    create-threadpool)
+        _command_args=('--host+:' '--idletimeout+:' '--maxqueuesize+:' '--maxthreadpoolsize+:' '--minthreadpoolsize+:' '--port+:' '--target+:' '--workqueues+:')
+        ;;
+    create-transport)
+        _command_args=('--acceptorthreads+:' '--buffersizebytes+:' '--bytebuffertype+:' '--classname+:' '--displayconfiguration+:displayconfiguration:(true false)' '--enablesnoop+:enablesnoop:(true false)' '--host+:' '--idlekeytimeoutseconds+:' '--maxconnectionscount+:' '--port+:' '--readtimeoutmillis+:' '--selectionkeyhandler+:' '--selectorpolltimeoutmillis+:' '--target+:' '--tcpnodelay+:tcpnodelay:(true false)' '--writetimeoutmillis+:')
+        ;;
+    create-virtual-server)
+        _command_args=('--defaultwebmodule+:' '--host+:' '--hosts+:' '--httplisteners+:' '--logfile+:' '--networklisteners+:' '--port+:' '--property+:' '--state+:state:(on off disabled)' '--target+:')
+        ;;
+    delete-admin-object)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-application-ref)
+        _command_args=('--cascade+:cascade:(true false)' '--host+:' '--port+:' '--target+:')
+        ;;
+    delete-audit-module)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-auth-realm)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-config)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    delete-connector-connection-pool)
+        _command_args=('--cascade+:cascade:(true false)' '--host+:' '--port+:' '--target+:')
+        ;;
+    delete-connector-resource)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-connector-security-map)
+        _command_args=('--host+:' '--poolname+:' '--port+:' '--target+:')
+        ;;
+    delete-connector-work-security-map)
+        _command_args=('--host+:' '--port+:' '--raname+:')
+        ;;
+    delete-custom-resource)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-domain)
+        _command_args=('--domaindir+:')
+        ;;
+    delete-file-user)
+        _command_args=('--authrealmname+:' '--host+:' '--port+:' '--target+:')
+        ;;
+    delete-http)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-http-health-checker)
+        _command_args=('--config+:' '--host+:' '--port+:')
+        ;;
+    delete-http-lb-ref)
+        _command_args=('--config+:' '--force+:' '--host+:' '--lbname+:' '--port+:')
+        ;;
+    delete-http-listener)
+        _command_args=('--host+:' '--port+:' '--secure+:' '--target+:')
+        ;;
+    delete-http-redirect)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-iiop-listener)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-instance)
+        _command_args=('--host+:' '--port+:' '--terse+:terse:(true false)')
+        ;;
+    delete-jacc-provider)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-javamail-resource)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-jdbc-connection-pool)
+        _command_args=('--cascade+:cascade:(true false)' '--host+:' '--port+:' '--target+:')
+        ;;
+    delete-jdbc-resource)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-jms-host)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-jms-resource)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-jmsdest)
+        _command_args=('--desttype+:' '--host+:' '--port+:' '--target+:')
+        ;;
+    delete-jndi-resource)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-jvm-options)
+        _command_args=('--host+:' '--port+:' '--profiler+:profiler:(true false)' '--target+:')
+        ;;
+    delete-lifecycle-module)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-local-instance)
+        _command_args=('--node+:node:_asadmin_nodes' '--nodedir+:')
+        ;;
+    delete-log-levels)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-message-security-provider)
+        _command_args=('--host+:' '--layer+:' '--port+:' '--target+:')
+        ;;
+    delete-network-listener)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-node-config)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    delete-node-dcom)
+        _command_args=('--force+:force:(true false)' '--host+:' '--port+:' '--uninstall+:uninstall:(true false)')
+        ;;
+    delete-node-ssh)
+        _command_args=('--force+:force:(true false)' '--host+:' '--port+:' '--uninstall+:uninstall:(true false)')
+        ;;
+    delete-password-alias)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    delete-profiler)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-protocol)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-protocol-filter)
+        _command_args=('--host+:' '--port+:' '--protocol+:' '--target+:')
+        ;;
+    delete-protocol-finder)
+        _command_args=('--host+:' '--port+:' '--protocol+:' '--target+:')
+        ;;
+    delete-resource-adapter-config)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-resource-ref)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-ssl)
+        _command_args=('--host+:' '--port+:' '--target+:' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
+        ;;
+    delete-system-property)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-threadpool)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-transport)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-virtual-server)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    deploy)
+        _command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--port+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
+        ;;
+    deploydir)
+        _command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--port+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
+        ;;
+    disable)
+        _command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--isundeploy+:isundeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--port+:' '--properties+:' '--target+:')
+        ;;
+    disable-http-lb-application)
+        _command_args=('--host+:' '--name+:' '--port+:' '--timeout+:')
+        ;;
+    disable-http-lb-server)
+        _command_args=('--host+:' '--port+:' '--timeout+:')
+        ;;
+    disable-monitoring)
+        _command_args=('--host+:' '--modules+:' '--port+:' '--target+:')
+        ;;
+    disable-secure-admin)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    enable)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    enable-http-lb-application)
+        _command_args=('--host+:' '--name+:' '--port+:')
+        ;;
+    enable-http-lb-server)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    enable-monitoring)
+        _command_args=('--dtrace+:dtrace:(true false)' '--host+:' '--mbean+:mbean:(true false)' '--modules+:' '--options+:' '--pid+:' '--port+:' '--target+:')
+        ;;
+    enable-secure-admin)
+        _command_args=('--adminalias+:' '--host+:' '--instancealias+:' '--port+:')
+        ;;
+    export-http-lb-config)
+        _command_args=('--config+:' '--host+:' '--lbname+:' '--lbtargets+:' '--port+:' '--property+:' '--retrievefile+:retrievefile:(true false)')
+        ;;
+    export-sync-bundle)
+        _command_args=('--host+:' '--port+:' '--retrieve+:retrieve:(true false)' '--target+:')
+        ;;
+    flush-connection-pool)
+        _command_args=('--appname+:' '--host+:' '--modulename+:' '--port+:')
+        ;;
+    flush-jmsdest)
+        _command_args=('--desttype+:' '--host+:' '--port+:' '--target+:')
+        ;;
+    freeze-transaction-service)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    generate-domain-schema)
+        _command_args=('--format+:' '--host+:' '--port+:' '--showdeprecated+:showdeprecated:(true false)' '--showsubclasses+:showsubclasses:(true false)')
+        ;;
+    generate-jvm-report)
+        _command_args=('--host+:' '--port+:' '--target+:' '--type+:type:(summary thread class memory log)')
+        ;;
+    get)
+        _command_args=('--host+:' '--monitor+:monitor:(true false)' '--port+:')
+        ;;
+    get-client-stubs)
+        _command_args=('--appname+:' '--host+:' '--port+:')
+        ;;
+    get-health)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    help)
+        _describe -t help-commands "asadmin help command" _1st_arguments
+    ;;
+    import-sync-bundle)
+        _command_args=('--instance+:' '--node+:node:_asadmin_nodes' '--nodedir+:')
+        ;;
+    install-node)
+        _command_args=('--archive+:' '--create+:create:(true false)' '--force+:force:(true false)' '--installdir+:' '--save+:save:(true false)' '--sshkeyfile+:' '--sshport+:' '--sshuser+:')
+        ;;
+    install-node-dcom)
+        _command_args=('--archive+:' '--create+:create:(true false)' '--force+:force:(true false)' '--installdir+:' '--save+:save:(true false)' '--windowsdomain+:' '--windowsuser+:')
+        ;;
+    install-node-ssh)
+        _command_args=('--archive+:' '--create+:create:(true false)' '--force+:force:(true false)' '--installdir+:' '--save+:save:(true false)' '--sshkeyfile+:' '--sshport+:' '--sshuser+:')
+        ;;
+    jms-ping)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    list)
+        _command_args=('--host+:' '--monitor+:monitor:(true false)' '--port+:')
+        ;;
+    list-admin-objects)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-application-refs)
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--terse+:terse:(true false)')
+        ;;
+    list-applications)
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--resources+:resources:(true false)' '--subcomponents+:subcomponents:(true false)' '--terse+:terse:(true false)' '--type+:')
+        ;;
+    list-audit-modules)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-auth-realms)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-backups)
+        _command_args=('--backupconfig+:' '--backupdir+:' '--domaindir+:' '--long+:long:(true false)')
+        ;;
+    list-clusters)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-commands)
+        _command_args=('--localonly+:localonly:(true false)' '--remoteonly+:remoteonly:(true false)')
+        ;;
+    list-components)
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--resources+:resources:(true false)' '--subcomponents+:subcomponents:(true false)' '--terse+:terse:(true false)' '--type+:')
+        ;;
+    list-configs)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-connector-connection-pools)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-connector-resources)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-connector-security-maps)
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--securitymap+:' '--target+:')
+        ;;
+    list-connector-work-security-maps)
+        _command_args=('--host+:' '--port+:' '--securitymap+:')
+        ;;
+    list-containers)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-custom-resources)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    list-descriptors)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-domains)
+        _command_args=('--domaindir+:')
+        ;;
+    list-file-groups)
+        _command_args=('--authrealmname+:' '--host+:' '--name+:' '--port+:')
+        ;;
+    list-file-users)
+        _command_args=('--authrealmname+:' '--host+:' '--port+:')
+        ;;
+    list-http-lb-configs)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-http-listeners)
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:')
+        ;;
+    list-iiop-listeners)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-instances)
+        _command_args=('--host+:' '--long+:long:(true false)' '--nostatus+:nostatus:(true false)' '--port+:' '--standaloneonly+:standaloneonly:(true false)' '--timeoutmsec+:')
+        ;;
+    list-jacc-providers)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-javamail-resources)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    list-jdbc-connection-pools)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-jdbc-resources)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-jms-hosts)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    list-jms-resources)
+        _command_args=('--host+:' '--port+:' '--restype+:')
+        ;;
+    list-jmsdest)
+        _command_args=('--desttype+:' '--host+:' '--port+:' '--property+:')
+        ;;
+    list-jndi-entries)
+        _command_args=('--context+:' '--host+:' '--port+:')
+        ;;
+    list-jndi-resources)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    list-jvm-options)
+        _command_args=('--host+:' '--port+:' '--profiler+:profiler:(true false)' '--target+:')
+        ;;
+    list-libraries)
+        _command_args=('--host+:' '--port+:' '--type+:type:(common ext app)')
+        ;;
+    list-lifecycle-modules)
+        _command_args=('--host+:' '--port+:' '--terse+:terse:(true false)')
+        ;;
+    list-log-attributes)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-log-levels)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-message-security-providers)
+        _command_args=('--host+:' '--layer+:layer:(SOAP HttpServlet)' '--port+:')
+        ;;
+    list-modules)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-network-listeners)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-nodes)
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--terse+:terse:(true false)')
+        ;;
+    list-nodes-config)
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--terse+:terse:(true false)')
+        ;;
+    list-nodes-dcom)
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--terse+:terse:(true false)')
+        ;;
+    list-nodes-ssh)
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--terse+:terse:(true false)')
+        ;;
+    list-password-aliases)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-persistence-types)
+        _command_args=('--host+:' '--port+:' '--type+:')
+        ;;
+    list-protocol-filters)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    list-protocol-finders)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    list-protocols)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-resource-adapter-configs)
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--raname+:')
+        ;;
+    list-resource-refs)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-sub-components)
+        _command_args=('--appname+:' '--host+:' '--port+:' '--resources+:resources:(true false)' '--terse+:terse:(true false)' '--type+:')
+        ;;
+    list-supported-cipher-suites)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-system-properties)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-threadpools)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-timers)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-transports)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-virtual-servers)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    list-web-context-param)
+        _command_args=('--host+:' '--name+:' '--port+:')
+        ;;
+    list-web-env-entry)
+        _command_args=('--host+:' '--name+:' '--port+:')
+        ;;
+    login)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    migrate-timers)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    monitor)
+        _command_args=('--filename+:filename:directory:_files' '--filter+:' '--interval+:' '--type+:')
+        ;;
+    multimode)
+        _command_args=('--encoding+:' '--file+:file:directory:_files' '--printprompt+:printprompt:(true false)')
+        ;;
+    ping-connection-pool)
+        _command_args=('--appname+:' '--host+:' '--modulename+:' '--port+:' '--target+:')
+        ;;
+    ping-node-dcom)
+        _command_args=('--host+:' '--port+:' '--validate+:validate:(true false)')
+        ;;
+    ping-node-ssh)
+        _command_args=('--host+:' '--port+:' '--validate+:validate:(true false)')
+        ;;
+    recover-transactions)
+        _command_args=('--host+:' '--port+:' '--target+:' '--transactionlogdir+:')
+        ;;
+    redeploy)
+        _command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--port+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
+        ;;
+    remove-library)
+        _command_args=('--host+:' '--port+:' '--type+:type:(common ext app)')
+        ;;
+    restart-domain)
+        _command_args=('--debug+:debug:(true false)' '--domaindir+:' '--force+:force:(true false)' '--kill+:kill:(true false)')
+        ;;
+    restart-instance)
+        _command_args=('--debug+:' '--host+:' '--port+:')
+        ;;
+    restart-local-instance)
+        _command_args=('--debug+:debug:(true false)' '--force+:force:(true false)' '--kill+:kill:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:')
+        ;;
+    restore-domain)
+        _command_args=('--backupconfig+:' '--backupdir+:' '--description+:' '--domaindir+:' '--filename+:' '--force+:force:(true false)' '--long+:long:(true false)')
+        ;;
+    rollback-transaction)
+        _command_args=('--host+:' '--port+:' '--target+:' '--transaction_id+:')
+        ;;
+    rotate-log)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    set)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    set-log-attributes)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    set-log-levels)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    set-web-context-param)
+        _command_args=('--description+:' '--host+:' '--ignoredescriptoritem+:ignoredescriptoritem:(true false)' '--name+:' '--port+:' '--value+:')
+        ;;
+    set-web-env-entry)
+        _command_args=('--description+:' '--host+:' '--ignoredescriptoritem+:ignoredescriptoritem:(true false)' '--name+:' '--port+:' '--type+:' '--value+:')
+        ;;
+    setup-ssh)
+        _command_args=('--generatekey+:generatekey:(true false)' '--sshkeyfile+:' '--sshport+:' '--sshpublickeyfile+:' '--sshuser+:')
+        ;;
+    show-component-status)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    start-cluster)
+        _command_args=('--autohadboverride+:autohadboverride:(true false)' '--host+:' '--port+:' '--verbose+:verbose:(true false)')
+        ;;
+    start-database)
+        _command_args=('--dbhome+:' '--dbhost+:' '--dbport+:' '--jvmoptions+:')
+        ;;
+    start-domain)
+        _command_args=('--debug+:debug:(true false)' '--domaindir+:' '--upgrade+:upgrade:(true false)' '--verbose+:verbose:(true false)')
+        ;;
+    start-instance)
+        _command_args=('--debug+:debug:(true false)' '--host+:' '--port+:' '--setenv+:' '--sync+:sync:(none normal full)' '--terse+:terse:(true false)')
+        ;;
+    start-local-instance)
+        _command_args=('--debug+:debug:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:' '--sync+:sync:(none normal full)' '--verbose+:verbose:(true false)')
+        ;;
+    stop-cluster)
+        _command_args=('--autohadboverride+:autohadboverride:(true false)' '--host+:' '--kill+:kill:(true false)' '--port+:' '--verbose+:verbose:(true false)')
+        ;;
+    stop-database)
+        _command_args=('--dbhost+:' '--dbport+:' '--dbuser+:')
+        ;;
+    stop-domain)
+        _command_args=('--domaindir+:' '--force+:force:(true false)' '--kill+:kill:(true false)')
+        ;;
+    stop-instance)
+        _command_args=('--force+:force:(true false)' '--host+:' '--kill+:kill:(true false)' '--port+:')
+        ;;
+    stop-local-instance)
+        _command_args=('--force+:force:(true false)' '--kill+:kill:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:')
+        ;;
+    test-upgrade)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    undeploy)
+        _command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--port+:' '--properties+:' '--target+:')
+        ;;
+    unfreeze-transaction-service)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    uninstall-node)
+        _command_args=('--force+:force:(true false)' '--installdir+:' '--sshkeyfile+:' '--sshport+:' '--sshuser+:')
+        ;;
+    uninstall-node-dcom)
+        _command_args=('--force+:force:(true false)' '--installdir+:' '--windowsdomain+:' '--windowsuser+:')
+        ;;
+    uninstall-node-ssh)
+        _command_args=('--force+:force:(true false)' '--installdir+:' '--sshkeyfile+:' '--sshport+:' '--sshuser+:')
+        ;;
+    unset-web-context-param)
+        _command_args=('--host+:' '--name+:' '--port+:')
+        ;;
+    unset-web-env-entry)
+        _command_args=('--host+:' '--name+:' '--port+:')
+        ;;
+    update-connector-security-map)
+        _command_args=('--addprincipals+:' '--addusergroups+:' '--host+:' '--mappedpassword+:' '--mappedusername+:' '--poolname+:' '--port+:' '--removeprincipals+:' '--removeusergroups+:' '--target+:')
+        ;;
+    update-connector-work-security-map)
+        _command_args=('--addgroups+:' '--addprincipals+:' '--host+:' '--port+:' '--raname+:' '--removegroups+:' '--removeprincipals+:')
+        ;;
+    update-file-user)
+        _command_args=('--authrealmname+:' '--groups+:' '--host+:' '--port+:' '--target+:' '--userpassword+:')
+        ;;
+    update-node-config)
+        _command_args=('--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:')
+        ;;
+    update-node-dcom)
+        _command_args=('--force+:force:(true false)' '--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
+        ;;
+    update-node-ssh)
+        _command_args=('--force+:force:(true false)' '--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:' '--sshkeyfile+:' '--sshkeypassphrase+:' '--sshpassword+:' '--sshport+:' '--sshuser+:')
+        ;;
+    update-password-alias)
+        _command_args=('--aliaspassword+:' '--host+:' '--port+:')
+        ;;
+    uptime)
+        _command_args=('--host+:' '--milliseconds+:milliseconds:(true false)' '--port+:')
+        ;;
+    validate-dcom)
+        _command_args=('--host+:' '--port+:' '--remotetestdir+:' '--verbose+:verbose:(true false)' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
+        ;;
+    validate-multicast)
+        _command_args=('--bindaddress+:' '--multicastaddress+:' '--multicastport+:' '--sendperiod+:' '--timeout+:' '--timetolive+:' '--verbose+:verbose:(true false)')
+        ;;
+    verify-domain-xml)
+        _command_args=('--domaindir+:')
+        ;;
+    version)
+        _command_args=('--local+:local:(true false)' '--terse+:terse:(true false)' '--verbose+:verbose:(true false)')
+        ;;
 esac
 
+
+_asadmin_instances() {
+    compadd $(command asadmin list-instances --terse --nostatus domain)
+}
+
+_asadmin_libraries() {
+    compadd $(command asadmin list-libraries --terse)
+}
+
+_asadmin_nodes() {
+    compadd $(command asadmin list-nodes --terse)
+}
+
+compadd '--help'
 _arguments \
     $_command_args \
-    &&  return 0
+    &&  return 0;

From 6d7d131a3c408e83d81b3f246abaeb9cb956e72b Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Tue, 24 Jul 2012 16:16:55 +0200
Subject: [PATCH 333/364] node completion

---
 plugins/glassfish/_asadmin | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/plugins/glassfish/_asadmin b/plugins/glassfish/_asadmin
index b29d65d3b..32b15b61d 100644
--- a/plugins/glassfish/_asadmin
+++ b/plugins/glassfish/_asadmin
@@ -559,13 +559,13 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:' '--target+:')
         ;;
     delete-node-config)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:nodes:_asadmin_nodes_config' '--host+:' '--port+:')
         ;;
     delete-node-dcom)
-        _command_args=('--force+:force:(true false)' '--host+:' '--port+:' '--uninstall+:uninstall:(true false)')
+        _command_args=('*:nodes:_asadmin_nodes_dcom' '--force+:force:(true false)' '--host+:' '--port+:' '--uninstall+:uninstall:(true false)')
         ;;
     delete-node-ssh)
-        _command_args=('--force+:force:(true false)' '--host+:' '--port+:' '--uninstall+:uninstall:(true false)')
+        _command_args=('*:nodes:_asadmin_nodes_ssh' '--force+:force:(true false)' '--host+:' '--port+:' '--uninstall+:uninstall:(true false)')
         ;;
     delete-password-alias)
         _command_args=('--host+:' '--port+:')
@@ -889,10 +889,10 @@ case "$words[1]" in
         _command_args=('--appname+:' '--host+:' '--modulename+:' '--port+:' '--target+:')
         ;;
     ping-node-dcom)
-        _command_args=('--host+:' '--port+:' '--validate+:validate:(true false)')
+        _command_args=('*:nodes:_asadmin_nodes_dcom' '--host+:' '--port+:' '--validate+:validate:(true false)')
         ;;
     ping-node-ssh)
-        _command_args=('--host+:' '--port+:' '--validate+:validate:(true false)')
+        _command_args=('*:nodes:_asadmin_nodes_ssh' '--host+:' '--port+:' '--validate+:validate:(true false)')
         ;;
     recover-transactions)
         _command_args=('--host+:' '--port+:' '--target+:' '--transactionlogdir+:')
@@ -1006,13 +1006,13 @@ case "$words[1]" in
         _command_args=('--authrealmname+:' '--groups+:' '--host+:' '--port+:' '--target+:' '--userpassword+:')
         ;;
     update-node-config)
-        _command_args=('--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:')
+        _command_args=('*:nodes:_asadmin_nodes_config' '--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:')
         ;;
     update-node-dcom)
-        _command_args=('--force+:force:(true false)' '--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
+        _command_args=('*:nodes:_asadmin_nodes_dcom' '--force+:force:(true false)' '--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
         ;;
     update-node-ssh)
-        _command_args=('--force+:force:(true false)' '--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:' '--sshkeyfile+:' '--sshkeypassphrase+:' '--sshpassword+:' '--sshport+:' '--sshuser+:')
+        _command_args=('*:nodes:_asadmin_nodes_ssh' '--force+:force:(true false)' '--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:' '--sshkeyfile+:' '--sshkeypassphrase+:' '--sshpassword+:' '--sshport+:' '--sshuser+:')
         ;;
     update-password-alias)
         _command_args=('--aliaspassword+:' '--host+:' '--port+:')
@@ -1047,6 +1047,18 @@ _asadmin_nodes() {
     compadd $(command asadmin list-nodes --terse)
 }
 
+_asadmin_nodes_config() {
+    compadd $(command asadmin list-nodes-config --terse)
+}
+
+_asadmin_nodes_dcom() {
+    compadd $(command asadmin list-nodes-dcom --terse)
+}
+
+_asadmin_nodes_ssh() {
+    compadd $(command asadmin list-nodes-ssh --terse)
+}
+
 compadd '--help'
 _arguments \
     $_command_args \

From fd3d5bfb749e30b752b887d265f5561bd54e02c2 Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Tue, 31 Jul 2012 15:02:12 +0200
Subject: [PATCH 334/364] instance and cluster completion

---
 plugins/glassfish/_asadmin | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/plugins/glassfish/_asadmin b/plugins/glassfish/_asadmin
index 32b15b61d..1623cd274 100644
--- a/plugins/glassfish/_asadmin
+++ b/plugins/glassfish/_asadmin
@@ -307,7 +307,7 @@ case "$words[1]" in
         _command_args=('--clustertype+:' '--configstoretype+:' '--dburl+:' '--dbuser+:' '--dbvendor+:' '--host+:' '--jmsdbpassword+:' '--messagestoretype+:' '--port+:' '--property+:')
         ;;
     configure-lb-weight)
-        _command_args=('--cluster+:' '--host+:' '--port+:')
+        _command_args=('--cluster+:cluster:_asadmin_clusters' '--host+:' '--port+:')
         ;;
     configure-ldap-for-admin)
         _command_args=('--basedn+:' '--host+:' '--ldap-group+:' '--port+:' '--target+:' '--url+:')
@@ -370,7 +370,7 @@ case "$words[1]" in
         _command_args=('--enabled+:enabled:(true false)' '--host+:' '--iiopport+:' '--listeneraddress+:' '--port+:' '--property+:' '--securityenabled+:securityenabled:(true false)' '--target+:')
         ;;
     create-instance)
-        _command_args=('--checkports+:checkports:(true false)' '--cluster+:' '--config+:' '--host+:' '--lbenabled+:lbenabled:(true false)' '--node+:node:_asadmin_nodes' '--port+:' '--portbase+:' '--systemproperties+:' '--terse+:terse:(true false)')
+        _command_args=('--checkports+:checkports:(true false)' '--cluster+:cluster:_asadmin_clusters' '--config+:' '--host+:' '--lbenabled+:lbenabled:(true false)' '--node+:node:_asadmin_nodes' '--port+:' '--portbase+:' '--systemproperties+:' '--terse+:terse:(true false)')
         ;;
     create-jacc-provider)
         _command_args=('--host+:' '--policyconfigfactoryclass+:' '--policyproviderclass+:' '--port+:' '--property+:' '--target+:')
@@ -403,7 +403,7 @@ case "$words[1]" in
         _command_args=('--classname+:' '--classpath+:' '--description+:' '--enabled+:enabled:(true false)' '--failurefatal+:failurefatal:(true false)' '--host+:' '--loadorder+:' '--port+:' '--property+:' '--target+:')
         ;;
     create-local-instance)
-        _command_args=('--checkports+:checkports:(true false)' '--cluster+:' '--config+:' '--lbenabled+:lbenabled:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:' '--portbase+:' '--savemasterpassword+:savemasterpassword:(true false)' '--systemproperties+:' '--usemasterpassword+:usemasterpassword:(true false)')
+        _command_args=('--checkports+:checkports:(true false)' '--cluster+:cluster:_asadmin_clusters' '--config+:' '--lbenabled+:lbenabled:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:' '--portbase+:' '--savemasterpassword+:savemasterpassword:(true false)' '--systemproperties+:' '--usemasterpassword+:usemasterpassword:(true false)')
         ;;
     create-message-security-provider)
         _command_args=('--classname+:' '--host+:' '--isdefaultprovider+:isdefaultprovider:(true false)' '--layer+:layer:(SOAP HttpServlet)' '--port+:' '--property+:' '--providertype+:providertype:(client server client-server)' '--requestauthrecipient+:' '--requestauthsource+:' '--responseauthrecipient+:' '--responseauthsource+:' '--target+:')
@@ -442,7 +442,7 @@ case "$words[1]" in
         _command_args=('--enabled+:enabled:(true false)' '--host+:' '--port+:' '--target+:')
         ;;
     create-service)
-        _command_args=('--domaindir+:domaindir:directory:_files' '--dry-run+:dry-run:(true false)' '--force+:force:(true false)' '--name+:' '--node+:node:_asadmin_nodes' '--nodedir+:' '--serviceproperties+:' '--serviceuser+:')
+        _command_args=('*:instances:_asadmin_instances' '--domaindir+:domaindir:directory:_files' '--dry-run+:dry-run:(true false)' '--force+:force:(true false)' '--name+:' '--node+:node:_asadmin_nodes' '--nodedir+:' '--serviceproperties+:' '--serviceuser+:')
         ;;
     create-ssl)
         _command_args=('--certname+:' '--clientauthenabled+:clientauthenabled:(true false)' '--host+:' '--port+:' '--ssl2ciphers+:' '--ssl2enabled+:ssl2enabled:(true false)' '--ssl3enabled+:ssl3enabled:(true false)' '--ssl3tlsciphers+:' '--target+:' '--tlsenabled+:tlsenabled:(true false)' '--tlsrollbackenabled+:tlsrollbackenabled:(true false)' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
@@ -514,7 +514,7 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:' '--target+:')
         ;;
     delete-instance)
-        _command_args=('--host+:' '--port+:' '--terse+:terse:(true false)')
+        _command_args=('*:instances:_asadmin_instances' '--host+:' '--port+:' '--terse+:terse:(true false)')
         ;;
     delete-jacc-provider)
         _command_args=('--host+:' '--port+:' '--target+:')
@@ -547,7 +547,7 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:' '--target+:')
         ;;
     delete-local-instance)
-        _command_args=('--node+:node:_asadmin_nodes' '--nodedir+:')
+        _command_args=('*:instances:_asadmin_instances' '--node+:node:_asadmin_nodes' '--nodedir+:')
         ;;
     delete-log-levels)
         _command_args=('--host+:' '--port+:' '--target+:')
@@ -907,10 +907,10 @@ case "$words[1]" in
         _command_args=('--debug+:debug:(true false)' '--domaindir+:' '--force+:force:(true false)' '--kill+:kill:(true false)')
         ;;
     restart-instance)
-        _command_args=('--debug+:' '--host+:' '--port+:')
+        _command_args=('*:instances:_asadmin_instances' '--debug+:' '--host+:' '--port+:')
         ;;
     restart-local-instance)
-        _command_args=('--debug+:debug:(true false)' '--force+:force:(true false)' '--kill+:kill:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:')
+        _command_args=('*:instances:_asadmin_instances' '--debug+:debug:(true false)' '--force+:force:(true false)' '--kill+:kill:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:')
         ;;
     restore-domain)
         _command_args=('--backupconfig+:' '--backupdir+:' '--description+:' '--domaindir+:' '--filename+:' '--force+:force:(true false)' '--long+:long:(true false)')
@@ -943,7 +943,7 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:' '--target+:')
         ;;
     start-cluster)
-        _command_args=('--autohadboverride+:autohadboverride:(true false)' '--host+:' '--port+:' '--verbose+:verbose:(true false)')
+        _command_args=('*:clusters:_asadmin_clusters' '--autohadboverride+:autohadboverride:(true false)' '--host+:' '--port+:' '--verbose+:verbose:(true false)')
         ;;
     start-database)
         _command_args=('--dbhome+:' '--dbhost+:' '--dbport+:' '--jvmoptions+:')
@@ -952,13 +952,13 @@ case "$words[1]" in
         _command_args=('--debug+:debug:(true false)' '--domaindir+:' '--upgrade+:upgrade:(true false)' '--verbose+:verbose:(true false)')
         ;;
     start-instance)
-        _command_args=('--debug+:debug:(true false)' '--host+:' '--port+:' '--setenv+:' '--sync+:sync:(none normal full)' '--terse+:terse:(true false)')
+        _command_args=('*:instances:_asadmin_instances' '--debug+:debug:(true false)' '--host+:' '--port+:' '--setenv+:' '--sync+:sync:(none normal full)' '--terse+:terse:(true false)')
         ;;
     start-local-instance)
-        _command_args=('--debug+:debug:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:' '--sync+:sync:(none normal full)' '--verbose+:verbose:(true false)')
+        _command_args=('*:instances:_asadmin_instances' '--debug+:debug:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:' '--sync+:sync:(none normal full)' '--verbose+:verbose:(true false)')
         ;;
     stop-cluster)
-        _command_args=('--autohadboverride+:autohadboverride:(true false)' '--host+:' '--kill+:kill:(true false)' '--port+:' '--verbose+:verbose:(true false)')
+        _command_args=('*:clusters:_asadmin_clusters' '--autohadboverride+:autohadboverride:(true false)' '--host+:' '--kill+:kill:(true false)' '--port+:' '--verbose+:verbose:(true false)')
         ;;
     stop-database)
         _command_args=('--dbhost+:' '--dbport+:' '--dbuser+:')
@@ -967,10 +967,10 @@ case "$words[1]" in
         _command_args=('--domaindir+:' '--force+:force:(true false)' '--kill+:kill:(true false)')
         ;;
     stop-instance)
-        _command_args=('--force+:force:(true false)' '--host+:' '--kill+:kill:(true false)' '--port+:')
+        _command_args=('*:instances:_asadmin_instances' '--force+:force:(true false)' '--host+:' '--kill+:kill:(true false)' '--port+:')
         ;;
     stop-local-instance)
-        _command_args=('--force+:force:(true false)' '--kill+:kill:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:')
+        _command_args=('*:instances:_asadmin_instances' '--force+:force:(true false)' '--kill+:kill:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:')
         ;;
     test-upgrade)
         _command_args=('--host+:' '--port+:')
@@ -1035,6 +1035,10 @@ case "$words[1]" in
 esac
 
 
+_asadmin_clusters() {
+    compadd $(command asadmin list-clusters --terse | sed 's/ .*//')
+}
+
 _asadmin_instances() {
     compadd $(command asadmin list-instances --terse --nostatus domain)
 }

From ee3a20a3dcd950f2959424bff9423807bf25b69e Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Tue, 31 Jul 2012 16:59:56 +0200
Subject: [PATCH 335/364] completion of targets

---
 plugins/glassfish/_asadmin | 323 +++++++++++++++++++++++--------------
 1 file changed, 200 insertions(+), 123 deletions(-)

diff --git a/plugins/glassfish/_asadmin b/plugins/glassfish/_asadmin
index 1623cd274..9d6b5687b 100644
--- a/plugins/glassfish/_asadmin
+++ b/plugins/glassfish/_asadmin
@@ -283,7 +283,7 @@ case "$words[1]" in
         _command_args=('*:directory:_files' '--host+:' '--port+:' '--type+:type:(common ext app)')
         ;;
     add-resources)
-        _command_args=('*:directory:_files' '--host+:' '--port+:' '--target+:')
+        _command_args=('*:directory:_files' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     apply-http-lb-changes)
         _command_args=('--host+:' '--ping+:' '--port+:')
@@ -310,28 +310,28 @@ case "$words[1]" in
         _command_args=('--cluster+:cluster:_asadmin_clusters' '--host+:' '--port+:')
         ;;
     configure-ldap-for-admin)
-        _command_args=('--basedn+:' '--host+:' '--ldap-group+:' '--port+:' '--target+:' '--url+:')
+        _command_args=('--basedn+:' '--host+:' '--ldap-group+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--url+:')
         ;;
     copy-config)
         _command_args=('--host+:' '--port+:' '--systemproperties+:')
         ;;
     create-admin-object)
-        _command_args=('--classname+:' '--description+:' '--enabled+:enabled:(true false)' '--host+:' '--port+:' '--property+:' '--raname+:' '--restype+:' '--target+:')
+        _command_args=('--classname+:' '--description+:' '--enabled+:enabled:(true false)' '--host+:' '--port+:' '--property+:' '--raname+:' '--restype+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-application-ref)
-        _command_args=('--enabled+:enabled:(true false)' '--host+:' '--lbenabled+:lbenabled:(true false)' '--port+:' '--target+:' '--virtualservers+:')
+        _command_args=('--enabled+:enabled:(true false)' '--host+:' '--lbenabled+:lbenabled:(true false)' '--port+:' '--target+:target:_asadmin_targets_cluster_das_standalone_instance' '--virtualservers+:')
         ;;
     create-audit-module)
-        _command_args=('--classname+:' '--host+:' '--port+:' '--property+:' '--target+:')
+        _command_args=('--classname+:' '--host+:' '--port+:' '--property+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-auth-realm)
-        _command_args=('--classname+:' '--host+:' '--port+:' '--property+:' '--target+:')
+        _command_args=('--classname+:' '--host+:' '--port+:' '--property+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-connector-connection-pool)
         _command_args=('--associatewiththread+:associatewiththread:(true false)' '--connectiondefinition+:' '--creationretryattempts+:' '--creationretryinterval+:' '--description+:' '--failconnection+:failconnection:(true false)' '--host+:' '--idletimeout+:' '--isconnectvalidatereq+:isconnectvalidatereq:(true false)' '--lazyconnectionassociation+:lazyconnectionassociation:(true false)' '--lazyconnectionenlistment+:lazyconnectionenlistment:(true false)' '--leakreclaim+:leakreclaim:(true false)' '--leaktimeout+:' '--matchconnections+:matchconnections:(true false)' '--maxconnectionusagecount+:' '--maxpoolsize+:' '--maxwait+:' '--ping+:ping:(true false)' '--pooling+:pooling:(true false)' '--poolresize+:' '--port+:' '--property+:' '--raname+:' '--steadypoolsize+:' '--target+:' '--transactionsupport+:transactionsupport:(XATransaction LocalTransaction NoTransaction)' '--validateatmostonceperiod+:')
         ;;
     create-connector-resource)
-        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--host+:' '--objecttype+:' '--poolname+:' '--port+:' '--property+:' '--target+:')
+        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--host+:' '--objecttype+:' '--poolname+:' '--port+:' '--property+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     create-connector-security-map)
         _command_args=('--host+:' '--mappedpassword+:' '--mappedusername+:' '--poolname+:' '--port+:' '--principals+:' '--target+:' '--usergroups+:')
@@ -340,76 +340,76 @@ case "$words[1]" in
         _command_args=('--description+:' '--groupsmap+:' '--host+:' '--port+:' '--principalsmap+:' '--raname+:')
         ;;
     create-custom-resource)
-        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--factoryclass+:' '--host+:' '--port+:' '--property+:' '--restype+:' '--target+:')
+        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--factoryclass+:' '--host+:' '--port+:' '--property+:' '--restype+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     create-domain)
         _command_args=('--adminport+:' '--checkports+:checkports:(true false)' '--domaindir+:' '--domainproperties+:' '--instanceport+:' '--keytooloptions+:' '--nopassword+:nopassword:(true false)' '--portbase+:' '--profile+:' '--savelogin+:savelogin:(true false)' '--savemasterpassword+:savemasterpassword:(true false)' '--template+:' '--usemasterpassword+:usemasterpassword:(true false)')
         ;;
     create-file-user)
-        _command_args=('--authrealmname+:' '--groups+:' '--host+:' '--port+:' '--target+:' '--userpassword+:')
+        _command_args=('--authrealmname+:' '--groups+:' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--userpassword+:')
         ;;
     create-http)
-        _command_args=('--default-virtual-server+:' '--dns-lookup-enabled+:dns-lookup-enabled:(true false)' '--host+:' '--max-connection+:' '--port+:' '--request-timeout-seconds+:' '--servername+:' '--target+:' '--timeout-seconds+:' '--xpowered+:xpowered:(true false)')
+        _command_args=('--default-virtual-server+:' '--dns-lookup-enabled+:dns-lookup-enabled:(true false)' '--host+:' '--max-connection+:' '--port+:' '--request-timeout-seconds+:' '--servername+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--timeout-seconds+:' '--xpowered+:xpowered:(true false)')
         ;;
     create-http-health-checker)
         _command_args=('--config+:' '--host+:' '--interval+:' '--port+:' '--timeout+:' '--url+:')
         ;;
     create-http-lb)
-        _command_args=('--autoapplyenabled+:autoapplyenabled:(true false)' '--devicehost+:' '--deviceport+:' '--healthcheckerinterval+:' '--healthcheckertimeout+:' '--healthcheckerurl+:' '--host+:' '--httpsrouting+:httpsrouting:(true false)' '--lbenableallapplications+:' '--lbenableallinstances+:' '--lbpolicy+:' '--lbpolicymodule+:' '--lbweight+:' '--monitor+:monitor:(true false)' '--port+:' '--property+:' '--reloadinterval+:' '--responsetimeout+:' '--routecookie+:routecookie:(true false)' '--sslproxyhost+:' '--sslproxyport+:' '--target+:')
+        _command_args=('--autoapplyenabled+:autoapplyenabled:(true false)' '--devicehost+:' '--deviceport+:' '--healthcheckerinterval+:' '--healthcheckertimeout+:' '--healthcheckerurl+:' '--host+:' '--httpsrouting+:httpsrouting:(true false)' '--lbenableallapplications+:' '--lbenableallinstances+:' '--lbpolicy+:' '--lbpolicymodule+:' '--lbweight+:' '--monitor+:monitor:(true false)' '--port+:' '--property+:' '--reloadinterval+:' '--responsetimeout+:' '--routecookie+:routecookie:(true false)' '--sslproxyhost+:' '--sslproxyport+:' '--target+:target:_asadmin_targets_cluster_standalone_instance')
         ;;
     create-http-lb-ref)
         _command_args=('--config+:' '--healthcheckerinterval+:' '--healthcheckertimeout+:' '--healthcheckerurl+:' '--host+:' '--lbenableallapplications+:' '--lbenableallinstances+:' '--lbname+:' '--lbpolicy+:' '--lbpolicymodule+:' '--lbweight+:' '--port+:')
         ;;
     create-http-listener)
-        _command_args=('--acceptorthreads+:' '--default-virtual-server+:' '--defaultvs+:' '--enabled+:enabled:(true false)' '--host+:' '--listeneraddress+:' '--listenerport+:' '--port+:' '--redirectport+:' '--secure+:secure:(true false)' '--securityenabled+:securityenabled:(true false)' '--servername+:' '--target+:' '--xpowered+:xpowered:(true false)')
+        _command_args=('--acceptorthreads+:' '--default-virtual-server+:' '--defaultvs+:' '--enabled+:enabled:(true false)' '--host+:' '--listeneraddress+:' '--listenerport+:' '--port+:' '--redirectport+:' '--secure+:secure:(true false)' '--securityenabled+:securityenabled:(true false)' '--servername+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--xpowered+:xpowered:(true false)')
         ;;
     create-http-redirect)
-        _command_args=('--host+:' '--port+:' '--redirect-port+:' '--secure-redirect+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--redirect-port+:' '--secure-redirect+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-iiop-listener)
-        _command_args=('--enabled+:enabled:(true false)' '--host+:' '--iiopport+:' '--listeneraddress+:' '--port+:' '--property+:' '--securityenabled+:securityenabled:(true false)' '--target+:')
+        _command_args=('--enabled+:enabled:(true false)' '--host+:' '--iiopport+:' '--listeneraddress+:' '--port+:' '--property+:' '--securityenabled+:securityenabled:(true false)' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-instance)
         _command_args=('--checkports+:checkports:(true false)' '--cluster+:cluster:_asadmin_clusters' '--config+:' '--host+:' '--lbenabled+:lbenabled:(true false)' '--node+:node:_asadmin_nodes' '--port+:' '--portbase+:' '--systemproperties+:' '--terse+:terse:(true false)')
         ;;
     create-jacc-provider)
-        _command_args=('--host+:' '--policyconfigfactoryclass+:' '--policyproviderclass+:' '--port+:' '--property+:' '--target+:')
+        _command_args=('--host+:' '--policyconfigfactoryclass+:' '--policyproviderclass+:' '--port+:' '--property+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-javamail-resource)
-        _command_args=('--debug+:debug:(true false)' '--description+:' '--enabled+:enabled:(true false)' '--fromaddress+:' '--host+:' '--mailhost+:' '--mailuser+:' '--port+:' '--property+:' '--storeprotocol+:' '--storeprotocolclass+:' '--target+:' '--transprotocol+:' '--transprotocolclass+:')
+        _command_args=('--debug+:debug:(true false)' '--description+:' '--enabled+:enabled:(true false)' '--fromaddress+:' '--host+:' '--mailhost+:' '--mailuser+:' '--port+:' '--property+:' '--storeprotocol+:' '--storeprotocolclass+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance' '--transprotocol+:' '--transprotocolclass+:')
         ;;
     create-jdbc-connection-pool)
         _command_args=('--allownoncomponentcallers+:allownoncomponentcallers:(true false)' '--associatewiththread+:associatewiththread:(true false)' '--creationretryattempts+:' '--creationretryinterval+:' '--datasourceclassname+:' '--description+:' '--driverclassname+:' '--failconnection+:failconnection:(true false)' '--host+:' '--idletimeout+:' '--initsql+:' '--isconnectvalidatereq+:isconnectvalidatereq:(true false)' '--isisolationguaranteed+:isisolationguaranteed:(true false)' '--isolationlevel+:' '--lazyconnectionassociation+:lazyconnectionassociation:(true false)' '--lazyconnectionenlistment+:lazyconnectionenlistment:(true false)' '--leakreclaim+:leakreclaim:(true false)' '--leaktimeout+:' '--matchconnections+:matchconnections:(true false)' '--maxconnectionusagecount+:' '--maxpoolsize+:' '--maxwait+:' '--nontransactionalconnections+:nontransactionalconnections:(true false)' '--ping+:ping:(true false)' '--pooling+:pooling:(true false)' '--poolresize+:' '--port+:' '--property+:' '--restype+:restype:(javax.sql.DataSource javax.sql.XADataSource javax.sql.ConnectionPoolDataSource java.sql.Driver)' '--sqltracelisteners+:' '--statementcachesize+:' '--statementleakreclaim+:statementleakreclaim:(true false)' '--statementleaktimeout+:' '--statementtimeout+:' '--steadypoolsize+:' '--target+:' '--validateatmostonceperiod+:' '--validationclassname+:' '--validationmethod+:validationmethod:(auto-commit meta-data table custom-validation)' '--validationtable+:' '--wrapjdbcobjects+:wrapjdbcobjects:(true false)')
         ;;
     create-jdbc-resource)
-        _command_args=('--connectionpoolid+:' '--description+:' '--enabled+:enabled:(true false)' '--host+:' '--port+:' '--property+:' '--target+:')
+        _command_args=('--connectionpoolid+:' '--description+:' '--enabled+:enabled:(true false)' '--host+:' '--port+:' '--property+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     create-jms-host)
-        _command_args=('--host+:' '--mqhost+:' '--mqpassword+:' '--mqport+:' '--mquser+:' '--port+:' '--property+:' '--target+:')
+        _command_args=('--host+:' '--mqhost+:' '--mqpassword+:' '--mqport+:' '--mquser+:' '--port+:' '--property+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-jms-resource)
-        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--host+:' '--port+:' '--property+:' '--restype+:' '--target+:')
+        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--host+:' '--port+:' '--property+:' '--restype+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     create-jmsdest)
-        _command_args=('--desttype+:' '--host+:' '--port+:' '--property+:' '--target+:')
+        _command_args=('--desttype+:' '--host+:' '--port+:' '--property+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-jndi-resource)
-        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--factoryclass+:' '--host+:' '--jndilookupname+:' '--port+:' '--property+:' '--restype+:' '--target+:')
+        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--factoryclass+:' '--host+:' '--jndilookupname+:' '--port+:' '--property+:' '--restype+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     create-jvm-options)
-        _command_args=('--host+:' '--port+:' '--profiler+:profiler:(true false)' '--target+:')
+        _command_args=('--host+:' '--port+:' '--profiler+:profiler:(true false)' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-lifecycle-module)
-        _command_args=('--classname+:' '--classpath+:' '--description+:' '--enabled+:enabled:(true false)' '--failurefatal+:failurefatal:(true false)' '--host+:' '--loadorder+:' '--port+:' '--property+:' '--target+:')
+        _command_args=('--classname+:' '--classpath+:' '--description+:' '--enabled+:enabled:(true false)' '--failurefatal+:failurefatal:(true false)' '--host+:' '--loadorder+:' '--port+:' '--property+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     create-local-instance)
         _command_args=('--checkports+:checkports:(true false)' '--cluster+:cluster:_asadmin_clusters' '--config+:' '--lbenabled+:lbenabled:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:' '--portbase+:' '--savemasterpassword+:savemasterpassword:(true false)' '--systemproperties+:' '--usemasterpassword+:usemasterpassword:(true false)')
         ;;
     create-message-security-provider)
-        _command_args=('--classname+:' '--host+:' '--isdefaultprovider+:isdefaultprovider:(true false)' '--layer+:layer:(SOAP HttpServlet)' '--port+:' '--property+:' '--providertype+:providertype:(client server client-server)' '--requestauthrecipient+:' '--requestauthsource+:' '--responseauthrecipient+:' '--responseauthsource+:' '--target+:')
+        _command_args=('--classname+:' '--host+:' '--isdefaultprovider+:isdefaultprovider:(true false)' '--layer+:layer:(SOAP HttpServlet)' '--port+:' '--property+:' '--providertype+:providertype:(client server client-server)' '--requestauthrecipient+:' '--requestauthsource+:' '--responseauthrecipient+:' '--responseauthsource+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-network-listener)
-        _command_args=('--address+:' '--enabled+:enabled:(true false)' '--host+:' '--jkenabled+:jkenabled:(true false)' '--listenerport+:' '--port+:' '--protocol+:' '--target+:' '--threadpool+:' '--transport+:')
+        _command_args=('--address+:' '--enabled+:enabled:(true false)' '--host+:' '--jkenabled+:jkenabled:(true false)' '--listenerport+:' '--port+:' '--protocol+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--threadpool+:' '--transport+:')
         ;;
     create-node-config)
         _command_args=('--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:')
@@ -424,52 +424,52 @@ case "$words[1]" in
         _command_args=('--aliaspassword+:' '--host+:' '--port+:')
         ;;
     create-profiler)
-        _command_args=('--classpath+:' '--enabled+:enabled:(true false)' '--host+:' '--nativelibrarypath+:' '--port+:' '--property+:' '--target+:')
+        _command_args=('--classpath+:' '--enabled+:enabled:(true false)' '--host+:' '--nativelibrarypath+:' '--port+:' '--property+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-protocol)
-        _command_args=('--host+:' '--port+:' '--securityenabled+:securityenabled:(true false)' '--target+:')
+        _command_args=('--host+:' '--port+:' '--securityenabled+:securityenabled:(true false)' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-protocol-filter)
-        _command_args=('--classname+:' '--host+:' '--port+:' '--protocol+:' '--target+:')
+        _command_args=('--classname+:' '--host+:' '--port+:' '--protocol+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-protocol-finder)
-        _command_args=('--classname+:' '--host+:' '--port+:' '--protocol+:' '--target+:' '--targetprotocol+:')
+        _command_args=('--classname+:' '--host+:' '--port+:' '--protocol+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--targetprotocol+:')
         ;;
     create-resource-adapter-config)
         _command_args=('--host+:' '--objecttype+:' '--port+:' '--property+:' '--target+:' '--threadpoolid+:')
         ;;
     create-resource-ref)
-        _command_args=('--enabled+:enabled:(true false)' '--host+:' '--port+:' '--target+:')
+        _command_args=('--enabled+:enabled:(true false)' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_standalone_instance')
         ;;
     create-service)
         _command_args=('*:instances:_asadmin_instances' '--domaindir+:domaindir:directory:_files' '--dry-run+:dry-run:(true false)' '--force+:force:(true false)' '--name+:' '--node+:node:_asadmin_nodes' '--nodedir+:' '--serviceproperties+:' '--serviceuser+:')
         ;;
     create-ssl)
-        _command_args=('--certname+:' '--clientauthenabled+:clientauthenabled:(true false)' '--host+:' '--port+:' '--ssl2ciphers+:' '--ssl2enabled+:ssl2enabled:(true false)' '--ssl3enabled+:ssl3enabled:(true false)' '--ssl3tlsciphers+:' '--target+:' '--tlsenabled+:tlsenabled:(true false)' '--tlsrollbackenabled+:tlsrollbackenabled:(true false)' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
+        _command_args=('--certname+:' '--clientauthenabled+:clientauthenabled:(true false)' '--host+:' '--port+:' '--ssl2ciphers+:' '--ssl2enabled+:ssl2enabled:(true false)' '--ssl3enabled+:ssl3enabled:(true false)' '--ssl3tlsciphers+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--tlsenabled+:tlsenabled:(true false)' '--tlsrollbackenabled+:tlsrollbackenabled:(true false)' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
         ;;
     create-system-properties)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_config_das_domain_standalone_instance')
         ;;
     create-threadpool)
-        _command_args=('--host+:' '--idletimeout+:' '--maxqueuesize+:' '--maxthreadpoolsize+:' '--minthreadpoolsize+:' '--port+:' '--target+:' '--workqueues+:')
+        _command_args=('--host+:' '--idletimeout+:' '--maxqueuesize+:' '--maxthreadpoolsize+:' '--minthreadpoolsize+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--workqueues+:')
         ;;
     create-transport)
-        _command_args=('--acceptorthreads+:' '--buffersizebytes+:' '--bytebuffertype+:' '--classname+:' '--displayconfiguration+:displayconfiguration:(true false)' '--enablesnoop+:enablesnoop:(true false)' '--host+:' '--idlekeytimeoutseconds+:' '--maxconnectionscount+:' '--port+:' '--readtimeoutmillis+:' '--selectionkeyhandler+:' '--selectorpolltimeoutmillis+:' '--target+:' '--tcpnodelay+:tcpnodelay:(true false)' '--writetimeoutmillis+:')
+        _command_args=('--acceptorthreads+:' '--buffersizebytes+:' '--bytebuffertype+:' '--classname+:' '--displayconfiguration+:displayconfiguration:(true false)' '--enablesnoop+:enablesnoop:(true false)' '--host+:' '--idlekeytimeoutseconds+:' '--maxconnectionscount+:' '--port+:' '--readtimeoutmillis+:' '--selectionkeyhandler+:' '--selectorpolltimeoutmillis+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--tcpnodelay+:tcpnodelay:(true false)' '--writetimeoutmillis+:')
         ;;
     create-virtual-server)
-        _command_args=('--defaultwebmodule+:' '--host+:' '--hosts+:' '--httplisteners+:' '--logfile+:' '--networklisteners+:' '--port+:' '--property+:' '--state+:state:(on off disabled)' '--target+:')
+        _command_args=('--defaultwebmodule+:' '--host+:' '--hosts+:' '--httplisteners+:' '--logfile+:' '--networklisteners+:' '--port+:' '--property+:' '--state+:state:(on off disabled)' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-admin-object)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-application-ref)
-        _command_args=('--cascade+:cascade:(true false)' '--host+:' '--port+:' '--target+:')
+        _command_args=('--cascade+:cascade:(true false)' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_standalone_instance')
         ;;
     delete-audit-module)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-auth-realm)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-config)
         _command_args=('--host+:' '--port+:')
@@ -478,7 +478,7 @@ case "$words[1]" in
         _command_args=('--cascade+:cascade:(true false)' '--host+:' '--port+:' '--target+:')
         ;;
     delete-connector-resource)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     delete-connector-security-map)
         _command_args=('--host+:' '--poolname+:' '--port+:' '--target+:')
@@ -487,16 +487,16 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:' '--raname+:')
         ;;
     delete-custom-resource)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     delete-domain)
         _command_args=('--domaindir+:')
         ;;
     delete-file-user)
-        _command_args=('--authrealmname+:' '--host+:' '--port+:' '--target+:')
+        _command_args=('--authrealmname+:' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-http)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-http-health-checker)
         _command_args=('--config+:' '--host+:' '--port+:')
@@ -505,58 +505,58 @@ case "$words[1]" in
         _command_args=('--config+:' '--force+:' '--host+:' '--lbname+:' '--port+:')
         ;;
     delete-http-listener)
-        _command_args=('--host+:' '--port+:' '--secure+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--secure+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-http-redirect)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-iiop-listener)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-instance)
         _command_args=('*:instances:_asadmin_instances' '--host+:' '--port+:' '--terse+:terse:(true false)')
         ;;
     delete-jacc-provider)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-javamail-resource)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     delete-jdbc-connection-pool)
         _command_args=('--cascade+:cascade:(true false)' '--host+:' '--port+:' '--target+:')
         ;;
     delete-jdbc-resource)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     delete-jms-host)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-jms-resource)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     delete-jmsdest)
-        _command_args=('--desttype+:' '--host+:' '--port+:' '--target+:')
+        _command_args=('--desttype+:' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-jndi-resource)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     delete-jvm-options)
-        _command_args=('--host+:' '--port+:' '--profiler+:profiler:(true false)' '--target+:')
+        _command_args=('--host+:' '--port+:' '--profiler+:profiler:(true false)' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-lifecycle-module)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     delete-local-instance)
         _command_args=('*:instances:_asadmin_instances' '--node+:node:_asadmin_nodes' '--nodedir+:')
         ;;
     delete-log-levels)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-message-security-provider)
-        _command_args=('--host+:' '--layer+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--layer+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-network-listener)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-node-config)
         _command_args=('*:nodes:_asadmin_nodes_config' '--host+:' '--port+:')
@@ -571,46 +571,46 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:')
         ;;
     delete-profiler)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-protocol)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-protocol-filter)
-        _command_args=('--host+:' '--port+:' '--protocol+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--protocol+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-protocol-finder)
-        _command_args=('--host+:' '--port+:' '--protocol+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--protocol+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-resource-adapter-config)
         _command_args=('--host+:' '--port+:' '--target+:')
         ;;
     delete-resource-ref)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_standalone_instance')
         ;;
     delete-ssl)
-        _command_args=('--host+:' '--port+:' '--target+:' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
         ;;
     delete-system-property)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_config_das_domain_standalone_instance')
         ;;
     delete-threadpool)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-transport)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-virtual-server)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     deploy)
-        _command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--port+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
+        _command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--port+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
         ;;
     deploydir)
-        _command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--port+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
+        _command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--port+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
         ;;
     disable)
-        _command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--isundeploy+:isundeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--port+:' '--properties+:' '--target+:')
+        _command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--isundeploy+:isundeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--port+:' '--properties+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance')
         ;;
     disable-http-lb-application)
         _command_args=('--host+:' '--name+:' '--port+:' '--timeout+:')
@@ -619,13 +619,13 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:' '--timeout+:')
         ;;
     disable-monitoring)
-        _command_args=('--host+:' '--modules+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--modules+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     disable-secure-admin)
         _command_args=('--host+:' '--port+:')
         ;;
     enable)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance')
         ;;
     enable-http-lb-application)
         _command_args=('--host+:' '--name+:' '--port+:')
@@ -634,7 +634,7 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:')
         ;;
     enable-monitoring)
-        _command_args=('--dtrace+:dtrace:(true false)' '--host+:' '--mbean+:mbean:(true false)' '--modules+:' '--options+:' '--pid+:' '--port+:' '--target+:')
+        _command_args=('--dtrace+:dtrace:(true false)' '--host+:' '--mbean+:mbean:(true false)' '--modules+:' '--options+:' '--pid+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     enable-secure-admin)
         _command_args=('--adminalias+:' '--host+:' '--instancealias+:' '--port+:')
@@ -649,16 +649,16 @@ case "$words[1]" in
         _command_args=('--appname+:' '--host+:' '--modulename+:' '--port+:')
         ;;
     flush-jmsdest)
-        _command_args=('--desttype+:' '--host+:' '--port+:' '--target+:')
+        _command_args=('--desttype+:' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     freeze-transaction-service)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance')
         ;;
     generate-domain-schema)
         _command_args=('--format+:' '--host+:' '--port+:' '--showdeprecated+:showdeprecated:(true false)' '--showsubclasses+:showsubclasses:(true false)')
         ;;
     generate-jvm-report)
-        _command_args=('--host+:' '--port+:' '--target+:' '--type+:type:(summary thread class memory log)')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_clustered_instance_das_standalone_instance' '--type+:type:(summary thread class memory log)')
         ;;
     get)
         _command_args=('--host+:' '--monitor+:monitor:(true false)' '--port+:')
@@ -685,25 +685,25 @@ case "$words[1]" in
         _command_args=('--archive+:' '--create+:create:(true false)' '--force+:force:(true false)' '--installdir+:' '--save+:save:(true false)' '--sshkeyfile+:' '--sshport+:' '--sshuser+:')
         ;;
     jms-ping)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance')
         ;;
     list)
         _command_args=('--host+:' '--monitor+:monitor:(true false)' '--port+:')
         ;;
     list-admin-objects)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance' '--host+:' '--port+:')
         ;;
     list-application-refs)
-        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--terse+:terse:(true false)')
+        _command_args=('*:targets:_asadmin_targets_cluster_das_standalone_instance' '--host+:' '--long+:long:(true false)' '--port+:' '--terse+:terse:(true false)')
         ;;
     list-applications)
-        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--resources+:resources:(true false)' '--subcomponents+:subcomponents:(true false)' '--terse+:terse:(true false)' '--type+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_das_domain_standalone_instance' '--host+:' '--long+:long:(true false)' '--port+:' '--resources+:resources:(true false)' '--subcomponents+:subcomponents:(true false)' '--terse+:terse:(true false)' '--type+:')
         ;;
     list-audit-modules)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance' '--host+:' '--port+:')
         ;;
     list-auth-realms)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance' '--host+:' '--port+:')
         ;;
     list-backups)
         _command_args=('--backupconfig+:' '--backupdir+:' '--domaindir+:' '--long+:long:(true false)')
@@ -715,19 +715,19 @@ case "$words[1]" in
         _command_args=('--localonly+:localonly:(true false)' '--remoteonly+:remoteonly:(true false)')
         ;;
     list-components)
-        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--resources+:resources:(true false)' '--subcomponents+:subcomponents:(true false)' '--terse+:terse:(true false)' '--type+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_das_domain_standalone_instance' '--host+:' '--long+:long:(true false)' '--port+:' '--resources+:resources:(true false)' '--subcomponents+:subcomponents:(true false)' '--terse+:terse:(true false)' '--type+:')
         ;;
     list-configs)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_config_das_domain_standalone_instance' '--host+:' '--port+:')
         ;;
     list-connector-connection-pools)
         _command_args=('--host+:' '--port+:')
         ;;
     list-connector-resources)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance' '--host+:' '--port+:')
         ;;
     list-connector-security-maps)
-        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--securitymap+:' '--target+:')
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--securitymap+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance')
         ;;
     list-connector-work-security-maps)
         _command_args=('--host+:' '--port+:' '--securitymap+:')
@@ -736,7 +736,7 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:')
         ;;
     list-custom-resources)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance')
         ;;
     list-descriptors)
         _command_args=('--host+:' '--port+:')
@@ -748,25 +748,25 @@ case "$words[1]" in
         _command_args=('--authrealmname+:' '--host+:' '--name+:' '--port+:')
         ;;
     list-file-users)
-        _command_args=('--authrealmname+:' '--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance' '--authrealmname+:' '--host+:' '--port+:')
         ;;
     list-http-lb-configs)
         _command_args=('--host+:' '--port+:')
         ;;
     list-http-listeners)
-        _command_args=('--host+:' '--long+:long:(true false)' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_config_das_standalone_instance' '--host+:' '--long+:long:(true false)' '--port+:')
         ;;
     list-iiop-listeners)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_config_das_domain_standalone_instance' '--host+:' '--port+:')
         ;;
     list-instances)
         _command_args=('--host+:' '--long+:long:(true false)' '--nostatus+:nostatus:(true false)' '--port+:' '--standaloneonly+:standaloneonly:(true false)' '--timeoutmsec+:')
         ;;
     list-jacc-providers)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance' '--host+:' '--port+:')
         ;;
     list-javamail-resources)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance')
         ;;
     list-jdbc-connection-pools)
         _command_args=('--host+:' '--port+:')
@@ -775,43 +775,43 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:')
         ;;
     list-jms-hosts)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     list-jms-resources)
-        _command_args=('--host+:' '--port+:' '--restype+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_das_domain_standalone_instance' '--host+:' '--port+:' '--restype+:')
         ;;
     list-jmsdest)
-        _command_args=('--desttype+:' '--host+:' '--port+:' '--property+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_config_das_standalone_instance' '--desttype+:' '--host+:' '--port+:' '--property+:')
         ;;
     list-jndi-entries)
-        _command_args=('--context+:' '--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance' '--context+:' '--host+:' '--port+:')
         ;;
     list-jndi-resources)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance')
         ;;
     list-jvm-options)
-        _command_args=('--host+:' '--port+:' '--profiler+:profiler:(true false)' '--target+:')
+        _command_args=('--host+:' '--port+:' '--profiler+:profiler:(true false)' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     list-libraries)
         _command_args=('--host+:' '--port+:' '--type+:type:(common ext app)')
         ;;
     list-lifecycle-modules)
-        _command_args=('--host+:' '--port+:' '--terse+:terse:(true false)')
+        _command_args=('*:targets:_asadmin_targets_cluster_das_domain_standalone_instance' '--host+:' '--port+:' '--terse+:terse:(true false)')
         ;;
     list-log-attributes)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance' '--host+:' '--port+:')
         ;;
     list-log-levels)
         _command_args=('--host+:' '--port+:')
         ;;
     list-message-security-providers)
-        _command_args=('--host+:' '--layer+:layer:(SOAP HttpServlet)' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance' '--host+:' '--layer+:layer:(SOAP HttpServlet)' '--port+:')
         ;;
     list-modules)
         _command_args=('--host+:' '--port+:')
         ;;
     list-network-listeners)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_config_das_standalone_instance' '--host+:' '--port+:')
         ;;
     list-nodes)
         _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--terse+:terse:(true false)')
@@ -832,19 +832,19 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:' '--type+:')
         ;;
     list-protocol-filters)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     list-protocol-finders)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     list-protocols)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_config_das_standalone_instance' '--host+:' '--port+:')
         ;;
     list-resource-adapter-configs)
         _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--raname+:')
         ;;
     list-resource-refs)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_das_standalone_instance' '--host+:' '--port+:')
         ;;
     list-sub-components)
         _command_args=('--appname+:' '--host+:' '--port+:' '--resources+:resources:(true false)' '--terse+:terse:(true false)' '--type+:')
@@ -853,19 +853,19 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:')
         ;;
     list-system-properties)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_config_das_domain_standalone_instance' '--host+:' '--port+:')
         ;;
     list-threadpools)
         _command_args=('--host+:' '--port+:')
         ;;
     list-timers)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_das_standalone_instance' '--host+:' '--port+:')
         ;;
     list-transports)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_config_das_standalone_instance' '--host+:' '--port+:')
         ;;
     list-virtual-servers)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_config_das_standalone_instance' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     list-web-context-param)
         _command_args=('--host+:' '--name+:' '--port+:')
@@ -874,10 +874,10 @@ case "$words[1]" in
         _command_args=('--host+:' '--name+:' '--port+:')
         ;;
     login)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_standalone_instance')
         ;;
     migrate-timers)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_clustered_instance_das')
         ;;
     monitor)
         _command_args=('--filename+:filename:directory:_files' '--filter+:' '--interval+:' '--type+:')
@@ -895,10 +895,10 @@ case "$words[1]" in
         _command_args=('*:nodes:_asadmin_nodes_ssh' '--host+:' '--port+:' '--validate+:validate:(true false)')
         ;;
     recover-transactions)
-        _command_args=('--host+:' '--port+:' '--target+:' '--transactionlogdir+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_clustered_instance_das_standalone_instance' '--transactionlogdir+:')
         ;;
     redeploy)
-        _command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--port+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
+        _command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--port+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
         ;;
     remove-library)
         _command_args=('--host+:' '--port+:' '--type+:type:(common ext app)')
@@ -916,19 +916,19 @@ case "$words[1]" in
         _command_args=('--backupconfig+:' '--backupdir+:' '--description+:' '--domaindir+:' '--filename+:' '--force+:force:(true false)' '--long+:long:(true false)')
         ;;
     rollback-transaction)
-        _command_args=('--host+:' '--port+:' '--target+:' '--transaction_id+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_clustered_instance_das_standalone_instance' '--transaction_id+:')
         ;;
     rotate-log)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_das_standalone_instance')
         ;;
     set)
         _command_args=('--host+:' '--port+:')
         ;;
     set-log-attributes)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     set-log-levels)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     set-web-context-param)
         _command_args=('--description+:' '--host+:' '--ignoredescriptoritem+:ignoredescriptoritem:(true false)' '--name+:' '--port+:' '--value+:')
@@ -940,7 +940,7 @@ case "$words[1]" in
         _command_args=('--generatekey+:generatekey:(true false)' '--sshkeyfile+:' '--sshport+:' '--sshpublickeyfile+:' '--sshuser+:')
         ;;
     show-component-status)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance')
         ;;
     start-cluster)
         _command_args=('*:clusters:_asadmin_clusters' '--autohadboverride+:autohadboverride:(true false)' '--host+:' '--port+:' '--verbose+:verbose:(true false)')
@@ -976,10 +976,10 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:')
         ;;
     undeploy)
-        _command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--port+:' '--properties+:' '--target+:')
+        _command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--port+:' '--properties+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     unfreeze-transaction-service)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance')
         ;;
     uninstall-node)
         _command_args=('--force+:force:(true false)' '--installdir+:' '--sshkeyfile+:' '--sshport+:' '--sshuser+:')
@@ -1003,7 +1003,7 @@ case "$words[1]" in
         _command_args=('--addgroups+:' '--addprincipals+:' '--host+:' '--port+:' '--raname+:' '--removegroups+:' '--removeprincipals+:')
         ;;
     update-file-user)
-        _command_args=('--authrealmname+:' '--groups+:' '--host+:' '--port+:' '--target+:' '--userpassword+:')
+        _command_args=('--authrealmname+:' '--groups+:' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--userpassword+:')
         ;;
     update-node-config)
         _command_args=('*:nodes:_asadmin_nodes_config' '--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:')
@@ -1039,10 +1039,18 @@ _asadmin_clusters() {
     compadd $(command asadmin list-clusters --terse | sed 's/ .*//')
 }
 
+_asadmin_configs() {
+    compadd $(command asadmin list-configs --terse)
+}
+
 _asadmin_instances() {
     compadd $(command asadmin list-instances --terse --nostatus domain)
 }
 
+_asadmin_instances_standalone() {
+    compadd $(command asadmin list-instances --terse --standaloneonly --nostatus domain)
+}
+
 _asadmin_libraries() {
     compadd $(command asadmin list-libraries --terse)
 }
@@ -1063,6 +1071,75 @@ _asadmin_nodes_ssh() {
     compadd $(command asadmin list-nodes-ssh --terse)
 }
 
+_asadmin_targets() {
+    _asadmin_instances
+    _asadmin_clusters
+    _asadmin_configs
+    compadd domain server
+}
+
+_asadmin_targets_cluster_clustered_instance_config_das_domain_standalone_instance() {
+    _asadmin_instances
+    _asadmin_clusters
+    _asadmin_configs
+    compadd domain server
+}
+
+_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance() {
+    _asadmin_instances
+    _asadmin_clusters
+    _asadmin_configs
+    compadd server
+}
+
+_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance() {
+    _asadmin_instances
+    _asadmin_clusters
+    compadd domain server
+}
+
+_asadmin_targets_cluster_clustered_instance_das_standalone_instance() {
+    _asadmin_instances
+    _asadmin_clusters
+    _asadmin_configs
+    compadd server
+}
+
+_asadmin_targets_cluster_config_das_standalone_instance() {
+    _asadmin_instances_standalone
+    _asadmin_clusters
+    _asadmin_configs
+    compadd server
+}
+
+_asadmin_targets_cluster_das_domain_standalone_instance() {
+    _asadmin_instances_standalone
+    _asadmin_clusters
+    compadd domain server
+}
+
+_asadmin_targets_cluster_das_standalone_instance() {
+    _asadmin_instances_standalone
+    _asadmin_clusters
+    compadd server
+}
+
+_asadmin_targets_clustered_instance_das() {
+    _asadmin_instances
+    compadd server
+}
+
+_asadmin_targets_clustered_instance_das_standalone_instance() {
+    _asadmin_instances
+    compadd server
+}
+
+_asadmin_targets_cluster_standalone_instance() {
+    _asadmin_clusters
+    _asadmin_instances_standalone
+}
+
+
 compadd '--help'
 _arguments \
     $_command_args \

From 0f3208316392d84a39a3e378968d2253f2f2429b Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Fri, 3 Aug 2012 10:02:19 +0200
Subject: [PATCH 336/364] in hindsight, this is probably a bad idea

---
 plugins/glassfish/glassfish.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/glassfish/glassfish.plugin.zsh b/plugins/glassfish/glassfish.plugin.zsh
index 49ca23299..fde2edb2a 100644
--- a/plugins/glassfish/glassfish.plugin.zsh
+++ b/plugins/glassfish/glassfish.plugin.zsh
@@ -1,3 +1,3 @@
 # if there is a user named 'glassfish' on the system, we'll assume
 # that is the user asadmin should be run as
-grep -e '^glassfish' /etc/passwd > /dev/null && alias asadmin='sudo -u glassfish asadmin'
\ No newline at end of file
+# grep -e '^glassfish' /etc/passwd > /dev/null && alias asadmin='sudo -u glassfish asadmin'
\ No newline at end of file

From bc02c28b736f4f9e6af97829da21128f42a4b8ba Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Fri, 3 Aug 2012 10:02:27 +0200
Subject: [PATCH 337/364] library completion

---
 plugins/glassfish/_asadmin | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/glassfish/_asadmin b/plugins/glassfish/_asadmin
index 9d6b5687b..e5401c918 100644
--- a/plugins/glassfish/_asadmin
+++ b/plugins/glassfish/_asadmin
@@ -901,7 +901,7 @@ case "$words[1]" in
         _command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--port+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
         ;;
     remove-library)
-        _command_args=('--host+:' '--port+:' '--type+:type:(common ext app)')
+        _command_args=('*:libraries:_asadmin_libraries' '--host+:' '--port+:' '--type+:type:(common ext app)')
         ;;
     restart-domain)
         _command_args=('--debug+:debug:(true false)' '--domaindir+:' '--force+:force:(true false)' '--kill+:kill:(true false)')

From 8194aa9554a0edf7998b1c5dabeb8e37f5807191 Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Fri, 3 Aug 2012 10:15:01 +0200
Subject: [PATCH 338/364] application completion

---
 plugins/glassfish/_asadmin | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/plugins/glassfish/_asadmin b/plugins/glassfish/_asadmin
index e5401c918..a6a7af549 100644
--- a/plugins/glassfish/_asadmin
+++ b/plugins/glassfish/_asadmin
@@ -976,7 +976,7 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:')
         ;;
     undeploy)
-        _command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--port+:' '--properties+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
+        _command_args=('*:applications:_asadmin_applications' '--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--port+:' '--properties+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     unfreeze-transaction-service)
         _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance')
@@ -1035,8 +1035,12 @@ case "$words[1]" in
 esac
 
 
+_asadmin_applications() {
+    compadd $(command asadmin list-applications --terse | sed 's/\s.*//')
+}
+
 _asadmin_clusters() {
-    compadd $(command asadmin list-clusters --terse | sed 's/ .*//')
+    compadd $(command asadmin list-clusters --terse | sed 's/\s.*//')
 }
 
 _asadmin_configs() {

From c1ada7a938268ce39cc83b71bd6d2da0047979db Mon Sep 17 00:00:00 2001
From: cybozuty <ty_c@cybozu.co.jp>
Date: Mon, 3 Sep 2012 15:31:54 +0900
Subject: [PATCH 339/364] Rendering the 'vagrant box (remove|repackage)'
 completion code independant of Vagrant implementation details.

---
 plugins/vagrant/_vagrant | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/vagrant/_vagrant b/plugins/vagrant/_vagrant
index 9af8cb036..d55ae6709 100644
--- a/plugins/vagrant/_vagrant
+++ b/plugins/vagrant/_vagrant
@@ -44,7 +44,7 @@ __task_list ()
 
 __box_list ()
 {
-    _wanted application expl 'command' compadd $(command ls -1 $HOME/.vagrant/boxes 2>/dev/null| sed -e 's/ /\\ /g')
+    _wanted application expl 'command' compadd $(command vagrant box list | sed -e 's/ /\\ /g')
 }
 
 __vm_list ()

From c0e3c553bcdd8e4bc74d602d239a4330ac2641e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sun, 23 Mar 2014 02:03:12 +0100
Subject: [PATCH 340/364] Fix export syntax of $GREP_OPTIONS

Fixes #2641, #2642
---
 lib/grep.zsh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/grep.zsh b/lib/grep.zsh
index 25345bd06..977435ee4 100644
--- a/lib/grep.zsh
+++ b/lib/grep.zsh
@@ -8,5 +8,6 @@ GREP_OPTIONS=
 for PATTERN in .cvs .git .hg .svn; do
     GREP_OPTIONS+="--exclude-dir=$PATTERN "
 done
-export GREP_OPTIONS+='--color=auto '
-export GREP_COLOR='1;32'
\ No newline at end of file
+GREP_OPTIONS+="--color=auto"
+export GREP_OPTIONS="$GREP_OPTIONS"
+export GREP_COLOR='1;32'

From ffd5cb20eee51eb6e25a8ff50af912f1a4038c03 Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Sun, 23 Mar 2014 14:39:38 +0100
Subject: [PATCH 341/364] suggest setting $LANG to fix #1286 and fix #1823

---
 templates/zshrc.zsh-template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index c25c20e75..5e1d9b2f1 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -54,6 +54,9 @@ source $ZSH/oh-my-zsh.sh
 export PATH=$HOME/bin:/usr/local/bin:$PATH
 # export MANPATH="/usr/local/man:$MANPATH"
 
+# You may need to manually set your language environment
+# export LANG=en_US.UTF-8
+
 # # Preferred editor for local and remote sessions
 # if [[ -n $SSH_CONNECTION ]]; then
 #   export EDITOR='vim'

From 2697a1825724b243343f3fbf3f5cebf5d64dc00f Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Sun, 23 Mar 2014 14:45:55 +0100
Subject: [PATCH 342/364] mention $ZSH_CUSTOM as suggested in #2295

---
 templates/zshrc.zsh-template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 5e1d9b2f1..48757ba0e 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -42,6 +42,9 @@ ZSH_THEME="robbyrussell"
 # The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
 # HIST_STAMPS="mm/dd/yyyy"
 
+# Would you like to use another custom folder than $ZSH/custom?
+# ZSH_CUSTOM=/path/to/new-custom-folder
+
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)

From 732bca071e0f1e53735645daf3c48eb8b03af71c Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Sun, 23 Mar 2014 14:47:10 +0100
Subject: [PATCH 343/364] $ZSH is the OMZ installation folder, not
 configuration

---
 templates/zshrc.zsh-template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 48757ba0e..7b7f1df85 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -1,4 +1,4 @@
-# Path to your oh-my-zsh configuration.
+# Path to your oh-my-zsh installation.
 export ZSH=$HOME/.oh-my-zsh
 
 # Set name of the theme to load.

From 94a5cc5c631301bbcd4ea286144099223cee6011 Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Tue, 31 Dec 2013 14:54:34 +0100
Subject: [PATCH 344/364] Updates spectrum.zsh

---
 lib/spectrum.zsh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/spectrum.zsh b/lib/spectrum.zsh
index 166c942fb..b683aca29 100644
--- a/lib/spectrum.zsh
+++ b/lib/spectrum.zsh
@@ -19,17 +19,19 @@ for color in {000..255}; do
     BG[$color]="%{[48;5;${color}m%}"
 done
 
+
+ZSH_SPECTRUM_TEXT=${ZSH_SPECTRUM_TEXT:-Arma virumque cano Troiae qui primus ab oris}
+
 # Show all 256 colors with color number
 function spectrum_ls() {
   for code in {000..255}; do
-    print -P -- "$code: %F{$code}Test%f"
+    print -P -- "$code: %F{$code}$ZSH_SPECTRUM_TEXT%f"
   done
 }
 
 # Show all 256 colors where the background is set to specific color
 function spectrum_bls() {
   for code in {000..255}; do
-    ((cc = code + 1))
-    print -P -- "$BG[$code]$code: Test %{$reset_color%}"
+    print -P -- "$BG[$code]$code: $ZSH_SPECTRUM_TEXT %{$reset_color%}"
   done
 }

From a3b357abd89c781776329253790e60d56f78b883 Mon Sep 17 00:00:00 2001
From: Bob Williams <bobwilliams.ii@gmail.com>
Date: Wed, 26 Feb 2014 19:35:24 -0500
Subject: [PATCH 345/364] Adds command line aliases useful for dealing with
 JSON

---
 plugins/jsontools/jsontools.plugin.zsh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 plugins/jsontools/jsontools.plugin.zsh

diff --git a/plugins/jsontools/jsontools.plugin.zsh b/plugins/jsontools/jsontools.plugin.zsh
new file mode 100644
index 000000000..51578b349
--- /dev/null
+++ b/plugins/jsontools/jsontools.plugin.zsh
@@ -0,0 +1,14 @@
+# JSON Tools
+# Adds command line aliases useful for dealing with JSON
+
+if [[ $(whence $JSONTOOLS_METHOD) = "" ]]; then
+    JSONTOOLS_METHOD=""
+fi
+
+if [[ $(whence python) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xpython" ) ]]; then
+	alias pp_json='python -mjson.tool'
+elif [[ $(whence ruby) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xruby" ) ]]; then
+	alias pp_json='ruby -e "require \"json\"; require \"yaml\"; puts JSON.parse(STDIN.read).to_yaml"'
+fi
+
+unset JSONTOOLS_METHOD
\ No newline at end of file

From 64bb1a255ae52db501fa98608f4db865a7b4811a Mon Sep 17 00:00:00 2001
From: Bob Williams <bobwilliams.ii@gmail.com>
Date: Thu, 27 Feb 2014 10:56:07 -0500
Subject: [PATCH 346/364] adding support for node

---
 plugins/jsontools/jsontools.plugin.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/jsontools/jsontools.plugin.zsh b/plugins/jsontools/jsontools.plugin.zsh
index 51578b349..7b6f8c585 100644
--- a/plugins/jsontools/jsontools.plugin.zsh
+++ b/plugins/jsontools/jsontools.plugin.zsh
@@ -5,7 +5,9 @@ if [[ $(whence $JSONTOOLS_METHOD) = "" ]]; then
     JSONTOOLS_METHOD=""
 fi
 
-if [[ $(whence python) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xpython" ) ]]; then
+if [[ $(whence node) != "" && ( "x$JSONTOOLS_METHOD" = "x"  || "x$JSONTOOLS_METHOD" = "xnode" ) ]]; then
+    alias pp_json='node -e "console.log(JSON.stringify(process.argv[1]), null, 4)"'
+elif [[ $(whence python) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xpython" ) ]]; then
 	alias pp_json='python -mjson.tool'
 elif [[ $(whence ruby) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xruby" ) ]]; then
 	alias pp_json='ruby -e "require \"json\"; require \"yaml\"; puts JSON.parse(STDIN.read).to_yaml"'

From 44467877a8eb7483cc462e679476a1ccf7c8fc18 Mon Sep 17 00:00:00 2001
From: Phil Eichinger <phil@zankapfel.net>
Date: Tue, 25 Mar 2014 13:43:36 +0100
Subject: [PATCH 347/364] New aliases for 'apt-get' and 'aptitude' as they were
 overwritten by later aliases

---
 plugins/debian/debian.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index 28dfb82a5..6e45e0521 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -21,8 +21,8 @@ fi
 # Aliases ###################################################################
 # These are for more obscure uses of apt-get and aptitude that aren't covered
 # below.
-alias ag='apt-get'
-alias ap='aptitude'
+alias age='apt-get'
+alias api='aptitude'
 
 # Some self-explanatory aliases
 alias acs="apt-cache search"

From 9eadaf562ae403d9721ce5d9ea998769dd500cc9 Mon Sep 17 00:00:00 2001
From: Patrick Stadler <patrick.stadler@gmail.com>
Date: Tue, 25 Mar 2014 16:56:09 +0100
Subject: [PATCH 348/364] brew-cask plugin: use spaces instead of tabs

---
 plugins/brew-cask/brew-cask.plugin.zsh | 114 ++++++++++++-------------
 1 file changed, 57 insertions(+), 57 deletions(-)

diff --git a/plugins/brew-cask/brew-cask.plugin.zsh b/plugins/brew-cask/brew-cask.plugin.zsh
index e0ee62293..91ce0f498 100644
--- a/plugins/brew-cask/brew-cask.plugin.zsh
+++ b/plugins/brew-cask/brew-cask.plugin.zsh
@@ -9,76 +9,76 @@ compdef _brew-cask brew
 
 _brew-cask()
 {
-	local curcontext="$curcontext" state line
-	typeset -A opt_args
+  local curcontext="$curcontext" state line
+  typeset -A opt_args
 
-	_arguments -C \
-		':command:->command' \
-		':subcmd:->subcmd' \
-		'*::options:->options'
+  _arguments -C \
+    ':command:->command' \
+    ':subcmd:->subcmd' \
+    '*::options:->options'
 
-	case $state in
-		(command)
-			__call_original_brew
-			cask_commands=(
-				'cask:manage casks'
-			)
-			_describe -t commands 'brew cask command' cask_commands ;;
+  case $state in
+    (command)
+      __call_original_brew
+      cask_commands=(
+        'cask:manage casks'
+      )
+      _describe -t commands 'brew cask command' cask_commands ;;
 
-		(subcmd)
-			case "$line[1]" in
-				cask)
-					if (( CURRENT == 3 )); then
-						local -a subcommands
-						subcommands=(
-							"alfred:used to modify Alfred's scope to include the Caskroom"
-							'audit:verifies installability of casks'
-							'checklinks:checks for bad cask links'
-							'cleanup:cleans up cached downloads'
-							'create:creates a cask of the given name and opens it in an editor'
-							'doctor:checks for configuration issues'
-							'edit:edits the cask of the given name'
-							'fetch:downloads Cask resources to local cache'
-							'home:opens the homepage of the cask of the given name'
-							'info:displays information about the cask of the given name'
-							'install:installs the cask of the given name'
-							'list:with no args, lists installed casks; given installed casks, lists installed files'
-							'search:searches all known casks'
-							'uninstall:uninstalls the cask of the given name'
-							"update:a synonym for 'brew update'"
-						)
-						_describe -t commands "brew cask subcommand" subcommands
-					fi ;;
+    (subcmd)
+      case "$line[1]" in
+        cask)
+          if (( CURRENT == 3 )); then
+            local -a subcommands
+            subcommands=(
+              "alfred:used to modify Alfred's scope to include the Caskroom"
+              'audit:verifies installability of casks'
+              'checklinks:checks for bad cask links'
+              'cleanup:cleans up cached downloads'
+              'create:creates a cask of the given name and opens it in an editor'
+              'doctor:checks for configuration issues'
+              'edit:edits the cask of the given name'
+              'fetch:downloads Cask resources to local cache'
+              'home:opens the homepage of the cask of the given name'
+              'info:displays information about the cask of the given name'
+              'install:installs the cask of the given name'
+              'list:with no args, lists installed casks; given installed casks, lists installed files'
+              'search:searches all known casks'
+              'uninstall:uninstalls the cask of the given name'
+              "update:a synonym for 'brew update'"
+            )
+            _describe -t commands "brew cask subcommand" subcommands
+          fi ;;
 
-				*)
-					__call_original_brew ;;
-			esac ;;
+        *)
+          __call_original_brew ;;
+      esac ;;
 
-		(options)
-			local -a casks installed_casks
-			local expl
-			case "$line[2]" in
-				list|uninstall)
-					__brew_installed_casks
-					_wanted installed_casks expl 'installed casks' compadd -a installed_casks ;;
-				audit|edit|home|info|install)
-					__brew_all_casks
-					_wanted casks expl 'all casks' compadd -a casks ;;
-			esac ;;
-	esac
+    (options)
+      local -a casks installed_casks
+      local expl
+      case "$line[2]" in
+        list|uninstall)
+          __brew_installed_casks
+          _wanted installed_casks expl 'installed casks' compadd -a installed_casks ;;
+        audit|edit|home|info|install)
+          __brew_all_casks
+          _wanted casks expl 'all casks' compadd -a casks ;;
+      esac ;;
+  esac
 }
 
 __brew_all_casks() {
-	casks=(`brew cask search`)
+  casks=(`brew cask search`)
 }
 
 __brew_installed_casks() {
-	installed_casks=(`brew cask list`)
+  installed_casks=(`brew cask list`)
 }
 
 __call_original_brew()
 {
-	local ret=1
-	_call_function ret _brew
-	compdef _brew-cask brew
+  local ret=1
+  _call_function ret _brew
+  compdef _brew-cask brew
 }

From 015b742153654c0b127f8f158ab80e51f6ea8ec3 Mon Sep 17 00:00:00 2001
From: Simon Courtois <scourtois_github@cubyx.fr>
Date: Tue, 25 Mar 2014 17:16:20 +0100
Subject: [PATCH 349/364] Allowing path with spaces in pow plugin

This commit allows for paths with spaces to be symlinked
in Pow.

If an application is located in a folder like `/some path/to the/app`
the powit command would fail when it shouldn't. It's not the case
anymore.
---
 plugins/pow/pow.plugin.zsh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/pow/pow.plugin.zsh b/plugins/pow/pow.plugin.zsh
index 7f86c0c76..d85c88777 100644
--- a/plugins/pow/pow.plugin.zsh
+++ b/plugins/pow/pow.plugin.zsh
@@ -21,8 +21,8 @@
 
 rack_root(){
   setopt chaselinks
-  local orgdir=$(pwd)
-  local basedir=$(pwd)
+  local orgdir="$(pwd)"
+  local basedir="$(pwd)"
 
   while [[ $basedir != '/' ]]; do
     test -e "$basedir/config.ru" && break
@@ -30,7 +30,7 @@ rack_root(){
     basedir="$(pwd)"
   done
 
-  builtin cd $orgdir 2>/dev/null
+  builtin cd "$orgdir" 2>/dev/null
   [[ ${basedir} == "/" ]] && return 1
   echo $basedir
 }
@@ -56,19 +56,19 @@ kapow(){
 compctl -W ~/.pow -/ kapow
 
 powit(){
-  local basedir=$(pwd)
+  local basedir="$(pwd)"
   local vhost=$1
   [ ! -n "$vhost" ] && vhost=$(rack_root_detect)
   if [ ! -h ~/.pow/$vhost ]
   then
     echo "pow: Symlinking your app with pow. ${vhost}"
-    [ ! -d ~/.pow/${vhost} ] && ln -s $basedir ~/.pow/$vhost
+    [ ! -d ~/.pow/${vhost} ] && ln -s "$basedir" ~/.pow/$vhost
     return 1
   fi
 }
 
 powed(){
-  local basedir=$(rack_root)
+  local basedir="$(rack_root)"
   find ~/.pow/ -type l -lname "*$basedir*" -exec basename {}'.dev' \;
 }
 
@@ -82,4 +82,4 @@ repow(){
 }
 
 # View the standard out (puts) from any pow app
-alias kaput="tail -f ~/Library/Logs/Pow/apps/*"
\ No newline at end of file
+alias kaput="tail -f ~/Library/Logs/Pow/apps/*"

From 7b08f494e3604f18e7b9b31959a6da6d97abcc65 Mon Sep 17 00:00:00 2001
From: Kevin Bongart <contact@kevinbongart.net>
Date: Tue, 25 Mar 2014 12:37:25 -0400
Subject: [PATCH 350/364] Add README file to rake-fast plugin

---
 plugins/rake-fast/README.md            | 23 +++++++++++++++++++++++
 plugins/rake-fast/rake-fast.plugin.zsh | 17 -----------------
 2 files changed, 23 insertions(+), 17 deletions(-)
 create mode 100644 plugins/rake-fast/README.md

diff --git a/plugins/rake-fast/README.md b/plugins/rake-fast/README.md
new file mode 100644
index 000000000..f56142f69
--- /dev/null
+++ b/plugins/rake-fast/README.md
@@ -0,0 +1,23 @@
+# rake-fast
+
+Fast rake autocompletion plugin.
+
+This script caches the output for later usage and significantly speeds it up. It generates a .rake_tasks cache file in parallel to the Rakefile. It also checks the file modification dates to see if it needs to regenerate the cache file.
+
+This is entirely based on [this pull request by Ullrich Schäfer](https://github.com/robb/.dotfiles/pull/10/), which is inspired by [this Ruby on Rails trick from 2006](http://weblog.rubyonrails.org/2006/3/9/fast-rake-task-completion-for-zsh/).
+
+Think about that. 2006.
+
+## Installation
+
+Just add the plugin to your `.zshrc`:
+
+```bash
+plugins=(foo bar rake-fast)
+```
+
+You might consider adding `.rake_tasks` to your [global .gitignore](https://help.github.com/articles/ignoring-files#global-gitignore)
+
+## Usage
+
+`rake`, then press tab
diff --git a/plugins/rake-fast/rake-fast.plugin.zsh b/plugins/rake-fast/rake-fast.plugin.zsh
index 320855233..545b6c049 100644
--- a/plugins/rake-fast/rake-fast.plugin.zsh
+++ b/plugins/rake-fast/rake-fast.plugin.zsh
@@ -1,20 +1,3 @@
-# rake-fast
-# Fast rake autocompletion plugin for oh-my-zsh
-
-# This script caches the output for later usage and significantly speeds it up.
-# It generates a .rake_tasks file in parallel to the Rakefile.
-
-# You'll want to add `.rake_tasks` to your global .git_ignore file:
-# https://help.github.com/articles/ignoring-files#global-gitignore
-
-# You can force .rake_tasks to refresh with:
-# $ rake_refresh
-
-# This is entirely based on Ullrich Schäfer's work
-# (https://github.com/robb/.dotfiles/pull/10/),
-# which is inspired by this Ruby on Rails trick from 2006:
-# http://weblog.rubyonrails.org/2006/3/9/fast-rake-task-completion-for-zsh/
-
 _rake_refresh () {
   if [ -f .rake_tasks ]; then
     rm .rake_tasks

From 5137e0e509ae4d6534be132d614d43ea53d8a4e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Tue, 25 Mar 2014 21:01:34 +0100
Subject: [PATCH 351/364] Escape % in $CMD variable

Fixes formatting on some rare cases when a percent ends up
in the $CMD variable, like these below:

- When assigning a variable, $CMD ends up with the second parameter;
in this case, $CMD will contain '+%s%N', messing with the syntax:

 $ a=`date +%s%N`

- A function (or command in general) that contains a percent symbol:

 $ to\%() { echo $(( $1 * 100 / $3))\% } # $CMD=to%()
 $ to% 2 of 10 # $CMD=to%
---
 lib/termsupport.zsh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 5f2fe63d4..9c0a430fb 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -26,8 +26,11 @@ function omz_termsupport_precmd {
 function omz_termsupport_preexec {
   emulate -L zsh
   setopt extended_glob
-  local CMD=${1[(wr)^(*=*|sudo|ssh|rake|-*)]} #cmd name only, or if this is sudo or ssh, the next cmd
+
+  # cmd name only, or if this is sudo or ssh, the next cmd
+  local CMD=${1[(wr)^(*=*|sudo|ssh|rake|-*)]:gs/%/%%}
   local LINE="${2:gs/%/%%}"
+
   title '$CMD' '%100>...>$LINE%<<'
 }
 

From 982b534ce8cdf439c96bc48ff58f890e9e350d30 Mon Sep 17 00:00:00 2001
From: Bob Williams <bobwilliams.ii@gmail.com>
Date: Tue, 25 Mar 2014 16:20:25 -0400
Subject: [PATCH 352/364] adding the is_json tool and associated readme.md
 details

---
 plugins/jsontools/README.md            | 17 +++++++++++++++--
 plugins/jsontools/jsontools.plugin.zsh | 15 +++++++++++++--
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/plugins/jsontools/README.md b/plugins/jsontools/README.md
index 9f07194c9..309ce9b5f 100644
--- a/plugins/jsontools/README.md
+++ b/plugins/jsontools/README.md
@@ -5,10 +5,11 @@ Handy command line tools for dealing with json data.
 ## Tools
 
 - **pp_json** - pretty prints json
+- **is_json** - returns true if valid json; false otherwise
 
-## Usage
+## Examples
 
-##### pp_json - examples
+##### pp_json
 
 ```sh
 # curl json data and pretty print the results
@@ -19,4 +20,16 @@ less data.json | pp_json
 
 # json data directly from the command line
 echo '{"b":2, "a":1}' | pp_json
+```
+
+##### is_json
+```sh
+# curl json data and pretty print the results
+curl https://coderwall.com/bobwilliams.json | is_json
+
+# pretty print the contents of an existing json file
+less data.json | is_json
+
+# json data directly from the command line
+echo '{"b":2, "a":1}' | is_json
 ```
\ No newline at end of file
diff --git a/plugins/jsontools/jsontools.plugin.zsh b/plugins/jsontools/jsontools.plugin.zsh
index 729763c33..b8b558807 100644
--- a/plugins/jsontools/jsontools.plugin.zsh
+++ b/plugins/jsontools/jsontools.plugin.zsh
@@ -2,15 +2,26 @@
 # Adds command line aliases useful for dealing with JSON
 
 if [[ $(whence $JSONTOOLS_METHOD) = "" ]]; then
-    JSONTOOLS_METHOD=""
+	JSONTOOLS_METHOD=""
 fi
 
 if [[ $(whence node) != "" && ( "x$JSONTOOLS_METHOD" = "x"  || "x$JSONTOOLS_METHOD" = "xnode" ) ]]; then
 	alias pp_json='xargs -0 node -e "console.log(JSON.stringify(JSON.parse(process.argv[1]), null, 4));"'
+	alias is_json='xargs -0 node -e "try {json = JSON.parse(process.argv[1]);} catch (e) { console.log(false); json = null; } if(json) { console.log(true); }"'
 elif [[ $(whence python) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xpython" ) ]]; then
 	alias pp_json='python -mjson.tool'
+	alias is_json='python -c "
+import json, sys;
+try: 
+	json.loads(sys.stdin.read())
+except ValueError, e: 
+	print False
+else:
+	print True
+sys.exit(0)"'
 elif [[ $(whence ruby) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xruby" ) ]]; then
 	alias pp_json='ruby -e "require \"json\"; require \"yaml\"; puts JSON.parse(STDIN.read).to_yaml"'
+	alias is_json='ruby -e "require \"json\"; begin; JSON.parse(STDIN.read); puts true; rescue Exception => e; puts false; end"'
 fi
 
-unset JSONTOOLS_METHOD
\ No newline at end of file
+unset JSONTOOLS_METHOD

From 9650861e56a3404313adc35cbcb1f32a7015b99d Mon Sep 17 00:00:00 2001
From: Andre Eriksson <andre.eriksson@trioptima.com>
Date: Wed, 26 Mar 2014 15:05:00 +0900
Subject: [PATCH 353/364] Fix broken reverse-menu-complete keybinding.

Since e537ee9, the reverse-menu-complete keybinding has no longer been
properly bound (it was accidentally bound to the delete key).

This commit again binds it to shift-tab.
---
 lib/key-bindings.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
index 5f3f237c7..9063c6a18 100644
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@@ -46,8 +46,8 @@ bindkey ' ' magic-space                               # [Space] - do history exp
 bindkey '^[[1;5C' forward-word                        # [Ctrl-RightArrow] - move forward one word
 bindkey '^[[1;5D' backward-word                       # [Ctrl-LeftArrow] - move backward one word
 
-if [[ "${terminfo[kdch1]}" != "" ]]; then
-  bindkey "${terminfo[kdch1]}" reverse-menu-complete  # [Shift-Tab] - move through the completion menu backwards
+if [[ "${terminfo[kcbt]}" != "" ]]; then
+  bindkey "${terminfo[kcbt]}" reverse-menu-complete   # [Shift-Tab] - move through the completion menu backwards
 fi
 
 bindkey '^?' backward-delete-char                     # [Backspace] - delete backward

From 76e1edf31f73e20487d7d7fe4a579361bb86815b Mon Sep 17 00:00:00 2001
From: Bob Maerten <bob.maerten@gmail.com>
Date: Wed, 26 Mar 2014 10:40:46 +0100
Subject: [PATCH 354/364] Matching autocomplete for Docker v0.9.1

Many deprecations since 0.8 and new commands.
---
 plugins/docker/_docker | 162 +++++++++++++++++++++++++++++------------
 1 file changed, 114 insertions(+), 48 deletions(-)

diff --git a/plugins/docker/_docker b/plugins/docker/_docker
index 12eee7a15..5acd19edf 100644
--- a/plugins/docker/_docker
+++ b/plugins/docker/_docker
@@ -2,7 +2,8 @@
 
 # Docker autocompletion for oh-my-zsh
 # Requires: Docker installed
-# Author : Azaan (@aeonazaan)
+# Author: Azaan (@aeonazaan)
+# Updates: Bob Maerten (@bobmaerten) for Docker v0.9+
 
 
 # ----- Helper functions
@@ -24,21 +25,30 @@ __docker_images() {
 # Seperate function for each command, makes extension easier later
 # ---------------------------
 __attach() {
+    _arguments \
+        '--no-stdin[Do not attach stdin]' \
+        '--sig-proxy[Proxify all received signal to the process (even in non-tty mode)]'
     __docker_containers
 }
 
 __build() {
     _arguments \
-        '-q=false[Suppress verbose build output]' \
-        '-t="[fuck to be applied to the resulting image in case of success]' \
+        '--no-cache[Do not use cache when building the image]' \
+        '(-q,--quiet)'{-q,--quiet}'[Suppress the verbose output generated by the containers]' \
+        '--rm[Remove intermediate containers after a successful build]' \
+        '(-t,--tag=)'{-t,--tag=}'[Repository name (and optionally a tag) to be applied to the resulting image in case of success]' \
         '*:files:_files'
 }
 
 __commit() {
     _arguments \
-        '-author="[Author]' \
-        '-m="[Commit message]' \
-        '-run="[Config automatically applied when the image is run.\n]'
+        '(-a,--author=)'{-a,--author=}'[Author (eg. "John Hannibal Smith <hannibal@a-team.com>"]' \
+        '(-m,--message=)'{-m,--message=}'[Commit message]' \
+        '--run=[Config automatically applied when the image is run.]'
+    __docker_containers
+}
+
+__cp() {
     __docker_containers
 }
 
@@ -46,21 +56,29 @@ __diff() {
     __docker_containers
 }
 
+__events() {
+    _arguments \
+        '--since=[Show previously created events and then stream.]'
+}
+
 __export() {
    __docker_containers
 }
 
-
 __history() {
+    _arguments \
+        '--no-trunc=[Don''t truncate output]' \
+        '(-q,--quiet)'{-q,--quiet}'[Only show numeric IDs]'
     __docker_images
 }
 
 __images() {
     _arguments \
-        '-a[show all images]' \
-        '-notrunc[dont truncate output]' \
-        '-q[only show numeric IDs]' \
-        '-viz[output graph in graphviz format]'
+        '(-a,--all)'{-a,--all}'[Show all images (by default filter out the intermediate images used to build)]' \
+        '--no-trunc[Don''t truncate output]' \
+        '(-q,--quiet=)'{-q,--quiet=}'[Only show numeric IDs]' \
+        '(-t,--tree=)'{-t,--tree=}'[Output graph in tree format]' \
+        '(-v,--viz=)'{-v,--viz=}'[Output graph in graphviz format]'
     __docker_images
 }
 
@@ -86,14 +104,20 @@ __kill() {
     __docker_containers
 }
 
+__load() {
+    _arguments '*:files:_files'
+}
+
 __login() {
     _arguments \
-        '-e="[email]' \
-        '-p="[password]' \
-        '-u="[username]' \
+        '(-e,--email=)'{-e,-email=}'[Email]' \
+        '(-p,--password=)'{-p,-password=}'[Password]' \
+        '(-u,--username=)'{-u,-username=}'[Username]'
 }
 
 __logs() {
+    _arguments \
+        '(-f,--follow)'{-f,-follow}'[Follow log output]'
     __docker_containers
 }
 
@@ -107,77 +131,107 @@ __top() {
 
 __ps() {
     _arguments \
-        '-a[Show all containers. Only running containers are shown by default.]' \
-        '-beforeId="[Show only container created before Id, include non-running ones.]' \
-        '-l[Show only the latest created container, include non-running ones.]' \
-        '-n=[Show n last created containers, include non-running ones.]' \
-        '-notrunc[Dont truncate output]' \
-        '-q[Only display numeric IDs]' \
-        '-s[Display sizes]' \
-        '-sinceId="[Show only containers created since Id, include non-running ones.]'
+        '(-a,--all)'{-a,--all}'[Show all containers. Only running containers are shown by default.]' \
+        '--before-id=[Show only container created before Id, include non-running ones.]' \
+        '(-l,--latest)'{-l,--latest}'[Show only the latest created container, include non-running ones.]' \
+        '-n=[Show n last created containers, include non-running ones. default=-1.]' \
+        '--no-trunc[Don''t truncate output]' \
+        '(-q,--quiet)'{-q,--quiet}'[Only display numeric IDs]' \
+        '(-s,--size)'{-s,--size}'[Display sizes]' \
+        '--since-id=[Show only containers created since Id, include non-running ones.]'
 }
 
 __pull() {
-    _arguments '-t="[Download tagged image in repository]'
+    _arguments \
+        '(-t,--tag=)'{-t,--tag=}'[Download tagged image in repository]'
 }
 
 __push() {
-
+    # no arguments
 }
 
 __restart() {
-    _arguments '-t=[number of seconds to try to stop before killing]'
+    _arguments \
+        '(-t,--time=)'{-t,--time=}'[Number of seconds to try to stop for before killing the container. Once killed it will then be restarted. Default=10]'
     __docker_containers
 }
 
 __rm() {
-    _arguments '-v[Remove the volumes associated to the container]'
+    _arguments \
+        '(-f,--force=)'{-f,--force=}'[Force removal of running container]' \
+        '(-l,--link=)'{-l,--link=}'[Remove the specified link and not the underlying container]' \
+        '(-v,--volumes=)'{-v,--volumes=}'[Remove the volumes associated to the container]'
     __docker_containers
 }
 
 __rmi() {
+    _arguments \
+        '(-f,--force=)'{-f,--force=}'[Force]' \
     __docker_images
 }
 
 __run() {
     _arguments \
-        '-a=[Attach to stdin, stdout or stderr.]' \
-        '-c=[CPU shares (relative weight)]' \
-        '-d[Detached mode: leave the container running in the background]' \
-        '-dns=[Set custom dns servers]' \
-        '-e=[Set environment variables]' \
-        '-entrypoint="[Overwrite the default entrypoint of the image]' \
-        '-h="[Container host name]' \
-        '-i[Keep stdin open even if not attached]' \
-        '-m=[Memory limit (in bytes)]' \
-        '-p=[Expose a containers port to the host (use docker port to see the actual mapping)]' \
-        '-t[Allocate a pseudo-tty]' \
-        '-u="[Username or UID]' \
-        '-v=[Bind mount a volume (e.g. from the host: -v /host:/container, from docker: -v /container)]' \
-        '-volumes-from="[Mount volumes from the specified container]'
+        '(-P,--publish-all=)'{-P,--publish-all=}'[Publish all exposed ports to the host interfaces]' \
+        '(-a,--attach=)'{-a,--attach=}'[Attach to stdin, stdout or stderr.]' \
+        '(-c,--cpu-shares=)'{-c,--cpu-shares=}': CPU shares (relative weight)]' \
+        '--cidfile=[Write the container ID to the file]' \
+        '(-d,--detach=)'{-d,--detach=}'[Detached mode: Run container in the background, print new container id]' \
+        '--dns=[Set custom dns servers]' \
+        '(-e,--env=)'{-e,--env=}'[Set environment variables]' \
+        '--entrypoint=[Overwrite the default entrypoint of the image]' \
+        '--expose=[Expose a port from the container without publishing it to your host]' \
+        '(-h,--hostname=)'{-h,--hostname=}'[Container host name]' \
+        '(-i,--interactive=)'{-i,--interactive=}'[Keep stdin open even if not attached]' \
+        '--link=[Add link to another container (name:alias)]' \
+        '--lxc-conf=[Add custom lxc options -lxc-conf="lxc.cgroup.cpuset.cpus = 0,1"]' \
+        '(-m,--memory=)'{-m,--memory=}'[Memory limit (format: <number><optional unit>, where unit = b, k, m or g)]' \
+        '(-n,--networking=)'{-n,--networking=}'[Enable networking for this container]' \
+        '--name=[Assign a name to the container]' \
+        '(-p,--publish=)'{-p,--publish=}'[Publish a container''s port to the host (format: ip:hostPort:containerPort | ip::containerPort | hostPort:containerPort) (use "docker port" to see the actual mapping)]' \
+        '--privileged=[Give extended privileges to this container]' \
+        '--rm=[Automatically remove the container when it exits (incompatible with -d)]' \
+        '--sig-proxy=[Proxify all received signal to the process (even in non-tty mode)]' \
+        '(-t,--tty=)'{-t,--tty=}'[Allocate a pseudo-tty]' \
+        '(-u,--user=)'{-u,--user=}'[Username or UID]' \
+        '(-v,--volume=)'{-v,--volume=}'[Bind mount a volume (e.g. from the host: -v /host:/container, from docker: -v /container)]' \
+        '--volumes-from=[Mount volumes from the specified container(s)]' \
+        '(-w,--workdir=)'{-w,--workdir=}'[Working directory inside the container]'
     __docker_images
 }
 
 __search() {
-    _arguments '-notrunc[Dont truncate output]'
+    _arguments \
+        '--no-trunc=[Don''t truncate output]' \
+        '-s,--stars=)'{-s,--stars=}'[Only displays with at least xxx stars]' \
+        '-t,--trusted=)'{-t,--trusted=}'[Only show trusted builds]'
+}
+
+__save() {
+    __docker_images
 }
 
 __start() {
+    _arguments \
+        '(-a,--attach=)'{-a,--attach=}'[Attach container''s stdout/stderr and forward all signals to the process]' \
+        '(-i,--interactive=)'{-i, --interactive=}'[Attach container''s stdin]'
     __docker_containers
 }
 
 __stop() {
-    _arguments '-t=[number of seconds to try to stop before killing]'
+    _arguments \
+        '(-t,--time=)'{-t,--time=}'[Number of seconds to wait for the container to stop before killing it.]'
     __docker_containers
 }
 
 __tag() {
-    _arguments '-f[Force]'
+    _arguments \
+        '(-f,--force=)'{-f,--force=}'[Force]'
     __docker_images
 }
 
 __version() {
-
+    # no arguments
 }
 
 __wait() {
@@ -192,7 +246,9 @@ _1st_arguments=(
     "attach":"Attach to a running container"
     "build":"Build a container from a Dockerfile"
     "commit":"Create a new image from a container's changes"
+    "cp":"Copy files/folders from the containers filesystem to the host path"
     "diff":"Inspect changes on a container's filesystem"
+    "events":"Get real time events from the server"
     "export":"Stream the contents of a container as a tar archive"
     "history":"Show the history of an image"
     "images":"List images"
@@ -201,10 +257,10 @@ _1st_arguments=(
     "insert":"Insert a file in an image"
     "inspect":"Return low-level information on a container"
     "kill":"Kill a running container"
+    "load":"Load an image from a tar archive"
     "login":"Register or Login to the docker registry server"
     "logs":"Fetch the logs of a container"
     "port":"Lookup the public-facing port which is NAT-ed to PRIVATE_PORT"
-    "top":"Lookup the running processes of a container"
     "ps":"List containers"
     "pull":"Pull an image or a repository from the docker registry server"
     "push":"Push an image or a repository to the docker registry server"
@@ -212,10 +268,12 @@ _1st_arguments=(
     "rm":"Remove one or more containers"
     "rmi":"Remove one or more images"
     "run":"Run a command in a new container"
+    "save":"Save an image to a tar archive"
     "search":"Search for an image in the docker index"
     "start":"Start a stopped container"
     "stop":"Stop a running container"
     "tag":"Tag an image into a repository"
+    "top":"Lookup the running processes of a container"
     "version":"Show the docker version information"
     "wait":"Block until a container stops, then print its exit code"
 )
@@ -230,13 +288,17 @@ fi
 local -a _command_args
 case "$words[1]" in
     attach)
-       __docker_containers ;;
+       __attach ;;
     build)
         __build ;;
     commit)
         __commit ;;
+    cp)
+        __cp ;;
     diff)
         __diff ;;
+    events)
+        __events ;;
     export)
         __export ;;
     history)
@@ -253,14 +315,14 @@ case "$words[1]" in
         __inspect ;;
     kill)
         __kill ;;
+    load)
+        __load ;;
     login)
         __login ;;
     logs)
         __logs ;;
     port)
         __port ;;
-    top)
-        __top ;;
     ps)
         __ps ;;
     pull)
@@ -275,6 +337,8 @@ case "$words[1]" in
         __rmi ;;
     run)
         __run ;;
+    save)
+        __save ;;
     search)
         __search ;;
     start)
@@ -283,6 +347,8 @@ case "$words[1]" in
         __stop ;;
     tag)
         __tag ;;
+    top)
+        __top ;;
     version)
         __version ;;
     wait)

From 53323abdb1a18c7756ace473390ac6ca51660839 Mon Sep 17 00:00:00 2001
From: tcasparro <tcasparr@gmail.com>
Date: Thu, 20 Mar 2014 16:09:45 -0700
Subject: [PATCH 355/364] Added git mode support for merging, rebasing, and
 bisecting

<B> Designates Bisecting
>M< Designates Merging
>R> Designates Rebasing
---
 themes/agnoster.zsh-theme | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index 85b846cb5..2b33c48bc 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -69,7 +69,9 @@ prompt_context() {
 
 # Git: branch/detached head, dirty status
 prompt_git() {
-  local ref dirty
+  local ref dirty mode repo_path
+  repo_path=$(git rev-parse --git-dir 2>/dev/null)
+
   if $(git rev-parse --is-inside-work-tree >/dev/null 2>&1); then
     dirty=$(parse_git_dirty)
     ref=$(git symbolic-ref HEAD 2> /dev/null) || ref="➦ $(git show-ref --head -s --abbrev |head -n1 2> /dev/null)"
@@ -79,6 +81,14 @@ prompt_git() {
       prompt_segment green black
     fi
 
+    if [[ -e "${repo_path}/BISECT_LOG" ]]; then
+      mode=" <B>"
+    elif [[ -e "${repo_path}/MERGE_HEAD" ]]; then
+      mode=" >M<"
+    elif [[ -e "${repo_path}/rebase" || -e "${repo_path}/rebase-apply" || -e "${repo_path}/rebase-merge" || -e "${repo_path}/../.dotest" ]]; then
+      mode=" >R>"
+    fi
+
     setopt promptsubst
     autoload -Uz vcs_info
 
@@ -90,7 +100,7 @@ prompt_git() {
     zstyle ':vcs_info:*' formats ' %u%c'
     zstyle ':vcs_info:*' actionformats ' %u%c'
     vcs_info
-    echo -n "${ref/refs\/heads\// }${vcs_info_msg_0_%% }"
+    echo -n "${ref/refs\/heads\// }${vcs_info_msg_0_%% }${mode}"
   fi
 }
 

From 0605d53fa7f04c864e7bc5f9f68bd38f24fbbfd5 Mon Sep 17 00:00:00 2001
From: Bob Williams <bobwilliams.ii@gmail.com>
Date: Wed, 26 Mar 2014 18:47:57 -0400
Subject: [PATCH 356/364] adding urlencode_json and associated README.md
 details

---
 plugins/jsontools/README.md            | 20 ++++++++++----------
 plugins/jsontools/jsontools.plugin.zsh |  6 ++++++
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/plugins/jsontools/README.md b/plugins/jsontools/README.md
index 309ce9b5f..975d2bb79 100644
--- a/plugins/jsontools/README.md
+++ b/plugins/jsontools/README.md
@@ -6,7 +6,13 @@ Handy command line tools for dealing with json data.
 
 - **pp_json** - pretty prints json
 - **is_json** - returns true if valid json; false otherwise
+- **urlencode_json** - returns a url encoded string for the given json 
 
+## Usage
+Usage is simple...just take your json data and pipe it into the appropriate jsontool.
+```sh
+<json data> | <jsontools tool>
+```
 ## Examples
 
 ##### pp_json
@@ -14,22 +20,16 @@ Handy command line tools for dealing with json data.
 ```sh
 # curl json data and pretty print the results
 curl https://coderwall.com/bobwilliams.json | pp_json
-
-# pretty print the contents of an existing json file
-less data.json | pp_json
-
-# json data directly from the command line
-echo '{"b":2, "a":1}' | pp_json
 ```
 
 ##### is_json
 ```sh
-# curl json data and pretty print the results
-curl https://coderwall.com/bobwilliams.json | is_json
-
 # pretty print the contents of an existing json file
 less data.json | is_json
+```
 
+##### urlencode_json
+```sh
 # json data directly from the command line
-echo '{"b":2, "a":1}' | is_json
+echo '{"b":2, "a":1}' | urlencode_json
 ```
\ No newline at end of file
diff --git a/plugins/jsontools/jsontools.plugin.zsh b/plugins/jsontools/jsontools.plugin.zsh
index b8b558807..8877ee62f 100644
--- a/plugins/jsontools/jsontools.plugin.zsh
+++ b/plugins/jsontools/jsontools.plugin.zsh
@@ -8,6 +8,7 @@ fi
 if [[ $(whence node) != "" && ( "x$JSONTOOLS_METHOD" = "x"  || "x$JSONTOOLS_METHOD" = "xnode" ) ]]; then
 	alias pp_json='xargs -0 node -e "console.log(JSON.stringify(JSON.parse(process.argv[1]), null, 4));"'
 	alias is_json='xargs -0 node -e "try {json = JSON.parse(process.argv[1]);} catch (e) { console.log(false); json = null; } if(json) { console.log(true); }"'
+	alias urlencode_json='xargs -0 node -e "console.log(encodeURIComponent(JSON.stringify(process.argv[1])))"'
 elif [[ $(whence python) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xpython" ) ]]; then
 	alias pp_json='python -mjson.tool'
 	alias is_json='python -c "
@@ -18,10 +19,15 @@ except ValueError, e:
 	print False
 else:
 	print True
+sys.exit(0)"'
+	alias urlencode_json='python -c "
+import urllib, json, sys;
+print urllib.quote_plus(json.dumps(sys.stdin.read()))
 sys.exit(0)"'
 elif [[ $(whence ruby) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xruby" ) ]]; then
 	alias pp_json='ruby -e "require \"json\"; require \"yaml\"; puts JSON.parse(STDIN.read).to_yaml"'
 	alias is_json='ruby -e "require \"json\"; begin; JSON.parse(STDIN.read); puts true; rescue Exception => e; puts false; end"'
+	alias urlencode_json='ruby -e "require \"uri\"; puts URI.escape(STDIN.read)"'
 fi
 
 unset JSONTOOLS_METHOD

From 400643ff5b20521aebe16ca36fde34bde212db89 Mon Sep 17 00:00:00 2001
From: Bob Williams <bobwilliams.ii@gmail.com>
Date: Thu, 27 Mar 2014 10:34:54 -0400
Subject: [PATCH 357/364] adding urldecode_json to compliment urlencode_json
 and updating readme.md; slight tweak to urlencode_json from previous commit

---
 plugins/jsontools/README.md            |  7 +++++++
 plugins/jsontools/jsontools.plugin.zsh | 12 +++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/plugins/jsontools/README.md b/plugins/jsontools/README.md
index 975d2bb79..4faf58b98 100644
--- a/plugins/jsontools/README.md
+++ b/plugins/jsontools/README.md
@@ -7,6 +7,7 @@ Handy command line tools for dealing with json data.
 - **pp_json** - pretty prints json
 - **is_json** - returns true if valid json; false otherwise
 - **urlencode_json** - returns a url encoded string for the given json 
+- **urldecode_json** - returns decoded json for the given url encoded string
 
 ## Usage
 Usage is simple...just take your json data and pipe it into the appropriate jsontool.
@@ -32,4 +33,10 @@ less data.json | is_json
 ```sh
 # json data directly from the command line
 echo '{"b":2, "a":1}' | urlencode_json
+```
+
+##### urldecode_json
+```sh
+# url encoded string to decode
+echo '%7B%22b%22:2,%20%22a%22:1%7D%0A' | urldecode_json
 ```
\ No newline at end of file
diff --git a/plugins/jsontools/jsontools.plugin.zsh b/plugins/jsontools/jsontools.plugin.zsh
index 8877ee62f..20d5eb1c9 100644
--- a/plugins/jsontools/jsontools.plugin.zsh
+++ b/plugins/jsontools/jsontools.plugin.zsh
@@ -8,7 +8,8 @@ fi
 if [[ $(whence node) != "" && ( "x$JSONTOOLS_METHOD" = "x"  || "x$JSONTOOLS_METHOD" = "xnode" ) ]]; then
 	alias pp_json='xargs -0 node -e "console.log(JSON.stringify(JSON.parse(process.argv[1]), null, 4));"'
 	alias is_json='xargs -0 node -e "try {json = JSON.parse(process.argv[1]);} catch (e) { console.log(false); json = null; } if(json) { console.log(true); }"'
-	alias urlencode_json='xargs -0 node -e "console.log(encodeURIComponent(JSON.stringify(process.argv[1])))"'
+	alias urlencode_json='xargs -0 node -e "console.log(encodeURIComponent(process.argv[1]))"'
+	alias urldecode_json='xargs -0 node -e "console.log(decodeURIComponent(process.argv[1]))"'
 elif [[ $(whence python) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xpython" ) ]]; then
 	alias pp_json='python -mjson.tool'
 	alias is_json='python -c "
@@ -22,12 +23,17 @@ else:
 sys.exit(0)"'
 	alias urlencode_json='python -c "
 import urllib, json, sys;
-print urllib.quote_plus(json.dumps(sys.stdin.read()))
+print urllib.quote_plus(sys.stdin.read())
+sys.exit(0)"'
+	alias urldecode_json='python -c "
+import urllib, json, sys;
+print urllib.unquote_plus(sys.stdin.read())
 sys.exit(0)"'
 elif [[ $(whence ruby) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xruby" ) ]]; then
 	alias pp_json='ruby -e "require \"json\"; require \"yaml\"; puts JSON.parse(STDIN.read).to_yaml"'
 	alias is_json='ruby -e "require \"json\"; begin; JSON.parse(STDIN.read); puts true; rescue Exception => e; puts false; end"'
 	alias urlencode_json='ruby -e "require \"uri\"; puts URI.escape(STDIN.read)"'
+	alias urldecode_json='ruby -e "require \"uri\"; puts URI.unescape(STDIN.read)"'
 fi
 
-unset JSONTOOLS_METHOD
+unset JSONTOOLS_METHOD
\ No newline at end of file

From f46d06dae19f691e6666d4836766e9eb69d2e51b Mon Sep 17 00:00:00 2001
From: Henrik Holm <henrik@henrikholm.com>
Date: Sat, 29 Mar 2014 10:14:37 -0400
Subject: [PATCH 358/364] Correct redirection of output from 'hash'

The intention of the redirection to /dev/null is to hide the output
'hash: no such command: git' since we rely on the exit status.

However, the output goes to stderr, so it's stderr that needs to be
redirected. For completeness, we redirect both stderr and stdout using
'2>&1'.

Example:

  [~]$ hash git > /dev/null
  [~]$ PATH=''
  [~]$ hash git > /dev/null
  hash: no such command: git
  [~]$ hash git > /dev/null 2>&1
  [~]$
---
 tools/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/install.sh b/tools/install.sh
index 71e19a389..fc7ad70cf 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -10,7 +10,7 @@ if [ -d "$ZSH" ]; then
 fi
 
 echo "\033[0;34mCloning Oh My Zsh...\033[0m"
-hash git >/dev/null && /usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git $ZSH || {
+hash git >/dev/null 2>&1 && /usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git $ZSH || {
   echo "git not installed"
   exit
 }

From 7d696f79b8d864e7b6afb13512bcb0f0cd519f1a Mon Sep 17 00:00:00 2001
From: DeLynn Berry <delynn@gmail.com>
Date: Fri, 4 Apr 2014 08:11:11 -0600
Subject: [PATCH 359/364] Remove mailcatcher

The mailcatcher gem does not work correctly when executed through Bundler.
---
 plugins/bundler/bundler.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index e4b03e7b0..3338d78be 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -6,7 +6,7 @@ alias bu="bundle update"
 
 # The following is based on https://github.com/gma/bundler-exec
 
-bundled_commands=(annotate berks cap capify cucumber foodcritic foreman guard irb jekyll kitchen knife mailcatcher middleman nanoc puma rackup rainbows rake rspec ruby shotgun spec spin spork strainer tailor taps thin thor unicorn unicorn_rails)
+bundled_commands=(annotate berks cap capify cucumber foodcritic foreman guard irb jekyll kitchen knife middleman nanoc puma rackup rainbows rake rspec ruby shotgun spec spin spork strainer tailor taps thin thor unicorn unicorn_rails)
 
 # Remove $UNBUNDLED_COMMANDS from the bundled_commands list
 for cmd in $UNBUNDLED_COMMANDS; do

From 6f3cf195c67bec936b6b0799051859e1f0ddb9dc Mon Sep 17 00:00:00 2001
From: Benjamin Wong <jimini@gmail.com>
Date: Fri, 18 Apr 2014 22:43:23 +1000
Subject: [PATCH 360/364] Spelling correction in itunes control function.

Spelling correction in itunes control function.
---
 plugins/osx/osx.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index 608ec3789..63760b5ff 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -184,7 +184,7 @@ function itunes() {
 			return 0
 			;;
 		*)
-			print "Unkonwn option: $opt"
+			print "Unknown option: $opt"
 			return 1
 			;;
 	esac

From fcfa323974985cd202c95379f893a86d6cf975fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Tue, 25 Mar 2014 22:16:36 +0100
Subject: [PATCH 361/364] Use cache folder inside $ZSH, delete with unaliased
 rm

---
 plugins/zsh_reload/zsh_reload.plugin.zsh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/plugins/zsh_reload/zsh_reload.plugin.zsh b/plugins/zsh_reload/zsh_reload.plugin.zsh
index a435dbc8d..94945bd48 100644
--- a/plugins/zsh_reload/zsh_reload.plugin.zsh
+++ b/plugins/zsh_reload/zsh_reload.plugin.zsh
@@ -1,13 +1,12 @@
-zsh_cache=$HOME/.zsh_cache
-mkdir -p $zsh_cache
-
 # reload zshrc
 function src()
 {
   autoload -U compinit zrecompile
-  compinit -d $zsh_cache/zcomp-$HOST
-  for f in $HOME/.zshrc $zsh_cache/zcomp-$HOST; do
-    zrecompile -p $f && rm -f $f.zwc.old
+  compinit -d "$ZSH/cache/zcomp-$HOST"
+
+  for f in ~/.zshrc "$ZSH/cache/zcomp-$HOST"; do
+    zrecompile -p $f && command rm -f $f.zwc.old
   done
+
   source ~/.zshrc
-}
\ No newline at end of file
+}

From 9385b3ee0a8425ae8a2b5c16084d4fab1ebc3764 Mon Sep 17 00:00:00 2001
From: Dmitriy <me@kemko.ru>
Date: Mon, 24 Mar 2014 10:17:19 +0300
Subject: [PATCH 362/364] set exclude-dir or exclude grep flags only if
 available

---
 lib/grep.zsh | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/lib/grep.zsh b/lib/grep.zsh
index 977435ee4..276fec382 100644
--- a/lib/grep.zsh
+++ b/lib/grep.zsh
@@ -3,11 +3,22 @@
 # Examples: http://rubyurl.com/ZXv
 #
 
-# avoid VCS folders
-GREP_OPTIONS=
-for PATTERN in .cvs .git .hg .svn; do
-    GREP_OPTIONS+="--exclude-dir=$PATTERN "
-done
-GREP_OPTIONS+="--color=auto"
+GREP_OPTIONS="--color=auto"
+
+# avoid VCS folders (if the necessary grep flags are available)
+grep-flag-available() {
+    echo | grep $1 "" >/dev/null 2>&1
+}
+if grep-flag-available --exclude-dir=.cvs; then
+    for PATTERN in .cvs .git .hg .svn; do
+        GREP_OPTIONS+=" --exclude-dir=$PATTERN"
+    done
+elif grep-flag-available --exclude=.cvs; then
+    for PATTERN in .cvs .git .hg .svn; do
+        GREP_OPTIONS+=" --exclude=$PATTERN"
+    done
+fi
+unfunction grep-flag-available
+
 export GREP_OPTIONS="$GREP_OPTIONS"
 export GREP_COLOR='1;32'

From cee52283d8f5e18ba962cdb7b0acec2627e647e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Tomak?= <pawel.tomak@gmail.com>
Date: Fri, 18 Apr 2014 23:09:38 +0200
Subject: [PATCH 363/364] Fix for Python3

In Python3 without universal_newlines set to True
output from Popen was byte-encoded.
---
 plugins/git-prompt/gitstatus.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/git-prompt/gitstatus.py b/plugins/git-prompt/gitstatus.py
index ef894bff2..256841432 100644
--- a/plugins/git-prompt/gitstatus.py
+++ b/plugins/git-prompt/gitstatus.py
@@ -16,7 +16,7 @@ symbols = {
 }
 
 output, error = Popen(
-    ['git', 'status'], stdout=PIPE, stderr=PIPE).communicate()
+    ['git', 'status'], stdout=PIPE, stderr=PIPE, universal_newlines=True).communicate()
 
 if error:
     import sys

From 7949a1cd8d69e7a79cbf20294cf41662aff15058 Mon Sep 17 00:00:00 2001
From: Javier Tejero <jtejero@cink.es>
Date: Sun, 6 Apr 2014 13:51:18 +0200
Subject: [PATCH 364/364] Fix `docker rmi` tab completion

This is exactly what happens on tab completion for docker rmi. This commit
fixes that.

```sh
$ docker rmi <hit TAB>
_arguments:comparguments:312: invalid argument: __docker_images
_arguments:comparguments:312: invalid argument: __docker_images
_arguments:comparguments:312: invalid argument: __docker_images
```
---
 plugins/docker/_docker | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/docker/_docker b/plugins/docker/_docker
index 5acd19edf..c291037a3 100644
--- a/plugins/docker/_docker
+++ b/plugins/docker/_docker
@@ -166,7 +166,7 @@ __rm() {
 
 __rmi() {
     _arguments \
-        '(-f,--force=)'{-f,--force=}'[Force]' \
+        '(-f,--force=)'{-f,--force=}'[Force]'
     __docker_images
 }