From 2c19c0e59e6a3fd1f844ee6f5f883e199a3c1adc Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Sat, 24 May 2014 08:31:59 +0200
Subject: typo, fixes #1806

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

(limited to 'plugins')

diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index 2fb8d5462..610ad34dc 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -1,7 +1,7 @@
 #
 # INSTRUCTIONS
 #
-#   To enabled agent forwarding support add the following to
+#   To enable agent forwarding support add the following to
 #   your .zshrc file:
 #
 #     zstyle :omz:plugins:ssh-agent agent-forwarding on
-- 
cgit v1.2.3-70-g09d2


From 8355233f7fc055d8446c7ebf50569202fa5bd1f5 Mon Sep 17 00:00:00 2001
From: Trevor Strieber <trevor@strieber.org>
Date: Thu, 8 May 2014 14:19:37 -0400
Subject: Fixing typo.

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

(limited to 'plugins')

diff --git a/plugins/colorize/colorize.plugin.zsh b/plugins/colorize/colorize.plugin.zsh
index 0696607d9..dc0947d4f 100644
--- a/plugins/colorize/colorize.plugin.zsh
+++ b/plugins/colorize/colorize.plugin.zsh
@@ -1,4 +1,4 @@
-# Plugin for highligthing file content
+# Plugin for highlighting file content
 # Plugin highlights file content based on the filename extension.
 # If no highlighting method supported for given extension then it tries 
 # guess it by looking for file content.
@@ -25,4 +25,4 @@ colorize_via_pygmentize() {
             pygmentize -g "$FNAME"
         fi
     done
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3-70-g09d2


From c1f5a1792be3f11f9b298a11232bc5913c8b71a2 Mon Sep 17 00:00:00 2001
From: Brian Hartvigsen <brian.andrew@brianandjenny.com>
Date: Thu, 13 Feb 2014 17:33:27 -0700
Subject: This is already done in lib/theme-and-appearance.zsh and supports
 Darwin/BSD/etc

---
 plugins/common-aliases/common-aliases.plugin.zsh | 1 -
 1 file changed, 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/common-aliases/common-aliases.plugin.zsh b/plugins/common-aliases/common-aliases.plugin.zsh
index b19650fee..0ee17014b 100644
--- a/plugins/common-aliases/common-aliases.plugin.zsh
+++ b/plugins/common-aliases/common-aliases.plugin.zsh
@@ -3,7 +3,6 @@
 #
 
 # ls, the common ones I use a lot shortened for rapid fire usage
-alias ls='ls --color' #I like color
 alias l='ls -lFh'     #size,show type,human readable
 alias la='ls -lAFh'   #long list,show almost all,show type,human readable
 alias lr='ls -tRFh'   #sorted by date,recursive,show type,human readable
-- 
cgit v1.2.3-70-g09d2


From 5e601d6515f9ee51c733aea71acf6757066943e2 Mon Sep 17 00:00:00 2001
From: Brian Hartvigsen <brian.andrew@brianandjenny.com>
Date: Thu, 13 Feb 2014 17:41:38 -0700
Subject: Fix dud alias. Switch --max-depth for just -d

As far as I can tell (tested on Linux & Darwin, BSD man page seems to agree), `-d` is pretty univerally accepted as the depth argument.  So instead of doing a test, we can just use -d and call it a day.
---
 plugins/common-aliases/common-aliases.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/common-aliases/common-aliases.plugin.zsh b/plugins/common-aliases/common-aliases.plugin.zsh
index 0ee17014b..228a39da0 100644
--- a/plugins/common-aliases/common-aliases.plugin.zsh
+++ b/plugins/common-aliases/common-aliases.plugin.zsh
@@ -38,7 +38,7 @@ alias -g NE="2> /dev/null"
 alias -g NUL="> /dev/null 2>&1"
 alias -g P="2>&1| pygmentize -l pytb"
 
-alias dud='du --max-depth=1 -h'
+alias dud='du -d 1 -h'
 alias duf='du -sh *'
 alias fd='find . -type d -name'
 alias ff='find . -type f -name'
-- 
cgit v1.2.3-70-g09d2


From c0b094cf859899bd78db43a4dc59a0ae6786d49d Mon Sep 17 00:00:00 2001
From: pangratz <cmueller.418@gmail.com>
Date: Mon, 3 Feb 2014 10:35:40 +0100
Subject: Fix function/alias naming clash between bower and bundle plugin

Since the `bower` plugin specifies a `bi` alias and `bundle` plugin
specifies a `bi` function, there is a name clash when using both
plugins, which results in the message "Can't 'bundle install' outside a
bundled project" when trying to execute `bower`.

This adresses #2486
---
 plugins/bundler/bundler.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index 3338d78be..8571eeda3 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -3,6 +3,7 @@ alias bl="bundle list"
 alias bp="bundle package"
 alias bo="bundle open"
 alias bu="bundle update"
+alias bi="bundle_install"
 
 # The following is based on https://github.com/gma/bundler-exec
 
@@ -15,7 +16,7 @@ done
 
 ## Functions
 
-bi() {
+bundle_install() {
   if _bundler-installed && _within-bundled-project; then
     local bundler_version=`bundle version | cut -d' ' -f3`
     if [[ $bundler_version > '1.4.0' || $bundler_version = '1.4.0' ]]; then
-- 
cgit v1.2.3-70-g09d2


From 6fc241b0d2f4690f7fd00f26eb91045a04c05fbd Mon Sep 17 00:00:00 2001
From: Frank Behrens <fbehrens@gmail.com>
Date: Fri, 18 Apr 2014 11:26:06 +0200
Subject: extract plugin will unzip *.sublime-package files

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

(limited to 'plugins')

diff --git a/plugins/extract/extract.plugin.zsh b/plugins/extract/extract.plugin.zsh
index 7352e5bad..a6e16ddf7 100644
--- a/plugins/extract/extract.plugin.zsh
+++ b/plugins/extract/extract.plugin.zsh
@@ -52,7 +52,7 @@ function extract() {
       (*.xz) unxz "$1" ;;
       (*.lzma) unlzma "$1" ;;
       (*.Z) uncompress "$1" ;;
-      (*.zip|*.war|*.jar) unzip "$1" -d $extract_dir ;;
+      (*.zip|*.war|*.jar|*.sublime-package) unzip "$1" -d $extract_dir ;;
       (*.rar) unrar x -ad "$1" ;;
       (*.7z) 7za x "$1" ;;
       (*.deb)
-- 
cgit v1.2.3-70-g09d2


From 7bb42fb49a0dcbd0774a0e6efafe766fdfc82268 Mon Sep 17 00:00:00 2001
From: James Magnarelli <jmagnare@gmail.com>
Date: Sat, 29 Dec 2012 21:32:00 -0500
Subject: Corrected syntax error in github plugin's empty_gh function

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

(limited to 'plugins')

diff --git a/plugins/github/github.plugin.zsh b/plugins/github/github.plugin.zsh
index 25b1a1e1b..bd69b1bd5 100644
--- a/plugins/github/github.plugin.zsh
+++ b/plugins/github/github.plugin.zsh
@@ -40,7 +40,7 @@ fi
 #
 # Use this when creating a new repo from scratch.
 empty_gh() { # [NAME_OF_REPO]
-    repo = $1
+    repo=$1
     ghuser=$(  git config github.user )
 
     mkdir "$repo"
-- 
cgit v1.2.3-70-g09d2


From 80828cd0d3d415b49530c0f7e989f6d251427985 Mon Sep 17 00:00:00 2001
From: Andrey Koleshko <ka8725@gmail.com>
Date: Mon, 14 Jan 2013 12:46:01 +0300
Subject: Update plugins/rbenv/rbenv.plugin.zsh

Fix rbenv plugin for OS X latest homebrew
---
 plugins/rbenv/rbenv.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/rbenv/rbenv.plugin.zsh b/plugins/rbenv/rbenv.plugin.zsh
index b6795b91c..213e1beb0 100644
--- a/plugins/rbenv/rbenv.plugin.zsh
+++ b/plugins/rbenv/rbenv.plugin.zsh
@@ -7,7 +7,7 @@ _rbenv-from-homebrew-installed() {
 }
 
 FOUND_RBENV=0
-rbenvdirs=("$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv")
+rbenvdirs=("$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv" "/usr/local/opt/rbenv")
 if _homebrew-installed && _rbenv-from-homebrew-installed ; then
     rbenvdirs=($(brew --prefix rbenv) "${rbenvdirs[@]}")
 fi
-- 
cgit v1.2.3-70-g09d2


From 97ab436f7f8823586fd9f3ef21ec1248abdc1262 Mon Sep 17 00:00:00 2001
From: Jim Hester <james.f.hester@gmail.com>
Date: Fri, 2 Nov 2012 11:14:45 -0400
Subject: Fix path for colemak plugin

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

(limited to 'plugins')

diff --git a/plugins/colemak/colemak.plugin.zsh b/plugins/colemak/colemak.plugin.zsh
index 34d42c280..cb7cc5068 100644
--- a/plugins/colemak/colemak.plugin.zsh
+++ b/plugins/colemak/colemak.plugin.zsh
@@ -19,4 +19,4 @@ bindkey -a 'N' vi-join
 bindkey -a 'j' vi-forward-word-end
 bindkey -a 'J' vi-forward-blank-word-end
 
-lesskey $ZSH_CUSTOM/plugins/colemak/colemak-less
+lesskey $ZSH/plugins/colemak/colemak-less
-- 
cgit v1.2.3-70-g09d2


From 3fac127152e42a3149fa7174a0841de97f2fb82a Mon Sep 17 00:00:00 2001
From: MrTux <mrtux@ubuntu-vn.org>
Date: Tue, 14 Jan 2014 02:19:33 +0700
Subject: Correct wrong plugin file name

---
 plugins/systemadmin/systemadmin.plugin.zsh | 159 +++++++++++++++++++++++++++++
 plugins/systemadmin/systemadmin.zsh        | 159 -----------------------------
 2 files changed, 159 insertions(+), 159 deletions(-)
 create mode 100644 plugins/systemadmin/systemadmin.plugin.zsh
 delete mode 100644 plugins/systemadmin/systemadmin.zsh

(limited to 'plugins')

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


From 3c41da3172325d90397baed7b27b4c675def8a51 Mon Sep 17 00:00:00 2001
From: Christophe Bliard <christophe.bliard@trux.info>
Date: Tue, 9 Jul 2013 13:51:52 +0200
Subject: Update colorize.plugin.zsh

correctly detect when pygmentize is not installed
do not exit shell if when pygmentize is not installed
---
 plugins/colorize/colorize.plugin.zsh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'plugins')

diff --git a/plugins/colorize/colorize.plugin.zsh b/plugins/colorize/colorize.plugin.zsh
index dc0947d4f..11b58e69d 100644
--- a/plugins/colorize/colorize.plugin.zsh
+++ b/plugins/colorize/colorize.plugin.zsh
@@ -6,9 +6,9 @@
 alias colorize='colorize_via_pygmentize'
 
 colorize_via_pygmentize() {
-    if [ ! -x $(which pygmentize) ]; then
-        echo package \'pygmentize\' is not installed!
-        exit -1
+    if [ ! -x "$(which pygmentize)" ]; then
+        echo "package \'pygmentize\' is not installed!"
+        return -1
     fi
 
     if [ $# -eq 0 ]; then
-- 
cgit v1.2.3-70-g09d2


From b5692730128f84da8cc03567099f58df2baf546b Mon Sep 17 00:00:00 2001
From: Theodore Kokkoris <t.kokkoris@gmail.com>
Date: Sat, 29 Jun 2013 13:09:37 +0300
Subject: Removed unnecessary execute permissions for some plugins

---
 plugins/bower/_bower               | 0
 plugins/grails/grails.plugin.zsh   | 0
 plugins/jruby/jruby.plugin.zsh     | 0
 plugins/sublime/sublime.plugin.zsh | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 plugins/bower/_bower
 mode change 100755 => 100644 plugins/grails/grails.plugin.zsh
 mode change 100755 => 100644 plugins/jruby/jruby.plugin.zsh
 mode change 100755 => 100644 plugins/sublime/sublime.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/bower/_bower b/plugins/bower/_bower
old mode 100755
new mode 100644
diff --git a/plugins/grails/grails.plugin.zsh b/plugins/grails/grails.plugin.zsh
old mode 100755
new mode 100644
diff --git a/plugins/jruby/jruby.plugin.zsh b/plugins/jruby/jruby.plugin.zsh
old mode 100755
new mode 100644
diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
old mode 100755
new mode 100644
-- 
cgit v1.2.3-70-g09d2


From 76e23e62c659fd61cf43b5e2cde350fd1d434d43 Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Thu, 29 May 2014 10:58:51 +0200
Subject: Fix permissions on wd plugin continuating #1923

---
 plugins/wd/wd.plugin.zsh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 plugins/wd/wd.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/wd/wd.plugin.zsh b/plugins/wd/wd.plugin.zsh
old mode 100755
new mode 100644
-- 
cgit v1.2.3-70-g09d2


From ac1a321abefb73f1eeb6c9ec76dd14a062482ac6 Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Thu, 29 May 2014 11:06:02 +0200
Subject: add gfa alias for recursive formatting inspired from #2018

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

(limited to 'plugins')

diff --git a/plugins/golang/golang.plugin.zsh b/plugins/golang/golang.plugin.zsh
index 18bcaaff2..f2be6ca9c 100644
--- a/plugins/golang/golang.plugin.zsh
+++ b/plugins/golang/golang.plugin.zsh
@@ -158,3 +158,6 @@ __go_tool_complete() {
 }
 
 compdef __go_tool_complete go
+
+# aliases
+alias gfa='go fmt . ./...'
-- 
cgit v1.2.3-70-g09d2


From b1c97bc77ef6e6922c6aed5bb7a2a86506407efc Mon Sep 17 00:00:00 2001
From: Doug Jones <djones@squarespace.com>
Date: Mon, 5 Aug 2013 09:54:49 -0400
Subject: Fix comparison used to determine if the cache is outdated.

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

(limited to 'plugins')

diff --git a/plugins/gradle/gradle.plugin.zsh b/plugins/gradle/gradle.plugin.zsh
index 9229512f7..97bf50b43 100644
--- a/plugins/gradle/gradle.plugin.zsh
+++ b/plugins/gradle/gradle.plugin.zsh
@@ -60,7 +60,7 @@ function in_gradle() {
 ############################################################################
 _gradle_does_task_list_need_generating () {
   [ ! -f .gradletasknamecache ] && return 0;
-  [ .gradletasknamecache -nt build.gradle ] && return 0;
+  [ build.gradle -nt .gradletasknamecache ] && return 0;
   return 1;
 }
 
-- 
cgit v1.2.3-70-g09d2


From 3cdfdad28a1b7efbcc1cd1282e7811d80f50a730 Mon Sep 17 00:00:00 2001
From: Yachi Lo <yaachi@gmail.com>
Date: Wed, 28 May 2014 16:05:07 +0800
Subject: use ls instead of find to avoid incompatibility with gnu find

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

(limited to 'plugins')

diff --git a/plugins/xcode/xcode.plugin.zsh b/plugins/xcode/xcode.plugin.zsh
index 4816ab0ed..e59bee8c7 100644
--- a/plugins/xcode/xcode.plugin.zsh
+++ b/plugins/xcode/xcode.plugin.zsh
@@ -1,6 +1,6 @@
 #xc function courtesy of http://gist.github.com/subdigital/5420709
 function xc {
-  xcode_proj=`find . -name "*.xc*" -d 1 | sort -r | head -1`
+  xcode_proj=`ls | grep "\.xc" | sort -r | head -1`
   if [[ `echo -n $xcode_proj | wc -m` == 0 ]]
   then
     echo "No xcworkspace/xcodeproj file found in the current directory."
-- 
cgit v1.2.3-70-g09d2


From e5ed07e2b5740346d2a32b3a47204612d8808723 Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Wed, 4 Jun 2014 12:36:34 +0200
Subject: specify python2 in shebang as suggested in #2382

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

(limited to 'plugins')

diff --git a/plugins/git-prompt/gitstatus.py b/plugins/git-prompt/gitstatus.py
index 256841432..c665a9ee1 100644
--- a/plugins/git-prompt/gitstatus.py
+++ b/plugins/git-prompt/gitstatus.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 # -*- coding: UTF-8 -*-
 from subprocess import Popen, PIPE
 import re
-- 
cgit v1.2.3-70-g09d2


From de41dee9e462e2a04cbe4658a002812d71f9e3c3 Mon Sep 17 00:00:00 2001
From: Jérôme Macias <jerome.macias@gmail.com>
Date: Tue, 10 Dec 2013 10:03:46 +0100
Subject: Add alias for container:debug task

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

(limited to 'plugins')

diff --git a/plugins/symfony2/symfony2.plugin.zsh b/plugins/symfony2/symfony2.plugin.zsh
index 0d2bb68c3..4c07349a4 100644
--- a/plugins/symfony2/symfony2.plugin.zsh
+++ b/plugins/symfony2/symfony2.plugin.zsh
@@ -17,5 +17,6 @@ compdef _symfony2 sf
 alias sf='php app/console'
 alias sfcl='php app/console cache:clear'
 alias sfroute='php app/console router:debug'
+alias sfcontainer='php app/console container:debug'
 alias sfgb='php app/console generate:bundle'
 
-- 
cgit v1.2.3-70-g09d2


From f82092a0e78985287c6eb1746234db688bb1a98f Mon Sep 17 00:00:00 2001
From: Chris Krycho <github@chriskrycho.com>
Date: Fri, 18 Oct 2013 09:23:27 -0400
Subject: Add a command to show unresolve files in merge

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

(limited to 'plugins')

diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
index 2e99a12fb..ff95d5e40 100644
--- a/plugins/mercurial/mercurial.plugin.zsh
+++ b/plugins/mercurial/mercurial.plugin.zsh
@@ -16,6 +16,8 @@ alias hgs='hg status'
 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'
+# list unresolved files (since hg does not list unmerged files in the status command)
+alias hgun='hg resolve --list'
 
 function in_hg() {
   if [[ -d .hg ]] || $(hg summary > /dev/null 2>&1); then
-- 
cgit v1.2.3-70-g09d2


From f7948ace66dd541e5b60666d840cce6b6d95f0e6 Mon Sep 17 00:00:00 2001
From: Tim Kelty <timkelty@gmail.com>
Date: Mon, 16 Dec 2013 10:26:18 -0500
Subject: Adding compression to rsync commands

This speeds up transfers significantly. No reason not to include it as far as I know.
---
 plugins/rsync/rsync.plugin.zsh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'plugins')

diff --git a/plugins/rsync/rsync.plugin.zsh b/plugins/rsync/rsync.plugin.zsh
index 33a31a5c1..1a3bb4cc3 100644
--- a/plugins/rsync/rsync.plugin.zsh
+++ b/plugins/rsync/rsync.plugin.zsh
@@ -1,4 +1,4 @@
-alias rsync-copy="rsync -av --progress -h"
-alias rsync-move="rsync -av --progress -h --remove-source-files"
-alias rsync-update="rsync -avu --progress -h"
-alias rsync-synchronize="rsync -avu --delete --progress -h"
+alias rsync-copy="rsync -avz --progress -h"
+alias rsync-move="rsync -avz --progress -h --remove-source-files"
+alias rsync-update="rsync -avzu --progress -h"
+alias rsync-synchronize="rsync -avzu --delete --progress -h"
-- 
cgit v1.2.3-70-g09d2


From e04d3e0563217c2beef475b4eecf90bde4c8193a Mon Sep 17 00:00:00 2001
From: Julia Medina <a.julia.medina@gmail.com>
Date: Fri, 25 Oct 2013 20:34:23 -0300
Subject: Add startproject to django command completions

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

(limited to 'plugins')

diff --git a/plugins/django/django.plugin.zsh b/plugins/django/django.plugin.zsh
index 9d898edca..aaaa7d21d 100644
--- a/plugins/django/django.plugin.zsh
+++ b/plugins/django/django.plugin.zsh
@@ -141,6 +141,7 @@ _managepy-sqlinitialdata(){}
 _managepy-sqlreset(){}
 _managepy-sqlsequencereset(){}
 _managepy-startapp(){}
+_managepy-startproject(){}
 
 _managepy-syncdb() {
   _arguments -s : \
@@ -198,6 +199,7 @@ _managepy-commands() {
     'sqlreset:Prints the DROP TABLE SQL, then the CREATE TABLE SQL, for the given app name(s).'
     'sqlsequencereset:Prints the SQL statements for resetting sequences for the given app name(s).'
     "startapp:Creates a Django app directory structure for the given app name in this project's directory."
+    "startproject:Creates a Django project directory structure for the given project name in this current directory."
     "syncdb:Create the database tables for all apps in INSTALLED_APPS whose tables haven't already been created."
     'test:Runs the test suite for the specified applications, or the entire site if no apps are specified.'
     'testserver:Runs a development server with data from the given fixture(s).'
-- 
cgit v1.2.3-70-g09d2


From 99c9dbed4722c66428323401d560aaa521c6932f Mon Sep 17 00:00:00 2001
From: Gaetan Semet <gaetan@xeberon.net>
Date: Tue, 3 Dec 2013 10:24:32 +0100
Subject: New alias for repo: ru and rst

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

(limited to 'plugins')

diff --git a/plugins/repo/repo.plugin.zsh b/plugins/repo/repo.plugin.zsh
index d690a9d22..33f4195c7 100644
--- a/plugins/repo/repo.plugin.zsh
+++ b/plugins/repo/repo.plugin.zsh
@@ -10,3 +10,9 @@ compdef _repo rs='repo sync'
 
 alias rsrra='repo sync ; repo rebase --auto-stash'
 compdef _repo rsrra='repo sync ; repo rebase --auto-stash'
+
+alias ru='repo upload'
+compdef _repo ru='repo upload'
+
+alias rst='repo status'
+compdef _repo rst='repo status'
-- 
cgit v1.2.3-70-g09d2


From 519d37fc389e1f2faec6fd34cb8ee64a35fa154e Mon Sep 17 00:00:00 2001
From: Pieter Kokx <pieter@kokx.nl>
Date: Fri, 8 Nov 2013 10:11:38 +0100
Subject: Vundle plugin now works with submodules.

If you are using a submodule, ~/.vim/bundle/vundle/.git is a file,
not a directory. So I changed the test for that.
---
 plugins/vundle/vundle.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/vundle/vundle.plugin.zsh b/plugins/vundle/vundle.plugin.zsh
index 936c8d7d2..830774fe3 100644
--- a/plugins/vundle/vundle.plugin.zsh
+++ b/plugins/vundle/vundle.plugin.zsh
@@ -4,7 +4,7 @@ function vundle-init () {
     mkdir -p ~/.vim/bundle/vundle/
   fi
 
-  if [ ! -d ~/.vim/bundle/vundle/.git/ ]
+  if [ ! -d ~/.vim/bundle/vundle/.git ] && [ ! -f ~/.vim/bundle/vundle/.git ]
   then
     git clone http://github.com/gmarik/vundle.git ~/.vim/bundle/vundle
     echo "\n\tRead about vim configuration for vundle at https://github.com/gmarik/vundle\n"
-- 
cgit v1.2.3-70-g09d2


From 50fe95a69e471345f20fb88ae62e14ada43c134a Mon Sep 17 00:00:00 2001
From: Hong Xu <hong@topbug.net>
Date: Fri, 25 Oct 2013 16:17:21 -0700
Subject: Autojump plugin: check user local installation first.

Users may install their own version of autojump to override the system
installed version.
---
 plugins/autojump/autojump.plugin.zsh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'plugins')

diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh
index 0aa14959d..50a694764 100644
--- a/plugins/autojump/autojump.plugin.zsh
+++ b/plugins/autojump/autojump.plugin.zsh
@@ -1,5 +1,7 @@
 if [ $commands[autojump] ]; then # check if autojump is installed
-  if [ -f /usr/share/autojump/autojump.zsh ]; then # debian and ubuntu package
+  if [ -f $HOME/.autojump/etc/profile.d/autojump.zsh ]; then # manual user-local installation
+    . $HOME/.autojump/etc/profile.d/autojump.zsh
+  elif [ -f /usr/share/autojump/autojump.zsh ]; then # debian and ubuntu package
     . /usr/share/autojump/autojump.zsh
   elif [ -f /etc/profile.d/autojump.zsh ]; then # manual installation
     . /etc/profile.d/autojump.zsh
@@ -7,8 +9,6 @@ if [ $commands[autojump] ]; then # check if autojump is installed
     . /etc/profile.d/autojump.sh
   elif [ -f /usr/local/share/autojump/autojump.zsh ]; then # freebsd installation
     . /usr/local/share/autojump/autojump.zsh
-  elif [ -f $HOME/.autojump/etc/profile.d/autojump.zsh ]; then # manual user-local installation
-    . $HOME/.autojump/etc/profile.d/autojump.zsh
   elif [ -f /opt/local/etc/profile.d/autojump.zsh ]; then # mac os x with ports
     . /opt/local/etc/profile.d/autojump.zsh
   elif [ $commands[brew] -a -f `brew --prefix`/etc/autojump.zsh ]; then # mac os x with brew
-- 
cgit v1.2.3-70-g09d2


From 89a5075528f5e36a442330f13f89a0782f1c555d Mon Sep 17 00:00:00 2001
From: Fenhl <fenhl@fenhl.net>
Date: Wed, 12 Feb 2014 17:23:29 +0000
Subject: Add pip3 completion support to pip plugin

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

(limited to 'plugins')

diff --git a/plugins/pip/_pip b/plugins/pip/_pip
index 9892dd19c..bf0df3e41 100644
--- a/plugins/pip/_pip
+++ b/plugins/pip/_pip
@@ -1,4 +1,4 @@
-#compdef pip
+#compdef pip pip3 pip-3.2 pip-3.3 pip-3.4
 #autoload
 
 # pip zsh completion, based on homebrew completion
-- 
cgit v1.2.3-70-g09d2


From 82d557a84e26ea79a3ecc5a8e975890c23099a00 Mon Sep 17 00:00:00 2001
From: Fenhl <fenhl@fenhl.net>
Date: Wed, 11 Jun 2014 19:31:24 +0000
Subject: Add pip2 and pip-2.7 support to pip plugin

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

(limited to 'plugins')

diff --git a/plugins/pip/_pip b/plugins/pip/_pip
index bf0df3e41..cb155e5f4 100644
--- a/plugins/pip/_pip
+++ b/plugins/pip/_pip
@@ -1,4 +1,4 @@
-#compdef pip pip3 pip-3.2 pip-3.3 pip-3.4
+#compdef pip pip2 pip-2.7 pip3 pip-3.2 pip-3.3 pip-3.4
 #autoload
 
 # pip zsh completion, based on homebrew completion
-- 
cgit v1.2.3-70-g09d2


From 340da08b9ad92654e5e9bb45a1aedc8645f78b74 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Wed, 16 Apr 2014 20:23:01 +0200
Subject: Add missing quotes to within-bundler-project function

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

(limited to 'plugins')

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index 8571eeda3..d70e8d4da 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -40,8 +40,8 @@ _bundler-installed() {
 }
 
 _within-bundled-project() {
-  local check_dir=$PWD
-  while [ $check_dir != "/" ]; do
+  local check_dir="$PWD"
+  while [ "$check_dir" != "/" ]; do
     [ -f "$check_dir/Gemfile" ] && return
     check_dir="$(dirname $check_dir)"
   done
-- 
cgit v1.2.3-70-g09d2


From f2b81e2977c264713a2a0f6971c8f312f7560b52 Mon Sep 17 00:00:00 2001
From: Helge Rausch <helge@rausch.io>
Date: Mon, 16 Jun 2014 16:18:22 +0200
Subject: Add spring to bundled commands

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

(limited to 'plugins')

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index d70e8d4da..20931dcef 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -7,7 +7,7 @@ alias bi="bundle_install"
 
 # The following is based on https://github.com/gma/bundler-exec
 
-bundled_commands=(annotate berks cap capify cucumber foodcritic foreman guard irb jekyll kitchen knife middleman nanoc puma rackup rainbows rake rspec ruby shotgun spec spin spork strainer tailor taps thin thor unicorn unicorn_rails)
+bundled_commands=(annotate berks cap capify cucumber foodcritic foreman guard irb jekyll kitchen knife middleman nanoc puma rackup rainbows rake rspec ruby shotgun spec spin spork spring strainer tailor taps thin thor unicorn unicorn_rails)
 
 # Remove $UNBUNDLED_COMMANDS from the bundled_commands list
 for cmd in $UNBUNDLED_COMMANDS; do
-- 
cgit v1.2.3-70-g09d2


From bc2e3ff15a55fd21c6eabd502981e035dd5629c1 Mon Sep 17 00:00:00 2001
From: Peter Butkovic <butkovic@gmail.com>
Date: Tue, 24 Jun 2014 16:26:12 +0200
Subject: added useful mvn aliases

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

(limited to 'plugins')

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index ed7968534..2b7683078 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -44,19 +44,22 @@ mvn-color()
 # aliases
 alias mvncie='mvn clean install eclipse:eclipse'
 alias mvnci='mvn clean install'
+alias mvncist='mvn clean install -DskipTests'
 alias mvne='mvn eclipse:eclipse'
 alias mvnce='mvn clean eclipse:clean eclipse:eclipse'
 alias mvnd='mvn deploy'
 alias mvnp='mvn package'
 alias mvnc='mvn clean'
 alias mvncom='mvn compile'
+alias mvnct='mvn clean test'
 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'
 alias mvnjetty='mvn jetty:run'
-
+alias mvndt='mvn dependency:tree'
+alias mvns='mvn site'
 
 function listMavenCompletions { 
      reply=(
-- 
cgit v1.2.3-70-g09d2


From 75c02dd53e65357658f08bafaec99cc4b15a55ec Mon Sep 17 00:00:00 2001
From: Jannik Zschiesche <jz@becklyn.com>
Date: Fri, 23 May 2014 10:52:37 +0200
Subject: Plugin jump: autocompletion for numbers and dots

This change fixes the autocompletion for marks which contain numbers or dots.

Fixes #2578

`\d` in sed regular expressions doesn't work (see http://stackoverflow.com/questions/14671293/why-does-d-doesnt-work-in-regular-expression-in-sed)
---
 plugins/jump/jump.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/jump/jump.plugin.zsh b/plugins/jump/jump.plugin.zsh
index 5096879d8..1b23b5d42 100644
--- a/plugins/jump/jump.plugin.zsh
+++ b/plugins/jump/jump.plugin.zsh
@@ -39,7 +39,7 @@ marks() {
 
 _completemarks() {
 	if [[ $(ls "${MARKPATH}" | wc -l) -gt 1 ]]; then
-		reply=($(ls $MARKPATH/**/*(-) | grep : | sed -E 's/(.*)\/([_\da-zA-Z\-]*):$/\2/g'))
+		reply=($(ls $MARKPATH/**/*(-) | grep : | sed -E 's/(.*)\/([_a-zA-Z0-9\.\-]*):$/\2/g'))
 	else
 		if readlink -e "${MARKPATH}"/* &>/dev/null; then
 			reply=($(ls "${MARKPATH}"))
-- 
cgit v1.2.3-70-g09d2


From dbca185b05b79cdc5308936415602d81fb444821 Mon Sep 17 00:00:00 2001
From: Arandi López <arandilopez.93@gmail.com>
Date: Sat, 21 Jun 2014 20:29:05 -0500
Subject: Add /usr/bin/subl path for who has linked sublime text there

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

(limited to 'plugins')

diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index a2042343a..438f386fb 100644
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -7,6 +7,7 @@ if [[ $('uname') == 'Linux' ]]; then
         "/opt/sublime_text/sublime_text"
         "/usr/bin/sublime_text"
         "/usr/local/bin/sublime_text"
+        "/usr/bin/subl"
     )
     for _sublime_path in $_sublime_linux_paths; do
         if [[ -a $_sublime_path ]]; then
-- 
cgit v1.2.3-70-g09d2


From ce9ec85c63412036163781d3501e9ed74432d391 Mon Sep 17 00:00:00 2001
From: Rob Loach <robloach@gmail.com>
Date: Sun, 1 Jun 2014 19:28:42 -0400
Subject: Add Composer's global binaries to PATH

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

(limited to 'plugins')

diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh
index 9975aaca4..86f2ca4df 100644
--- a/plugins/composer/composer.plugin.zsh
+++ b/plugins/composer/composer.plugin.zsh
@@ -46,3 +46,6 @@ alias cdu='composer dump-autoload'
 
 # install composer in the current directory
 alias cget='curl -s https://getcomposer.org/installer | php'
+
+# Add Composer's global binaries to PATH
+export PATH=$PATH:~/.composer/vendor/bin
-- 
cgit v1.2.3-70-g09d2


From 08632bb1780d51f6748b5c09ef5232862313f78f Mon Sep 17 00:00:00 2001
From: fjcapdevila <fjcapdevila@gmail.com>
Date: Mon, 2 Jun 2014 12:14:57 -0300
Subject: Basic support for Docker related commands.

Add basic support for Docker related commands.
---
 plugins/vagrant/_vagrant | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'plugins')

diff --git a/plugins/vagrant/_vagrant b/plugins/vagrant/_vagrant
index e05b16f81..9ddfa1be7 100644
--- a/plugins/vagrant/_vagrant
+++ b/plugins/vagrant/_vagrant
@@ -8,6 +8,8 @@ _1st_arguments=(
     'box:Box commands'
     'connect:Connects to a shared, remote Vagrant environment'
     'destroy:Destroys the vagrant environment'
+    'docker-logs:Shows Docker logs'
+    'docker-run:Run one-off commands against a Docker container'
     'global-status:Reports the status of all active Vagrant environments on the system'
     'halt:Halts the currently running vagrant environment'
     'init:[box_name] [box_url] Initializes current folder for Vagrant usage'
-- 
cgit v1.2.3-70-g09d2