From 5d90f58b37fd67184c4aed3d81a1d3703f8fe832 Mon Sep 17 00:00:00 2001 From: Tristan Carel Date: Wed, 13 Apr 2011 20:21:13 +0200 Subject: [PATCH 001/181] 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 Date: Thu, 14 Apr 2011 07:17:10 +0200 Subject: [PATCH 002/181] 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 Date: Fri, 15 Apr 2011 18:13:01 +0200 Subject: [PATCH 003/181] - 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 Date: Fri, 15 Apr 2011 18:21:22 +0200 Subject: [PATCH 004/181] 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 Date: Fri, 15 Apr 2011 18:22:27 +0200 Subject: [PATCH 005/181] 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 574de93efbba22db0ec816ecec717d502dfa333e Mon Sep 17 00:00:00 2001 From: Tristan Carel Date: Tue, 6 Sep 2011 10:50:53 +0200 Subject: [PATCH 006/181] 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 de29ef809dad9c1a1190a4b670cbb30b8b578f3c Mon Sep 17 00:00:00 2001 From: Jason Whittle Date: Wed, 5 Oct 2011 00:57:48 -0300 Subject: [PATCH 007/181] 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 Date: Mon, 10 Oct 2011 14:54:20 +0200 Subject: [PATCH 008/181] 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 Date: Mon, 10 Oct 2011 18:04:13 +0200 Subject: [PATCH 009/181] 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 Date: Mon, 10 Oct 2011 18:04:24 +0200 Subject: [PATCH 010/181] 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 Date: Sat, 15 Oct 2011 23:31:27 +0200 Subject: [PATCH 011/181] 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 Date: Thu, 20 Oct 2011 13:10:20 +0200 Subject: [PATCH 012/181] 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 98578ec2412d5b5d2e105f3ddd0d41eb21c3de14 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Fri, 16 Dec 2011 14:21:45 +0100 Subject: [PATCH 013/181] `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 c9c021478ea4a2b55aac8cda3cd0d05137443f36 Mon Sep 17 00:00:00 2001 From: William Roe Date: Thu, 23 Feb 2012 14:11:52 +0000 Subject: [PATCH 014/181] 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 fa1657e10bc062394390d83d0bb5d3848905f5b6 Mon Sep 17 00:00:00 2001 From: David Lee Date: Sun, 26 Feb 2012 02:29:24 -0800 Subject: [PATCH 015/181] 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 Date: Mon, 5 Mar 2012 11:55:30 +0000 Subject: [PATCH 016/181] 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 Date: Tue, 6 Mar 2012 14:31:03 -1000 Subject: [PATCH 017/181] 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 Date: Fri, 9 Mar 2012 08:53:09 -0500 Subject: [PATCH 018/181] 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 Date: Tue, 20 Mar 2012 08:16:44 -0400 Subject: [PATCH 019/181] 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 <} == $after ]]; then + after="$after" + fi + if [[ ${before#:} != $before && ${before%} == $before ]]; then + before="$before" + fi + local files="" + for f in $@ + do + files="$files $(resolveFile $f)" + done + if [[ -n $files ]]; then + files=':args! '"$files" + 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 Date: Tue, 20 Mar 2012 09:55:25 -0400 Subject: [PATCH 020/181] 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 04a7536641621e0188987b5bb1362e6b922a8771 Mon Sep 17 00:00:00 2001 From: Derek Wyatt Date: Fri, 30 Mar 2012 06:33:06 -0400 Subject: [PATCH 021/181] 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 Date: Fri, 30 Mar 2012 06:39:49 -0400 Subject: [PATCH 022/181] 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 Date: Sun, 1 Apr 2012 15:41:39 -0400 Subject: [PATCH 023/181] Added an 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. 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="" local after="" while getopts ":b:a:" option do From 8762b27d67156886d144213ba656aa3e8edfcf8b Mon Sep 17 00:00:00 2001 From: cmar Date: Wed, 4 Apr 2012 12:54:31 -0400 Subject: [PATCH 024/181] 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 Date: Wed, 16 May 2012 14:51:52 -0400 Subject: [PATCH 025/181] 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 4f9cfee9bdfcab18bb83d17129f090a62dc05eac Mon Sep 17 00:00:00 2001 From: nXqd Date: Thu, 14 Jun 2012 08:06:36 +0300 Subject: [PATCH 026/181] 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 4d0c135798368a6241752060ffc6a2190a94a810 Mon Sep 17 00:00:00 2001 From: fred-o Date: Tue, 10 Jul 2012 14:49:32 +0200 Subject: [PATCH 027/181] 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 Date: Tue, 10 Jul 2012 14:57:59 +0200 Subject: [PATCH 028/181] 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 Date: Thu, 12 Jul 2012 14:05:33 +0200 Subject: [PATCH 029/181] 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 Date: Thu, 12 Jul 2012 14:17:59 +0200 Subject: [PATCH 030/181] 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 Date: Fri, 13 Jul 2012 12:08:41 +0200 Subject: [PATCH 031/181] 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 Date: Fri, 13 Jul 2012 16:24:45 +0200 Subject: [PATCH 032/181] 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 Date: Tue, 24 Jul 2012 12:15:36 +0200 Subject: [PATCH 033/181] 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 Date: Tue, 24 Jul 2012 16:16:55 +0200 Subject: [PATCH 034/181] 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 Date: Tue, 31 Jul 2012 15:02:12 +0200 Subject: [PATCH 035/181] 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 Date: Tue, 31 Jul 2012 16:59:56 +0200 Subject: [PATCH 036/181] 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 Date: Fri, 3 Aug 2012 10:02:19 +0200 Subject: [PATCH 037/181] 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 Date: Fri, 3 Aug 2012 10:02:27 +0200 Subject: [PATCH 038/181] 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 Date: Fri, 3 Aug 2012 10:15:01 +0200 Subject: [PATCH 039/181] 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 Date: Mon, 3 Sep 2012 15:31:54 +0900 Subject: [PATCH 040/181] 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 Date: Mon, 30 Jan 2012 22:51:58 -0500 Subject: [PATCH 041/181] 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 Date: Mon, 30 Jan 2012 23:04:06 -0500 Subject: [PATCH 042/181] 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 Date: Sat, 17 Mar 2012 22:03:01 -0300 Subject: [PATCH 043/181] 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 Date: Sun, 14 Oct 2012 00:07:47 +0200 Subject: [PATCH 044/181] 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 Date: Sun, 14 Oct 2012 02:32:48 +0200 Subject: [PATCH 045/181] 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 Date: Fri, 9 Nov 2012 23:53:22 +0200 Subject: [PATCH 046/181] 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 Date: Tue, 18 Dec 2012 08:16:28 +0000 Subject: [PATCH 047/181] 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 Date: Tue, 18 Dec 2012 08:47:04 +0000 Subject: [PATCH 048/181] 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 ae1973de443525daeb87df9973ae83c6c9210cfe Mon Sep 17 00:00:00 2001 From: Ron Shapiro Date: Mon, 29 Apr 2013 10:18:32 -0400 Subject: [PATCH 049/181] 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 9ebdbec58979b077e4790387b5927c74ce7184ef Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Fri, 23 Aug 2013 21:58:29 -0500 Subject: [PATCH 050/181] gitfast: update to upstream v1.8.4 Signed-off-by: Felipe Contreras --- 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 # -# 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 # 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, 
 and
-#        , 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, 
 and , 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 
Date: Sun, 1 Sep 2013 18:20:08 +0200
Subject: [PATCH 051/181] 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 
Date: Sun, 1 Sep 2013 19:23:21 +0200
Subject: [PATCH 052/181] 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 190fcdffa7bc413dc7a9ebef4a6eaed37beb6896 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20M=C4=83gheru=C8=99an-Stanciu?=
 
Date: Wed, 9 Oct 2013 16:42:28 +0200
Subject: [PATCH 053/181] 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=""
+    
+}
+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 3ca3c5a126a937dc6d6d3daba241f9a0f5a4c2f2 Mon Sep 17 00:00:00 2001
From: Wes Morgan 
Date: Mon, 14 Oct 2013 09:59:20 -0600
Subject: [PATCH 054/181] 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 c9f2c947e4bdc94676aeaf989ba16dbe35aa45ee Mon Sep 17 00:00:00 2001
From: Stefan Tatschner 
Date: Fri, 29 Nov 2013 14:24:14 +0100
Subject: [PATCH 055/181] 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 be6b1b3b8fda01bebc499e02b6945eaddaf45b84 Mon Sep 17 00:00:00 2001
From: Foivos 
Date: Sun, 8 Dec 2013 07:11:33 +0200
Subject: [PATCH 056/181] 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 
Date: Sun, 8 Dec 2013 07:16:40 +0200
Subject: [PATCH 057/181] 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 
Date: Mon, 9 Dec 2013 08:54:38 +0100
Subject: [PATCH 058/181] 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__8haA2${CI+9qz)+Cykjz%^8kLO5T$EmmJCv;@V^J`0Hz){|D6`T{v*^
z6Fo|~JSSz20pMs7lb)P$bvlIxs>gl00HWa4spqTy1`yO1G`^IBS)da#?K
zsxU|{fc^>bP0
Hl+XkKlf#Hs

literal 0
HcmV?d00001


From cbd63f220dff93ad6c9d00734949106443a5b03b Mon Sep 17 00:00:00 2001
From: Andy Fleming 
Date: Mon, 9 Dec 2013 19:38:27 +0000
Subject: [PATCH 059/181] 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 
Date: Mon, 9 Dec 2013 22:07:19 +0100
Subject: [PATCH 060/181] 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 
Date: Mon, 9 Dec 2013 22:18:20 +0100
Subject: [PATCH 061/181] 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 
Date: Tue, 10 Dec 2013 00:11:22 +0000
Subject: [PATCH 062/181] 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 
Date: Fri, 6 Dec 2013 12:20:38 +0200
Subject: [PATCH 063/181] 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 
Date: Fri, 13 Dec 2013 19:05:35 -0300
Subject: [PATCH 064/181] 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" 
Date: Wed, 18 Dec 2013 18:27:20 +0100
Subject: [PATCH 065/181] 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 
Date: Wed, 18 Dec 2013 17:03:33 -0800
Subject: [PATCH 066/181] 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 
Date: Thu, 19 Dec 2013 11:24:38 -0800
Subject: [PATCH 067/181] 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 
Date: Sat, 21 Dec 2013 19:49:44 +0100
Subject: [PATCH 068/181] 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 
Date: Fri, 27 Dec 2013 14:25:06 +0100
Subject: [PATCH 069/181] 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 070/181] 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 071/181] 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 072/181] 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 073/181] 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 074/181] 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 075/181] 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 
Date: Tue, 31 Dec 2013 12:41:28 +0100
Subject: [PATCH 076/181] 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 077/181] 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 
Date: Thu, 2 Jan 2014 15:48:09 -0800
Subject: [PATCH 078/181] 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 
Date: Thu, 2 Jan 2014 15:53:34 -0800
Subject: [PATCH 079/181] 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 4354f911710572f9ec0a8e4435571ea3c19cb0f8 Mon Sep 17 00:00:00 2001
From: Pablo Cantero 
Date: Fri, 3 Jan 2014 11:52:33 -0200
Subject: [PATCH 080/181] 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 
Date: Sat, 4 Jan 2014 22:06:09 +0100
Subject: [PATCH 081/181] 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 082/181] 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 083/181] 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 084/181] 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 085/181] 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 
Date: Mon, 6 Jan 2014 14:09:40 +0100
Subject: [PATCH 086/181] 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 
Date: Tue, 7 Jan 2014 02:10:34 +0100
Subject: [PATCH 087/181] 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 088/181] 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 089/181] 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 
Date: Wed, 8 Jan 2014 02:50:58 +0100
Subject: [PATCH 090/181] 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 
Date: Wed, 8 Jan 2014 03:04:54 +0100
Subject: [PATCH 091/181] 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 
Date: Fri, 10 Jan 2014 14:03:10 +0100
Subject: [PATCH 092/181] 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 093/181] 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 
Date: Thu, 16 Jan 2014 12:15:41 +0100
Subject: [PATCH 094/181] 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 
Date: Fri, 17 Jan 2014 12:59:14 +0300
Subject: [PATCH 095/181] 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 
Date: Mon, 6 Jan 2014 02:09:15 +0100
Subject: [PATCH 096/181] 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 
Date: Thu, 23 Jan 2014 20:58:23 -0800
Subject: [PATCH 097/181] 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 
Date: Fri, 24 Jan 2014 10:27:41 -0800
Subject: [PATCH 098/181] 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 
Date: Fri, 24 Jan 2014 23:01:35 +0100
Subject: [PATCH 099/181] 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 
Date: Tue, 28 Jan 2014 18:02:40 -0600
Subject: [PATCH 100/181] 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 
Date: Tue, 28 Jan 2014 21:54:00 -0600
Subject: [PATCH 101/181] 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 
Date: Wed, 29 Jan 2014 13:35:21 -0600
Subject: [PATCH 102/181] 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 
Date: Thu, 30 Jan 2014 15:04:09 -0200
Subject: [PATCH 103/181] 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 ed19ffee5ecc0db6617c1ae753e515d60cb486c6 Mon Sep 17 00:00:00 2001
From: Pavol Juhas 
Date: Sat, 8 Feb 2014 19:49:54 -0500
Subject: [PATCH 104/181] 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
+
+

+-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 save it to
+  ~/.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 options summary and exit.

+

+
+## 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
+
+

+~/.scdhistory

+    time-stamped index of visited directories.

+
+~/.scdalias.zsh

+    scd-generated definitions of directory aliases.

+

+
+# ENVIRONMENT
+
+

+SCD_HISTFILE

+    path to the scd index file (by default ~/.scdhistory).

+
+SCD_HISTSIZE

+    maximum number of entries in the index (5000).  Index is trimmed when it
+    exceeds SCD_HISTSIZE by more than 20%.

+
+SCD_MENUSIZE

+    maximum number of items for directory selection menu (20).

+
+SCD_MEANLIFE

+    mean lifetime in seconds for exponential decay of directory
+    likelihood (86400).

+
+SCD_THRESHOLD

+    threshold for cumulative directory likelihood.  Directories with
+    lower likelihood are excluded unless they are the only match to
+    scd patterns.
+    

+
+SCD_SCRIPT

+    command script file where scd writes the final cd
+    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 SCD_SCRIPT.

+

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 0cb2ecff8002e478f5e7e64cb529eb2af71b0299 Mon Sep 17 00:00:00 2001
From: Tobias Kirschstein 
Date: Tue, 11 Feb 2014 19:56:13 +1300
Subject: [PATCH 105/181] 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 
Date: Tue, 11 Feb 2014 21:14:02 -0600
Subject: [PATCH 106/181] 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 
Date: Tue, 11 Feb 2014 22:45:41 -0500
Subject: [PATCH 107/181] 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 
Date: Wed, 12 Feb 2014 20:09:44 -0600
Subject: [PATCH 108/181] 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 
Date: Wed, 12 Feb 2014 20:13:00 -0600
Subject: [PATCH 109/181] 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 
Date: Thu, 13 Feb 2014 10:32:52 +0100
Subject: [PATCH 110/181] 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 
Date: Thu, 13 Feb 2014 12:27:00 -0500
Subject: [PATCH 111/181] 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 
Date: Fri, 14 Feb 2014 14:54:28 +0000
Subject: [PATCH 112/181] 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 
Date: Mon, 17 Feb 2014 13:32:24 +1300
Subject: [PATCH 113/181] 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 
Date: Tue, 18 Feb 2014 14:37:59 -0700
Subject: [PATCH 114/181] 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 
Date: Tue, 18 Feb 2014 14:43:42 -0700
Subject: [PATCH 115/181] 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 
Date: Wed, 19 Feb 2014 15:08:47 +0300
Subject: [PATCH 116/181] 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 
Date: Wed, 19 Feb 2014 13:33:02 -0700
Subject: [PATCH 117/181] 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 
Date: Wed, 19 Feb 2014 18:55:52 -0500
Subject: [PATCH 118/181] 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 
Date: Thu, 20 Feb 2014 10:18:53 -0800
Subject: [PATCH 119/181] 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?= 
Date: Thu, 12 Dec 2013 23:27:22 +0100
Subject: [PATCH 120/181] 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?= 
Date: Sat, 14 Dec 2013 02:13:18 +0100
Subject: [PATCH 121/181] 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?= 
Date: Sat, 14 Dec 2013 04:30:29 +0100
Subject: [PATCH 122/181] 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?= 
Date: Mon, 16 Dec 2013 09:24:24 +0100
Subject: [PATCH 123/181] 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 
Date: Fri, 21 Feb 2014 22:47:56 -0800
Subject: [PATCH 124/181] 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 
Date: Fri, 21 Feb 2014 22:48:38 -0800
Subject: [PATCH 125/181] 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 
Date: Sun, 23 Feb 2014 10:07:26 +0100
Subject: [PATCH 126/181] 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 
Date: Tue, 25 Feb 2014 20:27:33 -0800
Subject: [PATCH 127/181] ..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 
Date: Wed, 26 Feb 2014 19:35:24 -0500
Subject: [PATCH 128/181] 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 
Date: Fri, 28 Feb 2014 01:26:17 +1100
Subject: [PATCH 129/181] 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 
Date: Fri, 28 Feb 2014 01:26:54 +1100
Subject: [PATCH 130/181] 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 
Date: Fri, 28 Feb 2014 01:32:01 +1100
Subject: [PATCH 131/181] 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 
Date: Thu, 27 Feb 2014 10:56:07 -0500
Subject: [PATCH 132/181] 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 
Date: Thu, 27 Feb 2014 11:52:21 +0200
Subject: [PATCH 133/181] :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 
Date: Sun, 2 Mar 2014 03:59:27 -0500
Subject: [PATCH 134/181] 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 
Date: Sun, 2 Mar 2014 14:47:35 -0300
Subject: [PATCH 135/181] 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 
Date: Sun, 2 Mar 2014 14:13:55 -0500
Subject: [PATCH 136/181] 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 
Date: Mon, 3 Mar 2014 10:18:10 -0500
Subject: [PATCH 137/181] 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 
Date: Tue, 4 Mar 2014 20:25:54 +0100
Subject: [PATCH 138/181] 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 
Date: Fri, 7 Mar 2014 01:09:04 +0200
Subject: [PATCH 139/181] 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 
Date: Fri, 7 Mar 2014 01:22:37 +0200
Subject: [PATCH 140/181] 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 
Date: Fri, 7 Mar 2014 01:23:37 +0200
Subject: [PATCH 141/181] 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 
Date: Sat, 8 Mar 2014 23:51:16 +0600
Subject: [PATCH 142/181] 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 ()
-#
 # 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 
+# 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 
Date: Sat, 8 Mar 2014 13:13:52 -0800
Subject: [PATCH 143/181] 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 
Date: Sat, 8 Mar 2014 13:15:18 -0800
Subject: [PATCH 144/181] 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 
Date: Sat, 8 Mar 2014 13:17:16 -0800
Subject: [PATCH 145/181] 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 
Date: Mon, 23 Apr 2012 14:01:14 -0700
Subject: [PATCH 146/181] 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 
Date: Mon, 10 Mar 2014 11:41:25 +0800
Subject: [PATCH 147/181] 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 
Date: Mon, 10 Mar 2014 04:05:14 -0400
Subject: [PATCH 148/181] 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 
Date: Mon, 10 Mar 2014 16:23:14 +0100
Subject: [PATCH 149/181] 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 
Date: Mon, 10 Mar 2014 17:18:50 -0500
Subject: [PATCH 150/181] 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 
Date: Mon, 10 Mar 2014 18:36:51 -0500
Subject: [PATCH 151/181] 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 
Date: Tue, 11 Mar 2014 11:29:25 +0800
Subject: [PATCH 152/181] 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 
Date: Wed, 12 Mar 2014 07:52:20 -0700
Subject: [PATCH 153/181] 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 
Date: Wed, 12 Mar 2014 22:37:25 -0700
Subject: [PATCH 154/181] 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 
Date: Mon, 17 Dec 2012 12:22:33 +0100
Subject: [PATCH 155/181] 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)"$(
Date: Thu, 13 Mar 2014 10:15:18 -0700
Subject: [PATCH 156/181] 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?= 
Date: Thu, 13 Mar 2014 14:44:58 -0400
Subject: [PATCH 157/181] 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 
Date: Fri, 14 Mar 2014 10:14:47 +0000
Subject: [PATCH 158/181] 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 
Date: Fri, 7 Mar 2014 11:17:18 -0800
Subject: [PATCH 159/181] 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 
Date: Sun, 16 Mar 2014 18:14:34 +0100
Subject: [PATCH 160/181] Ignore more users in ssh completion.

Signed-off-by: Mariusz Fik 
---
 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 
Date: Sun, 16 Mar 2014 16:52:37 -0400
Subject: [PATCH 161/181] 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 
Date: Wed, 5 Mar 2014 12:58:18 +0000
Subject: [PATCH 162/181] 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 
Date: Mon, 17 Mar 2014 10:05:56 +0100
Subject: [PATCH 163/181] 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 
Date: Mon, 17 Mar 2014 16:07:46 +0100
Subject: [PATCH 164/181] 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 
Date: Mon, 17 Mar 2014 11:02:47 -0500
Subject: [PATCH 165/181] 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 
Date: Mon, 17 Mar 2014 19:49:12 -0400
Subject: [PATCH 166/181] 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

 
 SCD_THRESHOLD

     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).
     

 
 SCD_SCRIPT

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 
Date: Tue, 18 Mar 2014 10:52:25 +0100
Subject: [PATCH 167/181] 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 
Date: Mon, 17 Mar 2014 12:01:00 -0400
Subject: [PATCH 168/181] 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 
Date: Thu, 20 Mar 2014 10:43:33 +0100
Subject: [PATCH 169/181] 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 ) {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 
Date: Thu, 20 Mar 2014 19:10:44 -0700
Subject: [PATCH 170/181] 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 
Date: Thu, 20 Mar 2014 19:29:06 -0700
Subject: [PATCH 171/181] 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 
Date: Thu, 20 Mar 2014 19:34:43 -0700
Subject: [PATCH 172/181] 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 
Date: Fri, 21 Mar 2014 11:49:52 -0400
Subject: [PATCH 173/181] 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 
Date: Fri, 21 Mar 2014 09:24:59 -0700
Subject: [PATCH 174/181] 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 c3150edad2b8d9494127afa9528519a07bf8a64a Mon Sep 17 00:00:00 2001
From: Miguel Flores Ruiz de Eguino 
Date: Fri, 21 Mar 2014 19:18:29 -0600
Subject: [PATCH 175/181] 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 
Date: Sat, 22 Mar 2014 08:51:26 -0400
Subject: [PATCH 176/181] 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 
Date: Sat, 22 Mar 2014 10:24:58 -0600
Subject: [PATCH 177/181] 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?= 
Date: Sun, 23 Mar 2014 02:03:12 +0100
Subject: [PATCH 178/181] 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 
Date: Sun, 23 Mar 2014 14:39:38 +0100
Subject: [PATCH 179/181] 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 
Date: Sun, 23 Mar 2014 14:45:55 +0100
Subject: [PATCH 180/181] 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 
Date: Sun, 23 Mar 2014 14:47:10 +0100
Subject: [PATCH 181/181] $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.