From 96d10e2147b59adc25e9c3b90ac6f31935495ef3 Mon Sep 17 00:00:00 2001
From: Robert Strack <robert.strack@gmail.com>
Date: Fri, 13 Nov 2015 23:42:21 -0500
Subject: calculating command's execution time

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

(limited to 'plugins')

diff --git a/plugins/timer/timer.plugin.zsh b/plugins/timer/timer.plugin.zsh
new file mode 100644
index 000000000..aa4573b9f
--- /dev/null
+++ b/plugins/timer/timer.plugin.zsh
@@ -0,0 +1,18 @@
+preexec() {
+  __timer_cmd_start_time=$(date '+%s')
+}
+
+precmd() {
+  if [ -n "${__timer_cmd_start_time}" ]; then
+    local cmd_end_time=$(date '+%s')
+    local tdiff=$((${cmd_end_time} - ${__timer_cmd_start_time}))
+    unset __timer_cmd_start_time
+    local tdiffstr='/'
+    if (( tdiff >= 60 )); then
+      tdiffstr+="$((tdiff / 60))m"
+    fi
+    tdiffstr+="$((tdiff % 60))s"
+    local cols=$(($COLUMNS - ${#tdiffstr} - 1))
+    echo -e "\033[1A\033[${cols}C ${tdiffstr}"
+  fi
+}
-- 
cgit v1.2.3-70-g09d2


From 1b8f05a3d395c107d81724445cac7fcd599942d8 Mon Sep 17 00:00:00 2001
From: Robert Strack <robert.strack@gmail.com>
Date: Sat, 14 Nov 2015 23:13:44 -0500
Subject: simplified time string calculation

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

(limited to 'plugins')

diff --git a/plugins/timer/timer.plugin.zsh b/plugins/timer/timer.plugin.zsh
index aa4573b9f..f73d2ab53 100644
--- a/plugins/timer/timer.plugin.zsh
+++ b/plugins/timer/timer.plugin.zsh
@@ -7,12 +7,8 @@ precmd() {
     local cmd_end_time=$(date '+%s')
     local tdiff=$((${cmd_end_time} - ${__timer_cmd_start_time}))
     unset __timer_cmd_start_time
-    local tdiffstr='/'
-    if (( tdiff >= 60 )); then
-      tdiffstr+="$((tdiff / 60))m"
-    fi
-    tdiffstr+="$((tdiff % 60))s"
-    local cols=$(($COLUMNS - ${#tdiffstr} - 1))
-    echo -e "\033[1A\033[${cols}C ${tdiffstr}"
+    local tdiffstr="$((tdiff / 60))m$((tdiff % 60))s"
+    local cols=$(($COLUMNS - ${#tdiffstr#0m} - 2))
+    echo -e "\033[1A\033[${cols}C \`${tdiffstr#0m}"
   fi
 }
-- 
cgit v1.2.3-70-g09d2


From 120e8620af6e1d7d01159614186403c7a816457d Mon Sep 17 00:00:00 2001
From: Robert Strack <robert.strack@gmail.com>
Date: Sat, 14 Nov 2015 23:48:26 -0500
Subject: cleaning up

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

(limited to 'plugins')

diff --git a/plugins/timer/timer.plugin.zsh b/plugins/timer/timer.plugin.zsh
index f73d2ab53..ee2cb66c1 100644
--- a/plugins/timer/timer.plugin.zsh
+++ b/plugins/timer/timer.plugin.zsh
@@ -3,12 +3,12 @@ preexec() {
 }
 
 precmd() {
-  if [ -n "${__timer_cmd_start_time}" ]; then
+  if [ -n "$__timer_cmd_start_time" ]; then
     local cmd_end_time=$(date '+%s')
-    local tdiff=$((${cmd_end_time} - ${__timer_cmd_start_time}))
+    local tdiff=$((cmd_end_time - __timer_cmd_start_time))
     unset __timer_cmd_start_time
     local tdiffstr="$((tdiff / 60))m$((tdiff % 60))s"
-    local cols=$(($COLUMNS - ${#tdiffstr#0m} - 2))
+    local cols=$((COLUMNS - ${#tdiffstr#0m} - 2))
     echo -e "\033[1A\033[${cols}C \`${tdiffstr#0m}"
   fi
 }
-- 
cgit v1.2.3-70-g09d2


From d4c74690b61b74e317410df3b80b784891ab55ed Mon Sep 17 00:00:00 2001
From: Robert Strack <robert.strack@gmail.com>
Date: Sun, 15 Nov 2015 22:08:16 -0500
Subject: increased timer's pecision

---
 plugins/timer/timer.plugin.zsh | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

(limited to 'plugins')

diff --git a/plugins/timer/timer.plugin.zsh b/plugins/timer/timer.plugin.zsh
index ee2cb66c1..729dd3ee2 100644
--- a/plugins/timer/timer.plugin.zsh
+++ b/plugins/timer/timer.plugin.zsh
@@ -1,14 +1,25 @@
+__timer_current_time() {
+  perl -MTime::HiRes=time -e'print time'
+}
+
+__timer_format_duration() {
+  local mins=$(printf '%.0f' $(($1 / 60)))
+  local secs=$(printf '%.1f' $(($1 - 60 * mins)))
+  local duration_str=$(echo "${mins}m${secs}s")
+  echo "\`${duration_str#0m}"
+}
+
 preexec() {
-  __timer_cmd_start_time=$(date '+%s')
+  __timer_cmd_start_time=$(__timer_current_time)
 }
 
 precmd() {
-  if [ -n "$__timer_cmd_start_time" ]; then
-    local cmd_end_time=$(date '+%s')
+  if [ -n "${__timer_cmd_start_time}" ]; then
+    local cmd_end_time=$(__timer_current_time)
     local tdiff=$((cmd_end_time - __timer_cmd_start_time))
     unset __timer_cmd_start_time
-    local tdiffstr="$((tdiff / 60))m$((tdiff % 60))s"
-    local cols=$((COLUMNS - ${#tdiffstr#0m} - 2))
-    echo -e "\033[1A\033[${cols}C \`${tdiffstr#0m}"
+    local tdiffstr=$(__timer_format_duration ${tdiff})
+    local cols=$((COLUMNS - ${#tdiffstr} - 1))
+    echo -e "\033[1A\033[${cols}C ${tdiffstr}"
   fi
 }
-- 
cgit v1.2.3-70-g09d2


From 111dd018b9b821fad2c7899b31aa46b5c0aaa218 Mon Sep 17 00:00:00 2001
From: Robert Strack <robert.strack@gmail.com>
Date: Mon, 16 Nov 2015 22:20:26 -0500
Subject: allow changes in display format

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

(limited to 'plugins')

diff --git a/plugins/timer/timer.plugin.zsh b/plugins/timer/timer.plugin.zsh
index 729dd3ee2..33481ea4e 100644
--- a/plugins/timer/timer.plugin.zsh
+++ b/plugins/timer/timer.plugin.zsh
@@ -4,9 +4,9 @@ __timer_current_time() {
 
 __timer_format_duration() {
   local mins=$(printf '%.0f' $(($1 / 60)))
-  local secs=$(printf '%.1f' $(($1 - 60 * mins)))
+  local secs=$(printf "%.${TIMER_PRECISION:-1}f" $(($1 - 60 * mins)))
   local duration_str=$(echo "${mins}m${secs}s")
-  echo "\`${duration_str#0m}"
+  echo "${TIMER_SYMBOL:-\`}${duration_str#0m}"
 }
 
 preexec() {
-- 
cgit v1.2.3-70-g09d2


From 96148d2275b848dbfb976a58967535067def4210 Mon Sep 17 00:00:00 2001
From: Robert Strack <robert.strack@gmail.com>
Date: Tue, 17 Nov 2015 20:50:30 -0500
Subject: customizable timer format

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

(limited to 'plugins')

diff --git a/plugins/timer/timer.plugin.zsh b/plugins/timer/timer.plugin.zsh
index 33481ea4e..f7f039b78 100644
--- a/plugins/timer/timer.plugin.zsh
+++ b/plugins/timer/timer.plugin.zsh
@@ -6,7 +6,8 @@ __timer_format_duration() {
   local mins=$(printf '%.0f' $(($1 / 60)))
   local secs=$(printf "%.${TIMER_PRECISION:-1}f" $(($1 - 60 * mins)))
   local duration_str=$(echo "${mins}m${secs}s")
-  echo "${TIMER_SYMBOL:-\`}${duration_str#0m}"
+  local format="${TIMER_FORMAT:-/%d}"
+  echo "${format//\%d/${duration_str#0m}}"
 }
 
 preexec() {
-- 
cgit v1.2.3-70-g09d2


From de8d6841b00903f2873a8b009faf7002bfbc1273 Mon Sep 17 00:00:00 2001
From: Robert Strack <robert.strack@gmail.com>
Date: Wed, 18 Nov 2015 20:33:38 -0500
Subject: added pre_functions

---
 plugins/timer/timer.plugin.zsh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/timer/timer.plugin.zsh b/plugins/timer/timer.plugin.zsh
index f7f039b78..231134e7d 100644
--- a/plugins/timer/timer.plugin.zsh
+++ b/plugins/timer/timer.plugin.zsh
@@ -10,11 +10,11 @@ __timer_format_duration() {
   echo "${format//\%d/${duration_str#0m}}"
 }
 
-preexec() {
+__timer_save_time_preexec() {
   __timer_cmd_start_time=$(__timer_current_time)
 }
 
-precmd() {
+__timer_display_timer_precmd() {
   if [ -n "${__timer_cmd_start_time}" ]; then
     local cmd_end_time=$(__timer_current_time)
     local tdiff=$((cmd_end_time - __timer_cmd_start_time))
@@ -24,3 +24,6 @@ precmd() {
     echo -e "\033[1A\033[${cols}C ${tdiffstr}"
   fi
 }
+
+preexec_functions+=(__timer_save_time_preexec)
+precmd_functions+=(__timer_display_timer_precmd)
-- 
cgit v1.2.3-70-g09d2


From d615961430aca9668cfb056aef6024c4ed41eff8 Mon Sep 17 00:00:00 2001
From: Robert Strack <robert.strack@gmail.com>
Date: Wed, 18 Nov 2015 21:09:18 -0500
Subject: readme file

---
 plugins/timer/README.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 plugins/timer/README.md

(limited to 'plugins')

diff --git a/plugins/timer/README.md b/plugins/timer/README.md
new file mode 100644
index 000000000..19072cb24
--- /dev/null
+++ b/plugins/timer/README.md
@@ -0,0 +1,18 @@
+This plugin allows to display command's execution time in a very nonintrusive way.
+
+Timer can be tuned by these two variables:
+* `TIMER_PRECISION` allows to control number of decimal places (default `1`)
+* `TIMER_FORMAT` allows to adjust display format (default `'/%d'`)
+
+Sample session:
+
+    me@here:~$ sleep 1                                         /1.0s
+    me@here:~$ sleep 73                                     /1m13.0s
+    me@here:~$ TIMER_FORMAT='[%d]'; TIMER_PRECISION=2         [0.00s]
+    me@here:~$ head -c50 < /dev/urandom | hexdump
+    0000000 b2 16 20 f0 29 1f 61 2d 8a 29 20 8c 8c 39 5a ab
+    0000010 21 47 0e f9 ee a4 76 46 71 9e 4f 6b a4 c4 51 cb
+    0000020 f9 1f 7e b9 6f 2c ae dd cf 40 6d 64 a8 fb d3 db
+    0000030 09 37
+    0000032                                                  [0.02s]
+
-- 
cgit v1.2.3-70-g09d2


From 7553bcb4185b9d584a40b41cf15501e43041fe57 Mon Sep 17 00:00:00 2001
From: Robert Strack <robert.strack@gmail.com>
Date: Wed, 18 Nov 2015 21:27:29 -0500
Subject: minor corrections in the readme file

---
 plugins/timer/README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/timer/README.md b/plugins/timer/README.md
index 19072cb24..321307e59 100644
--- a/plugins/timer/README.md
+++ b/plugins/timer/README.md
@@ -8,11 +8,10 @@ Sample session:
 
     me@here:~$ sleep 1                                         /1.0s
     me@here:~$ sleep 73                                     /1m13.0s
-    me@here:~$ TIMER_FORMAT='[%d]'; TIMER_PRECISION=2         [0.00s]
+    me@here:~$ TIMER_FORMAT='[%d]'; TIMER_PRECISION=2        [0.00s]
     me@here:~$ head -c50 < /dev/urandom | hexdump
     0000000 b2 16 20 f0 29 1f 61 2d 8a 29 20 8c 8c 39 5a ab
     0000010 21 47 0e f9 ee a4 76 46 71 9e 4f 6b a4 c4 51 cb
     0000020 f9 1f 7e b9 6f 2c ae dd cf 40 6d 64 a8 fb d3 db
     0000030 09 37
     0000032                                                  [0.02s]
-
-- 
cgit v1.2.3-70-g09d2


From 9248052e917a1d9296d4b79fa229b081cefbc698 Mon Sep 17 00:00:00 2001
From: mahi97 <mohammadmahdi76@gmail.com>
Date: Wed, 31 Aug 2016 03:31:49 +0430
Subject: initial spotify control

---
 plugins/osx/osx.plugin.zsh | 98 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 98 insertions(+)

(limited to 'plugins')

diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index a3e550972..948d69a29 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -261,6 +261,104 @@ EOF
 	osascript -e "tell application \"iTunes\" to $opt"
 }
 
+# Spotify control function
+function spotify() {
+  showHelp () {
+    echo "Usage:";
+    echo;
+    echo "  $(basename "$0") <command>";
+    echo;
+    echo "Commands:";
+    echo;
+    echo "  play                         # Resumes playback where Spotify last left off.";
+    echo "  pause                        # Pauses Spotify playback.";
+    echo "  next                         # Skips to the next song in a playlist.";
+    echo "  prev                         # Returns to the previous song in a playlist.";
+    echo "  pos [time]                   # Jumps to a time (in secs) in the current song.";
+    echo "  quit                         # Stops playback and quits Spotify.";
+    echo;
+    echo "  vol [amount]                 # Sets the volume to an amount between 0 and 100.";
+    echo "  vol show                     # Shows the current Spotify volume.";
+    echo;
+    echo "  toggle shuffle               # Toggles shuffle playback mode.";
+    echo "  toggle repeat                # Toggles repeat playback mode.";
+  }
+
+  if [ $# = 0 ]; then
+    showHelp;
+  else
+    if [ "$(osascript -e 'application "Spotify" is running')" = "false" ]; then
+      osascript -e 'tell application "Spotify" to activate'
+      sleep 2
+    fi
+  fi
+
+  while [ $# -gt 0 ]; do
+    arg=$1;
+
+    case $arg in
+      "play"    )
+        echo "Playing Spotify.";
+        osascript -e 'tell application "Spotify" to play';
+        break ;;
+
+      "pause"    )
+        echo "Pausing Spotify.";
+        osascript -e 'tell application "Spotify" to pause';
+        break ;;
+
+      "quit"    ) 
+        echo "Quitting Spotify.";
+        osascript -e 'tell application "Spotify" to quit';
+        exit 1 ;;
+
+      "next"    ) 
+        echo "Going to next track." ;
+        osascript -e 'tell application "Spotify" to next track';
+        break ;;
+
+      "prev"    ) 
+        echo "Going to previous track.";
+        osascript -e 'tell application "Spotify" to previous track';
+        break ;;
+
+      "vol"    )
+        vol=$(osascript -e 'tell application "Spotify" to sound volume as integer');
+        if [[ "$2" = "show" || "$2" = "" ]]; then
+          echo "Current Spotify volume level is $vol.";
+          break ;
+        elif [ "$2" -ge 0 ]; then
+          newvol=$2;
+        fi
+
+        osascript -e "tell application \"Spotify\" to set sound volume to $newvol";
+        break ;;
+
+      "toggle"  )
+        if [ "$2" = "shuffle" ]; then
+          osascript -e 'tell application "Spotify" to set shuffling to not shuffling';
+          curr=$(osascript -e 'tell application "Spotify" to shuffling');
+          echo "Spotify shuffling set to $curr";
+        elif [ "$2" = "repeat" ]; then
+          osascript -e 'tell application "Spotify" to set repeating to not repeating';
+          curr=$(osascript -e 'tell application "Spotify" to repeating');
+          echo "Spotify repeating set to $curr";
+        fi
+        break ;;
+
+      "pos"   )
+        echo "Adjusting Spotify play position."
+        osascript -e "tell application \"Spotify\" to set player position to $2";
+        break;;
+
+      -h|--help| *)
+        showHelp;
+        break ;;
+    esac
+  done
+}
+
+
 # Show/hide hidden files in the Finder
 alias showfiles="defaults write com.apple.finder AppleShowAllFiles -bool true && killall Finder"
 alias hidefiles="defaults write com.apple.finder AppleShowAllFiles -bool false && killall Finder"
-- 
cgit v1.2.3-70-g09d2


From 8f47c96453a229ad5488bbd1e4ee8b7c522b6a15 Mon Sep 17 00:00:00 2001
From: mahi97 <mohammadmahdi76@gmail.com>
Date: Wed, 31 Aug 2016 03:37:53 +0430
Subject: volume up/down added

---
 plugins/osx/osx.plugin.zsh | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'plugins')

diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index 948d69a29..386507dbc 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -327,6 +327,22 @@ function spotify() {
         if [[ "$2" = "show" || "$2" = "" ]]; then
           echo "Current Spotify volume level is $vol.";
           break ;
+        elif [ "$2" = "up" ]; then
+          if [ "$vol" -le 90 ]; then
+            newvol=$(( vol+10 ));
+            echo "Increasing Spotify volume to $newvol.";
+          else
+            newvol=100;
+            echo "Spotify volume level is at max.";
+          fi
+        elif [ "$2" = "down" ]; then
+          if [ "$vol" -ge 10 ]; then
+            newvol=$(( vol-10 ));
+            echo "Reducing Spotify volume to $newvol.";
+          else
+            newvol=0;
+            echo "Spotify volume level is at min.";
+          fi
         elif [ "$2" -ge 0 ]; then
           newvol=$2;
         fi
-- 
cgit v1.2.3-70-g09d2


From 92586e38c72a4a3a112a5c2b13cca6fc250e7447 Mon Sep 17 00:00:00 2001
From: mahi97 <mohammadmahdi76@gmail.com>
Date: Wed, 31 Aug 2016 03:50:53 +0430
Subject: add info, share and status option

---
 plugins/osx/osx.plugin.zsh | 68 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)

(limited to 'plugins')

diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index 386507dbc..dc68916bf 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -263,6 +263,7 @@ EOF
 
 # Spotify control function
 function spotify() {
+  
   showHelp () {
     echo "Usage:";
     echo;
@@ -277,13 +278,35 @@ function spotify() {
     echo "  pos [time]                   # Jumps to a time (in secs) in the current song.";
     echo "  quit                         # Stops playback and quits Spotify.";
     echo;
+    echo "  vol up                       # Increases the volume by 10%.";
+    echo "  vol down                     # Decreases the volume by 10%.";
     echo "  vol [amount]                 # Sets the volume to an amount between 0 and 100.";
     echo "  vol show                     # Shows the current Spotify volume.";
     echo;
+    echo "  status                       # Shows the current player status.";
+    echo "  share                        # Copies the current song URL to the clipboard."
+    echo "  info                         # Shows Full Information about song that is playing.";
+    echo;
     echo "  toggle shuffle               # Toggles shuffle playback mode.";
     echo "  toggle repeat                # Toggles repeat playback mode.";
   }
 
+  showStatus () {
+      state=$(osascript -e 'tell application "Spotify" to player state as string');
+      echo "Spotify is currently $state.";
+      if [ "$state" = "playing" ]; then
+        artist=$(osascript -e 'tell application "Spotify" to artist of current track as string');
+        album=$(osascript -e 'tell application "Spotify" to album of current track as string');
+        track=$(osascript -e 'tell application "Spotify" to name of current track as string');
+        duration=$(osascript -e 'tell application "Spotify" to duration of current track as string');
+        duration=$(echo "scale=2; $duration / 60 / 1000" | bc);
+        position=$(osascript -e 'tell application "Spotify" to player position as string' | tr ',' '.');
+        position=$(echo "scale=2; $position / 60" | bc | awk '{printf "%0.2f", $0}');
+
+        echo "$reset""Artist: $artist\nAlbum: $album\nTrack: $track \nPosition: $position / $duration";
+      fi
+  }
+
   if [ $# = 0 ]; then
     showHelp;
   else
@@ -367,6 +390,51 @@ function spotify() {
         osascript -e "tell application \"Spotify\" to set player position to $2";
         break;;
 
+      "status" )
+        showStatus;
+        break ;;
+
+      "info" )
+        info=$(osascript -e 'tell application "Spotify"
+          set tM to round (duration of current track / 60) rounding down
+          set tS to duration of current track mod 60
+          set pos to player position as text
+          set myTime to tM as text & "min " & tS as text & "s"
+          set nM to round (player position / 60) rounding down
+          set nS to round (player position mod 60) rounding down
+          set nowAt to nM as text & "min " & nS as text & "s"
+          set info to "" & "\nArtist:         " & artist of current track
+          set info to info & "\nTrack:          " & name of current track
+          set info to info & "\nAlbum Artist:   " & album artist of current track
+          set info to info & "\nAlbum:          " & album of current track
+          set info to info & "\nSeconds:        " & duration of current track
+          set info to info & "\nSeconds played: " & pos
+          set info to info & "\nDuration:       " & mytime
+          set info to info & "\nNow at:         " & nowAt
+          set info to info & "\nPlayed Count:   " & played count of current track
+          set info to info & "\nTrack Number:   " & track number of current track
+          set info to info & "\nPopularity:     " & popularity of current track
+          set info to info & "\nId:             " & id of current track
+          set info to info & "\nSpotify URL:    " & spotify url of current track
+          set info to info & "\nArtwork:        " & artwork of current track
+          set info to info & "\nPlayer:         " & player state
+          set info to info & "\nVolume:         " & sound volume
+          set info to info & "\nShuffle:        " & shuffling
+          set info to info & "\nRepeating:      " & repeating
+          end tell
+          return info')
+        echo "$info";
+        break ;;
+
+    "share"     )
+      url=$(osascript -e 'tell application "Spotify" to spotify url of current track');
+      remove='spotify:track:'
+      url=${url#$remove}
+      url="http://open.spotify.com/track/$url"
+      echo "Share URL: $url";
+      echo -n "$url" | pbcopy
+      break;;
+
       -h|--help| *)
         showHelp;
         break ;;
-- 
cgit v1.2.3-70-g09d2


From 2a5321f4e69b55f626c94993a40b1dee6a73c26f Mon Sep 17 00:00:00 2001
From: mahi97 <mohammadmahdi76@gmail.com>
Date: Wed, 31 Aug 2016 03:56:21 +0430
Subject: add color echo

---
 plugins/osx/osx.plugin.zsh | 43 ++++++++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 17 deletions(-)

(limited to 'plugins')

diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index dc68916bf..19acd3dd5 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -263,7 +263,7 @@ EOF
 
 # Spotify control function
 function spotify() {
-  
+
   showHelp () {
     echo "Usage:";
     echo;
@@ -291,9 +291,16 @@ function spotify() {
     echo "  toggle repeat                # Toggles repeat playback mode.";
   }
 
+  cecho(){
+    bold=$(tput bold);
+    green=$(tput setaf 2);
+    reset=$(tput sgr0);
+    echo "$bold$green$1$reset";
+  }
+
   showStatus () {
       state=$(osascript -e 'tell application "Spotify" to player state as string');
-      echo "Spotify is currently $state.";
+      cecho "Spotify is currently $state.";
       if [ "$state" = "playing" ]; then
         artist=$(osascript -e 'tell application "Spotify" to artist of current track as string');
         album=$(osascript -e 'tell application "Spotify" to album of current track as string');
@@ -307,6 +314,8 @@ function spotify() {
       fi
   }
 
+
+
   if [ $# = 0 ]; then
     showHelp;
   else
@@ -321,50 +330,50 @@ function spotify() {
 
     case $arg in
       "play"    )
-        echo "Playing Spotify.";
+        cecho "Playing Spotify.";
         osascript -e 'tell application "Spotify" to play';
         break ;;
 
       "pause"    )
-        echo "Pausing Spotify.";
+        cecho "Pausing Spotify.";
         osascript -e 'tell application "Spotify" to pause';
         break ;;
 
       "quit"    ) 
-        echo "Quitting Spotify.";
+        cecho "Quitting Spotify.";
         osascript -e 'tell application "Spotify" to quit';
         exit 1 ;;
 
       "next"    ) 
-        echo "Going to next track." ;
+        cecho "Going to next track." ;
         osascript -e 'tell application "Spotify" to next track';
         break ;;
 
       "prev"    ) 
-        echo "Going to previous track.";
+        cecho "Going to previous track.";
         osascript -e 'tell application "Spotify" to previous track';
         break ;;
 
       "vol"    )
         vol=$(osascript -e 'tell application "Spotify" to sound volume as integer');
         if [[ "$2" = "show" || "$2" = "" ]]; then
-          echo "Current Spotify volume level is $vol.";
+          cecho "Current Spotify volume level is $vol.";
           break ;
         elif [ "$2" = "up" ]; then
           if [ "$vol" -le 90 ]; then
             newvol=$(( vol+10 ));
-            echo "Increasing Spotify volume to $newvol.";
+            cecho "Increasing Spotify volume to $newvol.";
           else
             newvol=100;
-            echo "Spotify volume level is at max.";
+            cecho "Spotify volume level is at max.";
           fi
         elif [ "$2" = "down" ]; then
           if [ "$vol" -ge 10 ]; then
             newvol=$(( vol-10 ));
-            echo "Reducing Spotify volume to $newvol.";
+            cecho "Reducing Spotify volume to $newvol.";
           else
             newvol=0;
-            echo "Spotify volume level is at min.";
+            cecho "Spotify volume level is at min.";
           fi
         elif [ "$2" -ge 0 ]; then
           newvol=$2;
@@ -377,16 +386,16 @@ function spotify() {
         if [ "$2" = "shuffle" ]; then
           osascript -e 'tell application "Spotify" to set shuffling to not shuffling';
           curr=$(osascript -e 'tell application "Spotify" to shuffling');
-          echo "Spotify shuffling set to $curr";
+          cecho "Spotify shuffling set to $curr";
         elif [ "$2" = "repeat" ]; then
           osascript -e 'tell application "Spotify" to set repeating to not repeating';
           curr=$(osascript -e 'tell application "Spotify" to repeating');
-          echo "Spotify repeating set to $curr";
+          cecho "Spotify repeating set to $curr";
         fi
         break ;;
 
       "pos"   )
-        echo "Adjusting Spotify play position."
+        cecho "Adjusting Spotify play position."
         osascript -e "tell application \"Spotify\" to set player position to $2";
         break;;
 
@@ -431,8 +440,8 @@ function spotify() {
       remove='spotify:track:'
       url=${url#$remove}
       url="http://open.spotify.com/track/$url"
-      echo "Share URL: $url";
-      echo -n "$url" | pbcopy
+      cecho "Share URL: $url";
+      cecho -n "$url" | pbcopy
       break;;
 
       -h|--help| *)
-- 
cgit v1.2.3-70-g09d2


From 96d57dc33ec7ce473a7ce06d7c0166eabd14e1c8 Mon Sep 17 00:00:00 2001
From: mahi97 <mohammadmahdi76@gmail.com>
Date: Wed, 31 Aug 2016 03:58:15 +0430
Subject: change pause to play/pause

---
 plugins/osx/osx.plugin.zsh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index 19acd3dd5..058576f0b 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -335,8 +335,14 @@ function spotify() {
         break ;;
 
       "pause"    )
-        cecho "Pausing Spotify.";
-        osascript -e 'tell application "Spotify" to pause';
+        state=$(osascript -e 'tell application "Spotify" to player state as string');
+        if [ "$state" = "playing" ]; then
+          cecho "Pausing Spotify.";
+        else
+          cecho "Playing Spotify.";
+        fi
+
+        osascript -e 'tell application "Spotify" to playpause';
         break ;;
 
       "quit"    ) 
-- 
cgit v1.2.3-70-g09d2


From 3b2f827d5b37d51bdd0c165dc2b66501704990c4 Mon Sep 17 00:00:00 2001
From: mahi97 <mohammadmahdi76@gmail.com>
Date: Wed, 31 Aug 2016 04:12:13 +0430
Subject: add Search Option for album,artist and tracks

---
 plugins/osx/osx.plugin.zsh | 42 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index 058576f0b..031740633 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -330,9 +330,49 @@ function spotify() {
 
     case $arg in
       "play"    )
+        if [ $# != 1 ]; then
+          # There are additional arguments, so find out how many
+          array=( $@ );
+          len=${#array[@]};
+          SPOTIFY_SEARCH_API="https://api.spotify.com/v1/search"
+          SPOTIFY_PLAY_URI="";
+
+          searchAndPlay() {
+            type="$1"
+            Q="$2"
+
+            cecho "Searching ${type}s for: $Q";
+
+            SPOTIFY_PLAY_URI=$( \
+              curl -s -G $SPOTIFY_SEARCH_API --data-urlencode "q=$Q" -d "type=$type&limit=1&offset=0" -H "Accept: application/json" \
+              | grep -E -o "spotify:$type:[a-zA-Z0-9]+" -m 1
+              )
+          }
+
+          case $2 in
+            "album" | "artist" | "track"    )
+              _args=${array[*]:2:$len};
+              searchAndPlay "$2" "$_args";;
+
+            *   )
+              _args=${array[*]:1:$len};
+              searchAndPlay track "$_args";;
+          esac
+
+          if [ "$SPOTIFY_PLAY_URI" != "" ]; then
+            cecho "Playing ($Q Search) -> Spotify URL: $";
+
+            osascript -e "tell application \"Spotify\" to play track \"$SPOTIFY_PLAY_URI\"";
+
+          else
+            cecho "No results when searching for $Q";
+          fi
+      else
+        # play is the only param
         cecho "Playing Spotify.";
         osascript -e 'tell application "Spotify" to play';
-        break ;;
+      fi
+      break ;;
 
       "pause"    )
         state=$(osascript -e 'tell application "Spotify" to player state as string');
-- 
cgit v1.2.3-70-g09d2


From b808555678ea6a960d3ab31f1bdce4bd18ab0a10 Mon Sep 17 00:00:00 2001
From: mahi97 <mohammadmahdi76@gmail.com>
Date: Wed, 31 Aug 2016 04:18:22 +0430
Subject: add search option for playlist

---
 plugins/osx/osx.plugin.zsh | 35 +++++++++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 6 deletions(-)

(limited to 'plugins')

diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index 031740633..4ba2026c0 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -350,6 +350,29 @@ function spotify() {
           }
 
           case $2 in
+            "list"  )
+              _args=${array[*]:2:$len};
+              Q=$_args;
+
+              cecho "Searching playlists for: $Q";
+
+              results=$( \
+                curl -s -G $SPOTIFY_SEARCH_API --data-urlencode "q=$Q" -d "type=playlist&limit=10&offset=0" -H "Accept: application/json" \
+                | grep -E -o "spotify:user:[a-zA-Z0-9_]+:playlist:[a-zA-Z0-9]+" -m 10 \
+                )
+
+              count=$( \
+                echo "$results" | grep -c "spotify:user" \
+                )
+
+              if [ "$count" -gt 0 ]; then
+                random=$(( RANDOM % count));
+
+                SPOTIFY_PLAY_URI=$( \
+                  echo "$results" | awk -v random="$random" '/spotify:user:[a-zA-Z0-9]+:playlist:[a-zA-Z0-9]+/{i++}i==random{print; exit}' \
+                  )
+              fi;;
+
             "album" | "artist" | "track"    )
               _args=${array[*]:2:$len};
               searchAndPlay "$2" "$_args";;
@@ -367,12 +390,12 @@ function spotify() {
           else
             cecho "No results when searching for $Q";
           fi
-      else
-        # play is the only param
-        cecho "Playing Spotify.";
-        osascript -e 'tell application "Spotify" to play';
-      fi
-      break ;;
+        else
+          # play is the only param
+          cecho "Playing Spotify.";
+          osascript -e 'tell application "Spotify" to play';
+        fi
+        break ;;
 
       "pause"    )
         state=$(osascript -e 'tell application "Spotify" to player state as string');
-- 
cgit v1.2.3-70-g09d2


From 6cbba3353f20174c1cd55246507182dfab65ed97 Mon Sep 17 00:00:00 2001
From: mahi97 <mohammadmahdi76@gmail.com>
Date: Wed, 31 Aug 2016 04:35:29 +0430
Subject: fix showStatus output

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

(limited to 'plugins')

diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index 4ba2026c0..84eec9eed 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -310,7 +310,7 @@ function spotify() {
         position=$(osascript -e 'tell application "Spotify" to player position as string' | tr ',' '.');
         position=$(echo "scale=2; $position / 60" | bc | awk '{printf "%0.2f", $0}');
 
-        echo "$reset""Artist: $artist\nAlbum: $album\nTrack: $track \nPosition: $position / $duration";
+        printf "$reset""Artist: %s\nAlbum: %s\nTrack: %s \nPosition: %s / %s" "$artist" "$album" "$track" "$position" "$duration";
       fi
   }
 
-- 
cgit v1.2.3-70-g09d2


From d099022e440a72b1352ac09773a1863d9833dbb1 Mon Sep 17 00:00:00 2001
From: mahi97 <mohammadmahdi76@gmail.com>
Date: Wed, 31 Aug 2016 04:41:54 +0430
Subject: complete help

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

(limited to 'plugins')

diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index 84eec9eed..d75e3d2d6 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -272,6 +272,10 @@ function spotify() {
     echo "Commands:";
     echo;
     echo "  play                         # Resumes playback where Spotify last left off.";
+    echo "  play [song name]             # Finds a song by name and plays it.";
+    echo "  play album [album name]      # Finds an album by name and plays it.";
+    echo "  play artist [artist name]    # Finds an artist by name and plays it.";
+    echo "  play list [playlist name]    # Finds a playlist by name and plays it.";
     echo "  pause                        # Pauses Spotify playback.";
     echo "  next                         # Skips to the next song in a playlist.";
     echo "  prev                         # Returns to the previous song in a playlist.";
-- 
cgit v1.2.3-70-g09d2


From f820345afa9d500f0ff6b1ad1c45d4d37ef7d88a Mon Sep 17 00:00:00 2001
From: mahi97 <mohammadmahdi76@gmail.com>
Date: Thu, 1 Sep 2016 01:52:04 +0430
Subject: readme updated

---
 plugins/osx/README.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins')

diff --git a/plugins/osx/README.md b/plugins/osx/README.md
index 0fcd23dd5..b77daecc5 100644
--- a/plugins/osx/README.md
+++ b/plugins/osx/README.md
@@ -30,3 +30,4 @@ Original author: [Sorin Ionescu](https://github.com/sorin-ionescu)
 | `showfiles`     | Show hidden files                                |
 | `hidefiles`     | Hide the hidden files                            |
 | `itunes`        | Control iTunes. User `itunes -h` for usage details |
+| `spotify`       | Control Spotify and search by artist, album, track and etc.|
-- 
cgit v1.2.3-70-g09d2


From d6e032035cde237f09306ea6670a22e5994c38f4 Mon Sep 17 00:00:00 2001
From: mahi97 <mohammadmahdi76@gmail.com>
Date: Thu, 1 Sep 2016 01:52:43 +0430
Subject: seach show Url of song

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

(limited to 'plugins')

diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index d75e3d2d6..aa6a256c1 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -387,7 +387,7 @@ function spotify() {
           esac
 
           if [ "$SPOTIFY_PLAY_URI" != "" ]; then
-            cecho "Playing ($Q Search) -> Spotify URL: $";
+            cecho "Playing ($Q Search) -> Spotify URL: $SPOTIFY_PLAY_URI";
 
             osascript -e "tell application \"Spotify\" to play track \"$SPOTIFY_PLAY_URI\"";
 
-- 
cgit v1.2.3-70-g09d2


From 798c38dd1a70637cd17c26879be83e7f25a3ee53 Mon Sep 17 00:00:00 2001
From: slavaGanzin <slava.ganzin@gmail.com>
Date: Tue, 27 Sep 2016 15:18:23 +0300
Subject: globalias fix #4834

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

(limited to 'plugins')

diff --git a/plugins/globalias/globalias.plugin.zsh b/plugins/globalias/globalias.plugin.zsh
new file mode 100644
index 000000000..95a0e3072
--- /dev/null
+++ b/plugins/globalias/globalias.plugin.zsh
@@ -0,0 +1,11 @@
+globalias() {
+   zle _expand_alias
+   zle expand-word
+   zle self-insert
+}
+zle -N globalias
+bindkey -e " " globalias
+bindkey -v " " globalias
+bindkey -e "^ " magic-space           # control-space to bypass completion
+bindkey -v "^ " magic-space
+bindkey -M isearch " " magic-space # normal space during searches
-- 
cgit v1.2.3-70-g09d2


From 65874f2b2201c2e55d410ab322dc20394a587b83 Mon Sep 17 00:00:00 2001
From: Leif Ringstad <leif@bitelm.com>
Date: Wed, 28 Sep 2016 14:47:00 +0200
Subject: Add more docker compose aliases (#5422)

Adds the following aliases:

```zsh
alias dco='docker-compose'
alias dcr='docker-compose run'
alias dce='docker-compose exec'
```

And sorts the aliases similar to `docker-compose help` order
---
 plugins/docker-compose/docker-compose.plugin.zsh | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'plugins')

diff --git a/plugins/docker-compose/docker-compose.plugin.zsh b/plugins/docker-compose/docker-compose.plugin.zsh
index 351e77824..9f2457fc4 100644
--- a/plugins/docker-compose/docker-compose.plugin.zsh
+++ b/plugins/docker-compose/docker-compose.plugin.zsh
@@ -5,9 +5,16 @@
 
 # Aliases ###################################################################
 
-alias dcup='docker-compose up'
+# Use dco as alias for docker-compose, since dc on *nix is 'dc - an arbitrary precision calculator'
+# https://www.gnu.org/software/bc/manual/dc-1.05/html_mono/dc.html
+
+alias dco='docker-compose'
+
 alias dcb='docker-compose build'
-alias dcrm='docker-compose rm'
+alias dce='docker-compose exec'
 alias dcps='docker-compose ps'
-alias dcstop='docker-compose stop'
 alias dcrestart='docker-compose restart'
+alias dcrm='docker-compose rm'
+alias dcr='docker-compose run'
+alias dcstop='docker-compose stop'
+alias dcup='docker-compose up'
-- 
cgit v1.2.3-70-g09d2


From ac8915d43f0e8de9294c8552dc338ecc9993acd2 Mon Sep 17 00:00:00 2001
From: Diego Said Anaya Mancilla <mancilladev@gmail.com>
Date: Wed, 28 Sep 2016 14:28:53 -0500
Subject: Update pip plugin to last stable release (#5472)

Update pip plugin to last stable release
---
 plugins/pip/_pip | 36 +++++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 11 deletions(-)

(limited to 'plugins')

diff --git a/plugins/pip/_pip b/plugins/pip/_pip
index cb155e5f4..732ffabea 100644
--- a/plugins/pip/_pip
+++ b/plugins/pip/_pip
@@ -1,7 +1,8 @@
 #compdef pip pip2 pip-2.7 pip3 pip-3.2 pip-3.3 pip-3.4
 #autoload
 
-# pip zsh completion, based on homebrew completion
+# pip zsh completion, based on last stable release (pip8)
+# homebrew completion and backwards compatibility
 
 _pip_all() {
   # we cache the list of packages (originally from the macports plugin)
@@ -17,30 +18,43 @@ _pip_installed() {
 
 local -a _1st_arguments
 _1st_arguments=(
-  'bundle:create pybundles (archives containing multiple packages)'
+  'install:install packages'
+  'download:download packages'
+  'uninstall:uninstall packages'
   'freeze:output all currently installed packages (exact versions) to stdout'
-  'help:show available commands'
+  'list:list installed packages'
   'show:show information about installed packages'
-  'install:install packages'
   'search:search PyPI'
-  'uninstall:uninstall packages'
-  'unzip:unzip individual packages'
-  'zip:zip individual packages'
+  'wheel:build individual wheel archives for your requirements and dependencies'
+  'hash:compute a hash of a local package archive'
+  'help:show available commands'
+  'bundle:create pybundles (archives containing multiple packages)(deprecated)'
+  'unzip:unzip individual packages(deprecated)'
+  'zip:zip individual packages(deprecated)'
 )
 
 local expl
 local -a all_pkgs installed_pkgs
 
 _arguments \
-  '(--version)--version[show version number of program and exit]' \
   '(-h --help)'{-h,--help}'[show help]' \
-  '(-E --environment)'{-E,--environment}'[virtualenv environment to run pip in]' \
-  '(-s --enable-site-packages)'{-s,--enable-site-packages}'[include site-packages in virtualenv]' \
+  '(--isolated)--isolated[run pip in isolated mode, ignores environment variables and user configuration]' \
   '(-v --verbose)'{-v,--verbose}'[give more output]' \
+  '(-V --version)'{-V,--version}'[show version number of program and exit]' \
   '(-q --quiet)'{-q,--quiet}'[give less output]' \
   '(--log)--log[log file location]' \
   '(--proxy)--proxy[proxy in form user:passwd@proxy.server:port]' \
+  '(--retries)--retries[max number of retries per connection (default 5 times)]' \
   '(--timeout)--timeout[socket timeout (default 15s)]' \
+  '(--exists-action)--exists-action[default action when a path already exists: (s)witch, (i)gnore, (w)ipe, (b)ackup]' \
+  '(--trusted-host)--trusted-host[mark this host as trusted]' \
+  '(--cert)--cert[path to alternate CA bundle]' \
+  '(--client-cert)--client-cert[path to SSL client certificate]' \
+  '(--cache-dir)--cache-dir[store the cache data in specified directory]' \
+  '(--no-cache-dir)--no-cache-dir[disable de cache]' \
+  '(--disable-pip-version-check)--disable-pip-version-check[do not check periodically for new pip version downloads]' \
+  '(-E --environment)'{-E,--environment}'[virtualenv environment to run pip in (deprecated)]' \
+  '(-s --enable-site-packages)'{-s,--enable-site-packages}'[include site-packages in virtualenv (deprecated)]' \
   '*:: :->subcmds' && return 0
 
 if (( CURRENT == 1 )); then
@@ -56,7 +70,7 @@ case "$words[1]" in
     _arguments \
       '(-l --local)'{-l,--local}'[report only virtualenv packages]' ;;
   install)
-  	_arguments \
+    _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' \
-- 
cgit v1.2.3-70-g09d2


From 10ffa4fe992e56a93396ed8914eba74821bb2cca Mon Sep 17 00:00:00 2001
From: Christian Ferbar <christian.ferbar@gmx.net>
Date: Tue, 27 Sep 2016 12:27:37 +0200
Subject: Add README to svn plugin

---
 plugins/svn/README.md | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 plugins/svn/README.md

(limited to 'plugins')

diff --git a/plugins/svn/README.md b/plugins/svn/README.md
new file mode 100644
index 000000000..b8eff70f5
--- /dev/null
+++ b/plugins/svn/README.md
@@ -0,0 +1,64 @@
+# `svn` plugin
+
+This plugin adds some utility functions to display additional information regarding your current
+svn repsitiory. See http://subversion.apache.org/ for the full svn documentation.
+
+## Functions
+
+| Command                | Description                             |
+|:-----------------------|:----------------------------------------|
+|svn_prompt_info         | prompt for some themes                  |
+|in_svn                  | within svn directory                    |
+|svn_get_repo_name       |                                         |
+|svn_get_branch_name     | branch name (see caveats)              |
+|svn_get_rev_nr          | revision number                         |
+|svn_dirty               | changes in this subversion repo         |
+
+## Caveats
+
+The plugin expects the first directory to be the current branch / tag / trunk. So, it returns
+the first path element if you don't use branches.
+
+## Usage
+
+To use it, add `svn` to your plugins array:
+```sh
+plugins=(... svn)
+```
+
+### Agnoster theme git-like prompt
+
+Enable the svn plugin and add the followind lines to your ```~/.zshrc```
+
+```shell
+prompt_svn() {
+    local rev branch
+    if in_svn; then
+        rev=$(svn_get_rev_nr)
+        branch=$(svn_get_branch_name)
+        if [ `svn_dirty_choose_pwd 1 0` -eq 1 ]; then
+            prompt_segment yellow black
+            echo -n "$rev@$branch"
+            echo -n "±"
+        else
+            prompt_segment green black
+            echo -n "$rev@$branch"
+        fi
+    fi
+}
+```
+
+override the agnoster build_prompt() function:
+
+```shell
+build_prompt() {
+    RETVAL=$?
+    prompt_status
+    prompt_context
+    prompt_dir
+    prompt_git
+    prompt_svn
+    prompt_end
+}
+```
+
-- 
cgit v1.2.3-70-g09d2


From 364019a3c9c4ef08d2d7f0752c0ac008293d62df Mon Sep 17 00:00:00 2001
From: Christian Ferbar <christian.ferbar@gmx.net>
Date: Tue, 27 Sep 2016 12:29:25 +0200
Subject: Add localization workaround to svn plugin

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

(limited to 'plugins')

diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
index 816055afe..e95ee9d99 100644
--- a/plugins/svn/svn.plugin.zsh
+++ b/plugins/svn/svn.plugin.zsh
@@ -25,14 +25,14 @@ function in_svn() {
 
 function svn_get_repo_name() {
   if in_svn; then
-    svn info | sed -n 's/Repository\ Root:\ .*\///p' | read SVN_ROOT
-    svn info | sed -n "s/URL:\ .*$SVN_ROOT\///p"
+    LANG=C svn info | sed -n 's/^Repository\ Root:\ .*\///p' | read SVN_ROOT
+    LANG=C svn info | sed -n "s/^URL:\ .*$SVN_ROOT\///p"
   fi
 }
 
 function svn_get_branch_name() {
   local _DISPLAY=$(
-    svn info 2> /dev/null | \
+    LANG=C svn info 2> /dev/null | \
       awk -F/ \
       '/^URL:/ { \
         for (i=0; i<=NF; i++) { \
@@ -54,13 +54,13 @@ function svn_get_branch_name() {
 
 function svn_get_rev_nr() {
   if in_svn; then
-    svn info 2> /dev/null | sed -n 's/Revision:\ //p'
+    LANG=C svn info 2> /dev/null | sed -n 's/Revision:\ //p'
   fi
 }
 
 function svn_dirty_choose() {
   if in_svn; then
-    local root=`svn info 2> /dev/null | sed -n 's/^Working Copy Root Path: //p'`
+    local root=`LANG=C svn info 2> /dev/null | sed -n 's/^Working Copy Root Path: //p'`
     if $(svn status $root 2> /dev/null | command grep -Eq '^\s*[ACDIM!?L]'); then
       # Grep exits with 0 when "One or more lines were selected", return "dirty".
       echo $1
-- 
cgit v1.2.3-70-g09d2


From f573247a59773f47b1741967335ec6c495bcf4b4 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Thu, 29 Sep 2016 13:56:16 +0200
Subject: Clean up svn README

---
 plugins/svn/README.md | 93 ++++++++++++++++++++++++++-------------------------
 1 file changed, 48 insertions(+), 45 deletions(-)

(limited to 'plugins')

diff --git a/plugins/svn/README.md b/plugins/svn/README.md
index b8eff70f5..1f7b70c86 100644
--- a/plugins/svn/README.md
+++ b/plugins/svn/README.md
@@ -1,64 +1,67 @@
 # `svn` plugin
 
 This plugin adds some utility functions to display additional information regarding your current
-svn repsitiory. See http://subversion.apache.org/ for the full svn documentation.
+svn repository. See http://subversion.apache.org/ for the full svn documentation.
+
+To use it, add `svn` to your plugins array:
+
+```zsh
+plugins=(... svn)
+```
 
 ## Functions
 
-| Command                | Description                             |
-|:-----------------------|:----------------------------------------|
-|svn_prompt_info         | prompt for some themes                  |
-|in_svn                  | within svn directory                    |
-|svn_get_repo_name       |                                         |
-|svn_get_branch_name     | branch name (see caveats)              |
-|svn_get_rev_nr          | revision number                         |
-|svn_dirty               | changes in this subversion repo         |
+| Command               | Description                                 |
+|:----------------------|:--------------------------------------------|
+| `svn_prompt_info`     | Shows svn prompt in themes                  |
+| `in_svn`              | Checks if we're in an svn repository        |
+| `svn_get_repo_name`   | Get repository name                         |
+| `svn_get_branch_name` | Get branch name (see [caveats](#caveats))   |
+| `svn_get_rev_nr`      | Get revision number                         |
+| `svn_dirty`           | Checks if there are changes in the svn repo |
 
 ## Caveats
 
-The plugin expects the first directory to be the current branch / tag / trunk. So, it returns
+The plugin expects the first directory to be the current branch / tag / trunk. So it returns
 the first path element if you don't use branches.
 
-## Usage
+## Usage on themes
 
-To use it, add `svn` to your plugins array:
-```sh
-plugins=(... svn)
-```
+To use this in the `agnoster` theme follow these instructions:
 
-### Agnoster theme git-like prompt
+1. Enable the svn plugin
 
-Enable the svn plugin and add the followind lines to your ```~/.zshrc```
+2. Add the following lines to your `zshrc` file:
 
-```shell
-prompt_svn() {
-    local rev branch
-    if in_svn; then
-        rev=$(svn_get_rev_nr)
-        branch=$(svn_get_branch_name)
-        if [ `svn_dirty_choose_pwd 1 0` -eq 1 ]; then
-            prompt_segment yellow black
-            echo -n "$rev@$branch"
-            echo -n "±"
-        else
-            prompt_segment green black
-            echo -n "$rev@$branch"
+    ```shell
+    prompt_svn() {
+        local rev branch
+        if in_svn; then
+            rev=$(svn_get_rev_nr)
+            branch=$(svn_get_branch_name)
+            if [[ $(svn_dirty_choose_pwd 1 0) -eq 1 ]]; then
+                prompt_segment yellow black
+                echo -n "$rev@$branch"
+                echo -n "±"
+            else
+                prompt_segment green black
+                echo -n "$rev@$branch"
+            fi
         fi
-    fi
-}
-```
+    }
+    ```
 
-override the agnoster build_prompt() function:
+3. Override the agnoster `build_prompt()` function:
 
-```shell
-build_prompt() {
-    RETVAL=$?
-    prompt_status
-    prompt_context
-    prompt_dir
-    prompt_git
-    prompt_svn
-    prompt_end
-}
-```
+    ```zsh
+    build_prompt() {
+        RETVAL=$?
+        prompt_status
+        prompt_context
+        prompt_dir
+        prompt_git
+        prompt_svn
+        prompt_end
+    }
+    ```
 
-- 
cgit v1.2.3-70-g09d2


From e6df0e036e39bcc2c20d7feaef1749d3c4f2768f Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Thu, 29 Sep 2016 14:03:09 +0200
Subject: Clean up and refactor code in svn plugin

---
 plugins/svn/svn.plugin.zsh | 48 +++++++++++++++++++---------------------------
 1 file changed, 20 insertions(+), 28 deletions(-)

(limited to 'plugins')

diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
index e95ee9d99..fbc9ee538 100644
--- a/plugins/svn/svn.plugin.zsh
+++ b/plugins/svn/svn.plugin.zsh
@@ -1,9 +1,7 @@
-# vim:ft=zsh ts=2 sw=2 sts=2
-#
-function svn_prompt_info() {
+svn_prompt_info() {
   local _DISPLAY
   if in_svn; then
-    if [ "x$SVN_SHOW_BRANCH" = "xtrue" ]; then
+    if [[ "$SVN_SHOW_BRANCH" = true ]]; then
       unset SVN_SHOW_BRANCH
       _DISPLAY=$(svn_get_branch_name)
     else
@@ -16,21 +14,18 @@ $ZSH_THEME_REPO_NAME_COLOR$_DISPLAY$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_S
 }
 
 
-function in_svn() {
-  if $(svn info >/dev/null 2>&1); then
-    return 0
-  fi
-  return 1
+in_svn() {
+  svn info >/dev/null 2>&1
 }
 
-function svn_get_repo_name() {
+svn_get_repo_name() {
   if in_svn; then
     LANG=C svn info | sed -n 's/^Repository\ Root:\ .*\///p' | read SVN_ROOT
     LANG=C svn info | sed -n "s/^URL:\ .*$SVN_ROOT\///p"
   fi
 }
 
-function svn_get_branch_name() {
+svn_get_branch_name() {
   local _DISPLAY=$(
     LANG=C svn info 2> /dev/null | \
       awk -F/ \
@@ -44,24 +39,28 @@ function svn_get_branch_name() {
         } \
       }'
   )
-  
-  if [ "x$_DISPLAY" = "x" ]; then
+
+  if [[ -z "$_DISPLAY" ]]; then
     svn_get_repo_name
   else
     echo $_DISPLAY
   fi
 }
 
-function svn_get_rev_nr() {
+svn_get_rev_nr() {
   if in_svn; then
     LANG=C svn info 2> /dev/null | sed -n 's/Revision:\ //p'
   fi
 }
 
-function svn_dirty_choose() {
+svn_dirty() {
+  svn_dirty_choose $ZSH_THEME_SVN_PROMPT_DIRTY $ZSH_THEME_SVN_PROMPT_CLEAN
+}
+
+svn_dirty_choose() {
   if in_svn; then
-    local root=`LANG=C svn info 2> /dev/null | sed -n 's/^Working Copy Root Path: //p'`
-    if $(svn status $root 2> /dev/null | command grep -Eq '^\s*[ACDIM!?L]'); then
+    local root=$(LANG=C svn info 2> /dev/null | sed -n 's/^Working Copy Root Path: //p')
+    if svn status $root 2> /dev/null | command grep -Eq '^\s*[ACDIM!?L]'; then
       # Grep exits with 0 when "One or more lines were selected", return "dirty".
       echo $1
     else
@@ -71,14 +70,13 @@ function svn_dirty_choose() {
   fi
 }
 
-function svn_dirty() {
-  svn_dirty_choose $ZSH_THEME_SVN_PROMPT_DIRTY $ZSH_THEME_SVN_PROMPT_CLEAN
+svn_dirty_pwd () {
+  svn_dirty_choose_pwd $ZSH_THEME_SVN_PROMPT_DIRTY_PWD $ZSH_THEME_SVN_PROMPT_CLEAN_PWD
 }
 
-function svn_dirty_choose_pwd () {
+svn_dirty_choose_pwd () {
   if in_svn; then
-    local root=$PWD
-    if $(svn status $root 2> /dev/null | command grep -Eq '^\s*[ACDIM!?L]'); then
+    if svn status "$PWD" 2> /dev/null | command grep -Eq '^\s*[ACDIM!?L]'; then
       # Grep exits with 0 when "One or more lines were selected", return "dirty".
       echo $1
     else
@@ -87,9 +85,3 @@ function svn_dirty_choose_pwd () {
     fi
   fi
 }
-
-function svn_dirty_pwd () {
-  svn_dirty_choose_pwd $ZSH_THEME_SVN_PROMPT_DIRTY_PWD $ZSH_THEME_SVN_PROMPT_CLEAN_PWD
-}
-
-
-- 
cgit v1.2.3-70-g09d2


From 09d95251a7176e0c4b2a71837b7356980fe738e5 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Thu, 29 Sep 2016 13:19:47 +0200
Subject: extract: fix styling

---
 plugins/extract/_extract           |   2 -
 plugins/extract/extract.plugin.zsh | 137 ++++++++++++++++++-------------------
 2 files changed, 65 insertions(+), 74 deletions(-)

(limited to 'plugins')

diff --git a/plugins/extract/_extract b/plugins/extract/_extract
index 387b344bc..a73c892d9 100644
--- a/plugins/extract/_extract
+++ b/plugins/extract/_extract
@@ -4,5 +4,3 @@
 _arguments \
   '(-r --remove)'{-r,--remove}'[Remove archive.]' \
   "*::archive file:_files -g '(#i)*.(tar|tgz|tbz|tbz2|txz|tlz|gz|bz2|xz|lzma|Z|zip|ipsw|rar|7z|deb)(-.)'" && return 0
-
-
diff --git a/plugins/extract/extract.plugin.zsh b/plugins/extract/extract.plugin.zsh
index 5d0809e9a..081d5168f 100644
--- a/plugins/extract/extract.plugin.zsh
+++ b/plugins/extract/extract.plugin.zsh
@@ -1,80 +1,73 @@
-# ------------------------------------------------------------------------------
-#          FILE:  extract.plugin.zsh
-#   DESCRIPTION:  oh-my-zsh plugin file.
-#        AUTHOR:  Sorin Ionescu (sorin.ionescu@gmail.com)
-#       VERSION:  1.0.1
-# ------------------------------------------------------------------------------
+alias x=extract
 
+extract() {
+	local remove_archive
+	local success
+	local file_name
+	local extract_dir
 
-function extract() {
-  local remove_archive
-  local success
-  local file_name
-  local extract_dir
+	if (( $# == 0 )); then
+		cat <<-'EOF' >&2
+			Usage: extract [-option] [file ...]
 
-  if (( $# == 0 )); then
-    echo "Usage: extract [-option] [file ...]"
-    echo
-    echo Options:
-    echo "    -r, --remove    Remove archive."
-    echo
-    echo "Report bugs to <sorin.ionescu@gmail.com>."
-  fi
+			Options:
+			    -r, --remove    Remove archive.
+		EOF
+	fi
 
-  remove_archive=1
-  if [[ "$1" == "-r" ]] || [[ "$1" == "--remove" ]]; then
-    remove_archive=0
-    shift
-  fi
+	remove_archive=1
+	if [[ "$1" == "-r" ]] || [[ "$1" == "--remove" ]]; then
+		remove_archive=0
+		shift
+	fi
 
-  while (( $# > 0 )); do
-    if [[ ! -f "$1" ]]; then
-      echo "extract: '$1' is not a valid file" 1>&2
-      shift
-      continue
-    fi
+	while (( $# > 0 )); do
+		if [[ ! -f "$1" ]]; then
+			echo "extract: '$1' is not a valid file" >&2
+			shift
+			continue
+		fi
 
-    success=0
-    file_name="$( basename "$1" )"
-    extract_dir="$( echo "$file_name" | sed "s/\.${1##*.}//g" )"
-    case "$1" in
-      (*.tar.gz|*.tgz) [ -z $commands[pigz] ] && tar zxvf "$1" || pigz -dc "$1" | tar xv ;;
-      (*.tar.bz2|*.tbz|*.tbz2) tar xvjf "$1" ;;
-      (*.tar.xz|*.txz) tar --xz --help &> /dev/null \
-        && tar --xz -xvf "$1" \
-        || xzcat "$1" | tar xvf - ;;
-      (*.tar.zma|*.tlz) tar --lzma --help &> /dev/null \
-        && tar --lzma -xvf "$1" \
-        || lzcat "$1" | tar xvf - ;;
-      (*.tar) tar xvf "$1" ;;
-      (*.gz) [ -z $commands[pigz] ] && gunzip "$1" || pigz -d "$1" ;;
-      (*.bz2) bunzip2 "$1" ;;
-      (*.xz) unxz "$1" ;;
-      (*.lzma) unlzma "$1" ;;
-      (*.Z) uncompress "$1" ;;
-      (*.zip|*.war|*.jar|*.sublime-package|*.ipsw|*.xpi|*.apk) unzip "$1" -d $extract_dir ;;
-      (*.rar) unrar x -ad "$1" ;;
-      (*.7z) 7za x "$1" ;;
-      (*.deb)
-        mkdir -p "$extract_dir/control"
-        mkdir -p "$extract_dir/data"
-        cd "$extract_dir"; ar vx "../${1}" > /dev/null
-        cd control; tar xzvf ../control.tar.gz
-        cd ../data; tar xzvf ../data.tar.gz
-        cd ..; rm *.tar.gz debian-binary
-        cd ..
-      ;;
-      (*)
-        echo "extract: '$1' cannot be extracted" 1>&2
-        success=1
-      ;;
-    esac
+		success=0
+		file_name="$( basename "$1" )"
+		extract_dir="$( echo "$file_name" | sed "s/\.${1##*.}//g" )"
+		case "$1" in
+			(*.tar.gz|*.tgz) (( $+commands[pigz] )) && { pigz -dc "$1" | tar xv } || tar zxvf "$1" ;;
+			(*.tar.bz2|*.tbz|*.tbz2) tar xvjf "$1" ;;
+			(*.tar.xz|*.txz)
+				tar --xz --help &> /dev/null \
+				&& tar --xz -xvf "$1" \
+				|| xzcat "$1" | tar xvf - ;;
+			(*.tar.zma|*.tlz)
+				tar --lzma --help &> /dev/null \
+				&& tar --lzma -xvf "$1" \
+				|| lzcat "$1" | tar xvf - ;;
+			(*.tar) tar xvf "$1" ;;
+			(*.gz) (( $+commands[pigz] )) && pigz -d "$1" || gunzip "$1" ;;
+			(*.bz2) bunzip2 "$1" ;;
+			(*.xz) unxz "$1" ;;
+			(*.lzma) unlzma "$1" ;;
+			(*.Z) uncompress "$1" ;;
+			(*.zip|*.war|*.jar|*.sublime-package|*.ipsw|*.xpi|*.apk) unzip "$1" -d $extract_dir ;;
+			(*.rar) unrar x -ad "$1" ;;
+			(*.7z) 7za x "$1" ;;
+			(*.deb)
+				mkdir -p "$extract_dir/control"
+				mkdir -p "$extract_dir/data"
+				cd "$extract_dir"; ar vx "../${1}" > /dev/null
+				cd control; tar xzvf ../control.tar.gz
+				cd ../data; tar xzvf ../data.tar.gz
+				cd ..; rm *.tar.gz debian-binary
+				cd ..
+			;;
+			(*)
+				echo "extract: '$1' cannot be extracted" >&2
+				success=1
+			;;
+		esac
 
-    (( success = $success > 0 ? $success : $? ))
-    (( $success == 0 )) && (( $remove_archive == 0 )) && rm "$1"
-    shift
-  done
+		(( success = $success > 0 ? $success : $? ))
+		(( $success == 0 )) && (( $remove_archive == 0 )) && rm "$1"
+		shift
+	done
 }
-
-alias x=extract
-
-- 
cgit v1.2.3-70-g09d2


From f12cb5a697ca45b3ef8acda24cef72fe041addb3 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Thu, 29 Sep 2016 13:20:26 +0200
Subject: extract: fix extraction of deb packages with data.tar.xz

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

(limited to 'plugins')

diff --git a/plugins/extract/extract.plugin.zsh b/plugins/extract/extract.plugin.zsh
index 081d5168f..24b16517b 100644
--- a/plugins/extract/extract.plugin.zsh
+++ b/plugins/extract/extract.plugin.zsh
@@ -56,8 +56,8 @@ extract() {
 				mkdir -p "$extract_dir/data"
 				cd "$extract_dir"; ar vx "../${1}" > /dev/null
 				cd control; tar xzvf ../control.tar.gz
-				cd ../data; tar xzvf ../data.tar.gz
-				cd ..; rm *.tar.gz debian-binary
+				cd ../data; extract ../data.tar.*
+				cd ..; rm *.tar.* debian-binary
 				cd ..
 			;;
 			(*)
-- 
cgit v1.2.3-70-g09d2


From 68425c266a5107e50a2897b7d7cfc0ccb9fb753c Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Thu, 29 Sep 2016 13:26:50 +0200
Subject: extract: replace basename&sed w/ zsh variable expansion syntax

`${var:t:h}` uses:

- `${var:t}` which acts as `basename`.

- `${var:r}` which removes the extension.

See http://zsh.sourceforge.net/Doc/Release/Expansion.html#Modifiers
---
 plugins/extract/extract.plugin.zsh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'plugins')

diff --git a/plugins/extract/extract.plugin.zsh b/plugins/extract/extract.plugin.zsh
index 24b16517b..c524bf8f5 100644
--- a/plugins/extract/extract.plugin.zsh
+++ b/plugins/extract/extract.plugin.zsh
@@ -3,7 +3,6 @@ alias x=extract
 extract() {
 	local remove_archive
 	local success
-	local file_name
 	local extract_dir
 
 	if (( $# == 0 )); then
@@ -29,8 +28,7 @@ extract() {
 		fi
 
 		success=0
-		file_name="$( basename "$1" )"
-		extract_dir="$( echo "$file_name" | sed "s/\.${1##*.}//g" )"
+		extract_dir="${1:t:r}"
 		case "$1" in
 			(*.tar.gz|*.tgz) (( $+commands[pigz] )) && { pigz -dc "$1" | tar xv } || tar zxvf "$1" ;;
 			(*.tar.bz2|*.tbz|*.tbz2) tar xvjf "$1" ;;
-- 
cgit v1.2.3-70-g09d2


From b5dc976d236e8f8d276aa0aeff49980bfccb0532 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Thu, 29 Sep 2016 13:38:01 +0200
Subject: extract: add file extensions to extract completion

---
 plugins/extract/_extract | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/extract/_extract b/plugins/extract/_extract
index a73c892d9..172425d2c 100644
--- a/plugins/extract/_extract
+++ b/plugins/extract/_extract
@@ -3,4 +3,5 @@
 
 _arguments \
   '(-r --remove)'{-r,--remove}'[Remove archive.]' \
-  "*::archive file:_files -g '(#i)*.(tar|tgz|tbz|tbz2|txz|tlz|gz|bz2|xz|lzma|Z|zip|ipsw|rar|7z|deb)(-.)'" && return 0
+  "*::archive file:_files -g '(#i)*.(7z|Z|apk|bz2|deb|gz|ipsw|jar|lzma|rar|sublime-package|tar|tar.bz2|tar.gz|tar.xz|tar.zma|tbz|tbz2|tgz|tlz|txz|war|xpi|xz|zip)(-.)'" \
+    && return 0
-- 
cgit v1.2.3-70-g09d2


From bac896fca7b1af1e4237e96c58a0c13b8ff2d0de Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Fri, 30 Sep 2016 00:37:14 +0200
Subject: extract: add README

---
 plugins/extract/README.md | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 plugins/extract/README.md

(limited to 'plugins')

diff --git a/plugins/extract/README.md b/plugins/extract/README.md
new file mode 100644
index 000000000..c6bdd36dd
--- /dev/null
+++ b/plugins/extract/README.md
@@ -0,0 +1,46 @@
+# extract plugin
+
+This plugin defines a function called `extract` that extracts the archive file
+you pass it, and it supports a wide variety of archive filetypes.
+
+This way you don't have to know what specific command extracts a file, you just
+do `extract <filename>` and the function takes care of the rest.
+
+To use it, add `extract` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... extract)
+```
+
+## Supported file extensions
+
+| Extension         | Description                          |
+|:------------------|:-------------------------------------|
+| `7z`              | 7zip file                            |
+| `Z`               | Z archive (LZW)                      |
+| `apk`             | Android app file                     |
+| `bz2`             | Bzip2 file                           |
+| `deb`             | Debian package                       |
+| `gz`              | Gzip file                            |
+| `ipsw`            | iOS firmware file                    |
+| `jar`             | Java Archive                         |
+| `lzma`            | LZMA archive                         |
+| `rar`             | WinRAR archive                       |
+| `sublime-package` | Sublime Text package                 |
+| `tar`             | Tarball                              |
+| `tar.bz2`         | Tarball with bzip2 compression       |
+| `tar.gz`          | Tarball with gzip compression        |
+| `tar.xz`          | Tarball with lzma2 compression       |
+| `tar.zma`         | Tarball with lzma compression        |
+| `tbz`             | Tarball with bzip compression        |
+| `tbz2`            | Tarball with bzip2 compression       |
+| `tgz`             | Tarball with gzip compression        |
+| `tlz`             | Tarball with lzma compression        |
+| `txz`             | Tarball with lzma2 compression       |
+| `war`             | Web Application archive (Java-based) |
+| `xpi`             | Mozilla XPI module file              |
+| `xz`              | LZMA2 archive                        |
+| `zip`             | Zip archive                          |
+
+See [list of archive formats](https://en.wikipedia.org/wiki/List_of_archive_formats) for
+more information regarding archive formats.
-- 
cgit v1.2.3-70-g09d2


From c713407f90e7024507c7fc621440cb171108e7f4 Mon Sep 17 00:00:00 2001
From: Allan Lewis <allanlewis@users.noreply.github.com>
Date: Fri, 30 Sep 2016 12:45:28 +0100
Subject: git.plugin.zsh: Don't run Git hooks when making a WIP commit (#4751)

When making a WIP commit, we generally just want to save the state of the
current branch temporarily, maybe because we want to push our work for backup
purposes, or change branch to work on something else. Therefore, it's generally
undesirable to run Git hooks, which might do things like run linters, because
we probably don't care if our WIP has lint errors.
---
 plugins/git/git.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 25da03509..ea9ff8269 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -236,4 +236,4 @@ alias gupv='git pull --rebase -v'
 alias glum='git pull upstream master'
 
 alias gwch='git whatchanged -p --abbrev-commit --pretty=medium'
-alias gwip='git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit -m "--wip--"'
+alias gwip='git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify -m "--wip--"'
-- 
cgit v1.2.3-70-g09d2


From 3de0235ad26d4584727f4cce17c09f1b4ae6cee5 Mon Sep 17 00:00:00 2001
From: Manuel Hutter <mhutter@users.noreply.github.com>
Date: Fri, 30 Sep 2016 19:54:27 +0200
Subject: Add missing newline to end of `spotify status` output (#5480)

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

(limited to 'plugins')

diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index aa6a256c1..d7baa1191 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -314,7 +314,7 @@ function spotify() {
         position=$(osascript -e 'tell application "Spotify" to player position as string' | tr ',' '.');
         position=$(echo "scale=2; $position / 60" | bc | awk '{printf "%0.2f", $0}');
 
-        printf "$reset""Artist: %s\nAlbum: %s\nTrack: %s \nPosition: %s / %s" "$artist" "$album" "$track" "$position" "$duration";
+        printf "$reset""Artist: %s\nAlbum: %s\nTrack: %s \nPosition: %s / %s\n" "$artist" "$album" "$track" "$position" "$duration";
       fi
   }
 
@@ -412,17 +412,17 @@ function spotify() {
         osascript -e 'tell application "Spotify" to playpause';
         break ;;
 
-      "quit"    ) 
+      "quit"    )
         cecho "Quitting Spotify.";
         osascript -e 'tell application "Spotify" to quit';
         exit 1 ;;
 
-      "next"    ) 
+      "next"    )
         cecho "Going to next track." ;
         osascript -e 'tell application "Spotify" to next track';
         break ;;
 
-      "prev"    ) 
+      "prev"    )
         cecho "Going to previous track.";
         osascript -e 'tell application "Spotify" to previous track';
         break ;;
-- 
cgit v1.2.3-70-g09d2


From 8ea56633a40411d1b43127b9cd88e8851edaf922 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Wed, 28 Sep 2016 18:23:15 +0200
Subject: last-working-dir: clean up source

---
 .../last-working-dir/last-working-dir.plugin.zsh   | 25 +++++++++-------------
 1 file changed, 10 insertions(+), 15 deletions(-)

(limited to 'plugins')

diff --git a/plugins/last-working-dir/last-working-dir.plugin.zsh b/plugins/last-working-dir/last-working-dir.plugin.zsh
index c458464ce..c5278d640 100644
--- a/plugins/last-working-dir/last-working-dir.plugin.zsh
+++ b/plugins/last-working-dir/last-working-dir.plugin.zsh
@@ -1,26 +1,21 @@
-#!/usr/bin/env zsh
-# Keeps track of the last used working directory and automatically jumps
-# into it for new shells.
-
-# Flag indicating if we've previously jumped to last directory.
+# Flag indicating if we've previously jumped to last directory
 typeset -g ZSH_LAST_WORKING_DIRECTORY
-mkdir -p $ZSH_CACHE_DIR
-cache_file="$ZSH_CACHE_DIR/last-working-dir"
 
-# Updates the last directory once directory is changed.
+# Updates the last directory once directory is changed
 chpwd_functions+=(chpwd_last_working_dir)
-function chpwd_last_working_dir() {
-  # Use >| in case noclobber is set to avoid "file exists" error
+chpwd_last_working_dir() {
+	local cache_file="$ZSH_CACHE_DIR/last-working-dir"
 	pwd >| "$cache_file"
 }
 
-# Changes directory to the last working directory.
-function lwd() {
-	[[ ! -r "$cache_file" ]] || cd "`cat "$cache_file"`"
+# Changes directory to the last working directory
+lwd() {
+	local cache_file="$ZSH_CACHE_DIR/last-working-dir"
+	[[ -r "$cache_file" ]] && cd "$(cat "$cache_file")"
 }
 
-# Automatically jump to last working directory unless this isn't the first time
-# this plugin has been loaded.
+# Automatically jump to last working directory unless this
+# isn't the first time this plugin has been loaded.
 if [[ -z "$ZSH_LAST_WORKING_DIRECTORY" ]]; then
 	lwd 2>/dev/null && ZSH_LAST_WORKING_DIRECTORY=1 || true
 fi
-- 
cgit v1.2.3-70-g09d2


From fb6738a7e1d476ec9a74b0e8a04f5252f9de91fe Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Wed, 28 Sep 2016 18:30:46 +0200
Subject: last-working-dir: don't jump if not in $HOME

---
 plugins/last-working-dir/last-working-dir.plugin.zsh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'plugins')

diff --git a/plugins/last-working-dir/last-working-dir.plugin.zsh b/plugins/last-working-dir/last-working-dir.plugin.zsh
index c5278d640..e882b288f 100644
--- a/plugins/last-working-dir/last-working-dir.plugin.zsh
+++ b/plugins/last-working-dir/last-working-dir.plugin.zsh
@@ -14,8 +14,10 @@ lwd() {
 	[[ -r "$cache_file" ]] && cd "$(cat "$cache_file")"
 }
 
-# Automatically jump to last working directory unless this
-# isn't the first time this plugin has been loaded.
-if [[ -z "$ZSH_LAST_WORKING_DIRECTORY" ]]; then
-	lwd 2>/dev/null && ZSH_LAST_WORKING_DIRECTORY=1 || true
-fi
+# Jump to last directory automatically unless:
+# - this isn't the first time the plugin is loaded
+# - it's not in $HOME directory
+[[ -n "$ZSH_LAST_WORKING_DIRECTORY" ]] && return
+[[ "$PWD" != "$HOME" ]] && return
+
+lwd 2>/dev/null && ZSH_LAST_WORKING_DIRECTORY=1 || true
-- 
cgit v1.2.3-70-g09d2


From c488ab15f3293c3870f66fe84fc7ee71a182f214 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Wed, 28 Sep 2016 18:23:28 +0200
Subject: last-working-dir: add README

---
 plugins/last-working-dir/README.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 plugins/last-working-dir/README.md

(limited to 'plugins')

diff --git a/plugins/last-working-dir/README.md b/plugins/last-working-dir/README.md
new file mode 100644
index 000000000..4cc4acab6
--- /dev/null
+++ b/plugins/last-working-dir/README.md
@@ -0,0 +1,9 @@
+# last-working-dir plugin
+
+Keeps track of the last used working directory and automatically jumps into it
+for new shells, unless:
+
+- The plugin is already loaded.
+- The current `$PWD` is not `$HOME`.
+
+Adds `lwd` function to jump to the last working directory.
-- 
cgit v1.2.3-70-g09d2


From 9263e9ca59a65cad53d1cf0581c2af344984c2af Mon Sep 17 00:00:00 2001
From: Adrian Petrescu <apetresc@gmail.com>
Date: Fri, 30 Sep 2016 17:39:32 -0400
Subject: Add /usr/local/bin to autoenv search path (#5481)

The current list of directories to search for autoenv on misses the default location on Ubuntu systems if you just do a normal `pip install autoenv` - [it will place](https://github.com/kennethreitz/autoenv/blob/master/setup.py#L16) `activate.sh` in `/usr/local/bin` unless you manually override the `--prefix` or something.

The `/usr/local/opt/autoenv` is fine for macOS/homebrew installations but it would be nice not to have to manually patch on Linux :)
---
 plugins/autoenv/autoenv.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/autoenv/autoenv.plugin.zsh b/plugins/autoenv/autoenv.plugin.zsh
index ea2e56dd6..af58ee77b 100644
--- a/plugins/autoenv/autoenv.plugin.zsh
+++ b/plugins/autoenv/autoenv.plugin.zsh
@@ -1,7 +1,7 @@
 # Activates autoenv or reports its failure
 () {
 if ! type autoenv_init >/dev/null; then
-  for d (~/.autoenv /usr/local/opt/autoenv); do
+  for d (~/.autoenv /usr/local/opt/autoenv /usr/local/bin); do
     if [[ -e $d/activate.sh ]]; then
       autoenv_dir=$d
       break
-- 
cgit v1.2.3-70-g09d2


From d186bc30d071559a36bb190a3c3b329b882ec183 Mon Sep 17 00:00:00 2001
From: Florian Wilhelm <florian-wilhelm@onlinehome.de>
Date: Sun, 2 Oct 2016 16:34:54 +0200
Subject: Add aliases for docker-compose logs (#5475)

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

(limited to 'plugins')

diff --git a/plugins/docker-compose/docker-compose.plugin.zsh b/plugins/docker-compose/docker-compose.plugin.zsh
index 9f2457fc4..7e3307017 100644
--- a/plugins/docker-compose/docker-compose.plugin.zsh
+++ b/plugins/docker-compose/docker-compose.plugin.zsh
@@ -18,3 +18,5 @@ alias dcrm='docker-compose rm'
 alias dcr='docker-compose run'
 alias dcstop='docker-compose stop'
 alias dcup='docker-compose up'
+alias dcl='docker-compose logs'
+alias dclf='docker-compose logs -f'
-- 
cgit v1.2.3-70-g09d2


From eaf18167bbf3ee30157728ec50850db73ada3455 Mon Sep 17 00:00:00 2001
From: Juraj Fiala <doctorjellyface@riseup.net>
Date: Tue, 18 Aug 2015 21:37:09 +0200
Subject: Added pacaur aliases
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit removes most of its contents: it just leaves the
contribution signature. The rest is obsolete and superseeded
by #5460, but the contribution is still valuable.

Related: #4263.

Signed-off-by: Marc Cornellà <marc.cornella@live.com>
---
 plugins/archlinux/README.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins')

diff --git a/plugins/archlinux/README.md b/plugins/archlinux/README.md
index 785538a56..f32d91f79 100644
--- a/plugins/archlinux/README.md
+++ b/plugins/archlinux/README.md
@@ -67,3 +67,4 @@
 - Martin Putniorz - mputniorz@gmail.com
 - MatthR3D - matthr3d@gmail.com
 - ornicar - thibault.duplessis@gmail.com
+- Juraj Fiala - doctorjellyface@riseup.net
-- 
cgit v1.2.3-70-g09d2


From 485dd2b73671c257571601dda44e5fd94067271f Mon Sep 17 00:00:00 2001
From: Moses Miller <Majora320@gmail.com>
Date: Mon, 26 Sep 2016 23:17:18 -0700
Subject: Add pacaur compatibility to archlinux plugin + refactor

---
 plugins/archlinux/archlinux.plugin.zsh | 51 ++++++++++++++++++++++++++++------
 1 file changed, 42 insertions(+), 9 deletions(-)

(limited to 'plugins')

diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
index 1637e8561..2e55d1b8d 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -1,12 +1,4 @@
-if ! (( $+commands[yaourt] )); then
-  upgrade() {
-    sudo pacman -Syu
-  }
-else
-  upgrade () {
-    yaourt -Syu
-  }
-
+if (( $+commands[yaourt] )); then
   alias yaconf='yaourt -C'
   alias yaupg='yaourt -Syua'
   alias yasu='yaourt -Syua --noconfirm'
@@ -35,6 +27,47 @@ else
   fi
 fi
 
+if (( $+commands[pacaur] )); then
+  alias paupg='pacaur -Syua'
+  alias pasu='pacaur -Syua --noconfirm'
+  alias pain='pacaur -S'
+  alias pains='pacaur -U'
+  alias pare='pacaur -R'
+  alias parem='pacaur -Rns'
+  alias parep='pacaur -Si'
+  alias pareps='pacaur -Ss'
+  alias paloc='pacaur -Qi'
+  alias palocs='pacaur -Qs'
+  alias palst='pacaur -Qe'
+  alias paorph='pacaur -Qtd'
+  alias painsd='pacaur -S --asdeps'
+  alias pamir='pacaur -Syy'
+
+  if (( $+commands[abs] && $+commands[aur] )); then
+    alias paupd='pacaur -Sy && sudo abs && sudo aur'
+  elif (( $+commands[abs] )); then
+    alias paupd='pacaur -Sy && sudo abs'
+  elif (( $+commands[aur] )); then
+    alias paupd='pacaur -Sy && sudo aur'
+  else
+    alias paupd='pacaur -Sy'
+  fi
+fi
+
+if (( $+commands[pacaur] )); then
+  upgrade() {
+    pacaur -Syu
+  }
+elif (( $+commands[yaourt] )); then
+  upgrade() {
+    yaourt -Syu
+  }
+else
+  upgrade() {
+    pacman -Syu
+  }
+fi
+
 # Pacman - https://wiki.archlinux.org/index.php/Pacman_Tips
 alias pacupg='sudo pacman -Syu'
 alias pacin='sudo pacman -S'
-- 
cgit v1.2.3-70-g09d2


From e418a2bb92f6b26773d9e55115803a7137c90eec Mon Sep 17 00:00:00 2001
From: Moses Miller <Majora320@gmail.com>
Date: Sun, 2 Oct 2016 14:28:39 -0700
Subject: Updated README of the archlinux plugin

---
 plugins/archlinux/README.md            | 25 +++++++++++++++++++++++++
 plugins/archlinux/archlinux.plugin.zsh |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/archlinux/README.md b/plugins/archlinux/README.md
index f32d91f79..73a5037b0 100644
--- a/plugins/archlinux/README.md
+++ b/plugins/archlinux/README.md
@@ -27,6 +27,30 @@
 | yasu    | yaourt -Syua --no-confirm          | Same as `yaupg`, but without confirmation                           |
 | upgrade | yaourt -Syu                        | Sync with repositories before upgrading packages                    |
 
+### PACAUR
+
+| Alias   | Command                            | Description                                                         |
+|---------|------------------------------------|---------------------------------------------------------------------|
+| pain    | pacaur -S                          | Install packages from the repositories                              |
+| pains   | pacaur -U                          | Install a package from a local file                                 |
+| painsd  | pacaur -S --asdeps                 | Install packages as dependencies of another package                 |
+| paloc   | pacaur -Qi                         | Display information about a package in the local database           |
+| palocs  | pacaur -Qs                         | Search for packages in the local database                           |
+| palst   | pacaur -Qe                         | List installed packages including from AUR (tagged as "local")      |
+| pamir   | pacaur -Syy                        | Force refresh of all package lists after updating mirrorlist        |
+| paorph  | pacaur -Qtd                        | Remove orphans using pacaur                                         |
+| pare    | pacaur -R                          | Remove packages, keeping its settings and dependencies              |
+| parem   | pacaur -Rns                        | Remove packages, including its settings and unneeded dependencies   |
+| parep   | pacaur -Si                         | Display information about a package in the repositories             |
+| pareps  | pacaur -Ss                         | Search for packages in the repositories                             |
+| paupd   | pacaur -Sy && sudo abs && sudo aur | Update and refresh local package, ABS and AUR databases             |
+| paupd   | pacaur -Sy && sudo abs             | Update and refresh the local package and ABS databases              |
+| paupd   | pacaur -Sy && sudo aur             | Update and refresh the local package and AUR databases              |
+| paupd   | pacaur -Sy                         | Update and refresh the local package database                       |
+| paupg   | pacaur -Syua                       | Sync with repositories before upgrading all packages (from AUR too) |
+| pasu    | pacaur -Syua --no-confirm          | Same as `paupg`, but without confirmation                           |
+| upgrade | pacaur -Syu
+
 #### PACMAN
 
 | Alias        | Command                                 | Description                                                  |
@@ -68,3 +92,4 @@
 - MatthR3D - matthr3d@gmail.com
 - ornicar - thibault.duplessis@gmail.com
 - Juraj Fiala - doctorjellyface@riseup.net
+- Majora320 (Moses Miller) - Majora320@gmail.com
diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
index 2e55d1b8d..3156e949a 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -64,7 +64,7 @@ elif (( $+commands[yaourt] )); then
   }
 else
   upgrade() {
-    pacman -Syu
+    sudo pacman -Syu
   }
 fi
 
-- 
cgit v1.2.3-70-g09d2


From cd44246415d557bc9ba8d7c74acdcc0a44d10e34 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Mon, 3 Oct 2016 01:04:16 +0200
Subject: Fix small copy-editing mistake in archlinux README

---
 plugins/archlinux/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/archlinux/README.md b/plugins/archlinux/README.md
index 73a5037b0..16f099415 100644
--- a/plugins/archlinux/README.md
+++ b/plugins/archlinux/README.md
@@ -49,7 +49,7 @@
 | paupd   | pacaur -Sy                         | Update and refresh the local package database                       |
 | paupg   | pacaur -Syua                       | Sync with repositories before upgrading all packages (from AUR too) |
 | pasu    | pacaur -Syua --no-confirm          | Same as `paupg`, but without confirmation                           |
-| upgrade | pacaur -Syu
+| upgrade | pacaur -Syu                        | Sync with repositories before upgrading packages                    |
 
 #### PACMAN
 
-- 
cgit v1.2.3-70-g09d2


From 6d975f72589dbb6e44084841cddf9ea153990eb8 Mon Sep 17 00:00:00 2001
From: savimat <mat@savi.com.au>
Date: Mon, 3 Oct 2016 09:11:26 +1000
Subject: Add alias for signed git commit with message (#5390)

Signed-off-by: Mat Munn <mat@savi.com.au>
---
 plugins/git/git.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index ea9ff8269..28fb253dd 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -65,6 +65,7 @@ alias gca!='git commit -v -a --amend'
 alias gcan!='git commit -v -a --no-edit --amend'
 alias gcans!='git commit -v -a -s --no-edit --amend'
 alias gcam='git commit -a -m'
+alias gcsm='git commit -s -m'
 alias gcb='git checkout -b'
 alias gcf='git config --list'
 alias gcl='git clone --recursive'
-- 
cgit v1.2.3-70-g09d2


From 0887a7eb504debd8714bb914b99a2d6343f6b131 Mon Sep 17 00:00:00 2001
From: Henrik Johansson <dahankzter@gmail.com>
Date: Fri, 8 Aug 2014 14:09:07 +0200
Subject: Added simple support for Cargo - the Rust build system

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

(limited to 'plugins')

diff --git a/plugins/cargo/cargo.plugin.zsh b/plugins/cargo/cargo.plugin.zsh
new file mode 100644
index 000000000..e1dc953dd
--- /dev/null
+++ b/plugins/cargo/cargo.plugin.zsh
@@ -0,0 +1,22 @@
+function _cargo_commands() {
+    local ret=1 state
+    _arguments ':subcommand:->subcommand' && ret=0
+
+    case $state in
+      subcommand)
+        subcommands=(
+          "build:Build the current project"
+          "clean:Clean up after a build"
+          "help:Help about available commands"
+          "new:Create a new project"
+          "test:Run the tests"
+          "update:Updates list of known packages"
+          "run:Builds and runs the currecnt project"
+        )
+        _describe -t subcommands 'cargo subcommands' subcommands && ret=0
+    esac
+
+    return ret
+}
+
+compdef _cargo_commands cargo
-- 
cgit v1.2.3-70-g09d2


From 6b7003c3efcabe5ce185d5c2a1a8b708d92dfb82 Mon Sep 17 00:00:00 2001
From: Laurent Commarieu <laurent.commarieu@iadvize.com>
Date: Mon, 26 Sep 2016 15:26:38 +0200
Subject: feat(plugin): add nomad

---
 plugins/nomad/README.md | 11 +++++++++++
 plugins/nomad/_nomad    | 51 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 plugins/nomad/README.md
 create mode 100644 plugins/nomad/_nomad

(limited to 'plugins')

diff --git a/plugins/nomad/README.md b/plugins/nomad/README.md
new file mode 100644
index 000000000..ff07e917b
--- /dev/null
+++ b/plugins/nomad/README.md
@@ -0,0 +1,11 @@
+## About
+
+Plugin for Nomad, a tool from Hashicorp for easily deploy applications at any scale.
+
+### Requirements
+
+ * [Nomad](https://nomadproject.io/)
+
+### Usage
+
+ * Type `nomad` into your prompt and hit `TAB` to see available completion options
diff --git a/plugins/nomad/_nomad b/plugins/nomad/_nomad
new file mode 100644
index 000000000..25169f394
--- /dev/null
+++ b/plugins/nomad/_nomad
@@ -0,0 +1,51 @@
+#compdef nomad
+
+local -a _nomad_cmds
+_nomad_cmds=(
+  'agent:Runs a Nomad agent'
+  'agent-info:Display status information about the local agent'
+  'alloc-status:Display allocation status information and metadata'
+  'client-config:View or modify client configuration details'
+  'eval-status:Display evaluation status and placement failure reasons'
+  'fs:Inspect the contents of an allocation directory'
+  'init:Create an example job file'
+  'inspect:Inspect a submitted job'
+  'logs:Streams the logs of a task.'
+  'node-drain:Toggle drain mode on a given node'
+  'node-status:Display status information about nodes'
+  'plan:Dry-run a job update to determine its effects'
+  'run:Run a new job or update an existing'
+  'server-force-leave:Force a server into the left state'
+  'server-join:Join server nodes together'
+  'server-members:Display a list of known servers and their'
+  'status:Display status information about jobs'
+  'stop:Stop a running job'
+  'validate:Checks if a given job specification is valid'
+  'version:Prints the Nomad version'
+)
+
+
+__allocstatus() {
+  _arguments \
+    '-address=[(addr) The address of the Nomad server. Overrides the NOMAD_ADDR environment variable if set. Default = http://127.0.0.1:4646]' \
+    '-region=[(region) The region of the Nomad servers to forward commands to. Overrides the NOMAD_REGION environment variable if set. Defaults to the Agent s local region.]' \
+    '-no-color[Disables colored command output.]' \
+    '-short[Display short output. Shows only the most recent task event.]' \
+    '-stats[Display detailed resource usage statistics.]' \
+    '-verbose[Show full information.]' \
+    '-json[Output the allocation in its JSON format.]' \
+    '-t[Format and display allocation using a Go template.]'
+}
+
+_arguments '*:: :->command'
+
+if (( CURRENT == 1 )); then
+  _describe -t commands "nomad command" _nomad_cmds
+  return
+fi
+
+local -a _command_args
+case "$words[1]" in
+  alloc-status)
+    __allocstatus ;;
+esac
-- 
cgit v1.2.3-70-g09d2


From dfd7bf9f4141fe6d2ec9cd067b01ad9920e80a24 Mon Sep 17 00:00:00 2001
From: Laurent Commarieu <laurent.commarieu@iadvize.com>
Date: Mon, 3 Oct 2016 21:11:54 +0200
Subject: feat(nomad): add common commands and new readme

---
 plugins/nomad/README.md |  16 +++++---
 plugins/nomad/_nomad    | 104 +++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 113 insertions(+), 7 deletions(-)

(limited to 'plugins')

diff --git a/plugins/nomad/README.md b/plugins/nomad/README.md
index ff07e917b..04b361683 100644
--- a/plugins/nomad/README.md
+++ b/plugins/nomad/README.md
@@ -1,11 +1,15 @@
-## About
+# Nomad
 
-Plugin for Nomad, a tool from Hashicorp for easily deploy applications at any scale.
+The `nomad` plugin provides a simple autocompletion for [Nomad](https://nomadproject.io/), a tool from Hashicorp for easily deploy applications at any scale.
 
-### Requirements
+## Usage
 
- * [Nomad](https://nomadproject.io/)
+1. Enable the `nomad` plugin:
 
-### Usage
+   ```zsh
+   plugins=(... nomad)
+   ```
 
- * Type `nomad` into your prompt and hit `TAB` to see available completion options
+2.  Install [Nomad](https://nomadproject.io/)
+
+3.  Type `nomad` into your prompt and hit `TAB` to see available completion options.
diff --git a/plugins/nomad/_nomad b/plugins/nomad/_nomad
index 25169f394..1c935a02e 100644
--- a/plugins/nomad/_nomad
+++ b/plugins/nomad/_nomad
@@ -24,7 +24,6 @@ _nomad_cmds=(
   'version:Prints the Nomad version'
 )
 
-
 __allocstatus() {
   _arguments \
     '-address=[(addr) The address of the Nomad server. Overrides the NOMAD_ADDR environment variable if set. Default = http://127.0.0.1:4646]' \
@@ -37,6 +36,93 @@ __allocstatus() {
     '-t[Format and display allocation using a Go template.]'
 }
 
+__evalstatus() {
+  _arguments \
+    '-address=[(addr) The address of the Nomad server. Overrides the NOMAD_ADDR environment variable if set. Default = http://127.0.0.1:4646]' \
+    '-region=[(region) The region of the Nomad servers to forward commands to. Overrides the NOMAD_REGION environment variable if set. Defaults to the Agent s local region.]' \
+    '-no-color[Disables colored command output.]' \
+    '-monitor[Monitor an outstanding evaluation.]' \
+    '-verbose[Show full information.]' \
+    '-json[Output the allocation in its JSON format.]' \
+    '-t[Format and display allocation using a Go template.]'
+}
+
+__inspect() {
+  _arguments \
+    '-address=[(addr) The address of the Nomad server. Overrides the NOMAD_ADDR environment variable if set. Default = http://127.0.0.1:4646]' \
+    '-region=[(region) The region of the Nomad servers to forward commands to. Overrides the NOMAD_REGION environment variable if set. Defaults to the Agent s local region.]' \
+    '-no-color[Disables colored command output.]' \
+    '-json[Output the allocation in its JSON format.]' \
+    '-t[Format and display allocation using a Go template.]'
+}
+
+__logs() {
+  _arguments \
+    '-address=[(addr) The address of the Nomad server. Overrides the NOMAD_ADDR environment variable if set. Default = http://127.0.0.1:4646]' \
+    '-region=[(region) The region of the Nomad servers to forward commands to. Overrides the NOMAD_REGION environment variable if set. Defaults to the Agent s local region.]' \
+    '-no-color[Disables colored command output.]' \
+    '-stderr[ Display stderr logs.]' \
+    '-job[<job-id> Use a random allocation from the specified job ID.]' \
+    '-verbose[Show full information.]' \
+    '-f[Causes the output to not stop when the end of the logs are reached, but rather to wait for additional output.]' \
+    '-tail[Show the logs contents with offsets relative to the end of the logs. If no offset is given, -n is defaulted to 10.]' \
+    '-n[Sets the tail location in best-efforted number of lines relative to the end of the logs.]' \
+    '-c[Sets the tail location in number of bytes relative to the end of the logs.]'
+}
+
+__nodestatus() {
+  _arguments \
+    '-address=[(addr) The address of the Nomad server. Overrides the NOMAD_ADDR environment variable if set. Default = http://127.0.0.1:4646]' \
+    '-region=[(region) The region of the Nomad servers to forward commands to. Overrides the NOMAD_REGION environment variable if set. Defaults to the Agent s local region.]' \
+    '-no-color[Disables colored command output.]' \
+    '-self[Query the status of the local node.]' \
+    '-allocs[ Display a count of running allocations for each node.]' \
+    '-short[Display short output. Shows only the most recent task event.]' \
+    '-stats[Display detailed resource usage statistics.]' \
+    '-verbose[Show full information.]' \
+    '-json[Output the allocation in its JSON format.]' \
+    '-t[Format and display allocation using a Go template.]'
+}
+
+__plan() {
+  _arguments \
+    '-address=[(addr) The address of the Nomad server. Overrides the NOMAD_ADDR environment variable if set. Default = http://127.0.0.1:4646]' \
+    '-region=[(region) The region of the Nomad servers to forward commands to. Overrides the NOMAD_REGION environment variable if set. Defaults to the Agent s local region.]' \
+    '-no-color[Disables colored command output.]' \
+    '-diff[Determines whether the diff between the remote job and planned job is shown. Defaults to true.]' 
+}
+
+__run() {
+  _arguments \
+    '-address=[(addr) The address of the Nomad server. Overrides the NOMAD_ADDR environment variable if set. Default = http://127.0.0.1:4646]' \
+    '-region=[(region) The region of the Nomad servers to forward commands to. Overrides the NOMAD_REGION environment variable if set. Defaults to the Agent s local region.]' \
+    '-no-color[Disables colored command output.]' \
+    '-check-index[If set, the job is only registered or updated if the the passed job modify index matches the server side version. If a check-index value of zero is passed, the job is only registered if it does not yet exist. If a non-zero value is passed, it ensures that the job is being updated from a known state. The use of this flag is most common in conjunction with plan command.]' \
+    '-detach[Return immediately instead of entering monitor mode. After job submission, the evaluation ID will be printed to the screen, which can be used to examine the evaluation using the eval-status command.]' \
+    '-output[Output the JSON that would be submitted to the HTTP API without submitting the job.]' \
+    '-verbose[Show full information.]'
+}
+
+__status() {
+  _arguments \
+    '-address=[(addr) The address of the Nomad server. Overrides the NOMAD_ADDR environment variable if set. Default = http://127.0.0.1:4646]' \
+    '-region=[(region) The region of the Nomad servers to forward commands to. Overrides the NOMAD_REGION environment variable if set. Defaults to the Agent s local region.]' \
+    '-no-color[Disables colored command output.]' \
+    '-short[Display short output. Shows only the most recent task event.]' \
+    '-evals[Display the evaluations associated with the job.]' \
+    '-verbose[Show full information.]'
+}
+
+__stop() {
+  _arguments \
+    '-address=[(addr) The address of the Nomad server. Overrides the NOMAD_ADDR environment variable if set. Default = http://127.0.0.1:4646]' \
+    '-region=[(region) The region of the Nomad servers to forward commands to. Overrides the NOMAD_REGION environment variable if set. Defaults to the Agent s local region.]' \
+    '-no-color[Disables colored command output.]' \
+    '-detach[Return immediately instead of entering monitor mode. After the deregister command is submitted, a new evaluation ID is printed to the screen, which can be used to examine the evaluation using the eval-status command.]' \
+    '-yes[Automatic yes to prompts.]' \
+    '-verbose[Show full information.]'
+}
+
 _arguments '*:: :->command'
 
 if (( CURRENT == 1 )); then
@@ -48,4 +134,20 @@ local -a _command_args
 case "$words[1]" in
   alloc-status)
     __allocstatus ;;
+  eval-status)
+    __evalstatus ;;
+  inspect)
+    __inspect ;;
+  logs)
+    __logs ;;
+  node-status)
+    __nodestatus ;;
+  plan)
+    __plan ;;
+  run)
+    __run ;;
+  status)
+    __status ;;
+  stop)
+    __stop ;;
 esac
-- 
cgit v1.2.3-70-g09d2


From 915b0e46f275d19e66f8ad7762edc4fcb28967e6 Mon Sep 17 00:00:00 2001
From: Zaki Manian <zaki@manian.org>
Date: Tue, 14 Jun 2016 10:53:58 +0200
Subject: Add completion for cargo, the rust build tool
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Copy of the official repository:
https://github.com/rust-lang/cargo/tree/master/src/etc

Signed-off-by: Marc Cornellà <marc.cornella@live.com>
---
 plugins/cargo/_cargo           | 497 +++++++++++++++++++++++++++++++++++++++++
 plugins/cargo/cargo.plugin.zsh |  22 --
 2 files changed, 497 insertions(+), 22 deletions(-)
 create mode 100644 plugins/cargo/_cargo
 delete mode 100644 plugins/cargo/cargo.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/cargo/_cargo b/plugins/cargo/_cargo
new file mode 100644
index 000000000..175859202
--- /dev/null
+++ b/plugins/cargo/_cargo
@@ -0,0 +1,497 @@
+#compdef cargo
+
+typeset -A opt_args
+autoload -U regexp-replace
+
+_cargo() {
+
+_arguments \
+    '(- 1 *)'{-h,--help}'[show help message]' \
+    '(- 1 *)'--list'[list installed commands]' \
+    '(- 1 *)'{-v,--verbose}'[use verbose output]' \
+    '(- 1 *)'--color'[colorization option]' \
+    '(- 1 *)'{-V,--version}'[show version information]' \
+    '1: :_cargo_cmds' \
+    '*:: :->args'
+
+case $state in
+    args)
+        case $words[1] in
+            bench)
+                _arguments \
+                    '--features=[space separated feature list]' \
+                    '--all-features[enable all available features]' \
+                    '(-h, --help)'{-h,--help}'[show help message]' \
+                    '(-j, --jobs)'{-j,--jobs}'[number of parallel jobs, defaults to # of CPUs]' \
+                    "${command_scope_spec[@]}" \
+                    '--manifest-path=[path to manifest]: :_files -/' \
+                    '--no-default-features[do not build the default features]' \
+                    '--no-run[compile but do not run]' \
+                    '(-p,--package)'{-p=,--package=}'[package to run benchmarks for]:packages:_get_package_names' \
+                    '--target=[target triple]' \
+                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
+                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
+                    '--color=:colorization option:(auto always never)' \
+                    ;;
+
+            build)
+                _arguments \
+                    '--features=[space separated feature list]' \
+                    '--all-features[enable all available features]' \
+                    '(-h, --help)'{-h,--help}'[show help message]' \
+                    '(-j, --jobs)'{-j,--jobs}'[number of parallel jobs, defaults to # of CPUs]' \
+                    "${command_scope_spec[@]}" \
+                    '--manifest-path=[path to manifest]: :_files -/' \
+                    '--no-default-features[do not build the default features]' \
+                    '(-p,--package)'{-p=,--package=}'[package to build]:packages:_get_package_names' \
+                    '--release=[build in release mode]' \
+                    '--target=[target triple]' \
+                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
+                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
+                    '--color=:colorization option:(auto always never)' \
+                    ;;
+
+            clean)
+                _arguments \
+                    '(-h, --help)'{-h,--help}'[show help message]' \
+                    '--manifest-path=[path to manifest]: :_files -/' \
+                    '(-p,--package)'{-p=,--package=}'[package to clean]:packages:_get_package_names' \
+                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
+                    '--release[whether or not to clean release artifacts]' \
+                    '--target=[target triple(default:all)]' \
+                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
+                    '--color=:colorization option:(auto always never)' \
+                    ;;
+
+            doc)
+                _arguments \
+                    '--features=[space separated feature list]' \
+                    '--all-features[enable all available features]' \
+                    '(-h, --help)'{-h,--help}'[show help message]' \
+                    '(-j, --jobs)'{-j,--jobs}'[number of parallel jobs, defaults to # of CPUs]' \
+                    '--manifest-path=[path to manifest]: :_files -/' \
+                    '--no-deps[do not build docs for dependencies]' \
+                    '--no-default-features[do not build the default features]' \
+                    '--open[open docs in browser after the build]' \
+                    '(-p, --package)'{-p,--package}'=[package to document]' \
+                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
+                    '--release[build artifacts in release mode, with optimizations]' \
+                    '--target=[build for the target triple]' \
+                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
+                    '--color=:colorization option:(auto always never)' \
+                    ;;
+
+            fetch)
+                _arguments \
+                    '(-h, --help)'{-h,--help}'[show help message]' \
+                    '--manifest-path=[path to manifest]: :_files -/' \
+                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
+                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
+                    '--color=:colorization option:(auto always never)' \
+                    ;;
+
+            generate-lockfile)
+                _arguments \
+                    '(-h, --help)'{-h,--help}'[show help message]' \
+                    '--manifest-path=[path to manifest]: :_files -/' \
+                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
+                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
+                    '--color=:colorization option:(auto always never)' \
+                    ;;
+
+            git-checkout)
+                _arguments \
+                    '(-h, --help)'{-h,--help}'[show help message]' \
+                    'q(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
+                    '--reference=[REF]' \
+                    '--url=[URL]' \
+                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
+                    '--color=:colorization option:(auto always never)' \
+                    ;;
+
+            help)
+                _arguments \
+                    '(-h, --help)'{-h,--help}'[show help message]' \
+                    '*: :_cargo_cmds' \
+                    ;;
+
+            init)
+                _arguments \
+                    '--bin[use binary template]' \
+                    '--vcs:initialize a new repo with a given VCS:(git hg none)' \
+                    '(-h, --help)'{-h,--help}'[show help message]' \
+                    '--name=[set the resulting package name]' \
+                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
+                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
+                    '--color=:colorization option:(auto always never)' \
+                    ;;
+
+            install)
+                _arguments \
+                    '--bin=[only install the specified binary]' \
+                    '--branch=[branch to use when installing from git]' \
+                    '--color=:colorization option:(auto always never)' \
+                    '--debug[build in debug mode instead of release mode]' \
+                    '--example[install the specified example instead of binaries]' \
+                    '--features=[space separated feature list]' \
+                    '--all-features[enable all available features]' \
+                    '--git=[URL from which to install the crate]' \
+                    '(-h, --help)'{-h,--help}'[show help message]' \
+                    '(-j, --jobs)'{-j,--jobs}'[number of parallel jobs, defaults to # of CPUs]' \
+                    '--no-default-features[do not build the default features]' \
+                    '--path=[local filesystem path to crate to install]' \
+                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
+                    '--rev=[specific commit to use when installing from git]' \
+                    '--root=[directory to install packages into]' \
+                    '--tag=[tag to use when installing from git]' \
+                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
+                    '--vers=[version to install from crates.io]' \
+                    ;;
+
+            locate-project)
+                _arguments \
+                    '(-h, --help)'{-h,--help}'[show help message]' \
+                    '--manifest-path=[path to manifest]: :_files -/' \
+                    ;;
+
+            login)
+                _arguments \
+                    '(-h, --help)'{-h,--help}'[show help message]' \
+                    '--host=[Host to set the token for]' \
+                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
+                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
+                    '--color=:colorization option:(auto always never)' \
+                    ;;
+
+            metadata)
+                _arguments \
+                    '(-h, --help)'{-h,--help}'[show help message]' \
+                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
+                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
+                    "--no-deps[output information only about the root package and don't fetch dependencies]" \
+                    '--no-default-features[do not include the default feature]' \
+                    '--manifest-path=[path to manifest]: :_files -/' \
+                    '--features=[space separated feature list]' \
+                    '--all-features[enable all available features]' \
+                    '--format-version=[format version(default: 1)]' \
+                    '--color=:colorization option:(auto always never)' \
+                    ;;
+
+            new)
+                _arguments \
+                    '--bin[use binary template]' \
+                    '--vcs:initialize a new repo with a given VCS:(git hg none)' \
+                    '(-h, --help)'{-h,--help}'[show help message]' \
+                    '--name=[set the resulting package name]' \
+                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
+                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
+                    '--color=:colorization option:(auto always never)' \
+                    ;;
+
+            owner)
+                _arguments \
+                    '(-a, --add)'{-a,--add}'[add owner LOGIN]' \
+                    '(-h, --help)'{-h,--help}'[show help message]' \
+                    '--index[registry index]' \
+                    '(-l, --list)'{-l,--list}'[list owners of a crate]' \
+                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
+                    '(-r, --remove)'{-r,--remove}'[remove owner LOGIN]' \
+                    '--token[API token to use when authenticating]' \
+                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
+                    '--color=:colorization option:(auto always never)' \
+                    ;;
+
+            package)
+                _arguments \
+                    '(-h, --help)'{-h,--help}'[show help message]' \
+                    '(-l, --list)'{-l,--list}'[print files included in a package without making one]' \
+                    '--manifest-path=[path to manifest]: :_files -/' \
+                    '--no-metadata[ignore warnings about a lack of human-usable metadata]' \
+                    '--no-verify[do not build to verify contents]' \
+                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
+                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
+                    '--color=:colorization option:(auto always never)' \
+                    ;;
+
+            pkgid)
+                _arguments \
+                    '(-h, --help)'{-h,--help}'[show help message]' \
+                    '--manifest-path=[path to manifest]: :_files -/' \
+                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
+                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
+                    '--color=:colorization option:(auto always never)' \
+                    ;;
+
+            publish)
+                _arguments \
+                    '(-h, --help)'{-h,--help}'[show help message]' \
+                    '--host=[Host to set the token for]' \
+                    '--manifest-path=[path to manifest]: :_files -/' \
+                    '--no-verify[Do not verify tarball until before publish]' \
+                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
+                    '--token[token to use when uploading]' \
+                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
+                    '--color=:colorization option:(auto always never)' \
+                    ;;
+
+            read-manifest)
+                _arguments \
+                    '(-h, --help)'{-h,--help}'[show help message]' \
+                    '--manifest-path=[path to manifest]: :_files -/' \
+                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
+                    '--color=:colorization option:(auto always never)' \
+                    ;;
+
+            run)
+                _arguments \
+                    '--example=[name of the bin target]' \
+                    '--features=[space separated feature list]' \
+                    '--all-features[enable all available features]' \
+                    '(-h, --help)'{-h,--help}'[show help message]' \
+                    '(-j, --jobs)'{-j,--jobs}'[number of parallel jobs, defaults to # of CPUs]' \
+                    '--manifest-path=[path to manifest]: :_files -/' \
+                    '--bin=[name of the bin target]' \
+                    '--no-default-features[do not build the default features]' \
+                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
+                    '--release=[build in release mode]' \
+                    '--target=[target triple]' \
+                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
+                    '--color=:colorization option:(auto always never)' \
+                    '*: :_normal' \
+                    ;;
+
+            rustc)
+                _arguments \
+                    '--color=:colorization option:(auto always never)' \
+                    '--features=[features to compile for the package]' \
+                    '--all-features[enable all available features]' \
+                    '(-h, --help)'{-h,--help}'[show help message]' \
+                    '(-j, --jobs)'{-j,--jobs}'=[number of parallel jobs, defaults to # of CPUs]' \
+                    '--manifest-path=[path to the manifest to fetch dependencies for]' \
+                    '--no-default-features[do not compile default features for the package]' \
+                    '(-p, --package)'{-p,--package}'=[profile to compile for]' \
+                    '--profile=[profile to build the selected target for]' \
+                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
+                    '--release[build artifacts in release mode, with optimizations]' \
+                    '--target=[target triple which compiles will be for]' \
+                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
+                    "${command_scope_spec[@]}" \
+                    ;;
+
+            rustdoc)
+                _arguments \
+                    '--color=:colorization option:(auto always never)' \
+                    '--features=[space-separated list of features to also build]' \
+                    '--all-features[enable all available features]' \
+                    '(-h, --help)'{-h,--help}'[show help message]' \
+                    '(-j, --jobs)'{-j,--jobs}'=[number of parallel jobs, defaults to # of CPUs]' \
+                    '--manifest-path=[path to the manifest to document]' \
+                    '--no-default-features[do not build the `default` feature]' \
+                    '--open[open the docs in a browser after the operation]' \
+                    '(-p, --package)'{-p,--package}'=[package to document]' \
+                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
+                    '--release[build artifacts in release mode, with optimizations]' \
+                    '--target=[build for the target triple]' \
+                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
+                    "${command_scope_spec[@]}" \
+                    ;;
+
+            search)
+                _arguments \
+                    '--color=:colorization option:(auto always never)' \
+                    '(-h, --help)'{-h,--help}'[show help message]' \
+                    '--host=[host of a registry to search in]' \
+                    '--limit=[limit the number of results]' \
+                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
+                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
+                    ;;
+
+            test)
+                _arguments \
+                    '--features=[space separated feature list]' \
+                    '--all-features[enable all available features]' \
+                    '(-h, --help)'{-h,--help}'[show help message]' \
+                    '(-j, --jobs)'{-j,--jobs}'[number of parallel jobs, defaults to # of CPUs]' \
+                    '--manifest-path=[path to manifest]: :_files -/' \
+                    '--test=[test name]: :_test_names' \
+                    '--no-default-features[do not build the default features]' \
+                    '--no-fail-fast[run all tests regardless of failure]' \
+                    '--no-run[compile but do not run]' \
+                    '(-p,--package)'{-p=,--package=}'[package to run tests for]:packages:_get_package_names' \
+                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
+                    '--release[build artifacts in release mode, with optimizations]' \
+                    '--target=[target triple]' \
+                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
+                    '--color=:colorization option:(auto always never)' \
+                    '1: :_test_names' \
+                    ;;
+
+            uninstall)
+                _arguments \
+                    '--bin=[only uninstall the binary NAME]' \
+                    '--color=:colorization option:(auto always never)' \
+                    '(-h, --help)'{-h,--help}'[show help message]' \
+                    '(-q, --quiet)'{-q,--quiet}'[less output printed to stdout]' \
+                    '--root=[directory to uninstall packages from]' \
+                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
+                    ;;
+
+            update)
+                _arguments \
+                    '--aggressive=[force dependency update]' \
+                    '(-h, --help)'{-h,--help}'[show help message]' \
+                    '--manifest-path=[path to manifest]: :_files -/' \
+                    '(-p,--package)'{-p=,--package=}'[package to update]:packages:__get_package_names' \
+                    '--precise=[update single dependency to PRECISE]: :' \
+                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
+                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
+                    '--color=:colorization option:(auto always never)' \
+                    ;;
+
+            verify-project)
+                _arguments \
+                    '(-h, --help)'{-h,--help}'[show help message]' \
+                    '--manifest-path=[path to manifest]: :_files -/' \
+                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
+                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
+                    '--color=:colorization option:(auto always never)' \
+                    ;;
+
+            version)
+                _arguments \
+                    '(-h, --help)'{-h,--help}'[show help message]' \
+                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
+                    '--color=:colorization option:(auto always never)' \
+                    ;;
+
+            yank)
+                _arguments \
+                    '(-h, --help)'{-h,--help}'[show help message]' \
+                    '--index[registry index]' \
+                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
+                    '--token[API token to use when authenticating]' \
+                    '--undo[undo a yank, putting a version back into the index]' \
+                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
+                    '--color=:colorization option:(auto always never)' \
+                    '--vers[yank version]' \
+                    ;;
+        esac
+        ;;
+esac
+}
+
+_cargo_cmds(){
+local -a commands;commands=(
+'bench:execute all benchmarks of a local package'
+'build:compile the current project'
+'clean:remove generated artifacts'
+'doc:build package documentation'
+'fetch:fetch package dependencies'
+'generate-lockfile:create lockfile'
+'git-checkout:git checkout'
+'help:get help for commands'
+'init:create new project in current directory'
+'install:install a Rust binary'
+'locate-project:print "Cargo.toml" location'
+'login:login to remote server'
+'metadata:the metadata for a project in json'
+'new:create a new project'
+'owner:manage the owners of a crate on the registry'
+'package:assemble local package into a distributable tarball'
+'pkgid:print a fully qualified package specification'
+'publish:upload package to the registry'
+'read-manifest:print manifest in JSON format'
+'run:run the main binary of the local package'
+'rustc:compile a package and all of its dependencies'
+'rustdoc:build documentation for a package'
+'search:search packages on crates.io'
+'test:execute all unit and tests of a local package'
+'uninstall:remove a Rust binary'
+'update:update dependencies'
+'verify-project:check Cargo.toml'
+'version:show version information'
+'yank:remove pushed file from index'
+)
+_describe 'command' commands
+
+}
+
+
+#FIXME: Disabled until fixed
+#gets package names from the manifest file
+_get_package_names()
+{
+}
+
+#TODO:see if it makes sense to have 'locate-project' to have non-json output.
+#strips package name from json stuff
+_locate_manifest(){
+local manifest=`cargo locate-project 2>/dev/null`
+regexp-replace manifest '\{"root":"|"\}' ''
+echo $manifest
+}
+
+# Extracts the values of "name" from the array given in $1 and shows them as
+# command line options for completion
+_get_names_from_array()
+{
+    local -a filelist;
+    local manifest=$(_locate_manifest)
+    if [[ -z $manifest ]]; then
+        return 0
+    fi
+
+    local last_line
+    local -a names;
+    local in_block=false
+    local block_name=$1
+    names=()
+    while read line
+    do
+        if [[ $last_line == "[[$block_name]]" ]]; then
+            in_block=true
+        else
+            if [[ $last_line =~ '.*\[\[.*' ]]; then
+                in_block=false
+            fi
+        fi
+
+        if [[ $in_block == true ]]; then
+            if [[ $line =~ '.*name.*=' ]]; then
+                regexp-replace line '^.*name *= *|"' ""
+                names+=$line
+            fi
+        fi
+
+        last_line=$line
+    done < $manifest
+    _describe $block_name names
+
+}
+
+#Gets the test names from the manifest file
+_test_names()
+{
+    _get_names_from_array "test"
+}
+
+#Gets the bench names from the manifest file
+_benchmark_names()
+{
+    _get_names_from_array "bench"
+}
+
+# These flags are mutally exclusive specifiers for the scope of a command; as
+# they are used in multiple places without change, they are expanded into the
+# appropriate command's `_arguments` where appropriate.
+set command_scope_spec
+command_scope_spec=(
+    '(--bin --example --test --lib)--bench=[benchmark name]: :_benchmark_names'
+    '(--bench --bin --test --lib)--example=[example name]'
+    '(--bench --example --test --lib)--bin=[binary name]'
+    '(--bench --bin --example --test)--lib=[library name]'
+    '(--bench --bin --example --lib)--test=[test name]'
+)
+
+
+_cargo
diff --git a/plugins/cargo/cargo.plugin.zsh b/plugins/cargo/cargo.plugin.zsh
deleted file mode 100644
index e1dc953dd..000000000
--- a/plugins/cargo/cargo.plugin.zsh
+++ /dev/null
@@ -1,22 +0,0 @@
-function _cargo_commands() {
-    local ret=1 state
-    _arguments ':subcommand:->subcommand' && ret=0
-
-    case $state in
-      subcommand)
-        subcommands=(
-          "build:Build the current project"
-          "clean:Clean up after a build"
-          "help:Help about available commands"
-          "new:Create a new project"
-          "test:Run the tests"
-          "update:Updates list of known packages"
-          "run:Builds and runs the currecnt project"
-        )
-        _describe -t subcommands 'cargo subcommands' subcommands && ret=0
-    esac
-
-    return ret
-}
-
-compdef _cargo_commands cargo
-- 
cgit v1.2.3-70-g09d2


From 16bd691b3bd5ca9319e677b66096337e9bac1795 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 4 Oct 2016 00:17:38 +0200
Subject: Add README for the cargo plugin

---
 plugins/cargo/README.md | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 plugins/cargo/README.md

(limited to 'plugins')

diff --git a/plugins/cargo/README.md b/plugins/cargo/README.md
new file mode 100644
index 000000000..5fa688d21
--- /dev/null
+++ b/plugins/cargo/README.md
@@ -0,0 +1,11 @@
+# cargo
+
+This plugin adds completion for the Rust build tool [`cargo`](https://github.com/rust-lang/cargo).
+
+To use it, add `cargo` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... cargo)
+```
+
+Updated on October 4th, 2016.
-- 
cgit v1.2.3-70-g09d2


From 2a0223370a2e5bae604344a735ad7b53f30b0cab Mon Sep 17 00:00:00 2001
From: Michał Ordon <designorant@users.noreply.github.com>
Date: Mon, 3 Oct 2016 23:37:35 +0100
Subject: Add an alias for React Native Link command (#5491)

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

(limited to 'plugins')

diff --git a/plugins/react-native/react-native.plugin.zsh b/plugins/react-native/react-native.plugin.zsh
index 7323f1d2e..9463a98b3 100644
--- a/plugins/react-native/react-native.plugin.zsh
+++ b/plugins/react-native/react-native.plugin.zsh
@@ -3,4 +3,5 @@ alias rnios4s='react-native run-ios --simulator "iPhone 4s"'
 alias rnios5='react-native run-ios --simulator "iPhone 5"'
 alias rnios5s='react-native run-ios --simulator "iPhone 5s"'
 alias rnios='react-native run-ios'
+alias rnlink='react-native link'
 
-- 
cgit v1.2.3-70-g09d2


From d57f36dab82b332be6fd7362c0916b226709834b Mon Sep 17 00:00:00 2001
From: Mats Faugli <mats.faugli@gmail.com>
Date: Tue, 4 Oct 2016 00:47:59 +0200
Subject: Add jgitflow maven goals (#5489)

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

(limited to 'plugins')

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index 625aad949..04bd186af 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -110,6 +110,8 @@ function listMavenCompletions {
         help:active-profiles help:all-profiles help:describe help:effective-pom help:effective-settings help:evaluate help:expressions help:system
         # release
         release:clean release:prepare release:rollback release:perform release:stage release:branch release:update-versions
+	# jgitflow
+	jgitflow:feature-start jgitflow:feature-finish jgitflow:release-start jgitflow:release-finish jgitflow:hotfix-start jgitflow:hotfix-finish jgitflow:build-number
         # repository
         repository:bundle-create repository:bundle-pack
         # source
-- 
cgit v1.2.3-70-g09d2


From 81981ef248e6e05d11affd4fca40bcfb98306b0e Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 4 Oct 2016 01:03:16 +0200
Subject: Fix cp plugin completion and refactor (#5427)

* cp plugin: change cpv to function so that completion works

* cp plugin: show numbers in units of 1024 (K,M,G,T)

Use `-h` level (3): output numbers in units of 1024.
See the manpage of rsync for more information.

* cp plugin: add a README file

* cp plugin: recurse directories

* cp plugin: remove `--` to separate files from options

This has some undesired effects, like having `cpv --help` be a file
not found error.

Use `--` yourself if you need it (which you generally don't):

```zsh
cpv -- -some-file-with-hyphens.txt /tmp
```

Added this same info to the README.
---
 plugins/cp/README.md     | 32 ++++++++++++++++++++++++++++++++
 plugins/cp/cp.plugin.zsh | 18 ++++--------------
 2 files changed, 36 insertions(+), 14 deletions(-)
 create mode 100644 plugins/cp/README.md

(limited to 'plugins')

diff --git a/plugins/cp/README.md b/plugins/cp/README.md
new file mode 100644
index 000000000..e8a9b6ccc
--- /dev/null
+++ b/plugins/cp/README.md
@@ -0,0 +1,32 @@
+# cp plugin
+
+This plugin defines a `cpv` function that uses `rsync` so that you
+get the features and security of this command.
+
+To enable, add `cp` to your `plugins` array in your zshrc file:
+
+```zsh
+plugins=(... cp)
+```
+
+## Description
+
+The enabled options for rsync are:
+
+- `-p`: preserves permissions.
+
+- `-o`: preserves owner.
+
+* `-g`: preserves group.
+
+* `-b`: make a backup of the original file instead of overwriting it, if it exists.
+
+* `-r`: recurse directories.
+
+* `-hhh`: outputs numbers in human-readable format, in units of 1024 (K, M, G, T).
+
+* `--backup-dir=/tmp/rsync`: move backup copies to "/tmp/rsync".
+
+* `-e /dev/null`: only work on local files (disable remote shells).
+
+* `--progress`: display progress.
diff --git a/plugins/cp/cp.plugin.zsh b/plugins/cp/cp.plugin.zsh
index 7355a9990..fe6ea87a8 100644
--- a/plugins/cp/cp.plugin.zsh
+++ b/plugins/cp/cp.plugin.zsh
@@ -1,14 +1,4 @@
-#Show progress while file is copying
-
-# Rsync options are:
-#  -p - preserve permissions
-#  -o - preserve owner
-#  -g - preserve group
-#  -h - output in human-readable format
-#  --progress - display progress
-#  -b - instead of just overwriting an existing file, save the original
-#  --backup-dir=/tmp/rsync - move backup copies to "/tmp/rsync"
-#  -e /dev/null - only work on local files
-#  -- - everything after this is an argument, even if it looks like an option
-
-alias cpv="rsync -poghb --backup-dir=/tmp/rsync -e /dev/null --progress --"
+cpv() {
+    rsync -pogbr -hhh --backup-dir=/tmp/rsync -e /dev/null --progress "$@"
+}
+compdef _files cpv
-- 
cgit v1.2.3-70-g09d2


From 86126233bb5bb99ced64b95c16a4e4ed776fd8de Mon Sep 17 00:00:00 2001
From: slavaGanzin <slava.ganzin@gmail.com>
Date: Tue, 4 Oct 2016 12:21:18 +0300
Subject: specify globalias modes

---
 plugins/globalias/globalias.plugin.zsh | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'plugins')

diff --git a/plugins/globalias/globalias.plugin.zsh b/plugins/globalias/globalias.plugin.zsh
index 95a0e3072..bac657c47 100644
--- a/plugins/globalias/globalias.plugin.zsh
+++ b/plugins/globalias/globalias.plugin.zsh
@@ -4,8 +4,11 @@ globalias() {
    zle self-insert
 }
 zle -N globalias
-bindkey -e " " globalias
-bindkey -v " " globalias
-bindkey -e "^ " magic-space           # control-space to bypass completion
-bindkey -v "^ " magic-space
-bindkey -M isearch " " magic-space # normal space during searches
+
+# space expands all global aliases
+bindkey -M emacs " " globalias
+bindkey -M viins " " globalias
+
+# control-space to make a normal space
+bindkey -M emacs "^ " magic-space
+bindkey -M viins "^ " magic-space
-- 
cgit v1.2.3-70-g09d2


From 75f87dd24ec60bd243ffbe7c9dbd1daec5b51ae2 Mon Sep 17 00:00:00 2001
From: slavaGanzin <slava.ganzin@gmail.com>
Date: Tue, 4 Oct 2016 14:03:37 +0300
Subject: README for globalias

---
 plugins/globalias/README.md            | 37 ++++++++++++++++++++++++++++++++++
 plugins/globalias/globalias.plugin.zsh |  3 +++
 2 files changed, 40 insertions(+)
 create mode 100644 plugins/globalias/README.md

(limited to 'plugins')

diff --git a/plugins/globalias/README.md b/plugins/globalias/README.md
new file mode 100644
index 000000000..db2e5bee0
--- /dev/null
+++ b/plugins/globalias/README.md
@@ -0,0 +1,37 @@
+#Globalias
+
+
+Expands all globes, backtick expressions and aliases(including global).
+
+```
+$ touch {1..10}<space>
+#expands to
+$ touch 1 2 3 4 5 6 7 8 9 10
+
+$ mkdir "`date -R`"
+#expands to
+$ mkdir Tue,\ 04\ Oct\ 2016\ 13:54:03\ +0300
+
+#.zshrc:
+alias -g G="| grep --color=auto -P"
+alias l='ls --color=auto -lah'
+
+$ l<space>G<space>
+#expands to
+$ ls --color=auto -lah | grep --color=auto -P
+
+ls **/*.json<space>
+#expands to
+ls folder/file.json anotherfolder/another.json
+```
+
+####Returns autocompletion to your custom aliases:
+```
+#.zsrc
+alias S="sudo systemctl"
+
+$ S<space>
+#expands to:
+sudo systemctl s<tab>
+#trigger autocompletion
+```
diff --git a/plugins/globalias/globalias.plugin.zsh b/plugins/globalias/globalias.plugin.zsh
index bac657c47..bf4cfc030 100644
--- a/plugins/globalias/globalias.plugin.zsh
+++ b/plugins/globalias/globalias.plugin.zsh
@@ -12,3 +12,6 @@ bindkey -M viins " " globalias
 # control-space to make a normal space
 bindkey -M emacs "^ " magic-space
 bindkey -M viins "^ " magic-space
+
+# normal space during searches
+bindkey -M isearch " " magic-space
-- 
cgit v1.2.3-70-g09d2


From 6eaa868cd9ad8447973a53f09453121d58366a6a Mon Sep 17 00:00:00 2001
From: slavaGanzin <slava.ganzin@gmail.com>
Date: Tue, 4 Oct 2016 14:05:41 +0300
Subject: fix comment

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

(limited to 'plugins')

diff --git a/plugins/globalias/globalias.plugin.zsh b/plugins/globalias/globalias.plugin.zsh
index bf4cfc030..9602a9606 100644
--- a/plugins/globalias/globalias.plugin.zsh
+++ b/plugins/globalias/globalias.plugin.zsh
@@ -5,7 +5,7 @@ globalias() {
 }
 zle -N globalias
 
-# space expands all global aliases
+# space expands all aliases, including global
 bindkey -M emacs " " globalias
 bindkey -M viins " " globalias
 
-- 
cgit v1.2.3-70-g09d2


From f701b4de0fb55b71e2cfb17522a08fba741ff170 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 4 Oct 2016 13:55:11 +0200
Subject: Fix formatting and usage section

Also:

- Changes `globes` (which doesn't exist) to `glob expressions`.

- Delete the `trigger autocompletion to your current aliases` use case, since that's not
  really implemented.
---
 plugins/globalias/README.md | 55 ++++++++++++++++++++++++++++++++-------------
 1 file changed, 40 insertions(+), 15 deletions(-)

(limited to 'plugins')

diff --git a/plugins/globalias/README.md b/plugins/globalias/README.md
index db2e5bee0..ba9888ccb 100644
--- a/plugins/globalias/README.md
+++ b/plugins/globalias/README.md
@@ -1,37 +1,62 @@
-#Globalias
+# Globalias plugin
 
+Expands all glob expressions, subcommands and aliases (including global).
 
-Expands all globes, backtick expressions and aliases(including global).
+Idea from: http://blog.patshead.com/2012/11/automatically-expaning-zsh-global-aliases---simplified.html.
+
+## Usage
+
+Add `globalias` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... globalias)
+```
+
+Then just press `SPACE` to trigger the expansion of a command you've written.
+
+If you only want to insert a space without expanding the command line, press
+`CTRL`+`SPACE`.
+
+## Examples
+
+#### Glob expressions
 
 ```
 $ touch {1..10}<space>
-#expands to
+# expands to
 $ touch 1 2 3 4 5 6 7 8 9 10
 
+$ ls **/*.json<space>
+# expands to
+$ ls folder/file.json anotherfolder/another.json
+```
+
+#### Subcommands
+
+```
 $ mkdir "`date -R`"
-#expands to
+# expands to
 $ mkdir Tue,\ 04\ Oct\ 2016\ 13:54:03\ +0300
 
-#.zshrc:
+```
+
+#### Aliases
+
+```
+# .zshrc:
 alias -g G="| grep --color=auto -P"
 alias l='ls --color=auto -lah'
 
 $ l<space>G<space>
-#expands to
+# expands to
 $ ls --color=auto -lah | grep --color=auto -P
-
-ls **/*.json<space>
-#expands to
-ls folder/file.json anotherfolder/another.json
 ```
 
-####Returns autocompletion to your custom aliases:
 ```
-#.zsrc
+# .zsrc:
 alias S="sudo systemctl"
 
 $ S<space>
-#expands to:
-sudo systemctl s<tab>
-#trigger autocompletion
+# expands to:
+$ sudo systemctl
 ```
-- 
cgit v1.2.3-70-g09d2


From 3cc61701bd7fd0a3fa6cb3c70f2b927a1e51970a Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 4 Oct 2016 13:56:25 +0200
Subject: Update per-directory-history plugin to latest version (#5493)

Latest version: February 17, 2016 - dd81201
---
 plugins/per-directory-history/README.md                 |  5 ++---
 plugins/per-directory-history/per-directory-history.zsh | 12 +++++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'plugins')

diff --git a/plugins/per-directory-history/README.md b/plugins/per-directory-history/README.md
index d8ff93dc0..196f74e6c 100644
--- a/plugins/per-directory-history/README.md
+++ b/plugins/per-directory-history/README.md
@@ -27,9 +27,8 @@ Usage
 2.  The default mode if per directory history, interact with your history as normal.
 
 3.  Press ^G (the Control and G keys simultaneously) to toggle between local
-    and global histories. 
-
-
+    and global histories.  If you would prefer a different shortcut to toggle
+    set the PER_DIRECTORY_HISTORY_TOGGLE environment variable.
 
 -------------------------------------------------------------------------------
 Configuration
diff --git a/plugins/per-directory-history/per-directory-history.zsh b/plugins/per-directory-history/per-directory-history.zsh
index bdee341bd..1242dc420 100644
--- a/plugins/per-directory-history/per-directory-history.zsh
+++ b/plugins/per-directory-history/per-directory-history.zsh
@@ -30,7 +30,7 @@
 #
 ################################################################################
 #
-# Copyright (c) 2012 Jim Hester
+# Copyright (c) 2014 Jim Hester
 #
 # This software is provided 'as-is', without any express or implied warranty. 
 # In no event will the authors be held liable for any damages arising from the
@@ -57,6 +57,7 @@
 #-------------------------------------------------------------------------------
 
 [[ -z $HISTORY_BASE ]] && HISTORY_BASE="$HOME/.directory_history"
+[[ -z $PER_DIRECTORY_HISTORY_TOGGLE ]] && PER_DIRECTORY_HISTORY_TOGGLE='^G'
 
 #-------------------------------------------------------------------------------
 # toggle global/directory history used for searching - ctrl-G by default
@@ -76,7 +77,7 @@ function per-directory-history-toggle-history() {
 
 autoload per-directory-history-toggle-history
 zle -N per-directory-history-toggle-history
-bindkey '^G' per-directory-history-toggle-history
+bindkey $PER_DIRECTORY_HISTORY_TOGGLE per-directory-history-toggle-history
 
 #-------------------------------------------------------------------------------
 # implementation details
@@ -108,7 +109,7 @@ function _per-directory-history-change-directory() {
 }
 
 function _per-directory-history-addhistory() {
-  print -Sr -- ${1%%$'\n'}
+  print -Sr -- "${1%%$'\n'}"
   fc -p $_per_directory_history_directory
 }
 
@@ -140,8 +141,9 @@ function _per-directory-history-set-global-history() {
 
 
 #add functions to the exec list for chpwd and zshaddhistory
-chpwd_functions=(${chpwd_functions[@]} "_per-directory-history-change-directory")
-zshaddhistory_functions=(${zshaddhistory_functions[@]} "_per-directory-history-addhistory")
+autoload -U add-zsh-hook
+add-zsh-hook chpwd _per-directory-history-change-directory
+add-zsh-hook zshaddhistory _per-directory-history-addhistory
 
 #start in directory mode
 mkdir -p ${_per_directory_history_directory:h}
-- 
cgit v1.2.3-70-g09d2


From 7f9b7733507d57a6cd4f38d0c0db830647c1940d Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 4 Oct 2016 17:23:20 +0200
Subject: Fix compdef commands in git plugin

The command `compdef command=git` returns an error in some cases, the
appropriate command is `compdef _git command`.

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

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 28fb253dd..178f1deb2 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -76,7 +76,7 @@ alias gcd='git checkout develop'
 alias gcmsg='git commit -m'
 alias gco='git checkout'
 alias gcount='git shortlog -sn'
-compdef gcount=git
+compdef _git gcount
 alias gcp='git cherry-pick'
 alias gcpa='git cherry-pick --abort'
 alias gcpc='git cherry-pick --continue'
@@ -159,7 +159,7 @@ alias ghh='git help'
 alias gignore='git update-index --assume-unchanged'
 alias gignored='git ls-files -v | grep "^[[:lower:]]"'
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
-compdef git-svn-dcommit-push=git
+compdef _git git-svn-dcommit-push=git
 
 alias gk='\gitk --all --branches'
 compdef _git gk='gitk'
-- 
cgit v1.2.3-70-g09d2


From a1200f5bccd7c0ebe327ccbc554d56247136d48c Mon Sep 17 00:00:00 2001
From: slavaGanzin <slava.ganzin@gmail.com>
Date: Thu, 29 Sep 2016 19:05:49 +0300
Subject: git auto fetch on change directory

---
 plugins/git-auto-fetch/git-auto-fetch.plugin.zsh | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 plugins/git-auto-fetch/git-auto-fetch.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
new file mode 100644
index 000000000..841f47baf
--- /dev/null
+++ b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
@@ -0,0 +1,5 @@
+function git_fetch_on_chpwd {
+  ([[ -d .git ]] && git fetch --all >! ./.git/FETCH_LOG &)
+}
+chpwd_functions=(${chpwd_functions[@]} "git_fetch_on_chpwd")
+unset git_fetch_on_cpwd
-- 
cgit v1.2.3-70-g09d2


From 1427fbffef68d5796c8296ba105f325598b809f8 Mon Sep 17 00:00:00 2001
From: slavaGanzin <slava.ganzin@gmail.com>
Date: Thu, 29 Sep 2016 22:14:04 +0300
Subject: redirect output

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

(limited to 'plugins')

diff --git a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
index 841f47baf..cbf6984a0 100644
--- a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
+++ b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
@@ -1,5 +1,5 @@
 function git_fetch_on_chpwd {
-  ([[ -d .git ]] && git fetch --all >! ./.git/FETCH_LOG &)
+  ([[ -d .git ]] && git fetch --all &>! ./.git/FETCH_LOG &)
 }
-chpwd_functions=(${chpwd_functions[@]} "git_fetch_on_chpwd")
-unset git_fetch_on_cpwd
+chpwd_functions+=(git_fetch_on_chpwd)
+git_fetch_on_chpwd
-- 
cgit v1.2.3-70-g09d2


From 25fcf0c265c682f092ce49a6849e5e09b38dffa9 Mon Sep 17 00:00:00 2001
From: slavaGanzin <slava.ganzin@gmail.com>
Date: Tue, 4 Oct 2016 21:26:19 +0300
Subject: git-auto-fetch: README.md

---
 plugins/git-auto-fetch/README.md                 | 22 ++++++++++++++++++++++
 plugins/git-auto-fetch/git-auto-fetch.plugin.zsh | 12 +++++++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 plugins/git-auto-fetch/README.md

(limited to 'plugins')

diff --git a/plugins/git-auto-fetch/README.md b/plugins/git-auto-fetch/README.md
new file mode 100644
index 000000000..7f5eac49d
--- /dev/null
+++ b/plugins/git-auto-fetch/README.md
@@ -0,0 +1,22 @@
+# Git auto fetch
+
+Automatically fetches all changes from all remotes every time you cd into yout git-initialized project.
+
+####Usage
+Add ```git-auto-fetch``` to the plugins array in your zshrc file:
+```shell
+plugins=(... git-auto-fetch)
+```
+
+Every time you change directory to your git project all remotes will be fetched in background. Log of ```git fetch --all``` will be saved into .git/FETCH_LOG
+
+####Toggle auto fetch per folder
+If you are using mobile connection or for any other reason you can disable git-auto-fetch for any folder:
+
+```shell
+$ cd to/your/project
+$ git-auto-fetch
+disabled
+$ git-auto-fetch
+enabled
+```
diff --git a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
index cbf6984a0..87535b251 100644
--- a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
+++ b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
@@ -1,5 +1,15 @@
 function git_fetch_on_chpwd {
-  ([[ -d .git ]] && git fetch --all &>! ./.git/FETCH_LOG &)
+  ([[ -d .git ]] && [[ ! -f ".git/NO_AUTO_FETCH" ]] && git fetch --all &>! .git/FETCH_LOG &)
+}
+
+function git-auto-fetch {
+  [[ ! -d .git ]] && return
+  if [[ -f ".git/NO_AUTO_FETCH" ]]; then
+    rm ".git/NO_AUTO_FETCH" && echo "disabled"
+  else
+    touch ".git/NO_AUTO_FETCH" && echo "enabled"
+  fi
 }
 chpwd_functions+=(git_fetch_on_chpwd)
 git_fetch_on_chpwd
+unset git_fetch_on_chpwd
-- 
cgit v1.2.3-70-g09d2


From ac7dcdb21cfb57180c7d8007d95232ee62086997 Mon Sep 17 00:00:00 2001
From: slavaGanzin <slava.ganzin@gmail.com>
Date: Thu, 6 Oct 2016 16:55:21 +0300
Subject: add colors

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

(limited to 'plugins')

diff --git a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
index 87535b251..0bcefa931 100644
--- a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
+++ b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
@@ -5,9 +5,9 @@ function git_fetch_on_chpwd {
 function git-auto-fetch {
   [[ ! -d .git ]] && return
   if [[ -f ".git/NO_AUTO_FETCH" ]]; then
-    rm ".git/NO_AUTO_FETCH" && echo "disabled"
+    rm ".git/NO_AUTO_FETCH" && echo "${fg_bold[red]}disabled${reset_color}"
   else
-    touch ".git/NO_AUTO_FETCH" && echo "enabled"
+    touch ".git/NO_AUTO_FETCH" && echo "${fg_bold[green]}enabled${reset_color}"
   fi
 }
 chpwd_functions+=(git_fetch_on_chpwd)
-- 
cgit v1.2.3-70-g09d2


From d69f2850afc189310b40141c839480b42f71775c Mon Sep 17 00:00:00 2001
From: diego <sirdiego@users.noreply.github.com>
Date: Fri, 7 Oct 2016 23:54:54 +0200
Subject: Add non 0 exit code for missing jump targets (#5500)

This allows for the user to combine the jump command with something else. In my example cd and jump are now combined like this:

```bash
jumpcd() {
        jump $1 > /dev/null || cd $1
}
alias cd="jumpcd"
```
---
 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 e58e7373d..86d9553a2 100644
--- a/plugins/jump/jump.plugin.zsh
+++ b/plugins/jump/jump.plugin.zsh
@@ -9,7 +9,7 @@
 export MARKPATH=$HOME/.marks
 
 jump() {
-	cd -P "$MARKPATH/$1" 2>/dev/null || echo "No such mark: $1"
+	cd -P "$MARKPATH/$1" 2>/dev/null || {echo "No such mark: $1"; return 1}
 }
 
 mark() {
-- 
cgit v1.2.3-70-g09d2


From cd37d19ddaf9cc5acbf443f93f88ca355f74090d Mon Sep 17 00:00:00 2001
From: Florian Boulay <florian.boulay@gmail.com>
Date: Sat, 8 Oct 2016 08:26:10 +0200
Subject: Add m4a format in the common aliases plugin (#5502)

The m4a file format can be opened in the command line with mplayer
---
 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 c7aafd8b8..128db6e5f 100644
--- a/plugins/common-aliases/common-aliases.plugin.zsh
+++ b/plugins/common-aliases/common-aliases.plugin.zsh
@@ -63,7 +63,7 @@ if is-at-least 4.2.0; then
   _image_fts=(jpg jpeg png gif mng tiff tif xpm)
   for ft in $_image_fts ; do alias -s $ft=$XIVIEWER; done
 
-  _media_fts=(ape avi flv mkv mov mp3 mpeg mpg ogg ogm rm wav webm)
+  _media_fts=(ape avi flv m4a mkv mov mp3 mpeg mpg ogg ogm rm wav webm)
   for ft in $_media_fts ; do alias -s $ft=mplayer ; done
 
   #read documents
-- 
cgit v1.2.3-70-g09d2


From 3be4108d722269720c71138a211dd744ade66f5d Mon Sep 17 00:00:00 2001
From: Michel Filipe <michel.filipe@gmail.com>
Date: Sun, 9 Oct 2016 14:36:47 -0300
Subject: remove duplicate alias (#5508)

Removing one "apt-get autoremove" alias because it is duplicated.
---
 plugins/ubuntu/ubuntu.plugin.zsh | 2 --
 1 file changed, 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/ubuntu/ubuntu.plugin.zsh b/plugins/ubuntu/ubuntu.plugin.zsh
index d924f8861..ffde284fe 100644
--- a/plugins/ubuntu/ubuntu.plugin.zsh
+++ b/plugins/ubuntu/ubuntu.plugin.zsh
@@ -29,7 +29,6 @@ compdef _ppap ppap='sudo ppa-purge'
 
 alias ag='sudo apt-get'            # age - but without sudo
 alias aga='sudo apt-get autoclean' # aac
-alias agar='sudo apt-get autoremove'
 alias agb='sudo apt-get build-dep' # abd
 alias agc='sudo apt-get clean'     # adc
 alias agd='sudo apt-get dselect-upgrade' # ads
@@ -44,7 +43,6 @@ alias agar='sudo apt-get autoremove'
 
 compdef _ag ag='sudo apt-get'
 compdef _aga aga='sudo apt-get autoclean'
-compdef _agar agar='sudo apt-get autoremove'
 compdef _agb agb='sudo apt-get build-dep'
 compdef _agc agc='sudo apt-get clean'
 compdef _agd agd='sudo apt-get dselect-upgrade'
-- 
cgit v1.2.3-70-g09d2


From 028fdf2e9948fa720599a63cd36124eff95cb6fc Mon Sep 17 00:00:00 2001
From: slavaGanzin <slava.ganzin@gmail.com>
Date: Mon, 10 Oct 2016 22:33:09 +0300
Subject: add coloring

---
 plugins/git-auto-fetch/git-auto-fetch.plugin.zsh | 27 ++++++++++++++----------
 1 file changed, 16 insertions(+), 11 deletions(-)

(limited to 'plugins')

diff --git a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
index 0bcefa931..949709e4c 100644
--- a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
+++ b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
@@ -1,15 +1,20 @@
-function git_fetch_on_chpwd {
-  ([[ -d .git ]] && [[ ! -f ".git/NO_AUTO_FETCH" ]] && git fetch --all &>! .git/FETCH_LOG &)
+function git-fetch-on-chpwd {
+  (`git rev-parse --is-inside-work-tree 2>/dev/null` &&
+  dir=`git rev-parse --git-dir` &&
+  [[ ! -f $dir/NO_AUTO_FETCH ]] &&
+  git fetch --all &>! $dir/FETCH_LOG &)
 }
 
 function git-auto-fetch {
-  [[ ! -d .git ]] && return
-  if [[ -f ".git/NO_AUTO_FETCH" ]]; then
-    rm ".git/NO_AUTO_FETCH" && echo "${fg_bold[red]}disabled${reset_color}"
-  else
-    touch ".git/NO_AUTO_FETCH" && echo "${fg_bold[green]}enabled${reset_color}"
-  fi
+  `git rev-parse --is-inside-work-tree 2>/dev/null` || return
+  guard="`git rev-parse --git-dir`/NO_AUTO_FETCH"
+
+  (rm $guard 2>/dev/null &&
+    echo "${fg_bold[green]}enabled${reset_color}") ||
+  (touch $guard &&
+    echo "${fg_bold[red]}disabled${reset_color}")
 }
-chpwd_functions+=(git_fetch_on_chpwd)
-git_fetch_on_chpwd
-unset git_fetch_on_chpwd
+
+chpwd_functions+=(git-fetch-on-chpwd)
+git-fetch-on-chpwd
+unset git-fetch-on-chpwd
-- 
cgit v1.2.3-70-g09d2


From 9f2977f3eb969a8b026d1fc84394bef0d1a9ee78 Mon Sep 17 00:00:00 2001
From: slavaGanzin <slava.ganzin@gmail.com>
Date: Mon, 10 Oct 2016 22:30:47 +0300
Subject: reimplement

---
 $                               | 0
 disabled                        | 0
 echo                            | 0
 plugins/zsh-syntax-highlighting | 1 +
 4 files changed, 1 insertion(+)
 create mode 100644 $
 create mode 100644 disabled
 create mode 100644 echo
 create mode 160000 plugins/zsh-syntax-highlighting

(limited to 'plugins')

diff --git a/$ b/$
new file mode 100644
index 000000000..e69de29bb
diff --git a/disabled b/disabled
new file mode 100644
index 000000000..e69de29bb
diff --git a/echo b/echo
new file mode 100644
index 000000000..e69de29bb
diff --git a/plugins/zsh-syntax-highlighting b/plugins/zsh-syntax-highlighting
new file mode 160000
index 000000000..094329eb1
--- /dev/null
+++ b/plugins/zsh-syntax-highlighting
@@ -0,0 +1 @@
+Subproject commit 094329eb145e00b810e65415ed4b9ad58aa7c34a
-- 
cgit v1.2.3-70-g09d2


From a56eac7a71a774a4d97bb9456f36b8eb495329d5 Mon Sep 17 00:00:00 2001
From: Hong <hong@topbug.net>
Date: Mon, 10 Oct 2016 13:24:30 -0700
Subject: Use OSTYPE instead of uname whenever possible for better speed.
 (#5496)

---
 lib/theme-and-appearance.zsh         | 4 ++--
 plugins/battery/battery.plugin.zsh   | 2 +-
 plugins/gitfast/git-completion.bash  | 2 +-
 plugins/sublime/sublime.plugin.zsh   | 2 +-
 plugins/zsh-navigation-tools/_n-kill | 4 ++--
 plugins/zsh-navigation-tools/n-kill  | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'plugins')

diff --git a/lib/theme-and-appearance.zsh b/lib/theme-and-appearance.zsh
index 12bcd2849..039a59d2a 100644
--- a/lib/theme-and-appearance.zsh
+++ b/lib/theme-and-appearance.zsh
@@ -6,11 +6,11 @@ export LSCOLORS="Gxfxcxdxbxegedabagacad"
 
 if [[ "$DISABLE_LS_COLORS" != "true" ]]; then
   # Find the option for using colors in ls, depending on the version
-  if [[ "$(uname -s)" == "NetBSD" ]]; then
+  if [[ "$OSTYPE" == netbsd* ]]; then
     # On NetBSD, test if "gls" (GNU ls) is installed (this one supports colors);
     # otherwise, leave ls as is, because NetBSD's ls doesn't support -G
     gls --color -d . &>/dev/null && alias ls='gls --color=tty'
-  elif [[ "$(uname -s)" == "OpenBSD" ]]; then
+  elif [[ "$OSTYPE" == openbsd* ]]; then
     # On OpenBSD, "gls" (ls from GNU coreutils) and "colorls" (ls from base,
     # with color and multibyte support) are available from ports.  "colorls"
     # will be installed on purpose and can't be pulled in by installing
diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh
index 0bb9e77f0..da229cf35 100644
--- a/plugins/battery/battery.plugin.zsh
+++ b/plugins/battery/battery.plugin.zsh
@@ -64,7 +64,7 @@ if [[ "$OSTYPE" = darwin* ]] ; then
     [[ $(ioreg -rc "AppleSmartBattery"| grep '^.*"IsCharging"\ =\ ' | sed -e 's/^.*"IsCharging"\ =\ //') == "Yes" ]]
   }
 
-elif [[ $(uname) == "Linux"  ]] ; then
+elif [[ "$OSTYPE" = linux*  ]] ; then
 
   function battery_is_charging() {
     ! [[ $(acpi 2>/dev/null | grep -c '^Battery.*Discharging') -gt 0 ]]
diff --git a/plugins/gitfast/git-completion.bash b/plugins/gitfast/git-completion.bash
index e3918c87e..8ce6b5c5f 100644
--- a/plugins/gitfast/git-completion.bash
+++ b/plugins/gitfast/git-completion.bash
@@ -2771,6 +2771,6 @@ __git_complete gitk __gitk_main
 # when the user has tab-completed the executable name and consequently
 # included the '.exe' suffix.
 #
-if [ Cygwin = "$(uname -o 2>/dev/null)" ]; then
+if [[ "$OSTYPE" = cygwin* ]]; then
 __git_complete git.exe __git_main
 fi
diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index 75a39eab1..f84b7032a 100644
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -1,4 +1,4 @@
-if [[ $('uname') == 'Linux' ]]; then
+if [[ "$OSTYPE" == linux* ]]; then
     local _sublime_linux_paths > /dev/null 2>&1
     _sublime_linux_paths=(
         "$HOME/bin/sublime_text"
diff --git a/plugins/zsh-navigation-tools/_n-kill b/plugins/zsh-navigation-tools/_n-kill
index 8a4ec9da7..6f5d47971 100644
--- a/plugins/zsh-navigation-tools/_n-kill
+++ b/plugins/zsh-navigation-tools/_n-kill
@@ -10,8 +10,8 @@ integer cygwin=0
 local IFS="
 "
 
-case "$(uname)" in
-    CYGWIN*) list=( `command ps -Wa` ); cygwin=1 ;;
+case "$OSTYPE" in
+    cygwin*) list=( `command ps -Wa` ); cygwin=1 ;;
     *) list=( `command ps -o pid,uid,command -A` ) ;;
 esac
 
diff --git a/plugins/zsh-navigation-tools/n-kill b/plugins/zsh-navigation-tools/n-kill
index 0d10565e4..76050f969 100644
--- a/plugins/zsh-navigation-tools/n-kill
+++ b/plugins/zsh-navigation-tools/n-kill
@@ -42,8 +42,8 @@ NLIST_NONSELECTABLE_ELEMENTS=( 1 )
 
 type ps 2>/dev/null 1>&2 || { echo >&2 "Error: \`ps' not found"; return 1 }
 
-case "$(uname)" in
-    CYGWIN*) list=( `command ps -Wa` )  ;;
+case "$OSTYPE" in
+    cygwin*) list=( `command ps -Wa` )  ;;
     *) list=( `command ps -o pid,uid,command -A` ) ;;
 esac
 
-- 
cgit v1.2.3-70-g09d2


From 5cd7ad38cbb691c70377b5c82d3de5b0af076164 Mon Sep 17 00:00:00 2001
From: kennyklee <kennyklee@gmail.com>
Date: Mon, 17 Oct 2016 01:00:14 -0700
Subject: Fix regex for optional http(s), and variable reference inside
 osascript.

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

(limited to 'plugins')

diff --git a/plugins/droplr/droplr.plugin.zsh b/plugins/droplr/droplr.plugin.zsh
index 296a8b98b..af0a21299 100644
--- a/plugins/droplr/droplr.plugin.zsh
+++ b/plugins/droplr/droplr.plugin.zsh
@@ -7,8 +7,8 @@ droplr() {
         return 1
     fi
 
-    if [[ "$1" =~ ^http[|s]:// ]]; then
-        osascript -e "tell app 'Droplr' to shorten '$1'"
+    if [[ "$1" =~ ^https?:// ]]; then
+        osascript -e 'tell app "Droplr" to shorten "'"$1"'"'
     else
         open -ga /Applications/Droplr.app "$1"
     fi
-- 
cgit v1.2.3-70-g09d2


From 37bf9186a03a4e15dcccd1da76b9c6f597cc8e71 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 25 Oct 2016 05:43:11 +0200
Subject: Update docker completion (2015-10-25)

Closes #5568

Source:
https://github.com/docker/docker/commit/c9fdf9abf8d6443598808809b900d96e04adfcb1
---
 plugins/docker/_docker | 53 ++++++++++++++++++++++++++++++++++----------------
 1 file changed, 36 insertions(+), 17 deletions(-)

(limited to 'plugins')

diff --git a/plugins/docker/_docker b/plugins/docker/_docker
index 1366fd61b..415e731f3 100644
--- a/plugins/docker/_docker
+++ b/plugins/docker/_docker
@@ -57,7 +57,7 @@ __docker_get_containers() {
     type=$1; shift
     [[ $kind = (stopped|all) ]] && args=($args -a)
 
-    lines=(${(f)"$(_call_program commands docker $docker_options ps --format 'table' --no-trunc $args)"})
+    lines=(${(f)${:-"$(_call_program commands docker $docker_options ps --format 'table' --no-trunc $args)"$'\n'}})
 
     # Parse header line to find columns
     local i=1 j=1 k header=${lines[1]}
@@ -153,7 +153,7 @@ __docker_images() {
     [[ $PREFIX = -* ]] && return 1
     integer ret=1
     declare -a images
-    images=(${${${(f)"$(_call_program commands docker $docker_options images)"}[2,-1]}/(#b)([^ ]##) ##([^ ]##) ##([^ ]##)*/${match[3]}:${(r:15:: :::)match[2]} in ${match[1]}})
+    images=(${${${(f)${:-"$(_call_program commands docker $docker_options images)"$'\n'}}[2,-1]}/(#b)([^ ]##) ##([^ ]##) ##([^ ]##)*/${match[3]}:${(r:15:: :::)match[2]} in ${match[1]}})
     _describe -t docker-images "images" images && ret=0
     __docker_repositories_with_tags && ret=0
     return ret
@@ -162,7 +162,7 @@ __docker_images() {
 __docker_repositories() {
     [[ $PREFIX = -* ]] && return 1
     declare -a repos
-    repos=(${${${(f)"$(_call_program commands docker $docker_options images)"}%% *}[2,-1]})
+    repos=(${${${(f)${:-"$(_call_program commands docker $docker_options images)"$'\n'}}%% *}[2,-1]})
     repos=(${repos#<none>})
     _describe -t docker-repos "repositories" repos
 }
@@ -172,7 +172,7 @@ __docker_repositories_with_tags() {
     integer ret=1
     declare -a repos onlyrepos matched
     declare m
-    repos=(${${${${(f)"$(_call_program commands docker $docker_options images)"}[2,-1]}/ ##/:::}%% *})
+    repos=(${${${${(f)${:-"$(_call_program commands docker $docker_options images)"$'\n'}}[2,-1]}/ ##/:::}%% *})
     repos=(${${repos%:::<none>}#<none>})
     # Check if we have a prefix-match for the current prefix.
     onlyrepos=(${repos%::*})
@@ -208,7 +208,7 @@ __docker_search() {
     if ( [[ ${(P)+cachename} -eq 0 ]] || _cache_invalid ${cachename#_} ) \
         && ! _retrieve_cache ${cachename#_}; then
         _message "Searching for ${searchterm}..."
-        result=(${${${(f)"$(_call_program commands docker $docker_options search $searchterm)"}%% *}[2,-1]})
+        result=(${${${(f)${:-"$(_call_program commands docker $docker_options search $searchterm)"$'\n'}}%% *}[2,-1]})
         _store_cache ${cachename#_} result
     fi
     _wanted dockersearch expl 'available images' compadd -a result
@@ -219,7 +219,7 @@ __docker_get_log_options() {
 
     integer ret=1
     local log_driver=${opt_args[--log-driver]:-"all"}
-    local -a awslogs_options fluentd_options gelf_options journald_options json_file_options syslog_options splunk_options
+    local -a awslogs_options fluentd_options gelf_options journald_options json_file_options logentries_options syslog_options splunk_options
 
     awslogs_options=("awslogs-region" "awslogs-group" "awslogs-stream")
     fluentd_options=("env" "fluentd-address" "fluentd-async-connect" "fluentd-buffer-limit" "fluentd-retry-wait" "fluentd-max-retries" "labels" "tag")
@@ -227,6 +227,7 @@ __docker_get_log_options() {
     gelf_options=("env" "gelf-address" "gelf-compression-level" "gelf-compression-type" "labels" "tag")
     journald_options=("env" "labels" "tag")
     json_file_options=("env" "labels" "max-file" "max-size")
+    logentries_options=("logentries-token")
     syslog_options=("env" "labels" "syslog-address" "syslog-facility" "syslog-format" "syslog-tls-ca-cert" "syslog-tls-cert" "syslog-tls-key" "syslog-tls-skip-verify" "tag")
     splunk_options=("env" "labels" "splunk-caname" "splunk-capath" "splunk-format" "splunk-gzip" "splunk-gzip-level" "splunk-index" "splunk-insecureskipverify" "splunk-source" "splunk-sourcetype" "splunk-token" "splunk-url" "splunk-verify-connection" "tag")
 
@@ -236,6 +237,7 @@ __docker_get_log_options() {
     [[ $log_driver = (gelf|all) ]] && _describe -t gelf-options "gelf options" gelf_options "$@" && ret=0
     [[ $log_driver = (journald|all) ]] && _describe -t journald-options "journald options" journald_options "$@" && ret=0
     [[ $log_driver = (json-file|all) ]] && _describe -t json-file-options "json-file options" json_file_options "$@" && ret=0
+    [[ $log_driver = (logentries|all) ]] && _describe -t logentries-options "logentries options" logentries_options "$@" && ret=0
     [[ $log_driver = (syslog|all) ]] && _describe -t syslog-options "syslog options" syslog_options "$@" && ret=0
     [[ $log_driver = (splunk|all) ]] && _describe -t splunk-options "splunk options" splunk_options "$@" && ret=0
 
@@ -333,6 +335,9 @@ __docker_complete_ps_filters() {
             (id)
                 __docker_containers_ids && ret=0
                 ;;
+            (is-task)
+                _describe -t boolean-filter-opts "filter options" boolean_opts && ret=0
+                ;;
             (name)
                 __docker_containers_names && ret=0
                 ;;
@@ -504,7 +509,7 @@ __docker_get_networks() {
 
     type=$1; shift
 
-    lines=(${(f)"$(_call_program commands docker $docker_options network ls)"})
+    lines=(${(f)${:-"$(_call_program commands docker $docker_options network ls)"$'\n'}})
 
     # Parse header line to find columns
     local i=1 j=1 k header=${lines[1]}
@@ -720,7 +725,7 @@ __docker_nodes() {
     filter=$1; shift
     [[ $filter != "none" ]] && args=("-f $filter")
 
-    lines=(${(f)"$(_call_program commands docker $docker_options node ls $args)"})
+    lines=(${(f)${:-"$(_call_program commands docker $docker_options node ls $args)"$'\n'}})
     # Parse header line to find columns
     local i=1 j=1 k header=${lines[1]}
     declare -A begin end
@@ -792,7 +797,7 @@ __docker_node_commands() {
         "ls:List nodes in the swarm"
         "promote:Promote a node as manager in the swarm"
         "rm:Remove one or more nodes from the swarm"
-        "ps:List tasks running on a node, defaults to current node"
+        "ps:List tasks running on one or more nodes, defaults to current node"
         "update:Update a node"
     )
     _describe -t docker-node-commands "docker node command" _docker_node_subcommands
@@ -847,7 +852,7 @@ __docker_node_subcommand() {
                 "($help)*"{-f=,--filter=}"[Provide filter values]:filter:->filter-options" \
                 "($help)--no-resolve[Do not map IDs to Names]" \
                 "($help)--no-trunc[Do not truncate output]" \
-                "($help -)1:node:__docker_complete_nodes" && ret=0
+                "($help -)*:node:__docker_complete_nodes" && ret=0
             case $state in
                 (filter-options)
                     __docker_node_complete_ps_filters && ret=0
@@ -881,7 +886,7 @@ __docker_complete_plugins() {
     local line s
     declare -a lines plugins
 
-    lines=(${(f)"$(_call_program commands docker $docker_options plugin ls)"})
+    lines=(${(f)${:-"$(_call_program commands docker $docker_options plugin ls)"$'\n'}})
 
     # Parse header line to find columns
     local i=1 j=1 k header=${lines[1]}
@@ -1007,7 +1012,7 @@ __docker_services() {
 
     type=$1; shift
 
-    lines=(${(f)"$(_call_program commands docker $docker_options service ls)"})
+    lines=(${(f)${:-"$(_call_program commands docker $docker_options service ls)"$'\n'}})
 
     # Parse header line to find columns
     local i=1 j=1 k header=${lines[1]}
@@ -1103,6 +1108,8 @@ __docker_service_subcommand() {
         "($help)--stop-grace-period=[Time to wait before force killing a container]:grace period: "
         "($help)--update-delay=[Delay between updates]:delay: "
         "($help)--update-failure-action=[Action on update failure]:mode:(pause continue)"
+        "($help)--update-max-failure-ratio=[Failure rate to tolerate during an update]:fraction: "
+        "($help)--update-monitor=[Duration after each task update to monitor for failure]:window: "
         "($help)--update-parallelism=[Maximum number of tasks updated simultaneously]:number: "
         "($help -u --user)"{-u=,--user=}"[Username or UID]:user:_users"
         "($help)--with-registry-auth[Send registry authentication details to swarm agents]"
@@ -1178,8 +1185,10 @@ __docker_service_subcommand() {
                 "($help)--arg=[Service command args]:arguments: _normal" \
                 "($help)*--container-label-add=[Add or update container labels]:label: " \
                 "($help)*--container-label-rm=[Remove a container label by its key]:label: " \
+                "($help)--force[Force update]" \
                 "($help)*--group-rm=[Remove previously added user groups from the container]:group:_groups" \
                 "($help)--image=[Service image tag]:image:__docker_repositories" \
+                "($help)--rollback[Rollback to previous specification]" \
                 "($help -)1:service:__docker_complete_services" && ret=0
             ;;
         (help)
@@ -1293,7 +1302,7 @@ __docker_volumes() {
     integer ret=1
     declare -a lines volumes
 
-    lines=(${(f)"$(_call_program commands docker $docker_options volume ls)"})
+    lines=(${(f)${:-"$(_call_program commands docker $docker_options volume ls)"$'\n'}})
 
     # Parse header line to find columns
     local i=1 j=1 k header=${lines[1]}
@@ -1506,6 +1515,7 @@ __docker_subcommand() {
                 $opts_build_create_run \
                 $opts_build_create_run_update \
                 "($help)*--build-arg[Build-time variables]:<varname>=<value>: " \
+                "($help)--compress[Compress the build context using gzip]" \
                 "($help -f --file)"{-f=,--file=}"[Name of the Dockerfile]:Dockerfile:_files" \
                 "($help)--force-rm[Always remove intermediate containers]" \
                 "($help)*--label=[Set metadata for an image]:label=value: " \
@@ -1594,6 +1604,7 @@ __docker_subcommand() {
                 "($help -g --graph)"{-g=,--graph=}"[Root of the Docker runtime]:path:_directories" \
                 "($help -H --host)"{-H=,--host=}"[tcp://host:port to bind/connect to]:host: " \
                 "($help)--icc[Enable inter-container communication]" \
+                "($help)--init-path=[Path to the docker-init binary]:docker-init binary:_files" \
                 "($help)*--insecure-registry=[Enable insecure registry communication]:registry: " \
                 "($help)--ip=[Default IP when binding container ports]" \
                 "($help)--ip-forward[Enable net.ipv4.ip_forward]" \
@@ -1669,6 +1680,7 @@ __docker_subcommand() {
                 $opts_help \
                 $opts_attach_exec_run_start \
                 "($help -d --detach)"{-d,--detach}"[Detached mode: leave the container running in the background]" \
+                "($help -e --env)"{-e,--env}"[Set environment variables]" \
                 "($help -i --interactive)"{-i,--interactive}"[Keep stdin open even if not attached]" \
                 "($help)--privileged[Give extended Linux capabilities to the command]" \
                 "($help -t --tty)"{-t,--tty}"[Allocate a pseudo-tty]" \
@@ -1704,7 +1716,7 @@ __docker_subcommand() {
                 "($help -a --all)"{-a,--all}"[Show all images]" \
                 "($help)--digests[Show digests]" \
                 "($help)*"{-f=,--filter=}"[Filter values]:filter:->filter-options" \
-                "($help)--format[Pretty-print images using a Go template]:template: " \
+                "($help)--format=[Pretty-print images using a Go template]:template: " \
                 "($help)--no-trunc[Do not truncate output]" \
                 "($help -q --quiet)"{-q,--quiet}"[Only show numeric IDs]" \
                 "($help -): :__docker_repositories" && ret=0
@@ -1726,7 +1738,7 @@ __docker_subcommand() {
         (info|version)
             _arguments $(__docker_arguments) \
                 $opts_help \
-		"($help -f --format)"{-f=,--format=}"[Format the output using the given go template]:template: " && ret=0
+                "($help -f --format)"{-f=,--format=}"[Format the output using the given go template]:template: " && ret=0
             ;;
         (inspect)
             local state
@@ -1851,7 +1863,7 @@ __docker_subcommand() {
                 "($help -a --all)"{-a,--all}"[Show all containers]" \
                 "($help)--before=[Show only container created before...]:containers:__docker_containers" \
                 "($help)*"{-f=,--filter=}"[Filter values]:filter:__docker_complete_ps_filters" \
-                "($help)--format[Pretty-print containers using a Go template]:template: " \
+                "($help)--format=[Pretty-print containers using a Go template]:template: " \
                 "($help -l --latest)"{-l,--latest}"[Show only the latest created container]" \
                 "($help -n --last)"{-n=,--last=}"[Show n last created containers (includes all states)]:n:(1 5 10 25 50)" \
                 "($help)--no-trunc[Do not truncate output]" \
@@ -1878,12 +1890,18 @@ __docker_subcommand() {
                 "($help -):old name:__docker_containers" \
                 "($help -):new name: " && ret=0
             ;;
-        (restart|stop)
+        (stop)
             _arguments $(__docker_arguments) \
                 $opts_help \
                 "($help -t --time)"{-t=,--time=}"[Number of seconds to try to stop for before killing the container]:seconds to before killing:(1 5 10 30 60)" \
                 "($help -)*:containers:__docker_runningcontainers" && ret=0
             ;;
+        (restart)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -t --time)"{-t=,--time=}"[Number of seconds to try to stop for before killing the container]:seconds to before killing:(1 5 10 30 60)" \
+                "($help -)*:containers:__docker_containers_ids" && ret=0
+            ;;
         (rm)
             _arguments $(__docker_arguments) \
                 $opts_help \
@@ -1999,6 +2017,7 @@ __docker_subcommand() {
             _arguments $(__docker_arguments) \
                 $opts_help \
                 "($help -a --all)"{-a,--all}"[Show all containers (default shows just running)]" \
+                "($help)--format=[Pretty-print images using a Go template]:template: " \
                 "($help)--no-stream[Disable streaming stats and only pull the first result]" \
                 "($help -)*:containers:__docker_runningcontainers" && ret=0
             ;;
-- 
cgit v1.2.3-70-g09d2


From b1efd04f947ca9d391cf36dbca643b3845d8acee Mon Sep 17 00:00:00 2001
From: jotadrilo <jotadrilo@users.noreply.github.com>
Date: Tue, 25 Oct 2016 06:25:07 +0200
Subject: add docker-compose down alias (#5557)

* add docker-compose down alias

* rename `docker-compose down` alias to `dcdn`
---
 plugins/docker-compose/docker-compose.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins')

diff --git a/plugins/docker-compose/docker-compose.plugin.zsh b/plugins/docker-compose/docker-compose.plugin.zsh
index 7e3307017..4e4ac114a 100644
--- a/plugins/docker-compose/docker-compose.plugin.zsh
+++ b/plugins/docker-compose/docker-compose.plugin.zsh
@@ -18,5 +18,6 @@ alias dcrm='docker-compose rm'
 alias dcr='docker-compose run'
 alias dcstop='docker-compose stop'
 alias dcup='docker-compose up'
+alias dcdn='docker-compose down'
 alias dcl='docker-compose logs'
 alias dclf='docker-compose logs -f'
-- 
cgit v1.2.3-70-g09d2


From d9695a8b00c6960417726e49a32df4cf760e055e Mon Sep 17 00:00:00 2001
From: Michał Ordon <designorant@users.noreply.github.com>
Date: Tue, 25 Oct 2016 05:29:35 +0100
Subject: Add more simulator aliases (#5550)

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

(limited to 'plugins')

diff --git a/plugins/react-native/react-native.plugin.zsh b/plugins/react-native/react-native.plugin.zsh
index 9463a98b3..f19cba820 100644
--- a/plugins/react-native/react-native.plugin.zsh
+++ b/plugins/react-native/react-native.plugin.zsh
@@ -2,6 +2,8 @@ alias rnand='react-native run-android'
 alias rnios4s='react-native run-ios --simulator "iPhone 4s"'
 alias rnios5='react-native run-ios --simulator "iPhone 5"'
 alias rnios5s='react-native run-ios --simulator "iPhone 5s"'
+alias rnios6='react-native run-ios --simulator "iPhone 6"'
+alias rnios6s='react-native run-ios --simulator "iPhone 6s"'
 alias rnios='react-native run-ios'
 alias rnlink='react-native link'
 
-- 
cgit v1.2.3-70-g09d2


From 0ee89d965ecaa4f32cf2d1039e9d84a73eb206cf Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 25 Oct 2016 07:17:29 +0200
Subject: Add brew completion missing disclaimer

---
 plugins/brew/brew.plugin.zsh | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'plugins')

diff --git a/plugins/brew/brew.plugin.zsh b/plugins/brew/brew.plugin.zsh
index 5b5847328..d4289c98e 100644
--- a/plugins/brew/brew.plugin.zsh
+++ b/plugins/brew/brew.plugin.zsh
@@ -2,3 +2,19 @@ alias brews='brew list -1'
 alias bubo='brew update && brew outdated'
 alias bubc='brew upgrade && brew cleanup'
 alias bubu='bubo && bubc'
+
+if mkdir "$ZSH_CACHE_DIR/.brew-completion-message" 2>/dev/null; then
+	print -P '%F{yellow}'Oh My Zsh brew plugin:
+	cat <<-'EOF'
+
+		  With the advent of their 1.0 release, Homebrew has decided to bundle
+		  the zsh completion as part of the brew installation, so we no longer
+		  ship it with the brew plugin; now it only has brew aliases.
+
+		  If you find that brew completion no longer works, make sure you have
+		  your Homebrew installation fully up to date.
+
+		  You will only see this message once.
+	EOF
+	print -P '%f'
+fi
-- 
cgit v1.2.3-70-g09d2


From dbee3dd9c69c8d2e3299f2f7e7c68fabd06e33c5 Mon Sep 17 00:00:00 2001
From: slavaGanzin <slava.ganzin@gmail.com>
Date: Wed, 26 Oct 2016 23:47:51 +0300
Subject: 1. autofetch on zle-line-init 2. GIT_AUTO_FETCH_INTERVAL

---
 plugins/git-auto-fetch/README.md                 | 11 +++++++++--
 plugins/git-auto-fetch/git-auto-fetch.plugin.zsh | 20 ++++++++++++++++----
 2 files changed, 25 insertions(+), 6 deletions(-)

(limited to 'plugins')

diff --git a/plugins/git-auto-fetch/README.md b/plugins/git-auto-fetch/README.md
index 7f5eac49d..04f1c9445 100644
--- a/plugins/git-auto-fetch/README.md
+++ b/plugins/git-auto-fetch/README.md
@@ -1,6 +1,6 @@
 # Git auto fetch
 
-Automatically fetches all changes from all remotes every time you cd into yout git-initialized project.
+Automatically fetches all changes from all remotes while you are working in git-initialized directory.
 
 ####Usage
 Add ```git-auto-fetch``` to the plugins array in your zshrc file:
@@ -8,7 +8,14 @@ Add ```git-auto-fetch``` to the plugins array in your zshrc file:
 plugins=(... git-auto-fetch)
 ```
 
-Every time you change directory to your git project all remotes will be fetched in background. Log of ```git fetch --all``` will be saved into .git/FETCH_LOG
+Every time you launch a command in your shell all remotes will be fetched in background.
+By default autofetch will be triggered only if last fetch was done at least 60 seconds ago.
+You can change fetch interval in your .zshrc:
+```
+GIT_AUTO_FETCH_INTERVAL=1200 #in seconds
+```
+Log of ```git fetch --all``` will be saved into .git/FETCH_LOG
+
 
 ####Toggle auto fetch per folder
 If you are using mobile connection or for any other reason you can disable git-auto-fetch for any folder:
diff --git a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
index 949709e4c..e9946ef3f 100644
--- a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
+++ b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
@@ -1,7 +1,10 @@
-function git-fetch-on-chpwd {
+GIT_AUTO_FETCH_INTERVAL=${GIT_AUTO_FETCH_INTERVAL:=60}
+
+function git-fetch-all {
   (`git rev-parse --is-inside-work-tree 2>/dev/null` &&
   dir=`git rev-parse --git-dir` &&
   [[ ! -f $dir/NO_AUTO_FETCH ]] &&
+  (( `date +%s` - `date -r $dir/FETCH_LOG +%s` > $GIT_AUTO_FETCH_INTERVAL )) &&
   git fetch --all &>! $dir/FETCH_LOG &)
 }
 
@@ -15,6 +18,15 @@ function git-auto-fetch {
     echo "${fg_bold[red]}disabled${reset_color}")
 }
 
-chpwd_functions+=(git-fetch-on-chpwd)
-git-fetch-on-chpwd
-unset git-fetch-on-chpwd
+eval "original-$(declare -f zle-line-init)"
+
+function zle-line-init () {
+  git-fetch-all
+  original-zle-line-init
+}
+zle -N zle-line-init
+
+# chpwd_functions+=(git-fetch-on-chpwd)
+# git-fetch-on-chpwd
+unset git-auto-fetch
+unset original-zle-line-init
-- 
cgit v1.2.3-70-g09d2


From 41ad705f93bfb1cd75e4c69d1cc936107556b827 Mon Sep 17 00:00:00 2001
From: slavaGanzin <slava.ganzin@gmail.com>
Date: Thu, 27 Oct 2016 00:03:31 +0300
Subject: cut comments

---
 plugins/git-auto-fetch/git-auto-fetch.plugin.zsh | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'plugins')

diff --git a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
index e9946ef3f..7dbd63fe1 100644
--- a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
+++ b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
@@ -25,8 +25,3 @@ function zle-line-init () {
   original-zle-line-init
 }
 zle -N zle-line-init
-
-# chpwd_functions+=(git-fetch-on-chpwd)
-# git-fetch-on-chpwd
-unset git-auto-fetch
-unset original-zle-line-init
-- 
cgit v1.2.3-70-g09d2


From d47a7221924b4fa0b1859913d505f50a6c276da1 Mon Sep 17 00:00:00 2001
From: Marco De Bortoli <marco.debortoli@just-eat.com>
Date: Tue, 1 Nov 2016 15:49:50 +1100
Subject: PHP suffix alias should be removed

PHP can be executed as CLI script but due to the automated attempt
to add browser support to that extension such ability is prevented
in certain circumstances.
---
 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 128db6e5f..0908c8a38 100644
--- a/plugins/common-aliases/common-aliases.plugin.zsh
+++ b/plugins/common-aliases/common-aliases.plugin.zsh
@@ -54,7 +54,7 @@ alias mv='mv -i'
 # depends on the SUFFIX :)
 if is-at-least 4.2.0; then
   # open browser on urls
-  _browser_fts=(htm html de org net com at cx nl se dk dk php)
+  _browser_fts=(htm html de org net com at cx nl se dk dk)
   for ft in $_browser_fts ; do alias -s $ft=$BROWSER ; done
 
   _editor_fts=(cpp cxx cc c hh h inl asc txt TXT tex)
-- 
cgit v1.2.3-70-g09d2


From fc4e0cd7ba47bc87fe707f2bac8edb3461cfdd36 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Wed, 2 Nov 2016 11:02:58 +0100
Subject: common-aliases: check if $BROWSER is defined on browser aliases

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

(limited to 'plugins')

diff --git a/plugins/common-aliases/common-aliases.plugin.zsh b/plugins/common-aliases/common-aliases.plugin.zsh
index 0908c8a38..e888ff076 100644
--- a/plugins/common-aliases/common-aliases.plugin.zsh
+++ b/plugins/common-aliases/common-aliases.plugin.zsh
@@ -54,8 +54,10 @@ alias mv='mv -i'
 # depends on the SUFFIX :)
 if is-at-least 4.2.0; then
   # open browser on urls
-  _browser_fts=(htm html de org net com at cx nl se dk dk)
-  for ft in $_browser_fts ; do alias -s $ft=$BROWSER ; done
+  if [[ -n "$BROWSER" ]]; then
+    _browser_fts=(htm html de org net com at cx nl se dk dk)
+    for ft in $_browser_fts ; do alias -s $ft=$BROWSER ; done
+  fi
 
   _editor_fts=(cpp cxx cc c hh h inl asc txt TXT tex)
   for ft in $_editor_fts ; do alias -s $ft=$EDITOR ; done
-- 
cgit v1.2.3-70-g09d2


From cb26c2f6145ab36a2bb3b3d5392959cf741f2608 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Wed, 2 Nov 2016 11:03:47 +0100
Subject: common-aliases: minor style fixes

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

(limited to 'plugins')

diff --git a/plugins/common-aliases/common-aliases.plugin.zsh b/plugins/common-aliases/common-aliases.plugin.zsh
index e888ff076..d47b20e40 100644
--- a/plugins/common-aliases/common-aliases.plugin.zsh
+++ b/plugins/common-aliases/common-aliases.plugin.zsh
@@ -56,17 +56,17 @@ if is-at-least 4.2.0; then
   # open browser on urls
   if [[ -n "$BROWSER" ]]; then
     _browser_fts=(htm html de org net com at cx nl se dk dk)
-    for ft in $_browser_fts ; do alias -s $ft=$BROWSER ; done
+    for ft in $_browser_fts; do alias -s $ft=$BROWSER; done
   fi
 
   _editor_fts=(cpp cxx cc c hh h inl asc txt TXT tex)
-  for ft in $_editor_fts ; do alias -s $ft=$EDITOR ; done
+  for ft in $_editor_fts; do alias -s $ft=$EDITOR; done
 
   _image_fts=(jpg jpeg png gif mng tiff tif xpm)
-  for ft in $_image_fts ; do alias -s $ft=$XIVIEWER; done
+  for ft in $_image_fts; do alias -s $ft=$XIVIEWER; done
 
   _media_fts=(ape avi flv m4a mkv mov mp3 mpeg mpg ogg ogm rm wav webm)
-  for ft in $_media_fts ; do alias -s $ft=mplayer ; done
+  for ft in $_media_fts; do alias -s $ft=mplayer; done
 
   #read documents
   alias -s pdf=acroread
-- 
cgit v1.2.3-70-g09d2


From 0f62b7a8d8708910e75fedb9d7b8e3d8559a34da Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Wed, 2 Nov 2016 11:17:58 +0100
Subject: common-aliases: check if `$XIVIEWER` is defined and minor fixes

---
 plugins/common-aliases/common-aliases.plugin.zsh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'plugins')

diff --git a/plugins/common-aliases/common-aliases.plugin.zsh b/plugins/common-aliases/common-aliases.plugin.zsh
index d47b20e40..742798f27 100644
--- a/plugins/common-aliases/common-aliases.plugin.zsh
+++ b/plugins/common-aliases/common-aliases.plugin.zsh
@@ -55,15 +55,17 @@ alias mv='mv -i'
 if is-at-least 4.2.0; then
   # open browser on urls
   if [[ -n "$BROWSER" ]]; then
-    _browser_fts=(htm html de org net com at cx nl se dk dk)
+    _browser_fts=(htm html de org net com at cx nl se dk)
     for ft in $_browser_fts; do alias -s $ft=$BROWSER; done
   fi
 
   _editor_fts=(cpp cxx cc c hh h inl asc txt TXT tex)
   for ft in $_editor_fts; do alias -s $ft=$EDITOR; done
 
-  _image_fts=(jpg jpeg png gif mng tiff tif xpm)
-  for ft in $_image_fts; do alias -s $ft=$XIVIEWER; done
+  if [[ -n "$XIVIEWER" ]]; then
+    _image_fts=(jpg jpeg png gif mng tiff tif xpm)
+    for ft in $_image_fts; do alias -s $ft=$XIVIEWER; done
+  fi
 
   _media_fts=(ape avi flv m4a mkv mov mp3 mpeg mpg ogg ogm rm wav webm)
   for ft in $_media_fts; do alias -s $ft=mplayer; done
@@ -85,4 +87,3 @@ fi
 
 # Make zsh know about hosts already accessed by SSH
 zstyle -e ':completion:*:(ssh|scp|sftp|rsh|rsync):hosts' hosts 'reply=(${=${${(f)"$(cat {/etc/ssh_,~/.ssh/known_}hosts(|2)(N) /dev/null)"}%%[# ]*}//,/ })'
-
-- 
cgit v1.2.3-70-g09d2


From 73591101b6db1e67ad3a0c2f90c81bc8174f4056 Mon Sep 17 00:00:00 2001
From: psprint <sgniazdowski@gmail.com>
Date: Wed, 2 Nov 2016 13:08:58 +0100
Subject: znt: Update to v2.2.7 (#5576)

---
 plugins/zsh-navigation-tools/NEWS                  | 17 +++++++
 plugins/zsh-navigation-tools/README.md             | 54 ++++++++++++++++++++++
 plugins/zsh-navigation-tools/n-history             | 32 +++++++++----
 plugins/zsh-navigation-tools/n-list                |  3 +-
 plugins/zsh-navigation-tools/znt-tmux.zsh          | 50 ++++++++++++++++++++
 .../zsh-navigation-tools.plugin.zsh                | 35 ++++++++------
 6 files changed, 167 insertions(+), 24 deletions(-)
 create mode 100644 plugins/zsh-navigation-tools/NEWS
 create mode 100755 plugins/zsh-navigation-tools/znt-tmux.zsh

(limited to 'plugins')

diff --git a/plugins/zsh-navigation-tools/NEWS b/plugins/zsh-navigation-tools/NEWS
new file mode 100644
index 000000000..acd9f2ebc
--- /dev/null
+++ b/plugins/zsh-navigation-tools/NEWS
@@ -0,0 +1,17 @@
+-------------------------------------
+CHANGES FROM PREVIOUS VERSIONS OF ZNT
+-------------------------------------
+
+Changes from 2.2.1 to 2.2.7
+---------------------------
+
+Tmux integration has been added – bind file znt-tmux.zsh in Tmux as
+described in README.md and e.g. run local history on remote hosts. Tmux
+opens new window with n-history, and pastes selected history entry into
+immediate previous window (e.g. a remote session). Fixed plugin.zsh file
+to not use (outer scope) positional parameters. This fixes problem with
+Grlm's Zsh configuration. The file now doesn't use "test" builtin (but
+[[ instead), because it can be shadowed by alias or command. Private
+history has been fixed to not overwrite its history file with the same
+content. This improves performance when switching to private history
+view.
diff --git a/plugins/zsh-navigation-tools/README.md b/plugins/zsh-navigation-tools/README.md
index 7a679fe67..ed532a161 100644
--- a/plugins/zsh-navigation-tools/README.md
+++ b/plugins/zsh-navigation-tools/README.md
@@ -34,6 +34,60 @@ want to copy your previous data (from e.g. ~/.zhistory) into the new location.
 
 ## News
 
+* 06-10-2016
+  - Tmux-integration – Ctrl-b-h in Tmux to open n-history in new window.
+    Then select history entry, it will be copied to the original Tmux window.
+    Use this to execute local commands on remote hosts. All that is needed is
+    this line added to ~/.tmux.conf:
+
+    bind h run-shell -b "$ZNT_REPO_DIR/znt-tmux.zsh"
+
+* 16-05-2016
+  - n-kill has completion. It proposes *words* from what's in `ps -A`. Giving n-kill
+    arguments means grepping – it will start only with matching `ps` entries.
+
+* 15-05-2016
+  - Fixed problem where zsh-syntax-highlighting could render n-history slow (for
+    long history entries).
+
+* 14-05-2016
+  - Configuration can be set from zshrc. Example:
+
+    znt_list_instant_select=1
+    znt_list_border=0
+    znt_list_bold=1
+    znt_list_colorpair="green/black"
+    znt_functions_keywords=( "zplg" "zgen" "match" )
+    znt_cd_active_text="underline"
+    znt_env_nlist_coloring_color=$'\x1b[00;33m'
+    znt_cd_hotlist=( "~/.config/znt" "/usr/share/zsh/site-functions" "/usr/share/zsh"
+                     "/usr/local/share/zsh/site-functions" "/usr/local/share/zsh"
+                     "/usr/local/bin" )
+
+* 10-05-2016
+  - Search query rotation – use Ctrl-A to rotate entered words right.
+    Words `1 2 3` become `3 1 2`.
+
+* 09-05-2016
+  - New feature: n-help tool, available also from n-history via H key. It
+    displays help screen with various information on ZNT.
+
+* 08-05-2016
+  - Approximate matching – pressing f or Ctrl-F will enter FIX mode, in
+    which 1 or 2 errors are allowed in what is searched. This utilizes
+    original Zsh approximate matching features and is intended to be used
+    after entering search query, when a typo is discovered.
+
+* 06-05-2016
+  - Private history can be edited. Use e key or Ctrl-E for that when in
+    n-history. Your $EDITOR will start. This is a way to have handy set
+    of bookmarks prepared in private history's file.
+  - Border can be disabled. Use following snippet in ~/.config/znt/n-list.conf
+    or any other tool-targetted config file:
+
+    # Should draw the border?
+    local border=0
+
 * 30-04-2016
   - New feature: color themes. Use Ctrl-T and Ctrl-G to browse predefined
     themes. They are listed in ~/.config/znt/n-list.conf. Use the file to
diff --git a/plugins/zsh-navigation-tools/n-history b/plugins/zsh-navigation-tools/n-history
index af475dcb8..b425ecd10 100644
--- a/plugins/zsh-navigation-tools/n-history
+++ b/plugins/zsh-navigation-tools/n-history
@@ -307,7 +307,7 @@ while (( 1 )); do
     elif [ "$active_view" = "1" ]; then
         if [ -s "$private_history_db" ]; then
             local title=$'\x1b[00;32m'"Private history:"$'\x1b[00;00m\0'
-            () { fc -ap -R "$private_history_db"; list=( "$title" ${history[@]} ) }
+            () { fc -Rap "$private_history_db" 20000 0; list=( "$title" ${history[@]} ) }
         else
             list=( "Private history - history entries selected via this tool will be put here" )
         fi
@@ -335,21 +335,37 @@ done
 
 if [ "$REPLY" -gt 0 ]; then
     selected="$reply[REPLY]"
+
+    # Append to private history
+    if [[ "$active_view" = "0" ]]; then
+        local newline=$'\n'
+        local selected_ph="${selected//$newline/\\$newline}"
+        print -r -- "$selected_ph" >> "$private_history_db"
+    fi
+
+    # TMUX?
+    if [[ "$ZNT_TMUX_MODE" = "1" ]]; then
+        tmux send -t "$ZNT_TMUX_ORIGIN_SESSION:$ZNT_TMUX_ORIGIN_WINDOW.$ZNT_TMUX_ORIGIN_PANE" "$selected"
+        tmux kill-window
+        return 0
     # ZLE?
-    if [ "${(t)CURSOR}" = "integer-local-special" ]; then
+    elif [ "${(t)CURSOR}" = "integer-local-special" ]; then
         zle .redisplay
         zle .kill-buffer
         LBUFFER+="$selected"
-
-        # Append to private history
-        local newline=$'\n'
-        selected="${selected//$newline/\\$newline}"
-        [ "$active_view" = "0" ] && print -r -- "$selected" >> "$private_history_db"
     else
         print -zr -- "$selected"
     fi
 else
-    [ "${(t)CURSOR}" = "integer-local-special" ] && zle redisplay
+    # TMUX?
+    if [[ "$ZNT_TMUX_MODE" = "1" ]]; then
+        tmux kill-window
+    # ZLE?
+    elif [[ "${(t)CURSOR}" = "integer-local-special" ]]; then
+        zle redisplay
+    fi
 fi
 
+return 0
+
 # vim: set filetype=zsh:
diff --git a/plugins/zsh-navigation-tools/n-list b/plugins/zsh-navigation-tools/n-list
index f3d2e5b3e..3fe5542a6 100644
--- a/plugins/zsh-navigation-tools/n-list
+++ b/plugins/zsh-navigation-tools/n-list
@@ -310,8 +310,9 @@ while (( 1 )); do
                         colsearch_pattern="${search_buffer// ##/|(#a2)}"
                         list=( "${(@M)list:#(#ia2)*$~search_pattern*}" )
                     else
-                        # Patterns will be *foo*~^*bar* and (foo|bar)
+                        # Pattern will be *foo*~^*bar* (inventor: Mikael Magnusson)
                         search_pattern="${search_buffer// ##/*~^*}"
+                        # Pattern will be (foo|bar)
                         colsearch_pattern="${search_buffer// ##/|}"
                         list=( "${(@M)list:#(#i)*$~search_pattern*}" )
                     fi
diff --git a/plugins/zsh-navigation-tools/znt-tmux.zsh b/plugins/zsh-navigation-tools/znt-tmux.zsh
new file mode 100755
index 000000000..6a96e97a1
--- /dev/null
+++ b/plugins/zsh-navigation-tools/znt-tmux.zsh
@@ -0,0 +1,50 @@
+#!/usr/bin/env zsh
+
+# Copyright (c) 2016, Zsolt Lengyel
+# Modifications copyright (c) 2016, Sebastian Gniazdowski
+
+#
+# This script opens a new, temporary tmux pane and runs n-history. When
+# a selection is made, the result (history entry) is pasted back into
+# original tmux pane, and the temporary pane is closed. This allows to
+# use local history on remote machines.
+#
+# To use, put this line to your ~/.tmux.conf. The tool is invoked with:
+# Ctrl+b h
+#
+# bind h run-shell -b "$ZNT_REPO_DIR/znt-tmux.zsh"
+#
+
+# get and save the current active tmux pane id
+active_pane=$(tmux display -p -F ':#{session_id}:#I:#P:#{pane_active}:#{window_active}:#{session_attached}' )
+a_active_pane=("${(@s/:/)active_pane}")
+
+active_session=${a_active_pane[2]//$}
+active_window=$a_active_pane[3]
+active_pane=$a_active_pane[4]
+
+# set variables for upcoming window
+tmux setenv -t $active_session:$active_window.$active_pane "ZNT_TMUX_MODE" 1
+tmux setenv -t $active_session:$active_window.$active_pane "ZNT_TMUX_ORIGIN_SESSION" "$active_session"
+tmux setenv -t $active_session:$active_window.$active_pane "ZNT_TMUX_ORIGIN_WINDOW" "$active_window"
+tmux setenv -t $active_session:$active_window.$active_pane "ZNT_TMUX_ORIGIN_PANE" "$active_pane"
+
+# create a new window in the active session and call it znt-hist
+tmux new-window -t $active_session: -n znt-hist
+
+# unset the variables, so only above single window has them
+tmux setenv -u -t $active_session:$active_window.$active_pane "ZNT_TMUX_MODE"
+tmux setenv -u -t $active_session:$active_window.$active_pane "ZNT_TMUX_ORIGIN_SESSION"
+tmux setenv -u -t $active_session:$active_window.$active_pane "ZNT_TMUX_ORIGIN_WINDOW"
+tmux setenv -u -t $active_session:$active_window.$active_pane "ZNT_TMUX_ORIGIN_PANE"
+
+# znt's session id
+znt_active_pane=$(tmux display -p -F ':#{session_id}:#I:#P:#{pane_active}:#{window_active}:#{session_attached}' )
+znt_a_active_pane=("${(@s/:/)znt_active_pane}")
+
+znt_active_session=${znt_a_active_pane[2]//$}
+znt_active_window=$znt_a_active_pane[3]
+znt_active_pane=$znt_a_active_pane[4]
+
+# call znt
+tmux send -t "$znt_active_session:$znt_active_window.$znt_active_pane" n-history ENTER
diff --git a/plugins/zsh-navigation-tools/zsh-navigation-tools.plugin.zsh b/plugins/zsh-navigation-tools/zsh-navigation-tools.plugin.zsh
index b26549152..32b4ca064 100755
--- a/plugins/zsh-navigation-tools/zsh-navigation-tools.plugin.zsh
+++ b/plugins/zsh-navigation-tools/zsh-navigation-tools.plugin.zsh
@@ -1,38 +1,43 @@
 #!/usr/bin/env zsh
 
-REPO_DIR="${0%/*}"
-CONFIG_DIR="$HOME/.config/znt"
+0="${(%):-%N}" # this gives immunity to functionargzero being unset
+export ZNT_REPO_DIR="${0%/*}"
+export ZNT_CONFIG_DIR="$HOME/.config/znt"
 
 #
 # Copy configs
 #
 
-if ! test -d "$HOME/.config"; then
-    mkdir "$HOME/.config"
+if [[ ! -d "$HOME/.config" ]]; then
+    command mkdir "$HOME/.config"
 fi
 
-if ! test -d "$CONFIG_DIR"; then
-    mkdir "$CONFIG_DIR"
+if [[ ! -d "$ZNT_CONFIG_DIR" ]]; then
+    command mkdir "$ZNT_CONFIG_DIR"
 fi
 
 # 9 files
-set n-aliases.conf n-env.conf n-history.conf n-list.conf n-panelize.conf n-cd.conf n-functions.conf n-kill.conf n-options.conf
+unset __ZNT_CONFIG_FILES
+typeset -ga __ZNT_CONFIG_FILES
+set +A __ZNT_CONFIG_FILES n-aliases.conf n-env.conf n-history.conf n-list.conf n-panelize.conf n-cd.conf n-functions.conf n-kill.conf n-options.conf
 
 # Check for random 2 files if they exist
 # This will shift 0 - 7 elements
-shift $(( RANDOM % 8 ))
-if ! test -f "$CONFIG_DIR/$1" || ! test -f "$CONFIG_DIR/$2"; then
+shift $(( RANDOM % 8 )) __ZNT_CONFIG_FILES
+if [[ ! -f "$ZNT_CONFIG_DIR/${__ZNT_CONFIG_FILES[1]}" || ! -f "$ZNT_CONFIG_DIR/${__ZNT_CONFIG_FILES[2]}" ]]; then
     # Something changed - examine every file
-    set n-aliases.conf n-env.conf n-history.conf n-list.conf n-panelize.conf n-cd.conf n-functions.conf n-kill.conf n-options.conf
-    for i; do
-        if ! test -f "$CONFIG_DIR/$i"; then
-            cp "$REPO_DIR/.config/znt/$i" "$CONFIG_DIR"
+    set +A __ZNT_CONFIG_FILES n-aliases.conf n-env.conf n-history.conf n-list.conf n-panelize.conf n-cd.conf n-functions.conf n-kill.conf n-options.conf
+    unset __ZNT_CONFIG_FILE
+    typeset -g __ZNT_CONFIG_FILE
+    for __ZNT_CONFIG_FILE in "${__ZNT_CONFIG_FILES[@]}"; do
+        if [[ ! -f "$ZNT_CONFIG_DIR/$__ZNT_CONFIG_FILE" ]]; then
+            command cp "$ZNT_REPO_DIR/.config/znt/$__ZNT_CONFIG_FILE" "$ZNT_CONFIG_DIR"
         fi
     done
+    unset __ZNT_CONFIG_FILE
 fi
 
-# Don't leave positional parameters being set
-set --
+unset __ZNT_CONFIG_FILES
 
 #
 # Load functions
-- 
cgit v1.2.3-70-g09d2


From cf37697920019c44245ba3e5b69fed68c8c3fff4 Mon Sep 17 00:00:00 2001
From: Sachin George Thomas <sachq@users.noreply.github.com>
Date: Wed, 2 Nov 2016 20:22:14 +0530
Subject: node: open module-specific node documentation (#5572)

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

(limited to 'plugins')

diff --git a/plugins/node/node.plugin.zsh b/plugins/node/node.plugin.zsh
index 2463815ac..e2f18a032 100644
--- a/plugins/node/node.plugin.zsh
+++ b/plugins/node/node.plugin.zsh
@@ -1,5 +1,6 @@
 # Open the node api for your current version to the optional section.
 # TODO: Make the section part easier to use.
 function node-docs {
-  open_command "http://nodejs.org/docs/$(node --version)/api/all.html#all_$1"
+  local section=${1:-all}
+  open_command "http://nodejs.org/docs/$(node --version)/api/$section.html"
 }
-- 
cgit v1.2.3-70-g09d2


From 6685aac42cf1feb0c686ef84516c97e1113678a7 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Thu, 10 Nov 2016 19:46:15 +0100
Subject: dircycle: fix error on insert-cycledleft if dirstack is empty

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

(limited to 'plugins')

diff --git a/plugins/dircycle/dircycle.plugin.zsh b/plugins/dircycle/dircycle.plugin.zsh
index 2f32277cf..8c58cab4c 100644
--- a/plugins/dircycle/dircycle.plugin.zsh
+++ b/plugins/dircycle/dircycle.plugin.zsh
@@ -9,6 +9,8 @@
 #  pushd -N: start counting from right of `dirs' output
 
 switch-to-dir () {
+	[[ ${#dirstack} -eq 0 ]] && return
+
 	while ! builtin pushd -q $1 &>/dev/null; do
 		# We found a missing directory: pop it out of the dir stack
 		builtin popd -q $1
-- 
cgit v1.2.3-70-g09d2


From fe96d194210854e2dc170a226b166253091f2fc0 Mon Sep 17 00:00:00 2001
From: hjpotter92 <hjpotter92@users.noreply.github.com>
Date: Fri, 11 Nov 2016 07:47:43 +0530
Subject: Update endpoint from HTTP to HTTPS (#5622)

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

(limited to 'plugins')

diff --git a/plugins/node/node.plugin.zsh b/plugins/node/node.plugin.zsh
index e2f18a032..e196662c7 100644
--- a/plugins/node/node.plugin.zsh
+++ b/plugins/node/node.plugin.zsh
@@ -2,5 +2,5 @@
 # TODO: Make the section part easier to use.
 function node-docs {
   local section=${1:-all}
-  open_command "http://nodejs.org/docs/$(node --version)/api/$section.html"
+  open_command "https://nodejs.org/docs/$(node --version)/api/$section.html"
 }
-- 
cgit v1.2.3-70-g09d2


From 62b0abdb6e4bedc0c28f97176bd76f74859d82ea Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Fri, 11 Nov 2016 15:20:11 +0100
Subject: brew: fix disclaimer shown if mkdir is aliased

Fixes #5623.
---
 plugins/brew/brew.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/brew/brew.plugin.zsh b/plugins/brew/brew.plugin.zsh
index d4289c98e..6fb7f3453 100644
--- a/plugins/brew/brew.plugin.zsh
+++ b/plugins/brew/brew.plugin.zsh
@@ -3,7 +3,7 @@ alias bubo='brew update && brew outdated'
 alias bubc='brew upgrade && brew cleanup'
 alias bubu='bubo && bubc'
 
-if mkdir "$ZSH_CACHE_DIR/.brew-completion-message" 2>/dev/null; then
+if command mkdir "$ZSH_CACHE_DIR/.brew-completion-message" 2>/dev/null; then
 	print -P '%F{yellow}'Oh My Zsh brew plugin:
 	cat <<-'EOF'
 
-- 
cgit v1.2.3-70-g09d2


From 3477ff25274fa75bd9e6110f391f6ad98ca2af72 Mon Sep 17 00:00:00 2001
From: Jason Kurian <JaKXz@users.noreply.github.com>
Date: Wed, 16 Nov 2016 04:42:46 -0500
Subject: feat: no CI on WIP commits (#5643)

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

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 178f1deb2..9d8e4174a 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -237,4 +237,4 @@ alias gupv='git pull --rebase -v'
 alias glum='git pull upstream master'
 
 alias gwch='git whatchanged -p --abbrev-commit --pretty=medium'
-alias gwip='git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify -m "--wip--"'
+alias gwip='git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify -m "--wip-- [skip ci]"'
-- 
cgit v1.2.3-70-g09d2


From 41e65c0872fc29a604aea007aeba011334a6ac4c Mon Sep 17 00:00:00 2001
From: slavaGanzin <slava.ganzin@gmail.com>
Date: Thu, 17 Nov 2016 15:30:27 +0200
Subject: remove trash

---
 $                               | 0
 disabled                        | 0
 echo                            | 0
 plugins/zsh-syntax-highlighting | 1 -
 4 files changed, 1 deletion(-)
 delete mode 100644 $
 delete mode 100644 disabled
 delete mode 100644 echo
 delete mode 160000 plugins/zsh-syntax-highlighting

(limited to 'plugins')

diff --git a/$ b/$
deleted file mode 100644
index e69de29bb..000000000
diff --git a/disabled b/disabled
deleted file mode 100644
index e69de29bb..000000000
diff --git a/echo b/echo
deleted file mode 100644
index e69de29bb..000000000
diff --git a/plugins/zsh-syntax-highlighting b/plugins/zsh-syntax-highlighting
deleted file mode 160000
index 094329eb1..000000000
--- a/plugins/zsh-syntax-highlighting
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 094329eb145e00b810e65415ed4b9ad58aa7c34a
-- 
cgit v1.2.3-70-g09d2


From a90527b46d67e70f92258849b265b6bfd5e910e0 Mon Sep 17 00:00:00 2001
From: slavaGanzin <slava.ganzin@gmail.com>
Date: Thu, 17 Nov 2016 15:51:40 +0200
Subject: fix FETCH_LOG bug

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

(limited to 'plugins')

diff --git a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
index 7dbd63fe1..03fa911e7 100644
--- a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
+++ b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
@@ -4,7 +4,7 @@ function git-fetch-all {
   (`git rev-parse --is-inside-work-tree 2>/dev/null` &&
   dir=`git rev-parse --git-dir` &&
   [[ ! -f $dir/NO_AUTO_FETCH ]] &&
-  (( `date +%s` - `date -r $dir/FETCH_LOG +%s` > $GIT_AUTO_FETCH_INTERVAL )) &&
+  (( `date +%s` - `date -r $dir/FETCH_LOG +%s 2>/dev/null || echo 0` > $GIT_AUTO_FETCH_INTERVAL )) &&
   git fetch --all &>! $dir/FETCH_LOG &)
 }
 
-- 
cgit v1.2.3-70-g09d2


From 9d43dc88bbc313921661c8b699e78550a2d86708 Mon Sep 17 00:00:00 2001
From: Eduardo Bizarro <edbizarro@gmail.com>
Date: Wed, 23 Nov 2016 15:50:14 -0200
Subject: Yarn (https://yarnpkg.com) completion support (#5542)

* yarn completion
---
 plugins/yarn/yarn.plugin.zsh | 81 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)
 create mode 100644 plugins/yarn/yarn.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/yarn/yarn.plugin.zsh b/plugins/yarn/yarn.plugin.zsh
new file mode 100644
index 000000000..47c503acb
--- /dev/null
+++ b/plugins/yarn/yarn.plugin.zsh
@@ -0,0 +1,81 @@
+alias yi="yarn install"
+
+_yarn ()
+{
+    local -a _1st_arguments _dopts _dev _production
+    local expl
+    typeset -A opt_args
+
+    _dopts=(
+        '(--force)--force[This refetches all packages, even ones that were previously installed.]'
+    )
+
+    _installopts=(
+        '(--flat)--flat[Only allow one version of a package. On the first run this will prompt you to choose a single version for each package that is depended on at multiple version ranges.]'
+        '(--har)--har[Outputs an HTTP archive from all the network requests performed during the installation.]'
+        '(--no-lockfile)--no-lockfile[Don’t read or generate a yarn.lock lockfile.]'
+        '(--pure-lockfile)--pure-lockfile[Don’t generate a yarn.lock lockfile.]'
+    )
+
+    _dev=('(--dev)--dev[Save installed packages into the project"s package.json devDependencies]')
+
+    _production=('(--production)--production[Do not install project devDependencies]')
+
+    _1st_arguments=(
+      'help:Display help information about yarn' \
+      'init:Initialize for the development of a package.' \
+      'add:Add a package to use in your current package.' \
+      'install:Install all the dependencies listed within package.json in the local node_modules folder.' \
+      'publish:Publish a package to a package manager.' \
+      'remove:Remove a package that will no longer be used in your current package.' \
+      'cache:Clear the local cache. It will be populated again the next time yarn or yarn install is run.' \
+      'clean:Frees up space by removing unnecessary files and folders from dependencies.' \
+      'check:Verifies that versions of the package dependencies in the current project’s package.json matches that of yarn’s lock file.' \
+      'ls:List all installed packages.' \
+      'global:Makes binaries available to use on your operating system.' \
+      'info:<package> [<field>] - fetch information about a package and return it in a tree format.' \
+      'outdated:Checks for outdated package dependencies.' \
+      'run:Runs a defined package script.' \
+      'self-update:Updates Yarn to the latest version.' \
+      'upgrade:Upgrades packages to their latest version based on the specified range.' \
+      'why:<query> - Show information about why a package is installed.'
+    )
+    _arguments \
+    '*:: :->subcmds' && return 0
+
+    if (( CURRENT == 1 )); then
+        _describe -t commands "yarn subcommand" _1st_arguments
+        return
+    fi
+
+    case "$words[1]" in
+        add)
+        _arguments \
+        $_dopts \
+        $_dev \
+        $_production
+        ;;
+        install)
+        _arguments \
+        $_installopts \
+        $_dopts \
+        $_dev \
+        $_no_color \
+        $_production
+        ;;
+        update)
+        _arguments \
+        $_dopts
+        ;;
+        remove)
+        _arguments \
+        $_dopts
+        ;;
+        *)
+        _arguments \
+        ;;
+    esac
+
+}
+
+compdef _yarn yarn
-- 
cgit v1.2.3-70-g09d2


From 037764acc366bae0dc0f01c221c7a23ef04d3c83 Mon Sep 17 00:00:00 2001
From: Thomas Paul Mann <hi@thomaspaulmann.com>
Date: Mon, 28 Nov 2016 21:08:34 +0100
Subject: Add plugin for Swift Package Manager (#5670)

* Add plugin for Swift Package Manager
* swift-package-manager: Rename plugin to 'swift-pm'
---
 plugins/swift-pm/README.md           | 22 ++++++++++++++++++++++
 plugins/swift-pm/swift-pm.plugin.zsh |  8 ++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 plugins/swift-pm/README.md
 create mode 100644 plugins/swift-pm/swift-pm.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/swift-pm/README.md b/plugins/swift-pm/README.md
new file mode 100644
index 000000000..8e6a0d5c4
--- /dev/null
+++ b/plugins/swift-pm/README.md
@@ -0,0 +1,22 @@
+# Swift Package Manager
+
+## Description
+
+This plugin provides a few utilities that make you faster on your daily work with the [Swift Package Manager](https://github.com/apple/swift-package-manager).
+
+To start using it, add the `swift-pm` plugin to your `plugins` array in `~/.zshrc`:
+
+```zsh
+plugins=(... swift-pm)
+```
+
+## Aliases
+
+| Alias | Description                         | Command                            |
+|-------|-------------------------------------|------------------------------------|
+| `spi` | Initialize a new package            | `swift package init`               |
+| `spf` | Fetch package dependencies          | `swift package fetch`              |
+| `spu` | Update package dependencies         | `swift package update`             |
+| `spx` | Generates an Xcode project          | `swift package generate-xcodeproj` |
+| `sps` | Print the resolved dependency graph | `swift package show-dependencies`  |
+| `spd` | Print parsed Package.swift as JSON  | `swift package dump-package`       |
diff --git a/plugins/swift-pm/swift-pm.plugin.zsh b/plugins/swift-pm/swift-pm.plugin.zsh
new file mode 100644
index 000000000..ef872ea34
--- /dev/null
+++ b/plugins/swift-pm/swift-pm.plugin.zsh
@@ -0,0 +1,8 @@
+# Some aliases to make your life with the Swift Package Manager faster ✌️
+
+alias spi='swift package init'
+alias spf='swift package fetch'
+alias spu='swift package update'
+alias spx='swift package generate-xcodeproj'
+alias sps='swift package show-dependencies'
+alias spd='swift package dump-package'
-- 
cgit v1.2.3-70-g09d2


From 6ee6a734c24b8f2cda43f230142f0f02cfb52fb3 Mon Sep 17 00:00:00 2001
From: Thomas Paul Mann <hi@thomaspaulmann.com>
Date: Wed, 30 Nov 2016 00:20:43 +0100
Subject: swift-pm: Rename plugin to 'swiftpm' (#5674)

---
 plugins/swift-pm/README.md           | 22 ----------------------
 plugins/swift-pm/swift-pm.plugin.zsh |  8 --------
 plugins/swiftpm/README.md            | 22 ++++++++++++++++++++++
 plugins/swiftpm/swiftpm.plugin.zsh   |  8 ++++++++
 4 files changed, 30 insertions(+), 30 deletions(-)
 delete mode 100644 plugins/swift-pm/README.md
 delete mode 100644 plugins/swift-pm/swift-pm.plugin.zsh
 create mode 100644 plugins/swiftpm/README.md
 create mode 100644 plugins/swiftpm/swiftpm.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/swift-pm/README.md b/plugins/swift-pm/README.md
deleted file mode 100644
index 8e6a0d5c4..000000000
--- a/plugins/swift-pm/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# Swift Package Manager
-
-## Description
-
-This plugin provides a few utilities that make you faster on your daily work with the [Swift Package Manager](https://github.com/apple/swift-package-manager).
-
-To start using it, add the `swift-pm` plugin to your `plugins` array in `~/.zshrc`:
-
-```zsh
-plugins=(... swift-pm)
-```
-
-## Aliases
-
-| Alias | Description                         | Command                            |
-|-------|-------------------------------------|------------------------------------|
-| `spi` | Initialize a new package            | `swift package init`               |
-| `spf` | Fetch package dependencies          | `swift package fetch`              |
-| `spu` | Update package dependencies         | `swift package update`             |
-| `spx` | Generates an Xcode project          | `swift package generate-xcodeproj` |
-| `sps` | Print the resolved dependency graph | `swift package show-dependencies`  |
-| `spd` | Print parsed Package.swift as JSON  | `swift package dump-package`       |
diff --git a/plugins/swift-pm/swift-pm.plugin.zsh b/plugins/swift-pm/swift-pm.plugin.zsh
deleted file mode 100644
index ef872ea34..000000000
--- a/plugins/swift-pm/swift-pm.plugin.zsh
+++ /dev/null
@@ -1,8 +0,0 @@
-# Some aliases to make your life with the Swift Package Manager faster ✌️
-
-alias spi='swift package init'
-alias spf='swift package fetch'
-alias spu='swift package update'
-alias spx='swift package generate-xcodeproj'
-alias sps='swift package show-dependencies'
-alias spd='swift package dump-package'
diff --git a/plugins/swiftpm/README.md b/plugins/swiftpm/README.md
new file mode 100644
index 000000000..07ca25651
--- /dev/null
+++ b/plugins/swiftpm/README.md
@@ -0,0 +1,22 @@
+# Swift Package Manager
+
+## Description
+
+This plugin provides a few utilities that make you faster on your daily work with the [Swift Package Manager](https://github.com/apple/swift-package-manager).
+
+To start using it, add the `swiftpm` plugin to your `plugins` array in `~/.zshrc`:
+
+```zsh
+plugins=(... swiftpm)
+```
+
+## Aliases
+
+| Alias | Description                         | Command                            |
+|-------|-------------------------------------|------------------------------------|
+| `spi` | Initialize a new package            | `swift package init`               |
+| `spf` | Fetch package dependencies          | `swift package fetch`              |
+| `spu` | Update package dependencies         | `swift package update`             |
+| `spx` | Generates an Xcode project          | `swift package generate-xcodeproj` |
+| `sps` | Print the resolved dependency graph | `swift package show-dependencies`  |
+| `spd` | Print parsed Package.swift as JSON  | `swift package dump-package`       |
diff --git a/plugins/swiftpm/swiftpm.plugin.zsh b/plugins/swiftpm/swiftpm.plugin.zsh
new file mode 100644
index 000000000..ef872ea34
--- /dev/null
+++ b/plugins/swiftpm/swiftpm.plugin.zsh
@@ -0,0 +1,8 @@
+# Some aliases to make your life with the Swift Package Manager faster ✌️
+
+alias spi='swift package init'
+alias spf='swift package fetch'
+alias spu='swift package update'
+alias spx='swift package generate-xcodeproj'
+alias sps='swift package show-dependencies'
+alias spd='swift package dump-package'
-- 
cgit v1.2.3-70-g09d2


From 26aae6b5834e1342d9b95a894a5bb24159b367bf Mon Sep 17 00:00:00 2001
From: Rarylson Freitas <rarylson@gmail.com>
Date: Thu, 8 Dec 2016 18:49:58 -0200
Subject: Fix (plugins debian and ubuntu): `apt-history list` using `zgrep`
 (#5695)

Changing from `zcat` to `zgrep` because some `zcat` implementations do not work
if the file is not compressed.
---
 plugins/debian/debian.plugin.zsh | 2 +-
 plugins/ubuntu/ubuntu.plugin.zsh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index 31a772d60..28131ff80 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -192,7 +192,7 @@ apt-history () {
         awk '{print $4"="$5}'
       ;;
     list)
-      zcat $(ls -rt /var/log/dpkg*)
+      zgrep --no-filename '' $(ls -rt /var/log/dpkg*)
       ;;
     *)
       echo "Parameters:"
diff --git a/plugins/ubuntu/ubuntu.plugin.zsh b/plugins/ubuntu/ubuntu.plugin.zsh
index ffde284fe..030af0693 100644
--- a/plugins/ubuntu/ubuntu.plugin.zsh
+++ b/plugins/ubuntu/ubuntu.plugin.zsh
@@ -108,7 +108,7 @@ apt-history () {
         awk '{print $4"="$5}'
       ;;
     list)
-      zcat $(ls -rt /var/log/dpkg*)
+      zgrep --no-filename '' $(ls -rt /var/log/dpkg*)
       ;;
     *)
       echo "Parameters:"
-- 
cgit v1.2.3-70-g09d2


From 3b13dc07d823ebcb67ea429de305b5413e99ac1e Mon Sep 17 00:00:00 2001
From: Erik Zivkovic <erik.zivkovic@gmail.com>
Date: Wed, 14 Dec 2016 17:25:48 +0100
Subject: gradle: extract simple task names from subproject tasks (#5704)

Currently, only tasks with complete subproject specifier are added to
.gradletasknamecache. Gradle commands can be called for all (sub-)projects
they are defined for, using their name as defined in the subproject, here
called "simple" task names. One example is "gradle clean".

This patch adds support for parsing out those "simple" task names from the list
of fully specified task names. The .gradletasknamecache file will contain
both the fully specified names, and the "simple" names for your autocompletion
pleasure.
---
 plugins/gradle/gradle.plugin.zsh | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

(limited to 'plugins')

diff --git a/plugins/gradle/gradle.plugin.zsh b/plugins/gradle/gradle.plugin.zsh
index b2015a351..65b9d4685 100644
--- a/plugins/gradle/gradle.plugin.zsh
+++ b/plugins/gradle/gradle.plugin.zsh
@@ -61,7 +61,7 @@ _gradle_does_task_list_need_generating () {
 }
 
 ##############
-# Parse the tasks from `gradle(w) tasks --all` into .gradletasknamecache
+# Parse the tasks from `gradle(w) tasks --all` and return them to the calling function.
 # All lines in the output from gradle(w) that are between /^-+$/ and /^\s*$/
 # are considered to be tasks. If and when gradle adds support for listing tasks
 # for programmatic parsing, this method can be deprecated.
@@ -76,7 +76,7 @@ _gradle_parse_tasks () {
       task_name_buffer=""
     elif [[ $line =~ ^\s*$ ]]; then
       if [[ "$lines_might_be_tasks" = true ]]; then
-        # If a newline is found, send the buffer to .gradletasknamecache
+        # If a newline is found, echo the buffer to the calling function
         while read -r task; do
           echo $task | awk '/[a-zA-Z0-9:-]+/ {print $1}'
         done <<< "$task_name_buffer"
@@ -90,6 +90,25 @@ _gradle_parse_tasks () {
   done <<< "$1"
 }
 
+
+##############
+# Gradle tasks from subprojects are allowed to be executed without specifying
+# the subproject; that task will then be called on all subprojects.
+# gradle(w) tasks --all only lists tasks per subproject, but when autocompleting
+# we often want to be able to run a specific task on all subprojects, e.g.
+# "gradle clean".
+# This function uses the list of tasks from "gradle tasks --all", and for each
+# line grabs everything after the last ":" and combines that output with the original
+# output. The combined list is returned as the result of this function.
+##############
+_gradle_parse_and_extract_tasks () {
+  # All tasks
+  tasks=$(_gradle_parse_tasks "$1")
+  # Task name without sub project(s) prefix
+  simple_tasks=$(echo $tasks | awk 'BEGIN { FS = ":" } { print $NF }')
+  echo "$tasks\n$simple_tasks"
+}
+
 ##############################################################################
 # Discover the gradle tasks by running "gradle tasks --all"
 ############################################################################
@@ -97,7 +116,7 @@ _gradle_tasks () {
   if [[ -f build.gradle ]]; then
     _gradle_arguments
     if _gradle_does_task_list_need_generating; then
-      _gradle_parse_tasks "$(gradle tasks --all)" > .gradletasknamecache
+      _gradle_parse_and_extract_tasks "$(gradle tasks --all)" > .gradletasknamecache
     fi
     compadd -X "==== Gradle Tasks ====" $(cat .gradletasknamecache)
   fi
@@ -107,7 +126,7 @@ _gradlew_tasks () {
   if [[ -f build.gradle ]]; then
     _gradle_arguments
     if _gradle_does_task_list_need_generating; then
-      _gradle_parse_tasks "$(./gradlew tasks --all)" > .gradletasknamecache
+      _gradle_parse_and_extract_tasks "$(./gradlew tasks --all)" > .gradletasknamecache
     fi
     compadd -X "==== Gradlew Tasks ====" $(cat .gradletasknamecache)
   fi
-- 
cgit v1.2.3-70-g09d2


From 8d35fa0e2f32dab6894ca06bfc333af94be97ec7 Mon Sep 17 00:00:00 2001
From: Arthur <mardybm@gmail.com>
Date: Wed, 14 Dec 2016 22:49:08 +0600
Subject: add dotenv plugin (#4373)

---
 plugins/dotenv/README.md         | 34 ++++++++++++++++++++++++++++++++++
 plugins/dotenv/dotenv.plugin.zsh | 10 ++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 plugins/dotenv/README.md
 create mode 100644 plugins/dotenv/dotenv.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/dotenv/README.md b/plugins/dotenv/README.md
new file mode 100644
index 000000000..ade09fbb2
--- /dev/null
+++ b/plugins/dotenv/README.md
@@ -0,0 +1,34 @@
+# dotenv
+
+Automatically load your project ENV variables from `.env` file when you `cd` into project root directory.
+
+Storing configuration in the environment is one of the tenets of a [twelve-factor app](http://www.12factor.net). Anything that is likely to change between deployment environments–such as resource handles for databases or credentials for external services–should be extracted from the code into environment variables.
+
+## Installation
+
+Just add the plugin to your `.zshrc`:
+
+```sh
+plugins=(git man dotenv)
+```
+
+## Usage
+
+Create `.env` file inside your project directory and put your local ENV variables there.
+
+For example:
+```sh
+export AWS_S3_TOKEN=d84a83539134f28f412c652b09f9f98eff96c9a
+export SECRET_KEY=7c6c72d959416d5aa368a409362ec6e2ac90d7f
+export MONGO_URI=mongodb://127.0.0.1:27017
+export PORT=3001
+```
+`export` is optional. This format works as well:
+```sh
+AWS_S3_TOKEN=d84a83539134f28f412c652b09f9f98eff96c9a
+SECRET_KEY=7c6c72d959416d5aa368a409362ec6e2ac90d7f
+MONGO_URI=mongodb://127.0.0.1:27017
+PORT=3001
+```
+
+**It's strongly recommended to add `.env` file to `.gitignore`**, because usually it contains sensitive information such as your credentials, secret keys, passwords etc. You don't want to commit this file, it supposed to be local only.
diff --git a/plugins/dotenv/dotenv.plugin.zsh b/plugins/dotenv/dotenv.plugin.zsh
new file mode 100644
index 000000000..9dd784229
--- /dev/null
+++ b/plugins/dotenv/dotenv.plugin.zsh
@@ -0,0 +1,10 @@
+#!/bin/zsh
+
+source_env() {
+  if [[ -f .env ]]; then
+    source .env
+  fi
+}
+
+autoload -U add-zsh-hook
+add-zsh-hook chpwd source_env
-- 
cgit v1.2.3-70-g09d2


From 67dad45b38b7f0bafcaf7679da6eb4596301843b Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Wed, 14 Dec 2016 23:22:26 +0100
Subject: docker: update completion (upstream 2fe62f2)

Closes #5683
---
 plugins/docker/_docker | 1856 +++++++++++++++++++++++++++++++-----------------
 1 file changed, 1222 insertions(+), 634 deletions(-)

(limited to 'plugins')

diff --git a/plugins/docker/_docker b/plugins/docker/_docker
index 415e731f3..8d00b13e6 100644
--- a/plugins/docker/_docker
+++ b/plugins/docker/_docker
@@ -113,27 +113,27 @@ __docker_get_containers() {
     return ret
 }
 
-__docker_stoppedcontainers() {
+__docker_complete_stopped_containers() {
     [[ $PREFIX = -* ]] && return 1
     __docker_get_containers stopped all "$@"
 }
 
-__docker_runningcontainers() {
+__docker_complete_running_containers() {
     [[ $PREFIX = -* ]] && return 1
     __docker_get_containers running all "$@"
 }
 
-__docker_containers() {
+__docker_complete_containers() {
     [[ $PREFIX = -* ]] && return 1
     __docker_get_containers all all "$@"
 }
 
-__docker_containers_ids() {
+__docker_complete_containers_ids() {
     [[ $PREFIX = -* ]] && return 1
     __docker_get_containers all ids "$@"
 }
 
-__docker_containers_names() {
+__docker_complete_containers_names() {
     [[ $PREFIX = -* ]] && return 1
     __docker_get_containers all names "$@"
 }
@@ -149,25 +149,27 @@ __docker_complete_info_plugins() {
     return ret
 }
 
-__docker_images() {
+__docker_complete_images() {
     [[ $PREFIX = -* ]] && return 1
     integer ret=1
     declare -a images
     images=(${${${(f)${:-"$(_call_program commands docker $docker_options images)"$'\n'}}[2,-1]}/(#b)([^ ]##) ##([^ ]##) ##([^ ]##)*/${match[3]}:${(r:15:: :::)match[2]} in ${match[1]}})
     _describe -t docker-images "images" images && ret=0
-    __docker_repositories_with_tags && ret=0
+    __docker_complete_repositories_with_tags && ret=0
     return ret
 }
 
-__docker_repositories() {
+__docker_complete_repositories() {
     [[ $PREFIX = -* ]] && return 1
+    integer ret=1
     declare -a repos
     repos=(${${${(f)${:-"$(_call_program commands docker $docker_options images)"$'\n'}}%% *}[2,-1]})
     repos=(${repos#<none>})
-    _describe -t docker-repos "repositories" repos
+    _describe -t docker-repos "repositories" repos && ret=0
+    return ret
 }
 
-__docker_repositories_with_tags() {
+__docker_complete_repositories_with_tags() {
     [[ $PREFIX = -* ]] && return 1
     integer ret=1
     declare -a repos onlyrepos matched
@@ -244,7 +246,7 @@ __docker_get_log_options() {
     return ret
 }
 
-__docker_log_drivers() {
+__docker_complete_log_drivers() {
     [[ $PREFIX = -*  ]] && return 1
     integer ret=1
     drivers=(awslogs etwlogs fluentd gcplogs gelf journald json-file none splunk syslog)
@@ -252,7 +254,7 @@ __docker_log_drivers() {
     return ret
 }
 
-__docker_log_options() {
+__docker_complete_log_options() {
     [[ $PREFIX = -* ]] && return 1
     integer ret=1
 
@@ -295,7 +297,7 @@ __docker_complete_pid() {
     if compset -P '*:'; then
         case "${${words[-1]%:*}#*=}" in
             (container)
-                __docker_runningcontainers && ret=0
+                __docker_complete_running_containers && ret=0
                 ;;
             *)
                 _message 'value' && ret=0
@@ -327,36 +329,40 @@ __docker_complete_ps_filters() {
     if compset -P '*='; then
         case "${${words[-1]%=*}#*=}" in
             (ancestor)
-                __docker_images && ret=0
+                __docker_complete_images && ret=0
                 ;;
             (before|since)
-                __docker_containers && ret=0
+                __docker_complete_containers && ret=0
+                ;;
+            (health)
+                health_opts=('healthy' 'none' 'starting' 'unhealthy')
+                _describe -t health-filter-opts "health filter options" health_opts && ret=0
                 ;;
             (id)
-                __docker_containers_ids && ret=0
+                __docker_complete_containers_ids && ret=0
                 ;;
             (is-task)
                 _describe -t boolean-filter-opts "filter options" boolean_opts && ret=0
                 ;;
             (name)
-                __docker_containers_names && ret=0
+                __docker_complete_containers_names && ret=0
                 ;;
             (network)
-                __docker_networks && ret=0
+                __docker_complete_networks && ret=0
                 ;;
             (status)
                 status_opts=('created' 'dead' 'exited' 'paused' 'restarting' 'running' 'removing')
-                _describe -t status-filter-opts "Status Filter Options" status_opts && ret=0
+                _describe -t status-filter-opts "status filter options" status_opts && ret=0
                 ;;
             (volume)
-                __docker_volumes && ret=0
+                __docker_complete_volumes && ret=0
                 ;;
             *)
                 _message 'value' && ret=0
                 ;;
         esac
     else
-        opts=('ancestor' 'before' 'exited' 'id' 'label' 'name' 'network' 'since' 'status' 'volume')
+        opts=('ancestor' 'before' 'exited' 'health' 'id' 'label' 'name' 'network' 'since' 'status' 'volume')
         _describe -t filter-opts "Filter Options" opts -qS "=" && ret=0
     fi
 
@@ -393,12 +399,12 @@ __docker_complete_images_filters() {
     declare -a boolean_opts opts
 
     boolean_opts=('true' 'false')
-    opts=('before' 'dangling' 'label' 'since')
+    opts=('before' 'dangling' 'label' 'reference' 'since')
 
     if compset -P '*='; then
         case "${${words[-1]%=*}#*=}" in
-            (before|since)
-                __docker_images && ret=0
+            (before|reference|since)
+                __docker_complete_images && ret=0
                 ;;
             (dangling)
                 _describe -t boolean-filter-opts "filter options" boolean_opts && ret=0
@@ -424,7 +430,7 @@ __docker_complete_events_filter() {
     if compset -P '*='; then
         case "${${words[-1]%=*}#*=}" in
             (container)
-                __docker_containers && ret=0
+                __docker_complete_containers && ret=0
                 ;;
             (daemon)
                 emulate -L zsh
@@ -444,10 +450,10 @@ __docker_complete_events_filter() {
                 _describe -t event-filter-opts "event filter options" event_opts && ret=0
                 ;;
             (image)
-                __docker_images && ret=0
+                __docker_complete_images && ret=0
                 ;;
             (network)
-                __docker_networks && ret=0
+                __docker_complete_networks && ret=0
                 ;;
             (type)
                 local -a type_opts
@@ -455,7 +461,7 @@ __docker_complete_events_filter() {
                 _describe -t type-filter-opts "type filter options" type_opts && ret=0
                 ;;
             (volume)
-                __docker_volumes && ret=0
+                __docker_complete_volumes && ret=0
                 ;;
             *)
                 _message 'value' && ret=0
@@ -468,174 +474,725 @@ __docker_complete_events_filter() {
     return ret
 }
 
-# BO network
-
-__docker_network_complete_ls_filters() {
-    [[ $PREFIX = -* ]] && return 1
-    integer ret=1
-
-    if compset -P '*='; then
-        case "${${words[-1]%=*}#*=}" in
-            (driver)
-                __docker_complete_info_plugins Network && ret=0
-                ;;
-            (id)
-                __docker_networks_ids && ret=0
-                ;;
-            (name)
-                __docker_networks_names && ret=0
-                ;;
-            (type)
-                type_opts=('builtin' 'custom')
-                _describe -t type-filter-opts "Type Filter Options" type_opts && ret=0
-                ;;
-            *)
-                _message 'value' && ret=0
-                ;;
-        esac
-    else
-        opts=('driver' 'id' 'label' 'name' 'type')
-        _describe -t filter-opts "Filter Options" opts -qS "=" && ret=0
-    fi
-
-    return ret
-}
-
-__docker_get_networks() {
-    [[ $PREFIX = -* ]] && return 1
-    integer ret=1
-    local line s
-    declare -a lines networks
-
-    type=$1; shift
-
-    lines=(${(f)${:-"$(_call_program commands docker $docker_options network ls)"$'\n'}})
-
-    # Parse header line to find columns
-    local i=1 j=1 k header=${lines[1]}
-    declare -A begin end
-    while (( j < ${#header} - 1 )); do
-        i=$(( j + ${${header[$j,-1]}[(i)[^ ]]} - 1 ))
-        j=$(( i + ${${header[$i,-1]}[(i)  ]} - 1 ))
-        k=$(( j + ${${header[$j,-1]}[(i)[^ ]]} - 2 ))
-        begin[${header[$i,$((j-1))]}]=$i
-        end[${header[$i,$((j-1))]}]=$k
-    done
-    end[${header[$i,$((j-1))]}]=-1
-    lines=(${lines[2,-1]})
-
-    # Network ID
-    if [[ $type = (ids|all) ]]; then
-        for line in $lines; do
-            s="${line[${begin[NETWORK ID]},${end[NETWORK ID]}]%% ##}"
-            s="$s:${(l:7:: :::)${${line[${begin[DRIVER]},${end[DRIVER]}]}%% ##}}"
-            networks=($networks $s)
-        done
-    fi
-
-    # Names
-    if [[ $type = (names|all) ]]; then
-        for line in $lines; do
-            s="${line[${begin[NAME]},${end[NAME]}]%% ##}"
-            s="$s:${(l:7:: :::)${${line[${begin[DRIVER]},${end[DRIVER]}]}%% ##}}"
-            networks=($networks $s)
-        done
-    fi
-
-    _describe -t networks-list "networks" networks "$@" && ret=0
-    return ret
-}
-
-__docker_networks() {
-    [[ $PREFIX = -* ]] && return 1
-    __docker_get_networks all "$@"
-}
-
-__docker_networks_ids() {
-    [[ $PREFIX = -* ]] && return 1
-    __docker_get_networks ids "$@"
-}
-
-__docker_networks_names() {
-    [[ $PREFIX = -* ]] && return 1
-    __docker_get_networks names "$@"
-}
-
-__docker_network_commands() {
-    local -a _docker_network_subcommands
-    _docker_network_subcommands=(
-        "connect:Connect a container to a network"
-        "create:Creates a new network with a name specified by the user"
-        "disconnect:Disconnects a container from a network"
-        "inspect:Displays detailed information on a network"
-        "ls:Lists all the networks created by the user"
-        "rm:Deletes one or more networks"
+# BO container
+
+__docker_container_commands() {
+    local -a _docker_container_subcommands
+    _docker_container_subcommands=(
+        "attach:Attach to a running container"
+        "commit:Create a new image from a container's changes"
+        "cp:Copy files/folders between a container and the local filesystem"
+        "create:Create a new container"
+        "diff:Inspect changes on a container's filesystem"
+        "exec:Run a command in a running container"
+        "export:Export a container's filesystem as a tar archive"
+        "inspect:Display detailed information on one or more containers"
+        "kill:Kill one or more running containers"
+        "logs:Fetch the logs of a container"
+        "ls:List containers"
+        "pause:Pause all processes within one or more containers"
+        "port:List port mappings or a specific mapping for the container"
+        "prune:Remove all stopped containers"
+        "rename:Rename a container"
+        "restart:Restart one or more containers"
+        "rm:Remove one or more containers"
+        "run:Run a command in a new container"
+        "start:Start one or more stopped containers"
+        "stats:Display a live stream of container(s) resource usage statistics"
+        "stop:Stop one or more running containers"
+        "top:Display the running processes of a container"
+        "unpause:Unpause all processes within one or more containers"
+        "update:Update configuration of one or more containers"
+        "wait:Block until one or more containers stop, then print their exit codes"
     )
-    _describe -t docker-network-commands "docker network command" _docker_network_subcommands
+    _describe -t docker-container-commands "docker container command" _docker_container_subcommands
 }
 
-__docker_network_subcommand() {
-    local -a _command_args opts_help
+__docker_container_subcommand() {
+    local -a _command_args opts_help opts_attach_exec_run_start opts_create_run opts_create_run_update
     local expl help="--help"
     integer ret=1
 
+    opts_attach_exec_run_start=(
+        "($help)--detach-keys=[Escape key sequence used to detach a container]:sequence:__docker_complete_detach_keys"
+    )
+    opts_create_run=(
+        "($help -a --attach)"{-a=,--attach=}"[Attach to stdin, stdout or stderr]:device:(STDIN STDOUT STDERR)"
+        "($help)*--add-host=[Add a custom host-to-IP mapping]:host\:ip mapping: "
+        "($help)*--blkio-weight-device=[Block IO (relative device weight)]:device:Block IO weight: "
+        "($help)*--cap-add=[Add Linux capabilities]:capability: "
+        "($help)*--cap-drop=[Drop Linux capabilities]:capability: "
+        "($help)--cgroup-parent=[Parent cgroup for the container]:cgroup: "
+        "($help)--cidfile=[Write the container ID to the file]:CID file:_files"
+        "($help)--cpus=[Number of CPUs (default 0.000)]:cpus: "
+        "($help)*--device=[Add a host device to the container]:device:_files"
+        "($help)*--device-read-bps=[Limit the read rate (bytes per second) from a device]:device:IO rate: "
+        "($help)*--device-read-iops=[Limit the read rate (IO per second) from a device]:device:IO rate: "
+        "($help)*--device-write-bps=[Limit the write rate (bytes per second) to a device]:device:IO rate: "
+        "($help)*--device-write-iops=[Limit the write rate (IO per second) to a device]:device:IO rate: "
+        "($help)--disable-content-trust[Skip image verification]"
+        "($help)*--dns=[Custom DNS servers]:DNS server: "
+        "($help)*--dns-option=[Custom DNS options]:DNS option: "
+        "($help)*--dns-search=[Custom DNS search domains]:DNS domains: "
+        "($help)*"{-e=,--env=}"[Environment variables]:environment variable: "
+        "($help)--entrypoint=[Overwrite the default entrypoint of the image]:entry point: "
+        "($help)*--env-file=[Read environment variables from a file]:environment file:_files"
+        "($help)*--expose=[Expose a port from the container without publishing it]: "
+        "($help)*--group=[Set one or more supplementary user groups for the container]:group:_groups"
+        "($help -h --hostname)"{-h=,--hostname=}"[Container host name]:hostname:_hosts"
+        "($help -i --interactive)"{-i,--interactive}"[Keep stdin open even if not attached]"
+        "($help)--ip=[Container IPv4 address]:IPv4: "
+        "($help)--ip6=[Container IPv6 address]:IPv6: "
+        "($help)--ipc=[IPC namespace to use]:IPC namespace: "
+        "($help)--isolation=[Container isolation technology]:isolation:(default hyperv process)"
+        "($help)*--link=[Add link to another container]:link:->link"
+        "($help)*--link-local-ip=[Add a link-local address for the container]:IPv4/IPv6: "
+        "($help)*"{-l=,--label=}"[Container metadata]:label: "
+        "($help)--log-driver=[Default driver for container logs]:logging driver:__docker_complete_log_drivers"
+        "($help)*--log-opt=[Log driver specific options]:log driver options:__docker_complete_log_options"
+        "($help)--mac-address=[Container MAC address]:MAC address: "
+        "($help)--name=[Container name]:name: "
+        "($help)--network=[Connect a container to a network]:network mode:(bridge none container host)"
+        "($help)*--network-alias=[Add network-scoped alias for the container]:alias: "
+        "($help)--oom-kill-disable[Disable OOM Killer]"
+        "($help)--oom-score-adj[Tune the host's OOM preferences for containers (accepts -1000 to 1000)]"
+        "($help)--pids-limit[Tune container pids limit (set -1 for unlimited)]"
+        "($help -P --publish-all)"{-P,--publish-all}"[Publish all exposed ports]"
+        "($help)*"{-p=,--publish=}"[Expose a container's port to the host]:port:_ports"
+        "($help)--pid=[PID namespace to use]:PID namespace:__docker_complete_pid"
+        "($help)--privileged[Give extended privileges to this container]"
+        "($help)--read-only[Mount the container's root filesystem as read only]"
+        "($help)*--security-opt=[Security options]:security option: "
+        "($help)*--shm-size=[Size of '/dev/shm' (format is '<number><unit>')]:shm size: "
+        "($help)--stop-timeout=[Timeout (in seconds) to stop a container]:time: "
+        "($help)*--sysctl=-[sysctl options]:sysctl: "
+        "($help -t --tty)"{-t,--tty}"[Allocate a pseudo-tty]"
+        "($help -u --user)"{-u=,--user=}"[Username or UID]:user:_users"
+        "($help)*--ulimit=[ulimit options]:ulimit: "
+        "($help)--userns=[Container user namespace]:user namespace:(host)"
+        "($help)--tmpfs[mount tmpfs]"
+        "($help)*-v[Bind mount a volume]:volume: "
+        "($help)--volume-driver=[Optional volume driver for the container]:volume driver:(local)"
+        "($help)*--volumes-from=[Mount volumes from the specified container]:volume: "
+        "($help -w --workdir)"{-w=,--workdir=}"[Working directory inside the container]:directory:_directories"
+    )
+    opts_create_run_update=(
+        "($help)--blkio-weight=[Block IO (relative weight), between 10 and 1000]:Block IO weight:(10 100 500 1000)"
+        "($help -c --cpu-shares)"{-c=,--cpu-shares=}"[CPU shares (relative weight)]:CPU shares:(0 10 100 200 500 800 1000)"
+        "($help)--cpu-period=[Limit the CPU CFS (Completely Fair Scheduler) period]:CPU period: "
+        "($help)--cpu-quota=[Limit the CPU CFS (Completely Fair Scheduler) quota]:CPU quota: "
+        "($help)--cpu-rt-period=[Limit the CPU real-time period]:CPU real-time period in microseconds: "
+        "($help)--cpu-rt-runtime=[Limit the CPU real-time runtime]:CPU real-time runtime in microseconds: "
+        "($help)--cpuset-cpus=[CPUs in which to allow execution]:CPUs: "
+        "($help)--cpuset-mems=[MEMs in which to allow execution]:MEMs: "
+        "($help)--kernel-memory=[Kernel memory limit in bytes]:Memory limit: "
+        "($help -m --memory)"{-m=,--memory=}"[Memory limit]:Memory limit: "
+        "($help)--memory-reservation=[Memory soft limit]:Memory limit: "
+        "($help)--memory-swap=[Total memory limit with swap]:Memory limit: "
+        "($help)--restart=[Restart policy]:restart policy:(no on-failure always unless-stopped)"
+    )
     opts_help=("(: -)--help[Print usage]")
 
     case "$words[1]" in
-        (connect)
+        (attach)
             _arguments $(__docker_arguments) \
                 $opts_help \
-                "($help)*--alias=[Add network-scoped alias for the container]:alias: " \
-                "($help)--ip=[Container IPv4 address]:IPv4: " \
-                "($help)--ip6=[Container IPv6 address]:IPv6: " \
-                "($help)*--link=[Add a link to another container]:link:->link" \
-                "($help)*--link-local-ip=[Add a link-local address for the container]:IPv4/IPv6: " \
-                "($help -)1:network:__docker_networks" \
-                "($help -)2:containers:__docker_containers" && ret=0
-
+                $opts_attach_exec_run_start \
+                "($help)--no-stdin[Do not attach stdin]" \
+                "($help)--sig-proxy[Proxy all received signals to the process (non-TTY mode only)]" \
+                "($help -):containers:__docker_complete_running_containers" && ret=0
+            ;;
+        (commit)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -a --author)"{-a=,--author=}"[Author]:author: " \
+                "($help)*"{-c=,--change=}"[Apply Dockerfile instruction to the created image]:Dockerfile:_files" \
+                "($help -m --message)"{-m=,--message=}"[Commit message]:message: " \
+                "($help -p --pause)"{-p,--pause}"[Pause container during commit]" \
+                "($help -):container:__docker_complete_containers" \
+                "($help -): :__docker_complete_repositories_with_tags" && ret=0
+            ;;
+        (cp)
+            local state
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -L --follow-link)"{-L,--follow-link}"[Always follow symbol link]" \
+                "($help -)1:container:->container" \
+                "($help -)2:hostpath:_files" && ret=0
             case $state in
-                (link)
+                (container)
                     if compset -P "*:"; then
-                        _wanted alias expl "Alias" compadd -E "" && ret=0
+                        _files && ret=0
                     else
-                        __docker_runningcontainers -qS ":" && ret=0
+                        __docker_complete_containers -qS ":" && ret=0
                     fi
                     ;;
             esac
             ;;
         (create)
-            _arguments $(__docker_arguments) -A '-*' \
+            local state
+            _arguments $(__docker_arguments) \
                 $opts_help \
-                "($help)*--aux-address[Auxiliary IPv4 or IPv6 addresses used by network driver]:key=IP: " \
-                "($help -d --driver)"{-d=,--driver=}"[Driver to manage the Network]:driver:(null host bridge overlay)" \
-                "($help)*--gateway=[IPv4 or IPv6 Gateway for the master subnet]:IP: " \
-                "($help)--internal[Restricts external access to the network]" \
-                "($help)*--ip-range=[Allocate container ip from a sub-range]:IP/mask: " \
-                "($help)--ipam-driver=[IP Address Management Driver]:driver:(default)" \
-                "($help)*--ipam-opt=[Custom IPAM plugin options]:opt=value: " \
-                "($help)--ipv6[Enable IPv6 networking]" \
-                "($help)*--label=[Set metadata on a network]:label=value: " \
-                "($help)*"{-o=,--opt=}"[Driver specific options]:opt=value: " \
-                "($help)*--subnet=[Subnet in CIDR format that represents a network segment]:IP/mask: " \
-                "($help -)1:Network Name: " && ret=0
+                $opts_create_run \
+                $opts_create_run_update \
+                "($help -): :__docker_complete_images" \
+                "($help -):command: _command_names -e" \
+                "($help -)*::arguments: _normal" && ret=0
+            case $state in
+                (link)
+                    if compset -P "*:"; then
+                        _wanted alias expl "Alias" compadd -E "" && ret=0
+                    else
+                        __docker_complete_running_containers -qS ":" && ret=0
+                    fi
+                    ;;
+            esac
             ;;
-        (disconnect)
+        (diff)
             _arguments $(__docker_arguments) \
                 $opts_help \
-                "($help -)1:network:__docker_networks" \
-                "($help -)2:containers:__docker_containers" && ret=0
+                "($help -)*:containers:__docker_complete_containers" && ret=0
             ;;
-        (inspect)
+        (exec)
+            local state
             _arguments $(__docker_arguments) \
                 $opts_help \
-                "($help -f --format)"{-f=,--format=}"[Format the output using the given go template]:template: " \
-                "($help -)*:network:__docker_networks" && ret=0
+                $opts_attach_exec_run_start \
+                "($help -d --detach)"{-d,--detach}"[Detached mode: leave the container running in the background]" \
+                "($help)*"{-e=,--env=}"[Set environment variables]:environment variable: " \
+                "($help -i --interactive)"{-i,--interactive}"[Keep stdin open even if not attached]" \
+                "($help)--privileged[Give extended Linux capabilities to the command]" \
+                "($help -t --tty)"{-t,--tty}"[Allocate a pseudo-tty]" \
+                "($help -u --user)"{-u=,--user=}"[Username or UID]:user:_users" \
+                "($help -):containers:__docker_complete_running_containers" \
+                "($help -)*::command:->anycommand" && ret=0
+            case $state in
+                (anycommand)
+                    shift 1 words
+                    (( CURRENT-- ))
+                    _normal && ret=0
+                    ;;
+            esac
             ;;
-        (ls)
+        (export)
             _arguments $(__docker_arguments) \
                 $opts_help \
-                "($help)--no-trunc[Do not truncate the output]" \
-                "($help)*"{-f=,--filter=}"[Provide filter values]:filter:->filter-options" \
+                "($help -o --output)"{-o=,--output=}"[Write to a file, instead of stdout]:output file:_files" \
+                "($help -)*:containers:__docker_complete_containers" && ret=0
+            ;;
+        (inspect)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -f --format)"{-f=,--format=}"[Format the output using the given go template]:template: " \
+                "($help -s --size)"{-s,--size}"[Display total file sizes]" \
+                "($help -)*:containers:__docker_complete_containers" && ret=0
+            ;;
+        (kill)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -s --signal)"{-s=,--signal=}"[Signal to send]:signal:_signals" \
+                "($help -)*:containers:__docker_complete_running_containers" && ret=0
+            ;;
+        (logs)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help)--details[Show extra details provided to logs]" \
+                "($help -f --follow)"{-f,--follow}"[Follow log output]" \
+                "($help -s --since)"{-s=,--since=}"[Show logs since this timestamp]:timestamp: " \
+                "($help -t --timestamps)"{-t,--timestamps}"[Show timestamps]" \
+                "($help)--tail=[Output the last K lines]:lines:(1 10 20 50 all)" \
+                "($help -)*:containers:__docker_complete_containers" && ret=0
+            ;;
+        (ls|list)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -a --all)"{-a,--all}"[Show all containers]" \
+                "($help)--before=[Show only container created before...]:containers:__docker_complete_containers" \
+                "($help)*"{-f=,--filter=}"[Filter values]:filter:__docker_complete_ps_filters" \
+                "($help)--format=[Pretty-print containers using a Go template]:template: " \
+                "($help -l --latest)"{-l,--latest}"[Show only the latest created container]" \
+                "($help -n --last)"{-n=,--last=}"[Show n last created containers (includes all states)]:n:(1 5 10 25 50)" \
+                "($help)--no-trunc[Do not truncate output]" \
+                "($help -q --quiet)"{-q,--quiet}"[Only show numeric IDs]" \
+                "($help -s --size)"{-s,--size}"[Display total file sizes]" \
+                "($help)--since=[Show only containers created since...]:containers:__docker_complete_containers" && ret=0
+            ;;
+        (pause|unpause)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -)*:containers:__docker_complete_running_containers" && ret=0
+            ;;
+        (port)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -)1:containers:__docker_complete_running_containers" \
+                "($help -)2:port:_ports" && ret=0
+            ;;
+        (prune)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -f --force)"{-f,--force}"[Do not prompt for confirmation]" && ret=0
+            ;;
+        (rename)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -):old name:__docker_complete_containers" \
+                "($help -):new name: " && ret=0
+            ;;
+        (restart)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -t --time)"{-t=,--time=}"[Number of seconds to try to stop for before killing the container]:seconds to before killing:(1 5 10 30 60)" \
+                "($help -)*:containers:__docker_complete_containers_ids" && ret=0
+            ;;
+        (rm)
+            local state
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -f --force)"{-f,--force}"[Force removal]" \
+                "($help -l --link)"{-l,--link}"[Remove the specified link and not the underlying container]" \
+                "($help -v --volumes)"{-v,--volumes}"[Remove the volumes associated to the container]" \
+                "($help -)*:containers:->values" && ret=0
+            case $state in
+                (values)
+                    if [[ ${words[(r)-f]} == -f || ${words[(r)--force]} == --force ]]; then
+                        __docker_complete_containers && ret=0
+                    else
+                        __docker_complete_stopped_containers && ret=0
+                    fi
+                    ;;
+            esac
+            ;;
+        (run)
+            local state
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                $opts_create_run \
+                $opts_create_run_update \
+                $opts_attach_exec_run_start \
+                "($help -d --detach)"{-d,--detach}"[Detached mode: leave the container running in the background]" \
+                "($help)--health-cmd=[Command to run to check health]:command: " \
+                "($help)--health-interval=[Time between running the check]:time: " \
+                "($help)--health-retries=[Consecutive failures needed to report unhealthy]:retries:(1 2 3 4 5)" \
+                "($help)--health-timeout=[Maximum time to allow one check to run]:time: " \
+                "($help)--no-healthcheck[Disable any container-specified HEALTHCHECK]" \
+                "($help)--rm[Remove intermediate containers when it exits]" \
+                "($help)--runtime=[Name of the runtime to be used for that container]:runtime:__docker_complete_runtimes" \
+                "($help)--sig-proxy[Proxy all received signals to the process (non-TTY mode only)]" \
+                "($help)--stop-signal=[Signal to kill a container]:signal:_signals" \
+                "($help)--storage-opt=[Storage driver options for the container]:storage options:->storage-opt" \
+                "($help -): :__docker_complete_images" \
+                "($help -):command: _command_names -e" \
+                "($help -)*::arguments: _normal" && ret=0
+            case $state in
+                (link)
+                    if compset -P "*:"; then
+                        _wanted alias expl "Alias" compadd -E "" && ret=0
+                    else
+                        __docker_complete_running_containers -qS ":" && ret=0
+                    fi
+                    ;;
+                (storage-opt)
+                    if compset -P "*="; then
+                        _message "value" && ret=0
+                    else
+                        opts=('size')
+                        _describe -t filter-opts "storage options" opts -qS "=" && ret=0
+                    fi
+                    ;;
+            esac
+            ;;
+        (start)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                $opts_attach_exec_run_start \
+                "($help -a --attach)"{-a,--attach}"[Attach container's stdout/stderr and forward all signals]" \
+                "($help -i --interactive)"{-i,--interactive}"[Attach container's stding]" \
+                "($help -)*:containers:__docker_complete_stopped_containers" && ret=0
+            ;;
+        (stats)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -a --all)"{-a,--all}"[Show all containers (default shows just running)]" \
+                "($help)--format=[Pretty-print images using a Go template]:template: " \
+                "($help)--no-stream[Disable streaming stats and only pull the first result]" \
+                "($help -)*:containers:__docker_complete_running_containers" && ret=0
+            ;;
+        (stop)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -t --time)"{-t=,--time=}"[Number of seconds to try to stop for before killing the container]:seconds to before killing:(1 5 10 30 60)" \
+                "($help -)*:containers:__docker_complete_running_containers" && ret=0
+            ;;
+        (top)
+            local state
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -)1:containers:__docker_complete_running_containers" \
+                "($help -)*:: :->ps-arguments" && ret=0
+            case $state in
+                (ps-arguments)
+                    _ps && ret=0
+                    ;;
+            esac
+            ;;
+        (update)
+            local state
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                opts_create_run_update \
+                "($help -)*: :->values" && ret=0
+            case $state in
+                (values)
+                    if [[ ${words[(r)--kernel-memory*]} = (--kernel-memory*) ]]; then
+                        __docker_complete_stopped_containers && ret=0
+                    else
+                        __docker_complete_containers && ret=0
+                    fi
+                    ;;
+            esac
+            ;;
+        (wait)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -)*:containers:__docker_complete_running_containers" && ret=0
+            ;;
+        (help)
+            _arguments $(__docker_arguments) ":subcommand:__docker_container_commands" && ret=0
+            ;;
+    esac
+
+    return ret
+}
+
+# EO container
+
+# BO image
+
+__docker_image_commands() {
+    local -a _docker_image_subcommands
+    _docker_image_subcommands=(
+        "build:Build an image from a Dockerfile"
+        "history:Show the history of an image"
+        "import:Import the contents from a tarball to create a filesystem image"
+        "inspect:Display detailed information on one or more images"
+        "load:Load an image from a tar archive or STDIN"
+        "ls:List images"
+        "prune:Remove unused images"
+        "pull:Pull an image or a repository from a registry"
+        "push:Push an image or a repository to a registry"
+        "rm:Remove one or more images"
+        "save:Save one or more images to a tar archive (streamed to STDOUT by default)"
+        "tag:Tag an image into a repository"
+    )
+    _describe -t docker-image-commands "docker image command" _docker_image_subcommands
+}
+
+__docker_image_subcommand() {
+    local -a _command_args opts_help
+    local expl help="--help"
+    integer ret=1
+
+    opts_help=("(: -)--help[Print usage]")
+
+    case "$words[1]" in
+        (build)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help)*--build-arg=[Build-time variables]:<varname>=<value>: " \
+                "($help)*--cache-from=[Images to consider as cache sources]: :__docker_complete_repositories_with_tags" \
+                "($help -c --cpu-shares)"{-c=,--cpu-shares=}"[CPU shares (relative weight)]:CPU shares:(0 10 100 200 500 800 1000)" \
+                "($help)--cgroup-parent=[Parent cgroup for the container]:cgroup: " \
+                "($help)--compress[Compress the build context using gzip]" \
+                "($help)--cpu-period=[Limit the CPU CFS (Completely Fair Scheduler) period]:CPU period: " \
+                "($help)--cpu-quota=[Limit the CPU CFS (Completely Fair Scheduler) quota]:CPU quota: " \
+                "($help)--cpu-rt-period=[Limit the CPU real-time period]:CPU real-time period in microseconds: " \
+                "($help)--cpu-rt-runtime=[Limit the CPU real-time runtime]:CPU real-time runtime in microseconds: " \
+                "($help)--cpuset-cpus=[CPUs in which to allow execution]:CPUs: " \
+                "($help)--cpuset-mems=[MEMs in which to allow execution]:MEMs: " \
+                "($help)--disable-content-trust[Skip image verification]" \
+                "($help -f --file)"{-f=,--file=}"[Name of the Dockerfile]:Dockerfile:_files" \
+                "($help)--force-rm[Always remove intermediate containers]" \
+                "($help)--isolation=[Container isolation technology]:isolation:(default hyperv process)" \
+                "($help)*--label=[Set metadata for an image]:label=value: " \
+                "($help -m --memory)"{-m=,--memory=}"[Memory limit]:Memory limit: " \
+                "($help)--memory-swap=[Total memory limit with swap]:Memory limit: " \
+                "($help)--network=[Connect a container to a network]:network mode:(bridge none container host)"
+                "($help)--no-cache[Do not use cache when building the image]" \
+                "($help)--pull[Attempt to pull a newer version of the image]" \
+                "($help -q --quiet)"{-q,--quiet}"[Suppress verbose build output]" \
+                "($help)--rm[Remove intermediate containers after a successful build]" \
+                "($help)*--shm-size=[Size of '/dev/shm' (format is '<number><unit>')]:shm size: " \
+                "($help -t --tag)*"{-t=,--tag=}"[Repository, name and tag for the image]: :__docker_complete_repositories_with_tags" \
+                "($help)*--ulimit=[ulimit options]:ulimit: " \
+                "($help)--userns=[Container user namespace]:user namespace:(host)" \
+                "($help -):path or URL:_directories" && ret=0
+            ;;
+        (history)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -H --human)"{-H,--human}"[Print sizes and dates in human readable format]" \
+                "($help)--no-trunc[Do not truncate output]" \
+                "($help -q --quiet)"{-q,--quiet}"[Only show numeric IDs]" \
+                "($help -)*: :__docker_complete_images" && ret=0
+            ;;
+        (import)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help)*"{-c=,--change=}"[Apply Dockerfile instruction to the created image]:Dockerfile:_files" \
+                "($help -m --message)"{-m=,--message=}"[Commit message for imported image]:message: " \
+                "($help -):URL:(- http:// file://)" \
+                "($help -): :__docker_complete_repositories_with_tags" && ret=0
+            ;;
+        (inspect)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -f --format)"{-f=,--format=}"[Format the output using the given go template]:template: " \
+                "($help -)*:images:__docker_complete_images" && ret=0
+            ;;
+        (load)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -i --input)"{-i=,--input=}"[Read from tar archive file]:archive file:_files -g \"*.((tar|TAR)(.gz|.GZ|.Z|.bz2|.lzma|.xz|)|(tbz|tgz|txz))(-.)\"" \
+                "($help -q --quiet)"{-q,--quiet}"[Suppress the load output]" && ret=0
+            ;;
+        (ls|list)
+            local state
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -a --all)"{-a,--all}"[Show all images]" \
+                "($help)--digests[Show digests]" \
+                "($help)*"{-f=,--filter=}"[Filter values]:filter:->filter-options" \
+                "($help)--format=[Pretty-print images using a Go template]:template: " \
+                "($help)--no-trunc[Do not truncate output]" \
+                "($help -q --quiet)"{-q,--quiet}"[Only show numeric IDs]" \
+                "($help -): :__docker_complete_repositories" && ret=0
+            case $state in
+                (filter-options)
+                    __docker_complete_images_filters && ret=0
+                    ;;
+            esac
+            ;;
+        (prune)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -a --all)"{-a,--all}"[Remove all unused images, not just dangling ones]" \
+                "($help -f --force)"{-f,--force}"[Do not prompt for confirmation]" && ret=0
+            ;;
+        (pull)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -a --all-tags)"{-a,--all-tags}"[Download all tagged images]" \
+                "($help)--disable-content-trust[Skip image verification]" \
+                "($help -):name:__docker_search" && ret=0
+            ;;
+        (push)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help)--disable-content-trust[Skip image signing]" \
+                "($help -): :__docker_complete_images" && ret=0
+            ;;
+        (rm)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -f --force)"{-f,--force}"[Force removal]" \
+                "($help)--no-prune[Do not delete untagged parents]" \
+                "($help -)*: :__docker_complete_images" && ret=0
+            ;;
+        (save)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -o --output)"{-o=,--output=}"[Write to file]:file:_files" \
+                "($help -)*: :__docker_complete_images" && ret=0
+            ;;
+        (tag)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -):source:__docker_complete_images"\
+                "($help -):destination:__docker_complete_repositories_with_tags" && ret=0
+            ;;
+        (help)
+            _arguments $(__docker_arguments) ":subcommand:__docker_container_commands" && ret=0
+            ;;
+    esac
+
+    return ret
+}
+
+# EO image
+
+# BO network
+
+__docker_network_complete_ls_filters() {
+    [[ $PREFIX = -* ]] && return 1
+    integer ret=1
+
+    if compset -P '*='; then
+        case "${${words[-1]%=*}#*=}" in
+            (driver)
+                __docker_complete_info_plugins Network && ret=0
+                ;;
+            (id)
+                __docker_complete_networks_ids && ret=0
+                ;;
+            (name)
+                __docker_complete_networks_names && ret=0
+                ;;
+            (type)
+                type_opts=('builtin' 'custom')
+                _describe -t type-filter-opts "Type Filter Options" type_opts && ret=0
+                ;;
+            *)
+                _message 'value' && ret=0
+                ;;
+        esac
+    else
+        opts=('driver' 'id' 'label' 'name' 'type')
+        _describe -t filter-opts "Filter Options" opts -qS "=" && ret=0
+    fi
+
+    return ret
+}
+
+__docker_get_networks() {
+    [[ $PREFIX = -* ]] && return 1
+    integer ret=1
+    local line s
+    declare -a lines networks
+
+    type=$1; shift
+
+    lines=(${(f)${:-"$(_call_program commands docker $docker_options network ls)"$'\n'}})
+
+    # Parse header line to find columns
+    local i=1 j=1 k header=${lines[1]}
+    declare -A begin end
+    while (( j < ${#header} - 1 )); do
+        i=$(( j + ${${header[$j,-1]}[(i)[^ ]]} - 1 ))
+        j=$(( i + ${${header[$i,-1]}[(i)  ]} - 1 ))
+        k=$(( j + ${${header[$j,-1]}[(i)[^ ]]} - 2 ))
+        begin[${header[$i,$((j-1))]}]=$i
+        end[${header[$i,$((j-1))]}]=$k
+    done
+    end[${header[$i,$((j-1))]}]=-1
+    lines=(${lines[2,-1]})
+
+    # Network ID
+    if [[ $type = (ids|all) ]]; then
+        for line in $lines; do
+            s="${line[${begin[NETWORK ID]},${end[NETWORK ID]}]%% ##}"
+            s="$s:${(l:7:: :::)${${line[${begin[DRIVER]},${end[DRIVER]}]}%% ##}}"
+            s="$s, ${${line[${begin[SCOPE]},${end[SCOPE]}]}%% ##}"
+            networks=($networks $s)
+        done
+    fi
+
+    # Names
+    if [[ $type = (names|all) ]]; then
+        for line in $lines; do
+            s="${line[${begin[NAME]},${end[NAME]}]%% ##}"
+            s="$s:${(l:7:: :::)${${line[${begin[DRIVER]},${end[DRIVER]}]}%% ##}}"
+            s="$s, ${${line[${begin[SCOPE]},${end[SCOPE]}]}%% ##}"
+            networks=($networks $s)
+        done
+    fi
+
+    _describe -t networks-list "networks" networks "$@" && ret=0
+    return ret
+}
+
+__docker_complete_networks() {
+    [[ $PREFIX = -* ]] && return 1
+    __docker_get_networks all "$@"
+}
+
+__docker_complete_networks_ids() {
+    [[ $PREFIX = -* ]] && return 1
+    __docker_get_networks ids "$@"
+}
+
+__docker_complete_networks_names() {
+    [[ $PREFIX = -* ]] && return 1
+    __docker_get_networks names "$@"
+}
+
+__docker_network_commands() {
+    local -a _docker_network_subcommands
+    _docker_network_subcommands=(
+        "connect:Connect a container to a network"
+        "create:Creates a new network with a name specified by the user"
+        "disconnect:Disconnects a container from a network"
+        "inspect:Displays detailed information on a network"
+        "ls:Lists all the networks created by the user"
+        "prune:Remove all unused networks"
+        "rm:Deletes one or more networks"
+    )
+    _describe -t docker-network-commands "docker network command" _docker_network_subcommands
+}
+
+__docker_network_subcommand() {
+    local -a _command_args opts_help
+    local expl help="--help"
+    integer ret=1
+
+    opts_help=("(: -)--help[Print usage]")
+
+    case "$words[1]" in
+        (connect)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help)*--alias=[Add network-scoped alias for the container]:alias: " \
+                "($help)--ip=[Container IPv4 address]:IPv4: " \
+                "($help)--ip6=[Container IPv6 address]:IPv6: " \
+                "($help)*--link=[Add a link to another container]:link:->link" \
+                "($help)*--link-local-ip=[Add a link-local address for the container]:IPv4/IPv6: " \
+                "($help -)1:network:__docker_complete_networks" \
+                "($help -)2:containers:__docker_complete_containers" && ret=0
+
+            case $state in
+                (link)
+                    if compset -P "*:"; then
+                        _wanted alias expl "Alias" compadd -E "" && ret=0
+                    else
+                        __docker_complete_running_containers -qS ":" && ret=0
+                    fi
+                    ;;
+            esac
+            ;;
+        (create)
+            _arguments $(__docker_arguments) -A '-*' \
+                $opts_help \
+                "($help)--attachable[Enable manual container attachment]" \
+                "($help)*--aux-address[Auxiliary IPv4 or IPv6 addresses used by network driver]:key=IP: " \
+                "($help -d --driver)"{-d=,--driver=}"[Driver to manage the Network]:driver:(null host bridge overlay)" \
+                "($help)*--gateway=[IPv4 or IPv6 Gateway for the master subnet]:IP: " \
+                "($help)--internal[Restricts external access to the network]" \
+                "($help)*--ip-range=[Allocate container ip from a sub-range]:IP/mask: " \
+                "($help)--ipam-driver=[IP Address Management Driver]:driver:(default)" \
+                "($help)*--ipam-opt=[Custom IPAM plugin options]:opt=value: " \
+                "($help)--ipv6[Enable IPv6 networking]" \
+                "($help)*--label=[Set metadata on a network]:label=value: " \
+                "($help)*"{-o=,--opt=}"[Driver specific options]:opt=value: " \
+                "($help)*--subnet=[Subnet in CIDR format that represents a network segment]:IP/mask: " \
+                "($help -)1:Network Name: " && ret=0
+            ;;
+        (disconnect)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -)1:network:__docker_complete_networks" \
+                "($help -)2:containers:__docker_complete_containers" && ret=0
+            ;;
+        (inspect)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -f --format)"{-f=,--format=}"[Format the output using the given go template]:template: " \
+                "($help -)*:network:__docker_complete_networks" && ret=0
+            ;;
+        (ls)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help)--no-trunc[Do not truncate the output]" \
+                "($help)*"{-f=,--filter=}"[Provide filter values]:filter:->filter-options" \
                 "($help)--format=[Pretty-print networks using a Go template]:template: " \
                 "($help -q --quiet)"{-q,--quiet}"[Only display numeric IDs]" && ret=0
             case $state in
@@ -644,10 +1201,15 @@ __docker_network_subcommand() {
                     ;;
             esac
             ;;
+        (prune)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -f --force)"{-f,--force}"[Do not prompt for confirmation]" && ret=0
+            ;;
         (rm)
             _arguments $(__docker_arguments) \
                 $opts_help \
-                "($help -)*:network:__docker_networks" && ret=0
+                "($help -)*:network:__docker_complete_networks" && ret=0
             ;;
         (help)
             _arguments $(__docker_arguments) ":subcommand:__docker_network_commands" && ret=0
@@ -814,7 +1376,7 @@ __docker_node_subcommand() {
         (rm|remove)
              _arguments $(__docker_arguments) \
                 $opts_help \
-                "($help)--force[Force remove an active node]" \
+                "($help -f --force)"{-f,--force}"[Force remove a node from the swarm]" \
                 "($help -)*:node:__docker_complete_pending_nodes" && ret=0
             ;;
         (demote)
@@ -956,6 +1518,107 @@ __docker_plugin_subcommand() {
 
 # EO plugin
 
+# BO secret
+
+__docker_secrets() {
+    [[ $PREFIX = -* ]] && return 1
+    integer ret=1
+    local line s
+    declare -a lines secrets
+
+    type=$1; shift
+
+    lines=(${(f)${:-"$(_call_program commands docker $docker_options secret ls)"$'\n'}})
+
+    # Parse header line to find columns
+    local i=1 j=1 k header=${lines[1]}
+    declare -A begin end
+    while (( j < ${#header} - 1 )); do
+        i=$(( j + ${${header[$j,-1]}[(i)[^ ]]} - 1 ))
+        j=$(( i + ${${header[$i,-1]}[(i)  ]} - 1 ))
+        k=$(( j + ${${header[$j,-1]}[(i)[^ ]]} - 2 ))
+        begin[${header[$i,$((j-1))]}]=$i
+        end[${header[$i,$((j-1))]}]=$k
+    done
+    end[${header[$i,$((j-1))]}]=-1
+    lines=(${lines[2,-1]})
+
+    # ID
+    if [[ $type = (ids|all) ]]; then
+        for line in $lines; do
+            s="${line[${begin[ID]},${end[ID]}]%% ##}"
+            secrets=($secrets $s)
+        done
+    fi
+
+    # Names
+    if [[ $type = (names|all) ]]; then
+        for line in $lines; do
+            s="${line[${begin[NAME]},${end[NAME]}]%% ##}"
+            secrets=($secrets $s)
+        done
+    fi
+
+    _describe -t secrets-list "secrets" secrets "$@" && ret=0
+    return ret
+}
+
+__docker_complete_secrets() {
+    [[ $PREFIX = -* ]] && return 1
+    __docker_secrets all "$@"
+}
+
+__docker_secret_commands() {
+    local -a _docker_secret_subcommands
+    _docker_secret_subcommands=(
+        "create:Create a secret using stdin as content"
+        "inspect:Display detailed information on one or more secrets"
+        "ls:List secrets"
+        "rm:Remove one or more secrets"
+    )
+    _describe -t docker-secret-commands "docker secret command" _docker_secret_subcommands
+}
+
+__docker_secret_subcommand() {
+    local -a _command_args opts_help
+    local expl help="--help"
+    integer ret=1
+
+    opts_help=("(: -)--help[Print usage]")
+
+    case "$words[1]" in
+        (create)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help)*"{-l=,--label=}"[Secret labels]:label: " \
+                "($help -):secret: " && ret=0
+            ;;
+        (inspect)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -f --format)"{-f=,--format=}"[Format the output using the given Go template]:template: " \
+                "($help -)*:secret:__docker_complete_secrets" && ret=0
+            ;;
+        (ls|list)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -q --quiet)"{-q,--quiet}"[Only display IDs]" && ret=0
+            ;;
+        (rm|remove)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -)*:secret:__docker_complete_secrets" && ret=0
+            ;;
+        (help)
+            _arguments $(__docker_arguments) ":subcommand:__docker_secret_commands" && ret=0
+            ;;
+    esac
+
+    return ret
+}
+
+# EO secret
+
 # BO service
 
 __docker_service_complete_ls_filters() {
@@ -1071,7 +1734,7 @@ __docker_service_commands() {
         "inspect:Display detailed information on one or more services"
         "ls:List services"
         "rm:Remove one or more services"
-        "scale:Scale one or multiple services"
+        "scale:Scale one or multiple replicated services"
         "ps:List the tasks of a service"
         "update:Update a service"
     )
@@ -1088,15 +1751,19 @@ __docker_service_subcommand() {
         "($help)*--constraint=[Placement constraints]:constraint: "
         "($help)--endpoint-mode=[Placement constraints]:mode:(dnsrr vip)"
         "($help)*"{-e=,--env=}"[Set environment variables]:env: "
-        "($help)*--group-add=[Add additional user groups to the container]:group:_groups"
+        "($help)--health-cmd=[Command to run to check health]:command: "
+        "($help)--health-interval=[Time between running the check]:time: "
+        "($help)--health-retries=[Consecutive failures needed to report unhealthy]:retries:(1 2 3 4 5)"
+        "($help)--health-timeout=[Maximum time to allow one check to run]:time: "
+        "($help)--hostname=[Service container hostname]:hostname: " \
         "($help)*--label=[Service labels]:label: "
         "($help)--limit-cpu=[Limit CPUs]:value: "
         "($help)--limit-memory=[Limit Memory]:value: "
-        "($help)--log-driver=[Logging driver for service]:logging driver:__docker_log_drivers"
-        "($help)*--log-opt=[Logging driver options]:log driver options:__docker_log_options"
-        "($help)*--mount=[Attach a mount to the service]:mount: "
-        "($help)--name=[Service name]:name: "
+        "($help)--log-driver=[Logging driver for service]:logging driver:__docker_complete_log_drivers"
+        "($help)*--log-opt=[Logging driver options]:log driver options:__docker_complete_log_options"
+        "($help)*--mount=[Attach a filesystem mount to the service]:mount: "
         "($help)*--network=[Network attachments]:network: "
+        "($help)--no-healthcheck[Disable any container-specified HEALTHCHECK]"
         "($help)*"{-p=,--publish=}"[Publish a port as a node port]:port: "
         "($help)--replicas=[Number of tasks]:replicas: "
         "($help)--reserve-cpu=[Reserve CPUs]:value: "
@@ -1105,7 +1772,9 @@ __docker_service_subcommand() {
         "($help)--restart-delay=[Delay between restart attempts]:delay: "
         "($help)--restart-max-attempts=[Maximum number of restarts before giving up]:max-attempts: "
         "($help)--restart-window=[Window used to evaluate the restart policy]:window: "
+        "($help)*--secret=[Specify secrets to expose to the service]:secret:__docker_complete_secrets"
         "($help)--stop-grace-period=[Time to wait before force killing a container]:grace period: "
+        "($help -t --tty)"{-t,--tty}"[Allocate a pseudo-TTY]"
         "($help)--update-delay=[Delay between updates]:delay: "
         "($help)--update-failure-action=[Action on update failure]:mode:(pause continue)"
         "($help)--update-max-failure-ratio=[Failure rate to tolerate during an update]:fraction: "
@@ -1122,8 +1791,14 @@ __docker_service_subcommand() {
                 $opts_help \
                 $opts_create_update \
                 "($help)*--container-label=[Container labels]:label: " \
+                "($help)*--dns=[Set custom DNS servers]:DNS: " \
+                "($help)*--dns-option=[Set DNS options]:DNS option: " \
+                "($help)*--dns-search=[Set custom DNS search domains]:DNS search: " \
+                "($help)*--env-file=[Read environment variables from a file]:environment file:_files" \
                 "($help)--mode=[Service Mode]:mode:(global replicated)" \
-                "($help -): :__docker_images" \
+                "($help)--name=[Service name]:name: " \
+                "($help)*--publish=[Publish a port]:port: " \
+                "($help -): :__docker_complete_images" \
                 "($help -):command: _command_names -e" \
                 "($help -)*::arguments: _normal" && ret=0
             ;;
@@ -1167,10 +1842,10 @@ __docker_service_subcommand() {
         (ps)
             _arguments $(__docker_arguments) \
                 $opts_help \
-                "($help -a --all)"{-a,--all}"[Display all tasks]" \
                 "($help)*"{-f=,--filter=}"[Provide filter values]:filter:->filter-options" \
                 "($help)--no-resolve[Do not map IDs to Names]" \
                 "($help)--no-trunc[Do not truncate output]" \
+                "($help -q --quiet)"{-q,--quiet}"[Only display task IDs]" \
                 "($help -)1:service:__docker_complete_services" && ret=0
             case $state in
                 (filter-options)
@@ -1178,28 +1853,178 @@ __docker_service_subcommand() {
                     ;;
             esac
             ;;
-        (update)
+        (update)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                $opts_create_update \
+                "($help)--arg=[Service command args]:arguments: _normal" \
+                "($help)*--container-label-add=[Add or update container labels]:label: " \
+                "($help)*--container-label-rm=[Remove a container label by its key]:label: " \
+                "($help)*--dns-add=[Add or update custom DNS servers]:DNS: " \
+                "($help)*--dns-rm=[Remove custom DNS servers]:DNS: " \
+                "($help)*--dns-option-add=[Add or update DNS options]:DNS option: " \
+                "($help)*--dns-option-rm=[Remove DNS options]:DNS option: " \
+                "($help)*--dns-search-add=[Add or update custom DNS search domains]:DNS search: " \
+                "($help)*--dns-search-rm=[Remove DNS search domains]:DNS search: " \
+                "($help)--force[Force update]" \
+                "($help)*--group-add=[Add additional supplementary user groups to the container]:group:_groups" \
+                "($help)*--group-rm=[Remove previously added supplementary user groups from the container]:group:_groups" \
+                "($help)--image=[Service image tag]:image:__docker_complete_repositories" \
+                "($help)*--publish-add=[Add or update a port]:port: " \
+                "($help)*--publish-rm=[Remove a port(target-port mandatory)]:port: " \
+                "($help)--rollback[Rollback to previous specification]" \
+                "($help -)1:service:__docker_complete_services" && ret=0
+            ;;
+        (help)
+            _arguments $(__docker_arguments) ":subcommand:__docker_service_commands" && ret=0
+            ;;
+    esac
+
+    return ret
+}
+
+# EO service
+
+# BO stack
+
+__docker_stack_complete_ps_filters() {
+    [[ $PREFIX = -* ]] && return 1
+    integer ret=1
+
+    if compset -P '*='; then
+        case "${${words[-1]%=*}#*=}" in
+            (desired-state)
+                state_opts=('accepted' 'running')
+                _describe -t state-opts "desired state options" state_opts && ret=0
+                ;;
+            *)
+                _message 'value' && ret=0
+                ;;
+        esac
+    else
+        opts=('desired-state' 'id' 'name')
+        _describe -t filter-opts "filter options" opts -qS "=" && ret=0
+    fi
+
+    return ret
+}
+
+__docker_stack_complete_services_filters() {
+    [[ $PREFIX = -* ]] && return 1
+    integer ret=1
+
+    if compset -P '*='; then
+        case "${${words[-1]%=*}#*=}" in
+            *)
+                _message 'value' && ret=0
+                ;;
+        esac
+    else
+        opts=('id' 'label' 'name')
+        _describe -t filter-opts "filter options" opts -qS "=" && ret=0
+    fi
+
+    return ret
+}
+
+__docker_stacks() {
+    [[ $PREFIX = -* ]] && return 1
+    integer ret=1
+    local line s
+    declare -a lines stacks
+
+    lines=(${(f)${:-"$(_call_program commands docker $docker_options stack ls)"$'\n'}})
+
+    # Parse header line to find columns
+    local i=1 j=1 k header=${lines[1]}
+    declare -A begin end
+    while (( j < ${#header} - 1 )); do
+        i=$(( j + ${${header[$j,-1]}[(i)[^ ]]} - 1 ))
+        j=$(( i + ${${header[$i,-1]}[(i)  ]} - 1 ))
+        k=$(( j + ${${header[$j,-1]}[(i)[^ ]]} - 2 ))
+        begin[${header[$i,$((j-1))]}]=$i
+        end[${header[$i,$((j-1))]}]=$k
+    done
+    end[${header[$i,$((j-1))]}]=-1
+    lines=(${lines[2,-1]})
+
+    # Service ID
+    for line in $lines; do
+        s="${line[${begin[ID]},${end[ID]}]%% ##}"
+        stacks=($stacks $s)
+    done
+
+    _describe -t stacks-list "stacks" stacks "$@" && ret=0
+    return ret
+}
+
+__docker_complete_stacks() {
+    [[ $PREFIX = -* ]] && return 1
+    __docker_stacks "$@"
+}
+
+__docker_stack_commands() {
+    local -a _docker_stack_subcommands
+    _docker_stack_subcommands=(
+        "deploy:Deploy a new stack or update an existing stack"
+        "ls:List stacks"
+        "ps:List the tasks in the stack"
+        "rm:Remove the stack"
+        "services:List the services in the stack"
+    )
+    _describe -t docker-stack-commands "docker stack command" _docker_stack_subcommands
+}
+
+__docker_stack_subcommand() {
+    local -a _command_args opts_help
+    local expl help="--help"
+    integer ret=1
+
+    opts_help=("(: -)--help[Print usage]")
+
+    case "$words[1]" in
+        (deploy|up)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help)--bundle-file=[Path to a Distributed Application Bundle file]:dab:_files -g \"*.dab\"" \
+                "($help -c --compose-file)"{-c=,--compose-file=}"[Path to a Compose file]:compose file:_files -g \"*.(yml|yaml)\"" \
+                "($help)--with-registry-auth[Send registry authentication details to Swarm agents]" \
+                "($help -):stack:__docker_complete_stacks" && ret=0
+            ;;
+        (ls|list)
+            _arguments $(__docker_arguments) \
+                $opts_help && ret=0
+            ;;
+        (ps)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -a --all)"{-a,--all}"[Display all tasks]" \
+                "($help)*"{-f=,--filter=}"[Filter output based on conditions provided]:filter:__docker_stack_complete_ps_filters" \
+                "($help)--no-resolve[Do not map IDs to Names]" \
+                "($help)--no-trunc[Do not truncate output]" \
+                "($help -):stack:__docker_complete_stacks" && ret=0
+            ;;
+        (rm|remove|down)
             _arguments $(__docker_arguments) \
                 $opts_help \
-                $opts_create_update \
-                "($help)--arg=[Service command args]:arguments: _normal" \
-                "($help)*--container-label-add=[Add or update container labels]:label: " \
-                "($help)*--container-label-rm=[Remove a container label by its key]:label: " \
-                "($help)--force[Force update]" \
-                "($help)*--group-rm=[Remove previously added user groups from the container]:group:_groups" \
-                "($help)--image=[Service image tag]:image:__docker_repositories" \
-                "($help)--rollback[Rollback to previous specification]" \
-                "($help -)1:service:__docker_complete_services" && ret=0
+                "($help -):stack:__docker_complete_stacks" && ret=0
+            ;;
+        (services)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help)*"{-f=,--filter=}"[Filter output based on conditions provided]:filter:__docker_stack_complete_services_filters" \
+                "($help -q --quiet)"{-q,--quiet}"[Only display IDs]" \
+                "($help -):stack:__docker_complete_stacks" && ret=0
             ;;
         (help)
-            _arguments $(__docker_arguments) ":subcommand:__docker_service_commands" && ret=0
+            _arguments $(__docker_arguments) ":subcommand:__docker_stack_commands" && ret=0
             ;;
     esac
 
     return ret
 }
 
-# EO service
+# EO stack
 
 # BO swarm
 
@@ -1229,7 +2054,10 @@ __docker_swarm_subcommand() {
                 "($help)--advertise-addr[Advertised address]:ip\:port: " \
                 "($help)*--external-ca=[Specifications of one or more certificate signing endpoints]:endpoint: " \
                 "($help)--force-new-cluster[Force create a new cluster from current state]" \
-                "($help)--listen-addr=[Listen address]:ip\:port: " && ret=0
+                "($help)--listen-addr=[Listen address]:ip\:port: " \
+                "($help)--max-snapshots[Number of additional Raft snapshots to retain]" \
+                "($help)--snapshot-interval[Number of log entries between Raft snapshots]" \
+                "($help)--task-history-limit=[Task history retention limit]:limit: " && ret=0
             ;;
         (join)
             _arguments $(__docker_arguments) \
@@ -1248,13 +2076,17 @@ __docker_swarm_subcommand() {
             ;;
         (leave)
             _arguments $(__docker_arguments) \
-                $opts_help && ret=0
+                $opts_help \
+                "($help -f --force)"{-f,--force}"[Force this node to leave the swarm, ignoring warnings]" && ret=0
             ;;
         (update)
             _arguments $(__docker_arguments) \
                 $opts_help \
                 "($help)--cert-expiry=[Validity period for node certificates]:duration: " \
+                "($help)*--external-ca=[Specifications of one or more certificate signing endpoints]:endpoint: " \
                 "($help)--dispatcher-heartbeat=[Dispatcher heartbeat period]:duration: " \
+                "($help)--max-snapshots[Number of additional Raft snapshots to retain]" \
+                "($help)--snapshot-interval[Number of log entries between Raft snapshots]" \
                 "($help)--task-history-limit=[Task history retention limit]:limit: " && ret=0
             ;;
         (help)
@@ -1267,6 +2099,61 @@ __docker_swarm_subcommand() {
 
 # EO swarm
 
+# BO system
+
+__docker_system_commands() {
+    local -a _docker_system_subcommands
+    _docker_system_subcommands=(
+        "df:Show docker filesystem usage"
+        "events:Get real time events from the server"
+        "info:Display system-wide information"
+        "prune:Remove unused data"
+    )
+    _describe -t docker-system-commands "docker system command" _docker_system_subcommands
+}
+
+__docker_system_subcommand() {
+    local -a _command_args opts_help
+    local expl help="--help"
+    integer ret=1
+
+    opts_help=("(: -)--help[Print usage]")
+
+    case "$words[1]" in
+        (df)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -v --verbose)"{-v,--verbose}"[Show detailed information on space usage]" && ret=0
+            ;;
+        (events)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help)*"{-f=,--filter=}"[Filter values]:filter:__docker_complete_events_filter" \
+                "($help)--since=[Events created since this timestamp]:timestamp: " \
+                "($help)--until=[Events created until this timestamp]:timestamp: " \
+                "($help)--format=[Format the output using the given go template]:template: " && ret=0
+            ;;
+        (info)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -f --format)"{-f=,--format=}"[Format the output using the given go template]:template: " && ret=0
+            ;;
+        (prune)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -a --all)"{-a,--all}"[Remove all unused data, not just dangling ones]" \
+                "($help -f --force)"{-f,--force}"[Do not prompt for confirmation]" && ret=0
+            ;;
+        (help)
+            _arguments $(__docker_arguments) ":subcommand:__docker_volume_commands" && ret=0
+            ;;
+    esac
+
+    return ret
+}
+
+# EO system
+
 # BO volume
 
 __docker_volume_complete_ls_filters() {
@@ -1283,7 +2170,7 @@ __docker_volume_complete_ls_filters() {
                 __docker_complete_info_plugins Volume && ret=0
                 ;;
             (name)
-                __docker_volumes && ret=0
+                __docker_complete_volumes && ret=0
                 ;;
             *)
                 _message 'value' && ret=0
@@ -1297,7 +2184,7 @@ __docker_volume_complete_ls_filters() {
     return ret
 }
 
-__docker_volumes() {
+__docker_complete_volumes() {
     [[ $PREFIX = -* ]] && return 1
     integer ret=1
     declare -a lines volumes
@@ -1335,6 +2222,7 @@ __docker_volume_commands() {
         "create:Create a volume"
         "inspect:Display detailed information on one or more volumes"
         "ls:List volumes"
+        "prune:Remove all unused volumes"
         "rm:Remove one or more volumes"
     )
     _describe -t docker-volume-commands "docker volume command" _docker_volume_subcommands
@@ -1360,7 +2248,7 @@ __docker_volume_subcommand() {
             _arguments $(__docker_arguments) \
                 $opts_help \
                 "($help -f --format)"{-f=,--format=}"[Format the output using the given go template]:template: " \
-                "($help -)1:volume:__docker_volumes" && ret=0
+                "($help -)1:volume:__docker_complete_volumes" && ret=0
             ;;
         (ls)
             _arguments $(__docker_arguments) \
@@ -1374,11 +2262,16 @@ __docker_volume_subcommand() {
                     ;;
             esac
             ;;
+        (prune)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -f --force)"{-f,--force}"[Do not prompt for confirmation]" && ret=0
+            ;;
         (rm)
             _arguments $(__docker_arguments) \
                 $opts_help \
                 "($help -f --force)"{-f,--force}"[Force the removal of one or more volumes]" \
-                "($help -):volume:__docker_volumes" && ret=0
+                "($help -):volume:__docker_complete_volumes" && ret=0
             ;;
         (help)
             _arguments $(__docker_arguments) ":subcommand:__docker_volume_commands" && ret=0
@@ -1408,7 +2301,7 @@ __docker_commands() {
     then
         local -a lines
         lines=(${(f)"$(_call_program commands docker 2>&1)"})
-        _docker_subcommands=(${${${lines[$((${lines[(i)Commands:]} + 1)),${lines[(I)    *]}]}## #}/ ##/:})
+        _docker_subcommands=(${${${(M)${lines[$((${lines[(i)*Commands:]} + 1)),-1]}:# *}## #}/ ##/:})
         _docker_subcommands=($_docker_subcommands 'daemon:Enable daemon mode' 'help:Show help for a command')
         (( $#_docker_subcommands > 2 )) && _store_cache docker_subcommands _docker_subcommands
     fi
@@ -1416,188 +2309,61 @@ __docker_commands() {
 }
 
 __docker_subcommand() {
-    local -a _command_args opts_help opts_build_create_run opts_build_create_run_update opts_create_run opts_create_run_update
+    local -a _command_args opts_help
     local expl help="--help"
     integer ret=1
 
     opts_help=("(: -)--help[Print usage]")
-    opts_build_create_run=(
-        "($help)--cgroup-parent=[Parent cgroup for the container]:cgroup: "
-        "($help)--isolation=[Container isolation technology]:isolation:(default hyperv process)"
-        "($help)--disable-content-trust[Skip image verification]"
-        "($help)*--shm-size=[Size of '/dev/shm' (format is '<number><unit>')]:shm size: "
-        "($help)*--ulimit=[ulimit options]:ulimit: "
-        "($help)--userns=[Container user namespace]:user namespace:(host)"
-    )
-    opts_build_create_run_update=(
-        "($help -c --cpu-shares)"{-c=,--cpu-shares=}"[CPU shares (relative weight)]:CPU shares:(0 10 100 200 500 800 1000)"
-        "($help)--cpu-period=[Limit the CPU CFS (Completely Fair Scheduler) period]:CPU period: "
-        "($help)--cpu-quota=[Limit the CPU CFS (Completely Fair Scheduler) quota]:CPU quota: "
-        "($help)--cpuset-cpus=[CPUs in which to allow execution]:CPUs: "
-        "($help)--cpuset-mems=[MEMs in which to allow execution]:MEMs: "
-        "($help -m --memory)"{-m=,--memory=}"[Memory limit]:Memory limit: "
-        "($help)--memory-swap=[Total memory limit with swap]:Memory limit: "
-    )
-    opts_create_run=(
-        "($help -a --attach)"{-a=,--attach=}"[Attach to stdin, stdout or stderr]:device:(STDIN STDOUT STDERR)"
-        "($help)*--add-host=[Add a custom host-to-IP mapping]:host\:ip mapping: "
-        "($help)*--blkio-weight-device=[Block IO (relative device weight)]:device:Block IO weight: "
-        "($help)*--cap-add=[Add Linux capabilities]:capability: "
-        "($help)*--cap-drop=[Drop Linux capabilities]:capability: "
-        "($help)--cidfile=[Write the container ID to the file]:CID file:_files"
-        "($help)*--device=[Add a host device to the container]:device:_files"
-        "($help)*--device-read-bps=[Limit the read rate (bytes per second) from a device]:device:IO rate: "
-        "($help)*--device-read-iops=[Limit the read rate (IO per second) from a device]:device:IO rate: "
-        "($help)*--device-write-bps=[Limit the write rate (bytes per second) to a device]:device:IO rate: "
-        "($help)*--device-write-iops=[Limit the write rate (IO per second) to a device]:device:IO rate: "
-        "($help)*--dns=[Custom DNS servers]:DNS server: "
-        "($help)*--dns-opt=[Custom DNS options]:DNS option: "
-        "($help)*--dns-search=[Custom DNS search domains]:DNS domains: "
-        "($help)*"{-e=,--env=}"[Environment variables]:environment variable: "
-        "($help)--entrypoint=[Overwrite the default entrypoint of the image]:entry point: "
-        "($help)*--env-file=[Read environment variables from a file]:environment file:_files"
-        "($help)*--expose=[Expose a port from the container without publishing it]: "
-        "($help)*--group-add=[Add additional groups to run as]:group:_groups"
-        "($help -h --hostname)"{-h=,--hostname=}"[Container host name]:hostname:_hosts"
-        "($help -i --interactive)"{-i,--interactive}"[Keep stdin open even if not attached]"
-        "($help)--ip=[Container IPv4 address]:IPv4: "
-        "($help)--ip6=[Container IPv6 address]:IPv6: "
-        "($help)--ipc=[IPC namespace to use]:IPC namespace: "
-        "($help)*--link=[Add link to another container]:link:->link"
-        "($help)*--link-local-ip=[Add a link-local address for the container]:IPv4/IPv6: "
-        "($help)*"{-l=,--label=}"[Container metadata]:label: "
-        "($help)--log-driver=[Default driver for container logs]:logging driver:__docker_log_drivers"
-        "($help)*--log-opt=[Log driver specific options]:log driver options:__docker_log_options"
-        "($help)--mac-address=[Container MAC address]:MAC address: "
-        "($help)--name=[Container name]:name: "
-        "($help)--network=[Connect a container to a network]:network mode:(bridge none container host)"
-        "($help)*--network-alias=[Add network-scoped alias for the container]:alias: "
-        "($help)--oom-kill-disable[Disable OOM Killer]"
-        "($help)--oom-score-adj[Tune the host's OOM preferences for containers (accepts -1000 to 1000)]"
-        "($help)--pids-limit[Tune container pids limit (set -1 for unlimited)]"
-        "($help -P --publish-all)"{-P,--publish-all}"[Publish all exposed ports]"
-        "($help)*"{-p=,--publish=}"[Expose a container's port to the host]:port:_ports"
-        "($help)--pid=[PID namespace to use]:PID namespace:__docker_complete_pid"
-        "($help)--privileged[Give extended privileges to this container]"
-        "($help)--read-only[Mount the container's root filesystem as read only]"
-        "($help)*--security-opt=[Security options]:security option: "
-        "($help)*--sysctl=-[sysctl options]:sysctl: "
-        "($help -t --tty)"{-t,--tty}"[Allocate a pseudo-tty]"
-        "($help -u --user)"{-u=,--user=}"[Username or UID]:user:_users"
-        "($help)--tmpfs[mount tmpfs]"
-        "($help)*-v[Bind mount a volume]:volume: "
-        "($help)--volume-driver=[Optional volume driver for the container]:volume driver:(local)"
-        "($help)*--volumes-from=[Mount volumes from the specified container]:volume: "
-        "($help -w --workdir)"{-w=,--workdir=}"[Working directory inside the container]:directory:_directories"
-    )
-    opts_create_run_update=(
-        "($help)--blkio-weight=[Block IO (relative weight), between 10 and 1000]:Block IO weight:(10 100 500 1000)"
-        "($help)--kernel-memory=[Kernel memory limit in bytes]:Memory limit: "
-        "($help)--memory-reservation=[Memory soft limit]:Memory limit: "
-        "($help)--restart=[Restart policy]:restart policy:(no on-failure always unless-stopped)"
-    )
-    opts_attach_exec_run_start=(
-        "($help)--detach-keys=[Escape key sequence used to detach a container]:sequence:__docker_complete_detach_keys"
-    )
 
     case "$words[1]" in
-        (attach)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                $opts_attach_exec_run_start \
-                "($help)--no-stdin[Do not attach stdin]" \
-                "($help)--sig-proxy[Proxy all received signals to the process (non-TTY mode only)]" \
-                "($help -):containers:__docker_runningcontainers" && ret=0
-            ;;
-        (build)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                $opts_build_create_run \
-                $opts_build_create_run_update \
-                "($help)*--build-arg[Build-time variables]:<varname>=<value>: " \
-                "($help)--compress[Compress the build context using gzip]" \
-                "($help -f --file)"{-f=,--file=}"[Name of the Dockerfile]:Dockerfile:_files" \
-                "($help)--force-rm[Always remove intermediate containers]" \
-                "($help)*--label=[Set metadata for an image]:label=value: " \
-                "($help)--no-cache[Do not use cache when building the image]" \
-                "($help)--pull[Attempt to pull a newer version of the image]" \
-                "($help -q --quiet)"{-q,--quiet}"[Suppress verbose build output]" \
-                "($help)--rm[Remove intermediate containers after a successful build]" \
-                "($help -t --tag)*"{-t=,--tag=}"[Repository, name and tag for the image]: :__docker_repositories_with_tags" \
-                "($help -):path or URL:_directories" && ret=0
-            ;;
-        (commit)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -a --author)"{-a=,--author=}"[Author]:author: " \
-                "($help)*"{-c=,--change=}"[Apply Dockerfile instruction to the created image]:Dockerfile:_files" \
-                "($help -m --message)"{-m=,--message=}"[Commit message]:message: " \
-                "($help -p --pause)"{-p,--pause}"[Pause container during commit]" \
-                "($help -):container:__docker_containers" \
-                "($help -): :__docker_repositories_with_tags" && ret=0
+        (attach|commit|cp|create|diff|exec|export|kill|logs|pause|unpause|port|rename|restart|rm|run|start|stats|stop|top|update|wait)
+            __docker_container_subcommand && ret=0
             ;;
-        (cp)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -L --follow-link)"{-L,--follow-link}"[Always follow symbol link]" \
-                "($help -)1:container:->container" \
-                "($help -)2:hostpath:_files" && ret=0
-            case $state in
-                (container)
-                    if compset -P "*:"; then
-                        _files && ret=0
-                    else
-                        __docker_containers -qS ":" && ret=0
-                    fi
-                    ;;
-            esac
+        (build|history|import|load|pull|push|save|tag)
+            __docker_image_subcommand && ret=0
             ;;
-        (create)
+        (container)
+            local curcontext="$curcontext" state
             _arguments $(__docker_arguments) \
                 $opts_help \
-                $opts_build_create_run \
-                $opts_build_create_run_update \
-                $opts_create_run \
-                $opts_create_run_update \
-                "($help -): :__docker_images" \
-                "($help -):command: _command_names -e" \
-                "($help -)*::arguments: _normal" && ret=0
+                "($help -): :->command" \
+                "($help -)*:: :->option-or-argument" && ret=0
 
             case $state in
-                (link)
-                    if compset -P "*:"; then
-                        _wanted alias expl "Alias" compadd -E "" && ret=0
-                    else
-                        __docker_runningcontainers -qS ":" && ret=0
-                    fi
+                (command)
+                    __docker_container_commands && ret=0
+                    ;;
+                (option-or-argument)
+                    curcontext=${curcontext%:*:*}:docker-${words[-1]}:
+                    __docker_container_subcommand && ret=0
                     ;;
             esac
-
             ;;
         (daemon)
             _arguments $(__docker_arguments) \
                 $opts_help \
                 "($help)*--add-runtime=[Register an additional OCI compatible runtime]:runtime:__docker_complete_runtimes" \
-                "($help)--api-cors-header=[CORS headers in the remote API]:CORS headers: " \
+                "($help)--api-cors-header=[CORS headers in the Engine API]:CORS headers: " \
                 "($help)*--authorization-plugin=[Authorization plugins to load]" \
                 "($help -b --bridge)"{-b=,--bridge=}"[Attach containers to a network bridge]:bridge:_net_interfaces" \
                 "($help)--bip=[Network bridge IP]:IP address: " \
                 "($help)--cgroup-parent=[Parent cgroup for all containers]:cgroup: " \
+                "($help)--cluster-advertise=[Address or interface name to advertise]:Instance to advertise (host\:port): " \
+                "($help)--cluster-store=[URL of the distributed storage backend]:Cluster Store:->cluster-store" \
+                "($help)*--cluster-store-opt=[Cluster store options]:Cluster options:->cluster-store-options" \
                 "($help)--config-file=[Path to daemon configuration file]:Config File:_files" \
                 "($help)--containerd=[Path to containerd socket]:socket:_files -g \"*.sock\"" \
                 "($help -D --debug)"{-D,--debug}"[Enable debug mode]" \
                 "($help)--default-gateway[Container default gateway IPv4 address]:IPv4 address: " \
                 "($help)--default-gateway-v6[Container default gateway IPv6 address]:IPv6 address: " \
-                "($help)--cluster-store=[URL of the distributed storage backend]:Cluster Store:->cluster-store" \
-                "($help)--cluster-advertise=[Address or interface name to advertise]:Instance to advertise (host\:port): " \
-                "($help)*--cluster-store-opt=[Cluster store options]:Cluster options:->cluster-store-options" \
-                "($help)*--dns=[DNS server to use]:DNS: " \
-                "($help)*--dns-search=[DNS search domains to use]:DNS search: " \
-                "($help)*--dns-opt=[DNS options to use]:DNS option: " \
                 "($help)*--default-ulimit=[Default ulimits for containers]:ulimit: " \
                 "($help)--disable-legacy-registry[Disable contacting legacy registries]" \
+                "($help)*--dns=[DNS server to use]:DNS: " \
+                "($help)*--dns-opt=[DNS options to use]:DNS option: " \
+                "($help)*--dns-search=[DNS search domains to use]:DNS search: " \
                 "($help)*--exec-opt=[Runtime execution options]:runtime execution options: " \
                 "($help)--exec-root=[Root directory for execution state files]:path:_directories" \
+                "($help)--experimental[Enable experimental features]" \
                 "($help)--fixed-cidr=[IPv4 subnet for fixed IPs]:IPv4 subnet: " \
                 "($help)--fixed-cidr-v6=[IPv6 subnet for fixed IPs]:IPv6 subnet: " \
                 "($help -G --group)"{-G=,--group=}"[Group for the unix socket]:group:_groups" \
@@ -1614,8 +2380,8 @@ __docker_subcommand() {
                 "($help -l --log-level)"{-l=,--log-level=}"[Logging level]:level:(debug info warn error fatal)" \
                 "($help)*--label=[Key=value labels]:label: " \
                 "($help)--live-restore[Enable live restore of docker when containers are still running]" \
-                "($help)--log-driver=[Default driver for container logs]:logging driver:__docker_log_drivers" \
-                "($help)*--log-opt=[Default log driver options for containers]:log driver options:__docker_log_options" \
+                "($help)--log-driver=[Default driver for container logs]:logging driver:__docker_complete_log_drivers" \
+                "($help)*--log-opt=[Default log driver options for containers]:log driver options:__docker_complete_log_options" \
                 "($help)--max-concurrent-downloads[Set the max concurrent downloads for each pull]" \
                 "($help)--max-concurrent-uploads[Set the max concurrent uploads for each push]" \
                 "($help)--mtu=[Network MTU]:mtu:(0 576 1420 1500 9000)" \
@@ -1623,8 +2389,10 @@ __docker_subcommand() {
                 "($help -p --pidfile)"{-p=,--pidfile=}"[Path to use for daemon PID file]:PID file:_files" \
                 "($help)--raw-logs[Full timestamps without ANSI coloring]" \
                 "($help)*--registry-mirror=[Preferred Docker registry mirror]:registry mirror: " \
+                "($help)--seccomp-profile=[Path to seccomp profile]:path:_files -g \"*.json\"" \
                 "($help -s --storage-driver)"{-s=,--storage-driver=}"[Storage driver to use]:driver:(aufs btrfs devicemapper overlay overlay2 vfs zfs)" \
                 "($help)--selinux-enabled[Enable selinux support]" \
+                "($help)--shutdown-timeout=[Set the shutdown timeout value in seconds]:time: " \
                 "($help)*--storage-opt=[Storage driver options]:storage driver options: " \
                 "($help)--tls[Use TLS]" \
                 "($help)--tlscacert=[Trust certs signed only by this CA]:PEM file:_files -g \"*.(pem|crt)\"" \
@@ -1632,113 +2400,59 @@ __docker_subcommand() {
                 "($help)--tlskey=[Path to TLS key file]:Key file:_files -g \"*.(pem|key)\"" \
                 "($help)--tlsverify[Use TLS and verify the remote]" \
                 "($help)--userns-remap=[User/Group setting for user namespaces]:user\:group:->users-groups" \
-                "($help)--userland-proxy[Use userland proxy for loopback traffic]" && ret=0
+                "($help)--userland-proxy[Use userland proxy for loopback traffic]" \
+                "($help)--userland-proxy-path=[Path to the userland proxy binary]:binary:_files" && ret=0
 
             case $state in
                 (cluster-store)
                     if compset -P '*://'; then
-                        _message 'host:port' && ret=0
-                    else
-                        store=('consul' 'etcd' 'zk')
-                        _describe -t cluster-store "Cluster Store" store -qS "://" && ret=0
-                    fi
-                    ;;
-                (cluster-store-options)
-                    if compset -P '*='; then
-                        _files && ret=0
-                    else
-                        opts=('discovery.heartbeat' 'discovery.ttl' 'kv.cacertfile' 'kv.certfile' 'kv.keyfile' 'kv.path')
-                        _describe -t cluster-store-opts "Cluster Store Options" opts -qS "=" && ret=0
-                    fi
-                    ;;
-                (users-groups)
-                    if compset -P '*:'; then
-                        _groups && ret=0
-                    else
-                        _describe -t userns-default "default Docker user management" '(default)' && ret=0
-                        _users && ret=0
-                    fi
-                    ;;
-            esac
-            ;;
-        (diff)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -)*:containers:__docker_containers" && ret=0
-            ;;
-        (events)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help)*"{-f=,--filter=}"[Filter values]:filter:__docker_complete_events_filter" \
-                "($help)--since=[Events created since this timestamp]:timestamp: " \
-                "($help)--until=[Events created until this timestamp]:timestamp: " \
-                "($help)--format=[Format the output using the given go template]:template: " && ret=0
-            ;;
-        (exec)
-            local state
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                $opts_attach_exec_run_start \
-                "($help -d --detach)"{-d,--detach}"[Detached mode: leave the container running in the background]" \
-                "($help -e --env)"{-e,--env}"[Set environment variables]" \
-                "($help -i --interactive)"{-i,--interactive}"[Keep stdin open even if not attached]" \
-                "($help)--privileged[Give extended Linux capabilities to the command]" \
-                "($help -t --tty)"{-t,--tty}"[Allocate a pseudo-tty]" \
-                "($help -u --user)"{-u=,--user=}"[Username or UID]:user:_users" \
-                "($help -):containers:__docker_runningcontainers" \
-                "($help -)*::command:->anycommand" && ret=0
-
-            case $state in
-                (anycommand)
-                    shift 1 words
-                    (( CURRENT-- ))
-                    _normal && ret=0
+                        _message 'host:port' && ret=0
+                    else
+                        store=('consul' 'etcd' 'zk')
+                        _describe -t cluster-store "Cluster Store" store -qS "://" && ret=0
+                    fi
+                    ;;
+                (cluster-store-options)
+                    if compset -P '*='; then
+                        _files && ret=0
+                    else
+                        opts=('discovery.heartbeat' 'discovery.ttl' 'kv.cacertfile' 'kv.certfile' 'kv.keyfile' 'kv.path')
+                        _describe -t cluster-store-opts "Cluster Store Options" opts -qS "=" && ret=0
+                    fi
+                    ;;
+                (users-groups)
+                    if compset -P '*:'; then
+                        _groups && ret=0
+                    else
+                        _describe -t userns-default "default Docker user management" '(default)' && ret=0
+                        _users && ret=0
+                    fi
                     ;;
             esac
             ;;
-        (export)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -o --output)"{-o=,--output=}"[Write to a file, instead of stdout]:output file:_files" \
-                "($help -)*:containers:__docker_containers" && ret=0
-            ;;
-        (history)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -H --human)"{-H,--human}"[Print sizes and dates in human readable format]" \
-                "($help)--no-trunc[Do not truncate output]" \
-                "($help -q --quiet)"{-q,--quiet}"[Only show numeric IDs]" \
-                "($help -)*: :__docker_images" && ret=0
+        (events|info)
+            __docker_system_subcommand && ret=0
             ;;
-        (images)
+        (image)
+            local curcontext="$curcontext" state
             _arguments $(__docker_arguments) \
                 $opts_help \
-                "($help -a --all)"{-a,--all}"[Show all images]" \
-                "($help)--digests[Show digests]" \
-                "($help)*"{-f=,--filter=}"[Filter values]:filter:->filter-options" \
-                "($help)--format=[Pretty-print images using a Go template]:template: " \
-                "($help)--no-trunc[Do not truncate output]" \
-                "($help -q --quiet)"{-q,--quiet}"[Only show numeric IDs]" \
-                "($help -): :__docker_repositories" && ret=0
+                "($help -): :->command" \
+                "($help -)*:: :->option-or-argument" && ret=0
 
             case $state in
-                (filter-options)
-                    __docker_complete_images_filters && ret=0
+                (command)
+                    __docker_image_commands && ret=0
+                    ;;
+                (option-or-argument)
+                    curcontext=${curcontext%:*:*}:docker-${words[-1]}:
+                    __docker_image_subcommand && ret=0
                     ;;
             esac
             ;;
-        (import)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help)*"{-c=,--change=}"[Apply Dockerfile instruction to the created image]:Dockerfile:_files" \
-                "($help -m --message)"{-m=,--message=}"[Commit message for imported image]:message: " \
-                "($help -):URL:(- http:// file://)" \
-                "($help -): :__docker_repositories_with_tags" && ret=0
-            ;;
-        (info|version)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -f --format)"{-f=,--format=}"[Format the output using the given go template]:template: " && ret=0
+        (images)
+            words[1]='ls'
+            __docker_image_subcommand && ret=0
             ;;
         (inspect)
             local state
@@ -1746,33 +2460,37 @@ __docker_subcommand() {
                 $opts_help \
                 "($help -f --format)"{-f=,--format=}"[Format the output using the given go template]:template: " \
                 "($help -s --size)"{-s,--size}"[Display total file sizes if the type is container]" \
-                "($help)--type=[Return JSON for specified type]:type:(image container)" \
+                "($help)--type=[Return JSON for specified type]:type:(container image network node plugin service volume)" \
                 "($help -)*: :->values" && ret=0
 
             case $state in
                 (values)
                     if [[ ${words[(r)--type=container]} == --type=container ]]; then
-                        __docker_containers && ret=0
+                        __docker_complete_containers && ret=0
                     elif [[ ${words[(r)--type=image]} == --type=image ]]; then
-                        __docker_images && ret=0
+                        __docker_complete_images && ret=0
+                    elif [[ ${words[(r)--type=network]} == --type=network ]]; then
+                        __docker_complete_networks && ret=0
+                    elif [[ ${words[(r)--type=node]} == --type=node ]]; then
+                        __docker_complete_nodes && ret=0
+                    elif [[ ${words[(r)--type=plugin]} == --type=plugin ]]; then
+                        __docker_complete_plugins && ret=0
+                    elif [[ ${words[(r)--type=service]} == --type=service ]]; then
+                        __docker_complete_services && ret=0
+                    elif [[ ${words[(r)--type=volume]} == --type=volume ]]; then
+                        __docker_complete_volumes && ret=0
                     else
-                        __docker_images && __docker_containers && ret=0
+                        __docker_complete_containers
+                        __docker_complete_images
+                        __docker_complete_networks
+                        __docker_complete_nodes
+                        __docker_complete_plugins
+                        __docker_complete_services
+                        __docker_complete_volumes && ret=0
                     fi
                     ;;
             esac
             ;;
-        (kill)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -s --signal)"{-s=,--signal=}"[Signal to send]:signal:_signals" \
-                "($help -)*:containers:__docker_runningcontainers" && ret=0
-            ;;
-        (load)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -i --input)"{-i=,--input=}"[Read from tar archive file]:archive file:_files -g \"*.((tar|TAR)(.gz|.GZ|.Z|.bz2|.lzma|.xz|)|(tbz|tgz|txz))(-.)\"" \
-                "($help -q --quiet)"{-q,--quiet}"[Suppress the load output]" && ret=0
-            ;;
         (login)
             _arguments $(__docker_arguments) \
                 $opts_help \
@@ -1785,16 +2503,6 @@ __docker_subcommand() {
                 $opts_help \
                 "($help -)1:server: " && ret=0
             ;;
-        (logs)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help)--details[Show extra details provided to logs]" \
-                "($help -f --follow)"{-f,--follow}"[Follow log output]" \
-                "($help -s --since)"{-s=,--since=}"[Show logs since this timestamp]:timestamp: " \
-                "($help -t --timestamps)"{-t,--timestamps}"[Show timestamps]" \
-                "($help)--tail=[Output the last K lines]:lines:(1 10 20 50 all)" \
-                "($help -)*:containers:__docker_containers" && ret=0
-            ;;
         (network)
             local curcontext="$curcontext" state
             _arguments $(__docker_arguments) \
@@ -1829,11 +2537,6 @@ __docker_subcommand() {
                     ;;
             esac
             ;;
-        (pause|unpause)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -)*:containers:__docker_runningcontainers" && ret=0
-            ;;
         (plugin)
             local curcontext="$curcontext" state
             _arguments $(__docker_arguments) \
@@ -1851,128 +2554,13 @@ __docker_subcommand() {
                     ;;
             esac
             ;;
-        (port)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -)1:containers:__docker_runningcontainers" \
-                "($help -)2:port:_ports" && ret=0
-            ;;
         (ps)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -a --all)"{-a,--all}"[Show all containers]" \
-                "($help)--before=[Show only container created before...]:containers:__docker_containers" \
-                "($help)*"{-f=,--filter=}"[Filter values]:filter:__docker_complete_ps_filters" \
-                "($help)--format=[Pretty-print containers using a Go template]:template: " \
-                "($help -l --latest)"{-l,--latest}"[Show only the latest created container]" \
-                "($help -n --last)"{-n=,--last=}"[Show n last created containers (includes all states)]:n:(1 5 10 25 50)" \
-                "($help)--no-trunc[Do not truncate output]" \
-                "($help -q --quiet)"{-q,--quiet}"[Only show numeric IDs]" \
-                "($help -s --size)"{-s,--size}"[Display total file sizes]" \
-                "($help)--since=[Show only containers created since...]:containers:__docker_containers" && ret=0
-            ;;
-        (pull)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -a --all-tags)"{-a,--all-tags}"[Download all tagged images]" \
-                "($help)--disable-content-trust[Skip image verification]" \
-                "($help -):name:__docker_search" && ret=0
-            ;;
-        (push)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help)--disable-content-trust[Skip image signing]" \
-                "($help -): :__docker_images" && ret=0
-            ;;
-        (rename)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -):old name:__docker_containers" \
-                "($help -):new name: " && ret=0
-            ;;
-        (stop)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -t --time)"{-t=,--time=}"[Number of seconds to try to stop for before killing the container]:seconds to before killing:(1 5 10 30 60)" \
-                "($help -)*:containers:__docker_runningcontainers" && ret=0
-            ;;
-        (restart)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -t --time)"{-t=,--time=}"[Number of seconds to try to stop for before killing the container]:seconds to before killing:(1 5 10 30 60)" \
-                "($help -)*:containers:__docker_containers_ids" && ret=0
-            ;;
-        (rm)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -f --force)"{-f,--force}"[Force removal]" \
-                "($help -l --link)"{-l,--link}"[Remove the specified link and not the underlying container]" \
-                "($help -v --volumes)"{-v,--volumes}"[Remove the volumes associated to the container]" \
-                "($help -)*:containers:->values" && ret=0
-            case $state in
-                (values)
-                    if [[ ${words[(r)-f]} == -f || ${words[(r)--force]} == --force ]]; then
-                        __docker_containers && ret=0
-                    else
-                        __docker_stoppedcontainers && ret=0
-                    fi
-                    ;;
-            esac
+            words[1]='ls'
+            __docker_container_subcommand && ret=0
             ;;
         (rmi)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -f --force)"{-f,--force}"[Force removal]" \
-                "($help)--no-prune[Do not delete untagged parents]" \
-                "($help -)*: :__docker_images" && ret=0
-            ;;
-        (run)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                $opts_build_create_run \
-                $opts_build_create_run_update \
-                $opts_create_run \
-                $opts_create_run_update \
-                $opts_attach_exec_run_start \
-                "($help -d --detach)"{-d,--detach}"[Detached mode: leave the container running in the background]" \
-                "($help)--health-cmd=[Command to run to check health]:command: " \
-                "($help)--health-interval=[Time between running the check]:time: " \
-                "($help)--health-retries=[Consecutive failures needed to report unhealthy]:retries:(1 2 3 4 5)" \
-                "($help)--health-timeout=[Maximum time to allow one check to run]:time: " \
-                "($help)--no-healthcheck[Disable any container-specified HEALTHCHECK]" \
-                "($help)--rm[Remove intermediate containers when it exits]" \
-                "($help)--runtime=[Name of the runtime to be used for that container]:runtime:__docker_complete_runtimes" \
-                "($help)--sig-proxy[Proxy all received signals to the process (non-TTY mode only)]" \
-                "($help)--stop-signal=[Signal to kill a container]:signal:_signals" \
-                "($help)--storage-opt=[Storage driver options for the container]:storage options:->storage-opt" \
-                "($help -): :__docker_images" \
-                "($help -):command: _command_names -e" \
-                "($help -)*::arguments: _normal" && ret=0
-
-            case $state in
-                (link)
-                    if compset -P "*:"; then
-                        _wanted alias expl "Alias" compadd -E "" && ret=0
-                    else
-                        __docker_runningcontainers -qS ":" && ret=0
-                    fi
-                    ;;
-                (storage-opt)
-                    if compset -P "*="; then
-                        _message "value" && ret=0
-                    else
-                        opts=('size')
-                        _describe -t filter-opts "storage options" opts -qS "=" && ret=0
-                    fi
-                    ;;
-            esac
-
-            ;;
-        (save)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -o --output)"{-o=,--output=}"[Write to file]:file:_files" \
-                "($help -)*: :__docker_images" && ret=0
+            words[1]='rm'
+            __docker_image_subcommand && ret=0
             ;;
         (search)
             _arguments $(__docker_arguments) \
@@ -1988,7 +2576,7 @@ __docker_subcommand() {
                     ;;
             esac
             ;;
-        (service)
+        (secret)
             local curcontext="$curcontext" state
             _arguments $(__docker_arguments) \
                 $opts_help \
@@ -1997,29 +2585,47 @@ __docker_subcommand() {
 
             case $state in
                 (command)
-                    __docker_service_commands && ret=0
+                    __docker_secret_commands && ret=0
                     ;;
                 (option-or-argument)
                     curcontext=${curcontext%:*:*}:docker-${words[-1]}:
-                    __docker_service_subcommand && ret=0
+                    __docker_secret_subcommand && ret=0
                     ;;
             esac
             ;;
-        (start)
+        (service)
+            local curcontext="$curcontext" state
             _arguments $(__docker_arguments) \
                 $opts_help \
-                $opts_attach_exec_run_start \
-                "($help -a --attach)"{-a,--attach}"[Attach container's stdout/stderr and forward all signals]" \
-                "($help -i --interactive)"{-i,--interactive}"[Attach container's stding]" \
-                "($help -)*:containers:__docker_stoppedcontainers" && ret=0
+                "($help -): :->command" \
+                "($help -)*:: :->option-or-argument" && ret=0
+
+            case $state in
+                (command)
+                    __docker_service_commands && ret=0
+                    ;;
+                (option-or-argument)
+                    curcontext=${curcontext%:*:*}:docker-${words[-1]}:
+                    __docker_service_subcommand && ret=0
+                    ;;
+            esac
             ;;
-        (stats)
+        (stack)
+            local curcontext="$curcontext" state
             _arguments $(__docker_arguments) \
                 $opts_help \
-                "($help -a --all)"{-a,--all}"[Show all containers (default shows just running)]" \
-                "($help)--format=[Pretty-print images using a Go template]:template: " \
-                "($help)--no-stream[Disable streaming stats and only pull the first result]" \
-                "($help -)*:containers:__docker_runningcontainers" && ret=0
+                "($help -): :->command" \
+                "($help -)*:: :->option-or-argument" && ret=0
+
+            case $state in
+                (command)
+                    __docker_stack_commands && ret=0
+                    ;;
+                (option-or-argument)
+                    curcontext=${curcontext%:*:*}:docker-${words[-1]}:
+                    __docker_stack_subcommand && ret=0
+                    ;;
+            esac
             ;;
         (swarm)
             local curcontext="$curcontext" state
@@ -2038,40 +2644,27 @@ __docker_subcommand() {
                     ;;
             esac
             ;;
-        (tag)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -):source:__docker_images"\
-                "($help -):destination:__docker_repositories_with_tags" && ret=0
-            ;;
-        (top)
+        (system)
+            local curcontext="$curcontext" state
             _arguments $(__docker_arguments) \
                 $opts_help \
-                "($help -)1:containers:__docker_runningcontainers" \
-                "($help -)*:: :->ps-arguments" && ret=0
+                "($help -): :->command" \
+                "($help -)*:: :->option-or-argument" && ret=0
+
             case $state in
-                (ps-arguments)
-                    _ps && ret=0
+                (command)
+                    __docker_system_commands && ret=0
+                    ;;
+                (option-or-argument)
+                    curcontext=${curcontext%:*:*}:docker-${words[-1]}:
+                    __docker_system_subcommand && ret=0
                     ;;
             esac
-
             ;;
-        (update)
+        (version)
             _arguments $(__docker_arguments) \
                 $opts_help \
-                $opts_create_run_update \
-                $opts_build_create_run_update \
-                "($help -)*: :->values" && ret=0
-
-            case $state in
-                (values)
-                    if [[ ${words[(r)--kernel-memory*]} = (--kernel-memory*) ]]; then
-                        __docker_stoppedcontainers && ret=0
-                    else
-                        __docker_containers && ret=0
-                    fi
-                    ;;
-            esac
+                "($help -f --format)"{-f=,--format=}"[Format the output using the given go template]:template: " && ret=0
             ;;
         (volume)
             local curcontext="$curcontext" state
@@ -2090,11 +2683,6 @@ __docker_subcommand() {
                     ;;
             esac
             ;;
-        (wait)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -)*:containers:__docker_runningcontainers" && ret=0
-            ;;
         (help)
             _arguments $(__docker_arguments) ":subcommand:__docker_commands" && ret=0
             ;;
-- 
cgit v1.2.3-70-g09d2


From 6fe2028a1264a79330f16b1dbd6da8f59dc6854f Mon Sep 17 00:00:00 2001
From: Dariusz Luksza <dariusz@luksza.org>
Date: Sun, 25 Jan 2015 13:29:42 +0100
Subject: Fix emacs client terminal

Fixes #3305

Signed-off-by: Dariusz Luksza <dariusz@luksza.org>
---
 plugins/emacs/emacs.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/emacs/emacs.plugin.zsh b/plugins/emacs/emacs.plugin.zsh
index c102a5a1e..929aa0616 100644
--- a/plugins/emacs/emacs.plugin.zsh
+++ b/plugins/emacs/emacs.plugin.zsh
@@ -16,7 +16,7 @@ if "$ZSH/tools/require_tool.sh" emacs 24 2>/dev/null ; then
     # set EDITOR if not already defined.
     export EDITOR="${EDITOR:-${EMACS_PLUGIN_LAUNCHER}}"
 
-    alias emacs="$EMACS_PLUGIN_LAUNCHER --no-wait"
+    alias emacs="$EMACS_PLUGIN_LAUNCHER -t"
     alias e=emacs
     # open terminal emacsclient
     alias te="$EMACS_PLUGIN_LAUNCHER -nw"
-- 
cgit v1.2.3-70-g09d2


From 456341fd69c3e514e401f1c3c1726b77d733c86b Mon Sep 17 00:00:00 2001
From: Felipe Guilherme <felipeguilhermefs@users.noreply.github.com>
Date: Sat, 17 Dec 2016 15:01:13 -0200
Subject: Add git alias for staging tracked files (#5178)

Although `gaa` (git add --all) is cool, it stages every file, tracked or
not, if it is not on .gitignore.

Sometimes we want to just stage everything we are working on, that is
already tracked. For that reason, 'gau' can save us some time.
---
 plugins/git/git.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 9d8e4174a..34942d387 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -43,6 +43,7 @@ alias g='git'
 alias ga='git add'
 alias gaa='git add --all'
 alias gapa='git add --patch'
+alias gau='git add --update'
 
 alias gb='git branch'
 alias gba='git branch -a'
-- 
cgit v1.2.3-70-g09d2


From 1ca2fe63deb0db4870b867c7da7dddc36b15963b Mon Sep 17 00:00:00 2001
From: Geoff Lane <geoff@zorched.net>
Date: Sat, 17 Dec 2016 16:32:53 -0500
Subject: Add file completion to `mix run` (#5673)

---
 plugins/mix/_mix | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'plugins')

diff --git a/plugins/mix/_mix b/plugins/mix/_mix
index 57fdf808a..cfeb4705e 100644
--- a/plugins/mix/_mix
+++ b/plugins/mix/_mix
@@ -86,6 +86,9 @@ case $state in
       (test)
          _files
          ;;
+      (run)
+         _files
+         ;;
     esac
   ;;
 esac
-- 
cgit v1.2.3-70-g09d2


From c6de77ca992648ea2be7beef5f35f5ce9f0151a9 Mon Sep 17 00:00:00 2001
From: Mauro Porras P <mauroporrasp@gmail.com>
Date: Sat, 17 Dec 2016 16:52:01 -0500
Subject: Add a React Native alias, and one to start the web server (#5711)

* Add a React Native alias, and one to start the web server

* Reorganise aliases in react-native plugin

* Update README for react-native plugin:

  Fix format and add a brief description
  Add missing aliases in react-native plugin README
---
 plugins/react-native/README.md               | 32 +++++++++++++++++++---------
 plugins/react-native/react-native.plugin.zsh |  8 ++++---
 2 files changed, 27 insertions(+), 13 deletions(-)

(limited to 'plugins')

diff --git a/plugins/react-native/README.md b/plugins/react-native/README.md
index 78bfb6844..c6fe396b8 100644
--- a/plugins/react-native/README.md
+++ b/plugins/react-native/README.md
@@ -1,14 +1,26 @@
-# React Native 
+# React Native plugin
 
-**Maintainer:** [BilalBudhani](https://github.com/BilalBudhani)
+This plugin adds completion for [`react-native`](https://facebook.github.io/react-native/).
+It also defines a few [aliases](#aliases) for the commands more frequently used.
 
-### List of Aliases
+To enable, add `react-native` to your `plugins` array in your zshrc file:
 
-Alias | React Native command
-------|---------------------
-**rnand** | *react-native run-android*
-**rnios** | *react-native run-ios*
-**rnios4s** | *react-native run-ios --simulator "iPhone 4s"*
-**rnios5** | *react-native run-ios --simulator "iPhone 5"*
-**rnios5s** | *react-native run-ios --simulator "iPhone 5s"*
+```zsh
+plugins=(... react-native)
+```
 
+## Aliases
+
+| Alias       | React Native command                           |
+|:------------|:-----------------------------------------------|
+| **rn**      | `react-native`                                 |
+| **rns**     | `react-native start`                           |
+| **rnlink**  | `react-native link`                            |
+| _App testing_                                                |
+| **rnand**   | `react-native run-android`                     |
+| **rnios**   | `react-native run-ios`                         |
+| **rnios4s** | `react-native run-ios --simulator "iPhone 4s"` |
+| **rnios5**  | `react-native run-ios --simulator "iPhone 5"`  |
+| **rnios5s** | `react-native run-ios --simulator "iPhone 5s"` |
+| **rnios6**  | `react-native run-ios --simulator "iPhone 6"`  |
+| **rnios6s** | `react-native run-ios --simulator "iPhone 6s"` |
diff --git a/plugins/react-native/react-native.plugin.zsh b/plugins/react-native/react-native.plugin.zsh
index f19cba820..892a31fbe 100644
--- a/plugins/react-native/react-native.plugin.zsh
+++ b/plugins/react-native/react-native.plugin.zsh
@@ -1,9 +1,11 @@
+alias rn='react-native'
+alias rns='react-native start'
+alias rnlink='react-native link'
+
 alias rnand='react-native run-android'
+alias rnios='react-native run-ios'
 alias rnios4s='react-native run-ios --simulator "iPhone 4s"'
 alias rnios5='react-native run-ios --simulator "iPhone 5"'
 alias rnios5s='react-native run-ios --simulator "iPhone 5s"'
 alias rnios6='react-native run-ios --simulator "iPhone 6"'
 alias rnios6s='react-native run-ios --simulator "iPhone 6s"'
-alias rnios='react-native run-ios'
-alias rnlink='react-native link'
-
-- 
cgit v1.2.3-70-g09d2


From e66bf038c7a9297afbccc264b802d50d43f2515a Mon Sep 17 00:00:00 2001
From: Jaehyun Shin <keepcosmos@gmail.com>
Date: Sun, 18 Dec 2016 07:03:02 +0900
Subject: Add heroku `features` command to completion (#5667)

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

(limited to 'plugins')

diff --git a/plugins/heroku/_heroku b/plugins/heroku/_heroku
index fd72e530e..878d3ce1b 100644
--- a/plugins/heroku/_heroku
+++ b/plugins/heroku/_heroku
@@ -31,6 +31,10 @@ _1st_arguments=(
   "domains\:add":"add a custom domain to an app"
   "domains\:remove":"remove a custom domain from an app"
   "domains\:clear":"remove all custom domains from an app"
+  "features":"list available app features"
+  "features\:disable":"disables a feature"
+  "features\:enable":"enables an feature"
+  "features\:info":"displays additional information about feature"
   "help":"list available commands or display help for a specific command"
   "keys":"display keys for the current user"
   "keys\:add":"add a key for the current user"
@@ -144,5 +148,4 @@ _arguments \
   '(--app)--app[the app name]' \
   '(--remote)--remote[the remote name]' \
   '(--help)--help[help about the current command]' \
-  &&  return 0
-
+  && return 0
-- 
cgit v1.2.3-70-g09d2


From dfd296a9367ed577435d6f298747c4e5e750fc9c Mon Sep 17 00:00:00 2001
From: Nathan Bolender <nathan@nathanbolender.com>
Date: Sat, 17 Dec 2016 21:27:08 -0500
Subject: Update react-native autocomplete arguments (#5646)

---
 plugins/react-native/_react-native | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'plugins')

diff --git a/plugins/react-native/_react-native b/plugins/react-native/_react-native
index 47ee8c370..893ac040a 100644
--- a/plugins/react-native/_react-native
+++ b/plugins/react-native/_react-native
@@ -3,12 +3,21 @@
 
 local -a _1st_arguments
 _1st_arguments=(
+    'init:<ProjectName> generates a new project and installs its dependencies'
+    'android:creates an empty android project'
     'start:starts the webserver'
-    'bundle:builds the javascript bundle for offline use'
-    'new-library:generates a native library bridge'
-    'android:generates an Android project for your app'
+    'run-ios:builds your app and starts it on iOS simulator'
     'run-android:builds your app and starts it on a connected Android emulator or device'
-    'upgrade:upgrade your apps template files to the latest version; run this after updating the react-native version in your package.json and running npm install'
+    'new-library:generates a native library bridge'
+    'bundle:builds the javascript bundle for offline use'
+    'unbundle:builds javascript as "unbundle" for offline use'
+    'link:[options] <packageName> links all native dependencies'
+    'unlink:[options] <packageName> unlink native dependency'
+    'install:[options] <packageName> install and link native dependencies'
+    'uninstall:[options] <packageName> uninstall and unlink native dependencies'
+    "upgrade:upgrade your app's template files to the latest version; run this after updating the react-native version in your package.json and running npm install"
+    'log-android:starts adb logcat'
+    'log-ios:starts iOS device syslog tail'
 )
 
 
-- 
cgit v1.2.3-70-g09d2


From 5fa674456a7d21b489a5cb3dea2ff01e1378b2f6 Mon Sep 17 00:00:00 2001
From: Dennis Rippinger <dennis.rippinger@gmail.com>
Date: Sun, 18 Dec 2016 03:34:16 +0100
Subject: Add mvn asciidoctor commands (#5645)

* Add mvn asciidoctor commands
* Fix formatting in mvn plugin
---
 plugins/mvn/mvn.plugin.zsh | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'plugins')

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index 04bd186af..c5a7faa0f 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -20,10 +20,9 @@ BACKGROUND_CYAN=`tput setab 6`
 BACKGROUND_WHITE=`tput setab 7`
 RESET_FORMATTING=`tput sgr0`
 
- 
+
 # Wrapper function for Maven's mvn command.
-mvn-color()
-{
+mvn-color() {
   (
   # Filter mvn output using sed. Before filtering set the locale to C, so invalid characters won't break some sed implementations
   unset LANG
@@ -37,7 +36,7 @@ mvn-color()
   echo -ne ${RESET_FORMATTING}
   )
 }
- 
+
 # Override the mvn command with the colorized one.
 #alias mvn="mvn-color"
 
@@ -65,13 +64,13 @@ alias mvnsrc='mvn dependency:sources'
 alias mvndocs='mvn dependency:resolve -Dclassifier=javadoc'
 
 function listMavenCompletions { 
-     reply=(
+    reply=(
         # common lifecycle
         clean process-resources compile process-test-resources test-compile test integration-test package verify install deploy site
-        
+
         # common plugins
         deploy failsafe install site surefire checkstyle javadoc jxr pmd ant antrun archetype assembly dependency enforcer gpg help release repository source eclipse idea jetty cargo jboss tomcat tomcat6 tomcat7 exec versions war ear ejb android scm buildnumber nexus repository sonar license hibernate3 liquibase flyway gwt
-       
+
         # deploy
         deploy:deploy-file
         # failsafe
@@ -82,7 +81,7 @@ function listMavenCompletions {
         site:site site:deploy site:run site:stage site:stage-deploy
         # surefire
         surefire:test
-            
+
         # checkstyle
         checkstyle:checkstyle checkstyle:check
         # javadoc
@@ -110,18 +109,18 @@ function listMavenCompletions {
         help:active-profiles help:all-profiles help:describe help:effective-pom help:effective-settings help:evaluate help:expressions help:system
         # release
         release:clean release:prepare release:rollback release:perform release:stage release:branch release:update-versions
-	# jgitflow
-	jgitflow:feature-start jgitflow:feature-finish jgitflow:release-start jgitflow:release-finish jgitflow:hotfix-start jgitflow:hotfix-finish jgitflow:build-number
+        # jgitflow
+        jgitflow:feature-start jgitflow:feature-finish jgitflow:release-start jgitflow:release-finish jgitflow:hotfix-start jgitflow:hotfix-finish jgitflow:build-number
         # repository
         repository:bundle-create repository:bundle-pack
         # source
         source:aggregate source:jar source:jar-no-fork
-            
+
         # eclipse
         eclipse:clean eclipse:eclipse
         # idea
         idea:clean idea:idea
-            
+
         # jetty
         jetty:run jetty:run-exploded
         # cargo
@@ -134,7 +133,7 @@ function listMavenCompletions {
         tomcat6:run tomcat6:run-war tomcat6:run-war-only tomcat6:stop tomcat6:deploy tomcat6:undeploy
         # tomcat7
         tomcat7:run tomcat7:run-war tomcat7:run-war-only tomcat7:deploy
-	# tomee
+        # tomee
         tomee:run tomee:run-war tomee:run-war-only tomee:stop tomee:deploy tomee:undeploy	
         # spring-boot
         spring-boot:run spring-boot:repackage
@@ -172,7 +171,8 @@ function listMavenCompletions {
         flyway:clean flyway:history flyway:init flyway:migrate flyway:status flyway:validate
         # gwt
         gwt:browser gwt:clean gwt:compile gwt:compile-report gwt:css gwt:debug gwt:eclipse gwt:eclipseTest gwt:generateAsync gwt:help gwt:i18n gwt:mergewebxml gwt:resources gwt:run gwt:sdkInstall gwt:source-jar gwt:soyc gwt:test
-
+        # asciidoctor
+        asciidoctor:process-asciidoc asciidoctor:auto-refresh asciidoctor:http asciidoctor:zip
         # options
         -Dmaven.test.skip=true -DskipTests -DskipITs -Dmaven.surefire.debug -DenableCiProfile -Dpmd.skip=true -Dcheckstyle.skip=true -Dtycho.mode=maven -Dmaven.test.failure.ignore=true -DgroupId= -DartifactId= -Dversion= -Dpackaging=jar -Dfile=
 
-- 
cgit v1.2.3-70-g09d2


From 97c03841691021f916c46b2fd2d089d7970400aa Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sun, 18 Dec 2016 05:02:08 +0100
Subject: Add more information to cask plugin README

---
 plugins/cask/README.md | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'plugins')

diff --git a/plugins/cask/README.md b/plugins/cask/README.md
index 6457fd858..e1335c1b8 100644
--- a/plugins/cask/README.md
+++ b/plugins/cask/README.md
@@ -1,11 +1,15 @@
-# cask plugin
+# Cask plugin
 
-Loads `cask` completion from non-standard locations, such as if installed
+[Cask](https://github.com/cask/cask) is a project management tool for Emacs that helps
+automate the package development cycle; development, dependencies, testing, building,
+packaging and more.
+
+This plugin loads `cask` completion from non-standard locations, such as if installed
 via Homebrew or others. To enable it, add `cask` to your plugins array:
 
 ```zsh
 plugins=(... cask)
 ```
 
-Make sure you have the `cask` directory in your `$PATH` before loading
-Oh My Zsh, otherwise you'll get the "command not found" error.
+Make sure you have the `cask` directory in your `$PATH` before loading Oh My Zsh,
+otherwise you'll get a "command not found" error.
-- 
cgit v1.2.3-70-g09d2


From eac098b55c9d3b32827aa1c1432188aefad06934 Mon Sep 17 00:00:00 2001
From: Patrick José Pereira <patrickelectric@gmail.com>
Date: Fri, 30 Dec 2016 10:34:16 -0200
Subject:  'plugins/droplr/README.md: Solve typos'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
---
 plugins/droplr/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/droplr/README.md b/plugins/droplr/README.md
index cfbec25ed..25cf61db7 100644
--- a/plugins/droplr/README.md
+++ b/plugins/droplr/README.md
@@ -1,6 +1,6 @@
 # droplr
 
-Use [Droplr](https://droplr.com/) from the comand line to upload files and shorten
+Use [Droplr](https://droplr.com/) from the command line to upload files and shorten
 links. It needs to have [Droplr.app](https://droplr.com/apps) installed and logged
 in. MacOS only.
 
-- 
cgit v1.2.3-70-g09d2


From 7079e67c11a468c8d1f07d069d666c50baa65e7c Mon Sep 17 00:00:00 2001
From: Patrick José Pereira <patrickelectric@gmail.com>
Date: Fri, 30 Dec 2016 10:34:16 -0200
Subject:  'plugins/gnu-utils/gnu-utils.plugin.zsh: Solve typos'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
---
 plugins/gnu-utils/gnu-utils.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/gnu-utils/gnu-utils.plugin.zsh b/plugins/gnu-utils/gnu-utils.plugin.zsh
index de95f7e6c..b66e25d7f 100644
--- a/plugins/gnu-utils/gnu-utils.plugin.zsh
+++ b/plugins/gnu-utils/gnu-utils.plugin.zsh
@@ -52,7 +52,7 @@ if [[ -x "${commands[gwhoami]}" ]]; then
 
       #
       # This method is inflexible since the aliases are at risk of being
-      # overriden resulting in the BSD coreutils being called.
+      # overridden resulting in the BSD coreutils being called.
       #
       # (( ${+commands[$gcmd]} )) && \
       # alias "$gcmd[2,-1]"="${prefix}/${gcmd//"["/"\\["}"
-- 
cgit v1.2.3-70-g09d2


From 1bebbbf50ad3608e96474302238c489dc612cff0 Mon Sep 17 00:00:00 2001
From: Patrick José Pereira <patrickelectric@gmail.com>
Date: Fri, 30 Dec 2016 10:34:16 -0200
Subject:  'plugins/history-substring-search/history-substring-search.zsh:
 Solve typos'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
---
 plugins/history-substring-search/history-substring-search.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/history-substring-search/history-substring-search.zsh b/plugins/history-substring-search/history-substring-search.zsh
index ad316acc8..3b8afd317 100644
--- a/plugins/history-substring-search/history-substring-search.zsh
+++ b/plugins/history-substring-search/history-substring-search.zsh
@@ -244,7 +244,7 @@ _history-substring-search-end() {
 
   _history_substring_search_result=$BUFFER
 
-  # the search was succesful so display the result properly by clearing away
+  # the search was successful so display the result properly by clearing away
   # existing highlights and moving the cursor to the end of the result buffer
   if [[ $_history_substring_search_refresh_display -eq 1 ]]; then
     region_highlight=()
-- 
cgit v1.2.3-70-g09d2


From 093c2cd6b6f50587cb779147eb9b14759d4c94aa Mon Sep 17 00:00:00 2001
From: Patrick José Pereira <patrickelectric@gmail.com>
Date: Fri, 30 Dec 2016 10:34:16 -0200
Subject:  'plugins/scala/_scala: Solve typos'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
---
 plugins/scala/_scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/scala/_scala b/plugins/scala/_scala
index c4ccb37d3..80434680c 100644
--- a/plugins/scala/_scala
+++ b/plugins/scala/_scala
@@ -152,10 +152,10 @@ Y_opts=(
   "-Ydump-classes+[Dump the generated bytecode to .class files (useful for reflective compilation that utilizes in-memory classloaders)]:output directory:_files -/"
   "-Yeta-expand-keeps-star[Eta-expand varargs methods to T* rather than Seq[T].  This is a temporary option to ease transition.]"
   "-Ygen-javap+[Generate a parallel output directory of .javap files]:output directory:_files -/"
-  "-Yinfer-argument-types[Infer types for arguments of overriden methods]"
+  "-Yinfer-argument-types[Infer types for arguments of overridden methods]"
   "-Yinline[Perform inlining when possible]"
   "-Yinline-handlers[Perform exception handler inlining when possible]"
-  "-Yinline-warnings[Emit inlining warnings (normally surpressed due to high volume)]"
+  "-Yinline-warnings[Emit inlining warnings (normally suppressed due to high volume)]"
   "-Yinvalidate+[Invalidate classpath entry before run]:classpath entry"
   "-Ylinearizer\:-[Linearizer to use (default\: rpo)]:linearizer:(normal dfs rpo dump)"
   "-Ylog-classpath[Output information about what classpath is being applied]"
-- 
cgit v1.2.3-70-g09d2


From 75663be294e2328dd4928596345a9e2e4785e8a8 Mon Sep 17 00:00:00 2001
From: Patrick José Pereira <patrickelectric@gmail.com>
Date: Fri, 30 Dec 2016 10:34:16 -0200
Subject:  'plugins/suse/suse.plugin.zsh: Solve typos'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
---
 plugins/suse/suse.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/suse/suse.plugin.zsh b/plugins/suse/suse.plugin.zsh
index afd8ecabd..f7215528b 100644
--- a/plugins/suse/suse.plugin.zsh
+++ b/plugins/suse/suse.plugin.zsh
@@ -1,4 +1,4 @@
-#Alias for Zypper according to the offical Zypper's alias
+#Alias for Zypper according to the official Zypper's alias
 
 #Main commands
 alias z='sudo zypper' #call zypper
@@ -51,7 +51,7 @@ alias zrr='sudo zypper rr' #remove repositories
 alias zas='sudo zypper as' #adds a service specified by URI to the system
 alias zms='sudo zypper ms' #modify properties of specified services
 alias zrefs='sudo zypper refs' #refreshing a service mean executing the service's special task
-alias zrs='sudo zypper rs' #remove specified repository index service from the sytem
+alias zrs='sudo zypper rs' #remove specified repository index service from the system
 alias zls='sudo zypper ls' #list services defined on the system
 
 #Package Locks Management commands
-- 
cgit v1.2.3-70-g09d2


From 87bc218d2da0da540383633462ca5fdbeda927fb Mon Sep 17 00:00:00 2001
From: Patrick José Pereira <patrickelectric@gmail.com>
Date: Fri, 30 Dec 2016 10:34:16 -0200
Subject:  'plugins/terraform/_terraform: Solve typos'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
---
 plugins/terraform/_terraform | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/terraform/_terraform b/plugins/terraform/_terraform
index 11740dc48..97c42a559 100644
--- a/plugins/terraform/_terraform
+++ b/plugins/terraform/_terraform
@@ -98,7 +98,7 @@ __push() {
         '-token=[(token) Atlas API token to use to authorize the upload. If blank or unspecified, the ATLAS_TOKEN environmental variable will be used.]' \
         '-var=[("foo=bar") Set the value of a variable for the Terraform configuration.]' \
         '-var-file=[(foo) Set the value of variables using a variable file.]' \
-        '-vcs=[(true) If true (default), then Terraform will detect if a VCS is in use, such as Git, and will only upload files that are comitted to version control. If no version control system is detected, Terraform will upload all files in path (parameter to the command).]'
+        '-vcs=[(true) If true (default), then Terraform will detect if a VCS is in use, such as Git, and will only upload files that are committed to version control. If no version control system is detected, Terraform will upload all files in path (parameter to the command).]'
 }
 
 __refresh() {
-- 
cgit v1.2.3-70-g09d2


From 8c6ac51f3f40e2af1f35bd5ac3765159e5a4a0cb Mon Sep 17 00:00:00 2001
From: Patrick José Pereira <patrickelectric@gmail.com>
Date: Fri, 30 Dec 2016 10:34:16 -0200
Subject:  'plugins/ubuntu/readme.md: Solve typos'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
---
 plugins/ubuntu/readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/ubuntu/readme.md b/plugins/ubuntu/readme.md
index c9ef61f4e..5ad4bbcd2 100644
--- a/plugins/ubuntu/readme.md
+++ b/plugins/ubuntu/readme.md
@@ -10,7 +10,7 @@ By now you already can guess almost all aliases
 
 There are two exeptions since ...  
 agu  = sudo Apt-Get Update  - we have ...  
-agug = sudo Apt-Get UpGrade - as the exeptional 4 letter alias for a single command.
+agug = sudo Apt-Get UpGrade - as the exceptional 4 letter alias for a single command.
 
 afs = Apt-File Search --regexp - this has the regexp switch on without being represented in the alias, I guess this makes sense since the debian plugin has it, I never used that command.
 
-- 
cgit v1.2.3-70-g09d2


From 223872c4530de5e756581d205c614ba3e1de79ce Mon Sep 17 00:00:00 2001
From: Patrick José Pereira <patrickelectric@gmail.com>
Date: Fri, 30 Dec 2016 10:34:16 -0200
Subject:  'plugins/ubuntu/ubuntu.plugin.zsh: Solve typos'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
---
 plugins/ubuntu/ubuntu.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/ubuntu/ubuntu.plugin.zsh b/plugins/ubuntu/ubuntu.plugin.zsh
index 030af0693..60ff0457f 100644
--- a/plugins/ubuntu/ubuntu.plugin.zsh
+++ b/plugins/ubuntu/ubuntu.plugin.zsh
@@ -69,7 +69,7 @@ alias mydeb='time dpkg-buildpackage -rfakeroot -us -uc'
 # apt-add-repository with automatic install/upgrade of the desired package
 # Usage: aar ppa:xxxxxx/xxxxxx [packagename]
 # If packagename is not given as 2nd argument the function will ask for it and guess the default by taking
-# the part after the / from the ppa name wich is sometimes the right name for the package you want to install
+# the part after the / from the ppa name which is sometimes the right name for the package you want to install
 aar() {
 	if [ -n "$2" ]; then
 		PACKAGE=$2
-- 
cgit v1.2.3-70-g09d2


From 13e327eb7c552ded26836247a5f8575dc52e0f6c Mon Sep 17 00:00:00 2001
From: Patrick José Pereira <patrickelectric@gmail.com>
Date: Fri, 30 Dec 2016 10:34:16 -0200
Subject:  'plugins/z/README: Solve typos'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
---
 plugins/z/README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/z/README b/plugins/z/README
index 7de82a4c7..56261cff4 100644
--- a/plugins/z/README
+++ b/plugins/z/README
@@ -125,7 +125,7 @@ ENVIRONMENT
        Directories must be full paths without trailing slashes.
 
        The  environment  variable  $_Z_OWNER  can  be set to your username, to
-       allow usage of z when your sudo enviroment keeps $HOME set.
+       allow usage of z when your sudo environment keeps $HOME set.
 
 FILES
        Data is stored in $HOME/.z. This  can  be  overridden  by  setting  the
-- 
cgit v1.2.3-70-g09d2


From c362da8813d8541a24e4f166400ea8e3fe7078dd Mon Sep 17 00:00:00 2001
From: Patrick José Pereira <patrickelectric@gmail.com>
Date: Fri, 30 Dec 2016 10:34:16 -0200
Subject:  'plugins/z/z.1: Solve typos'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
---
 plugins/z/z.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/z/z.1 b/plugins/z/z.1
index cc99910bf..bbc1bf5df 100644
--- a/plugins/z/z.1
+++ b/plugins/z/z.1
@@ -151,7 +151,7 @@ directory trees to exclude from tracking. \fB$HOME\fR is always excluded.
 Directories must be full paths without trailing slashes.
 .P
 The environment variable \fB$_Z_OWNER\fR can be set to your username, to
-allow usage of \fBz\fR when your sudo enviroment keeps \fB$HOME\fR set.
+allow usage of \fBz\fR when your sudo environment keeps \fB$HOME\fR set.
 .SH
 FILES
 Data is stored in \fB$HOME/.z\fR. This can be overridden by setting the
-- 
cgit v1.2.3-70-g09d2


From ff5629e60b815b3c21ef216d5ba5943932589758 Mon Sep 17 00:00:00 2001
From: Ryan Brushett <RyanBrushett@users.noreply.github.com>
Date: Fri, 30 Dec 2016 14:29:17 -0330
Subject: Improve UX for Spotify quit command in osx plugin (#5726)

* Improve UX for Spotify commands in osx plugin

Spotify command UX is a bit weak for people who live and work almost entirely in shells.
- `spotify quit` should not open Spotify if it is not already running. Should confirm that Spotify is indeed not running.
- `spotify quit` should not blow away the user's shell once Spotify is quit. This can be a disruption to work flow.

This PR looks to add a few little checks which will help improve this experience.
This PR also adds a space to line 477 between `break` and `;;` for consistency. Doesn't seem like a big enough change to put in its own PR.

* Rearranging output as per peer feedback

* osx plugin's spotify: change quitting w/ closing

Closing is more idiomatic English.
---
 plugins/osx/osx.plugin.zsh | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'plugins')

diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index d7baa1191..95ef3e1aa 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -323,7 +323,7 @@ function spotify() {
   if [ $# = 0 ]; then
     showHelp;
   else
-    if [ "$(osascript -e 'application "Spotify" is running')" = "false" ]; then
+    if [ "$1" != "quit" ] && [ "$(osascript -e 'application "Spotify" is running')" = "false" ]; then
       osascript -e 'tell application "Spotify" to activate'
       sleep 2
     fi
@@ -413,9 +413,13 @@ function spotify() {
         break ;;
 
       "quit"    )
-        cecho "Quitting Spotify.";
-        osascript -e 'tell application "Spotify" to quit';
-        exit 1 ;;
+        if [ "$(osascript -e 'application "Spotify" is running')" = "false" ]; then
+          cecho "Spotify was not running."
+        else
+          cecho "Closing Spotify.";
+          osascript -e 'tell application "Spotify" to quit';
+        fi
+        break ;;
 
       "next"    )
         cecho "Going to next track." ;
@@ -470,7 +474,7 @@ function spotify() {
       "pos"   )
         cecho "Adjusting Spotify play position."
         osascript -e "tell application \"Spotify\" to set player position to $2";
-        break;;
+        break ;;
 
       "status" )
         showStatus;
-- 
cgit v1.2.3-70-g09d2


From 4608231b2576fbe27913a6ce3d350ab03b9b5932 Mon Sep 17 00:00:00 2001
From: Eric Wendelin <me@eriwen.com>
Date: Wed, 4 Jan 2017 04:26:23 -0700
Subject: Improved gradle options (arguments) completion (#5743)

* Sort gradle options for autocompletion

This will allow us to more easily keep the options list up-to-date

* Add missing gradle options to gradle plugin

Reflect documentation at
https://docs.gradle.org/3.2.1/userguide/gradle_command_line.html
---
 plugins/gradle/gradle.plugin.zsh | 73 ++++++++++++++++++++++++++++------------
 1 file changed, 52 insertions(+), 21 deletions(-)

(limited to 'plugins')

diff --git a/plugins/gradle/gradle.plugin.zsh b/plugins/gradle/gradle.plugin.zsh
index 65b9d4685..0adc04a13 100644
--- a/plugins/gradle/gradle.plugin.zsh
+++ b/plugins/gradle/gradle.plugin.zsh
@@ -24,29 +24,60 @@ function _gradle_core_commands() {
 function _gradle_arguments() {
     _arguments -C \
     '-a[Do not rebuild project dependencies]' \
-    '-h[Help]' \
-    '-D[System property]' \
+    '-b[Specifies the build file]' \
+    '-c[Specifies the settings file]' \
     '-d[Log at the debug level]' \
-    '--gui[Launches the Gradle GUI app]' \
-    '--stop[Stop the Gradle daemon]' \
-    '--daemon[Use the Gradle daemon]' \
-    '--no-daemon[Do not use the Gradle daemon]' \
-    '--rerun-task [Specifies that any task optimization is ignored.]' \
-    '-i[Log at the info level]' \
-    '-m[Dry run]' \
-    '-P[Set a project property]' \
-    '-p[Specifies the start directory]' \
-    '--profile[Profile the build time]' \
-    '-q[Log at the quiet level (only show errors)]' \
-    '-v[Print the Gradle version info]' \
+    '-g[Specifies the Gradle user home directory]' \
+    '-h[Shows a help message]' \
+    '-i[Set log level to INFO]' \
+    '-m[Runs the build with all task actions disabled]' \
+    '-p[Specifies the start directory for Gradle]' \
+    '-q[Log errors only]' \
+    '-s[Print out the stacktrace also for user exceptions]' \
+    '-t[Continuous mode. Automatically re-run build after changes]' \
+    '-u[Don''t search in parent directories for a settings.gradle file]' \
+    '-v[Prints Gradle version info]' \
     '-x[Specify a task to be excluded]' \
-    '-b[Specifies the build file.]' \
-    '-c[Specifies the settings file.]' \
-    '--continue[Continues task execution after a task failure.]' \
-    '-g[Specifies the Gradle user home directory.]' \
-    '-I[Specifies an initialization script.]' \
-    '--refresh-dependencies[Refresh the state of dependencies.]' \
-    '-u[Don''t search in parent directories for a settings.gradle file.]' \
+    '-D[Set a system property]' \
+    '-I[Specifies an initialization script]' \
+    '-P[Sets a project property of the root project]' \
+    '-S[Print out the full (very verbose) stacktrace]' \
+    '--build-file[Specifies the build file]' \
+    '--configure-on-demand[Only relevant projects are configured]' \
+    '--console[Type of console output to generate (plain, auto, or rich)]' \
+    '--continue[Continues task execution after a task failure]' \
+    '--continuous[Continuous mode. Automatically re-run build after changes]' \
+    '--daemon[Use the Gradle Daemon]' \
+    '--debug[Log at the debug level]' \
+    '--dry-run[Runs the build with all task actions disabled]' \
+    '--exclude-task[Specify a task to be excluded]' \
+    '--full-stacktrace[Print out the full (very verbose) stacktrace]' \
+    '--gradle-user-home[Specifies the Gradle user home directory]' \
+    '--gui[Launches the Gradle GUI app (Deprecated)]' \
+    '--help[Shows a help message]' \
+    '--include-build[Run the build as a composite, including the specified build]' \
+    '--info[Set log level to INFO]' \
+    '--init-script[Specifies an initialization script]' \
+    '--max-workers[Set the maximum number of workers that Gradle may use]' \
+    '--no-daemon[Do not use the Gradle Daemon]' \
+    '--no-rebuild[Do not rebuild project dependencies]' \
+    '--no-search-upwards[Don''t search in parent directories for a settings.gradle file]' \
+    '--offline[Build without accessing network resources]' \
+    '--parallel[Build projects in parallel]' \
+    '--profile[Profile build time and create report]' \
+    '--project-cache-dir[Specifies the project-specific cache directory]' \
+    '--project-dir[Specifies the start directory for Gradle]' \
+    '--project-prop[Sets a project property of the root project]' \
+    '--quiet[Log errors only]' \
+    '--recompile-scripts[Forces scripts to be recompiled, bypassing caching]' \
+    '--refresh-dependencies[Refresh the state of dependencies]' \
+    '--rerun-task[Specifies that any task optimization is ignored]' \
+    '--settings-file[Specifies the settings file]' \
+    '--stacktrace[Print out the stacktrace also for user exceptions]' \
+    '--status[Print Gradle Daemon status]' \
+    '--stop[Stop all Gradle Daemons]' \
+    '--system-prop[Set a system property]' \
+    '--version[Prints Gradle version info]' \
     '*::command:->command' \
     && return 0
 }
-- 
cgit v1.2.3-70-g09d2


From cae540f899b1e302e514e190f7d51331a5a689e0 Mon Sep 17 00:00:00 2001
From: Italo Maia <italo.maia@gmail.com>
Date: Thu, 5 Jan 2017 07:41:53 -0300
Subject: Adding new path to look for activate.sh (#5654)

If autoenv was installed with pip and modifier --user, activate.sh will be at .local/bin
---
 plugins/autoenv/autoenv.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/autoenv/autoenv.plugin.zsh b/plugins/autoenv/autoenv.plugin.zsh
index af58ee77b..3c1b0fafc 100644
--- a/plugins/autoenv/autoenv.plugin.zsh
+++ b/plugins/autoenv/autoenv.plugin.zsh
@@ -1,7 +1,7 @@
 # Activates autoenv or reports its failure
 () {
 if ! type autoenv_init >/dev/null; then
-  for d (~/.autoenv /usr/local/opt/autoenv /usr/local/bin); do
+  for d (~/.autoenv ~/.local/bin /usr/local/opt/autoenv /usr/local/bin); do
     if [[ -e $d/activate.sh ]]; then
       autoenv_dir=$d
       break
-- 
cgit v1.2.3-70-g09d2


From d2725d44fce59ea7060b4d712c5739512a56882d Mon Sep 17 00:00:00 2001
From: Ruslan Voronkov <afftee@users.noreply.github.com>
Date: Sun, 15 Jan 2017 21:21:36 +0200
Subject: Add goodreads search provider (#5778)

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

(limited to 'plugins')

diff --git a/plugins/web-search/web-search.plugin.zsh b/plugins/web-search/web-search.plugin.zsh
index 3b5478ca2..cc970e5fd 100644
--- a/plugins/web-search/web-search.plugin.zsh
+++ b/plugins/web-search/web-search.plugin.zsh
@@ -15,6 +15,7 @@ function web_search() {
     github      "https://github.com/search?q="
     baidu       "https://www.baidu.com/s?wd="
     ecosia      "https://www.ecosia.org/search?q="
+    goodreads   "https://www.goodreads.com/search?q="
   )
 
   # check whether the search engine is supported
@@ -47,6 +48,7 @@ alias yandex='web_search yandex'
 alias github='web_search github'
 alias baidu='web_search baidu'
 alias ecosia='web_search ecosia'
+alias goodreads='web_search goodreads'
 
 #add your own !bang searches here
 alias wiki='web_search duckduckgo \!w'
-- 
cgit v1.2.3-70-g09d2


From 76c102944c8c164f2cf8908712b6c6a1d9fe5d70 Mon Sep 17 00:00:00 2001
From: Ilyes Kechidi <ilyes.spd@gmail.com>
Date: Wed, 23 Nov 2016 02:21:18 +0100
Subject: added a transfer.sh plugin created a function to easily upload files
 to transfer.sh file sharing site Usage : transfer file.txt

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

(limited to 'plugins')

diff --git a/plugins/transfer/transfer.plugin.zsh b/plugins/transfer/transfer.plugin.zsh
new file mode 100644
index 000000000..7d0d84bea
--- /dev/null
+++ b/plugins/transfer/transfer.plugin.zsh
@@ -0,0 +1,7 @@
+# transfer.sh Easy file sharing from the command line
+# transfer Plugin
+# Usage Example :
+# > transfer file.txt
+
+transfer() { if [ $# -eq 0 ]; then echo "No arguments specified. Usage:\necho transfer /tmp/test.md\ncat /tmp/test.md | transfer test.md"; return 1; fi 
+tmpfile=$( mktemp -t transferXXX ); if tty -s; then basefile=$(basename "$1" | sed -e 's/[^a-zA-Z0-9._-]/-/g'); curl --progress-bar --upload-file "$1" "https://transfer.sh/$basefile" >> $tmpfile; else curl --progress-bar --upload-file "-" "https://transfer.sh/$1" >> $tmpfile ; fi; cat $tmpfile; rm -f $tmpfile; }
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From 8013d3d8a933b6bae3ed9ceb37bebb42cf28ea56 Mon Sep 17 00:00:00 2001
From: Ilyes Kechidi <ilyes.spd@gmail.com>
Date: Tue, 7 Feb 2017 14:40:21 +0100
Subject: added README for transfer.sh plugin

---
 plugins/transfer/README.md | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 plugins/transfer/README.md

(limited to 'plugins')

diff --git a/plugins/transfer/README.md b/plugins/transfer/README.md
new file mode 100644
index 000000000..e14b94aa9
--- /dev/null
+++ b/plugins/transfer/README.md
@@ -0,0 +1,7 @@
+# `transfer.sh` plugin
+transfer.sh is an easy file sharing service from the command line
+
+## Usage
+Example
+> transfer file.txt
+
-- 
cgit v1.2.3-70-g09d2


From d2dfa69419845daebcfd20fed3253ae06faa2876 Mon Sep 17 00:00:00 2001
From: slavaGanzin <slava.ganzin@gmail.com>
Date: Tue, 7 Feb 2017 15:44:12 +0200
Subject: change name of overriden zle-line-init

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

(limited to 'plugins')

diff --git a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
index 03fa911e7..1d20bc04b 100644
--- a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
+++ b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
@@ -18,10 +18,10 @@ function git-auto-fetch {
     echo "${fg_bold[red]}disabled${reset_color}")
 }
 
-eval "original-$(declare -f zle-line-init)"
+eval "override-git-auto-fetch-$(declare -f zle-line-init)"
 
 function zle-line-init () {
   git-fetch-all
-  original-zle-line-init
+  override-git-auto-fetch-zle-line-init
 }
 zle -N zle-line-init
-- 
cgit v1.2.3-70-g09d2


From 845fdfaae0a913143d1ff03220a1bf1596871225 Mon Sep 17 00:00:00 2001
From: Ilyes Kechidi <ilyes.spd@gmail.com>
Date: Thu, 9 Feb 2017 02:28:33 +0100
Subject: replaced transfer function with @nl5887 version

---
 plugins/transfer/transfer.plugin.zsh | 62 ++++++++++++++++++++++++++++++++++--
 1 file changed, 60 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/transfer/transfer.plugin.zsh b/plugins/transfer/transfer.plugin.zsh
index 7d0d84bea..796faa9a2 100644
--- a/plugins/transfer/transfer.plugin.zsh
+++ b/plugins/transfer/transfer.plugin.zsh
@@ -2,6 +2,64 @@
 # transfer Plugin
 # Usage Example :
 # > transfer file.txt
+# > transfer directory/
 
-transfer() { if [ $# -eq 0 ]; then echo "No arguments specified. Usage:\necho transfer /tmp/test.md\ncat /tmp/test.md | transfer test.md"; return 1; fi 
-tmpfile=$( mktemp -t transferXXX ); if tty -s; then basefile=$(basename "$1" | sed -e 's/[^a-zA-Z0-9._-]/-/g'); curl --progress-bar --upload-file "$1" "https://transfer.sh/$basefile" >> $tmpfile; else curl --progress-bar --upload-file "-" "https://transfer.sh/$1" >> $tmpfile ; fi; cat $tmpfile; rm -f $tmpfile; }
\ No newline at end of file
+
+
+# Author:
+#   Remco Verhoef <remco@dutchcoders.io>
+#   https://gist.github.com/nl5887/a511f172d3fb3cd0e42d
+#
+
+curl --version 2>&1 > /dev/null
+if [ $? -ne 0 ]; then
+  echo "Could not find curl."
+  return 1
+fi
+
+transfer() { 
+    # check arguments
+    if [ $# -eq 0 ]; 
+    then 
+        echo "No arguments specified. Usage:\necho transfer /tmp/test.md\ncat /tmp/test.md | transfer test.md"
+        return 1
+    fi
+
+    # get temporarily filename, output is written to this file show progress can be showed
+    tmpfile=$( mktemp -t transferXXX )
+    
+    # upload stdin or file
+    file=$1
+
+    if tty -s; 
+    then 
+        basefile=$(basename "$file" | sed -e 's/[^a-zA-Z0-9._-]/-/g') 
+
+        if [ ! -e $file ];
+        then
+            echo "File $file doesn't exists."
+            return 1
+        fi
+        
+        if [ -d $file ];
+        then
+            # zip directory and transfer
+            zipfile=$( mktemp -t transferXXX.zip )
+            cd $(dirname $file) && zip -r -q - $(basename $file) >> $zipfile
+            curl --progress-bar --upload-file "$zipfile" "https://transfer.sh/$basefile.zip" >> $tmpfile
+            rm -f $zipfile
+        else
+            # transfer file
+            curl --progress-bar --upload-file "$file" "https://transfer.sh/$basefile" >> $tmpfile
+        fi
+    else 
+        # transfer pipe
+        curl --progress-bar --upload-file "-" "https://transfer.sh/$file" >> $tmpfile
+    fi
+   
+    # cat output link
+    cat $tmpfile
+
+    # cleanup
+    rm -f $tmpfile
+}
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From 6cefe70ffc8f5d827a9b4341129114a843ceb248 Mon Sep 17 00:00:00 2001
From: Ilyes Kechidi <ilyes.spd@gmail.com>
Date: Thu, 9 Feb 2017 02:29:24 +0100
Subject: updated transfer README.md

---
 plugins/transfer/README.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins')

diff --git a/plugins/transfer/README.md b/plugins/transfer/README.md
index e14b94aa9..9bf488d4e 100644
--- a/plugins/transfer/README.md
+++ b/plugins/transfer/README.md
@@ -4,4 +4,5 @@ transfer.sh is an easy file sharing service from the command line
 ## Usage
 Example
 > transfer file.txt
+> transfer directory/
 
-- 
cgit v1.2.3-70-g09d2


From c36474b7dfbe19c0628f6f21d8da40b535eeb5fb Mon Sep 17 00:00:00 2001
From: Ilyes Kechidi <ilyes.spd@gmail.com>
Date: Thu, 9 Feb 2017 19:41:09 +0100
Subject: modified the script to use tar command instead of zip

---
 plugins/transfer/transfer.plugin.zsh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'plugins')

diff --git a/plugins/transfer/transfer.plugin.zsh b/plugins/transfer/transfer.plugin.zsh
index 796faa9a2..7a7cd85ec 100644
--- a/plugins/transfer/transfer.plugin.zsh
+++ b/plugins/transfer/transfer.plugin.zsh
@@ -9,6 +9,7 @@
 # Author:
 #   Remco Verhoef <remco@dutchcoders.io>
 #   https://gist.github.com/nl5887/a511f172d3fb3cd0e42d
+#   Modified to use tar command instead of zip
 #
 
 curl --version 2>&1 > /dev/null
@@ -43,11 +44,12 @@ transfer() {
         
         if [ -d $file ];
         then
-            # zip directory and transfer
-            zipfile=$( mktemp -t transferXXX.zip )
-            cd $(dirname $file) && zip -r -q - $(basename $file) >> $zipfile
-            curl --progress-bar --upload-file "$zipfile" "https://transfer.sh/$basefile.zip" >> $tmpfile
-            rm -f $zipfile
+            echo $file
+            # tar directory and transfer
+            tarfile=$( mktemp -t transferXXX.tar.gz )
+            cd $(dirname $file) && tar -czf $tarfile $(basename $file)
+            curl --progress-bar --upload-file "$tarfile" "https://transfer.sh/$basefile.tar.gz" >> $tmpfile
+            rm -f $tarfile
         else
             # transfer file
             curl --progress-bar --upload-file "$file" "https://transfer.sh/$basefile" >> $tmpfile
-- 
cgit v1.2.3-70-g09d2


From 9bbcceda97c769071862c2862c9c1f525d091deb Mon Sep 17 00:00:00 2001
From: grh2g46 <grh2g46@gmail.com>
Date: Mon, 20 Feb 2017 18:20:53 +0000
Subject: add missing new line escape (#5896)

missing \ was causing command not found errors when tab completing docker build -t <tab>
---
 plugins/docker/_docker | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/docker/_docker b/plugins/docker/_docker
index 8d00b13e6..1aec353c5 100644
--- a/plugins/docker/_docker
+++ b/plugins/docker/_docker
@@ -917,7 +917,7 @@ __docker_image_subcommand() {
                 "($help)*--label=[Set metadata for an image]:label=value: " \
                 "($help -m --memory)"{-m=,--memory=}"[Memory limit]:Memory limit: " \
                 "($help)--memory-swap=[Total memory limit with swap]:Memory limit: " \
-                "($help)--network=[Connect a container to a network]:network mode:(bridge none container host)"
+                "($help)--network=[Connect a container to a network]:network mode:(bridge none container host)" \
                 "($help)--no-cache[Do not use cache when building the image]" \
                 "($help)--pull[Attempt to pull a newer version of the image]" \
                 "($help -q --quiet)"{-q,--quiet}"[Suppress verbose build output]" \
-- 
cgit v1.2.3-70-g09d2


From 98d8d3429f8b9fc2c4c109fb199a31c8d1735699 Mon Sep 17 00:00:00 2001
From: travoltron <ben@travoltron.com>
Date: Mon, 20 Feb 2017 13:21:36 -0500
Subject: Update composer.plugin.zsh (#5889)

Adds remove/global remove and optimize-autoloader commands.
---
 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 07eb1de88..ac272060b 100644
--- a/plugins/composer/composer.plugin.zsh
+++ b/plugins/composer/composer.plugin.zsh
@@ -39,11 +39,14 @@ alias c='composer'
 alias csu='composer self-update'
 alias cu='composer update'
 alias cr='composer require'
+alias crm='composer remove'
 alias ci='composer install'
 alias ccp='composer create-project'
 alias cdu='composer dump-autoload'
+alias cdo='composer dump-autoload --optimize-autoloader'
 alias cgu='composer global update'
 alias cgr='composer global require'
+alias cgrm='composer global remove'
 
 # install composer in the current directory
 alias cget='curl -s https://getcomposer.org/installer | php'
-- 
cgit v1.2.3-70-g09d2


From 8611aa8049f5f13cabe012f17a19e0d42669ef3f Mon Sep 17 00:00:00 2001
From: guyzmo <guyzmo+github+pub@m0g.net>
Date: Thu, 23 Feb 2017 08:50:49 +0100
Subject: Fixing battery prompt formatting issue (cf #5894) (#5895)

Signed-off-by: Guyzmo <guyzmo+github+pub@m0g.net>
---
 plugins/battery/battery.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh
index da229cf35..8f398cfb3 100644
--- a/plugins/battery/battery.plugin.zsh
+++ b/plugins/battery/battery.plugin.zsh
@@ -100,7 +100,7 @@ elif [[ "$OSTYPE" = linux*  ]] ; then
       else
         color='red'
       fi
-      echo "%{$fg[$color]%}[$(battery_pct_remaining)%%]%{$reset_color%}"
+      echo "%{$fg[$color]%}$(battery_pct_remaining)%%%{$reset_color%}"
     else
       echo "∞"
     fi
-- 
cgit v1.2.3-70-g09d2


From 4fba92e04fa9b62b2259abc45eb92ca6a74f1639 Mon Sep 17 00:00:00 2001
From: Ricardo Pérez <ricpelo@gmail.com>
Date: Thu, 23 Feb 2017 08:52:23 +0100
Subject: Use proper config bin directory (#5886)

Add the proper config bin directory to `PATH` instead of the previously (incorrect) fixed `~/.composer/vendor/bin`. Nowadays the right config dir is `~/.config/composer/vendor/bin`.
---
 plugins/composer/composer.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh
index ac272060b..8cf50d502 100644
--- a/plugins/composer/composer.plugin.zsh
+++ b/plugins/composer/composer.plugin.zsh
@@ -52,4 +52,4 @@ alias cgrm='composer global remove'
 alias cget='curl -s https://getcomposer.org/installer | php'
 
 # Add Composer's global binaries to PATH
-export PATH=$PATH:~/.composer/vendor/bin
+export PATH=$PATH:$(composer global config bin-dir --absolute) 2>/dev/null
-- 
cgit v1.2.3-70-g09d2


From ef9f3d97f0920a0b151d2ada7ae7235d148639dd Mon Sep 17 00:00:00 2001
From: Franz König <max.ii.josef@gmail.com>
Date: Thu, 23 Feb 2017 08:52:56 +0100
Subject: Added pacman file aliases (#5869)

---
 plugins/archlinux/README.md            | 2 ++
 plugins/archlinux/archlinux.plugin.zsh | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'plugins')

diff --git a/plugins/archlinux/README.md b/plugins/archlinux/README.md
index 16f099415..e408db13d 100644
--- a/plugins/archlinux/README.md
+++ b/plugins/archlinux/README.md
@@ -73,6 +73,8 @@
 | pacupd       | sudo pacman -Sy                         | Update and refresh the local package database                |
 | pacupg       | sudo pacman -Syu                        | Sync with repositories before upgrading packages             |
 | upgrade      | sudo pacman -Syu                        | Sync with repositories before upgrading packages             |
+| pacfileupg   | sudo pacman -Fy                         | Download fresh package databases from the server             |
+| pacfiles     | pacman -Fs                              | Search package file names for matching strings.              |
 
 | Function       | Description                                          |
 |----------------|------------------------------------------------------|
diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
index 3156e949a..105bd2d5f 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -82,6 +82,8 @@ alias pacinsd='sudo pacman -S --asdeps'
 alias pacmir='sudo pacman -Syy'
 alias paclsorphans='sudo pacman -Qdt'
 alias pacrmorphans='sudo pacman -Rs $(pacman -Qtdq)'
+alias pacfileupg='sudo pacman -Fy'
+alias pacfiles='pacman tFs'
 
 
 if (( $+commands[abs] && $+commands[aur] )); then
-- 
cgit v1.2.3-70-g09d2


From d874c73f19d8430f4dc32756fff0bf2f6a804d87 Mon Sep 17 00:00:00 2001
From: Avi Israeli <avii@wix.com>
Date: Thu, 23 Feb 2017 09:53:27 +0200
Subject: itunes playlist first commit (#5860)

Added playlist feature for the itunes command:
if a variable is passed and is valid - will play the playlist
if a variable is passed and is invalid(no such playlist) - will stop all playing
if no variable is passed will print all playlists available on the host
---
 plugins/osx/osx.plugin.zsh | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'plugins')

diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index 95ef3e1aa..e8488ebc9 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -184,6 +184,7 @@ function vncviewer() {
 # iTunes control function
 function itunes() {
 	local opt=$1
+	local playlist=$2
 	shift
 	case "$opt" in
 		launch|play|pause|stop|rewind|resume|quit)
@@ -200,6 +201,19 @@ function itunes() {
 		vol)
 			opt="set sound volume to $1" #$1 Due to the shift
 			;;
+		playlist)
+		# Inspired by: https://gist.github.com/nakajijapan/ac8b45371064ae98ea7f
+if [[ ! -z "$playlist" ]]; then
+                    		osascript -e 'tell application "iTunes"' -e "set new_playlist to \"$playlist\" as string" -e "play playlist new_playlist" -e "end tell" 2>/dev/null;
+				if [[ $? -eq 0 ]]; then
+					opt="play"
+				else
+					opt="stop"
+				fi	
+                  else
+                    opt="set allPlaylists to (get name of every playlist)"
+                  fi
+                ;;
 		playing|status)
 			local state=`osascript -e 'tell application "iTunes" to player state as string'`
 			if [[ "$state" = "playing" ]]; then
@@ -250,6 +264,7 @@ EOF
 			echo "\tshuf|shuffle [on|off|toggle]\tSet shuffled playback. Default: toggle. Note: toggle doesn't support the MiniPlayer."
 			echo "\tvol\tSet the volume, takes an argument from 0 to 100"
 			echo "\tplaying|status\tShow what song is currently playing in iTunes."
+			echo "\tplaylist [playlist name]\t Play specific playlist"
 			echo "\thelp\tshow this message and exit"
 			return 0
 			;;
-- 
cgit v1.2.3-70-g09d2


From 1c958e02a5613a4312534b1afe9f9f8c4a0793c2 Mon Sep 17 00:00:00 2001
From: Tobias Preuss <tobias.preuss@googlemail.com>
Date: Wed, 7 Jun 2017 23:47:47 +0200
Subject: Extend list of adb commands. (#5584)

---
 plugins/adb/_adb | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'plugins')

diff --git a/plugins/adb/_adb b/plugins/adb/_adb
index f30f3247f..5f37bedac 100644
--- a/plugins/adb/_adb
+++ b/plugins/adb/_adb
@@ -13,9 +13,13 @@ _1st_arguments=(
 'disconnect:disconnect from a TCP/IP device. Port 5555 is default.'
 'emu:run emulator console command'
 'forward:forward socket connections'
+'get-devpath:print the device path'
+'get-serialno:print the serial number of the device'
+'get-state:print the current state of the device: offline | bootloader | device'
 'help:show the help message'
 'install:push this package file to the device and install it'
 'jdwp:list PIDs of processes hosting a JDWP transport'
+'keygen:generate adb public/private key'
 'kill-server:kill the server if it is running'
 'logcat:view device log'
 'pull:copy file/dir from device'
@@ -30,6 +34,7 @@ _1st_arguments=(
 'start-server:ensure that there is a server running'
 'tcpip:restart host adb in tcpip mode'
 'uninstall:remove this app package from the device'
+'usb:restart the adbd daemon listing on USB'
 'version:show version num'
 'wait-for-device:block until device is online'
 )
-- 
cgit v1.2.3-70-g09d2


From d848c94804918138375041a9f800f401bec12068 Mon Sep 17 00:00:00 2001
From: Mauro Porras P <mauroporrasp@gmail.com>
Date: Thu, 22 Jun 2017 13:38:34 -0500
Subject: Add React Native aliases for logs (#5756)

---
 plugins/react-native/README.md               | 3 +++
 plugins/react-native/react-native.plugin.zsh | 3 +++
 2 files changed, 6 insertions(+)

(limited to 'plugins')

diff --git a/plugins/react-native/README.md b/plugins/react-native/README.md
index c6fe396b8..980246cf1 100644
--- a/plugins/react-native/README.md
+++ b/plugins/react-native/README.md
@@ -24,3 +24,6 @@ plugins=(... react-native)
 | **rnios5s** | `react-native run-ios --simulator "iPhone 5s"` |
 | **rnios6**  | `react-native run-ios --simulator "iPhone 6"`  |
 | **rnios6s** | `react-native run-ios --simulator "iPhone 6s"` |
+| _Logging_                                                    |
+| **rnland**  | `react-native log-android`                     |
+| **rnlios**  | `react-native log-ios`                         |
diff --git a/plugins/react-native/react-native.plugin.zsh b/plugins/react-native/react-native.plugin.zsh
index 892a31fbe..0566941a1 100644
--- a/plugins/react-native/react-native.plugin.zsh
+++ b/plugins/react-native/react-native.plugin.zsh
@@ -9,3 +9,6 @@ alias rnios5='react-native run-ios --simulator "iPhone 5"'
 alias rnios5s='react-native run-ios --simulator "iPhone 5s"'
 alias rnios6='react-native run-ios --simulator "iPhone 6"'
 alias rnios6s='react-native run-ios --simulator "iPhone 6s"'
+
+alias rnland='react-native log-android'
+alias rnlios='react-native log-ios'
-- 
cgit v1.2.3-70-g09d2


From accdcb2f1c3cca40527fef1fe4ab2d39eb6cf897 Mon Sep 17 00:00:00 2001
From: Janosch Knack <janosch.knack@gmail.com>
Date: Sun, 24 Sep 2017 20:19:49 +0200
Subject: improved maven plugin (#6298)

* added some apache maven plugins

added arguments
added longversion of arguments

* SC2006 shellcheck
see https://github.com/koalaman/shellcheck/wiki/SC2006

* SC2068 shellcheck
see https://github.com/koalaman/shellcheck/wiki/SC2068

* SC2086 shellcheck

see https://github.com/koalaman/shellcheck/wiki/SC2086

* shellcheck is not always right ;)
---
 plugins/mvn/mvn.plugin.zsh | 159 ++++++++++++++++++++++++++++++++++-----------
 1 file changed, 122 insertions(+), 37 deletions(-)

(limited to 'plugins')

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index c5a7faa0f..f1e4d3ee0 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -1,24 +1,24 @@
 # mvn-color based on https://gist.github.com/1027800
-BOLD=`tput bold`
-UNDERLINE_ON=`tput smul`
-UNDERLINE_OFF=`tput rmul`
-TEXT_BLACK=`tput setaf 0`
-TEXT_RED=`tput setaf 1`
-TEXT_GREEN=`tput setaf 2`
-TEXT_YELLOW=`tput setaf 3`
-TEXT_BLUE=`tput setaf 4`
-TEXT_MAGENTA=`tput setaf 5`
-TEXT_CYAN=`tput setaf 6`
-TEXT_WHITE=`tput setaf 7`
-BACKGROUND_BLACK=`tput setab 0`
-BACKGROUND_RED=`tput setab 1`
-BACKGROUND_GREEN=`tput setab 2`
-BACKGROUND_YELLOW=`tput setab 3`
-BACKGROUND_BLUE=`tput setab 4`
-BACKGROUND_MAGENTA=`tput setab 5`
-BACKGROUND_CYAN=`tput setab 6`
-BACKGROUND_WHITE=`tput setab 7`
-RESET_FORMATTING=`tput sgr0`
+BOLD=$(tput bold)
+UNDERLINE_ON=$(tput smul)
+UNDERLINE_OFF=$(tput rmul)
+TEXT_BLACK=$(tput setaf 0)
+TEXT_RED=$(tput setaf 1)
+TEXT_GREEN=$(tput setaf 2)
+TEXT_YELLOW=$(tput setaf 3)
+TEXT_BLUE=$(tput setaf 4)
+TEXT_MAGENTA=$(tput setaf 5)
+TEXT_CYAN=$(tput setaf 6)
+TEXT_WHITE=$(tput setaf 7)
+BACKGROUND_BLACK=$(tput setab 0)
+BACKGROUND_RED=$(tput setab 1)
+BACKGROUND_GREEN=$(tput setab 2)
+BACKGROUND_YELLOW=$(tput setab 3)
+BACKGROUND_BLUE=$(tput setab 4)
+BACKGROUND_MAGENTA=$(tput setab 5)
+BACKGROUND_CYAN=$(tput setab 6)
+BACKGROUND_WHITE=$(tput setab 7)
+RESET_FORMATTING=$(tput sgr0)
 
 
 # Wrapper function for Maven's mvn command.
@@ -26,15 +26,15 @@ mvn-color() {
   (
   # Filter mvn output using sed. Before filtering set the locale to C, so invalid characters won't break some sed implementations
   unset LANG
-  LC_CTYPE=C mvn $@ | sed -e "s/\(\[INFO\]\)\(.*\)/${TEXT_BLUE}${BOLD}\1${RESET_FORMATTING}\2/g" \
+  LC_CTYPE=C mvn "$@" | sed -e "s/\(\[INFO\]\)\(.*\)/${TEXT_BLUE}${BOLD}\1${RESET_FORMATTING}\2/g" \
                -e "s/\(\[INFO\]\ BUILD SUCCESSFUL\)/${BOLD}${TEXT_GREEN}\1${RESET_FORMATTING}/g" \
                -e "s/\(\[WARNING\]\)\(.*\)/${BOLD}${TEXT_YELLOW}\1${RESET_FORMATTING}\2/g" \
                -e "s/\(\[ERROR\]\)\(.*\)/${BOLD}${TEXT_RED}\1${RESET_FORMATTING}\2/g" \
                -e "s/Tests run: \([^,]*\), Failures: \([^,]*\), Errors: \([^,]*\), Skipped: \([^,]*\)/${BOLD}${TEXT_GREEN}Tests run: \1${RESET_FORMATTING}, Failures: ${BOLD}${TEXT_RED}\2${RESET_FORMATTING}, Errors: ${BOLD}${TEXT_RED}\3${RESET_FORMATTING}, Skipped: ${BOLD}${TEXT_YELLOW}\4${RESET_FORMATTING}/g"
  
   # Make sure formatting is reset
-  echo -ne ${RESET_FORMATTING}
-  )
+  echo -ne "${RESET_FORMATTING}"
+    )
 }
 
 # Override the mvn command with the colorized one.
@@ -76,18 +76,18 @@ function listMavenCompletions {
         # failsafe
         failsafe:integration-test failsafe:verify
         # install
-        install:install-file
+        install:install-file install:help
         # site
-        site:site site:deploy site:run site:stage site:stage-deploy
+        site:site site:deploy site:run site:stage site:stage-deploy site:attach-descriptor site:jar site:effective-site
         # surefire
         surefire:test
 
         # checkstyle
-        checkstyle:checkstyle checkstyle:check
+        checkstyle:checkstyle checkstyle:check checkstyle:checkstyle-aggregate
         # javadoc
-        javadoc:javadoc javadoc:jar javadoc:aggregate
+        javadoc:javadoc javadoc:test-javadoc javadoc:javadoc-no-fork javadoc:test-javadoc-no-fork javadoc:aggregate javadoc:test-aggregate javadoc:jar javadoc:test-jar javadoc:aggregate-jar javadoc:test-aggregate-jar javadoc:fix javadoc:test-fix javadoc:resource-bundle javadoc:test-resource-bundle
         # jxr
-        jxr:jxr
+        jxr:jxr jxr:aggregate jxr:test-jxr jxr:test-aggregate
         # pmd
         pmd:pmd pmd:cpd pmd:check pmd:cpd-check
 
@@ -100,21 +100,21 @@ function listMavenCompletions {
         # assembly
         assembly:single assembly:assembly
         # dependency
-        dependency:analyze dependency:analyze-dep-mgt dependency:analyze-only dependency:analyze-report dependency:build-classpath dependency:copy dependency:copy-dependencies dependency:get dependency:go-offline dependency:list dependency:purge-local-repository dependency:resolve dependency:resolve-plugins dependency:sources dependency:tree dependency:unpack dependency:unpack-dependencies
+        dependency:analyze dependency:analyze-dep-mgt dependency:analyze-only dependency:analyze-report dependency:analyze-duplicate dependency:build-classpath dependency:copy dependency:copy-dependencies dependency:display-ancestors dependency:get dependency:go-offline dependency:list dependency:list-repositories dependency:properties dependency:purge-local-repository dependency:resolve dependency:resolve-plugins dependency:sources dependency:tree dependency:unpack dependency:unpack-dependencies
         # enforcer
-        enforcer:enforce
+        enforcer:enforce enforcer:display-info
         # gpg
         gpg:sign gpg:sign-and-deploy-file
         # help
         help:active-profiles help:all-profiles help:describe help:effective-pom help:effective-settings help:evaluate help:expressions help:system
         # release
-        release:clean release:prepare release:rollback release:perform release:stage release:branch release:update-versions
+        release:clean release:prepare release:prepare-with-pom release:rollback release:perform release:stage release:branch release:update-versions
         # jgitflow
         jgitflow:feature-start jgitflow:feature-finish jgitflow:release-start jgitflow:release-finish jgitflow:hotfix-start jgitflow:hotfix-finish jgitflow:build-number
         # repository
         repository:bundle-create repository:bundle-pack
         # source
-        source:aggregate source:jar source:jar-no-fork
+        source:aggregate source:jar source:jar-no-fork source:test-jar source:test-jar-no-fork
 
         # eclipse
         eclipse:clean eclipse:eclipse
@@ -142,7 +142,7 @@ function listMavenCompletions {
         # versions
         versions:display-dependency-updates versions:display-plugin-updates versions:display-property-updates versions:update-parent versions:update-properties versions:update-child-modules versions:lock-snapshots versions:unlock-snapshots versions:resolve-ranges versions:set versions:use-releases versions:use-next-releases versions:use-latest-releases versions:use-next-snapshots versions:use-latest-snapshots versions:use-next-versions versions:use-latest-versions versions:commit versions:revert
         # scm
-        scm:add scm:checkin scm:checkout scm:update scm:status
+        scm:add scm:bootstrap scm:branch scm:changelog scm:check-local-modification scm:checkin scm:checkout scm:diff scm:edit scm:export scm:list scm:remove scm:status scm:tag scm:unedit scm:update scm:update-subprojects scm:validate
         # buildnumber
         buildnumber:create buildnumber:create-timestamp buildnumber:help buildnumber:hgchangeset
 
@@ -173,17 +173,102 @@ function listMavenCompletions {
         gwt:browser gwt:clean gwt:compile gwt:compile-report gwt:css gwt:debug gwt:eclipse gwt:eclipseTest gwt:generateAsync gwt:help gwt:i18n gwt:mergewebxml gwt:resources gwt:run gwt:sdkInstall gwt:source-jar gwt:soyc gwt:test
         # asciidoctor
         asciidoctor:process-asciidoc asciidoctor:auto-refresh asciidoctor:http asciidoctor:zip
+        # compiler
+        compiler:compile compiler:testCompile
+        # resources
+        resources:resources resources:testResources resources:copy-resources
+        # verifier
+        verifier:verify
+        # jar
+        jar:jar jar:test-jar
+        # rar
+        rar:rar
+        # acr
+        acr:acr
+        # shade
+        shade:shade
+        # changelog
+        changelog:changelog changelog:dev-activity changelog:file-activity
+        # changes
+        changes:announcement-mail changes:announcement-generate changes:changes-check changes:changes-validate changes:changes-report changes:jira-report changes:trac-report changes:github-report
+        # doap
+        doap:generate
+        # docck
+        docck:check
+        # jdeps
+        jdeps:jdkinternals jdeps:test-jdkinternals
+        # linkcheck
+        linkcheck:linkcheck
+        # project-info-reports
+        project-info-reports:cim project-info-reports:dependencies project-info-reports:dependency-convergence project-info-reports:dependency-info project-info-reports:dependency-management project-info-reports:distribution-management project-info-reports:help project-info-reports:index project-info-reports:issue-tracking project-info-reports:license project-info-reports:mailing-list project-info-reports:modules project-info-reports:plugin-management project-info-reports:plugins project-info-reports:project-team project-info-reports:scm project-info-reports:summary
+        # surefire-report
+        surefire-report:failsafe-report-only surefire-report:report surefire-report:report-only
+        # invoker
+        invoker:install invoker:integration-test invoker:verify invoker:run
+        # jarsigner
+        jarsigner:sign jarsigner:verify
+        # patch
+        patch:apply
+        # pdf
+        pdf:pdf
+        # plugin
+        plugin:descriptor plugin:report plugin:updateRegistry plugin:addPluginArtifactMetadata plugin:helpmojo
+        # remote-resources
+        remote-resources:bundle remote-resources:process
+        # scm-publish
+        scm-publish:help scm-publish:publish-scm scm-publish:scmpublish
+        # stage
+        stage:copy
+        # toolchain
+        toolchain:toolchain
+        
         # options
-        -Dmaven.test.skip=true -DskipTests -DskipITs -Dmaven.surefire.debug -DenableCiProfile -Dpmd.skip=true -Dcheckstyle.skip=true -Dtycho.mode=maven -Dmaven.test.failure.ignore=true -DgroupId= -DartifactId= -Dversion= -Dpackaging=jar -Dfile=
+        "-Dmaven.test.skip=true" -DskipTests -DskipITs -Dmaven.surefire.debug -DenableCiProfile "-Dpmd.skip=true" "-Dcheckstyle.skip=true" "-Dtycho.mode=maven" "-Dmaven.test.failure.ignore=true" "-DgroupId=" "-DartifactId=" "-Dversion=" "-Dpackaging=jar" "-Dfile="
 
         # arguments
-        -am -amd -B -C -c -cpu -D -e -emp -ep -f -fae -ff -fn -gs -h -l -N -npr -npu -nsu -o -P -pl -q -rf -s -T -t -U -up -V -v -X
+        -am --also-make
+        -amd --also-make-dependents-am
+        -B --batch-mode
+        -b --builder
+        -C --strict-checksums
+        -c --lax-checksums
+        -cpu --check-plugin-updates
+        -D --define
+        -e --errors
+        -emp --encrypt-master-password
+        -ep --encrypt-password
+        -f --file
+        -fae --fail-at-end
+        -ff --fail-fast
+        -fn --fail-never
+        -gs --global-settings
+        -gt --global-toolchains
+        -h --help
+        -l --log-file
+        -llr --legacy-local-repository
+        -N --non-recursive
+        -npr --no-plugin-registry
+        -npu --no-plugin-updates
+        -nsu --no-snapshot-updates
+        -o --offline
+        -P --activate-profiles
+        -pl --projects
+        -q --quiet
+        -rf --resume-from
+        -s --settings
+        -t --toolchains
+        -T --threads
+        -U --update-snapshots
+        -up --update-plugins
+        -v --version
+        -V --show-version
+        -X --debug
 
         cli:execute cli:execute-phase 
         archetype:generate generate-sources 
         cobertura:cobertura
-        -Dtest= `if [ -d ./src/test/java ] ; then find ./src/test/java -type f -name '*.java' | grep -v svn | sed 's?.*/\([^/]*\)\..*?-Dtest=\1?' ; fi`
-        -Dit.test= `if [ -d ./src/test/java ] ; then find ./src/test/java -type f -name '*.java' | grep -v svn | sed 's?.*/\([^/]*\)\..*?-Dit.test=\1?' ; fi`
+        -Dtest=$(if [ -d ./src/test/java ] ; then find ./src/test/java -type f -name '*.java' | grep -v svn | sed 's?.*/\([^/]*\)\..*?-Dtest=\1?' ; fi)
+        -Dit.test=$(if [ -d ./src/test/java ] ; then find ./src/test/java -type f -name '*.java' | grep -v svn | sed 's?.*/\([^/]*\)\..*?-Dit.test=\1?' ; fi)
     ); 
 }
 
-- 
cgit v1.2.3-70-g09d2


From 57742ccd726adcd1106c4e0ccee49c3514fa29e5 Mon Sep 17 00:00:00 2001
From: Zach Whitten <zwhitten+github@gmail.com>
Date: Wed, 1 Nov 2017 08:23:14 -0400
Subject: Update to mix plugin to support Phoenix v1.3.0+ tasks (#6355)

---
 plugins/mix/_mix | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/mix/_mix b/plugins/mix/_mix
index cfeb4705e..025572a4d 100644
--- a/plugins/mix/_mix
+++ b/plugins/mix/_mix
@@ -36,6 +36,8 @@ _1st_arguments=(
     'loadconfig:Loads and persists the given configuration'
     'local:List local tasks'
     'local.hex:Install hex locally'
+    'local.phoenix:Updates Phoenix locally'
+    'local.phx:Updates the Phoenix project generator locally'
     'local.rebar:Install rebar locally'
     'new:Create a new Elixir project'
     'phoenix.digest:Digests and compress static files'
@@ -44,9 +46,24 @@ _1st_arguments=(
     'phoenix.gen.json:Generates a controller and model for a JSON based resource'
     'phoenix.gen.model:Generates an Ecto model'
     'phoenix.gen.secret:Generates a secret'
-    'phoenix.new:Create a new Phoenix application'
+    'phoenix.new:Creates a new Phoenix v1.2.1 application'
     'phoenix.routes:Prints all routes'
     'phoenix.server:Starts applications and their servers'
+    'phx.digest:Digests and compresses static files'
+    'phx.digest.clean:Removes old versions of static assets.'
+    'phx.gen.channel:Generates a Phoenix channel'
+    'phx.gen.context:Generates a context with functions around an Ecto schema'
+    'phx.gen.embedded:Generates an embedded Ecto schema file'
+    'phx.gen.html:Generates controller, views, and context for an HTML resource'
+    'phx.gen.json:Generates controller, views, and context for a JSON resource'
+    'phx.gen.presence:Generates a Presence tracker'
+    'phx.gen.schema:Generates an Ecto schema and migration file'
+    'phx.gen.secret:Generates a secret'
+    'phx.new:Creates a new Phoenix v1.3.0 application'
+    'phx.new.ecto:Creates a new Ecto project within an umbrella project'
+    'phx.new.web:Creates a new Phoenix web project within an umbrella project'
+    'phx.routes:Prints all routes'
+    'phx.server:Starts applications and their servers'
     'run:Run the given file or expression'
     "test:Run a project's tests"
     '--help:Describe available tasks'
@@ -58,7 +75,7 @@ __task_list ()
     local expl
     declare -a tasks
 
-    tasks=(app.start archive archive.build archive.install archive.uninstall clean cmd compile compile.protocols deps deps.clean deps.compile deps.get deps.unlock deps.update do escript.build help hex hex.config hex.docs hex.info hex.key hex.outdated hex.owner hex.publish hex.search hex.user loadconfig local local.hex local.rebar new phoenix.digest phoenix.gen.channel phoenix.gen.html phoenix.gen.json phoenix.gen.model phoenix.gen.secret phoenix.new phoenix.routes phoenix.server run test)
+    tasks=(app.start archive archive.build archive.install archive.uninstall clean cmd compile compile.protocols deps deps.clean deps.compile deps.get deps.unlock deps.update do escript.build help hex hex.config hex.docs hex.info hex.key hex.outdated hex.owner hex.publish hex.search hex.user loadconfig local local.hex local.rebar new phoenix.digest phoenix.gen.channel phoenix.gen.html phoenix.gen.json phoenix.gen.model phoenix.gen.secret phoenix.new phoenix.routes phoenix.server phx.digest phx.digest.clean phx.gen.channel phx.gen.context phx.gen.embedded phx.gen.html phx.gen.json phx.gen.presence phx.gen.schema phx.gen.secret phx.new phx.new.ecto phx.new.web phx.routes phx.server run test)
 
     _wanted tasks expl 'help' compadd $tasks
 }
-- 
cgit v1.2.3-70-g09d2


From 1700c948b4cbc5c99640e01923cd6b6e58baebee Mon Sep 17 00:00:00 2001
From: Tomas Chmelevskij <chmelevskij@users.noreply.github.com>
Date: Wed, 1 Nov 2017 12:55:19 +0000
Subject: Add chaced word diff (#6378)

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

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 34942d387..52dcea7dd 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -85,6 +85,7 @@ alias gcs='git commit -S'
 
 alias gd='git diff'
 alias gdca='git diff --cached'
+alias gdcw='git diff --cached --word-diff'
 alias gdct='git describe --tags `git rev-list --tags --max-count=1`'
 alias gdt='git diff-tree --no-commit-id --name-only -r'
 alias gdw='git diff --word-diff'
-- 
cgit v1.2.3-70-g09d2


From b5898a5ec663177210db95b28155d14da64170f0 Mon Sep 17 00:00:00 2001
From: madpawel <madpawel@users.noreply.github.com>
Date: Wed, 1 Nov 2017 13:56:29 +0100
Subject: add -backend-config flag to terraform init command (#6370)

---
 plugins/terraform/_terraform | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins')

diff --git a/plugins/terraform/_terraform b/plugins/terraform/_terraform
index 97c42a559..d67820603 100644
--- a/plugins/terraform/_terraform
+++ b/plugins/terraform/_terraform
@@ -62,6 +62,7 @@ __init() {
         '-address=[(url) URL of the remote storage server. Required for HTTP backend, optional for Atlas and Consul.]' \
         '-access-token=[(token) Authentication token for state storage server. Required for Atlas backend, optional for Consul.]' \
         '-backend=[(atlas) Specifies the type of remote backend. Must be one of Atlas, Consul, or HTTP. Defaults to atlas.]' \
+        '-backend-config=[(path) Specifies the path to remote backend config file.]' \
         '-name=[(name) Name of the state file in the state storage server. Required for Atlas backend.]' \
         '-path=[(path) Path of the remote state in Consul. Required for the Consul backend.]'
 }
-- 
cgit v1.2.3-70-g09d2


From 2102d10896fe14e912ed6ed8075bb0ddd3a5bc6a Mon Sep 17 00:00:00 2001
From: Markus Færevaag <m@frv.ag>
Date: Wed, 1 Nov 2017 22:03:34 +0900
Subject: [wd] Update wd plugin to latest version (#6371)

* [wd] Update wd plugin to v0.4.3

* [wd] Update wd plugin to v0.4.4
---
 plugins/wd/README.md | 23 +++++++++++------
 plugins/wd/_wd.sh    | 21 +++++++++++++++-
 plugins/wd/wd.sh     | 71 ++++++++++++++++++++++++++++++++--------------------
 3 files changed, 80 insertions(+), 35 deletions(-)

(limited to 'plugins')

diff --git a/plugins/wd/README.md b/plugins/wd/README.md
index ed149eb3e..b1deeffd5 100644
--- a/plugins/wd/README.md
+++ b/plugins/wd/README.md
@@ -3,16 +3,17 @@ wd
 
 [![Build Status](https://travis-ci.org/mfaerevaag/wd.png?branch=master)](https://travis-ci.org/mfaerevaag/wd)
 
-`wd` (*warp directory*) lets you jump to custom directories in zsh, without using `cd`. Why? Because `cd` seems ineffecient when the folder is frequently visited or has a long path.
+`wd` (*warp directory*) lets you jump to custom directories in zsh, without using `cd`. Why? Because `cd` seems inefficient when the folder is frequently visited or has a long path.
 
-*NOTE*: If you are not using zsh, check out the `ruby` branch which has `wd` implemented as a gem.
+![tty.gif](https://raw.githubusercontent.com/mfaerevaag/wd/master/tty.gif)
 
+*NEWS*: If you are not using zsh, check out the c-port, [wd-c](https://github.com/mfaerevaag/wd-c), which works with all shells using wrapper functions.
 
 ### Setup
 
 ### oh-my-zsh
 
-`wd` comes bundles with [oh-my-zshell](https://github.com/robbyrussell/oh-my-zsh)!
+`wd` comes bundled with [oh-my-zshell](https://github.com/robbyrussell/oh-my-zsh)!
 
 Just add the plugin in your `~/.zshrc` file:
 
@@ -27,6 +28,10 @@ Run either in terminal:
 
  * `wget --no-check-certificate https://github.com/mfaerevaag/wd/raw/master/install.sh -O - | sh`
 
+##### Arch ([AUR](https://aur.archlinux.org/))
+
+    # yaourt -S zsh-plugin-wd-git
+
 
 #### Manual
 
@@ -48,7 +53,7 @@ Run either in terminal:
 
 #### Completion
 
-If you're NOT using [oh-my-zsh](https://github.com/robbyrussell/oh-my-zsh) and you want to utelize the zsh-completion feature, you will also need to add the path to your `wd` installation (`~/bin/wd` if you used the automatic installer) to your `fpath`. E.g. in your `~/.zshrc`:
+If you're NOT using [oh-my-zsh](https://github.com/robbyrussell/oh-my-zsh) and you want to utilize the zsh-completion feature, you will also need to add the path to your `wd` installation (`~/bin/wd` if you used the automatic installer) to your `fpath`. E.g. in your `~/.zshrc`:
 
     fpath=(~/path/to/wd $fpath)
 
@@ -66,7 +71,9 @@ Also, you may have to force a rebuild of `zcompdump` by running:
 
     If a warp point with the same name exists, use `add!` to overwrite it.
 
-    Note, a warp point cannot contain colons, or only consist of only spaces and dots. The first will conflict in how `wd` stores the warp points, and the second will conflict other features, as below.
+    Note, a warp point cannot contain colons, or only consist of only spaces and dots. The first will conflict in how `wd` stores the warp points, and the second will conflict with other features, as below.
+
+    You can omit point name to use the current directory's name instead.
 
  * From an other directory (not necessarily), warp to `foo` with:
 
@@ -84,6 +91,8 @@ Also, you may have to force a rebuild of `zcompdump` by running:
 
         $ wd rm foo
 
+    You can omit point name to use the current directory's name instead.
+
  * List all warp points (stored in `~/.warprc`):
 
         $ wd list
@@ -143,8 +152,8 @@ The project is licensed under the [MIT-license](https://github.com/mfaerevaag/wd
 
 ### Finally
 
-If you have issues, feedback or improvements, don't hesitate to report it or submit a pull-request. In the case of an issue, we would much appreciate if you would include a failing test in `test/tests.sh`. Explanation on how to run the tests, read the section "Testing" in this README.
+If you have issues, feedback or improvements, don't hesitate to report it or submit a pull-request. In the case of an issue, we would much appreciate if you would include a failing test in `test/tests.sh`. For an explanation on how to run the tests, read the section "Testing" in this README.
 
-Credit to [altschuler](https://github.com/altschuler) for awesome idea.
+Credit to [altschuler](https://github.com/altschuler) for an awesome idea.
 
 Hope you enjoy!
diff --git a/plugins/wd/_wd.sh b/plugins/wd/_wd.sh
index b67f4a1e2..65fa1ddde 100644
--- a/plugins/wd/_wd.sh
+++ b/plugins/wd/_wd.sh
@@ -16,6 +16,19 @@ function _wd() {
 
   warp_points=( "${(f)mapfile[$CONFIG]//$HOME/~}" )
 
+  typeset -A points
+  while read -r line
+  do
+    arr=(${(s,:,)line})
+    name=${arr[1]}
+    path=${arr[2]}
+
+    # replace ~ from path to fix completion (#17)
+    path=${path/#\~/$HOME}
+
+    points[$name]=$path
+  done < $CONFIG
+
   commands=(
     'add:Adds the current working directory to your warp points'
     'add!:Overwrites existing warp point'
@@ -34,13 +47,15 @@ function _wd() {
     '1: :->first_arg' \
     '2: :->second_arg' && ret=0
 
+  local target=$words[2]
+
   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
+      case $target in
         add\!|rm)
           _describe -t points "Warp points" warp_points && ret=0
           ;;
@@ -56,6 +71,10 @@ function _wd() {
         path)
           _describe -t points "Warp points" warp_points && ret=0
           ;;
+        *)
+          # complete sub directories from the warp point
+          _path_files -W "(${points[$target]})" -/ && ret=0
+          ;;
       esac
       ;;
   esac
diff --git a/plugins/wd/wd.sh b/plugins/wd/wd.sh
index cf54713bd..c330dd358 100755
--- a/plugins/wd/wd.sh
+++ b/plugins/wd/wd.sh
@@ -8,7 +8,7 @@
 # @github.com/mfaerevaag/wd
 
 # version
-readonly WD_VERSION=0.4.2
+readonly WD_VERSION=0.4.4
 
 # colors
 readonly WD_BLUE="\033[96m"
@@ -72,25 +72,28 @@ wd_print_msg()
 wd_print_usage()
 {
     cat <<- EOF
-Usage: wd [command] <point>
+Usage: wd [command] [point]
 
 Commands:
-	add <point>	Adds the current working directory to your warp points
-	add! <point>	Overwrites existing warp point
-	rm <point>	Removes the given warp point
-	show		Print warp points to current directory
-	show <point>	Print path to given warp point
-	list	        Print all stored warp points
-ls  <point>     Show files from given warp point
-path <point>    Show the path to given warp point
-	clean!		Remove points warping to nonexistent directories
-
-	-v | --version	Print version
-	-d | --debug	Exit after execution with exit codes (for testing)
-	-c | --config	Specify config file (default ~/.warprc)
-	-q | --quiet	Suppress all output
-
-	help		Show this extremely helpful text
+    add <point>     Adds the current working directory to your warp points
+    add             Adds the current working directory to your warp points with current directory's name
+    add! <point>    Overwrites existing warp point
+    add!            Overwrites existing warp point with current directory's name
+    rm <point>      Removes the given warp point
+    rm              Removes the given warp point with current directory's name
+    show <point>    Print path to given warp point
+    show            Print warp points to current directory
+    list            Print all stored warp points
+    ls  <point>     Show files from given warp point (ls)
+    path <point>    Show the path to given warp point (pwd)
+    clean!          Remove points warping to nonexistent directories
+
+    -v | --version  Print version
+    -d | --debug    Exit after execution with exit codes (for testing)
+    -c | --config   Specify config file (default ~/.warprc)
+    -q | --quiet    Suppress all output
+
+    help            Show this extremely helpful text
 EOF
 }
 
@@ -131,10 +134,11 @@ wd_getdir()
 wd_warp()
 {
     local point=$1
+    local sub=$2
 
     if [[ $point =~ "^\.+$" ]]
     then
-        if [ $#1 < 2 ]
+        if [[ $#1 < 2 ]]
         then
             wd_exit_warn "Warping to current directory?"
         else
@@ -143,7 +147,12 @@ wd_warp()
         fi
     elif [[ ${points[$point]} != "" ]]
     then
-        cd ${points[$point]/#\~/$HOME}
+        if [[ $sub != "" ]]
+        then
+            cd ${points[$point]/#\~/$HOME}/$sub
+        else
+            cd ${points[$point]/#\~/$HOME}
+        fi
     else
         wd_exit_fail "Unknown warp point '${point}'"
     fi
@@ -154,6 +163,11 @@ wd_add()
     local force=$1
     local point=$2
 
+    if [[ $point == "" ]]
+    then
+        point=$(basename $PWD)
+    fi
+
     if [[ $point =~ "^[\.]+$" ]]
     then
         wd_exit_fail "Warp point cannot be just dots"
@@ -163,10 +177,7 @@ wd_add()
     elif [[ $point == *:* ]]
     then
         wd_exit_fail "Warp point cannot contain colons"
-    elif [[ $point == "" ]]
-    then
-        wd_exit_fail "Warp point cannot be empty"
-    elif [[ ${points[$2]} == "" ]] || $force
+    elif [[ ${points[$point]} == "" ]] || $force
     then
         wd_remove $point > /dev/null
         printf "%q:%s\n" "${point}" "${PWD/#$HOME/~}" >> $WD_CONFIG
@@ -185,6 +196,11 @@ wd_remove()
 {
     local point=$1
 
+    if [[ $point == "" ]]
+    then
+        point=$(basename $PWD)
+    fi
+
     if [[ ${points[$point]} != "" ]]
     then
         local config_tmp=$WD_CONFIG.tmp
@@ -294,7 +310,7 @@ wd_clean() {
             key=${arr[1]}
             val=${arr[2]}
 
-            if [ -d "$val" ]
+            if [ -d "${val/#\~/$HOME}" ]
             then
                 wd_tmp=$wd_tmp"\n"`echo $line`
             else
@@ -356,7 +372,8 @@ while read -r line
 do
     arr=(${(s,:,)line})
     key=${arr[1]}
-    val=${arr[2]}
+    # join the rest, in case the path contains colons
+    val=${(j,:,)arr[2,-1]}
 
     points[$key]=$val
 done < $WD_CONFIG
@@ -424,7 +441,7 @@ else
                 break
                 ;;
             *)
-                wd_warp $o
+                wd_warp $o $2
                 break
                 ;;
             --)
-- 
cgit v1.2.3-70-g09d2


From e8e7bf3b892ef69aac97c171d02b4b026322dcec Mon Sep 17 00:00:00 2001
From: bjorn3 <bjorn3@users.noreply.github.com>
Date: Wed, 1 Nov 2017 14:04:03 +0100
Subject: Update rust plugin for latest rustc (#6342)

* Update for latest rustc

* Some debug option updates

* Add some cargo flags

* Fix bug in cargo plugin
---
 plugins/cargo/_cargo |  5 +++-
 plugins/rust/_rust   | 65 +++++++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 55 insertions(+), 15 deletions(-)

(limited to 'plugins')

diff --git a/plugins/cargo/_cargo b/plugins/cargo/_cargo
index 175859202..54e709ca0 100644
--- a/plugins/cargo/_cargo
+++ b/plugins/cargo/_cargo
@@ -7,10 +7,13 @@ _cargo() {
 
 _arguments \
     '(- 1 *)'{-h,--help}'[show help message]' \
+    '(- 1 *)'{-V,--version}'[show version information]' \
     '(- 1 *)'--list'[list installed commands]' \
+    '(- 1 *)'--explain'[Run `rustc --explain CODE`]' \
     '(- 1 *)'{-v,--verbose}'[use verbose output]' \
     '(- 1 *)'--color'[colorization option]' \
-    '(- 1 *)'{-V,--version}'[show version information]' \
+    '(- 1 *)'--frozen'[Require Cargo.lock and cache are up to date]' \
+    '(- 1 *)'--locked'[Require Cargo.lock is up to date]' \
     '1: :_cargo_cmds' \
     '*:: :->args'
 
diff --git a/plugins/rust/_rust b/plugins/rust/_rust
index f4e8f6f78..ac6aee160 100644
--- a/plugins/rust/_rust
+++ b/plugins/rust/_rust
@@ -15,59 +15,93 @@ _rustc_crate_types=(
     'lib'
     'rlib'
     'dylib'
+    'cdylib'
     'staticlib'
+    'proc-macro'
 )
 
 _rustc_emit_types=(
     'asm'
-    'bc'
-    'ir'
+    'llvm-bc'
+    'llvm-ir'
     'obj'
+    'metadata'
     'link'
+    'dep-info'
+    'mir'
+)
+_rustc_print_types=(
+    'crate-name'
+    'file-names'
+    'sysroot'
+    'cfg'
+    'target-list'
+    'target-cpus'
+    'target-features'
+    'relocation-models'
+    'code-models'
+    'target-spec-json'
+    'native-static-libs'
 )
 _rustc_pretty_types=(
     'normal[un-annotated source]'
     'expanded[crates expanded]'
-    'typed[crates  expanded,  with  type  annotations]'
-    'identified[fully parenthesized, AST nodes and blocks with IDs]'
+    'expanded,identified[fully parenthesized, AST nodes with IDs]'
+)
+_rustc_unpretty_types=(
+    'normal[un-annotated source]'
+    'expanded[crates expanded]'
+    'expanded,identified[fully parenthesized, AST nodes with IDs]'
     'flowgraph=[graphviz formatted flowgraph for node]:NODEID:'
+    'everybody_loops[all function bodies replaced with `loop {}`]'
+    'hir[the HIR]'
+    'hir,identified'
+    'hir,typed[HIR with types for each node]'
 )
 _rustc_color_types=(
     'auto[colorize, if output goes to a tty (default)]'
     'always[always colorize output]'
     'never[never colorize output]'
 )
+_rustc_error_format=(
+    'human'
+    'json'
+)
 
 _rustc_opts_vals=(
+    --cfg='[Configure the compilation environment]:SPEC:'
+    -L'[Add a directory to the library search path]:DIR:_files -/'
     --crate-name='[Specify the name of the crate being built]'
     --crate-type='[Comma separated list of types of crates for the compiler to emit]:TYPES:_values -s "," "Crate types"  "$_rustc_crate_types[@]"'
     --emit='[Comma separated list of types of output for the compiler to emit]:TYPES:_values -s "," "Emit Targets" "$_rustc_emit_types[@]"'
+    --print='[Comma separated list of compiler information to print on stdout]:TYPES:_values -s "," "Printable info" "$_rustc_print_types[@]"'
+    -o'[Write output to <filename>. Ignored if more than one --emit is specified.]:FILENAME:_files'
+    --out-dir='[Write output to compiler-chosen filename in <dir>.  Ignored  if  -o  is  specified. (default the current directory)]:DIR:_files -/'
+    --explain='[Provide a detailed explanation of an error message]:OPT:'
+    --target='[Target triple cpu-manufacturer-kernel\[-os\] to compile]:TRIPLE:'
+    --extern'[Specify where an external rust library is located]:ARG:'
+    --sysroot='[Override the system root]:PATH:_files -/'
+    --error-format='[How errors and other messages are produced]:TYPES:_values "$_rustc_error_format"'
     --debuginfo='[Emit DWARF debug info to the objects created]:LEVEL:_values "Debug Levels" "$_rustc_debuginfo_levels[@]"'
     --dep-info='[Output dependency info to <filename> after compiling]::FILE:_files -/'
-    --sysroot='[Override the system root]:PATH:_files -/'
-    --cfg='[Configure the compilation environment]:SPEC:'
-    --out-dir='[Write output to compiler-chosen filename in <dir>.  Ignored  if  -o  is  specified. (default the current directory)]:DIR:_files -/'
-    -o'[Write output to <filename>. Ignored if more than one --emit is specified.]:FILENAME:_files'
     --opt-level='[Optimize with possible levels 0-3]:LEVEL:(0 1 2 3)'
     --pretty='[Pretty-print the input instead of compiling]::TYPE:_values "TYPES" "$_rustc_pretty_types[@]"'
-    -L'[Add a directory to the library search path]:DIR:_files -/'
-    --target='[Target triple cpu-manufacturer-kernel\[-os\] to compile]:TRIPLE:'
+    --unpretty='[Present the input source, unstable (and less-pretty)]::TYPE:_values "TYPES" "$_rustc_unpretty_types[@]"'
     --color='[Configure coloring of output]:CONF:_values "COLORS" "$_rustc_color_types[@]"'
     {-v,--version}'[Print version info and exit]::VERBOSE:(verbose)'
-    --explain='[Provide a detailed explanation of an error message]:OPT:'
-    --extern'[Specify where an external rust library is located]:ARG:'
 )
 
 _rustc_opts_switches=(
     -g'[Equivalent to --debuginfo=2]'
+    -O'[Equivalent to --opt-level=2]'
+    --test'[Build a test harness]'
+    --verbose'[Use verbose output]'
     {-h,--help}'[Display this message]'
     --no-analysis'[Parse and expand the output, but run no analysis or produce output]'
     --no-trans'[Run all passes except translation; no output]'
-    -O'[Equivalent to --opt-level=2]'
     --parse-only'[Parse only; do not compile, assemble, or link]'
     --print-crate-name'[Output the crate name and exit]'
     --print-file-name'[Output the file(s) that would be written if compilation continued and exit]'
-    --test'[Build a test harness]'
 )
 _rustc_opts_codegen=(
     'ar=[Path to the archive utility to use when assembling archives.]:BIN:_path_files'
@@ -139,6 +173,9 @@ _rustc_opts_lint=(
 
 _rustc_opts_debug=(
     'verbose[in general, enable more debug printouts]'
+    'span-free-formats[when debug-printing compiler state, do not include spans]'
+    "identify-regions[make unnamed regions display as '# (where # is some non-ident unique id)]"
+    'emit-end-regions[emit EndRegion as part of MIR; enable transforms that solely process EndRegion]'
     'time-passes[measure time of each rustc pass]'
     'count-llvm-insns[count where LLVM instrs originate]'
     'time-llvm-passes[measure time of each LLVM pass]'
-- 
cgit v1.2.3-70-g09d2


From 529a12fac857efbfa749998ed872d668ff51d15d Mon Sep 17 00:00:00 2001
From: Jarryd Tilbrook <jrad.tilbrook@gmail.com>
Date: Wed, 1 Nov 2017 21:04:41 +0800
Subject: Add shortcut for opening current branch in Jira (#6366)

---
 plugins/jira/_jira           |  1 +
 plugins/jira/jira.plugin.zsh | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/jira/_jira b/plugins/jira/_jira
index 03fe6a499..890f97f4c 100644
--- a/plugins/jira/_jira
+++ b/plugins/jira/_jira
@@ -7,6 +7,7 @@ _1st_arguments=(
   'dashboard:open the dashboard'
   'reported:search for issues reported by a user'
   'assigned:search for issues assigned to a user'
+  'br:open the issue named after the git branch of the current directory'
   'dumpconfig:display effective jira configuration'
 )
 
diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh
index 67c989457..fe1772cd8 100644
--- a/plugins/jira/jira.plugin.zsh
+++ b/plugins/jira/jira.plugin.zsh
@@ -51,8 +51,14 @@ function jira() {
     echo "JIRA_DEFAULT_ACTION=$JIRA_DEFAULT_ACTION"
   else
     # Anything that doesn't match a special action is considered an issue name
-    local issue_arg=$action
-    local issue="${jira_prefix}${issue_arg}"
+    # but `branch` is a special case that will parse the current git branch
+    if [[ "$action" == "br" ]]; then
+      local issue_arg=$(git rev-parse --abbrev-ref HEAD)
+      local issue="${jira_prefix}${issue_arg}"
+    else
+      local issue_arg=$action
+      local issue="${jira_prefix}${issue_arg}"
+    fi
     local url_fragment=''
     if [[ "$2" == "m" ]]; then
       url_fragment="#add-comment"
-- 
cgit v1.2.3-70-g09d2


From 1e027509d840d0d2a2fee1001543a5f2f34b3c28 Mon Sep 17 00:00:00 2001
From: Wenzheng Jiang <jwzh.hi@gmail.com>
Date: Thu, 2 Nov 2017 00:05:35 +1100
Subject: Add nixos support for autojump plugin (#6365)

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

(limited to 'plugins')

diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh
index c05c699e1..7339fad9e 100644
--- a/plugins/autojump/autojump.plugin.zsh
+++ b/plugins/autojump/autojump.plugin.zsh
@@ -5,6 +5,8 @@ if [ $commands[autojump] ]; then # check if autojump is installed
     . $HOME/.autojump/share/autojump/autojump.zsh
   elif [ -f $HOME/.nix-profile/etc/profile.d/autojump.zsh ]; then # nix installation
     . $HOME/.nix-profile/etc/profile.d/autojump.zsh
+  elif [ -f /run/current-system/sw/share/autojump/autojump.zsh ]; then # nixos installation
+    . /run/current-system/sw/share/autojump/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
-- 
cgit v1.2.3-70-g09d2


From 6d5b1f1e3be483bb09315d22a2175d1c97998167 Mon Sep 17 00:00:00 2001
From: Jarryd Tilbrook <jrad.tilbrook@gmail.com>
Date: Wed, 1 Nov 2017 21:09:10 +0800
Subject: Allow jira default action file based setting (#6367)

---
 plugins/jira/jira.plugin.zsh | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'plugins')

diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh
index fe1772cd8..7d4e5b921 100644
--- a/plugins/jira/jira.plugin.zsh
+++ b/plugins/jira/jira.plugin.zsh
@@ -2,13 +2,19 @@
 #
 # See README.md for details
 
-: ${JIRA_DEFAULT_ACTION:=new}
-
 function jira() {
   emulate -L zsh
-  local action=${1:=$JIRA_DEFAULT_ACTION}
+  local action jira_url jira_prefix
+  if [[ -f .jira-default-action ]]; then
+    action=$(cat .jira-default-action)
+  elif [[ -f ~/.jira-default-action ]]; then
+    action=$(cat ~/.jira-default-action)
+  elif [[ -n "${JIRA_DEFAULT_ACTION}" ]]; then
+    action=${JIRA_DEFAULT_ACTION}
+  else
+    action="new"
+  fi
 
-  local jira_url jira_prefix
   if [[ -f .jira-url ]]; then
     jira_url=$(cat .jira-url)
   elif [[ -f ~/.jira-url ]]; then
-- 
cgit v1.2.3-70-g09d2


From 0fc24140951e9015569080b1596a0d7536f93a0d Mon Sep 17 00:00:00 2001
From: Arthur Schneider <dev.schneiart@gmail.com>
Date: Wed, 1 Nov 2017 14:09:31 +0100
Subject: Update git-flow aliases (#6335)

It is possible to pull and push branches to/from origin
---
 plugins/git-flow/git-flow.plugin.zsh | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'plugins')

diff --git a/plugins/git-flow/git-flow.plugin.zsh b/plugins/git-flow/git-flow.plugin.zsh
index bda050725..5f5e4aa73 100644
--- a/plugins/git-flow/git-flow.plugin.zsh
+++ b/plugins/git-flow/git-flow.plugin.zsh
@@ -35,6 +35,10 @@ alias gflrs='git flow release start'
 alias gflff='git flow feature finish'
 alias gflhf='git flow hotfix finish'
 alias gflrf='git flow release finish'
+alias gflfp='git flow feature publish'
+alias gflhp='git flow hotfix publish'
+alias gflrp='git flow release publish'
+alias gflfpll='git flow feature pull'
 
 _git-flow ()
 {
-- 
cgit v1.2.3-70-g09d2


From 4cb730773b52a47f2e9ab159a6b1c5185a3a37fb Mon Sep 17 00:00:00 2001
From: Mike Reardon <mike.reardon@me.com>
Date: Wed, 1 Nov 2017 06:21:49 -0700
Subject: Added 'clean verify' to the mvn plugin targets (#6339)

---
 plugins/mvn/README.md      | 1 +
 plugins/mvn/mvn.plugin.zsh | 1 +
 2 files changed, 2 insertions(+)

(limited to 'plugins')

diff --git a/plugins/mvn/README.md b/plugins/mvn/README.md
index ffc5f6832..986ac84a4 100644
--- a/plugins/mvn/README.md
+++ b/plugins/mvn/README.md
@@ -17,6 +17,7 @@ plugins=(... mvn)
 | `mvncist`            | `mvn clean install -DskipTests`                 |
 | `mvncisto`           | `mvn clean install -DskipTests --offline`       |
 | `mvne`               | `mvn eclipse:eclipse`                           |
+| `mvncv`              | `mvn clean verify`                              |
 | `mvnd`               | `mvn deploy`                                    |
 | `mvnp`               | `mvn package`                                   |
 | `mvnc`               | `mvn clean`                                     |
diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index f1e4d3ee0..ee6fe2770 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -47,6 +47,7 @@ alias mvncist='mvn clean install -DskipTests'
 alias mvncisto='mvn clean install -DskipTests --offline'
 alias mvne='mvn eclipse:eclipse'
 alias mvnce='mvn clean eclipse:clean eclipse:eclipse'
+alias mvncv='mvn clean verify'
 alias mvnd='mvn deploy'
 alias mvnp='mvn package'
 alias mvnc='mvn clean'
-- 
cgit v1.2.3-70-g09d2


From 93120c4151b0bbc831ce29f5386f8d9dcf313573 Mon Sep 17 00:00:00 2001
From: ramanduh <ramanduh@users.noreply.github.com>
Date: Sat, 4 Nov 2017 18:31:42 +0100
Subject: jira plugin: take into account action argument (fix #6388) (#6393)

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

(limited to 'plugins')

diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh
index 7d4e5b921..0340dd7f4 100644
--- a/plugins/jira/jira.plugin.zsh
+++ b/plugins/jira/jira.plugin.zsh
@@ -5,7 +5,9 @@
 function jira() {
   emulate -L zsh
   local action jira_url jira_prefix
-  if [[ -f .jira-default-action ]]; then
+  if [[ -n "$1" ]]; then
+    action=$1
+  elif [[ -f .jira-default-action ]]; then
     action=$(cat .jira-default-action)
   elif [[ -f ~/.jira-default-action ]]; then
     action=$(cat ~/.jira-default-action)
-- 
cgit v1.2.3-70-g09d2


From 905eb815fa380d561d23af33bbbda6175025c343 Mon Sep 17 00:00:00 2001
From: David Librera <davidlibrera@gmail.com>
Date: Sat, 4 Nov 2017 18:33:57 +0100
Subject: Check first for bin/stubs directory in _rails_command and
 _rake_command (#6372)

---
 plugins/rails/rails.plugin.zsh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
index c8974b5f4..eb3f30360 100644
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@@ -1,5 +1,7 @@
 function _rails_command () {
-  if [ -e "bin/rails" ]; then
+  if [ -e "bin/stubs/rails" ]; then
+    bin/stubs/rails $@
+  elif [ -e "bin/rails" ]; then
     bin/rails $@
   elif [ -e "script/rails" ]; then
     ruby script/rails $@
@@ -11,7 +13,9 @@ function _rails_command () {
 }
 
 function _rake_command () {
-  if [ -e "bin/rake" ]; then
+  if [ -e "bin/stubs/rake" ]; then
+    bin/stubs/rake $@
+  elif [ -e "bin/rake" ]; then
     bin/rake $@
   elif type bundle &> /dev/null && [ -e "Gemfile" ]; then
     bundle exec rake $@
-- 
cgit v1.2.3-70-g09d2


From fb1227088d2448d9de8385c466d8c2c1b92a1042 Mon Sep 17 00:00:00 2001
From: Sebastian Schlein <sschlein@users.noreply.github.com>
Date: Sat, 4 Nov 2017 18:34:31 +0100
Subject: Enhanced Laravel 5 Plugin (#6376)

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

(limited to 'plugins')

diff --git a/plugins/laravel5/laravel5.plugin.zsh b/plugins/laravel5/laravel5.plugin.zsh
index 38454f40d..487a0742b 100644
--- a/plugins/laravel5/laravel5.plugin.zsh
+++ b/plugins/laravel5/laravel5.plugin.zsh
@@ -1,6 +1,6 @@
 # Laravel5 basic command completion
 _laravel5_get_command_list () {
-	php artisan --no-ansi | sed "1,/Available commands/d" | awk '/^ +[a-z]+/ { print $1 }'
+	php artisan --raw --no-ansi list | sed "s/[[:space:]].*//g"
 }
 
 _laravel5 () {
-- 
cgit v1.2.3-70-g09d2


From d29784e1aebab5e02db918b1ffbfa4d2d308799a Mon Sep 17 00:00:00 2001
From: Athaher Sirnaik <athaher.sirnaik@hotmail.com>
Date: Sat, 4 Nov 2017 23:05:44 +0530
Subject: Improved npm aliases: run, publish (#6354)

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

(limited to 'plugins')

diff --git a/plugins/npm/npm.plugin.zsh b/plugins/npm/npm.plugin.zsh
index 43aedc36d..014fb55f8 100644
--- a/plugins/npm/npm.plugin.zsh
+++ b/plugins/npm/npm.plugin.zsh
@@ -38,9 +38,17 @@ alias npmV="npm -v"
 # List packages
 alias npmL="npm list"
 
+# List top-level installed packages
+alias npmL0="npm ls --depth=0"
+
 # Run npm start
 alias npmst="npm start"
 
 # Run npm test
 alias npmt="npm test"
 
+# Run npm scripts
+alias npmR="npm run"
+
+# Run npm publish 
+alias npmP="npm publish"
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From d6ccb41d0baa65a8b9496cbebdbf2589ffb5c85f Mon Sep 17 00:00:00 2001
From: William Bautista <Willibaur@users.noreply.github.com>
Date: Sat, 4 Nov 2017 17:41:14 +0000
Subject: Update Yarn plugin alias (#6246)

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

(limited to 'plugins')

diff --git a/plugins/yarn/yarn.plugin.zsh b/plugins/yarn/yarn.plugin.zsh
index 47c503acb..5fa512377 100644
--- a/plugins/yarn/yarn.plugin.zsh
+++ b/plugins/yarn/yarn.plugin.zsh
@@ -1,4 +1,11 @@
-alias yi="yarn install"
+# Alias sorted alphabetically
+
+alias y="yarn "
+alias ya="yarn add"
+alias ycc="yarn cache clean"
+alias yh="yarn help"
+alias yo="yarn outdated"
+alias yui="yarn upgrade-interactive"
 
 _yarn ()
 {
-- 
cgit v1.2.3-70-g09d2


From 1ec5bab7d82bfc82ee4e9f37cc67b6476a060008 Mon Sep 17 00:00:00 2001
From: Canux <canuxcheng@gmail.com>
Date: Mon, 6 Nov 2017 22:41:13 +0800
Subject: fix conflict with command ag (#6395)

ag is a famous command just like grep.
---
 plugins/debian/debian.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index 28131ff80..19966b6ac 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -50,7 +50,7 @@ if [[ $use_sudo -eq 1 ]]; then
     alias adg='sudo $apt_pref update && sudo $apt_pref $apt_upgr'
     alias adu='sudo $apt_pref update && sudo $apt_pref dist-upgrade'
     alias afu='sudo apt-file update'
-    alias ag='sudo $apt_pref $apt_upgr'
+    alias au='sudo $apt_pref $apt_upgr'
     alias ai='sudo $apt_pref install'
     # Install all packages given on the command line while using only the first word of each line:
     # acs ... | ail
-- 
cgit v1.2.3-70-g09d2


From d072c0fbec58439ede849facf89fa11225dd85d9 Mon Sep 17 00:00:00 2001
From: Tiago Rinaldi <trinaldi@gmail.com>
Date: Mon, 6 Nov 2017 12:41:33 -0200
Subject: Change `agud` alias from `dist-upgrade` to `full-upgrade` (#6384)

---
 plugins/ubuntu/readme.md         | 2 +-
 plugins/ubuntu/ubuntu.plugin.zsh | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'plugins')

diff --git a/plugins/ubuntu/readme.md b/plugins/ubuntu/readme.md
index 5ad4bbcd2..99d62a6f7 100644
--- a/plugins/ubuntu/readme.md
+++ b/plugins/ubuntu/readme.md
@@ -16,6 +16,6 @@ afs = Apt-File Search --regexp - this has the regexp switch on without being rep
 
 Then there are the 2 other 4 letter aliases for combined commands, that are straight forward and easy to remember.  
 aguu = sudo Apt-Get Update && sudo apt-get Upgrade      - better then adg or not?  
-agud = sudo Apt-Get Update && sudo apt-get Dist-upgrade
+agud = sudo Apt-Get Update && sudo apt-get full-upgrade
 
 For a full list aliases and the functions just watch the plugins code https://github.com/robbyrussell/oh-my-zsh/blob/master/plugins/ubuntu/ubuntu.plugin.zsh, look at the comments if you want to switch from the debian plugin. Ubuntu, Mint and & co users will like the new aar function to install packages from ppas with a single command.
diff --git a/plugins/ubuntu/ubuntu.plugin.zsh b/plugins/ubuntu/ubuntu.plugin.zsh
index 60ff0457f..eab2da409 100644
--- a/plugins/ubuntu/ubuntu.plugin.zsh
+++ b/plugins/ubuntu/ubuntu.plugin.zsh
@@ -2,6 +2,7 @@
 # https://github.com/AlexBio
 # https://github.com/dbb
 # https://github.com/Mappleconfusers
+# https://github.com/trinaldi
 # Nicolas Jonas nextgenthemes.com
 # https://github.com/loctauxphilippe
 #
@@ -36,7 +37,7 @@ alias agi='sudo apt-get install'  # ai
 alias agp='sudo apt-get purge'    # ap
 alias agr='sudo apt-get remove'   # ar
 alias agu='sudo apt-get update'   # ad
-alias agud='sudo apt-get update && sudo apt-get dist-upgrade' #adu
+alias agud='sudo apt-get update && sudo apt-get full-upgrade' #adu
 alias agug='sudo apt-get upgrade' # ag
 alias aguu='sudo apt-get update && sudo apt-get upgrade'      #adg
 alias agar='sudo apt-get autoremove'
@@ -50,7 +51,7 @@ compdef _agi agi='sudo apt-get install'
 compdef _agp agp='sudo apt-get purge'
 compdef _agr agr='sudo apt-get remove'
 compdef _agu agu='sudo apt-get update'
-compdef _agud agud='sudo apt-get update && sudo apt-get dist-upgrade'
+compdef _agud agud='sudo apt-get update && sudo apt-get full-upgrade'
 compdef _agug agug='sudo apt-get upgrade'
 compdef _aguu aguu='sudo apt-get update && sudo apt-get upgrade'
 compdef _agar agar='sudo apt-get autoremove'
-- 
cgit v1.2.3-70-g09d2


From 9dab0af11f22f91c98a77892a14b16ca7fa7fbb4 Mon Sep 17 00:00:00 2001
From: Nicolas Cavigneaux <nico@bounga.org>
Date: Mon, 6 Nov 2017 15:43:03 +0100
Subject: Set RBENV_ROOT to "$HOME/.rbenv" if not already set (#6324)

This is the default behavior of rbenv and what users are expecting
most of the time.

It allows users to have their own set of rubies and gems. It also
prevents losing all rubies when rbenv is updated using Homebrew which
is not true when RBENV_ROOT is set to /usr/local/opt/rbenv.
---
 plugins/rbenv/rbenv.plugin.zsh | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'plugins')

diff --git a/plugins/rbenv/rbenv.plugin.zsh b/plugins/rbenv/rbenv.plugin.zsh
index ef5106f2d..7430e9625 100644
--- a/plugins/rbenv/rbenv.plugin.zsh
+++ b/plugins/rbenv/rbenv.plugin.zsh
@@ -7,6 +7,9 @@ rbenvdirs=("$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv" "/usr/local/opt/rbenv"
 if _homebrew-installed && rbenv_homebrew_path=$(brew --prefix rbenv 2>/dev/null); then
     rbenvdirs=($rbenv_homebrew_path "${rbenvdirs[@]}")
     unset rbenv_homebrew_path
+    if [[ $RBENV_ROOT = '' ]]; then 
+      RBENV_ROOT="$HOME/.rbenv"
+    fi
 fi
 
 for rbenvdir in "${rbenvdirs[@]}" ; do
-- 
cgit v1.2.3-70-g09d2


From b53fbc36c15d5d2f65ec1779cec9e05b533337b6 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pyapar@gmail.com>
Date: Mon, 6 Nov 2017 18:18:56 +0330
Subject: plugin: npx (#6152)

---
 plugins/npx/README.md      | 17 +++++++++++++++++
 plugins/npx/npx.plugin.zsh |  7 +++++++
 2 files changed, 24 insertions(+)
 create mode 100644 plugins/npx/README.md
 create mode 100644 plugins/npx/npx.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/npx/README.md b/plugins/npx/README.md
new file mode 100644
index 000000000..2c94e4515
--- /dev/null
+++ b/plugins/npx/README.md
@@ -0,0 +1,17 @@
+# NPX Plugin
+> npx(1) -- execute npm package binaries. ([more info](https://github.com/zkat/npx))
+
+This plugin automatically registers npx command-not-found handler if `npx` exists in your `$PATH`.
+
+## Setup
+
+- Add plugin to `~/.zshrc`
+
+```bash
+plugins=(.... npx)
+```
+
+- Globally install npx binary (you need node.js installed too!)
+```bash
+sudo npm install -g npx
+```
\ No newline at end of file
diff --git a/plugins/npx/npx.plugin.zsh b/plugins/npx/npx.plugin.zsh
new file mode 100644
index 000000000..32bb67377
--- /dev/null
+++ b/plugins/npx/npx.plugin.zsh
@@ -0,0 +1,7 @@
+# NPX Plugin
+# https://www.npmjs.com/package/npx
+# Maintainer: Pooya Parsa <pooya@pi0.ir>
+
+(( $+commands[npx] )) && {
+ source <(npx --shell-auto-fallback zsh)
+}
-- 
cgit v1.2.3-70-g09d2


From 9edb3fcebac250e12850530222a10a13d513f03f Mon Sep 17 00:00:00 2001
From: Vincent <github@fleeto.us>
Date: Mon, 6 Nov 2017 22:49:27 +0800
Subject: Added: Helm plugins (#6265)

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

(limited to 'plugins')

diff --git a/plugins/helm/helm.plugin.zsh b/plugins/helm/helm.plugin.zsh
new file mode 100644
index 000000000..78499c15d
--- /dev/null
+++ b/plugins/helm/helm.plugin.zsh
@@ -0,0 +1,7 @@
+# Autocompletion for helm.
+#
+# Copy from kubectl : https://github.com/pstadler
+
+if [ $commands[helm] ]; then
+  source <(helm completion zsh)
+fi
-- 
cgit v1.2.3-70-g09d2


From 46062e25cc4ebae21465cac4680ce284dcf475a7 Mon Sep 17 00:00:00 2001
From: Markus Færevaag <m@frv.ag>
Date: Wed, 8 Nov 2017 00:40:24 +0900
Subject: [wd] Update wd plugin to latest (#6383)

* Update wd plugin to v0.4.5

* [wd] Update wd plugin to v0.4.6
---
 plugins/wd/_wd.sh | 6 +++---
 plugins/wd/wd.sh  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'plugins')

diff --git a/plugins/wd/_wd.sh b/plugins/wd/_wd.sh
index 65fa1ddde..d5419d629 100644
--- a/plugins/wd/_wd.sh
+++ b/plugins/wd/_wd.sh
@@ -21,12 +21,12 @@ function _wd() {
   do
     arr=(${(s,:,)line})
     name=${arr[1]}
-    path=${arr[2]}
+    target_path=${arr[2]}
 
     # replace ~ from path to fix completion (#17)
-    path=${path/#\~/$HOME}
+    target_path=${path/#\~/$HOME}
 
-    points[$name]=$path
+    points[$name]=$target_path
   done < $CONFIG
 
   commands=(
diff --git a/plugins/wd/wd.sh b/plugins/wd/wd.sh
index c330dd358..3d68583f1 100755
--- a/plugins/wd/wd.sh
+++ b/plugins/wd/wd.sh
@@ -8,7 +8,7 @@
 # @github.com/mfaerevaag/wd
 
 # version
-readonly WD_VERSION=0.4.4
+readonly WD_VERSION=0.4.6
 
 # colors
 readonly WD_BLUE="\033[96m"
-- 
cgit v1.2.3-70-g09d2


From d12c2ea4e83779250fda8096571682d9d340ee09 Mon Sep 17 00:00:00 2001
From: Maciej Lasyk <maciek@lasyk.info>
Date: Tue, 7 Nov 2017 16:45:25 +0100
Subject: Plugins: Terraform (#6373)

Expanded Terraform plugin with function that can be used to show workspace name in the zsh prompt
---
 plugins/terraform/README.md            | 10 ++++++++++
 plugins/terraform/terraform.plugin.zsh |  7 +++++++
 2 files changed, 17 insertions(+)
 create mode 100644 plugins/terraform/terraform.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/terraform/README.md b/plugins/terraform/README.md
index 44e38a1c0..b39f9916b 100644
--- a/plugins/terraform/README.md
+++ b/plugins/terraform/README.md
@@ -9,3 +9,13 @@ Plugin for Terraform, a tool from Hashicorp for managing infrastructure safely a
 ### Usage
 
  * Type `terraform` into your prompt and hit `TAB` to see available completion options
+
+### Expanding ZSH prompt with current Terraform workspace name
+
+If you want to get current Terraform workspace name in your ZSH prompt open 
+your .zsh-theme file and in a choosen place insert:
+
+```
+$FG[045]\
+$(terraform_prompt_info)\
+```
diff --git a/plugins/terraform/terraform.plugin.zsh b/plugins/terraform/terraform.plugin.zsh
new file mode 100644
index 000000000..84eec5cc1
--- /dev/null
+++ b/plugins/terraform/terraform.plugin.zsh
@@ -0,0 +1,7 @@
+function terraform_prompt_info() {
+    # check if in terraform dir
+    if [ -d .terraform ]; then
+      workspace=$(terraform workspace show 2> /dev/null) || return
+      echo "[${workspace}]"
+    fi
+}
-- 
cgit v1.2.3-70-g09d2


From 1fca822ab229ed2bd0dbc8c7b2ea9fbcd7e1d2fc Mon Sep 17 00:00:00 2001
From: jrisebor <jrisebor@users.noreply.github.com>
Date: Tue, 7 Nov 2017 10:50:08 -0500
Subject: Fix Standard Error Redirection for composer plugin (#5935)

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

(limited to 'plugins')

diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh
index 8cf50d502..d00813e39 100644
--- a/plugins/composer/composer.plugin.zsh
+++ b/plugins/composer/composer.plugin.zsh
@@ -52,4 +52,4 @@ alias cgrm='composer global remove'
 alias cget='curl -s https://getcomposer.org/installer | php'
 
 # Add Composer's global binaries to PATH
-export PATH=$PATH:$(composer global config bin-dir --absolute) 2>/dev/null
+export PATH=$PATH:$(composer global config bin-dir --absolute 2>/dev/null)
-- 
cgit v1.2.3-70-g09d2


From 63cfade9a4328b1b8d0be9036529fae76bf34325 Mon Sep 17 00:00:00 2001
From: Marcel Siegert <siegert.marcel95@gmail.com>
Date: Tue, 7 Nov 2017 16:51:38 +0100
Subject: Prepend function keyword in colored-man-pages plugin (#6238)

Resolves: #6237
---
 plugins/colored-man-pages/colored-man-pages.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/colored-man-pages/colored-man-pages.plugin.zsh b/plugins/colored-man-pages/colored-man-pages.plugin.zsh
index 54f0bdda9..1bea536e0 100644
--- a/plugins/colored-man-pages/colored-man-pages.plugin.zsh
+++ b/plugins/colored-man-pages/colored-man-pages.plugin.zsh
@@ -16,7 +16,7 @@ EOF
 	fi
 fi
 
-man() {
+function man() {
 	env \
 		LESS_TERMCAP_mb=$(printf "\e[1;31m") \
 		LESS_TERMCAP_md=$(printf "\e[1;31m") \
-- 
cgit v1.2.3-70-g09d2


From 9edde0950ef783fc55e69ca1f9ec971819758cd4 Mon Sep 17 00:00:00 2001
From: Kevin Kirkup <kevin.s.kirkup@me.com>
Date: Tue, 7 Nov 2017 10:55:24 -0500
Subject: Add OpenShift autocompletion (#6049)

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

(limited to 'plugins')

diff --git a/plugins/oc/oc.plugin.zsh b/plugins/oc/oc.plugin.zsh
new file mode 100644
index 000000000..b968c4bd4
--- /dev/null
+++ b/plugins/oc/oc.plugin.zsh
@@ -0,0 +1,7 @@
+# Autocompletion for oc, the command line interface for OpenShift
+#
+# Author: https://github.com/kevinkirkup
+
+if [ $commands[oc] ]; then
+  source <(oc completion zsh)
+fi
-- 
cgit v1.2.3-70-g09d2


From dfc03c7bb664229e9b014728f8ee4bc2220ad9d2 Mon Sep 17 00:00:00 2001
From: Luke Lazurite <LukeXuan@users.noreply.github.com>
Date: Tue, 7 Nov 2017 10:57:07 -0500
Subject: optimize load of pyenv with homebrew (#6142)

---
 plugins/pyenv/pyenv.plugin.zsh | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

(limited to 'plugins')

diff --git a/plugins/pyenv/pyenv.plugin.zsh b/plugins/pyenv/pyenv.plugin.zsh
index aa1f9488a..ec3ae9f5b 100644
--- a/plugins/pyenv/pyenv.plugin.zsh
+++ b/plugins/pyenv/pyenv.plugin.zsh
@@ -8,9 +8,6 @@ _pyenv-from-homebrew-installed() {
 
 FOUND_PYENV=0
 pyenvdirs=("$HOME/.pyenv" "/usr/local/pyenv" "/opt/pyenv")
-if _homebrew-installed && _pyenv-from-homebrew-installed ; then
-    pyenvdirs=($(brew --prefix pyenv) "${pyenvdirs[@]}")
-fi
 
 for pyenvdir in "${pyenvdirs[@]}" ; do
     if [ -d $pyenvdir/bin -a $FOUND_PYENV -eq 0 ] ; then
@@ -30,6 +27,24 @@ for pyenvdir in "${pyenvdirs[@]}" ; do
 done
 unset pyenvdir
 
+if [ $FOUND_PYENV -eq 0 ] ; then
+    pyenvdir=$(brew --prefix pyenv 2> /dev/null)
+    if [ $? -eq 0 -a -d $pyenvdir/bin ] ; then
+        FOUND_PYENV=1
+        export PYENV_ROOT=$pyenvdir
+        export PATH=${pyenvdir}/bin:$PATH
+        eval "$(pyenv init - zsh)"
+
+        if pyenv commands | command grep -q virtualenv-init; then
+            eval "$(pyenv virtualenv-init - zsh)"
+        fi
+
+        function pyenv_prompt_info() {
+            echo "$(pyenv version-name)"
+        }
+    fi
+fi
+
 if [ $FOUND_PYENV -eq 0 ] ; then
     function pyenv_prompt_info() { echo "system: $(python -V 2>&1 | cut -f 2 -d ' ')" }
 fi
-- 
cgit v1.2.3-70-g09d2


From 790712f6f2cae48e8e57239b9ca9e7ab01254253 Mon Sep 17 00:00:00 2001
From: Michael Favia <michael@favias.org>
Date: Tue, 7 Nov 2017 08:00:14 -0800
Subject: Add aliases for kubectl to speed up repetitive commands. (#5856)

---
 plugins/kubectl/kubectl.plugin.zsh | 43 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

(limited to 'plugins')

diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index 51ae142a2..88177b5a0 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -5,3 +5,46 @@
 if [ $commands[kubectl] ]; then
   source <(kubectl completion zsh)
 fi
+
+# This command is used ALOT both below and in daily life
+alias k=kubectl
+
+# Drop into an interactive terminal on a container
+alias keti='k exec -ti'
+
+# Manage configuration quickly to switch contexts between local, dev ad staging.
+alias kcuc='k config use-context'
+alias kcsc='k config set-context'
+alias kcdc='k config delete-context'
+alias kccc='k config current-context'
+
+# Pod management.
+alias kgp='k get pods'
+alias klp='k logs pods'
+alias kep='k edit pods'
+alias kdp='k describe pods'
+alias kdelp='k delete pods'
+
+# Service management.
+alias kgs='k get svc'
+alias kes='k edit svc'
+alias kds='k describe svc'
+alias kdels='k delete svc'
+
+# Secret management
+alias kgsec='k get secret'
+alias kdsec='k describe secret'
+alias kdelsec='k delete secret'
+
+# Deployment management.
+alias kgd='k get deployment'
+alias ked='k edit deployment'
+alias kdd='k describe deployment'
+alias kdeld='k delete deployment'
+alias ksd='k scale deployment'
+alias krsd='k rollout status deployment'
+
+# Rollout management.
+alias kgrs='k get rs'
+alias krh='k rollout history'
+alias kru='k rollout undo'
-- 
cgit v1.2.3-70-g09d2


From 47039f645ffa5e59d1d32aeee8e2cb432035f78a Mon Sep 17 00:00:00 2001
From: Nur Rony <nmrony@users.noreply.github.com>
Date: Tue, 7 Nov 2017 22:03:14 +0600
Subject: feature(plugins): adds kops (kubernetes operations) plugin (#6107)

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

(limited to 'plugins')

diff --git a/plugins/kops/kops.plugin.zsh b/plugins/kops/kops.plugin.zsh
new file mode 100644
index 000000000..f707f3aff
--- /dev/null
+++ b/plugins/kops/kops.plugin.zsh
@@ -0,0 +1,9 @@
+# Autocompletion for kops (Kubernetes Operations),
+# the command line interface to get a production grade
+# Kubernetes cluster up and running
+
+# Author: https://github.com/nmrony
+
+if [ $commands[kops] ]; then
+  source <(kops completion zsh)
+fi
-- 
cgit v1.2.3-70-g09d2


From 9d6b6c5ce161280e52df3a33d584318d6dbc0bd9 Mon Sep 17 00:00:00 2001
From: T0mK0 <T0mK0@users.noreply.github.com>
Date: Tue, 7 Nov 2017 11:03:54 -0500
Subject: speed up chruby plugin by eliminating(as much as possible) calls to
 brew (#6080)

* speed up chruby plugin by eliminating(as much as possible) calls to brew

* speed up aws plugin by eliminating(as much as possible) calls to brew
---
 plugins/aws/aws.plugin.zsh       | 19 +++++++++++++++++--
 plugins/chruby/chruby.plugin.zsh | 22 +++++++++++++++++++---
 2 files changed, 36 insertions(+), 5 deletions(-)

(limited to 'plugins')

diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index d31052f83..6a0e04add 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -1,9 +1,24 @@
 _homebrew-installed() {
   type brew &> /dev/null
+  _xit=$?
+  if [ $_xit -eq 0 ];then
+        # ok , we have brew installed
+        # speculatively we check default brew prefix
+        if [ -h  /usr/local/opt/awscli ];then
+                _brew_prefix="/usr/local/opt/awscli"
+        else
+                # ok , it is not default prefix
+                # this call to brew is expensive ( about 400 ms ), so at least let's make it only once
+                _brew_prefix=$(brew --prefix awscli)
+        fi
+        return 0
+   else
+        return $_xit
+   fi
 }
 
 _awscli-homebrew-installed() {
-  brew list awscli &> /dev/null
+  [ -r $_brew_prefix/libexec/bin/aws_zsh_completer.sh ] &> /dev/null
 }
 
 export AWS_HOME=~/.aws
@@ -28,7 +43,7 @@ function aws_profiles {
 compctl -K aws_profiles asp
 
 if _homebrew-installed && _awscli-homebrew-installed ; then
-  _aws_zsh_completer_path=$(brew --prefix awscli)/libexec/bin/aws_zsh_completer.sh
+  _aws_zsh_completer_path=$_brew_prefix/libexec/bin/aws_zsh_completer.sh
 else
   _aws_zsh_completer_path=$(which aws_zsh_completer.sh)
 fi
diff --git a/plugins/chruby/chruby.plugin.zsh b/plugins/chruby/chruby.plugin.zsh
index 758b4a56c..998d92098 100644
--- a/plugins/chruby/chruby.plugin.zsh
+++ b/plugins/chruby/chruby.plugin.zsh
@@ -16,12 +16,28 @@
 # rvm and rbenv plugins also provide this alias
 alias rubies='chruby'
 
+
 _homebrew-installed() {
     whence brew &> /dev/null
+    _xit=$?
+    if [ $_xit -eq 0 ];then
+    	# ok , we have brew installed
+	# speculatively we check default brew prefix
+        if [ -h  /usr/local/opt/chruby ];then
+		_brew_prefix="/usr/local/opt/chruby"
+	else
+		# ok , it is not default prefix 
+		# this call to brew is expensive ( about 400 ms ), so at least let's make it only once
+		_brew_prefix=$(brew --prefix chruby)
+	fi
+	return 0
+   else
+        return $_xit
+   fi
 }
 
 _chruby-from-homebrew-installed() {
-  [ -r $(brew --prefix chruby) ] &> /dev/null
+  [ -r _brew_prefix ] &> /dev/null
 }
 
 _ruby-build_installed() {
@@ -64,8 +80,8 @@ _chruby_dirs() {
 }
 
 if _homebrew-installed && _chruby-from-homebrew-installed ; then
-    source $(brew --prefix chruby)/share/chruby/chruby.sh
-    source $(brew --prefix chruby)/share/chruby/auto.sh
+    source $_brew_prefix/share/chruby/chruby.sh
+    source $_brew_prefix/share/chruby/auto.sh
     _chruby_dirs
 elif [[ -r "/usr/local/share/chruby/chruby.sh" ]] ; then
     source /usr/local/share/chruby/chruby.sh
-- 
cgit v1.2.3-70-g09d2


From c2fb24a7922077a364c853df923403c372ef5916 Mon Sep 17 00:00:00 2001
From: Paweł Czochański <czochanski@gmail.com>
Date: Tue, 7 Nov 2017 17:04:38 +0100
Subject: Fixed the gpg-agent plugin for new gpg versions (#6140)

The gpg-agent plugin did not work for gpg versions above or equal to
2.1 because of the `--write-env-file` option deprecation. This new version
works fine and also enables the ssh-agent support only if it is enabled in the
gpg-agent config file.
---
 plugins/gpg-agent/gpg-agent.plugin.zsh | 49 ++++++++--------------------------
 1 file changed, 11 insertions(+), 38 deletions(-)

(limited to 'plugins')

diff --git a/plugins/gpg-agent/gpg-agent.plugin.zsh b/plugins/gpg-agent/gpg-agent.plugin.zsh
index 3e6a34f42..0bf65d58f 100644
--- a/plugins/gpg-agent/gpg-agent.plugin.zsh
+++ b/plugins/gpg-agent/gpg-agent.plugin.zsh
@@ -1,41 +1,14 @@
-local GPG_ENV=$HOME/.gnupg/gpg-agent.env
-
-function start_agent_nossh {
-    eval $(/usr/bin/env gpg-agent --quiet --daemon --write-env-file ${GPG_ENV} 2> /dev/null)
-    chmod 600 ${GPG_ENV}
-    export GPG_AGENT_INFO
-}
-
-function start_agent_withssh {
-    eval $(/usr/bin/env gpg-agent --quiet --daemon --enable-ssh-support --write-env-file ${GPG_ENV} 2> /dev/null)
-    chmod 600 ${GPG_ENV}
-    export GPG_AGENT_INFO
-    export SSH_AUTH_SOCK
-    export SSH_AGENT_PID
-}
-
-# check if another agent is running
-if ! gpg-connect-agent --quiet /bye > /dev/null 2> /dev/null; then
-    # source settings of old agent, if applicable
-    if [ -f "${GPG_ENV}" ]; then
-        . ${GPG_ENV} > /dev/null
-        export GPG_AGENT_INFO
-        export SSH_AUTH_SOCK
-        export SSH_AGENT_PID
-    fi
+# Enable gpg-agent if it is not running
+GPG_AGENT_SOCKET="${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh"
+if [ ! -S $GPG_AGENT_SOCKET ]; then
+  gpg-agent --daemon >/dev/null 2>&1
+  export GPG_TTY=$(tty)
+fi
 
-    # check again if another agent is running using the newly sourced settings
-    if ! gpg-connect-agent --quiet /bye > /dev/null 2> /dev/null; then
-        # check for existing ssh-agent
-        if ssh-add -l > /dev/null 2> /dev/null; then
-            # ssh-agent running, start gpg-agent without ssh support
-            start_agent_nossh;
-        else
-            # otherwise start gpg-agent with ssh support
-            start_agent_withssh;
-        fi
-    fi
+# Set SSH to use gpg-agent if it is configured to do so
+GNUPGCONFIG=${GNUPGHOME:-"$HOME/.gnupg/gpg-agent.conf"}
+if [ -r "$GNUPGCONFIG" ] && grep -q enable-ssh-support "$GNUPGCONFIG"; then
+  unset SSH_AGENT_PID
+  export SSH_AUTH_SOCK=$GPG_AGENT_SOCKET
 fi
 
-GPG_TTY=$(tty)
-export GPG_TTY
-- 
cgit v1.2.3-70-g09d2


From 766b47d8b85dea53ae6afb64031f6ed9dc271663 Mon Sep 17 00:00:00 2001
From: Jakub Sacha <jakubsacha@gmail.com>
Date: Tue, 7 Nov 2017 17:05:19 +0100
Subject: Add docker-machine plugin (#4782)

---
 plugins/docker-machine/README.md                 | 19 ++++++++++++++
 plugins/docker-machine/docker-machine.plugin.zsh | 33 ++++++++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 plugins/docker-machine/README.md
 create mode 100644 plugins/docker-machine/docker-machine.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/docker-machine/README.md b/plugins/docker-machine/README.md
new file mode 100644
index 000000000..308a6cfdb
--- /dev/null
+++ b/plugins/docker-machine/README.md
@@ -0,0 +1,19 @@
+# docker-machine plugin for oh my zsh
+
+### Usage
+
+#### docker-vm
+Will create a docker-machine with the name "dev" (required only once)
+To create a second machine call "docker-vm foobar" or pass any other name
+
+#### docker-up
+This will start your "dev" docker-machine (if necessary) and set it as the active one
+To start a named machine use "docker-up foobar"
+
+#### docker-switch dev
+Use this to activate a running docker-machine (or to switch between multiple machines)
+You need to call either this or docker-up when opening a new terminal
+
+#### docker-stop
+This will stop your "dev" docker-machine
+To stop a named machine use "docker-stop foobar"
\ No newline at end of file
diff --git a/plugins/docker-machine/docker-machine.plugin.zsh b/plugins/docker-machine/docker-machine.plugin.zsh
new file mode 100644
index 000000000..235d90ee8
--- /dev/null
+++ b/plugins/docker-machine/docker-machine.plugin.zsh
@@ -0,0 +1,33 @@
+DEFAULT_MACHINE="default"
+
+docker-up() {
+    if [ -z "$1" ]
+    then
+        docker-machine start "${DEFAULT_MACHINE}"
+        eval $(docker-machine env "${DEFAULT_MACHINE}")
+    else
+        docker-machine start $1
+        eval $(docker-machine env $1)
+    fi
+    echo $DOCKER_HOST
+}
+docker-stop() {
+    if [ -z "$1" ]
+    then
+        docker-machine stop "${DEFAULT_MACHINE}"
+    else
+        docker-machine stop $1
+    fi
+}
+docker-switch() {
+    eval $(docker-machine env $1)
+    echo $DOCKER_HOST
+}
+docker-vm() {
+    if [ -z "$1" ]
+    then
+        docker-machine create -d virtualbox --virtualbox-disk-size 20000 --virtualbox-memory 4096 --virtualbox-cpu-count 2 "${DEFAULT_MACHINE}"
+    else
+        docker-machine create -d virtualbox --virtualbox-disk-size 20000 --virtualbox-memory 4096 --virtualbox-cpu-count 2 $1
+    fi
+}
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From 5486aa21eb3e3a6068a814531799063280800c19 Mon Sep 17 00:00:00 2001
From: Jonathan Channon <jonathan.channon@gmail.com>
Date: Tue, 7 Nov 2017 16:06:19 +0000
Subject: Added --force-with-lease method (#5025)

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

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 52dcea7dd..4536e191a 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -107,6 +107,10 @@ ggf() {
   [[ "$#" != 1 ]] && local b="$(git_current_branch)"
   git push --force origin "${b:=$1}"
 }
+ggfl() {
+[[ "$#" != 1 ]] && local b="$(git_current_branch)"
+git push --force-with-lease origin "${b:=$1}"
+}
 compdef _git ggf=git-checkout
 
 ggl() {
-- 
cgit v1.2.3-70-g09d2


From ed85147e6e6cee9d030fd32f7643e5323a707cfc Mon Sep 17 00:00:00 2001
From: Mahmoud Hossam <mahmoudhossam@users.noreply.github.com>
Date: Tue, 7 Nov 2017 18:06:42 +0200
Subject: Rename clashing ag alias (#5849)

* Fix ubuntu ag alias clashing with the silver searcher

* Add aliases for git apply and git merge --abort
---
 plugins/git/git.plugin.zsh       | 2 ++
 plugins/ubuntu/ubuntu.plugin.zsh | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 4536e191a..fa0c06500 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -44,6 +44,7 @@ alias ga='git add'
 alias gaa='git add --all'
 alias gapa='git add --patch'
 alias gau='git add --update'
+alias gap='git apply'
 
 alias gb='git branch'
 alias gba='git branch -a'
@@ -191,6 +192,7 @@ alias gmom='git merge origin/master'
 alias gmt='git mergetool --no-prompt'
 alias gmtvim='git mergetool --no-prompt --tool=vimdiff'
 alias gmum='git merge upstream/master'
+alias gma='git merge --abort'
 
 alias gp='git push'
 alias gpd='git push --dry-run'
diff --git a/plugins/ubuntu/ubuntu.plugin.zsh b/plugins/ubuntu/ubuntu.plugin.zsh
index eab2da409..ba7143687 100644
--- a/plugins/ubuntu/ubuntu.plugin.zsh
+++ b/plugins/ubuntu/ubuntu.plugin.zsh
@@ -28,7 +28,7 @@ compdef _afu afu='sudo apt-file update'
 alias ppap='sudo ppa-purge'
 compdef _ppap ppap='sudo ppa-purge'
 
-alias ag='sudo apt-get'            # age - but without sudo
+alias apg='sudo apt-get'            # age - but without sudo
 alias aga='sudo apt-get autoclean' # aac
 alias agb='sudo apt-get build-dep' # abd
 alias agc='sudo apt-get clean'     # adc
@@ -42,7 +42,7 @@ alias agug='sudo apt-get upgrade' # ag
 alias aguu='sudo apt-get update && sudo apt-get upgrade'      #adg
 alias agar='sudo apt-get autoremove'
 
-compdef _ag ag='sudo apt-get'
+compdef _ag apg='sudo apt-get'
 compdef _aga aga='sudo apt-get autoclean'
 compdef _agb agb='sudo apt-get build-dep'
 compdef _agc agc='sudo apt-get clean'
-- 
cgit v1.2.3-70-g09d2


From 85401d481106e4d47709dea0270d5160004d9b30 Mon Sep 17 00:00:00 2001
From: "Aviv A. Rosenberg" <aviv.rosenberg@gmail.com>
Date: Tue, 7 Nov 2017 18:11:21 +0200
Subject: Plugin for iTerm2 (#3790)

* Plugin for iTerm2 on OSX

iTerm2 is a popular terminal emulator for OSX (https://www.iterm2.com).

The plugin currently implements one function, iterm2_profile, which
allows easily changing the currently selected user settings profile,
without creating a new tab or window, just by calling the function.

For example, this is handy for switching from a dark to a light colored
profile without having to re-open anything.

In addition, it also works within tmux running inside iTerm2.

* iTerm2 Plugin: Run any iTerm2 command

Refactored the plugin so that it can run arbitrary iTerm2 commands.
Should work with any of the supported commands, see
https://iterm2.com/documentation-escape-codes.html

* iTerm2 Plugin: Add functions to change tab color
---
 plugins/iterm2/iterm2.plugin.zsh | 68 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 plugins/iterm2/iterm2.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/iterm2/iterm2.plugin.zsh b/plugins/iterm2/iterm2.plugin.zsh
new file mode 100644
index 000000000..e4ac72ee3
--- /dev/null
+++ b/plugins/iterm2/iterm2.plugin.zsh
@@ -0,0 +1,68 @@
+#####################################################
+# iTerm2 plugin for oh-my-zsh                       #
+# Author: Aviv Rosenberg (github.com/avivrosenberg) #
+#####################################################
+
+###
+# This plugin is only relevant if the terminal is iTerm2 on OSX.
+if [[ "$OSTYPE" == darwin* ]] && [[ -n "$ITERM_SESSION_ID" ]] ; then
+
+  ###
+  # Executes an arbitrary iTerm2 command via an escape code sequce.
+  # See https://iterm2.com/documentation-escape-codes.html for all supported commands.
+  # Example: $ _iterm2_command "1337;StealFocus"
+  function _iterm2_command() {
+    local cmd="$1"
+
+    # Escape codes for wrapping commands for iTerm2.
+    local iterm2_prefix="\x1B]"
+    local iterm2_suffix="\x07"
+
+    # If we're in tmux, a special escape code must be prepended/appended so that
+    # the iTerm2 escape code is passed on into iTerm2.
+    if [[ -n $TMUX ]]; then
+      local tmux_prefix="\x1BPtmux;\x1B"
+      local tmux_suffix="\x1B\\"
+    fi
+
+    echo -n "${tmux_prefix}${iterm2_prefix}${cmd}${iterm2_suffix}${tmux_suffix}"
+  }
+
+  ###
+  # iterm2_profile(): Function for changing the current terminal window's
+  # profile (colors, fonts, settings, etc).
+  # To change the current iTerm2 profile, call this function and pass in a name
+  # of another existing iTerm2 profile (name can contain spaces).
+  function iterm2_profile() {
+    # Desired name of profile
+    local profile="$1"
+
+    # iTerm2 command for changing profile
+    local cmd="1337;SetProfile=$profile"
+
+    # send the sequence
+    _iterm2_command "${cmd}"
+
+    # update shell variable
+    ITERM_PROFILE="$profile"
+  }
+
+  ###
+  # iterm2_tab_color(): Changes the color of iTerm2's currently active tab.
+  # Usage: iterm2_tab_color <red> <green> <blue>
+  #        where red/green/blue are on the range 0-255.
+  function iterm2_tab_color() {
+    _iterm2_command "6;1;bg;red;brightness;$1"
+    _iterm2_command "6;1;bg;green;brightness;$2"
+    _iterm2_command "6;1;bg;blue;brightness;$3"
+  }
+
+
+  ###
+  # iterm2_tab_color_reset(): Resets the color of iTerm2's current tab back to
+  # default.
+  function iterm2_tab_color_reset() {
+    _iterm2_command "6;1;bg;*;default"
+  }
+
+fi
-- 
cgit v1.2.3-70-g09d2


From 2c87f85ad56663c322f6a72f4ef6ad70b74c8aad Mon Sep 17 00:00:00 2001
From: Paweł Czochański <czochanski@gmail.com>
Date: Wed, 8 Nov 2017 23:02:38 +0100
Subject: Fix wrong $GNUPGHOME usage in gpg-agent plugin (#6403)

$GNUPGHOME variable was used incorrectly and caused a grep error when
set.
---
 plugins/gpg-agent/gpg-agent.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/gpg-agent/gpg-agent.plugin.zsh b/plugins/gpg-agent/gpg-agent.plugin.zsh
index 0bf65d58f..69e239ccf 100644
--- a/plugins/gpg-agent/gpg-agent.plugin.zsh
+++ b/plugins/gpg-agent/gpg-agent.plugin.zsh
@@ -6,7 +6,7 @@ if [ ! -S $GPG_AGENT_SOCKET ]; then
 fi
 
 # Set SSH to use gpg-agent if it is configured to do so
-GNUPGCONFIG=${GNUPGHOME:-"$HOME/.gnupg/gpg-agent.conf"}
+GNUPGCONFIG="${GNUPGHOME:-"$HOME/.gnupg"}/gpg-agent.conf"
 if [ -r "$GNUPGCONFIG" ] && grep -q enable-ssh-support "$GNUPGCONFIG"; then
   unset SSH_AGENT_PID
   export SSH_AUTH_SOCK=$GPG_AGENT_SOCKET
-- 
cgit v1.2.3-70-g09d2


From 7cea8475fbf8e1ba9e665e7740e35182c57bfb6f Mon Sep 17 00:00:00 2001
From: Juanra Núñez <juanra@gmail.com>
Date: Wed, 8 Nov 2017 17:03:11 -0500
Subject: Added aliases for listing packages (#6374)

Added 'agli' to list all installed packages.
Added 'aglu' to list available updates only.
---
 plugins/ubuntu/ubuntu.plugin.zsh | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'plugins')

diff --git a/plugins/ubuntu/ubuntu.plugin.zsh b/plugins/ubuntu/ubuntu.plugin.zsh
index ba7143687..082481466 100644
--- a/plugins/ubuntu/ubuntu.plugin.zsh
+++ b/plugins/ubuntu/ubuntu.plugin.zsh
@@ -21,7 +21,16 @@ compdef _ags ags='apt-get source'
 alias acp='apt-cache policy' # app
 compdef _acp acp='apt-cache policy'
 
+#List all installed packages
+alias agli='apt list --installed'
+compdef _agli agli='apt list --installed'
+
 # superuser operations ######################################################
+
+# List available updates only
+alias aglu='sudo apt-get -u upgrade --assume-no'
+compdef _aglu aglu='sudo apt-get -u upgrade --assume-no'
+
 alias afu='sudo apt-file update'
 compdef _afu afu='sudo apt-file update'
 
-- 
cgit v1.2.3-70-g09d2


From dcb8101fdeded9aa4310d867f9c809c976a0f1cb Mon Sep 17 00:00:00 2001
From: Markus Færevaag <m@frv.ag>
Date: Fri, 10 Nov 2017 08:10:33 +0900
Subject: [wd] Fix update of wd plugin to v0.4.6 (#6407)

---
 plugins/wd/_wd.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/wd/_wd.sh b/plugins/wd/_wd.sh
index d5419d629..4354a71f4 100644
--- a/plugins/wd/_wd.sh
+++ b/plugins/wd/_wd.sh
@@ -24,7 +24,7 @@ function _wd() {
     target_path=${arr[2]}
 
     # replace ~ from path to fix completion (#17)
-    target_path=${path/#\~/$HOME}
+    target_path=${target_path/#\~/$HOME}
 
     points[$name]=$target_path
   done < $CONFIG
-- 
cgit v1.2.3-70-g09d2


From 41eedd37005f6b3668fcebe2a5f5a26324753519 Mon Sep 17 00:00:00 2001
From: Antonis Kalipetis <akalipetis@gmail.com>
Date: Sat, 11 Nov 2017 19:40:03 +0200
Subject: Update Docker completion plugin (#6410)

---
 plugins/docker/README.md |   2 +-
 plugins/docker/_docker   | 474 +++++++++++++++++++++++++++++++++++++----------
 2 files changed, 374 insertions(+), 102 deletions(-)

(limited to 'plugins')

diff --git a/plugins/docker/README.md b/plugins/docker/README.md
index 1615f75f5..e91798485 100644
--- a/plugins/docker/README.md
+++ b/plugins/docker/README.md
@@ -1,5 +1,5 @@
 ## Docker autocomplete plugin
 
 A copy of the completion script from the
-[docker](https://github.com/docker/docker/tree/master/contrib/completion/zsh)
+[docker/cli](https://github.com/docker/cli/blob/master/contrib/completion/zsh/_docker)
 git repo.
diff --git a/plugins/docker/_docker b/plugins/docker/_docker
index 1aec353c5..5d6edd880 100644
--- a/plugins/docker/_docker
+++ b/plugins/docker/_docker
@@ -78,7 +78,7 @@ __docker_get_containers() {
             s="${${line[${begin[CONTAINER ID]},${end[CONTAINER ID]}]%% ##}[0,12]}"
             s="$s:${(l:15:: :::)${${line[${begin[CREATED]},${end[CREATED]}]/ ago/}%% ##}}"
             s="$s, ${${${line[${begin[IMAGE]},${end[IMAGE]}]}/:/\\:}%% ##}"
-            if [[ ${line[${begin[STATUS]},${end[STATUS]}]} = Exit* ]]; then
+            if [[ ${line[${begin[STATUS]},${end[STATUS]}]} = (Exit*|Created*) ]]; then
                 stopped=($stopped $s)
             else
                 running=($running $s)
@@ -100,7 +100,7 @@ __docker_get_containers() {
             (( $#s != 0 )) || continue
             s="$s:${(l:15:: :::)${${line[${begin[CREATED]},${end[CREATED]}]/ ago/}%% ##}}"
             s="$s, ${${${line[${begin[IMAGE]},${end[IMAGE]}]}/:/\\:}%% ##}"
-            if [[ ${line[${begin[STATUS]},${end[STATUS]}]} = Exit* ]]; then
+            if [[ ${line[${begin[STATUS]},${end[STATUS]}]} = (Exit*|Created*) ]]; then
                 stopped=($stopped $s)
             else
                 running=($running $s)
@@ -221,17 +221,19 @@ __docker_get_log_options() {
 
     integer ret=1
     local log_driver=${opt_args[--log-driver]:-"all"}
-    local -a awslogs_options fluentd_options gelf_options journald_options json_file_options logentries_options syslog_options splunk_options
-
-    awslogs_options=("awslogs-region" "awslogs-group" "awslogs-stream")
-    fluentd_options=("env" "fluentd-address" "fluentd-async-connect" "fluentd-buffer-limit" "fluentd-retry-wait" "fluentd-max-retries" "labels" "tag")
-    gcplogs_options=("env" "gcp-log-cmd" "gcp-project" "labels")
-    gelf_options=("env" "gelf-address" "gelf-compression-level" "gelf-compression-type" "labels" "tag")
-    journald_options=("env" "labels" "tag")
-    json_file_options=("env" "labels" "max-file" "max-size")
-    logentries_options=("logentries-token")
-    syslog_options=("env" "labels" "syslog-address" "syslog-facility" "syslog-format" "syslog-tls-ca-cert" "syslog-tls-cert" "syslog-tls-key" "syslog-tls-skip-verify" "tag")
-    splunk_options=("env" "labels" "splunk-caname" "splunk-capath" "splunk-format" "splunk-gzip" "splunk-gzip-level" "splunk-index" "splunk-insecureskipverify" "splunk-source" "splunk-sourcetype" "splunk-token" "splunk-url" "splunk-verify-connection" "tag")
+    local -a common_options common_options2 awslogs_options fluentd_options gelf_options journald_options json_file_options logentries_options syslog_options splunk_options
+
+    common_options=("max-buffer-size" "mode")
+    common_options2=("env" "env-regex" "labels")
+    awslogs_options=($common_options "awslogs-create-group" "awslogs-datetime-format" "awslogs-group" "awslogs-multiline-pattern" "awslogs-region" "awslogs-stream" "tag")
+    fluentd_options=($common_options $common_options2 "fluentd-address" "fluentd-async-connect" "fluentd-buffer-limit" "fluentd-retry-wait" "fluentd-max-retries" "tag")
+    gcplogs_options=($common_options $common_options2 "gcp-log-cmd" "gcp-meta-id" "gcp-meta-name" "gcp-meta-zone" "gcp-project")
+    gelf_options=($common_options $common_options2 "gelf-address" "gelf-compression-level" "gelf-compression-type" "tag")
+    journald_options=($common_options $common_options2 "tag")
+    json_file_options=($common_options $common_options2 "max-file" "max-size")
+    logentries_options=($common_options $common_options2 "logentries-token" "tag")
+    syslog_options=($common_options $common_options2 "syslog-address" "syslog-facility" "syslog-format" "syslog-tls-ca-cert" "syslog-tls-cert" "syslog-tls-key" "syslog-tls-skip-verify" "tag")
+    splunk_options=($common_options $common_options2 "splunk-caname" "splunk-capath" "splunk-format" "splunk-gzip" "splunk-gzip-level" "splunk-index" "splunk-insecureskipverify" "splunk-source" "splunk-sourcetype" "splunk-token" "splunk-url" "splunk-verify-connection" "tag")
 
     [[ $log_driver = (awslogs|all) ]] && _describe -t awslogs-options "awslogs options" awslogs_options "$@" && ret=0
     [[ $log_driver = (fluentd|all) ]] && _describe -t fluentd-options "fluentd options" fluentd_options "$@" && ret=0
@@ -261,8 +263,12 @@ __docker_complete_log_options() {
     if compset -P '*='; then
         case "${${words[-1]%=*}#*=}" in
             (syslog-format)
-                syslog_format_opts=('rfc3164' 'rfc5424' 'rfc5424micro')
-                _describe -t syslog-format-opts "Syslog format Options" syslog_format_opts && ret=0
+                local opts=('rfc3164' 'rfc5424' 'rfc5424micro')
+                _describe -t syslog-format-opts "syslog format options" opts && ret=0
+                ;;
+            (mode)
+                local opts=('blocking' 'non-blocking')
+                _describe -t mode-opts "mode options" opts && ret=0
                 ;;
             *)
                 _message 'value' && ret=0
@@ -362,7 +368,7 @@ __docker_complete_ps_filters() {
                 ;;
         esac
     else
-        opts=('ancestor' 'before' 'exited' 'health' 'id' 'label' 'name' 'network' 'since' 'status' 'volume')
+        opts=('ancestor' 'before' 'exited' 'expose' 'health' 'id' 'label' 'name' 'network' 'publish' 'since' 'status' 'volume')
         _describe -t filter-opts "Filter Options" opts -qS "=" && ret=0
     fi
 
@@ -474,6 +480,77 @@ __docker_complete_events_filter() {
     return ret
 }
 
+__docker_complete_prune_filters() {
+    [[ $PREFIX = -* ]] && return 1
+    integer ret=1
+    declare -a opts
+
+    opts=('until')
+
+    if compset -P '*='; then
+        case "${${words[-1]%=*}#*=}" in
+            *)
+                _message 'value' && ret=0
+                ;;
+        esac
+    else
+        _describe -t filter-opts "filter options" opts -qS "=" && ret=0
+    fi
+
+    return ret
+}
+
+# BO checkpoint
+
+__docker_checkpoint_commands() {
+    local -a _docker_checkpoint_subcommands
+    _docker_checkpoint_subcommands=(
+        "create:Create a checkpoint from a running container"
+        "ls:List checkpoints for a container"
+        "rm:Remove a checkpoint"
+    )
+    _describe -t docker-checkpoint-commands "docker checkpoint command" _docker_checkpoint_subcommands
+}
+
+__docker_checkpoint_subcommand() {
+    local -a _command_args opts_help
+    local expl help="--help"
+    integer ret=1
+
+    opts_help=("(: -)--help[Print usage]")
+
+    case "$words[1]" in
+        (create)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help)--checkpoint-dir=[Use a custom checkpoint storage directory]:dir:_directories" \
+                "($help)--leave-running[Leave the container running after checkpoint]" \
+                "($help -)1:container:__docker_complete_running_containers" \
+                "($help -)2:checkpoint: " && ret=0
+            ;;
+        (ls|list)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help)--checkpoint-dir=[Use a custom checkpoint storage directory]:dir:_directories" \
+                "($help -)1:container:__docker_complete_containers" && ret=0
+            ;;
+        (rm|remove)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help)--checkpoint-dir=[Use a custom checkpoint storage directory]:dir:_directories" \
+                "($help -)1:container:__docker_complete_containers" \
+                "($help -)2:checkpoint: " && ret=0
+            ;;
+        (help)
+            _arguments $(__docker_arguments) ":subcommand:__docker_checkpoint_commands" && ret=0
+            ;;
+    esac
+
+    return ret
+}
+
+# EO checkpoint
+
 # BO container
 
 __docker_container_commands() {
@@ -526,6 +603,7 @@ __docker_container_subcommand() {
         "($help)--cidfile=[Write the container ID to the file]:CID file:_files"
         "($help)--cpus=[Number of CPUs (default 0.000)]:cpus: "
         "($help)*--device=[Add a host device to the container]:device:_files"
+        "($help)*--device-cgroup-rule=[Add a rule to the cgroup allowed devices list]:device:cgroup: "
         "($help)*--device-read-bps=[Limit the read rate (bytes per second) from a device]:device:IO rate: "
         "($help)*--device-read-iops=[Limit the read rate (IO per second) from a device]:device:IO rate: "
         "($help)*--device-write-bps=[Limit the write rate (bytes per second) to a device]:device:IO rate: "
@@ -541,16 +619,18 @@ __docker_container_subcommand() {
         "($help)*--group=[Set one or more supplementary user groups for the container]:group:_groups"
         "($help -h --hostname)"{-h=,--hostname=}"[Container host name]:hostname:_hosts"
         "($help -i --interactive)"{-i,--interactive}"[Keep stdin open even if not attached]"
-        "($help)--ip=[Container IPv4 address]:IPv4: "
-        "($help)--ip6=[Container IPv6 address]:IPv6: "
+        "($help)--init[Run an init inside the container that forwards signals and reaps processes]"
+        "($help)--ip=[IPv4 address]:IPv4: "
+        "($help)--ip6=[IPv6 address]:IPv6: "
         "($help)--ipc=[IPC namespace to use]:IPC namespace: "
         "($help)--isolation=[Container isolation technology]:isolation:(default hyperv process)"
         "($help)*--link=[Add link to another container]:link:->link"
-        "($help)*--link-local-ip=[Add a link-local address for the container]:IPv4/IPv6: "
+        "($help)*--link-local-ip=[Container IPv4/IPv6 link-local addresses]:IPv4/IPv6: "
         "($help)*"{-l=,--label=}"[Container metadata]:label: "
         "($help)--log-driver=[Default driver for container logs]:logging driver:__docker_complete_log_drivers"
         "($help)*--log-opt=[Log driver specific options]:log driver options:__docker_complete_log_options"
         "($help)--mac-address=[Container MAC address]:MAC address: "
+        "($help)*--mount=[Attach a filesystem mount to the container]:mount: "
         "($help)--name=[Container name]:name: "
         "($help)--network=[Connect a container to a network]:network mode:(bridge none container host)"
         "($help)*--network-alias=[Add network-scoped alias for the container]:alias: "
@@ -564,6 +644,7 @@ __docker_container_subcommand() {
         "($help)--read-only[Mount the container's root filesystem as read only]"
         "($help)*--security-opt=[Security options]:security option: "
         "($help)*--shm-size=[Size of '/dev/shm' (format is '<number><unit>')]:shm size: "
+        "($help)--stop-signal=[Signal to kill a container]:signal:_signals"
         "($help)--stop-timeout=[Timeout (in seconds) to stop a container]:time: "
         "($help)*--sysctl=-[sysctl options]:sysctl: "
         "($help -t --tty)"{-t,--tty}"[Allocate a pseudo-tty]"
@@ -731,6 +812,7 @@ __docker_container_subcommand() {
         (prune)
             _arguments $(__docker_arguments) \
                 $opts_help \
+                "($help)*--filter=[Filter values]:filter:__docker_complete_prune_filters" \
                 "($help -f --force)"{-f,--force}"[Do not prompt for confirmation]" && ret=0
             ;;
         (rename)
@@ -779,7 +861,6 @@ __docker_container_subcommand() {
                 "($help)--rm[Remove intermediate containers when it exits]" \
                 "($help)--runtime=[Name of the runtime to be used for that container]:runtime:__docker_complete_runtimes" \
                 "($help)--sig-proxy[Proxy all received signals to the process (non-TTY mode only)]" \
-                "($help)--stop-signal=[Signal to kill a container]:signal:_signals" \
                 "($help)--storage-opt=[Storage driver options for the container]:storage options:->storage-opt" \
                 "($help -): :__docker_complete_images" \
                 "($help -):command: _command_names -e" \
@@ -816,6 +897,7 @@ __docker_container_subcommand() {
                 "($help -a --all)"{-a,--all}"[Show all containers (default shows just running)]" \
                 "($help)--format=[Pretty-print images using a Go template]:template: " \
                 "($help)--no-stream[Disable streaming stats and only pull the first result]" \
+                "($help)--no-trunc[Do not truncate output]" \
                 "($help -)*:containers:__docker_complete_running_containers" && ret=0
             ;;
         (stop)
@@ -899,6 +981,7 @@ __docker_image_subcommand() {
         (build)
             _arguments $(__docker_arguments) \
                 $opts_help \
+                "($help)*--add-host=[Add a custom host-to-IP mapping]:host\:ip mapping: " \
                 "($help)*--build-arg=[Build-time variables]:<varname>=<value>: " \
                 "($help)*--cache-from=[Images to consider as cache sources]: :__docker_complete_repositories_with_tags" \
                 "($help -c --cpu-shares)"{-c=,--cpu-shares=}"[CPU shares (relative weight)]:CPU shares:(0 10 100 200 500 800 1000)" \
@@ -923,6 +1006,7 @@ __docker_image_subcommand() {
                 "($help -q --quiet)"{-q,--quiet}"[Suppress verbose build output]" \
                 "($help)--rm[Remove intermediate containers after a successful build]" \
                 "($help)*--shm-size=[Size of '/dev/shm' (format is '<number><unit>')]:shm size: " \
+                "($help)--squash[Squash newly built layers into a single new layer]" \
                 "($help -t --tag)*"{-t=,--tag=}"[Repository, name and tag for the image]: :__docker_complete_repositories_with_tags" \
                 "($help)*--ulimit=[ulimit options]:ulimit: " \
                 "($help)--userns=[Container user namespace]:user namespace:(host)" \
@@ -962,21 +1046,17 @@ __docker_image_subcommand() {
                 $opts_help \
                 "($help -a --all)"{-a,--all}"[Show all images]" \
                 "($help)--digests[Show digests]" \
-                "($help)*"{-f=,--filter=}"[Filter values]:filter:->filter-options" \
+                "($help)*"{-f=,--filter=}"[Filter values]:filter:__docker_complete_images_filters" \
                 "($help)--format=[Pretty-print images using a Go template]:template: " \
                 "($help)--no-trunc[Do not truncate output]" \
                 "($help -q --quiet)"{-q,--quiet}"[Only show numeric IDs]" \
                 "($help -): :__docker_complete_repositories" && ret=0
-            case $state in
-                (filter-options)
-                    __docker_complete_images_filters && ret=0
-                    ;;
-            esac
             ;;
         (prune)
             _arguments $(__docker_arguments) \
                 $opts_help \
                 "($help -a --all)"{-a,--all}"[Remove all unused images, not just dangling ones]" \
+                "($help)*--filter=[Filter values]:filter:__docker_complete_prune_filters" \
                 "($help -f --force)"{-f,--force}"[Do not prompt for confirmation]" && ret=0
             ;;
         (pull)
@@ -1038,16 +1118,20 @@ __docker_network_complete_ls_filters() {
             (name)
                 __docker_complete_networks_names && ret=0
                 ;;
+            (scope)
+                opts=('global' 'local' 'swarm')
+                _describe -t scope-filter-opts "Scope filter options" opts && ret=0
+                ;;
             (type)
-                type_opts=('builtin' 'custom')
-                _describe -t type-filter-opts "Type Filter Options" type_opts && ret=0
+                opts=('builtin' 'custom')
+                _describe -t type-filter-opts "Type filter options" opts && ret=0
                 ;;
             *)
                 _message 'value' && ret=0
                 ;;
         esac
     else
-        opts=('driver' 'id' 'label' 'name' 'type')
+        opts=('driver' 'id' 'label' 'name' 'scope' 'type')
         _describe -t filter-opts "Filter Options" opts -qS "=" && ret=0
     fi
 
@@ -1142,8 +1226,8 @@ __docker_network_subcommand() {
             _arguments $(__docker_arguments) \
                 $opts_help \
                 "($help)*--alias=[Add network-scoped alias for the container]:alias: " \
-                "($help)--ip=[Container IPv4 address]:IPv4: " \
-                "($help)--ip6=[Container IPv6 address]:IPv6: " \
+                "($help)--ip=[IPv4 address]:IPv4: " \
+                "($help)--ip6=[IPv6 address]:IPv6: " \
                 "($help)*--link=[Add a link to another container]:link:->link" \
                 "($help)*--link-local-ip=[Add a link-local address for the container]:IPv4/IPv6: " \
                 "($help -)1:network:__docker_complete_networks" \
@@ -1186,24 +1270,21 @@ __docker_network_subcommand() {
             _arguments $(__docker_arguments) \
                 $opts_help \
                 "($help -f --format)"{-f=,--format=}"[Format the output using the given go template]:template: " \
+                "($help)--verbose[Show detailed information]" \
                 "($help -)*:network:__docker_complete_networks" && ret=0
             ;;
         (ls)
             _arguments $(__docker_arguments) \
                 $opts_help \
                 "($help)--no-trunc[Do not truncate the output]" \
-                "($help)*"{-f=,--filter=}"[Provide filter values]:filter:->filter-options" \
+                "($help)*"{-f=,--filter=}"[Provide filter values]:filter:__docker_network_complete_ls_filters" \
                 "($help)--format=[Pretty-print networks using a Go template]:template: " \
                 "($help -q --quiet)"{-q,--quiet}"[Only display numeric IDs]" && ret=0
-            case $state in
-                (filter-options)
-                    __docker_network_complete_ls_filters && ret=0
-                    ;;
-            esac
             ;;
         (prune)
             _arguments $(__docker_arguments) \
                 $opts_help \
+                "($help)*--filter=[Filter values]:filter:__docker_complete_prune_filters" \
                 "($help -f --force)"{-f,--force}"[Do not prompt for confirmation]" && ret=0
             ;;
         (rm)
@@ -1262,7 +1343,7 @@ __docker_node_complete_ps_filters() {
     if compset -P '*='; then
         case "${${words[-1]%=*}#*=}" in
             (desired-state)
-                state_opts=('accepted' 'running')
+                state_opts=('accepted' 'running' 'shutdown')
                 _describe -t state-opts "desired state options" state_opts && ret=0
                 ;;
             *)
@@ -1394,13 +1475,8 @@ __docker_node_subcommand() {
         (ls|list)
             _arguments $(__docker_arguments) \
                 $opts_help \
-                "($help)*"{-f=,--filter=}"[Provide filter values]:filter:->filter-options" \
+                "($help)*"{-f=,--filter=}"[Provide filter values]:filter:__docker_node_complete_ls_filters" \
                 "($help -q --quiet)"{-q,--quiet}"[Only display IDs]" && ret=0
-            case $state in
-                (filter-options)
-                    __docker_node_complete_ls_filters && ret=0
-                    ;;
-            esac
             ;;
         (promote)
              _arguments $(__docker_arguments) \
@@ -1411,15 +1487,12 @@ __docker_node_subcommand() {
             _arguments $(__docker_arguments) \
                 $opts_help \
                 "($help -a --all)"{-a,--all}"[Display all instances]" \
-                "($help)*"{-f=,--filter=}"[Provide filter values]:filter:->filter-options" \
+                "($help)*"{-f=,--filter=}"[Provide filter values]:filter:__docker_node_complete_ps_filters" \
+                "($help)--format=[Format the output using the given go template]:template: " \
                 "($help)--no-resolve[Do not map IDs to Names]" \
                 "($help)--no-trunc[Do not truncate output]" \
+                "($help -q --quiet)"{-q,--quiet}"[Only display IDs]" \
                 "($help -)*:node:__docker_complete_nodes" && ret=0
-            case $state in
-                (filter-options)
-                    __docker_node_complete_ps_filters && ret=0
-                    ;;
-            esac
             ;;
         (update)
             _arguments $(__docker_arguments) \
@@ -1442,13 +1515,42 @@ __docker_node_subcommand() {
 
 # BO plugin
 
-__docker_complete_plugins() {
+__docker_plugin_complete_ls_filters() {
+    [[ $PREFIX = -* ]] && return 1
+    integer ret=1
+
+    if compset -P '*='; then
+        case "${${words[-1]%=*}#*=}" in
+            (capability)
+                opts=('authz' 'ipamdriver' 'logdriver' 'metricscollector' 'networkdriver' 'volumedriver')
+                _describe -t capability-opts "capability options" opts && ret=0
+                ;;
+            (enabled)
+                opts=('false' 'true')
+                _describe -t enabled-opts "enabled options" opts && ret=0
+                ;;
+            *)
+                _message 'value' && ret=0
+                ;;
+        esac
+    else
+        opts=('capability' 'enabled')
+        _describe -t filter-opts "filter options" opts -qS "=" && ret=0
+    fi
+
+    return ret
+}
+
+__docker_plugins() {
     [[ $PREFIX = -* ]] && return 1
     integer ret=1
     local line s
-    declare -a lines plugins
+    declare -a lines plugins args
 
-    lines=(${(f)${:-"$(_call_program commands docker $docker_options plugin ls)"$'\n'}})
+    filter=$1; shift
+    [[ $filter != "none" ]] && args=("-f $filter")
+
+    lines=(${(f)${:-"$(_call_program commands docker $docker_options plugin ls $args)"$'\n'}})
 
     # Parse header line to find columns
     local i=1 j=1 k header=${lines[1]}
@@ -1474,6 +1576,21 @@ __docker_complete_plugins() {
     return ret
 }
 
+__docker_complete_plugins() {
+    [[ $PREFIX = -* ]] && return 1
+    __docker_plugins none "$@"
+}
+
+__docker_complete_enabled_plugins() {
+    [[ $PREFIX = -* ]] && return 1
+    __docker_plugins enabled=true "$@"
+}
+
+__docker_complete_disabled_plugins() {
+    [[ $PREFIX = -* ]] && return 1
+    __docker_plugins enabled=false "$@"
+}
+
 __docker_plugin_commands() {
     local -a _docker_plugin_subcommands
     _docker_plugin_subcommands=(
@@ -1485,6 +1602,7 @@ __docker_plugin_commands() {
         "push:Push a plugin"
         "rm:Remove a plugin"
         "set:Change settings for a plugin"
+        "upgrade:Upgrade an existing plugin"
     )
     _describe -t docker-plugin-commands "docker plugin command" _docker_plugin_subcommands
 }
@@ -1497,16 +1615,68 @@ __docker_plugin_subcommand() {
     opts_help=("(: -)--help[Print usage]")
 
     case "$words[1]" in
-        (disable|enable|inspect|install|ls|push|rm)
+        (disable)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -f --force)"{-f,--force}"[Force the disable of an active plugin]" \
+                "($help -)1:plugin:__docker_complete_enabled_plugins" && ret=0
+            ;;
+        (enable)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help)--timeout=[HTTP client timeout (in seconds)]:timeout: " \
+                "($help -)1:plugin:__docker_complete_disabled_plugins" && ret=0
+            ;;
+        (inspect)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -f --format)"{-f=,--format=}"[Format the output using the given Go template]:template: " \
+                "($help -)*:plugin:__docker_complete_plugins" && ret=0
+            ;;
+        (install)
             _arguments $(__docker_arguments) \
                 $opts_help \
+                "($help)--alias=[Local name for plugin]:alias: " \
+                "($help)--disable[Do not enable the plugin on install]" \
+                "($help)--disable-content-trust[Skip image verification (default true)]" \
+                "($help)--grant-all-permissions[Grant all permissions necessary to run the plugin]" \
+                "($help -)1:plugin:__docker_complete_plugins" \
+                "($help -)*:key=value: " && ret=0
+            ;;
+        (ls|list)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help)*"{-f=,--filter=}"[Filter output based on conditions provided]:filter:__docker_plugin_complete_ls_filters" \
+                "($help --format)--format=[Format the output using the given Go template]:template: " \
+                "($help)--no-trunc[Don't truncate output]" \
+                "($help -q --quiet)"{-q,--quiet}"[Only display IDs]" && ret=0
+            ;;
+        (push)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help)--disable-content-trust[Skip image verification (default true)]" \
                 "($help -)1:plugin:__docker_complete_plugins" && ret=0
             ;;
+        (rm|remove)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -f --force)"{-f,--force}"[Force the removal of an active plugin]" \
+                "($help -)*:plugin:__docker_complete_plugins" && ret=0
+            ;;
         (set)
             _arguments $(__docker_arguments) \
                 $opts_help \
                 "($help -)1:plugin:__docker_complete_plugins" \
-                "($help-)*:key=value: " && ret=0
+                "($help -)*:key=value: " && ret=0
+            ;;
+        (upgrade)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help)--disable-content-trust[Skip image verification (default true)]" \
+                "($help)--grant-all-permissions[Grant all permissions necessary to run the plugin]" \
+                "($help)--skip-remote-check[Do not check if specified remote plugin matches existing plugin image]" \
+                "($help -)1:plugin:__docker_complete_plugins" \
+                "($help -):remote: " && ret=0
             ;;
         (help)
             _arguments $(__docker_arguments) ":subcommand:__docker_plugin_commands" && ret=0
@@ -1588,7 +1758,7 @@ __docker_secret_subcommand() {
 
     case "$words[1]" in
         (create)
-            _arguments $(__docker_arguments) \
+            _arguments $(__docker_arguments) -A '-*' \
                 $opts_help \
                 "($help)*"{-l=,--label=}"[Secret labels]:label: " \
                 "($help -):secret: " && ret=0
@@ -1602,6 +1772,7 @@ __docker_secret_subcommand() {
         (ls|list)
             _arguments $(__docker_arguments) \
                 $opts_help \
+                "($help)--format=[Format the output using the given go template]:template: " \
                 "($help -q --quiet)"{-q,--quiet}"[Only display IDs]" && ret=0
             ;;
         (rm|remove)
@@ -1630,6 +1801,10 @@ __docker_service_complete_ls_filters() {
             (id)
                 __docker_complete_services_ids && ret=0
                 ;;
+            (mode)
+                opts=('global' 'replicated')
+                _describe -t mode-opts "mode options" opts && ret=0
+                ;;
             (name)
                 __docker_complete_services_names && ret=0
                 ;;
@@ -1638,7 +1813,7 @@ __docker_service_complete_ls_filters() {
                 ;;
         esac
     else
-        opts=('id' 'label' 'name')
+        opts=('id' 'label' 'mode' 'name')
         _describe -t filter-opts "filter options" opts -qS "=" && ret=0
     fi
 
@@ -1652,7 +1827,7 @@ __docker_service_complete_ps_filters() {
     if compset -P '*='; then
         case "${${words[-1]%=*}#*=}" in
             (desired-state)
-                state_opts=('accepted' 'running')
+                state_opts=('accepted' 'running' 'shutdown')
                 _describe -t state-opts "desired state options" state_opts && ret=0
                 ;;
             *)
@@ -1667,6 +1842,28 @@ __docker_service_complete_ps_filters() {
     return ret
 }
 
+__docker_service_complete_placement_pref() {
+    [[ $PREFIX = -* ]] && return 1
+    integer ret=1
+
+    if compset -P '*='; then
+        case "${${words[-1]%=*}#*=}" in
+            (spread)
+                opts=('engine.labels' 'node.labels')
+                _describe -t spread-opts "spread options" opts -qS "." && ret=0
+                ;;
+            *)
+                _message 'value' && ret=0
+                ;;
+        esac
+    else
+        opts=('spread')
+        _describe -t pref-opts "placement pref options" opts -qS "=" && ret=0
+    fi
+
+    return ret
+}
+
 __docker_services() {
     [[ $PREFIX = -* ]] && return 1
     integer ret=1
@@ -1732,8 +1929,10 @@ __docker_service_commands() {
     _docker_service_subcommands=(
         "create:Create a new service"
         "inspect:Display detailed information on one or more services"
+        "logs:Fetch the logs of a service or task"
         "ls:List services"
         "rm:Remove one or more services"
+        "rollback:Revert changes to a service's configuration"
         "scale:Scale one or multiple replicated services"
         "ps:List the tasks of a service"
         "update:Update a service"
@@ -1764,19 +1963,25 @@ __docker_service_subcommand() {
         "($help)*--mount=[Attach a filesystem mount to the service]:mount: "
         "($help)*--network=[Network attachments]:network: "
         "($help)--no-healthcheck[Disable any container-specified HEALTHCHECK]"
-        "($help)*"{-p=,--publish=}"[Publish a port as a node port]:port: "
+        "($help)--read-only[Mount the container's root filesystem as read only]"
         "($help)--replicas=[Number of tasks]:replicas: "
         "($help)--reserve-cpu=[Reserve CPUs]:value: "
         "($help)--reserve-memory=[Reserve Memory]:value: "
         "($help)--restart-condition=[Restart when condition is met]:mode:(any none on-failure)"
         "($help)--restart-delay=[Delay between restart attempts]:delay: "
         "($help)--restart-max-attempts=[Maximum number of restarts before giving up]:max-attempts: "
-        "($help)--restart-window=[Window used to evaluate the restart policy]:window: "
+        "($help)--restart-window=[Window used to evaluate the restart policy]:duration: "
+        "($help)--rollback-delay=[Delay between task rollbacks]:duration: "
+        "($help)--rollback-failure-action=[Action on rollback failure]:action:(continue pause)"
+        "($help)--rollback-max-failure-ratio=[Failure rate to tolerate during a rollback]:failure rate: "
+        "($help)--rollback-monitor=[Duration after each task rollback to monitor for failure]:duration: "
+        "($help)--rollback-parallelism=[Maximum number of tasks rolled back simultaneously]:number: "
         "($help)*--secret=[Specify secrets to expose to the service]:secret:__docker_complete_secrets"
         "($help)--stop-grace-period=[Time to wait before force killing a container]:grace period: "
+        "($help)--stop-signal=[Signal to stop the container]:signal:_signals"
         "($help -t --tty)"{-t,--tty}"[Allocate a pseudo-TTY]"
         "($help)--update-delay=[Delay between updates]:delay: "
-        "($help)--update-failure-action=[Action on update failure]:mode:(pause continue)"
+        "($help)--update-failure-action=[Action on update failure]:mode:(continue pause rollback)"
         "($help)--update-max-failure-ratio=[Failure rate to tolerate during an update]:fraction: "
         "($help)--update-monitor=[Duration after each task update to monitor for failure]:window: "
         "($help)--update-parallelism=[Maximum number of tasks updated simultaneously]:number: "
@@ -1797,7 +2002,8 @@ __docker_service_subcommand() {
                 "($help)*--env-file=[Read environment variables from a file]:environment file:_files" \
                 "($help)--mode=[Service Mode]:mode:(global replicated)" \
                 "($help)--name=[Service name]:name: " \
-                "($help)*--publish=[Publish a port]:port: " \
+                "($help)*--placement-pref=[Add a placement preference]:pref:__docker_service_complete_placement_pref" \
+                "($help)*"{-p=,--publish=}"[Publish a port as a node port]:port: " \
                 "($help -): :__docker_complete_images" \
                 "($help -):command: _command_names -e" \
                 "($help -)*::arguments: _normal" && ret=0
@@ -1809,25 +2015,41 @@ __docker_service_subcommand() {
                 "($help)--pretty[Print the information in a human friendly format]" \
                 "($help -)*:service:__docker_complete_services" && ret=0
             ;;
+        (logs)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -f --follow)"{-f,--follow}"[Follow log output]" \
+                "($help)--no-resolve[Do not map IDs to Names]" \
+                "($help)--no-task-ids[Do not include task IDs]" \
+                "($help)--no-trunc[Do not truncate output]" \
+                "($help)--since=[Show logs since timestamp]:timestamp: " \
+                "($help)--tail=[Number of lines to show from the end of the logs]:lines:(1 10 20 50 all)" \
+                "($help -t --timestamps)"{-t,--timestamps}"[Show timestamps]" \
+                "($help -)1:service:__docker_complete_services" && ret=0
+            ;;
         (ls|list)
             _arguments $(__docker_arguments) \
                 $opts_help \
-                "($help)*"{-f=,--filter=}"[Filter output based on conditions provided]:filter:->filter-options" \
+                "($help)*"{-f=,--filter=}"[Filter output based on conditions provided]:filter:__docker_service_complete_ls_filters" \
+                "($help)--format=[Pretty-print services using a Go template]:template: " \
                 "($help -q --quiet)"{-q,--quiet}"[Only display IDs]" && ret=0
-            case $state in
-                (filter-options)
-                    __docker_service_complete_ls_filters && ret=0
-                    ;;
-            esac
             ;;
         (rm|remove)
             _arguments $(__docker_arguments) \
                 $opts_help \
                 "($help -)*:service:__docker_complete_services" && ret=0
             ;;
+        (rollback)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -d --detach)"{-d=false,--detach=false}"[Disable detached mode]" \
+                "($help -q --quiet)"{-q,--quiet}"[Suppress progress output]" \
+                "($help -)*:service:__docker_complete_services" && ret=0
+            ;;
         (scale)
             _arguments $(__docker_arguments) \
                 $opts_help \
+                "($help -d --detach)"{-d=false,--detach=false}"[Disable detached mode]" \
                 "($help -)*:service:->values" && ret=0
             case $state in
                 (values)
@@ -1842,16 +2064,12 @@ __docker_service_subcommand() {
         (ps)
             _arguments $(__docker_arguments) \
                 $opts_help \
-                "($help)*"{-f=,--filter=}"[Provide filter values]:filter:->filter-options" \
+                "($help)*"{-f=,--filter=}"[Provide filter values]:filter:__docker_service_complete_ps_filters" \
+                "($help)--format=[Format the output using the given go template]:template: " \
                 "($help)--no-resolve[Do not map IDs to Names]" \
                 "($help)--no-trunc[Do not truncate output]" \
                 "($help -q --quiet)"{-q,--quiet}"[Only display task IDs]" \
-                "($help -)1:service:__docker_complete_services" && ret=0
-            case $state in
-                (filter-options)
-                    __docker_service_complete_ps_filters && ret=0
-                    ;;
-            esac
+                "($help -)*:service:__docker_complete_services" && ret=0
             ;;
         (update)
             _arguments $(__docker_arguments) \
@@ -1870,6 +2088,8 @@ __docker_service_subcommand() {
                 "($help)*--group-add=[Add additional supplementary user groups to the container]:group:_groups" \
                 "($help)*--group-rm=[Remove previously added supplementary user groups from the container]:group:_groups" \
                 "($help)--image=[Service image tag]:image:__docker_complete_repositories" \
+                "($help)*--placement-pref-add=[Add a placement preference]:pref:__docker_service_complete_placement_pref" \
+                "($help)*--placement-pref-rm=[Remove a placement preference]:pref:__docker_service_complete_placement_pref" \
                 "($help)*--publish-add=[Add or update a port]:port: " \
                 "($help)*--publish-rm=[Remove a port(target-port mandatory)]:port: " \
                 "($help)--rollback[Rollback to previous specification]" \
@@ -1894,7 +2114,7 @@ __docker_stack_complete_ps_filters() {
     if compset -P '*='; then
         case "${${words[-1]%=*}#*=}" in
             (desired-state)
-                state_opts=('accepted' 'running')
+                state_opts=('accepted' 'running' 'shutdown')
                 _describe -t state-opts "desired state options" state_opts && ret=0
                 ;;
             *)
@@ -2000,8 +2220,10 @@ __docker_stack_subcommand() {
                 $opts_help \
                 "($help -a --all)"{-a,--all}"[Display all tasks]" \
                 "($help)*"{-f=,--filter=}"[Filter output based on conditions provided]:filter:__docker_stack_complete_ps_filters" \
+                "($help)--format=[Format the output using the given go template]:template: " \
                 "($help)--no-resolve[Do not map IDs to Names]" \
                 "($help)--no-trunc[Do not truncate output]" \
+                "($help -q --quiet)"{-q,--quiet}"[Only display task IDs]" \
                 "($help -):stack:__docker_complete_stacks" && ret=0
             ;;
         (rm|remove|down)
@@ -2013,6 +2235,7 @@ __docker_stack_subcommand() {
             _arguments $(__docker_arguments) \
                 $opts_help \
                 "($help)*"{-f=,--filter=}"[Filter output based on conditions provided]:filter:__docker_stack_complete_services_filters" \
+                "($help)--format=[Pretty-print services using a Go template]:template: " \
                 "($help -q --quiet)"{-q,--quiet}"[Only display IDs]" \
                 "($help -):stack:__docker_complete_stacks" && ret=0
             ;;
@@ -2035,6 +2258,8 @@ __docker_swarm_commands() {
         "join:Join a swarm as a node and/or manager"
         "join-token:Manage join tokens"
         "leave:Leave a swarm"
+        "unlock:Unlock swarm"
+        "unlock-key:Manage the unlock key"
         "update:Update the swarm"
     )
     _describe -t docker-swarm-commands "docker swarm command" _docker_swarm_subcommands
@@ -2051,7 +2276,12 @@ __docker_swarm_subcommand() {
         (init)
             _arguments $(__docker_arguments) \
                 $opts_help \
-                "($help)--advertise-addr[Advertised address]:ip\:port: " \
+                "($help)--advertise-addr=[Advertised address]:ip\:port: " \
+                "($help)--data-path-addr=[Data path IP or interface]:ip " \
+                "($help)--autolock[Enable manager autolocking]" \
+                "($help)--availability=[Availability of the node]:availability:(active drain pause)" \
+                "($help)--cert-expiry=[Validity period for node certificates]:duration: " \
+                "($help)--dispatcher-heartbeat=[Dispatcher heartbeat period]:duration: " \
                 "($help)*--external-ca=[Specifications of one or more certificate signing endpoints]:endpoint: " \
                 "($help)--force-new-cluster[Force create a new cluster from current state]" \
                 "($help)--listen-addr=[Listen address]:ip\:port: " \
@@ -2060,9 +2290,11 @@ __docker_swarm_subcommand() {
                 "($help)--task-history-limit=[Task history retention limit]:limit: " && ret=0
             ;;
         (join)
-            _arguments $(__docker_arguments) \
+            _arguments $(__docker_arguments) -A '-*' \
                 $opts_help \
-                "($help)--advertise-addr[Advertised address]:ip\:port: " \
+                "($help)--advertise-addr=[Advertised address]:ip\:port: " \
+                "($help)--data-path-addr=[Data path IP or interface]:ip " \
+                "($help)--availability=[Availability of the node]:availability:(active drain pause)" \
                 "($help)--listen-addr=[Listen address]:ip\:port: " \
                 "($help)--token=[Token for entry into the swarm]:secret: " \
                 "($help -):host\:port: " && ret=0
@@ -2079,12 +2311,23 @@ __docker_swarm_subcommand() {
                 $opts_help \
                 "($help -f --force)"{-f,--force}"[Force this node to leave the swarm, ignoring warnings]" && ret=0
             ;;
+        (unlock)
+            _arguments $(__docker_arguments) \
+                $opts_help && ret=0
+            ;;
+        (unlock-key)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -q --quiet)"{-q,--quiet}"[Only display token]" \
+                "($help)--rotate[Rotate unlock token]" && ret=0
+            ;;
         (update)
             _arguments $(__docker_arguments) \
                 $opts_help \
+                "($help)--autolock[Enable manager autolocking]" \
                 "($help)--cert-expiry=[Validity period for node certificates]:duration: " \
-                "($help)*--external-ca=[Specifications of one or more certificate signing endpoints]:endpoint: " \
                 "($help)--dispatcher-heartbeat=[Dispatcher heartbeat period]:duration: " \
+                "($help)*--external-ca=[Specifications of one or more certificate signing endpoints]:endpoint: " \
                 "($help)--max-snapshots[Number of additional Raft snapshots to retain]" \
                 "($help)--snapshot-interval[Number of log entries between Raft snapshots]" \
                 "($help)--task-history-limit=[Task history retention limit]:limit: " && ret=0
@@ -2142,7 +2385,9 @@ __docker_system_subcommand() {
             _arguments $(__docker_arguments) \
                 $opts_help \
                 "($help -a --all)"{-a,--all}"[Remove all unused data, not just dangling ones]" \
-                "($help -f --force)"{-f,--force}"[Do not prompt for confirmation]" && ret=0
+                "($help)*--filter=[Filter values]:filter:__docker_complete_prune_filters" \
+                "($help -f --force)"{-f,--force}"[Do not prompt for confirmation]" \
+                "($help)--volumes=[Remove all unused volumes]" && ret=0
             ;;
         (help)
             _arguments $(__docker_arguments) ":subcommand:__docker_volume_commands" && ret=0
@@ -2253,14 +2498,9 @@ __docker_volume_subcommand() {
         (ls)
             _arguments $(__docker_arguments) \
                 $opts_help \
-                "($help)*"{-f=,--filter=}"[Provide filter values]:filter:->filter-options" \
+                "($help)*"{-f=,--filter=}"[Provide filter values]:filter:__docker_volume_complete_ls_filters" \
                 "($help)--format=[Pretty-print volumes using a Go template]:template: " \
                 "($help -q --quiet)"{-q,--quiet}"[Only display volume names]" && ret=0
-            case $state in
-                (filter-options)
-                    __docker_volume_complete_ls_filters && ret=0
-                    ;;
-            esac
             ;;
         (prune)
             _arguments $(__docker_arguments) \
@@ -2290,14 +2530,28 @@ __docker_caching_policy() {
 
 __docker_commands() {
     local cache_policy
+    integer force_invalidation=0
 
     zstyle -s ":completion:${curcontext}:" cache-policy cache_policy
     if [[ -z "$cache_policy" ]]; then
         zstyle ":completion:${curcontext}:" cache-policy __docker_caching_policy
     fi
 
-    if ( [[ ${+_docker_subcommands} -eq 0 ]] || _cache_invalid docker_subcommands) \
-        && ! _retrieve_cache docker_subcommands;
+    if ( (( ! ${+_docker_hide_legacy_commands} )) || _cache_invalid docker_hide_legacy_commands ) \
+       && ! _retrieve_cache docker_hide_legacy_commands;
+    then
+        _docker_hide_legacy_commands="${DOCKER_HIDE_LEGACY_COMMANDS}"
+        _store_cache docker_hide_legacy_commands _docker_hide_legacy_commands
+    fi
+
+    if [[ "${_docker_hide_legacy_commands}" != "${DOCKER_HIDE_LEGACY_COMMANDS}" ]]; then
+        force_invalidation=1
+        _docker_hide_legacy_commands="${DOCKER_HIDE_LEGACY_COMMANDS}"
+        _store_cache docker_hide_legacy_commands _docker_hide_legacy_commands
+    fi
+
+    if ( [[ ${+_docker_subcommands} -eq 0 ]] || _cache_invalid docker_subcommands ) \
+        && ! _retrieve_cache docker_subcommands || [[ ${force_invalidation} -eq 1 ]];
     then
         local -a lines
         lines=(${(f)"$(_call_program commands docker 2>&1)"})
@@ -2322,6 +2576,23 @@ __docker_subcommand() {
         (build|history|import|load|pull|push|save|tag)
             __docker_image_subcommand && ret=0
             ;;
+        (checkpoint)
+            local curcontext="$curcontext" state
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -): :->command" \
+                "($help -)*:: :->option-or-argument" && ret=0
+
+            case $state in
+                (command)
+                    __docker_checkpoint_commands && ret=0
+                    ;;
+                (option-or-argument)
+                    curcontext=${curcontext%:*:*}:docker-${words[-1]}:
+                    __docker_checkpoint_subcommand && ret=0
+                    ;;
+            esac
+            ;;
         (container)
             local curcontext="$curcontext" state
             _arguments $(__docker_arguments) \
@@ -2343,6 +2614,7 @@ __docker_subcommand() {
             _arguments $(__docker_arguments) \
                 $opts_help \
                 "($help)*--add-runtime=[Register an additional OCI compatible runtime]:runtime:__docker_complete_runtimes" \
+                "($help)*--allow-nondistributable-artifacts=[Push nondistributable artifacts to specified registries]:registry: " \
                 "($help)--api-cors-header=[CORS headers in the Engine API]:CORS headers: " \
                 "($help)*--authorization-plugin=[Authorization plugins to load]" \
                 "($help -b --bridge)"{-b=,--bridge=}"[Attach containers to a network bridge]:bridge:_net_interfaces" \
@@ -2353,11 +2625,13 @@ __docker_subcommand() {
                 "($help)*--cluster-store-opt=[Cluster store options]:Cluster options:->cluster-store-options" \
                 "($help)--config-file=[Path to daemon configuration file]:Config File:_files" \
                 "($help)--containerd=[Path to containerd socket]:socket:_files -g \"*.sock\"" \
+                "($help)--data-root=[Root directory of persisted Docker data]:path:_directories" \
                 "($help -D --debug)"{-D,--debug}"[Enable debug mode]" \
                 "($help)--default-gateway[Container default gateway IPv4 address]:IPv4 address: " \
                 "($help)--default-gateway-v6[Container default gateway IPv6 address]:IPv6 address: " \
+                "($help)--default-shm-size=[Default shm size for containers]:size:" \
                 "($help)*--default-ulimit=[Default ulimits for containers]:ulimit: " \
-                "($help)--disable-legacy-registry[Disable contacting legacy registries]" \
+                "($help)--disable-legacy-registry[Disable contacting legacy registries (default true)]" \
                 "($help)*--dns=[DNS server to use]:DNS: " \
                 "($help)*--dns-opt=[DNS options to use]:DNS option: " \
                 "($help)*--dns-search=[DNS search domains to use]:DNS search: " \
@@ -2367,9 +2641,9 @@ __docker_subcommand() {
                 "($help)--fixed-cidr=[IPv4 subnet for fixed IPs]:IPv4 subnet: " \
                 "($help)--fixed-cidr-v6=[IPv6 subnet for fixed IPs]:IPv6 subnet: " \
                 "($help -G --group)"{-G=,--group=}"[Group for the unix socket]:group:_groups" \
-                "($help -g --graph)"{-g=,--graph=}"[Root of the Docker runtime]:path:_directories" \
                 "($help -H --host)"{-H=,--host=}"[tcp://host:port to bind/connect to]:host: " \
                 "($help)--icc[Enable inter-container communication]" \
+                "($help)--init[Run an init inside containers to forward signals and reap processes]" \
                 "($help)--init-path=[Path to the docker-init binary]:docker-init binary:_files" \
                 "($help)*--insecure-registry=[Enable insecure registry communication]:registry: " \
                 "($help)--ip=[Default IP when binding container ports]" \
@@ -2475,6 +2749,8 @@ __docker_subcommand() {
                         __docker_complete_nodes && ret=0
                     elif [[ ${words[(r)--type=plugin]} == --type=plugin ]]; then
                         __docker_complete_plugins && ret=0
+                    elif [[ ${words[(r)--type=service]} == --type=secrets ]]; then
+                        __docker_complete_secrets && ret=0
                     elif [[ ${words[(r)--type=service]} == --type=service ]]; then
                         __docker_complete_services && ret=0
                     elif [[ ${words[(r)--type=volume]} == --type=volume ]]; then
@@ -2485,6 +2761,7 @@ __docker_subcommand() {
                         __docker_complete_networks
                         __docker_complete_nodes
                         __docker_complete_plugins
+                        __docker_complete_secrets
                         __docker_complete_services
                         __docker_complete_volumes && ret=0
                     fi
@@ -2492,14 +2769,15 @@ __docker_subcommand() {
             esac
             ;;
         (login)
-            _arguments $(__docker_arguments) \
+            _arguments $(__docker_arguments) -A '-*' \
                 $opts_help \
                 "($help -p --password)"{-p=,--password=}"[Password]:password: " \
+                "($help)--password-stdin[Read password from stdin]" \
                 "($help -u --user)"{-u=,--user=}"[Username]:username: " \
                 "($help -)1:server: " && ret=0
             ;;
         (logout)
-            _arguments $(__docker_arguments) \
+            _arguments $(__docker_arguments) -A '-*' \
                 $opts_help \
                 "($help -)1:server: " && ret=0
             ;;
@@ -2563,18 +2841,12 @@ __docker_subcommand() {
             __docker_image_subcommand && ret=0
             ;;
         (search)
-            _arguments $(__docker_arguments) \
+            _arguments $(__docker_arguments) -A '-*' \
                 $opts_help \
-                "($help)*"{-f=,--filter=}"[Filter values]:filter:->filter-options" \
+                "($help)*"{-f=,--filter=}"[Filter values]:filter:__docker_complete_search_filters" \
                 "($help)--limit=[Maximum returned search results]:limit:(1 5 10 25 50)" \
                 "($help)--no-trunc[Do not truncate output]" \
                 "($help -):term: " && ret=0
-
-            case $state in
-                (filter-options)
-                    __docker_complete_search_filters && ret=0
-                    ;;
-            esac
             ;;
         (secret)
             local curcontext="$curcontext" state
-- 
cgit v1.2.3-70-g09d2


From 2bd24f7e0de0ab2fa6131f15f49d3d86f4d7f4a8 Mon Sep 17 00:00:00 2001
From: Ning Sun <classicning@gmail.com>
Date: Tue, 14 Nov 2017 08:35:55 -0600
Subject: Fixed Pacaur aliases (#6416)

`pacaur -Syua` only updated AUR pakcages, wihch is incompatible with semantics of `pacupg` and `yaupg`. Removing `-a` here it would work for both main repos and aur.
---
 plugins/archlinux/archlinux.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
index 105bd2d5f..0fab1252b 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -28,8 +28,8 @@ if (( $+commands[yaourt] )); then
 fi
 
 if (( $+commands[pacaur] )); then
-  alias paupg='pacaur -Syua'
-  alias pasu='pacaur -Syua --noconfirm'
+  alias paupg='pacaur -Syu'
+  alias pasu='pacaur -Syu --noconfirm'
   alias pain='pacaur -S'
   alias pains='pacaur -U'
   alias pare='pacaur -R'
-- 
cgit v1.2.3-70-g09d2


From 510d90749f156ef5f10b656630191df13a86e989 Mon Sep 17 00:00:00 2001
From: Michael Nikitochkin <miry.sof@gmail.com>
Date: Tue, 14 Nov 2017 15:36:22 +0100
Subject: Fix the terraform function name (#6418)

* Fix the terraform function name

Current function name do worse. I always use `terr<TAB>` and before those prompt it was add space in the end. Now because we have multiple functions and binaries started with terraform there are no space.

* Updated terraform readme

Updated the name of new function name
---
 plugins/terraform/README.md            | 2 +-
 plugins/terraform/terraform.plugin.zsh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/terraform/README.md b/plugins/terraform/README.md
index b39f9916b..46855e417 100644
--- a/plugins/terraform/README.md
+++ b/plugins/terraform/README.md
@@ -17,5 +17,5 @@ your .zsh-theme file and in a choosen place insert:
 
 ```
 $FG[045]\
-$(terraform_prompt_info)\
+$(tf_prompt_info)\
 ```
diff --git a/plugins/terraform/terraform.plugin.zsh b/plugins/terraform/terraform.plugin.zsh
index 84eec5cc1..b170f73a6 100644
--- a/plugins/terraform/terraform.plugin.zsh
+++ b/plugins/terraform/terraform.plugin.zsh
@@ -1,4 +1,4 @@
-function terraform_prompt_info() {
+function tf_prompt_info() {
     # check if in terraform dir
     if [ -d .terraform ]; then
       workspace=$(terraform workspace show 2> /dev/null) || return
-- 
cgit v1.2.3-70-g09d2


From e273cf004e1ff0510aee61416885f3003bcd15d9 Mon Sep 17 00:00:00 2001
From: Brandon Weaver <baweaver@users.noreply.github.com>
Date: Tue, 14 Nov 2017 06:37:31 -0800
Subject: Update ruby.plugin.zsh (#2117)

Added some Gem command shorthands, and ruby shorthand
---
 plugins/ruby/ruby.plugin.zsh | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'plugins')

diff --git a/plugins/ruby/ruby.plugin.zsh b/plugins/ruby/ruby.plugin.zsh
index 38e4d7cd0..177b35b31 100644
--- a/plugins/ruby/ruby.plugin.zsh
+++ b/plugins/ruby/ruby.plugin.zsh
@@ -4,3 +4,11 @@ alias sgem='sudo gem'
 
 # Find ruby file
 alias rfind='find . -name "*.rb" | xargs grep -n'
+
+# Shorthand Ruby
+alias rb="ruby"
+
+# Gem Command Shorthands
+alias gin="gem install"
+alias gun="gem uninstall"
+alias gli="gem list"
-- 
cgit v1.2.3-70-g09d2


From 2af2d1aa31caa534c419e72d75daa667ff725de2 Mon Sep 17 00:00:00 2001
From: kg <kjxstar@gmail.com>
Date: Tue, 5 Dec 2017 07:08:07 +0800
Subject: add autocomplete for adb -s option (#6121)

---
 plugins/adb/README.md |  2 +-
 plugins/adb/_adb      | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/adb/README.md b/plugins/adb/README.md
index 075beec0e..83dcc7288 100644
--- a/plugins/adb/README.md
+++ b/plugins/adb/README.md
@@ -1,7 +1,7 @@
 # adb autocomplete plugin
 
 * Adds autocomplete options for all adb commands.
-
+* Add autocomplete for `adb -s`
 
 ## Requirements
 
diff --git a/plugins/adb/_adb b/plugins/adb/_adb
index 5f37bedac..2e3c3658e 100644
--- a/plugins/adb/_adb
+++ b/plugins/adb/_adb
@@ -43,11 +43,20 @@ local expl
 local -a pkgs installed_pkgs
 
 _arguments \
+	'-s[devices]:specify device:->specify_device' \
 	'*:: :->subcmds' && return 0
 
+case "$state" in
+	specify_device)
+	_values  'devices' $(adb devices|awk 'NR>1&& $1 ~ /^[a-zA-Z0-9].*$/ \
+		{printf "%s[Device_%d:%s] ",$1,++i,$2 }')
+	return
+	;;
+esac
+
 if (( CURRENT == 1 )); then
 	_describe -t commands "adb subcommand" _1st_arguments
 	return
 fi
 
-_files
+_files
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From e999f104e74039b291070af435a494a88eb7d704 Mon Sep 17 00:00:00 2001
From: kg <kjxstar@gmail.com>
Date: Fri, 8 Dec 2017 07:52:52 +0800
Subject: Update adb (#6472)

---
 plugins/adb/_adb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/adb/_adb b/plugins/adb/_adb
index 2e3c3658e..8cbf6593c 100644
--- a/plugins/adb/_adb
+++ b/plugins/adb/_adb
@@ -48,8 +48,8 @@ _arguments \
 
 case "$state" in
 	specify_device)
-	_values  'devices' $(adb devices|awk 'NR>1&& $1 ~ /^[a-zA-Z0-9].*$/ \
-		{printf "%s[Device_%d:%s] ",$1,++i,$2 }')
+	_values  'devices' $(adb devices -l|awk 'NR>1&& $1 ~ /^[a-zA-Z0-9].*$/ \
+		{printf "%s[%s] ",$1,$6 }')
 	return
 	;;
 esac
-- 
cgit v1.2.3-70-g09d2


From a7fb55cf13bd5956a183e42916cf160a962b6370 Mon Sep 17 00:00:00 2001
From: yongxin SHI <shiyongxin@aliyun.com>
Date: Fri, 8 Dec 2017 07:53:10 +0800
Subject: add pip --user (#6470)

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

(limited to 'plugins')

diff --git a/plugins/pip/_pip b/plugins/pip/_pip
index 732ffabea..607f68e58 100644
--- a/plugins/pip/_pip
+++ b/plugins/pip/_pip
@@ -72,6 +72,7 @@ case "$words[1]" in
   install)
     _arguments \
       '(-U --upgrade)'{-U,--upgrade}'[upgrade all packages to the newest available version]' \
+      '(--user)--user[install packages to user home]' \
       '(-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]' \
-- 
cgit v1.2.3-70-g09d2


From c3b072eace1ce19a48e36c2ead5932ae2d2e06d9 Mon Sep 17 00:00:00 2001
From: Harish Narayanan <hnarayanan@gmail.com>
Date: Thu, 14 Dec 2017 16:01:32 +0000
Subject: Replace spotify command in the osx plugin with a more recent copy of
 the upstream project (#6419)

* Remove older shpotify code from the macOS plugin

* Add Shpotify 2.0.1 from the upstream repository at https://github.com/hnarayanan/shpotify/releases/tag/2.0.1

* Wrap the Shpotify script in a function and import into the macOS plugin

* Fix import path of the shpotify script

* Add shpotify permission notice in the macos plugin rREADME

* Merge with the upstream shpotify project

- Fix playlist playback
- Add a 'stop' command
---
 plugins/osx/README.md      |  27 +++
 plugins/osx/osx.plugin.zsh | 267 +--------------------------
 plugins/osx/spotify        | 438 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 466 insertions(+), 266 deletions(-)
 create mode 100644 plugins/osx/spotify

(limited to 'plugins')

diff --git a/plugins/osx/README.md b/plugins/osx/README.md
index b77daecc5..d3a8f94df 100644
--- a/plugins/osx/README.md
+++ b/plugins/osx/README.md
@@ -12,6 +12,33 @@ plugins=(... osx)
 
 Original author: [Sorin Ionescu](https://github.com/sorin-ionescu)
 
+## Acknowledgements
+
+This application makes use of the following third party scripts:
+
+[shpotify](https://github.com/hnarayanan/shpotify)
+
+Copyright (c) 2012–2017 [Harish Narayanan](https://harishnarayanan.org/).
+
+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.
+
 
 ## Commands
 
diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index e8488ebc9..b7d6aca72 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -277,272 +277,7 @@ EOF
 }
 
 # Spotify control function
-function spotify() {
-
-  showHelp () {
-    echo "Usage:";
-    echo;
-    echo "  $(basename "$0") <command>";
-    echo;
-    echo "Commands:";
-    echo;
-    echo "  play                         # Resumes playback where Spotify last left off.";
-    echo "  play [song name]             # Finds a song by name and plays it.";
-    echo "  play album [album name]      # Finds an album by name and plays it.";
-    echo "  play artist [artist name]    # Finds an artist by name and plays it.";
-    echo "  play list [playlist name]    # Finds a playlist by name and plays it.";
-    echo "  pause                        # Pauses Spotify playback.";
-    echo "  next                         # Skips to the next song in a playlist.";
-    echo "  prev                         # Returns to the previous song in a playlist.";
-    echo "  pos [time]                   # Jumps to a time (in secs) in the current song.";
-    echo "  quit                         # Stops playback and quits Spotify.";
-    echo;
-    echo "  vol up                       # Increases the volume by 10%.";
-    echo "  vol down                     # Decreases the volume by 10%.";
-    echo "  vol [amount]                 # Sets the volume to an amount between 0 and 100.";
-    echo "  vol show                     # Shows the current Spotify volume.";
-    echo;
-    echo "  status                       # Shows the current player status.";
-    echo "  share                        # Copies the current song URL to the clipboard."
-    echo "  info                         # Shows Full Information about song that is playing.";
-    echo;
-    echo "  toggle shuffle               # Toggles shuffle playback mode.";
-    echo "  toggle repeat                # Toggles repeat playback mode.";
-  }
-
-  cecho(){
-    bold=$(tput bold);
-    green=$(tput setaf 2);
-    reset=$(tput sgr0);
-    echo "$bold$green$1$reset";
-  }
-
-  showStatus () {
-      state=$(osascript -e 'tell application "Spotify" to player state as string');
-      cecho "Spotify is currently $state.";
-      if [ "$state" = "playing" ]; then
-        artist=$(osascript -e 'tell application "Spotify" to artist of current track as string');
-        album=$(osascript -e 'tell application "Spotify" to album of current track as string');
-        track=$(osascript -e 'tell application "Spotify" to name of current track as string');
-        duration=$(osascript -e 'tell application "Spotify" to duration of current track as string');
-        duration=$(echo "scale=2; $duration / 60 / 1000" | bc);
-        position=$(osascript -e 'tell application "Spotify" to player position as string' | tr ',' '.');
-        position=$(echo "scale=2; $position / 60" | bc | awk '{printf "%0.2f", $0}');
-
-        printf "$reset""Artist: %s\nAlbum: %s\nTrack: %s \nPosition: %s / %s\n" "$artist" "$album" "$track" "$position" "$duration";
-      fi
-  }
-
-
-
-  if [ $# = 0 ]; then
-    showHelp;
-  else
-    if [ "$1" != "quit" ] && [ "$(osascript -e 'application "Spotify" is running')" = "false" ]; then
-      osascript -e 'tell application "Spotify" to activate'
-      sleep 2
-    fi
-  fi
-
-  while [ $# -gt 0 ]; do
-    arg=$1;
-
-    case $arg in
-      "play"    )
-        if [ $# != 1 ]; then
-          # There are additional arguments, so find out how many
-          array=( $@ );
-          len=${#array[@]};
-          SPOTIFY_SEARCH_API="https://api.spotify.com/v1/search"
-          SPOTIFY_PLAY_URI="";
-
-          searchAndPlay() {
-            type="$1"
-            Q="$2"
-
-            cecho "Searching ${type}s for: $Q";
-
-            SPOTIFY_PLAY_URI=$( \
-              curl -s -G $SPOTIFY_SEARCH_API --data-urlencode "q=$Q" -d "type=$type&limit=1&offset=0" -H "Accept: application/json" \
-              | grep -E -o "spotify:$type:[a-zA-Z0-9]+" -m 1
-              )
-          }
-
-          case $2 in
-            "list"  )
-              _args=${array[*]:2:$len};
-              Q=$_args;
-
-              cecho "Searching playlists for: $Q";
-
-              results=$( \
-                curl -s -G $SPOTIFY_SEARCH_API --data-urlencode "q=$Q" -d "type=playlist&limit=10&offset=0" -H "Accept: application/json" \
-                | grep -E -o "spotify:user:[a-zA-Z0-9_]+:playlist:[a-zA-Z0-9]+" -m 10 \
-                )
-
-              count=$( \
-                echo "$results" | grep -c "spotify:user" \
-                )
-
-              if [ "$count" -gt 0 ]; then
-                random=$(( RANDOM % count));
-
-                SPOTIFY_PLAY_URI=$( \
-                  echo "$results" | awk -v random="$random" '/spotify:user:[a-zA-Z0-9]+:playlist:[a-zA-Z0-9]+/{i++}i==random{print; exit}' \
-                  )
-              fi;;
-
-            "album" | "artist" | "track"    )
-              _args=${array[*]:2:$len};
-              searchAndPlay "$2" "$_args";;
-
-            *   )
-              _args=${array[*]:1:$len};
-              searchAndPlay track "$_args";;
-          esac
-
-          if [ "$SPOTIFY_PLAY_URI" != "" ]; then
-            cecho "Playing ($Q Search) -> Spotify URL: $SPOTIFY_PLAY_URI";
-
-            osascript -e "tell application \"Spotify\" to play track \"$SPOTIFY_PLAY_URI\"";
-
-          else
-            cecho "No results when searching for $Q";
-          fi
-        else
-          # play is the only param
-          cecho "Playing Spotify.";
-          osascript -e 'tell application "Spotify" to play';
-        fi
-        break ;;
-
-      "pause"    )
-        state=$(osascript -e 'tell application "Spotify" to player state as string');
-        if [ "$state" = "playing" ]; then
-          cecho "Pausing Spotify.";
-        else
-          cecho "Playing Spotify.";
-        fi
-
-        osascript -e 'tell application "Spotify" to playpause';
-        break ;;
-
-      "quit"    )
-        if [ "$(osascript -e 'application "Spotify" is running')" = "false" ]; then
-          cecho "Spotify was not running."
-        else
-          cecho "Closing Spotify.";
-          osascript -e 'tell application "Spotify" to quit';
-        fi
-        break ;;
-
-      "next"    )
-        cecho "Going to next track." ;
-        osascript -e 'tell application "Spotify" to next track';
-        break ;;
-
-      "prev"    )
-        cecho "Going to previous track.";
-        osascript -e 'tell application "Spotify" to previous track';
-        break ;;
-
-      "vol"    )
-        vol=$(osascript -e 'tell application "Spotify" to sound volume as integer');
-        if [[ "$2" = "show" || "$2" = "" ]]; then
-          cecho "Current Spotify volume level is $vol.";
-          break ;
-        elif [ "$2" = "up" ]; then
-          if [ "$vol" -le 90 ]; then
-            newvol=$(( vol+10 ));
-            cecho "Increasing Spotify volume to $newvol.";
-          else
-            newvol=100;
-            cecho "Spotify volume level is at max.";
-          fi
-        elif [ "$2" = "down" ]; then
-          if [ "$vol" -ge 10 ]; then
-            newvol=$(( vol-10 ));
-            cecho "Reducing Spotify volume to $newvol.";
-          else
-            newvol=0;
-            cecho "Spotify volume level is at min.";
-          fi
-        elif [ "$2" -ge 0 ]; then
-          newvol=$2;
-        fi
-
-        osascript -e "tell application \"Spotify\" to set sound volume to $newvol";
-        break ;;
-
-      "toggle"  )
-        if [ "$2" = "shuffle" ]; then
-          osascript -e 'tell application "Spotify" to set shuffling to not shuffling';
-          curr=$(osascript -e 'tell application "Spotify" to shuffling');
-          cecho "Spotify shuffling set to $curr";
-        elif [ "$2" = "repeat" ]; then
-          osascript -e 'tell application "Spotify" to set repeating to not repeating';
-          curr=$(osascript -e 'tell application "Spotify" to repeating');
-          cecho "Spotify repeating set to $curr";
-        fi
-        break ;;
-
-      "pos"   )
-        cecho "Adjusting Spotify play position."
-        osascript -e "tell application \"Spotify\" to set player position to $2";
-        break ;;
-
-      "status" )
-        showStatus;
-        break ;;
-
-      "info" )
-        info=$(osascript -e 'tell application "Spotify"
-          set tM to round (duration of current track / 60) rounding down
-          set tS to duration of current track mod 60
-          set pos to player position as text
-          set myTime to tM as text & "min " & tS as text & "s"
-          set nM to round (player position / 60) rounding down
-          set nS to round (player position mod 60) rounding down
-          set nowAt to nM as text & "min " & nS as text & "s"
-          set info to "" & "\nArtist:         " & artist of current track
-          set info to info & "\nTrack:          " & name of current track
-          set info to info & "\nAlbum Artist:   " & album artist of current track
-          set info to info & "\nAlbum:          " & album of current track
-          set info to info & "\nSeconds:        " & duration of current track
-          set info to info & "\nSeconds played: " & pos
-          set info to info & "\nDuration:       " & mytime
-          set info to info & "\nNow at:         " & nowAt
-          set info to info & "\nPlayed Count:   " & played count of current track
-          set info to info & "\nTrack Number:   " & track number of current track
-          set info to info & "\nPopularity:     " & popularity of current track
-          set info to info & "\nId:             " & id of current track
-          set info to info & "\nSpotify URL:    " & spotify url of current track
-          set info to info & "\nArtwork:        " & artwork of current track
-          set info to info & "\nPlayer:         " & player state
-          set info to info & "\nVolume:         " & sound volume
-          set info to info & "\nShuffle:        " & shuffling
-          set info to info & "\nRepeating:      " & repeating
-          end tell
-          return info')
-        echo "$info";
-        break ;;
-
-    "share"     )
-      url=$(osascript -e 'tell application "Spotify" to spotify url of current track');
-      remove='spotify:track:'
-      url=${url#$remove}
-      url="http://open.spotify.com/track/$url"
-      cecho "Share URL: $url";
-      cecho -n "$url" | pbcopy
-      break;;
-
-      -h|--help| *)
-        showHelp;
-        break ;;
-    esac
-  done
-}
-
+source ${ZSH}/plugins/osx/spotify
 
 # Show/hide hidden files in the Finder
 alias showfiles="defaults write com.apple.finder AppleShowAllFiles -bool true && killall Finder"
diff --git a/plugins/osx/spotify b/plugins/osx/spotify
new file mode 100644
index 000000000..69f6c5419
--- /dev/null
+++ b/plugins/osx/spotify
@@ -0,0 +1,438 @@
+#!/usr/bin/env bash
+
+function spotify() {
+# Copyright (c) 2012--2017 Harish Narayanan <mail@harishnarayanan.org>
+#
+# Contains numerous helpful contributions from Jorge Colindres, Thomas
+# Pritchard, iLan Epstein, Gabriele Bonetti, Sean Heller, Eric Martin
+# and Peter Fonseca.
+
+# 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.
+
+USER_CONFIG_DEFAULTS="CLIENT_ID=\"\"\nCLIENT_SECRET=\"\"";
+USER_CONFIG_FILE="${HOME}/.shpotify.cfg";
+if ! [[ -f "${USER_CONFIG_FILE}" ]]; then
+    touch "${USER_CONFIG_FILE}";
+    echo -e "${USER_CONFIG_DEFAULTS}" > "${USER_CONFIG_FILE}";
+fi
+source "${USER_CONFIG_FILE}";
+
+showAPIHelp() {
+    echo;
+    echo "Connecting to Spotify's API:";
+    echo;
+    echo "  This command line application needs to connect to Spotify's API in order to";
+    echo "  find music by name. It is very likely you want this feature!";
+    echo;
+    echo "  To get this to work, you need to sign up (or in) and create an 'Application' at:";
+    echo "  https://developer.spotify.com/my-applications/#!/applications/create";
+    echo;
+    echo "  Once you've created an application, find the 'Client ID' and 'Client Secret'";
+    echo "  values, and enter them into your shpotify config file at '${USER_CONFIG_FILE}'";
+    echo;
+    echo "  Be sure to quote your values and don't add any extra spaces!";
+    echo "  When done, it should look like this (but with your own values):";
+    echo '  CLIENT_ID="abc01de2fghijk345lmnop"';
+    echo '  CLIENT_SECRET="qr6stu789vwxyz"';
+}
+
+showHelp () {
+    echo "Usage:";
+    echo;
+    echo "  `basename $0` <command>";
+    echo;
+    echo "Commands:";
+    echo;
+    echo "  play                         # Resumes playback where Spotify last left off.";
+    echo "  play <song name>             # Finds a song by name and plays it.";
+    echo "  play album <album name>      # Finds an album by name and plays it.";
+    echo "  play artist <artist name>    # Finds an artist by name and plays it.";
+    echo "  play list <playlist name>    # Finds a playlist by name and plays it.";
+    echo "  play uri <uri>               # Play songs from specific uri.";
+    echo;
+    echo "  next                         # Skips to the next song in a playlist.";
+    echo "  prev                         # Returns to the previous song in a playlist.";
+    echo "  replay                       # Replays the current track from the begining.";
+    echo "  pos <time>                   # Jumps to a time (in secs) in the current song.";
+    echo "  pause                        # Pauses (or resumes) Spotify playback.";
+    echo "  stop                         # Stops playback.";
+    echo "  quit                         # Stops playback and quits Spotify.";
+    echo;
+    echo "  vol up                       # Increases the volume by 10%.";
+    echo "  vol down                     # Decreases the volume by 10%.";
+    echo "  vol <amount>                 # Sets the volume to an amount between 0 and 100.";
+    echo "  vol [show]                   # Shows the current Spotify volume.";
+    echo;
+    echo "  status                       # Shows the current player status.";
+    echo;
+    echo "  share                        # Displays the current song's Spotify URL and URI."
+    echo "  share url                    # Displays the current song's Spotify URL and copies it to the clipboard."
+    echo "  share uri                    # Displays the current song's Spotify URI and copies it to the clipboard."
+    echo;
+    echo "  toggle shuffle               # Toggles shuffle playback mode.";
+    echo "  toggle repeat                # Toggles repeat playback mode.";
+    showAPIHelp
+}
+
+cecho(){
+    bold=$(tput bold);
+    green=$(tput setaf 2);
+    reset=$(tput sgr0);
+    echo $bold$green"$1"$reset;
+}
+
+showStatus () {
+    state=`osascript -e 'tell application "Spotify" to player state as string'`;
+    cecho "Spotify is currently $state.";
+    artist=`osascript -e 'tell application "Spotify" to artist of current track as string'`;
+    album=`osascript -e 'tell application "Spotify" to album of current track as string'`;
+    track=`osascript -e 'tell application "Spotify" to name of current track as string'`;
+    duration=`osascript -e 'tell application "Spotify"
+            set durSec to (duration of current track / 1000) as text
+            set tM to (round (durSec / 60) rounding down) as text
+            if length of ((durSec mod 60 div 1) as text) is greater than 1 then
+                set tS to (durSec mod 60 div 1) as text
+            else
+                set tS to ("0" & (durSec mod 60 div 1)) as text
+            end if
+            set myTime to tM as text & ":" & tS as text
+            end tell
+            return myTime'`;
+    position=`osascript -e 'tell application "Spotify"
+            set pos to player position
+            set nM to (round (pos / 60) rounding down) as text
+            if length of ((round (pos mod 60) rounding down) as text) is greater than 1 then
+                set nS to (round (pos mod 60) rounding down) as text
+            else
+                set nS to ("0" & (round (pos mod 60) rounding down)) as text
+            end if
+            set nowAt to nM as text & ":" & nS as text
+            end tell
+            return nowAt'`;
+
+    echo -e $reset"Artist: $artist\nAlbum: $album\nTrack: $track \nPosition: $position / $duration";
+}
+
+if [ $# = 0 ]; then
+    showHelp;
+else
+    if [ $(osascript -e 'application "Spotify" is running') = "false" ]; then
+        osascript -e 'tell application "Spotify" to activate'
+        sleep 2
+    fi
+fi
+while [ $# -gt 0 ]; do
+    arg=$1;
+
+    case $arg in
+        "play"    )
+            if [ $# != 1 ]; then
+                # There are additional arguments, so find out how many
+                array=( $@ );
+                len=${#array[@]};
+                SPOTIFY_SEARCH_API="https://api.spotify.com/v1/search";
+                SPOTIFY_TOKEN_URI="https://accounts.spotify.com/api/token";
+                if [ -z "${CLIENT_ID}" ]; then
+                    cecho "Invalid Client ID, please update ${USER_CONFIG_FILE}";
+                    showAPIHelp;
+                    exit 1;
+                fi
+                if [ -z "${CLIENT_SECRET}" ]; then
+                    cecho "Invalid Client Secret, please update ${USER_CONFIG_FILE}";
+                    showAPIHelp;
+                    exit 1;
+                fi
+                SHPOTIFY_CREDENTIALS=$(printf "${CLIENT_ID}:${CLIENT_SECRET}" | base64 | tr -d "\n");
+                SPOTIFY_PLAY_URI="";
+
+                getAccessToken() {
+                    cecho "Connecting to Spotify's API";
+
+                    SPOTIFY_TOKEN_RESPONSE_DATA=$( \
+                        curl "${SPOTIFY_TOKEN_URI}" \
+                            --silent \
+                            -X "POST" \
+                            -H "Authorization: Basic ${SHPOTIFY_CREDENTIALS}" \
+                            -d "grant_type=client_credentials" \
+                    )
+                    if ! [[ "${SPOTIFY_TOKEN_RESPONSE_DATA}" =~ "access_token" ]]; then
+                        cecho "Autorization failed, please check ${USER_CONFG_FILE}"
+                        cecho "${SPOTIFY_TOKEN_RESPONSE_DATA}"
+                        showAPIHelp
+                        exit 1
+                    fi
+                    SPOTIFY_ACCESS_TOKEN=$( \
+                        printf "${SPOTIFY_TOKEN_RESPONSE_DATA}" \
+                        | grep -E -o '"access_token":".*",' \
+                        | sed 's/"access_token"://g' \
+                        | sed 's/"//g' \
+                        | sed 's/,.*//g' \
+                    )
+                }
+
+                searchAndPlay() {
+                    type="$1"
+                    Q="$2"
+
+                    getAccessToken;
+
+                    cecho "Searching ${type}s for: $Q";
+
+                    SPOTIFY_PLAY_URI=$( \
+                        curl -s -G $SPOTIFY_SEARCH_API \
+                            -H "Authorization: Bearer ${SPOTIFY_ACCESS_TOKEN}" \
+                            -H "Accept: application/json" \
+                            --data-urlencode "q=$Q" \
+                            -d "type=$type&limit=1&offset=0" \
+                        | grep -E -o "spotify:$type:[a-zA-Z0-9]+" -m 1
+                    )
+                    echo "play uri: ${SPOTIFY_PLAY_URI}"
+                }
+
+                case $2 in
+                    "list"  )
+                        _args=${array[@]:2:$len};
+                        Q=$_args;
+
+                        getAccessToken;
+
+                        cecho "Searching playlists for: $Q";
+
+                        results=$( \
+                            curl -s -G $SPOTIFY_SEARCH_API --data-urlencode "q=$Q" -d "type=playlist&limit=10&offset=0" -H "Accept: application/json" -H "Authorization: Bearer ${SPOTIFY_ACCESS_TOKEN}" \
+                            | grep -E -o "spotify:user:[a-zA-Z0-9_]+:playlist:[a-zA-Z0-9]+" -m 10 \
+                        )
+
+                        count=$( \
+                            echo "$results" | grep -c "spotify:user" \
+                        )
+
+                        if [ "$count" -gt 0 ]; then
+                            random=$(( $RANDOM % $count));
+
+                            SPOTIFY_PLAY_URI=$( \
+                                echo "$results" | awk -v random="$random" '/spotify:user:[a-zA-Z0-9]+:playlist:[a-zA-Z0-9]+/{i++}i==random{print; exit}' \
+                            )
+                        fi;;
+
+                    "album" | "artist" | "track"    )
+                        _args=${array[@]:2:$len};
+                        searchAndPlay $2 "$_args";;
+
+                    "uri"  )
+                        SPOTIFY_PLAY_URI=${array[@]:2:$len};;
+
+                    *   )
+                        _args=${array[@]:1:$len};
+                        searchAndPlay track "$_args";;
+                esac
+
+                if [ "$SPOTIFY_PLAY_URI" != "" ]; then
+                    if [ "$2" = "uri" ]; then
+                        cecho "Playing Spotify URI: $SPOTIFY_PLAY_URI";
+                    else
+                        cecho "Playing ($Q Search) -> Spotify URI: $SPOTIFY_PLAY_URI";
+                    fi
+
+                    osascript -e "tell application \"Spotify\" to play track \"$SPOTIFY_PLAY_URI\"";
+
+                else
+                    cecho "No results when searching for $Q";
+                fi
+
+            else
+
+                # play is the only param
+                cecho "Playing Spotify.";
+                osascript -e 'tell application "Spotify" to play';
+            fi
+            break ;;
+
+        "pause"    )
+            state=`osascript -e 'tell application "Spotify" to player state as string'`;
+            if [ $state = "playing" ]; then
+              cecho "Pausing Spotify.";
+            else
+              cecho "Playing Spotify.";
+            fi
+
+            osascript -e 'tell application "Spotify" to playpause';
+            break ;;
+
+        "stop"    )
+            state=`osascript -e 'tell application "Spotify" to player state as string'`;
+            if [ $state = "playing" ]; then
+              cecho "Pausing Spotify.";
+              osascript -e 'tell application "Spotify" to playpause';
+            else
+              cecho "Spotify is already stopped."
+            fi
+
+            break ;;
+
+        "quit"    ) cecho "Quitting Spotify.";
+            osascript -e 'tell application "Spotify" to quit';
+            exit 1 ;;
+
+        "next"    ) cecho "Going to next track." ;
+            osascript -e 'tell application "Spotify" to next track';
+            showStatus;
+            break ;;
+
+        "prev"    ) cecho "Going to previous track.";
+            osascript -e '
+            tell application "Spotify"
+                set player position to 0
+                previous track
+            end tell';
+            showStatus;
+            break ;;
+
+        "replay"  ) cecho "Replaying current track.";
+            osascript -e 'tell application "Spotify" to set player position to 0'
+            break ;;
+
+        "vol"    )
+            vol=`osascript -e 'tell application "Spotify" to sound volume as integer'`;
+            if [[ $2 = "" || $2 = "show" ]]; then
+                cecho "Current Spotify volume level is $vol.";
+                break ;
+            elif [ "$2" = "up" ]; then
+                if [ $vol -le 90 ]; then
+                    newvol=$(( vol+10 ));
+                    cecho "Increasing Spotify volume to $newvol.";
+                else
+                    newvol=100;
+                    cecho "Spotify volume level is at max.";
+                fi
+            elif [ "$2" = "down" ]; then
+                if [ $vol -ge 10 ]; then
+                    newvol=$(( vol-10 ));
+                    cecho "Reducing Spotify volume to $newvol.";
+                else
+                    newvol=0;
+                    cecho "Spotify volume level is at min.";
+                fi
+            elif [[ $2 =~ ^[0-9]+$ ]] && [[ $2 -ge 0 && $2 -le 100 ]]; then
+                newvol=$2;
+                cecho "Setting Spotify volume level to $newvol";
+            else
+                echo "Improper use of 'vol' command"
+                echo "The 'vol' command should be used as follows:"
+                echo "  vol up                       # Increases the volume by 10%.";
+                echo "  vol down                     # Decreases the volume by 10%.";
+                echo "  vol [amount]                 # Sets the volume to an amount between 0 and 100.";
+                echo "  vol                          # Shows the current Spotify volume.";
+                break
+            fi
+
+            osascript -e "tell application \"Spotify\" to set sound volume to $newvol";
+            break ;;
+
+        "toggle"  )
+            if [ "$2" = "shuffle" ]; then
+                osascript -e 'tell application "Spotify" to set shuffling to not shuffling';
+                curr=`osascript -e 'tell application "Spotify" to shuffling'`;
+                cecho "Spotify shuffling set to $curr";
+            elif [ "$2" = "repeat" ]; then
+                osascript -e 'tell application "Spotify" to set repeating to not repeating';
+                curr=`osascript -e 'tell application "Spotify" to repeating'`;
+                cecho "Spotify repeating set to $curr";
+            fi
+            break ;;
+
+        "status" )
+            showStatus;
+            break ;;
+
+        "info" )
+            info=`osascript -e 'tell application "Spotify"
+                set durSec to (duration of current track / 1000)
+                set tM to (round (durSec / 60) rounding down) as text
+                if length of ((durSec mod 60 div 1) as text) is greater than 1 then
+                    set tS to (durSec mod 60 div 1) as text
+                else
+                    set tS to ("0" & (durSec mod 60 div 1)) as text
+                end if
+                set myTime to tM as text & "min " & tS as text & "s"
+                set pos to player position
+                set nM to (round (pos / 60) rounding down) as text
+                if length of ((round (pos mod 60) rounding down) as text) is greater than 1 then
+                    set nS to (round (pos mod 60) rounding down) as text
+                else
+                    set nS to ("0" & (round (pos mod 60) rounding down)) as text
+                end if
+                set nowAt to nM as text & "min " & nS as text & "s"
+                set info to "" & "\nArtist:         " & artist of current track
+                set info to info & "\nTrack:          " & name of current track
+                set info to info & "\nAlbum Artist:   " & album artist of current track
+                set info to info & "\nAlbum:          " & album of current track
+                set info to info & "\nSeconds:        " & durSec
+                set info to info & "\nSeconds played: " & pos
+                set info to info & "\nDuration:       " & mytime
+                set info to info & "\nNow at:         " & nowAt
+                set info to info & "\nPlayed Count:   " & played count of current track
+                set info to info & "\nTrack Number:   " & track number of current track
+                set info to info & "\nPopularity:     " & popularity of current track
+                set info to info & "\nId:             " & id of current track
+                set info to info & "\nSpotify URL:    " & spotify url of current track
+                set info to info & "\nArtwork:        " & artwork url of current track
+                set info to info & "\nPlayer:         " & player state
+                set info to info & "\nVolume:         " & sound volume
+                set info to info & "\nShuffle:        " & shuffling
+                set info to info & "\nRepeating:      " & repeating
+            end tell
+            return info'`
+            cecho "$info";
+            break ;;
+
+        "share"     )
+            uri=`osascript -e 'tell application "Spotify" to spotify url of current track'`;
+            remove='spotify:track:'
+            url=${uri#$remove}
+            url="http://open.spotify.com/track/$url"
+
+            if [ "$2" = "" ]; then
+                cecho "Spotify URL: $url"
+                cecho "Spotify URI: $uri"
+                echo "To copy the URL or URI to your clipboard, use:"
+                echo "\`spotify share url\` or"
+                echo "\`spotify share uri\` respectively."
+            elif [ "$2" = "url" ]; then
+                cecho "Spotify URL: $url";
+                echo -n $url | pbcopy
+            elif [ "$2" = "uri" ]; then
+                cecho "Spotify URI: $uri";
+                echo -n $uri | pbcopy
+            fi
+            break;;
+
+        "pos"   )
+            cecho "Adjusting Spotify play position."
+            osascript -e "tell application \"Spotify\" to set player position to $2";
+            break;;
+
+        "help" | * )
+            showHelp;
+            break ;;
+    esac
+done
+}
-- 
cgit v1.2.3-70-g09d2


From f6a4e37e8840bb90f5650147bf05386603f9ab42 Mon Sep 17 00:00:00 2001
From: arizzubair <5427064+arizzubair@users.noreply.github.com>
Date: Mon, 22 Jan 2018 21:14:32 -0600
Subject: Update README.md (#6554)

Minor spelling mistake.
---
 plugins/bgnotify/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/bgnotify/README.md b/plugins/bgnotify/README.md
index b154916d6..fad299159 100644
--- a/plugins/bgnotify/README.md
+++ b/plugins/bgnotify/README.md
@@ -10,7 +10,7 @@ Standalone homepage: [t413/zsh-background-notify](https://github.com/t413/zsh-ba
 
 Just add bgnotify to your plugins list in your `.zshrc`
 
-- On OS X you'll need [terminal-notifer](https://github.com/alloy/terminal-notifier)
+- On OS X you'll need [terminal-notifier](https://github.com/alloy/terminal-notifier)
   * `brew install terminal-notifier` (or `gem install terminal-notifier`)
 - On ubuntu you're already all set!
 - On windows you can use [notifu](http://www.paralint.com/projects/notifu/) or the Cygwin Ports libnotify package
-- 
cgit v1.2.3-70-g09d2


From d22189848e3549800486d009aeb7d6a692fd55be Mon Sep 17 00:00:00 2001
From: Alexey Pristavkin <pristavkin@gmail.com>
Date: Tue, 23 Jan 2018 06:14:55 +0300
Subject: Update of docker completion (#6542)

---
 plugins/docker/_docker | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'plugins')

diff --git a/plugins/docker/_docker b/plugins/docker/_docker
index 5d6edd880..0c20cf28e 100644
--- a/plugins/docker/_docker
+++ b/plugins/docker/_docker
@@ -226,7 +226,7 @@ __docker_get_log_options() {
     common_options=("max-buffer-size" "mode")
     common_options2=("env" "env-regex" "labels")
     awslogs_options=($common_options "awslogs-create-group" "awslogs-datetime-format" "awslogs-group" "awslogs-multiline-pattern" "awslogs-region" "awslogs-stream" "tag")
-    fluentd_options=($common_options $common_options2 "fluentd-address" "fluentd-async-connect" "fluentd-buffer-limit" "fluentd-retry-wait" "fluentd-max-retries" "tag")
+    fluentd_options=($common_options $common_options2 "fluentd-address" "fluentd-async-connect" "fluentd-buffer-limit" "fluentd-retry-wait" "fluentd-max-retries" "fluentd-sub-second-precision" "tag")
     gcplogs_options=($common_options $common_options2 "gcp-log-cmd" "gcp-meta-id" "gcp-meta-name" "gcp-meta-zone" "gcp-project")
     gelf_options=($common_options $common_options2 "gelf-address" "gelf-compression-level" "gelf-compression-type" "tag")
     journald_options=($common_options $common_options2 "tag")
@@ -745,6 +745,7 @@ __docker_container_subcommand() {
                 "($help)--privileged[Give extended Linux capabilities to the command]" \
                 "($help -t --tty)"{-t,--tty}"[Allocate a pseudo-tty]" \
                 "($help -u --user)"{-u=,--user=}"[Username or UID]:user:_users" \
+                "($help -w --workdir)"{-w=,--workdir=}"[Working directory inside the container]:directory:_directories" \
                 "($help -):containers:__docker_complete_running_containers" \
                 "($help -)*::command:->anycommand" && ret=0
             case $state in
@@ -1393,7 +1394,7 @@ __docker_nodes() {
     # Names
     if [[ $type = (names|all) ]]; then
         for line in $lines; do
-            s="${line[${begin[NAME]},${end[NAME]}]%% ##}"
+            s="${line[${begin[HOSTNAME]},${end[HOSTNAME]}]%% ##}"
             nodes=($nodes $s)
         done
     fi
@@ -1955,6 +1956,7 @@ __docker_service_subcommand() {
         "($help)--health-retries=[Consecutive failures needed to report unhealthy]:retries:(1 2 3 4 5)"
         "($help)--health-timeout=[Maximum time to allow one check to run]:time: "
         "($help)--hostname=[Service container hostname]:hostname: " \
+        "($help)--isolation=[Service container isolation mode]:isolation:(default process hyperv)" \
         "($help)*--label=[Service labels]:label: "
         "($help)--limit-cpu=[Limit CPUs]:value: "
         "($help)--limit-memory=[Limit Memory]:value: "
@@ -2168,9 +2170,9 @@ __docker_stacks() {
     end[${header[$i,$((j-1))]}]=-1
     lines=(${lines[2,-1]})
 
-    # Service ID
+    # Service NAME
     for line in $lines; do
-        s="${line[${begin[ID]},${end[ID]}]%% ##}"
+        s="${line[${begin[NAME]},${end[NAME]}]%% ##}"
         stacks=($stacks $s)
     done
 
@@ -2631,7 +2633,6 @@ __docker_subcommand() {
                 "($help)--default-gateway-v6[Container default gateway IPv6 address]:IPv6 address: " \
                 "($help)--default-shm-size=[Default shm size for containers]:size:" \
                 "($help)*--default-ulimit=[Default ulimits for containers]:ulimit: " \
-                "($help)--disable-legacy-registry[Disable contacting legacy registries (default true)]" \
                 "($help)*--dns=[DNS server to use]:DNS: " \
                 "($help)*--dns-opt=[DNS options to use]:DNS option: " \
                 "($help)*--dns-search=[DNS search domains to use]:DNS search: " \
@@ -3023,4 +3024,4 @@ _docker "$@"
 # indent-tabs-mode: nil
 # sh-basic-offset: 4
 # End:
-# vim: ft=zsh sw=4 ts=4 et
+# vim: ft=zsh sw=4 ts=4 et
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From 28cd683282f16b4306f47127149f7f2886db5b9c Mon Sep 17 00:00:00 2001
From: Steve <wifijanitor@users.noreply.github.com>
Date: Mon, 22 Jan 2018 21:18:03 -0600
Subject: updated alias and corrected python package (#6520)

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

(limited to 'plugins')

diff --git a/plugins/colorize/colorize.plugin.zsh b/plugins/colorize/colorize.plugin.zsh
index 11b58e69d..b97dffe43 100644
--- a/plugins/colorize/colorize.plugin.zsh
+++ b/plugins/colorize/colorize.plugin.zsh
@@ -3,11 +3,12 @@
 # If no highlighting method supported for given extension then it tries 
 # guess it by looking for file content.
 
-alias colorize='colorize_via_pygmentize'
+#easier alias to use plugin
+alias ccat='colorize_via_pygmentize'
 
 colorize_via_pygmentize() {
     if [ ! -x "$(which pygmentize)" ]; then
-        echo "package \'pygmentize\' is not installed!"
+        echo "package \'Pygments\' is not installed!"
         return -1
     fi
 
-- 
cgit v1.2.3-70-g09d2


From 215e43aa8ab4c660c0edb59ee4d8b3daceb456b5 Mon Sep 17 00:00:00 2001
From: Giuseppe Landolfi <giuseppe.landolfi@gmail.com>
Date: Tue, 23 Jan 2018 04:18:45 +0100
Subject: Add support for Mac to dirhistory plugin (#6533)

Add shortcuts for mac keyboards as an alternative to alt+left
abd alt+right: mac users can now use opt+left and opt+right.
---
 plugins/dirhistory/dirhistory.plugin.zsh | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'plugins')

diff --git a/plugins/dirhistory/dirhistory.plugin.zsh b/plugins/dirhistory/dirhistory.plugin.zsh
index 0209981e3..8138872bc 100644
--- a/plugins/dirhistory/dirhistory.plugin.zsh
+++ b/plugins/dirhistory/dirhistory.plugin.zsh
@@ -119,6 +119,8 @@ 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
+# Mac teminal (alt+left/right)
+bindkey "^[b" dirhistory_zle_dirhistory_back
 # Putty:
 bindkey "\e\e[D" dirhistory_zle_dirhistory_back
 # GNU screen:
@@ -127,6 +129,7 @@ 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 "^[f" dirhistory_zle_dirhistory_future
 bindkey "\e\e[C" dirhistory_zle_dirhistory_future
 bindkey "\eO3C" dirhistory_zle_dirhistory_future
 
-- 
cgit v1.2.3-70-g09d2


From 7a0dac8040c591b99ad9d28149dd559a6e332c1e Mon Sep 17 00:00:00 2001
From: Jeremy Worboys <jw@jeremyworboys.com>
Date: Tue, 23 Jan 2018 14:19:03 +1100
Subject: Add ExpressionEngine CMS autocompletion (#6556)

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

(limited to 'plugins')

diff --git a/plugins/eecms/eecms.plugin.zsh b/plugins/eecms/eecms.plugin.zsh
new file mode 100644
index 000000000..ee10fbb7e
--- /dev/null
+++ b/plugins/eecms/eecms.plugin.zsh
@@ -0,0 +1,20 @@
+# ExpressionEngine CMS basic command completion
+
+_eecms_console () {
+    echo "php $(find . -maxdepth 3 -mindepth 1 -name 'eecms' -type f | head -n 1)"
+}
+
+_eecms_get_command_list () {
+    `_eecms_console` | sed "/Available commands/,/^/d" | sed "s/[[:space:]].*//g"
+}
+
+_eecms () {
+    compadd `_eecms_get_command_list`
+}
+
+compdef _eecms '`_eecms_console`'
+compdef _eecms 'system/ee/eecms'
+compdef _eecms eecms
+
+#Alias
+alias eecms='`_eecms_console`'
-- 
cgit v1.2.3-70-g09d2


From e5dae3d33113d854183f908a9d867b03054a21dd Mon Sep 17 00:00:00 2001
From: Michael Nikitochkin <miry.sof@gmail.com>
Date: Tue, 23 Jan 2018 04:19:57 +0100
Subject: add -auto-approve flag to terraform apply command (#6558)

---
 plugins/terraform/_terraform | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins')

diff --git a/plugins/terraform/_terraform b/plugins/terraform/_terraform
index d67820603..285d83ec7 100644
--- a/plugins/terraform/_terraform
+++ b/plugins/terraform/_terraform
@@ -20,6 +20,7 @@ _terraform_cmds=(
 
 __apply() {
     _arguments \
+        '-auto-approve[Skip interactive approval of plan before applying.]' \
         '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]' \
         '-input=[(true) Ask for input for variables if not directly set.]' \
         '-no-color[If specified, output will not contain any color.]' \
-- 
cgit v1.2.3-70-g09d2


From 8f5e5233fb781c1442960f4ed50fea1a78cde147 Mon Sep 17 00:00:00 2001
From: Jake Stanley <madstanners@users.noreply.github.com>
Date: Tue, 23 Jan 2018 03:23:36 +0000
Subject: added stn create_project function for stubbing sublime-project files
 (#6515)

---
 plugins/sublime/README.md          |  4 ++++
 plugins/sublime/sublime.plugin.zsh | 31 +++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)

(limited to 'plugins')

diff --git a/plugins/sublime/README.md b/plugins/sublime/README.md
index 7b02d8428..5379891ad 100644
--- a/plugins/sublime/README.md
+++ b/plugins/sublime/README.md
@@ -19,3 +19,7 @@ Plugin for Sublime Text, a cross platform text and code editor, available for Li
  * If `sst` command is called, it is like `sudo st`, opening the file or folder in Sublime Text. Useful for editing system protected files.
 
  * If `stp` command is called, it find a `.sublime-project` file by traversing up the directory structure. If there is no `.sublime-project` file, but if the current folder is a Git repo, opens up the root directory of the repo. If the current folder is not a Git repo, then opens up the current directory.
+
+ * If `stn` command is called without an argument, create a stub `.sublime-project` file in the current working directory if one does not already exist
+
+ * If `stn` is passed a directory, create a stub `.sublime-project` file in it
diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index f84b7032a..22cf98227 100644
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -84,4 +84,35 @@ find_project()
     st $FINAL_DEST
 }
 
+function create_project() {
+
+    local _target=$1
+
+    if [[ "${_target}" == "" ]]; then
+        _target=$(pwd);
+    elif [[ ! -d ${_target} ]]; then
+        echo "${_target} is not a valid directory"
+        return 1
+    fi
+
+    local _sublime_project_file=$_target/$(basename $_target).sublime-project
+
+    if [[ ! -f $_sublime_project_file ]]; then
+        
+        touch $_sublime_project_file
+
+        echo -e "{"                         >> $_sublime_project_file
+        echo -e "\t\"folders\":"            >> $_sublime_project_file
+        echo -e "\t\t[{"                    >> $_sublime_project_file
+        echo -e "\t\t\t\"path\": \".\","    >> $_sublime_project_file
+        echo -e "\t\t\t\"file_exclude_patterns\": []" >> $_sublime_project_file
+        echo -e "\t\t}]"                    >> $_sublime_project_file
+        echo -e "}"                         >> $_sublime_project_file
+
+        echo -e "New Sublime Text project created:\n\t${_sublime_project_file}"
+
+    fi
+}
+
 alias stp=find_project
+alias stn=create_project
-- 
cgit v1.2.3-70-g09d2


From 3f654922def6af96a07ce8d159567c61e1907e42 Mon Sep 17 00:00:00 2001
From: David Leitner <david@leitner.io>
Date: Tue, 23 Jan 2018 04:24:18 +0100
Subject: Update extract.plugin.zsh (#6516)

---
 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 c524bf8f5..34f8d8710 100644
--- a/plugins/extract/extract.plugin.zsh
+++ b/plugins/extract/extract.plugin.zsh
@@ -10,7 +10,7 @@ extract() {
 			Usage: extract [-option] [file ...]
 
 			Options:
-			    -r, --remove    Remove archive.
+			    -r, --remove    Remove archive after unpacking.
 		EOF
 	fi
 
-- 
cgit v1.2.3-70-g09d2


From 15a681d26654346a5cf12461ad69c378bcf850a1 Mon Sep 17 00:00:00 2001
From: Samuel BERTHE ツ <dev@samuel-berthe.fr>
Date: Tue, 23 Jan 2018 04:25:15 +0100
Subject: Adding whatthecommit to lol plugin (#6289)

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

(limited to 'plugins')

diff --git a/plugins/lol/lol.plugin.zsh b/plugins/lol/lol.plugin.zsh
index 1b32ec2e4..e9a62a863 100644
--- a/plugins/lol/lol.plugin.zsh
+++ b/plugins/lol/lol.plugin.zsh
@@ -45,6 +45,7 @@ alias bringz='git pull'
 alias chicken='git add'
 alias oanward='git commit -m'
 alias ooanward='git commit -am'
+alias yolo='git commit -m "$(curl -s whatthecommit.com/index.txt)"'
 alias letcat='git checkout'
 alias violenz='git rebase'
 
-- 
cgit v1.2.3-70-g09d2


From 37c2d0ddd751e15d0c87a51e2d9f9849093571dc Mon Sep 17 00:00:00 2001
From: Vsevolod Romashov <7@7vn.ru>
Date: Tue, 23 Jan 2018 06:35:17 +0300
Subject: add hanami to the list of wrapped gems (#6334)

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

(limited to 'plugins')

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index c5284dbb1..6b10b78d1 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -14,6 +14,7 @@ bundled_commands=(
   cucumber
   foodcritic
   guard
+  hanami
   irb
   jekyll
   kitchen
-- 
cgit v1.2.3-70-g09d2


From 6d75f556e0f1d275d483746c84edb966de546f7e Mon Sep 17 00:00:00 2001
From: vadimkim <vadim@ant.ee>
Date: Fri, 9 Mar 2018 18:11:09 +0200
Subject: fix "kubectl logs" (#6667)

logs doesn't have "pods" parameter
---
 plugins/kubectl/kubectl.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index 88177b5a0..913b65cca 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -20,7 +20,7 @@ alias kccc='k config current-context'
 
 # Pod management.
 alias kgp='k get pods'
-alias klp='k logs pods'
+alias klp='k logs'
 alias kep='k edit pods'
 alias kdp='k describe pods'
 alias kdelp='k delete pods'
-- 
cgit v1.2.3-70-g09d2


From 52c4e134cc9e6348ebbcd5ba73501f903b57102b Mon Sep 17 00:00:00 2001
From: Nikolay Panov <github@npanov.com>
Date: Fri, 9 Mar 2018 08:11:30 -0800
Subject: Update django.plugin.zsh (#6634)

Added support for 'showmigrations' django command.
---
 plugins/django/django.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins')

diff --git a/plugins/django/django.plugin.zsh b/plugins/django/django.plugin.zsh
index 35865a692..29a51d29d 100644
--- a/plugins/django/django.plugin.zsh
+++ b/plugins/django/django.plugin.zsh
@@ -349,6 +349,7 @@ _managepy-commands() {
     'runfcgi:Run this project as a fastcgi (or some other protocol supported by flup) application,'
     'runserver:Starts a lightweight Web server for development.'
     'shell:Runs a Python interactive interpreter.'
+    'showmigrations:Shows all available migrations for the current project.'
     'sql:Prints the CREATE TABLE SQL statements for the given app name(s).'
     'sqlall:Prints the CREATE TABLE, custom SQL and CREATE INDEX SQL statements for the given model module name(s).'
     'sqlclear:Prints the DROP TABLE SQL statements for the given app name(s).'
-- 
cgit v1.2.3-70-g09d2


From 84e90669847771344ec949c4c2a775882c519624 Mon Sep 17 00:00:00 2001
From: Andrew Matheny <andrew.j.matheny@gmail.com>
Date: Fri, 9 Mar 2018 11:11:52 -0500
Subject: Update docker-compose autocompletion (#6607)

---
 plugins/docker-compose/_docker-compose | 38 ++++++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 9 deletions(-)

(limited to 'plugins')

diff --git a/plugins/docker-compose/_docker-compose b/plugins/docker-compose/_docker-compose
index 2947cef38..c0a54cced 100644
--- a/plugins/docker-compose/_docker-compose
+++ b/plugins/docker-compose/_docker-compose
@@ -3,11 +3,6 @@
 # Description
 # -----------
 #  zsh completion for docker-compose
-#  https://github.com/sdurrheimer/docker-compose-zsh-completion
-# -------------------------------------------------------------------------
-# Version
-# -------
-#  1.5.0
 # -------------------------------------------------------------------------
 # Authors
 # -------
@@ -199,7 +194,9 @@ __docker-compose_subcommand() {
         (build)
             _arguments \
                 $opts_help \
+                "*--build-arg=[Set build-time variables for one service.]:<varname>=<value>: " \
                 '--force-rm[Always remove intermediate containers.]' \
+                '--memory[Memory limit for the build container.]' \
                 '--no-cache[Do not use cache when building the image.]' \
                 '--pull[Always attempt to pull a newer version of the image.]' \
                 '*:services:__docker-compose_services_from_build' && ret=0
@@ -207,13 +204,16 @@ __docker-compose_subcommand() {
         (bundle)
             _arguments \
                 $opts_help \
+                '--push-images[Automatically push images for any services which have a `build` option specified.]' \
                 '(--output -o)'{--output,-o}'[Path to write the bundle file to. Defaults to "<project name>.dab".]:file:_files' && ret=0
             ;;
         (config)
             _arguments \
                 $opts_help \
                 '(--quiet -q)'{--quiet,-q}"[Only validate the configuration, don't print anything.]" \
-                '--services[Print the service names, one per line.]' && ret=0
+                '--resolve-image-digests[Pin image tags to digests.]' \
+                '--services[Print the service names, one per line.]' \
+                '--volumes[Print the volume names, one per line.]' && ret=0
             ;;
         (create)
             _arguments \
@@ -242,7 +242,7 @@ __docker-compose_subcommand() {
                 $opts_help \
                 '-d[Detached mode: Run command in the background.]' \
                 '--privileged[Give extended privileges to the process.]' \
-                '--user=[Run the command as this user.]:username:_users' \
+		'(-u --user)'{-u,--user=}'[Run the command as this user.]:username:_users' \
                 '-T[Disable pseudo-tty allocation. By default `docker-compose exec` allocates a TTY.]' \
                 '--index=[Index of the container if there are multiple instances of a service \[default: 1\]]:index: ' \
                 '(-):running services:__docker-compose_runningservices' \
@@ -252,6 +252,12 @@ __docker-compose_subcommand() {
         (help)
             _arguments ':subcommand:__docker-compose_commands' && ret=0
             ;;
+	(images)
+	    _arguments \
+		$opts_help \
+		'-q[Only display IDs]' \
+		'*:services:__docker-compose_services_all' && ret=0
+	    ;;
         (kill)
             _arguments \
                 $opts_help \
@@ -308,16 +314,17 @@ __docker-compose_subcommand() {
         (run)
             _arguments \
                 $opts_help \
+                $opts_no_deps \
                 '-d[Detached mode: Run container in the background, print new container name.]' \
                 '*-e[KEY=VAL Set an environment variable (can be used multiple times)]:environment variable KEY=VAL: ' \
                 '--entrypoint[Overwrite the entrypoint of the image.]:entry point: ' \
                 '--name=[Assign a name to the container]:name: ' \
-                $opts_no_deps \
                 '(-p --publish)'{-p,--publish=}"[Publish a container's port(s) to the host]" \
                 '--rm[Remove container after run. Ignored in detached mode.]' \
                 "--service-ports[Run command with the service's ports enabled and mapped to the host.]" \
                 '-T[Disable pseudo-tty allocation. By default `docker-compose run` allocates a TTY.]' \
                 '(-u --user)'{-u,--user=}'[Run as specified username or uid]:username or uid:_users' \
+                '(-v --volume)*'{-v,--volume=}'[Bind mount a volume]:volume: ' \
                 '(-w --workdir)'{-w,--workdir=}'[Working directory inside the container]:workdir: ' \
                 '(-):services:__docker-compose_services' \
                 '(-):command: _command_names -e' \
@@ -340,6 +347,11 @@ __docker-compose_subcommand() {
                 $opts_timeout \
                 '*:running services:__docker-compose_runningservices' && ret=0
             ;;
+        (top)
+            _arguments \
+                $opts_help \
+                '*:running services:__docker-compose_runningservices' && ret=0
+            ;;
         (unpause)
             _arguments \
                 $opts_help \
@@ -385,9 +397,17 @@ _docker-compose() {
     integer ret=1
     typeset -A opt_args
 
+    local file_description
+
+    if [[ -n ${words[(r)-f]} || -n ${words[(r)--file]} ]] ; then
+        file_description="Specify an override docker-compose file (default: docker-compose.override.yml)"
+    else
+        file_description="Specify an alternate docker-compose file (default: docker-compose.yml)"
+    fi
+
     _arguments -C \
         '(- :)'{-h,--help}'[Get help]' \
-        '(-f --file)'{-f,--file}'[Specify an alternate docker-compose file (default: docker-compose.yml)]:file:_files -g "*.yml"' \
+        '*'{-f,--file}"[${file_description}]:file:_files -g '*.yml'" \
         '(-p --project-name)'{-p,--project-name}'[Specify an alternate project name (default: directory name)]:project name:' \
         '--verbose[Show more output]' \
         '(- :)'{-v,--version}'[Print version and exit]' \
-- 
cgit v1.2.3-70-g09d2


From 7c2028e84ede1ece09fa2dd13b5b6d8ba59ddfd1 Mon Sep 17 00:00:00 2001
From: Luke <lukephilips@gmail.com>
Date: Fri, 9 Mar 2018 09:12:42 -0700
Subject: Update/add kubectl logging commands (#6639)

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

(limited to 'plugins')

diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index 913b65cca..a29773ee9 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -20,7 +20,6 @@ alias kccc='k config current-context'
 
 # Pod management.
 alias kgp='k get pods'
-alias klp='k logs'
 alias kep='k edit pods'
 alias kdp='k describe pods'
 alias kdelp='k delete pods'
@@ -48,3 +47,7 @@ alias krsd='k rollout status deployment'
 alias kgrs='k get rs'
 alias krh='k rollout history'
 alias kru='k rollout undo'
+
+# Logs
+alias kl='k logs'
+alias klf='k logs -f'
-- 
cgit v1.2.3-70-g09d2


From afad3e1f8d7b50b30493918912cd823c0e458780 Mon Sep 17 00:00:00 2001
From: Andrea Giardini <AndreaGiardini@users.noreply.github.com>
Date: Fri, 9 Mar 2018 17:14:09 +0100
Subject: Add kubectl alias for apply (#6662)

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

(limited to 'plugins')

diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index a29773ee9..97e429aac 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -9,6 +9,9 @@ fi
 # This command is used ALOT both below and in daily life
 alias k=kubectl
 
+# Apply a YML file
+alias kaf='k apply -f'
+
 # Drop into an interactive terminal on a container
 alias keti='k exec -ti'
 
-- 
cgit v1.2.3-70-g09d2


From e6e2b3d42fc7e88d293d380f7861fa87e0856e62 Mon Sep 17 00:00:00 2001
From: Jon Mosco <1970496+jonmosco@users.noreply.github.com>
Date: Fri, 9 Mar 2018 11:14:36 -0500
Subject: kube-ps1 zsh prompt helper (#6507)

---
 plugins/kube-ps1/README.md    |  76 ++++++++++++++++++++++++++
 plugins/kube-ps1/kube-ps1.zsh | 123 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 199 insertions(+)
 create mode 100644 plugins/kube-ps1/README.md
 create mode 100644 plugins/kube-ps1/kube-ps1.zsh

(limited to 'plugins')

diff --git a/plugins/kube-ps1/README.md b/plugins/kube-ps1/README.md
new file mode 100644
index 000000000..a572773a3
--- /dev/null
+++ b/plugins/kube-ps1/README.md
@@ -0,0 +1,76 @@
+Kubernetes prompt for zsh
+=========================
+
+A Kubernetes (k8s) zsh prompt that displays the current cluster cluster
+and the namespace.
+
+Inspired by several tools used to simplify usage of kubectl
+
+NOTE: If you are not using zsh, check out [kube-ps1](https://github.com/jonmosco/kube-ps1) designed for bash
+as well as zsh.
+
+## Requirements
+
+The default prompt assumes you have the kubectl command line utility installed.  It
+can be obtained here:
+
+[Install and Set up kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/)
+
+If using this with OpenShift, the oc tool needs installed.  It can be obtained from here:
+
+[OC Client Tools](https://www.openshift.org/download.html)
+
+## Helper utilities
+
+There are several great tools that make using kubectl very enjoyable.
+
+[kubectx and kubenx](https://github.com/ahmetb/kubectx) are great for
+fast switching between clusters and namespaces.
+
+## Prompt Structure
+
+The prompt layout is:
+
+```
+(<logo>|<cluster>:<namespace>)
+```
+
+Supported platforms:
+* k8s - Kubernetes
+* ocp - OpenShift
+
+## Install
+
+1. Clone this repository
+2. Source the kube-ps1.zsh in your ~./.zshrc
+
+ZSH:
+```
+source path/kube-ps1.sh
+PROMPT='$(kube_ps1) '
+```
+
+## Colors
+
+The colors are of my opinion. Blue was used as the prefix to match the Kubernetes
+color as closely as possible. Red was chosen as the cluster name to stand out, and cyan
+for the namespace.  These can of course be changed.
+
+## Customization
+
+The default settings can be overridden in ~/.zshrc
+
+| Variable | Default | Meaning |
+| :------- | :-----: | ------- |
+| `KUBE_PS1_DEFAULT` | `true` | Default settings for the prompt |
+| `KUBE_PS1_PREFIX` | `(` | Prompt opening character  |
+| `KUBE_PS1_DEFAULT_LABEL` | `⎈ ` | Default prompt symbol |
+| `KUBE_PS1_SEPERATOR` | `\|` | Separator between symbol and cluster name |
+| `KUBE_PS1_PLATFORM` | `kubectl` | Cluster type and binary to use |
+| `KUBE_PS1_DIVIDER` | `:` | Separator between cluster and namespace |
+| `KUBE_PS1_SUFFIX` | `)` | Prompt closing character |
+| `KUBE_PS1_DEFAULT_LABEL_IMG` | `false` | Use Kubernetes img as the label: ☸️  |
+
+## Contributors
+
+Jared Yanovich
diff --git a/plugins/kube-ps1/kube-ps1.zsh b/plugins/kube-ps1/kube-ps1.zsh
new file mode 100644
index 000000000..e1cb4339d
--- /dev/null
+++ b/plugins/kube-ps1/kube-ps1.zsh
@@ -0,0 +1,123 @@
+#!/bin/zsh
+
+# Kubernetes prompt helper for bash/zsh
+# Displays current context and namespace
+
+# Copyright 2017 Jon Mosco
+#
+#  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.
+
+# Debug
+[[ -n $DEBUG ]] && set -x
+
+setopt PROMPT_SUBST
+add-zsh-hook precmd _kube_ps1_load
+zmodload zsh/stat
+
+# Default values for the prompt
+# Override these values in ~/.zshrc or ~/.bashrc
+KUBE_PS1_DEFAULT="${KUBE_PS1_DEFAULT:=true}"
+KUBE_PS1_PREFIX="("
+KUBE_PS1_DEFAULT_LABEL="${KUBE_PS1_DEFAULT_LABEL:="⎈ "}"
+KUBE_PS1_DEFAULT_LABEL_IMG="${KUBE_PS1_DEFAULT_LABEL_IMG:=false}"
+KUBE_PS1_SEPERATOR="|"
+KUBE_PS1_PLATFORM="${KUBE_PS1_PLATFORM:="kubectl"}"
+KUBE_PS1_DIVIDER=":"
+KUBE_PS1_SUFFIX=")"
+KUBE_PS1_UNAME=$(uname)
+KUBE_PS1_LAST_TIME=0
+
+kube_ps1_label () {
+
+  [[ "${KUBE_PS1_DEFAULT_LABEL_IMG}" == false ]] && return
+
+  if [[ "${KUBE_PS1_DEFAULT_LABEL_IMG}" == true ]]; then
+    local KUBE_LABEL="☸️ "
+  fi
+
+  KUBE_PS1_DEFAULT_LABEL="${KUBE_LABEL}"
+
+}
+
+_kube_ps1_split() {
+  type setopt >/dev/null 2>&1 && setopt SH_WORD_SPLIT
+  local IFS=$1
+  echo $2
+}
+
+_kube_ps1_file_newer_than() {
+
+  local mtime
+  local file=$1
+  local check_time=$2
+  mtime=$(stat +mtime "${file}")
+
+  [ "${mtime}" -gt "${check_time}" ]
+
+}
+
+_kube_ps1_load() {
+  # kubectl will read the environment variable $KUBECONFIG
+  # otherwise set it to ~/.kube/config
+  KUBECONFIG="${KUBECONFIG:=$HOME/.kube/config}"
+
+  for conf in $(_kube_ps1_split : "${KUBECONFIG}"); do
+    # TODO: check existence of $conf
+    if _kube_ps1_file_newer_than "${conf}" "${KUBE_PS1_LAST_TIME}"; then
+      _kube_ps1_get_context_ns
+      return
+    fi
+  done
+}
+
+_kube_ps1_get_context_ns() {
+
+  # Set the command time
+  KUBE_PS1_LAST_TIME=$(date +%s)
+
+  if [[ "${KUBE_PS1_DEFAULT}" == true ]]; then
+    local KUBE_BINARY="${KUBE_PS1_PLATFORM}"
+  elif [[ "${KUBE_PS1_DEFAULT}" == false ]] && [[ "${KUBE_PS1_PLATFORM}" == "kubectl" ]];then
+    local KUBE_BINARY="kubectl"
+  elif [[ "${KUBE_PS1_PLATFORM}" == "oc" ]]; then
+    local KUBE_BINARY="oc"
+  fi
+
+  KUBE_PS1_CONTEXT="$(${KUBE_BINARY} config current-context)"
+  KUBE_PS1_NAMESPACE="$(${KUBE_BINARY} config view --minify --output 'jsonpath={..namespace}')"
+  # Set namespace to default if it is not defined
+  KUBE_PS1_NAMESPACE="${KUBE_PS1_NAMESPACE:-default}"
+
+}
+
+# source our symbol
+kube_ps1_label
+
+# Build our prompt
+kube_ps1 () {
+  local reset_color="%f"
+  local blue="%F{blue}"
+  local red="%F{red}"
+  local cyan="%F{cyan}"
+
+  KUBE_PS1="${reset_color}$KUBE_PS1_PREFIX"
+  KUBE_PS1+="${blue}$KUBE_PS1_DEFAULT_LABEL"
+  KUBE_PS1+="${reset_color}$KUBE_PS1_SEPERATOR"
+  KUBE_PS1+="${red}$KUBE_PS1_CONTEXT${reset_color}"
+  KUBE_PS1+="$KUBE_PS1_DIVIDER"
+  KUBE_PS1+="${cyan}$KUBE_PS1_NAMESPACE${reset_color}"
+  KUBE_PS1+="$KUBE_PS1_SUFFIX"
+
+  echo "${KUBE_PS1}"
+
+}
-- 
cgit v1.2.3-70-g09d2


From ce23ef9a2fcd71d2428d886f83af09296537d8ac Mon Sep 17 00:00:00 2001
From: Lauri Lavanti <laurilavanti@gmail.com>
Date: Fri, 9 Mar 2018 18:14:51 +0200
Subject: Add alias for docker-compose pull (#6665)

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

(limited to 'plugins')

diff --git a/plugins/docker-compose/docker-compose.plugin.zsh b/plugins/docker-compose/docker-compose.plugin.zsh
index 4e4ac114a..d69769010 100644
--- a/plugins/docker-compose/docker-compose.plugin.zsh
+++ b/plugins/docker-compose/docker-compose.plugin.zsh
@@ -21,3 +21,4 @@ alias dcup='docker-compose up'
 alias dcdn='docker-compose down'
 alias dcl='docker-compose logs'
 alias dclf='docker-compose logs -f'
+alias dcpull='docker-compose pull'
-- 
cgit v1.2.3-70-g09d2


From 5f2c34374babf5749f2701a10cd81800b41fc908 Mon Sep 17 00:00:00 2001
From: Eric Hudon <ehudon@users.noreply.github.com>
Date: Sun, 18 Mar 2018 17:10:34 -0400
Subject: Change the br action to branch to be more explicit. (#6678)

---
 plugins/jira/README.md       | 1 +
 plugins/jira/jira.plugin.zsh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/jira/README.md b/plugins/jira/README.md
index efb8a743a..a934ae68c 100644
--- a/plugins/jira/README.md
+++ b/plugins/jira/README.md
@@ -21,6 +21,7 @@ jira new        # opens a new issue
 jira dashboard  # opens your JIRA dashboard
 jira reported [username]  # queries for issues reported by a user
 jira assigned [username]  # queries for issues assigned to a user
+jira branch     # opens an existing issue matching the current branch name
 jira ABC-123    # opens an existing issue
 jira ABC-123 m  # opens an existing issue for adding a comment
 ```
diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh
index 0340dd7f4..052481a60 100644
--- a/plugins/jira/jira.plugin.zsh
+++ b/plugins/jira/jira.plugin.zsh
@@ -60,7 +60,7 @@ function jira() {
   else
     # Anything that doesn't match a special action is considered an issue name
     # but `branch` is a special case that will parse the current git branch
-    if [[ "$action" == "br" ]]; then
+    if [[ "$action" == "branch" ]]; then
       local issue_arg=$(git rev-parse --abbrev-ref HEAD)
       local issue="${jira_prefix}${issue_arg}"
     else
-- 
cgit v1.2.3-70-g09d2


From 0cec4626219bfd5a163986ebe3745fc31b593446 Mon Sep 17 00:00:00 2001
From: Lauri Lavanti <laurilavanti@gmail.com>
Date: Sun, 18 Mar 2018 23:10:58 +0200
Subject: Add docker-compose start alias 'dcstart' (#6675)

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

(limited to 'plugins')

diff --git a/plugins/docker-compose/docker-compose.plugin.zsh b/plugins/docker-compose/docker-compose.plugin.zsh
index d69769010..24bea318b 100644
--- a/plugins/docker-compose/docker-compose.plugin.zsh
+++ b/plugins/docker-compose/docker-compose.plugin.zsh
@@ -22,3 +22,4 @@ alias dcdn='docker-compose down'
 alias dcl='docker-compose logs'
 alias dclf='docker-compose logs -f'
 alias dcpull='docker-compose pull'
+alias dcstart='docker-compose start'
-- 
cgit v1.2.3-70-g09d2


From 132bffcbe164bc3b60208215ddea5bd405605f2b Mon Sep 17 00:00:00 2001
From: Zopanix <zopanix@gmail.com>
Date: Mon, 26 Mar 2018 21:04:27 -0400
Subject: Added a myissues option

This will allow the user to directly open the my open issues page. This
will make it easier  for the user to open his open issues in jira.
---
 plugins/jira/jira.plugin.zsh | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'plugins')

diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh
index 052481a60..e03bda90e 100644
--- a/plugins/jira/jira.plugin.zsh
+++ b/plugins/jira/jira.plugin.zsh
@@ -44,6 +44,9 @@ function jira() {
     open_command "${jira_url}/secure/CreateIssue!default.jspa"
   elif [[ "$action" == "assigned" || "$action" == "reported" ]]; then
     _jira_query $@
+  elif [[ "$action" == "myissues" ]]; then
+    echo "Opening my issues"
+    open_command "${jira_url}/issues/?filter=-1"
   elif [[ "$action" == "dashboard" ]]; then
     echo "Opening dashboard"
     if [[ "$JIRA_RAPID_BOARD" == "true" ]]; then
-- 
cgit v1.2.3-70-g09d2


From afb028763cf40fc339e49011b2cba124dc108fcb Mon Sep 17 00:00:00 2001
From: Zopanix <zopanix@gmail.com>
Date: Tue, 27 Mar 2018 09:16:43 -0400
Subject: MOdified README to reflect changes for myissues command

---
 plugins/jira/README.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins')

diff --git a/plugins/jira/README.md b/plugins/jira/README.md
index a934ae68c..091dccb97 100644
--- a/plugins/jira/README.md
+++ b/plugins/jira/README.md
@@ -21,6 +21,7 @@ jira new        # opens a new issue
 jira dashboard  # opens your JIRA dashboard
 jira reported [username]  # queries for issues reported by a user
 jira assigned [username]  # queries for issues assigned to a user
+jira myissues   # queries for you own issues
 jira branch     # opens an existing issue matching the current branch name
 jira ABC-123    # opens an existing issue
 jira ABC-123 m  # opens an existing issue for adding a comment
-- 
cgit v1.2.3-70-g09d2


From 9b1c21a409beb349d97fe4e9b9a0a9302ce68c9a Mon Sep 17 00:00:00 2001
From: fREW Schmidt <github@frew.co>
Date: Mon, 2 Apr 2018 04:43:41 -0700
Subject: Get rid of some silly copy pasta (#3187)

Said gem instead of vagrant
---
 plugins/vagrant/_vagrant | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/vagrant/_vagrant b/plugins/vagrant/_vagrant
index c5335e72e..a32347daa 100644
--- a/plugins/vagrant/_vagrant
+++ b/plugins/vagrant/_vagrant
@@ -81,7 +81,7 @@ __vagrant-box ()
 
    case $state in
        (command)
-           _describe -t commands "gem subcommand" _box_arguments
+           _describe -t commands "vagrant subcommand" _box_arguments
            return
        ;;
 
@@ -110,7 +110,7 @@ _arguments -C \
 
 case $state in
   (command)
-      _describe -t commands "gem subcommand" _1st_arguments
+      _describe -t commands "vagrant subcommand" _1st_arguments
       return
   ;;
 
-- 
cgit v1.2.3-70-g09d2


From 62b8a70a7c5d0c939d8dabfef48796a092d1a55f Mon Sep 17 00:00:00 2001
From: Jean-Benoit Griesner <33450151+jbgriesner@users.noreply.github.com>
Date: Fri, 6 Apr 2018 19:09:00 +0200
Subject: Add Qwant engine - web_search plugin (#6701)

Co-authored-by: Maxime AURIAU <maxime.auriau@dnd.fr>
---
 plugins/web-search/web-search.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'plugins')

diff --git a/plugins/web-search/web-search.plugin.zsh b/plugins/web-search/web-search.plugin.zsh
index cc970e5fd..863384223 100644
--- a/plugins/web-search/web-search.plugin.zsh
+++ b/plugins/web-search/web-search.plugin.zsh
@@ -16,6 +16,7 @@ function web_search() {
     baidu       "https://www.baidu.com/s?wd="
     ecosia      "https://www.ecosia.org/search?q="
     goodreads   "https://www.goodreads.com/search?q="
+    qwant       "https://www.qwant.com/?q="
   )
 
   # check whether the search engine is supported
@@ -49,6 +50,7 @@ alias github='web_search github'
 alias baidu='web_search baidu'
 alias ecosia='web_search ecosia'
 alias goodreads='web_search goodreads'
+alias qwant='web_search qwant'
 
 #add your own !bang searches here
 alias wiki='web_search duckduckgo \!w'
-- 
cgit v1.2.3-70-g09d2


From 2aa2ea744eff2322b1fc2a31be556d95dda83797 Mon Sep 17 00:00:00 2001
From: Eric Hudon <ehudon@users.noreply.github.com>
Date: Sun, 15 Apr 2018 07:17:23 -0400
Subject: Change the br argument to branch to follow PR #6678. (#6680)

---
 plugins/jira/_jira | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/jira/_jira b/plugins/jira/_jira
index 890f97f4c..d64614233 100644
--- a/plugins/jira/_jira
+++ b/plugins/jira/_jira
@@ -7,7 +7,7 @@ _1st_arguments=(
   'dashboard:open the dashboard'
   'reported:search for issues reported by a user'
   'assigned:search for issues assigned to a user'
-  'br:open the issue named after the git branch of the current directory'
+  'branch:open the issue named after the git branch of the current directory'
   'dumpconfig:display effective jira configuration'
 )
 
-- 
cgit v1.2.3-70-g09d2


From 15d051c32b1b11d37b38c5f3e7a1491c4d859db0 Mon Sep 17 00:00:00 2001
From: Franz König <Arlon1@users.noreply.github.com>
Date: Sun, 15 Apr 2018 11:38:25 +0000
Subject: hotfix for archlinux.plugin.zsh (#5909)

Co-authored-by: dalu <2694548+dalu@users.noreply.github.com>
---
 plugins/archlinux/archlinux.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
index 0fab1252b..81e7a6688 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -83,7 +83,7 @@ alias pacmir='sudo pacman -Syy'
 alias paclsorphans='sudo pacman -Qdt'
 alias pacrmorphans='sudo pacman -Rs $(pacman -Qtdq)'
 alias pacfileupg='sudo pacman -Fy'
-alias pacfiles='pacman tFs'
+alias pacfiles='pacman -Fs'
 
 
 if (( $+commands[abs] && $+commands[aur] )); then
-- 
cgit v1.2.3-70-g09d2


From 30a5124f9d087ca7184c9ccf797a2e1dcfe79845 Mon Sep 17 00:00:00 2001
From: Arthur Brainville <ybalrid@ybalrid.info>
Date: Sun, 15 Apr 2018 14:47:08 +0200
Subject: Added trizen to the archlinux plugin (#6650)

* Added trizen to the archlinux plugin

trizen is the recomended solution for using the Arch User Repository.
both yaourt and pacaur have some issues.

Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>

* Add trizen aliases to the readme

Also fixed inconsistency in formatting on readme file.
(also added myself in the contributor list)
---
 plugins/archlinux/README.md            | 28 ++++++++++++++++++++++++++-
 plugins/archlinux/archlinux.plugin.zsh | 35 +++++++++++++++++++++++++++++++++-
 2 files changed, 61 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/archlinux/README.md b/plugins/archlinux/README.md
index e408db13d..a249ad62b 100644
--- a/plugins/archlinux/README.md
+++ b/plugins/archlinux/README.md
@@ -2,6 +2,31 @@
 
 ## Features
 
+#### TRIZEN
+
+| Alias   | Command                            | Description                                                         |
+|---------|------------------------------------|---------------------------------------------------------------------|
+| trconf  | trizen -C                          | Fix all configuration files with vimdiff                            |
+| trin    | trizen -S                          | Install packages from the repositories                              |
+| trins   | trizen -U                          | Install a package from a local file                                 |
+| trinsd  | trizen -S --asdeps                 | Install packages as dependencies of another package                 |
+| trloc   | trizen -Qi                         | Display information about a package in the local database           |
+| trlocs  | trizen -Qs                         | Search for packages in the local database                           |
+| trlst   | trizen -Qe                         | List installed packages including from AUR (tagged as "local")      |
+| trmir   | trizen -Syy                        | Force refresh of all package lists after updating mirrorlist        |
+| trorph  | trizen -Qtd                        | Remove orphans using yaourt                                         |
+| trre    | trizen -R                          | Remove packages, keeping its settings and dependencies              |
+| trrem   | trizen -Rns                        | Remove packages, including its settings and unneeded dependencies   |
+| trrep   | trizen -Si                         | Display information about a package in the repositories             |
+| trreps  | trizen -Ss                         | Search for packages in the repositories                             |
+| trupd   | trizen -Sy && sudo abs && sudo aur | Update and refresh local package, ABS and AUR databases             |
+| trupd   | trizen -Sy && sudo abs             | Update and refresh the local package and ABS databases              |
+| trupd   | trizen -Sy && sudo aur             | Update and refresh the local package and AUR databases              |
+| trupd   | trizen -Sy                         | Update and refresh the local package database                       |
+| trupd   | trizen -Syua                       | Sync with repositories before upgrading all packages (from AUR too) |
+| trsu    | trizen -Syua --no-confirm          | Same as `trupg`, but without confirmation                           |
+| upgrade | trizen -Syu                        | Sync with repositories before upgrading packages                    |
+
 #### YAOURT
 
 | Alias   | Command                            | Description                                                         |
@@ -27,7 +52,7 @@
 | yasu    | yaourt -Syua --no-confirm          | Same as `yaupg`, but without confirmation                           |
 | upgrade | yaourt -Syu                        | Sync with repositories before upgrading packages                    |
 
-### PACAUR
+#### PACAUR
 
 | Alias   | Command                            | Description                                                         |
 |---------|------------------------------------|---------------------------------------------------------------------|
@@ -95,3 +120,4 @@
 - ornicar - thibault.duplessis@gmail.com
 - Juraj Fiala - doctorjellyface@riseup.net
 - Majora320 (Moses Miller) - Majora320@gmail.com
+- Ybalrid (Arthur Brainville) - ybalrid@ybalrid.info
diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
index 81e7a6688..9172aaa70 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -1,3 +1,32 @@
+if (( $+commands[trizen] )); then
+  alias trconf='trizen -C'
+  alias trupg='trizen -Syua'
+  alias trsu='trizen -Syua --noconfirm'
+  alias trin='trizen -S'
+  alias trins='trizen -U'
+  alias trre='trizen -R'
+  alias trrem='trizen -Rns'
+  alias trrep='trizen -Si'
+  alias trreps='trizen -Ss'
+  alias trloc='trizen -Qi'
+  alias trlocs='trizen -Qs'
+  alias trlst='trizen -Qe'
+  alias trorph='trizen -Qtd'
+  alias trinsd='trizen -S --asdeps'
+  alias trmir='trizen -Syy'
+
+
+  if (( $+commands[abs] && $+commands[aur] )); then
+    alias trupd='trizen -Sy && sudo abs && sudo aur'
+  elif (( $+commands[abs] )); then
+    alias trupd='trizen -Sy && sudo abs'
+  elif (( $+commands[aur] )); then
+    alias trupd='trizen -Sy && sudo aur'
+  else
+    alias trupd='trizen -Sy'
+  fi
+fi
+
 if (( $+commands[yaourt] )); then
   alias yaconf='yaourt -C'
   alias yaupg='yaourt -Syua'
@@ -54,7 +83,11 @@ if (( $+commands[pacaur] )); then
   fi
 fi
 
-if (( $+commands[pacaur] )); then
+if (( $+commands[trizen] )); then
+  upgrade() {
+    trizen -Syu
+  }
+elif (( $+commands[pacaur] )); then
   upgrade() {
     pacaur -Syu
   }
-- 
cgit v1.2.3-70-g09d2


From 88d21fea6c0d90e58f221f9a2320ba7b73dac97a Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Sun, 15 Apr 2018 15:16:44 +0200
Subject: Improve emotty plugin (#5999)

* The display_emotty function show the name of the displayed emotty set

* Unless an emotty set was given show the emotty set configured
  in $emotty_set
---
 plugins/emotty/emotty.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/emotty/emotty.plugin.zsh b/plugins/emotty/emotty.plugin.zsh
index b32dd1a4c..6a8bf6127 100644
--- a/plugins/emotty/emotty.plugin.zsh
+++ b/plugins/emotty/emotty.plugin.zsh
@@ -32,7 +32,8 @@ function emotty() {
 }
 
 function display_emotty() {
-  local name=$1
+  local name=${1:-$emotty_set}
+  echo $name
   for i in ${=_emotty_sets[$name]}; do
     printf "${emoji[$i]}${emoji2[emoji_style]}  "
   done
-- 
cgit v1.2.3-70-g09d2


From aa5279f2dc2502d13ae0e7d2fa8647db833e31f1 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sun, 15 Apr 2018 15:20:26 +0200
Subject: Fix typo that resulted in math error (#6731)

[emotty] fix typo that resulted in math error
---
 plugins/emotty/emotty.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/emotty/emotty.plugin.zsh b/plugins/emotty/emotty.plugin.zsh
index 6a8bf6127..b0d24c322 100644
--- a/plugins/emotty/emotty.plugin.zsh
+++ b/plugins/emotty/emotty.plugin.zsh
@@ -26,7 +26,7 @@ function emotty() {
   # Use emotty set defined by user, fallback to default
   local emotty=${_emotty_sets[${emotty_set:-$emotty_default_set}]}
   # Parse $TTY number, normalizing it to an emotty set index
-  (( tty = (${TTY##/dev/ttys} % ${#${=emotty}}) + 1 ))
+  (( tty = (${TTY##/dev/tty} % ${#${=emotty}}) + 1 ))
   local character_name=${${=emotty}[tty]}
   echo "${emoji[${character_name}]}${emoji2[emoji_style]}"
 }
-- 
cgit v1.2.3-70-g09d2


From 2fce6a0faf4e9c2c44521cd51ff8c88f11346e02 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sun, 15 Apr 2018 15:53:43 +0200
Subject: [archlinux] Fix function syntax to avoid clashes with aliases

See https://bugs.debian.org/871816

Fixes #6592
---
 plugins/archlinux/archlinux.plugin.zsh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'plugins')

diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
index 9172aaa70..79cc6ed11 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -84,19 +84,19 @@ if (( $+commands[pacaur] )); then
 fi
 
 if (( $+commands[trizen] )); then
-  upgrade() {
+  function upgrade() {
     trizen -Syu
   }
 elif (( $+commands[pacaur] )); then
-  upgrade() {
+  function upgrade() {
     pacaur -Syu
   }
 elif (( $+commands[yaourt] )); then
-  upgrade() {
+  function upgrade() {
     yaourt -Syu
   }
 else
-  upgrade() {
+  function upgrade() {
     sudo pacman -Syu
   }
 fi
@@ -129,13 +129,13 @@ else
   alias pacupd='sudo pacman -Sy'
 fi
 
-paclist() {
+function paclist() {
   # Source: https://bbs.archlinux.org/viewtopic.php?id=93683
   LC_ALL=C pacman -Qei $(pacman -Qu | cut -d " " -f 1) | \
     awk 'BEGIN {FS=":"} /^Name/{printf("\033[1;36m%s\033[1;37m", $2)} /^Description/{print $2}'
 }
 
-pacdisowned() {
+function pacdisowned() {
   emulate -L zsh
 
   tmp=${TMPDIR-/tmp}/pacman-disowned-$UID-$$
@@ -153,14 +153,14 @@ pacdisowned() {
   comm -23 "$fs" "$db"
 }
 
-pacmanallkeys() {
+function pacmanallkeys() {
   emulate -L zsh
   curl -s https://www.archlinux.org/people/{developers,trustedusers}/ | \
     awk -F\" '(/pgp.mit.edu/) { sub(/.*search=0x/,""); print $1}' | \
     xargs sudo pacman-key --recv-keys
 }
 
-pacmansignkeys() {
+function pacmansignkeys() {
   emulate -L zsh
   for key in $*; do
     sudo pacman-key --recv-keys $key
-- 
cgit v1.2.3-70-g09d2


From dc57d1881bfddf68d6be32375233c4c9c0e6793c Mon Sep 17 00:00:00 2001
From: Philippe Proulx <eeppeliteloop@gmail.com>
Date: Sun, 15 Apr 2018 19:13:39 +0200
Subject: plugins/archlinux: add pacls, pacown, pacweb

---
 plugins/archlinux/archlinux.plugin.zsh | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'plugins')

diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
index 79cc6ed11..ae80eb9f0 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -117,6 +117,8 @@ alias paclsorphans='sudo pacman -Qdt'
 alias pacrmorphans='sudo pacman -Rs $(pacman -Qtdq)'
 alias pacfileupg='sudo pacman -Fy'
 alias pacfiles='pacman -Fs'
+alias pacls='pacman -Ql'
+alias pacown='pacman -Qo'
 
 
 if (( $+commands[abs] && $+commands[aur] )); then
@@ -169,3 +171,16 @@ function pacmansignkeys() {
       --no-permission-warning --command-fd 0 --edit-key $key
   done
 }
+
+if (( $+commands[xdg-open] )); then
+  function pacweb() {
+    pkg="$1"
+    infos="$(pacman -Si "$pkg")"
+    if [[ -z "$infos" ]]; then
+      return
+    fi
+    repo="$(grep '^Repo' <<< "$infos" | grep -oP '[^ ]+$')"
+    arch="$(grep '^Arch' <<< "$infos" | grep -oP '[^ ]+$')"
+    xdg-open "https://www.archlinux.org/packages/$repo/$arch/$pkg/" &>/dev/null
+  }
+fi
-- 
cgit v1.2.3-70-g09d2


From cfec5d56df0848723c6c34524e979384fbdf2c6b Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sun, 15 Apr 2018 19:18:25 +0200
Subject: [archlinux] add recent aliases and functions to readme

---
 plugins/archlinux/README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/archlinux/README.md b/plugins/archlinux/README.md
index a249ad62b..c3521c523 100644
--- a/plugins/archlinux/README.md
+++ b/plugins/archlinux/README.md
@@ -99,7 +99,9 @@
 | pacupg       | sudo pacman -Syu                        | Sync with repositories before upgrading packages             |
 | upgrade      | sudo pacman -Syu                        | Sync with repositories before upgrading packages             |
 | pacfileupg   | sudo pacman -Fy                         | Download fresh package databases from the server             |
-| pacfiles     | pacman -Fs                              | Search package file names for matching strings.              |
+| pacfiles     | pacman -Fs                              | Search package file names for matching strings               |
+| pacls        | pacman -Ql                              | List files in a package                                      |
+| pacown       | pacman -Qo                              | Show which package owns a file                               |
 
 | Function       | Description                                          |
 |----------------|------------------------------------------------------|
@@ -107,6 +109,7 @@
 | paclist        | List all installed packages with a short description |
 | pacmanallkeys  | Get all keys for developers and trusted users        |
 | pacmansignkeys | Locally trust all keys passed as parameters          |
+| pacweb         | Open the website of an ArchLinux package             |
 
 ---
 
-- 
cgit v1.2.3-70-g09d2


From a8f3b374d89bd8a4b9e61001b0edd8b96a084abf Mon Sep 17 00:00:00 2001
From: Erwan ROUSSEL <erwan.roussel51@gmail.com>
Date: Sun, 15 Apr 2018 19:54:42 +0200
Subject: npm init (#6648)

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

(limited to 'plugins')

diff --git a/plugins/npm/npm.plugin.zsh b/plugins/npm/npm.plugin.zsh
index 014fb55f8..43af35ddb 100644
--- a/plugins/npm/npm.plugin.zsh
+++ b/plugins/npm/npm.plugin.zsh
@@ -51,4 +51,7 @@ alias npmt="npm test"
 alias npmR="npm run"
 
 # Run npm publish 
-alias npmP="npm publish"
\ No newline at end of file
+alias npmP="npm publish"
+
+# Run npm init
+alias npmI="npm init"
-- 
cgit v1.2.3-70-g09d2


From 0bd9e5d85975f7f712f13b6178fba04a8c18d5d6 Mon Sep 17 00:00:00 2001
From: Artem Pyankov <artpyankov@gmail.com>
Date: Sun, 31 Jul 2016 18:58:50 +0500
Subject: Add hanami plugin inspired by rails

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

(limited to 'plugins')

diff --git a/plugins/hanami/hanami.plugin.zsh b/plugins/hanami/hanami.plugin.zsh
new file mode 100644
index 000000000..349c42cae
--- /dev/null
+++ b/plugins/hanami/hanami.plugin.zsh
@@ -0,0 +1,19 @@
+alias -g HED='HANAMI_ENV=development'
+alias -g HEP='HANAMI_ENV=production'
+alias -g HET='HANAMI_ENV=test'
+
+alias hc='hanami console'
+alias hd='hanami destroy'
+alias hg='hanami generate'
+alias hgm='hanami generate migration'
+alias hs='hanami server'
+alias hsp='hanami server -p'
+alias hr='hanami routes'
+alias hdc='hanami db create'
+alias hdd='hanami db drop'
+alias hdp='hanami db prepare'
+alias hda='hanami db apply'
+alias hdv='hanami db version'
+alias hdrs='hdd && hdp'
+alias hdtp='HET hdp'
+alias hrg='hr | grep'
-- 
cgit v1.2.3-70-g09d2


From e64cdc9ec40c4b98b612905cbdc6c86b14dc1fb6 Mon Sep 17 00:00:00 2001
From: Artem Pyankov <artpyankov@gmail.com>
Date: Fri, 19 Aug 2016 01:18:14 +0500
Subject: Add README for hanami plugin

---
 plugins/hanami/README.md | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 plugins/hanami/README.md

(limited to 'plugins')

diff --git a/plugins/hanami/README.md b/plugins/hanami/README.md
new file mode 100644
index 000000000..20e9dd5c4
--- /dev/null
+++ b/plugins/hanami/README.md
@@ -0,0 +1,6 @@
+# Hanami Plugin #
+This plugin adds convinient ways to work with [Hanami](http://hanamirb.org/) via console. It's inspired by Rails plugin, so if you've used it, you'll be like home.
+
+## Usage ##
+For example, type `hc` into your console when you're within Hanami project directory to run application console.
+You can read about available commands [here](http://hanamirb.org/guides/command-line/applications/), almost all of them have shortcut aliases with this plugin.
-- 
cgit v1.2.3-70-g09d2


From 7c62c57b9f23b32685a3ce668b54edd3032456fb Mon Sep 17 00:00:00 2001
From: Artem Pyankov <artpyankov@gmail.com>
Date: Sat, 27 Aug 2016 17:18:12 +0500
Subject: Add table of aliases for hanami plugin

---
 plugins/hanami/README.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'plugins')

diff --git a/plugins/hanami/README.md b/plugins/hanami/README.md
index 20e9dd5c4..81f2431a8 100644
--- a/plugins/hanami/README.md
+++ b/plugins/hanami/README.md
@@ -4,3 +4,26 @@ This plugin adds convinient ways to work with [Hanami](http://hanamirb.org/) via
 ## Usage ##
 For example, type `hc` into your console when you're within Hanami project directory to run application console.
 You can read about available commands [here](http://hanamirb.org/guides/command-line/applications/), almost all of them have shortcut aliases with this plugin.
+
+## Aliases ##
+
+| Alias | Description                              | Command                                        |
+|-------|------------------------------------------|------------------------------------------------|
+| HED | Set environment variable HANAMI_ENV to development | HANAMI_ENV=development |
+| HEP | Set environment variable HANAMI_ENV to production | HANAMI_ENV=production |
+| HET | Set environment variable HANAMI_ENV to test | HANAMI_ENV=test |
+| hc | Run application console | hanami console |
+| hd | Remove specified hanami resource (model, action, migration, etc.) | hanami destroy |
+| hg | Create specified hanami resource (model, action, migration, etc.) | hanami generate | hanami generate |
+| hgm | Create migration file | hanami generate migration |
+| hs | Launch server with hanami application | hanami server |
+| hsp | Launch server with specified port | hanami server -p |
+| hr | List application routes | hanami routes |
+| hdc | Create application database | hanami db create |
+| hdd | Delete application database | hanami db drop |
+| hdp | Create application database, load schema (if any), run pending migrations | hanami db prepare |
+| hda | Run pending migrations, dump schema, delete all migration files | hanami db apply |
+| hdv | Print current database version (timestamp of last applied migration) | hanami db version |
+| hdrs | Drop and recreate application database | hdd && hdp |
+| hdtp | Actualize test environment database | HET hdp |
+| hrg | Grep hanami routes with specified pattern | hr &#124; grep |
-- 
cgit v1.2.3-70-g09d2


From ef9044c7225d62e8e56c494f7aafa7306b7015ad Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sun, 15 Apr 2018 20:25:50 +0200
Subject: Fix styling and format of hanami README

---
 plugins/hanami/README.md | 49 +++++++++++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 23 deletions(-)

(limited to 'plugins')

diff --git a/plugins/hanami/README.md b/plugins/hanami/README.md
index 81f2431a8..ef3451faf 100644
--- a/plugins/hanami/README.md
+++ b/plugins/hanami/README.md
@@ -1,29 +1,32 @@
 # Hanami Plugin #
-This plugin adds convinient ways to work with [Hanami](http://hanamirb.org/) via console. It's inspired by Rails plugin, so if you've used it, you'll be like home.
+This plugin adds convenient ways to work with [Hanami](http://hanamirb.org/) via console.
+It's inspired by Rails plugin, so if you've used it, you'll feel like home.
 
 ## Usage ##
-For example, type `hc` into your console when you're within Hanami project directory to run application console.
-You can read about available commands [here](http://hanamirb.org/guides/command-line/applications/), almost all of them have shortcut aliases with this plugin.
+
+For example, type `hc` into your console when you're within Hanami project directory to run
+the application console. Have a look at available shortcuts below. You can read more about
+these commands [on the official website](http://hanamirb.org/guides/command-line/applications/).
 
 ## Aliases ##
 
-| Alias | Description                              | Command                                        |
-|-------|------------------------------------------|------------------------------------------------|
-| HED | Set environment variable HANAMI_ENV to development | HANAMI_ENV=development |
-| HEP | Set environment variable HANAMI_ENV to production | HANAMI_ENV=production |
-| HET | Set environment variable HANAMI_ENV to test | HANAMI_ENV=test |
-| hc | Run application console | hanami console |
-| hd | Remove specified hanami resource (model, action, migration, etc.) | hanami destroy |
-| hg | Create specified hanami resource (model, action, migration, etc.) | hanami generate | hanami generate |
-| hgm | Create migration file | hanami generate migration |
-| hs | Launch server with hanami application | hanami server |
-| hsp | Launch server with specified port | hanami server -p |
-| hr | List application routes | hanami routes |
-| hdc | Create application database | hanami db create |
-| hdd | Delete application database | hanami db drop |
-| hdp | Create application database, load schema (if any), run pending migrations | hanami db prepare |
-| hda | Run pending migrations, dump schema, delete all migration files | hanami db apply |
-| hdv | Print current database version (timestamp of last applied migration) | hanami db version |
-| hdrs | Drop and recreate application database | hdd && hdp |
-| hdtp | Actualize test environment database | HET hdp |
-| hrg | Grep hanami routes with specified pattern | hr &#124; grep |
+| Alias | Command                   | Description                                             |
+|-------|---------------------------|---------------------------------------------------------|
+| HED   | HANAMI_ENV=development    | Set environment variable HANAMI_ENV to development      |
+| HEP   | HANAMI_ENV=production     | Set environment variable HANAMI_ENV to production       |
+| HET   | HANAMI_ENV=test           | Set environment variable HANAMI_ENV to test             |
+| hc    | hanami console            | Run application console                                 |
+| hd    | hanami destroy            | Remove specified hanami resource                        |
+| hg    | hanami generate           | Create specified hanami resource                        |
+| hgm   | hanami generate migration | Create migration file                                   |
+| hs    | hanami server             | Launch server with hanami application                   |
+| hsp   | hanami server -p          | Launch server with specified port                       |
+| hr    | hanami routes             | List application routes                                 |
+| hdc   | hanami db create          | Create application database                             |
+| hdd   | hanami db drop            | Delete application database                             |
+| hdp   | hanami db prepare         | Prepare database for the current environment            |
+| hda   | hanami db apply           | Recreates a fresh schema after migrations (destructive) |
+| hdv   | hanami db version         | Print current database version                          |
+| hdrs  | hdd && hdp                | Drop and recreate application database                  |
+| hdtp  | HET hdp                   | Actualize test environment database                     |
+| hrg   | hr &#124; grep            | Grep hanami routes with specified pattern               |
-- 
cgit v1.2.3-70-g09d2


From 5c047ae8ba54577f7e7471094bbce375339559ab Mon Sep 17 00:00:00 2001
From: Darius Grigalevicius <6205766+entregrammer@users.noreply.github.com>
Date: Sun, 15 Apr 2018 22:55:47 +0300
Subject: updated symfony plugin to add entity generation and schema update
 aliases (#5042)

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

(limited to 'plugins')

diff --git a/plugins/symfony2/symfony2.plugin.zsh b/plugins/symfony2/symfony2.plugin.zsh
index c2a1affad..0b608fe2a 100644
--- a/plugins/symfony2/symfony2.plugin.zsh
+++ b/plugins/symfony2/symfony2.plugin.zsh
@@ -25,5 +25,7 @@ alias sfcw='sf cache:warmup'
 alias sfroute='sf debug:router'
 alias sfcontainer='sf debug:container'
 alias sfgb='sf generate:bundle'
+alias sfge='sf doctrine:generate:entity'
+alias sfsu='sf doctrine:schema:update'
 alias sfdev='sf --env=dev'
 alias sfprod='sf --env=prod'
-- 
cgit v1.2.3-70-g09d2


From 9a71864288e5fb3898b0764db3e547cf7bb7328c Mon Sep 17 00:00:00 2001
From: Chris Fleming <me@chrisfleming.org>
Date: Sat, 21 Apr 2018 21:26:36 +0100
Subject: Fix gpg-agent plugin checks (#6469)

* Always try and start gpg-agent, with --use-standard-socket it will try and use a standard socket directory. It won't start multiple agents if agent is already running. In addition, XDG_RUNTIME_DIR isn't always set

* ssh socket if broken if --daemon is run again, so onky start if we don't have a socket

* Removed unnecessary allocation of GPG_SSH_AUTH_SOCK
---
 plugins/gpg-agent/gpg-agent.plugin.zsh | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'plugins')

diff --git a/plugins/gpg-agent/gpg-agent.plugin.zsh b/plugins/gpg-agent/gpg-agent.plugin.zsh
index 69e239ccf..6a94f598f 100644
--- a/plugins/gpg-agent/gpg-agent.plugin.zsh
+++ b/plugins/gpg-agent/gpg-agent.plugin.zsh
@@ -1,14 +1,16 @@
-# Enable gpg-agent if it is not running
-GPG_AGENT_SOCKET="${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh"
-if [ ! -S $GPG_AGENT_SOCKET ]; then
-  gpg-agent --daemon >/dev/null 2>&1
-  export GPG_TTY=$(tty)
+# Enable gpg-agent if it is not running-
+# --use-standard-socket will work from version 2 upwards
+
+AGENT_SOCK=`gpgconf --list-dirs | grep agent-socket | cut -d : -f 2`
+
+if [ ! -S ${AGENT_SOCK} ]; then
+  gpg-agent --daemon --use-standard-socket >/dev/null 2>&1
 fi
+export GPG_TTY=$(tty)
 
-# Set SSH to use gpg-agent if it is configured to do so
-GNUPGCONFIG="${GNUPGHOME:-"$HOME/.gnupg"}/gpg-agent.conf"
-if [ -r "$GNUPGCONFIG" ] && grep -q enable-ssh-support "$GNUPGCONFIG"; then
+# Set SSH to use gpg-agent if it's enabled
+if [ -S "${AGENT_SOCK}.ssh" ]; then
+  export SSH_AUTH_SOCK="${AGENT_SOCK}.ssh"
   unset SSH_AGENT_PID
-  export SSH_AUTH_SOCK=$GPG_AGENT_SOCKET
 fi
 
-- 
cgit v1.2.3-70-g09d2


From 9a7c56dcddfd007499bc59560c1de282611f6813 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Wed, 26 Oct 2016 20:04:14 +0200
Subject: zsh_reload: fix code style and indent with tabs

---
 plugins/zsh_reload/zsh_reload.plugin.zsh | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'plugins')

diff --git a/plugins/zsh_reload/zsh_reload.plugin.zsh b/plugins/zsh_reload/zsh_reload.plugin.zsh
index cde9ebeca..e3aed5d7a 100644
--- a/plugins/zsh_reload/zsh_reload.plugin.zsh
+++ b/plugins/zsh_reload/zsh_reload.plugin.zsh
@@ -1,13 +1,11 @@
-# reload zshrc
-function src()
-{
-  local cache=$ZSH_CACHE_DIR
-  autoload -U compinit zrecompile
-  compinit -d "$cache/zcomp-$HOST"
+src() {
+	local cache="$ZSH_CACHE_DIR"
+	autoload -U compinit zrecompile
+	compinit -d "$cache/zcomp-$HOST"
 
-  for f in ~/.zshrc "$cache/zcomp-$HOST"; do
-    zrecompile -p $f && command rm -f $f.zwc.old
-  done
+	for f in ~/.zshrc "$cache/zcomp-$HOST"; do
+		zrecompile -p $f && command rm -f $f.zwc.old
+	done
 
-  source ~/.zshrc
+	source ~/.zshrc
 }
-- 
cgit v1.2.3-70-g09d2


From 8706c8eb64c7eb40fe1acda30404ebc24fdb7f73 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Wed, 26 Oct 2016 20:09:08 +0200
Subject: zsh_reload: ignore insecure compinit files

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

(limited to 'plugins')

diff --git a/plugins/zsh_reload/zsh_reload.plugin.zsh b/plugins/zsh_reload/zsh_reload.plugin.zsh
index e3aed5d7a..b3a0094d1 100644
--- a/plugins/zsh_reload/zsh_reload.plugin.zsh
+++ b/plugins/zsh_reload/zsh_reload.plugin.zsh
@@ -1,7 +1,7 @@
 src() {
 	local cache="$ZSH_CACHE_DIR"
 	autoload -U compinit zrecompile
-	compinit -d "$cache/zcomp-$HOST"
+	compinit -i -d "$cache/zcomp-$HOST"
 
 	for f in ~/.zshrc "$cache/zcomp-$HOST"; do
 		zrecompile -p $f && command rm -f $f.zwc.old
-- 
cgit v1.2.3-70-g09d2


From 405b8f220abe35eabc408566d7c4442a3a8149db Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Wed, 26 Oct 2016 20:05:57 +0200
Subject: zsh_reload: use `exec zsh` instead of `source ~/.zshrc`

`source ~/.zshrc` is a bad practice, it doesn't make sure that the full
zsh session is reloaded and it may have side effects.

Use `$SHELL` as the path to zsh if it exists (this will fix edge cases
where the zsh used is not the first on $PATH). Otherwise, use `zsh`.
---
 plugins/zsh_reload/zsh_reload.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/zsh_reload/zsh_reload.plugin.zsh b/plugins/zsh_reload/zsh_reload.plugin.zsh
index b3a0094d1..51048ba9d 100644
--- a/plugins/zsh_reload/zsh_reload.plugin.zsh
+++ b/plugins/zsh_reload/zsh_reload.plugin.zsh
@@ -7,5 +7,6 @@ src() {
 		zrecompile -p $f && command rm -f $f.zwc.old
 	done
 
-	source ~/.zshrc
+	# Use $SHELL if available; remove leading dash if login shell
+	[[ -n "$SHELL" ]] && exec ${SHELL#-} || exec zsh
 }
-- 
cgit v1.2.3-70-g09d2


From fbbe902c38549dae8c8e997daeebcc797103ab7c Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Wed, 2 Nov 2016 10:16:59 +0100
Subject: zsh_reload: add README

---
 plugins/zsh_reload/README.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 plugins/zsh_reload/README.md

(limited to 'plugins')

diff --git a/plugins/zsh_reload/README.md b/plugins/zsh_reload/README.md
new file mode 100644
index 000000000..d31a827fe
--- /dev/null
+++ b/plugins/zsh_reload/README.md
@@ -0,0 +1,23 @@
+# zsh_reload plugin
+
+The zsh_reload plugin defines a function to reload the zsh session with
+just a few keystrokes.
+
+To use it, add `zsh_reload` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... zsh_reload)
+```
+
+## Usage
+
+To reload the zsh session, just run `src`:
+
+```zsh
+$ vim ~/.zshrc  # enabled a plugin
+$ src
+re-compiling /home/user/.zshrc.zwc: succeeded
+re-compiling /home/user/.oh-my-zsh/cache/zcomp-host.zwc: succeeded
+
+# you now have a fresh zsh session. happy hacking!
+```
-- 
cgit v1.2.3-70-g09d2


From ef68878b22398ea410ca2c19c770bce88aa967fc Mon Sep 17 00:00:00 2001
From: Andrew Janke <janke@taran.local>
Date: Thu, 26 Feb 2015 19:13:36 -0500
Subject: Rebuild the chucknorris fortune file with a scrapper, using 20 pages
 worth
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

NOTE: The scrapper was previously included, but due to the website it scrapped
being dead it's no longer useful. See #3642 for the code.

Co-authored-by: Marc Cornellà <marc.cornella@live.com>
---
 plugins/chucknorris/fortunes/chucknorris | 2545 ++++++++++++++++++++++++------
 1 file changed, 2091 insertions(+), 454 deletions(-)

(limited to 'plugins')

diff --git a/plugins/chucknorris/fortunes/chucknorris b/plugins/chucknorris/fortunes/chucknorris
index e705d1c13..2a13b060f 100644
--- a/plugins/chucknorris/fortunes/chucknorris
+++ b/plugins/chucknorris/fortunes/chucknorris
@@ -1,907 +1,2544 @@
-Chuck Norris' tears cure cancer. Too bad he has never cried. Ever. 
+When the Boogeyman goes to sleep every night, he checks his closet for Chuck Norris.
 %
-Chuck Norris does not sleep. He waits. 
+Chuck Norris doesn't read books. He stares them down until he gets the information he wants.
 %
-Chuck Norris is currently suing NBC, claiming Law and Order are trademarked names for his left and right legs. 
+There is no theory of evolution. Just a list of creatures Chuck Norris has allowed to live.
 %
-The chief export of Chuck Norris is pain. 
+Outer space exists because it's afraid to be on the same planet with Chuck Norris.
 %
-If you can see Chuck Norris, he can see you. If you can't see Chuck Norris, you may be only seconds away from death. 
+Chuck Norris does not sleep. He waits.
 %
-Chuck Norris has counted to infinity. Twice. 
+Chuck Norris is currently suing NBC, claiming Law and Order are trademarked names for his left and right legs.
 %
-Chuck Norris does not hunt because the word hunting implies the probability of failure. Chuck Norris goes killing. 
+Chuck Norris is the reason why Waldo is hiding.
 %
-Chuck Norris' blood type is AK+. Ass-Kicking Positive. It is compatible only with heavy construction equipment, tanks, and fighter jets. 
+Chuck Norris counted to infinity - twice.
 %
-Chuck Norris is 1/8th Cherokee. This has nothing to do with ancestry, the man ate a fucking Indian. 
+There is no chin behind Chuck Norris’ beard. There is only another fist.
 %
-In fine print on the last page of the Guinness Book of World Records it notes that all world records are held by Chuck Norris, and those listed in the book are simply the closest anyone else has ever gotten. 
+In fine print on the last page of the Guinness Book of World Records it notes that all world records are held by Chuck Norris, and those listed in the book are simply the closest anyone else has ever gotten.
 %
 There is no chin behind Chuck Norris' beard. There is only another fist.
 %
-Chuck Norris does not teabag the ladies. He potato-sacks them. 
+Chuck Norris does not teabag the ladies. He potato-sacks them.
 %
-Pluto is actually an orbiting group of British soldiers from the American Revolution who entered space after the Chuck gave them a roundhouse kick to the face. 
+Pluto is actually an orbiting group of British soldiers from the American Revolution who entered space after the Chuck gave them a roundhouse kick to the face.
 %
-When Chuck Norris goes to donate blood, he declines the syringe, and instead requests a hand gun and a bucket. 
+When Chuck Norris does a pushup, he isn't lifting himself up, he's pushing the Earth down.
 %
-There are no steroids in baseball. Just players Chuck Norris has breathed on. 
+Chuck Norris is so fast, he can run around the world and punch himself in the back of the head.
 %
-Chuck Norris once challenged Lance Armstrong in a "Who has more testicles?" contest. Chuck Norris won by 5. 
+Chuck Norris' hand is the only hand that can beat a Royal Flush.
 %
-Chuck Norris was the fourth wise man, who gave baby Jesus the gift of beard, which he carried with him until he died. The other three wise men were enraged by the preference that Jesus showed to Chuck's gift, and arranged to have him written out of the bible. All three died soon after of mysterious roundhouse-kick related injuries. 
+Chuck Norris can lead a horse to water AND make it drink.
 %
-Chuck Norris sheds his skin twice a year. 
+Chuck Norris doesn’t wear a watch. HE decides what time it is.
 %
-When Chuck Norris calls 1-900 numbers, he doesnt get charged. He holds up the phone and money falls out. 
+Chuck Norris can slam a revolving door.
 %
-Chuck Norris once ate a whole cake before his friends could tell him there was a stripper in it. 
+Chuck Norris does not get frostbite. Chuck Norris bites frost.
 %
-Some people like to eat frogs' legs. Chuck Norris likes to eat lizard legs. Hence, snakes. 
+Remember the Soviet Union? They decided to quit after watching a DeltaForce marathon on Satellite TV.
 %
-There are no races, only countries of people Chuck Norris has beaten to different shades of black and blue. 
+Contrary to popular belief, America is not a democracy, it is a Chucktatorship.
 %
-When Chuck Norris was denied an Egg McMuffin at McDonald's because it was 10:35, he roundhouse kicked the store so hard it became a Wendy's. 
+If you spell Chuck Norris in Scrabble, you win. Forever.
 %
-Chuck Norris can't finish a "color by numbers" because his markers are filled with the blood of his victims. Unfortunately, all blood is dark red. 
+Guns don't kill people. Chuck Norris kills people.
 %
-A Chuck Norris-delivered Roundhouse Kick is the preferred method of execution in 16 states. 
+There is no theory of evolution. Just a list of animals Chuck Norris allows to live.
 %
-When Chuck Norris falls in water, Chuck Norris doesn't get wet. Water gets Chuck Norris. 
+The chief export of Chuck Norris is Pain.
 %
-Scientists have estimated that the energy given off during the Big Bang is roughly equal to 1CNRhK (Chuck Norris Roundhouse Kick) 
+Chuck Norris has two speeds. Walk, and Kill.
 %
-Chuck Norris' house has no doors, only walls that he walks through. 
+The leading causes of death in the United States are: 1. Heart Disease 2. Chuck Norris 3. Cancer.
 %
-When Chuck Norris has sex with a man, it won't be because he is gay. It will be because he has run out of women. 
+Chuck Norris drives an ice cream truck covered in human skulls.
 %
-How much wood would a woodchuck chuck if a woodchuck could Chuck Norris? ...All of it. 
+Chuck Norris is my Homeboy.
 %
-Chuck Norris doesn't actually write books, the words assemble themselves out of fear. 
+Chuck Norris doesn't go hunting.... CHUCK NORRIS GOES KILLING.
 %
-In honor of Chuck Norris, all McDonald's in Texas have an even larger size than the super-size. When ordering, just ask to be "Norrisized". 
+Chuck Norris uses pepper spray to spice up his steaks.
 %
-Chuck Norris CAN believe it's not butter. 
+Chuck Norris once roundhouse kicked someone so hard that his foot broke the speed of light, went back in time, and killed Amelia Earhart while she was flying over the Pacific Ocean.
 %
-If tapped, a Chuck Norris roundhouse kick could power the country of Australia for 44 minutes. 
+Crop circles are Chuck Norris' way of telling the world that sometimes corn needs to lie down.
 %
-Chuck Norris can divide by zero. 
+Chuck Norris is ten feet tall, weighs two-tons, breathes fire, and could eat a hammer and take a shotgun blast standing.
 %
-The grass is always greener on the other side, unless Chuck Norris has been there. In that case the grass is most likely soaked in blood and tears. 
+The Great Wall of China was originally created to keep Chuck Norris out. It failed miserably.
 %
-A picture is worth a thousand words. A Chuck Norris is worth 1 billion words. 
+Contrary to popular belief, Chuck Norris, not the box jellyfish of northern Australia, is the most venomous creature on earth.
 %
-Newton's Third Law is wrong: Although it states that for each action, there is an equal and opposite reaction, there is no force equal in reaction to a Chuck Norris roundhouse kick. 
+Most people have 23 pairs of chromosomes. Chuck Norris has 72... and they're all poisonous.
 %
-Chuck Norris invented his own type of karate. It's called Chuck-Will-Kill. 
+If you ask Chuck Norris what time it is, he always says, "Two seconds 'til." After you ask, "Two seconds 'til what?" he roundhouse kicks you in the face.
 %
-When an episode of Walker Texas Ranger was aired in France, the French surrendered to Chuck Norris just to be on the safe side. 
+When Chuck Norris sends in his taxes, he sends blank forms and includes only a picture of himself, crouched and ready to attack. Chuck Norris has not had to pay taxes, ever.
 %
-While urinating, Chuck Norris is easily capable of welding titanium. 
+The quickest way to a man's heart is with Chuck Norris' fist.
 %
-Chuck Norris once sued the Houghton-Mifflin textbook company when it became apparent that their account of the war of 1812 was plagiarized from his autobiography. 
+Chuck Norris invented Kentucky Fried Chicken's famous secret recipe, with eleven herbs and spices. But nobody ever mentions the twelfth ingredient: Fear.
 %
-When Chuck Norris talks, everybody listens. And dies. 
+CNN was originally created as the "Chuck Norris Network" to update Americans with on-the-spot ass kicking in real-time.
 %
-When Steven Seagal kills a ninja, he only takes its hide. When Chuck Norris kills a ninja, he uses every part. 
+Chuck Norris can win a game of Connect Four in only three moves.
 %
-Wilt Chamberlain claims to have slept with more than 20,000 women in his lifetime. Chuck Norris calls this "a slow Tuesday." 
+What was going through the minds of all of Chuck Norris' victims before they died? His shoe.
 %
-Contrary to popular belief, there is indeed enough Chuck Norris to go around. 
+Chuck Norris is the only man to ever defeat a brick wall in a game of tennis.
 %
-Chuck Norris doesnt shave; he kicks himself in the face. The only thing that can cut Chuck Norris is Chuck Norris. 
+Police label anyone attacking Chuck Norris as a Code 45-11.... a suicide.
 %
-For some, the left testicle is larger than the right one. For Chuck Norris, each testicle is larger than the other one. 
+Chuck Norris doesn't churn butter. He roundhouse kicks the cows and the butter comes straight out.
 %
-Chuck Norris always knows the EXACT location of Carmen SanDiego. 
+Chuck Norris doesn’t wash his clothes, he disembowels them.
 %
-When taking the SAT, write "Chuck Norris" for every answer. You will score over 8000. 
+A Handicapped parking sign does not signify that this spot is for handicapped people. It is actually in fact a warning, that the spot belongs to Chuck Norris and that you will be handicapped if you park there.
 %
-Chuck Norris invented black. In fact, he invented the entire spectrum of visible light. Except pink. Tom Cruise invented pink. 
+Chuck Norris will attain statehood in 2009. His state flower will be the Magnolia.
 %
-When you're Chuck Norris, anything + anything is equal to 1. One roundhouse kick to the face. 
+Someone once videotaped Chuck Norris getting pissed off. It was called Walker: Texas Chain Saw Massacre.
 %
-Chuck Norris has the greatest Poker-Face of all time. He won the 1983 World Series of Poker, despite holding only a Joker, a Get out of Jail Free Monopoloy card, a 2 of clubs, 7 of spades and a green #4 card from the game UNO. 
+Chuck Norris originally appeared in the "Street Fighter II" video game, but was removed by Beta Testers because every button caused him to do a roundhouse kick. When asked bout this "glitch," Norris replied, "That's no glitch."
 %
-On his birthday, Chuck Norris randomly selects one lucky child to be thrown into the sun. 
+Fool me once, shame on you. Fool Chuck Norris once and he will roundhouse you in the face.
 %
-Nobody doesn't like Sara Lee. Except Chuck Norris. 
+Chuck Norris can win in a top spinning tournament with a cube
 %
-Chuck Norris doesn't throw up if he drinks too much. Chuck Norris throws down! 
+Beware of dogs... Dogs, beware of Chuck Norris.
 %
-In the beginning there was nothing...then Chuck Norris Roundhouse kicked that nothing in the face and said "Get a job". That is the story of the universe. 
+Chuck Norris can dig a hole in air.
 %
-Chuck Norris has 12 moons. One of those moons is the Earth. 
+The apple falls far from the tree, when a roundhouse kick is taken to the trunk.
 %
-Chuck Norris grinds his coffee with his teeth and boils the water with his own rage. 
+Chuck Norris - the new standard.
 %
-Archeologists unearthed an old english dictionary dating back to the year 1236. It defined "victim" as "one who has encountered Chuck Norris" 
+Chuck Norris told me to put this here.
 %
-Chuck Norris ordered a Big Mac at Burger King, and got one. 
+Chuck Norris doesn't exhale. The air runs desperately scared out of his lungs.
 %
-Chuck Norris and Mr. T walked into a bar. The bar was instantly destroyed, as that level of awesome cannot be contained in one building. 
+Fear of spiders is aracnaphobia, fear of tight spaces is chlaustraphobia, fear of Chuck Norris is called Logic
 %
-If you Google search "Chuck Norris getting his ass kicked" you will generate zero results. It just doesn't happen. 
+When Chuck Norris goes to rodeos, bulls ride him.
 %
-Chuck Norris can drink an entire gallon of milk in thirty-seven seconds. 
+Chuck Norris once walked down a street with his fists in his pockets. He was then arrested for concealing two deadly weapons.
 %
-Little known medical fact: Chuck Norris invented the Caesarean section when he roundhouse-kicked his way out of his monther's womb. 
+The meaning of life is Chuck Norris
 %
-Chuck Norris doesn't bowl strikes, he just knocks down one pin and the other nine faint. 
+Chuck Norris is the meaning of life. Too bad he's also the meaning of death.
 %
-The show Survivor had the original premise of putting people on an island with Chuck Norris. There were no survivors, and nobody is brave enough to go to the island to retrieve the footage. 
+If God doesn't know, Chuck does
 %
-It takes Chuck Norris 20 minutes to watch 60 Minutes. 
+Chuck Norris doesn't bowl strikes, he just knocks down one pin and the other nine faint.
 %
-You know how they say if you die in your dream then you will die in real life? In actuality, if you dream of death then Chuck Norris will find you and kill you. 
+The show Survivor had the original premise of putting people on an island with Chuck Norris. There were no survivors, and nobody is brave enough to go to the island to retrieve the footage.
 %
-Chuck Norris has a deep and abiding respect for human life... unless it gets in his way. 
+When the Boogeyman goes to sleep every night, he checks his closet for Chuck Norris.
 %
-The Bermuda Triangle used to be the Bermuda Square, until Chuck Norris Roundhouse kicked one of the corners off. 
+Chuck Norris doesn't read books. He stares them down until he gets the information he wants.
 %
-There are no weapons of mass destruction in Iraq, Chuck Norris lives in Oklahoma. 
+There is no theory of evolution. Just a list of creatures Chuck Norris has allowed to live.
 %
-Chuck Norris doesn't believe in Germany. 
+Outer space exists because it's afraid to be on the same planet with Chuck Norris.
 %
-When Chuck Norris is in a crowded area, he doesn't walk around people. He walks through them. 
+Chuck Norris does not sleep. He waits.
 %
-Chuck Norris once ate an entire bottle of sleeping pills. They made him blink. 
+Chuck Norris is currently suing NBC, claiming Law and Order are trademarked names for his left and right legs.
 %
-James Cameron wanted Chuck Norris to play the Terminator. However, upon reflection, he realized that would have turned his movie into a documentary, so he went with Arnold Schwarzenegger. 
+Chuck Norris is the reason why Waldo is hiding.
 %
-Chuck Norris can touch MC Hammer. 
+Chuck Norris counted to infinity - twice.
 %
-Thousands of years ago Chuck Norris came across a bear. It was so terrified that it fled north into the arctic. It was also so terrified that all of its decendents now have white hair. 
+There is no chin behind Chuck Norris’ beard. There is only another fist.
 %
-Chuck Norris played Russian Roulette with a fully loaded gun and won. 
+When Chuck Norris does a pushup, he isn't lifting himself up, he's pushing the Earth down.
 %
-It takes 14 puppeteers to make Chuck Norris smile, but only 2 to make him destroy an orphanage. 
+Chuck Norris is so fast, he can run around the world and punch himself in the back of the head.
 %
-Chuck Norris is responsible for China's over-population. He hosted a Karate tournament in Beijing and all women within 1,000 miles became pregnant instantly.
+Chuck Norris' hand is the only hand that can beat a Royal Flush.
 %
-Some people wear Superman pajamas. Superman wears Chuck Norris pajamas. 
+Chuck Norris can lead a horse to water AND make it drink.
 %
-Chuck Norris once worked as a weatherman for the San Diego evening news. Every night he would make the same forecast: Partly cloudy with a 75% chance of Pain. 
+Chuck Norris doesn’t wear a watch. HE decides what time it is.
 %
-Simply by pulling on both ends, Chuck Norris can stretch diamonds back into coal. 
+Chuck Norris can slam a revolving door.
 %
-When Chuck Norris does a pushup, he isn't lifting himself up, he's pushing the Earth down. 
+Chuck Norris does not get frostbite. Chuck Norris bites frost.
 %
-Chuck Norris invented the bolt-action rifle, liquor, sexual intercourse, and football-- in that order. 
+Remember the Soviet Union? They decided to quit after watching a DeltaForce marathon on Satellite TV.
 %
-A high tide means Chuck Norris is flying over your coast. The tide is caused by God pissing his pants. 
+Contrary to popular belief, America is not a democracy, it is a Chucktatorship.
 %
-Chuck Norris keeps his friends close and his enemies closer. Close enough to drop them with one round house kick to the face. 
+If you spell Chuck Norris in Scrabble, you win. Forever.
 %
-There is in fact an "I" in Norris, but there is no "team"? not even close. 
+Guns don't kill people. Chuck Norris kills people.
 %
-Scotty in Star Trek often says "Ye cannae change the laws of physics." This is untrue. Chuck Norris can change the laws of physics. With his fists. 
+There is no theory of evolution. Just a list of animals Chuck Norris allows to live.
 %
-An anagram for Walker Texas Ranger is KARATE WRANGLER SEX. I don't know what that is, but it sounds AWESOME. 
+The chief export of Chuck Norris is Pain.
 %
-Chuck Norris doesn't stub his toes. He accidentally destroys chairs, bedframes, and sidewalks. 
+Chuck Norris has two speeds. Walk, and Kill.
 %
-Using his trademark roundhouse kick, Chuck Norris once made a fieldgoal in RJ Stadium in Tampa Bay from the 50 yard line of Qualcomm stadium in San Diego. 
+The leading causes of death in the United States are: 1. Heart Disease 2. Chuck Norris 3. Cancer.
 %
-Chuck Norris roundhouse kicks don't really kill people. They wipe out their entire existence from the space-time continuum. 
+Chuck Norris drives an ice cream truck covered in human skulls.
 %
-Chuck Norris does not own a stove, oven, or microwave , because revenge is a dish best served cold. 
+Chuck Norris is my Homeboy.
 %
-Tom Clancy has to pay royalties to Chuck Norris because "The Sum of All Fears" is the name of Chuck Norris' autobiography. 
+Chuck Norris doesn't go hunting.... CHUCK NORRIS GOES KILLING.
 %
-Chuck Norris can slam a revolving door. 
+Chuck Norris uses pepper spray to spice up his steaks.
 %
-Chuck Norris is expected to win gold in every swimming competition at the 2008 Beijing Olympics, even though Chuck Norris does not swim. This is because when Chuck Norris enters the water, the water gets out of his way and Chuck Norris simply walks across the pool floor. 
+Chuck Norris once roundhouse kicked someone so hard that his foot broke the speed of light, went back in time, and killed Amelia Earhart while she was flying over the Pacific Ocean.
 %
-Chuck Norris built a better mousetrap, but the world was too frightened to beat a path to his door. 
+Crop circles are Chuck Norris' way of telling the world that sometimes corn needs to lie down.
 %
-The original draft of The Lord of the Rings featured Chuck Norris instead of Frodo Baggins. It was only 5 pages long, as Chuck roundhouse-kicked Sauron's ass halfway through the first chapter. 
+Chuck Norris is ten feet tall, weighs two-tons, breathes fire, and could eat a hammer and take a shotgun blast standing.
 %
-Hellen Keller's favorite color is Chuck Norris. 
+The Great Wall of China was originally created to keep Chuck Norris out. It failed miserably.
 %
-Chuck Norris eats beef jerky and craps gunpowder. Then, he uses that gunpowder to make a bullet, which he uses to kill a cow and make more beef jerky. Some people refer to this as the "Circle of Life." 
+Contrary to popular belief, Chuck Norris, not the box jellyfish of northern Australia, is the most venomous creature on earth.
 %
-If, by some incredible space-time paradox, Chuck Norris would ever fight himself, he'd win. Period. 
+Most people have 23 pairs of chromosomes. Chuck Norris has 72... and they're all poisonous.
 %
-Chuck Norris is currently suing myspace for taking the name of what he calls everything around you. 
+If you ask Chuck Norris what time it is, he always says, "Two seconds 'til." After you ask, "Two seconds 'til what?" he roundhouse kicks you in the face.
 %
-The crossing lights in Chuck Norris's home town say "Die slowly" and "die quickly". They each have a picture of Chuck Norris punching or kicking a pedestrian. 
+When Chuck Norris sends in his taxes, he sends blank forms and includes only a picture of himself, crouched and ready to attack. Chuck Norris has not had to pay taxes, ever.
 %
-Science Fact: Roundhouse kicks are comprised primarily of an element called Chucktanium. 
+The quickest way to a man's heart is with Chuck Norris' fist.
 %
-The Sherman tank was originaly called the Norris tank until Chuck Norris decided it wasn't tough enough to be associated with him. The Army, for fear of Chuck Norris, renamed the tank and promised to develop a weapon more fitting of his name. To date, no weapon created has been badass enough to be named after Chuck Norris. 
+Chuck Norris invented Kentucky Fried Chicken's famous secret recipe, with eleven herbs and spices. But nobody ever mentions the twelfth ingredient: Fear.
 %
-Chuck Norris proved that we are alone in the universe. We weren't before his first space expedition. 
+CNN was originally created as the "Chuck Norris Network" to update Americans with on-the-spot ass kicking in real-time.
 %
-Superman once watched an episode of Walker, Texas Ranger. He then cried himself to sleep. 
+Chuck Norris can win a game of Connect Four in only three moves.
 %
-Chuck Norris doesn't step on toes. Chuck Norris steps on necks. 
+What was going through the minds of all of Chuck Norris' victims before they died? His shoe.
 %
-The movie "Delta Force" was extremely hard to make because Chuck had to downplay his abilities. The first few cuts were completely unbelievable. 
+Chuck Norris is the only man to ever defeat a brick wall in a game of tennis.
 %
-Movie trivia: The movie "Invasion U.S.A." is, in fact, a documentary. 
+Police label anyone attacking Chuck Norris as a Code 45-11.... a suicide.
 %
-Chuck Norris does not "style" his hair. It lays perfectly in place out of sheer terror. 
+Chuck Norris doesn't churn butter. He roundhouse kicks the cows and the butter comes straight out.
 %
-There is no such thing as global warming. Chuck Norris was cold, so he turned the sun up. 
+Chuck Norris doesn’t wash his clothes, he disembowels them.
 %
-A study showed the leading causes of death in the United States are: 
-1:Heart disease 
-2:Chuck Norris 
-3:Cancer
+A Handicapped parking sign does not signify that this spot is for handicapped people. It is actually in fact a warning, that the spot belongs to Chuck Norris and that you will be handicapped if you park there.
 %
-It's widely believed that Jesus was Chuck Norris' stunt double for crucifixion due to the fact that it is impossible for nails to pierce Chuck Norris' skin. 
+Chuck Norris will attain statehood in 2009. His state flower will be the Magnolia.
 %
-Chuck Norris did in fact, build Rome in a day. 
+Someone once videotaped Chuck Norris getting pissed off. It was called Walker: Texas Chain Saw Massacre.
 %
-Along with his black belt, Chuck Norris often chooses to wear brown shoes. No one has DARED call him on it. Ever. 
+Chuck Norris originally appeared in the "Street Fighter II" video game, but was removed by Beta Testers because every button caused him to do a roundhouse kick. When asked bout this "glitch," Norris replied, "That's no glitch."
 %
-Anytime someone is elected president in the United States, they must ask permission from Chuck Norris to live in the White House. The reason for this is because Chuck Norris had won every Federal, State, and Local election since 1777. He just allows others to run the country in his place. 
+Fool me once, shame on you. Fool Chuck Norris once and he will roundhouse you in the face.
 %
-Once you go Norris, you are physically unable to go back. 
+When God said "Let there be light!", Chuck Norris said "Only for half the day
 %
-Ninjas want to grow up to be just like Chuck Norris. But usually they grow up just to be killed by Chuck Norris. 
+Chuck Norris went up the creek without a paddle... or a canoe
 %
-Chuck Norris once sued Burger King after they refused to put razor wire in his Whopper Jr, insisting that that actually is "his" way. 
+Chuck Norris once asked a man to turn down his music, he refused, that man's baby was born deaf.
 %
-The last thing you hear before Chuck Norris gives you a roundhouse kick? No one knows because dead men tell no tales. 
+Chuck Norris found the hay in the needle stack.
 %
-Chuck Norris doesn't play god. Playing is for children. 
+Chuck Norris doesn't need to brush his teeth, his spit acts as a bleach.
 %
-As a teen, Chuck Norris had sex with every nun in a convent tucked away in the hills of Tuscany. Nine months later the nuns gave birth to the 1972 Miami Dolphins, the only undefeated and untied team in professional football history. 
+Chuck Norris once had a street named after him. But the name removed at once, because nobody crosses Chuck Norris, and lives
 %
-Chuck Norris is the only person in the world that can actually email a roundhouse kick. 
+The planes in 9/11 were not hijacked. Chuck Norris was just playing with his old radio controller.
 %
-Chuck Norris won super bowls VII and VIII singlehandedly before unexpectedly retiring to pursue a career in ass-kicking. 
+Machiavelli said it is better to be feared than loved because he was inspired by Chuck Norris.
 %
-Wo hu cang long. The translation from Mandarin Chinese reads: "Crouching Chuck, Hidden Norris" 
+Chuck Norris Can Play the Theme from the Twilight Zone with His Beard
 %
-Chuck Norris can set ants on fire with a magnifying glass. At night. 
+Chuck Norris pees Adamantium
 %
-Some kids play Kick the can. Chuck Norris played Kick the keg. 
+The Beatles are on iTunes because Chuck Norris bought a Mac.
 %
-'Icy-Hot' is too weak for Chuck Norris. After a workout, Chuck Norris rubs his muscles down with liquid-hot MAGMA. 
+Chuck Norris once rounhouse kicked a football ...... it is now considered as a planet
 %
-Chuck Norris cannot love, he can only not kill. 
+Chuck Norris yells at Drill Sergeants
 %
-When Chuck Norris was a baby, he didn't suck his mother's breast. His mother served him whiskey, straight out of the bottle. 
+When the Boogeyman goes to sleep every night, he checks his closet for Chuck Norris.
 %
-According to Einstein's theory of relativity, Chuck Norris can actually roundhouse kick you yesterday. 
+Chuck Norris doesn't read books. He stares them down until he gets the information he wants.
 %
-Chuck Norris once pulled out a single hair from his beard and skewered three men through the heart with it. 
+There is no theory of evolution. Just a list of creatures Chuck Norris has allowed to live.
 %
-In an act of great philanthropy, Chuck made a generous donation to the American Cancer Society. He donated 6,000 dead bodies for scientific research. 
+Outer space exists because it's afraid to be on the same planet with Chuck Norris.
 %
-Chuck Norris' favourite cut of meat is the roundhouse. 
+Chuck Norris does not sleep. He waits.
 %
-When J. Robert Oppenheimer said "I am become death, the destroyer Of worlds", He was not referring to the atomic bomb. He was referring to the Chuck Norris halloween costume he was wearing. 
+Chuck Norris is currently suing NBC, claiming Law and Order are trademarked names for his left and right legs.
 %
-Chuck Norris recently had the idea to sell his urine as a canned beverage. We know this beverage as Red Bull. 
+Chuck Norris is the reason why Waldo is hiding.
 %
-In a recent survey it was discovered the 94% of American women lost their virginity to Chuck Norris. The other 6% were incredibly fat or ugly. 
+Chuck Norris counted to infinity - twice.
 %
-Chuck Norris invented a language that incorporates karate and roundhouse kicks. So next time Chuck Norris is kicking your ass, don't be offended or hurt, he may be just trying to tell you he likes your hat. 
+There is no chin behind Chuck Norris’ beard. There is only another fist.
 %
-If at first you don't succeed, you're not Chuck Norris. 
+When Chuck Norris does a pushup, he isn't lifting himself up, he's pushing the Earth down.
 %
-If Chuck Norris were a calendar, every month would be named Chucktober, and every day he'd kick your ass. 
+Chuck Norris is so fast, he can run around the world and punch himself in the back of the head.
 %
-Fear is not the only emotion Chuck Norris can smell. He can also detect hope, as in "I hope I don't get a roundhouse kick from Chuck Norris." 
-Too late, asshole. 
+Chuck Norris' hand is the only hand that can beat a Royal Flush.
 %
-Chuck Norris's show is called Walker: Texas Ranger, because Chuck Norris doesn't run. 
+If at first you don't succeed, you're not Chuck Norris.
 %
-MacGyver can build an airplane out of gum and paper clips, but Chuck Norris can roundhouse-kick his head through a wall and take it. 
+If Chuck Norris were a calendar, every month would be named Chucktober, and every day he'd kick your ass.
 %
-Behind every successful man, there is a woman. Behind every dead man, there is Chuck Norris. 
+Chuck Norris can lead a horse to water AND make it drink.
 %
-What's known as the UFC, or Ultimate Fighting Championship, doesn't use its full name, which happens to be "Ultimate Fighting Championship, Non-Chuck-Norris-Division". 
+Chuck Norris doesn’t wear a watch. HE decides what time it is.
 %
-Chuck Norris brushes his teeth with a mixture of iron shavings, industrial paint remover, and wood-grain alcohol. 
+Chuck Norris can slam a revolving door.
 %
-The easiest way to determine Chuck Norris' age is to cut him in half and count the rings. 
+Chuck Norris does not get frostbite. Chuck Norris bites frost.
 %
-There is endless debate about the existence of the human soul. Well it does exist, and Chuck Norris finds it delicious. 
+Remember the Soviet Union? They decided to quit after watching a DeltaForce marathon on Satellite TV.
 %
-Most boots are made for walkin'. Chuck Norris' boots ain't that merciful. 
+Contrary to popular belief, America is not a democracy, it is a Chucktatorship.
 %
-The US did not boycott the 1980 Summer Olympics in Moscow due to political reasons: Chuck Norris killed the entire US team with a single round-house kick during TaeKwonDo practice. 
+If you spell Chuck Norris in Scrabble, you win. Forever.
 %
-Chuck Norris wears a live rattlesnake as a condom. 
+Guns don't kill people. Chuck Norris kills people.
 %
-When the movie Pulp Fiction was filmed they had to borrow Chuck Norris's wallet... It's the one that says "Bad Mother Fucker" on it 
+There is no theory of evolution. Just a list of animals Chuck Norris allows to live.
 %
-The Bible was originally titled "Chuck Norris and Friends" 
+The chief export of Chuck Norris is Pain.
 %
-Chuck Norris began selling the Total Gym as an ill-fated attempt to make his day-to-day opponents less laughably pathetic. 
+Chuck Norris has two speeds. Walk, and Kill.
 %
-Do you know why Baskin Robbins only has 31 flavors? Because Chuck Norris doesn't like Fudge Ripple. 
+The leading causes of death in the United States are: 1. Heart Disease 2. Chuck Norris 3. Cancer.
 %
-When Chuck Norris says "More cowbell", he fucking MEANS it. 
+Chuck Norris drives an ice cream truck covered in human skulls.
 %
-On the set of Walker Texas Ranger Chuck Norris brought a dying lamb back to life by nuzzling it with his beard. As the onlookers gathered, the lamb sprang to life. Chuck Norris then roundhouse kicked it, killing it instantly. This was just to prove that the good Chuck giveth, and the good Chuck, he taketh away. 
+Chuck Norris is my Homeboy.
 %
-Chuck Norris was what Willis was talkin' about. 
+Chuck Norris doesn't go hunting.... CHUCK NORRIS GOES KILLING.
 %
-Google won't search for Chuck Norris because it knows you don't find Chuck Norris, he finds you. 
+Chuck Norris uses pepper spray to spice up his steaks.
 %
-Chuck Norris can lead a horse to water AND make it drink. 
+Chuck Norris once roundhouse kicked someone so hard that his foot broke the speed of light, went back in time, and killed Amelia Earhart while she was flying over the Pacific Ocean.
 %
-Nagasaki never had a bomb dropped on it. Chuck Norris jumped out of a plane and punched the ground. 
+Crop circles are Chuck Norris' way of telling the world that sometimes corn needs to lie down.
 %
-It is scientifically impossible for Chuck Norris to have had a mortal father. The most popular theory is that he went back in time and fathered himself. 
+Chuck Norris is ten feet tall, weighs two-tons, breathes fire, and could eat a hammer and take a shotgun blast standing.
 %
-Chuck Norris destroyed the periodic table, because Chuck Norris only recognizes the element of surprise. 
+The Great Wall of China was originally created to keep Chuck Norris out. It failed miserably.
 %
-It is believed dinosaurs are extinct due to a giant meteor. That's true if you want to call Chuck Norris a giant meteor. 
+Contrary to popular belief, Chuck Norris, not the box jellyfish of northern Australia, is the most venomous creature on earth.
 %
-Chuck Norris shot the sheriff, but he round house kicked the deputy. 
+Most people have 23 pairs of chromosomes. Chuck Norris has 72... and they're all poisonous.
 %
-That's not Chuck Norris doing push-ups -- that's Chuck Norris moving the Earth away from the path of a deadly asteroid. 
+If you ask Chuck Norris what time it is, he always says, "Two seconds 'til." After you ask, "Two seconds 'til what?" he roundhouse kicks you in the face.
 %
-Chuck Norris can judge a book by its cover. 
+When Chuck Norris sends in his taxes, he sends blank forms and includes only a picture of himself, crouched and ready to attack. Chuck Norris has not had to pay taxes, ever.
 %
-Nothing can escape the gravity of a black hole, except for Chuck Norris. Chuck Norris eats black holes. They taste like chicken. 
+The quickest way to a man's heart is with Chuck Norris' fist.
 %
-Chuck Norris does not play the lottery. It doesn't have nearly enough balls. 
+Chuck Norris invented Kentucky Fried Chicken's famous secret recipe, with eleven herbs and spices. But nobody ever mentions the twelfth ingredient: Fear.
 %
-Q: How many Chuck Norris' does it take to change a light bulb?
-A: None, Chuck Norris prefers to kill in the dark. 
+CNN was originally created as the "Chuck Norris Network" to update Americans with on-the-spot ass kicking in real-time.
 %
-As President Roosevelt said: "We have nothing to fear but fear itself. And Chuck Norris." 
+Chuck Norris can win a game of Connect Four in only three moves.
 %
-Chuck Norris just says "no" to drugs. If he said "yes", it would collapse Colombia's infrastructure. 
+What was going through the minds of all of Chuck Norris' victims before they died? His shoe.
 %
-Since 1940, the year Chuck Norris was born, roundhouse-kick related deaths have increased 13,000 percent.? 
+Chuck Norris is the only man to ever defeat a brick wall in a game of tennis.
 %
-Crime does not pay - unless you are an undertaker following Walker, Texas Ranger, on a routine patrol. 
+Police label anyone attacking Chuck Norris as a Code 45-11.... a suicide.
 %
-Chuck Norris invented the internet? just so he had a place to store his porn. 
+Chuck Norris doesn't churn butter. He roundhouse kicks the cows and the butter comes straight out.
 %
-Chuck Norris does not own a house. He walks into random houses and people move. 
+Chuck Norris doesn’t wash his clothes, he disembowels them.
 %
-It is better to give than to receive. This is especially true of a Chuck Norris roundhouse kick. 
+Since 1940, the year Chuck Norris was born, roundhouse-kick related deaths have increased 13,000 percent.?
 %
-Chuck Norris is the only person to ever win a staring contest against Ray Charles and Stevie Wonder at the same time. 
+A Handicapped parking sign does not signify that this spot is for handicapped people. It is actually in fact a warning, that the spot belongs to Chuck Norris and that you will be handicapped if you park there.
 %
-Industrial logging isn't the cause of deforestation. Chuck Norris needs toothpicks. 
+Chuck Norris will attain statehood in 2009. His state flower will be the Magnolia.
 %
-Chuck Norris smells what the Rock is cooking... because the Rock is Chuck Norris' personal chef. 
+Someone once videotaped Chuck Norris getting pissed off. It was called Walker: Texas Chain Saw Massacre.
 %
-When Chuck Norris plays Oregon Trail, his family does not die from cholera or dysentery, but rather, roundhouse kicks to the face. He also requires no wagon, since he carries the oxen, axels, and buffalo meat on his back. He always makes it to Oregon before you. 
+Chuck Norris originally appeared in the "Street Fighter II" video game, but was removed by Beta Testers because every button caused him to do a roundhouse kick. When asked bout this "glitch," Norris replied, "That's no glitch."
 %
-Chuck Norris is the reason why Waldo is hiding. 
+Fool me once, shame on you. Fool Chuck Norris once and he will roundhouse you in the face.
 %
-"Brokeback Mountain" is not just a movie. It's also what Chuck Norris calls the pile of dead ninjas in his front yard. 
+There is no such thing as being hard its called the Chuck Norris factor.
 %
-When God said, "let there be light", Chuck Norris said, "say 'please'." 
+When Chuck Norris goes to the library, he looks for the guinness book of records in the comedy section.
 %
-Chuck Norris does not eat. Food understands that the only safe haven from Chuck Norris' fists is inside his own body. 
+Chuck Norris can shoot a person 28 times with an unloaded gun.
 %
-One day Chuck Norris walked down the street with a massive erection. There were no survivors. 
+Chuck Norris' personal airplane is called Air Force Chuck
 %
-Chuck Norris built a time machine and went back in time to stop the JFK assassination. As Oswald shot, Chuck met all three bullets with his beard, deflecting them. JFK's head exploded out of sheer amazement. 
+The letters in Chuck Norris cannot be unscrambled.
 %
-Chuck Norris doesn't read books. He stares them down until he gets the information he wants. 
+Cops don't need a badges in their wallets but only a picture of Chuck Norris.
 %
-Chuck Norris uses a night light. Not because Chuck Norris is afraid of the dark, but the dark is afraid of Chuck Norris. 
+Chuck Norris was the reason why the Great Wall of China was constructed. It failed miserably.
 %
-Chuck Norris is not capable of hitting a target on the broad side of a barn. Every time he tries, the whole damn barn falls down. 
+If you see a man in the street who looks like Chuck Norris, but isn't, run: you don't want to be caught in the resulting roundhouse kick to his face.
 %
-Before each filming of Walker: Texas Ranger, Chuck Norris is injected with fourteen times the lethal dose of elephant tranquilzer. This is, of course, to limit his strength and mobility, in an attempt to lower the fatality rate of the actors he fights. 
+The red phone in the oval office...Rings directly to Chuck Norris Cell Phone
 %
-When Bruce Banner gets mad, he turns into the Hulk. When the Hulk gets mad, he turns into Chuck Norris. 
+The only way sharks will come near CN underwater is when CN is inside of a cage.
 %
-Chuck Norris kills anyone that asks, "You want fries with that" because by now everyone should know that Chuck doesn't ever want fries with anything. Ever. 
+Chuck Norris uses a real mouse to move the cursor, type on the keyboard, write e-mails, code entire websites, use photoshop, bring coffee.
 %
-Chuck Norris once kicked a horse in the chin. Its decendants are known today as Giraffes. 
+If Chuck Norris were to get into a fight with another Chuck Norris, Chuck Norris would win.
 %
-Sticks and stones may break your bones, but a Chuck Norris glare will liquefy your kidneys. 
+"2012" is code for, Chuck Norris when he is pissed.
 %
-Human cloning is outlawed because if Chuck Norris were cloned, then it would be possible for a Chuck Norris roundhouse kick to meet another chuck Norris roundhouse kick. Physicists theorize that this contact would end the universe. 
+When the Boogeyman goes to sleep every night, he checks his closet for Chuck Norris.
 %
-Chuck Norris once went skydiving, but promised never to do it again. One Grand Canyon is enough. 
+Chuck Norris doesn't read books. He stares them down until he gets the information he wants.
 %
-Chuck Norris's version of a "chocolate milkshake" is a raw porterhouse wrapped around ten Hershey bars, and doused in diesel fuel. 
+There is no theory of evolution. Just a list of creatures Chuck Norris has allowed to live.
 %
-If Chuck Norris round-house kicks you, you will die. If Chuck Norris' misses you with the round-house kick, the wind behind the kick will tear out your pancreas. 
+Outer space exists because it's afraid to be on the same planet with Chuck Norris.
 %
-In a fight between Batman and Darth Vader, the winner would be Chuck Norris. 
+Chuck Norris does not sleep. He waits.
 %
-Chuck Norris puts his pants on one leg at a time, just like the rest of us. The only difference is, then he fucking kills people. 
+Chuck Norris is currently suing NBC, claiming Law and Order are trademarked names for his left and right legs.
 %
-Everybody loves Raymond. Except Chuck Norris. 
+Chuck Norris is the reason why Waldo is hiding.
 %
-Contrary to popular belief, the Titanic didn't hit an iceberg. The ship was off course and accidentally ran into Chuck Norris while he was doing the backstroke across the Atlantic. 
+Chuck Norris counted to infinity - twice.
 %
-Chuck Norris got his drivers license at the age of 16. Seconds. 
+There is no chin behind Chuck Norris’ beard. There is only another fist.
 %
-The original title for Alien vs. Predator was Alien and Predator vs Chuck Norris. The film was cancelled shortly after going into preproduction. No one would pay nine dollars to see a movie fourteen seconds long. 
+When Chuck Norris does a pushup, he isn't lifting himself up, he's pushing the Earth down.
 %
-Chuck Norris' sperm is so badass, he had sex with Nicole Kidman, and 7 months later she prematurely gave birth to a Ford Excursion. 
+Chuck Norris is so fast, he can run around the world and punch himself in the back of the head.
 %
-Chuck Norris can win at solitaire with only 18 cards. 
+Chuck Norris' hand is the only hand that can beat a Royal Flush.
 %
-Chuck Norris once shat blood - the blood of 11,940 natives he had killed and eaten. 
+Chuck Norris can lead a horse to water AND make it drink.
 %
-Maslow's theory of higher needs does not apply to Chuck Norris. He only has two needs: killing people and finding people to kill. 
+Chuck Norris doesn’t wear a watch. HE decides what time it is.
 %
-The truth will set you free. Unless Chuck Norris has you, in which case, forget it buddy! 
+Chuck Norris can slam a revolving door.
 %
-For most people, home is where the heart is. For Chuck Norris, home is where he stores his collection of human skulls. 
+Chuck Norris does not get frostbite. Chuck Norris bites frost.
 %
-Kryptonite has been found to contain trace elements of Chuck Norris roundhouse kicks to the face. This is why it is so deadly to Superman. 
+Remember the Soviet Union? They decided to quit after watching a DeltaForce marathon on Satellite TV.
 %
-Saddam Hussein was not found hiding in a "hole." Saddam was roundhouse-kicked in the head by Chuck Norris in Kansas, which sent him through the earth, stopping just short of the surface of Iraq. 
+Contrary to popular belief, America is not a democracy, it is a Chucktatorship.
 %
-Coroners refer to dead people as "ABC's". Already Been Chucked. 
+If you spell Chuck Norris in Scrabble, you win. Forever.
 %
-Chuck Norris doesn't look both ways before he crosses the street... he just roundhouses any cars that get too close. 
+Guns don't kill people. Chuck Norris kills people.
 %
-Chuck Norris does not have to answer the phone. His beard picks up the incoming electrical impulses and translates them into audible sound. 
+There is no theory of evolution. Just a list of animals Chuck Norris allows to live.
 %
-How many roundhouse kicks does it take to get to the center of a tootsie pop? Just one. From Chuck Norris. 
+The chief export of Chuck Norris is Pain.
 %
-Chuck Norris doesnt wear a watch, HE decides what time it is. 
+Chuck Norris has two speeds. Walk, and Kill.
 %
-The phrase 'break a leg' was originally coined by Chuck Norris's co-stars in Walker, Texas Ranger as a good luck charm, indicating that a broken leg might be the worst extent of their injuries. This never proved to be the case. 
+The leading causes of death in the United States are: 1. Heart Disease 2. Chuck Norris 3. Cancer.
 %
-When chuck Norris does division, there are no remainders. 
+Chuck Norris drives an ice cream truck covered in human skulls.
 %
-If you rearrange the letters in "Chuck Norris", they also spell "Crush Rock In". The words "with his fists" are understood. 
+Chuck Norris is my Homeboy.
 %
-Never look a gift Chuck Norris in the mouth, because he will bite your damn eyes off. 
+Chuck Norris doesn't go hunting.... CHUCK NORRIS GOES KILLING.
 %
-Give a man a fish, and you will feed him for a day. Give a man anything that is better than a fish, and Chuck Norris will beat his ass and take it. 
+Chuck Norris uses pepper spray to spice up his steaks.
 %
-Chuck Norris used to play baseball. When Babe Ruth was hailed as the better player, Chuck Norris killed him with a baseball bat to the throat. Lou Gehrig got off easy. 
+Chuck Norris once roundhouse kicked someone so hard that his foot broke the speed of light, went back in time, and killed Amelia Earhart while she was flying over the Pacific Ocean.
 %
-The original title for Star Wars was "Skywalker: Texas Ranger". Starring Chuck Norris. 
+Crop circles are Chuck Norris' way of telling the world that sometimes corn needs to lie down.
 %
-Guantuanamo Bay, Cuba, is the military code-word for "Chuck Norris' basement". 
+Chuck Norris is ten feet tall, weighs two-tons, breathes fire, and could eat a hammer and take a shotgun blast standing.
 %
-The phrase 'balls to the wall' was originally conceived to describe Chuck Norris entering any building smaller than an aircraft hangar. 
+The Great Wall of China was originally created to keep Chuck Norris out. It failed miserably.
 %
-Chuck Norris' roundhouse kick is so powerful, it can be seen from outer space by the naked eye. 
+Contrary to popular belief, Chuck Norris, not the box jellyfish of northern Australia, is the most venomous creature on earth.
 %
-Ozzy Osbourne bites the heads off of bats. Chuck Norris bites the heads off of Siberian Tigers. 
+Most people have 23 pairs of chromosomes. Chuck Norris has 72... and they're all poisonous.
 %
-He who lives by the sword, dies by the sword. He who lives by Chuck Norris, dies by the roundhouse kick. 
+If you ask Chuck Norris what time it is, he always says, "Two seconds 'til." After you ask, "Two seconds 'til what?" he roundhouse kicks you in the face.
 %
-The best-laid plans of mice and men often go awry. Even the worst-laid plans of Chuck Norris come off without a hitch. 
+When Chuck Norris sends in his taxes, he sends blank forms and includes only a picture of himself, crouched and ready to attack. Chuck Norris has not had to pay taxes, ever.
 %
-The phrase 'dead ringer' refers to someone who sits behind Chuck Norris in a movie theater and forgets to turn their cell phone off. 
+The quickest way to a man's heart is with Chuck Norris' fist.
 %
-Chuck Norris' Roundhouse kick is so powerful, that on the set of Sidekicks he single-footedly destroyed Jonathan Brandis' Career. 
+Chuck Norris invented Kentucky Fried Chicken's famous secret recipe, with eleven herbs and spices. But nobody ever mentions the twelfth ingredient: Fear.
 %
-Staring at Chuck Norris for extended periods of time without proper eye protection will cause blindess, and possibly foot sized brusies on the face. 
+CNN was originally created as the "Chuck Norris Network" to update Americans with on-the-spot ass kicking in real-time.
 %
-Chuck Norris can taste lies. 
+Chuck Norris can win a game of Connect Four in only three moves.
 %
-Chuck Norris does not kick ass and take names. In fact, Chuck Norris kicks ass and assigns the corpse a number. It is currently recorded to be in the billions. 
+What was going through the minds of all of Chuck Norris' victims before they died? His shoe.
 %
-One time, Chuck Norris accidentally stubbed his toe. It destroyed the entire state of Ohio. 
+Chuck Norris is the only man to ever defeat a brick wall in a game of tennis.
 %
-Little Miss Muffet sat on her tuffet, until Chuck Norris roundhouse kicked her into a glacier. 
+Police label anyone attacking Chuck Norris as a Code 45-11.... a suicide.
 %
-In 1990, Chuck Norris founded the non-profit organization "Kick Drugs Out of America". If the organization's name were "Roundhouse Kick Drugs out of America", there wouldn't be any drugs in the Western Hemisphere. Anywhere. 
+Chuck Norris doesn't churn butter. He roundhouse kicks the cows and the butter comes straight out.
 %
-Chuck Norris can blow bubbles with beef jerky. 
+Chuck Norris doesn’t wash his clothes, he disembowels them.
 %
-They had to edit the first ending of 'Lone Wolf McQuade' after Chuck Norris kicked David Carradine's ass, then proceeded to barbecue and eat him. 
+A Handicapped parking sign does not signify that this spot is for handicapped people. It is actually in fact a warning, that the spot belongs to Chuck Norris and that you will be handicapped if you park there.
 %
-Chuck Norris does, in fact, live in a round house. 
+Chuck Norris will attain statehood in 2009. His state flower will be the Magnolia.
 %
-Chuck Norris was once on Jeopardy. This show is notable in that it was the first occasion in Jeopardy history that Alex Trebek had appeared without a mustache. And a head. 
+Someone once videotaped Chuck Norris getting pissed off. It was called Walker: Texas Chain Saw Massacre.
 %
-When Chuck Norris works out on the Total Gym, the Total Gym feels like it's been raped. 
+Chuck Norris originally appeared in the "Street Fighter II" video game, but was removed by Beta Testers because every button caused him to do a roundhouse kick. When asked bout this "glitch," Norris replied, "That's no glitch."
 %
-4 out of 5 doctors fail to recommend Chuck Norris as a solution to most problems. Also, 80% of doctors die unexplained, needlessly brutal deaths. 
+Fool me once, shame on you. Fool Chuck Norris once and he will roundhouse you in the face.
 %
-Chuck Norris can skeletize a cow in two minutes. 
+In the back of the book of world records, it says "All records are held by Chuck Norris. The ones listed are in second place."
+%
+The only place where the Starship Enterprise refuses to boldly go is Chuck Norris' planet...which is all of them.
+%
+Chuck Norris once had a pet monkey........his name was KING KONG
+%
+Chuck Norris can make his own megazord "The Chuck Norris Roundhouse Kickers Ultimate Super Awesome Megazord"
+%
+Simon doesn't say...Chuck Norris says.
+%
+When does Chuck Norris run out of shotgun bullets?.....whenever he wants to.
 %
 The only sure things are Death and Taxes, and when Chuck Norris goes to work for the IRS, they'll be the same thing.
 %
-Chuck Norris' first job was as a paperboy. There were no survivors. 
+Chuck Norris' first job was as a paperboy. There were no survivors.
+%
+Chuck Norris can turn toast back into bread
+%
+Chuck Norris started Chuck Norris.
+%
+Ever wonder what really happened to the dinosaurs? They all dug their own graves when they heard Chuck Norris was coming
+%
+Chuck Norris killed Kemper
+%
+Did you here about the boy who cried Chuck Norris?
+%
+Chuck Norris can't perform Hadoukens, he IS a Hadouken
+%
+Behind every successful man is Chuck Norris
+%
+When the Boogeyman goes to sleep every night, he checks his closet for Chuck Norris.
+%
+Chuck Norris doesn't read books. He stares them down until he gets the information he wants.
+%
+There is no theory of evolution. Just a list of creatures Chuck Norris has allowed to live.
+%
+Outer space exists because it's afraid to be on the same planet with Chuck Norris.
+%
+Chuck Norris does not sleep. He waits.
+%
+Chuck Norris is currently suing NBC, claiming Law and Order are trademarked names for his left and right legs.
+%
+Chuck Norris is the reason why Waldo is hiding.
+%
+Chuck Norris counted to infinity - twice.
+%
+MacGyver immediately tried to make a bomb out of some Q-Tips and Gatorade, but Chuck Norris roundhouse-kicked him in the solar plexus. MacGyver promptly threw up his own heart.
+%
+There is no chin behind Chuck Norris’ beard. There is only another fist.
+%
+When Chuck Norris does a pushup, he isn't lifting himself up, he's pushing the Earth down.
+%
+Chuck Norris is so fast, he can run around the world and punch himself in the back of the head.
+%
+Chuck Norris' hand is the only hand that can beat a Royal Flush.
+%
+Chuck Norris can lead a horse to water AND make it drink.
+%
+Chuck Norris doesn’t wear a watch. HE decides what time it is.
+%
+Chuck Norris can slam a revolving door.
+%
+Chuck Norris does not get frostbite. Chuck Norris bites frost.
+%
+Remember the Soviet Union? They decided to quit after watching a DeltaForce marathon on Satellite TV.
+%
+Contrary to popular belief, America is not a democracy, it is a Chucktatorship.
+%
+If you spell Chuck Norris in Scrabble, you win. Forever.
+%
+Guns don't kill people. Chuck Norris kills people.
+%
+There is no theory of evolution. Just a list of animals Chuck Norris allows to live.
+%
+The chief export of Chuck Norris is Pain.
+%
+Chuck Norris has two speeds. Walk, and Kill.
+%
+The leading causes of death in the United States are: 1. Heart Disease 2. Chuck Norris 3. Cancer.
+%
+Chuck Norris drives an ice cream truck covered in human skulls.
+%
+Chuck Norris is my Homeboy.
+%
+Chuck Norris doesn't go hunting.... CHUCK NORRIS GOES KILLING.
+%
+Chuck Norris uses pepper spray to spice up his steaks.
+%
+Chuck Norris once roundhouse kicked someone so hard that his foot broke the speed of light, went back in time, and killed Amelia Earhart while she was flying over the Pacific Ocean.
+%
+Crop circles are Chuck Norris' way of telling the world that sometimes corn needs to lie down.
+%
+Chuck Norris is ten feet tall, weighs two-tons, breathes fire, and could eat a hammer and take a shotgun blast standing.
+%
+The Great Wall of China was originally created to keep Chuck Norris out. It failed miserably.
+%
+Contrary to popular belief, Chuck Norris, not the box jellyfish of northern Australia, is the most venomous creature on earth.
+%
+Most people have 23 pairs of chromosomes. Chuck Norris has 72... and they're all poisonous.
+%
+If you ask Chuck Norris what time it is, he always says, "Two seconds 'til." After you ask, "Two seconds 'til what?" he roundhouse kicks you in the face.
+%
+When Chuck Norris sends in his taxes, he sends blank forms and includes only a picture of himself, crouched and ready to attack. Chuck Norris has not had to pay taxes, ever.
+%
+The quickest way to a man's heart is with Chuck Norris' fist.
+%
+Chuck Norris invented Kentucky Fried Chicken's famous secret recipe, with eleven herbs and spices. But nobody ever mentions the twelfth ingredient: Fear.
+%
+CNN was originally created as the "Chuck Norris Network" to update Americans with on-the-spot ass kicking in real-time.
+%
+Chuck Norris can win a game of Connect Four in only three moves.
+%
+What was going through the minds of all of Chuck Norris' victims before they died? His shoe.
+%
+Chuck Norris is the only man to ever defeat a brick wall in a game of tennis.
+%
+Police label anyone attacking Chuck Norris as a Code 45-11.... a suicide.
+%
+Chuck Norris doesn't churn butter. He roundhouse kicks the cows and the butter comes straight out.
+%
+Chuck Norris doesn’t wash his clothes, he disembowels them.
+%
+A Handicapped parking sign does not signify that this spot is for handicapped people. It is actually in fact a warning, that the spot belongs to Chuck Norris and that you will be handicapped if you park there.
+%
+Chuck Norris will attain statehood in 2009. His state flower will be the Magnolia.
+%
+Someone once videotaped Chuck Norris getting pissed off. It was called Walker: Texas Chain Saw Massacre.
+%
+Chuck Norris originally appeared in the "Street Fighter II" video game, but was removed by Beta Testers because every button caused him to do a roundhouse kick. When asked bout this "glitch," Norris replied, "That's no glitch."
+%
+Fool me once, shame on you. Fool Chuck Norris once and he will roundhouse you in the face.
+%
+The square root of Chuck Norris is pain.  Do not try to square Chuck Norris.  The result is death
+%
+Chuck Norris doesn't read. He just stares at the book until he gets the information he wants.
+%
+Why didn't the chicken cross the road? Because Chuck Norris got to it first.
+%
+When taking the SAT, write "Chuck Norris" for every answer. You will score over 8000.
+%
+Chuck Norris can milk an alligator
+%
+Chuck Norris doesn't eat, he just sucks the energy out of food by staring at it
+%
+Chuck Norris once proved p^~p by induction on his beard hairs.
+%
+The reason why batman only comes out at night is because he's afraid he might encounter Chuck Norris in the Morning and afternoon.
+%
+Chuck Norris can bake in a Freezer.
+%
+Chuck Norris is currently suing any broadway theater that plays "The Nutcracker". He claims its an infringement on his "other" roundhouse kick.
+%
+Chuck Norris once had a weak moment, just to know what it felt like.
+%
+Note to everyone: Please do not give beans to Chuck Norris or do you want another atombomb on hiroshima?
+%
+Chuck Norris has made a 148 break a snooker.
+%
+When the Boogeyman goes to sleep every night, he checks his closet for Chuck Norris.
+%
+Chuck Norris doesn't read books. He stares them down until he gets the information he wants.
+%
+There is no theory of evolution. Just a list of creatures Chuck Norris has allowed to live.
+%
+Outer space exists because it's afraid to be on the same planet with Chuck Norris.
+%
+Chuck Norris does not sleep. He waits.
+%
+Chuck Norris is currently suing NBC, claiming Law and Order are trademarked names for his left and right legs.
+%
+Chuck Norris is the reason why Waldo is hiding.
+%
+Chuck Norris counted to infinity - twice.
+%
+There is no chin behind Chuck Norris’ beard. There is only another fist.
+%
+When Chuck Norris does a pushup, he isn't lifting himself up, he's pushing the Earth down.
+%
+Chuck Norris is so fast, he can run around the world and punch himself in the back of the head.
+%
+Chuck Norris' hand is the only hand that can beat a Royal Flush.
+%
+Chuck Norris can lead a horse to water AND make it drink.
+%
+Chuck Norris doesn’t wear a watch. HE decides what time it is.
+%
+Chuck Norris can slam a revolving door.
+%
+Chuck Norris does not get frostbite. Chuck Norris bites frost.
+%
+Remember the Soviet Union? They decided to quit after watching a DeltaForce marathon on Satellite TV.
+%
+Contrary to popular belief, America is not a democracy, it is a Chucktatorship.
+%
+If you spell Chuck Norris in Scrabble, you win. Forever.
+%
+Guns don't kill people. Chuck Norris kills people.
+%
+There is no theory of evolution. Just a list of animals Chuck Norris allows to live.
+%
+The chief export of Chuck Norris is Pain.
+%
+Chuck Norris has two speeds. Walk, and Kill.
+%
+The leading causes of death in the United States are: 1. Heart Disease 2. Chuck Norris 3. Cancer.
+%
+Chuck Norris drives an ice cream truck covered in human skulls.
+%
+Chuck Norris is my Homeboy.
+%
+Chuck Norris doesn't go hunting.... CHUCK NORRIS GOES KILLING.
+%
+Chuck Norris uses pepper spray to spice up his steaks.
+%
+Chuck Norris once roundhouse kicked someone so hard that his foot broke the speed of light, went back in time, and killed Amelia Earhart while she was flying over the Pacific Ocean.
+%
+Crop circles are Chuck Norris' way of telling the world that sometimes corn needs to lie down.
+%
+Chuck Norris is ten feet tall, weighs two-tons, breathes fire, and could eat a hammer and take a shotgun blast standing.
+%
+The Great Wall of China was originally created to keep Chuck Norris out. It failed miserably.
+%
+Contrary to popular belief, Chuck Norris, not the box jellyfish of northern Australia, is the most venomous creature on earth.
+%
+Most people have 23 pairs of chromosomes. Chuck Norris has 72... and they're all poisonous.
+%
+If you ask Chuck Norris what time it is, he always says, "Two seconds 'til." After you ask, "Two seconds 'til what?" he roundhouse kicks you in the face.
+%
+When Chuck Norris sends in his taxes, he sends blank forms and includes only a picture of himself, crouched and ready to attack. Chuck Norris has not had to pay taxes, ever.
+%
+The quickest way to a man's heart is with Chuck Norris' fist.
+%
+Chuck Norris invented Kentucky Fried Chicken's famous secret recipe, with eleven herbs and spices. But nobody ever mentions the twelfth ingredient: Fear.
+%
+CNN was originally created as the "Chuck Norris Network" to update Americans with on-the-spot ass kicking in real-time.
+%
+Chuck Norris can win a game of Connect Four in only three moves.
+%
+What was going through the minds of all of Chuck Norris' victims before they died? His shoe.
+%
+Chuck Norris is the only man to ever defeat a brick wall in a game of tennis.
+%
+Police label anyone attacking Chuck Norris as a Code 45-11.... a suicide.
+%
+Chuck Norris doesn't churn butter. He roundhouse kicks the cows and the butter comes straight out.
+%
+Chuck Norris doesn’t wash his clothes, he disembowels them.
+%
+A Handicapped parking sign does not signify that this spot is for handicapped people. It is actually in fact a warning, that the spot belongs to Chuck Norris and that you will be handicapped if you park there.
+%
+Chuck Norris will attain statehood in 2009. His state flower will be the Magnolia.
+%
+Someone once videotaped Chuck Norris getting pissed off. It was called Walker: Texas Chain Saw Massacre.
+%
+Chuck Norris originally appeared in the "Street Fighter II" video game, but was removed by Beta Testers because every button caused him to do a roundhouse kick. When asked bout this "glitch," Norris replied, "That's no glitch."
+%
+Fool me once, shame on you. Fool Chuck Norris once and he will roundhouse you in the face.
+%
+http://chucknorrisfacts.com/ is built in Drupal because Chuck Norris knows a good CMS when he sees one.
+%
+The producers of the movie "The Last Airbender" are now in talks with Chuck Norris in Order to star him in their next sequal "The Last Skull Bender".
+%
+Some boots were made for walking. Some boots may walk all over you, but Chuck Norris' boot walk THROUGH you.
+%
+World War II began because Chuck Norris took a nap.  When he woke up, Hitler found out and killed himself out of fear Chuck Norris would kill him.
+%
+The best part of waking up is not Folgers in your cup, it's knowing that Chuck Norris let you live.
+%
+Only Chuck Norris can win the mind game, 'cause he never minds.
+%
+Do you know why Chuck Norris didn't star in The Expandebles? Because all the others guys would have surrended at the beginning.
+%
+Bruce Lee didn't defeat Chuck Norris.  Chuck hit Bruce with a Delayed roundhouse kick that was so fast that Lee only felt the impact a year later!
+%
+Chuck Norris doesn't need a bulletproof vest to be bulletproof
+%
+When Chuck Norris goes to Vegas, he doesn't have to gamble. The casinos just give him stacks of money.
+%
+Merlin was Chuck Norris' assistant.
+%
+If you put in the correct cheat code in Halo 2, you can have Master Cheif play without his helmet; revealing to be Chuck Norris.
+%
+Those who ignore history, are doomed by Chuck Norris.
+%
+When the Boogeyman goes to sleep every night, he checks his closet for Chuck Norris.
+%
+Chuck Norris doesn't read books. He stares them down until he gets the information he wants.
+%
+There is no theory of evolution. Just a list of creatures Chuck Norris has allowed to live.
+%
+Outer space exists because it's afraid to be on the same planet with Chuck Norris.
+%
+Chuck Norris does not sleep. He waits.
+%
+Chuck Norris is currently suing NBC, claiming Law and Order are trademarked names for his left and right legs.
+%
+Chuck Norris is the reason why Waldo is hiding.
+%
+Chuck Norris counted to infinity - twice.
+%
+There is no chin behind Chuck Norris’ beard. There is only another fist.
+%
+When Chuck Norris does a pushup, he isn't lifting himself up, he's pushing the Earth down.
+%
+Chuck Norris is so fast, he can run around the world and punch himself in the back of the head.
+%
+Chuck Norris' hand is the only hand that can beat a Royal Flush.
+%
+Chuck Norris can lead a horse to water AND make it drink.
+%
+Chuck Norris doesn’t wear a watch. HE decides what time it is.
+%
+Chuck Norris can slam a revolving door.
+%
+Chuck Norris does not get frostbite. Chuck Norris bites frost.
+%
+Remember the Soviet Union? They decided to quit after watching a DeltaForce marathon on Satellite TV.
+%
+Contrary to popular belief, America is not a democracy, it is a Chucktatorship.
+%
+If you spell Chuck Norris in Scrabble, you win. Forever.
+%
+Guns don't kill people. Chuck Norris kills people.
+%
+There is no theory of evolution. Just a list of animals Chuck Norris allows to live.
+%
+The chief export of Chuck Norris is Pain.
+%
+Chuck Norris has two speeds. Walk, and Kill.
+%
+The leading causes of death in the United States are: 1. Heart Disease 2. Chuck Norris 3. Cancer.
+%
+Chuck Norris drives an ice cream truck covered in human skulls.
+%
+Chuck Norris is my Homeboy.
+%
+Chuck Norris doesn't go hunting.... CHUCK NORRIS GOES KILLING.
+%
+Chuck Norris uses pepper spray to spice up his steaks.
+%
+Chuck Norris once roundhouse kicked someone so hard that his foot broke the speed of light, went back in time, and killed Amelia Earhart while she was flying over the Pacific Ocean.
+%
+Crop circles are Chuck Norris' way of telling the world that sometimes corn needs to lie down.
+%
+Chuck Norris is ten feet tall, weighs two-tons, breathes fire, and could eat a hammer and take a shotgun blast standing.
+%
+The Great Wall of China was originally created to keep Chuck Norris out. It failed miserably.
+%
+Contrary to popular belief, Chuck Norris, not the box jellyfish of northern Australia, is the most venomous creature on earth.
+%
+Most people have 23 pairs of chromosomes. Chuck Norris has 72... and they're all poisonous.
+%
+If you ask Chuck Norris what time it is, he always says, "Two seconds 'til." After you ask, "Two seconds 'til what?" he roundhouse kicks you in the face.
+%
+When Chuck Norris sends in his taxes, he sends blank forms and includes only a picture of himself, crouched and ready to attack. Chuck Norris has not had to pay taxes, ever.
+%
+The quickest way to a man's heart is with Chuck Norris' fist.
+%
+Chuck Norris invented Kentucky Fried Chicken's famous secret recipe, with eleven herbs and spices. But nobody ever mentions the twelfth ingredient: Fear.
+%
+CNN was originally created as the "Chuck Norris Network" to update Americans with on-the-spot ass kicking in real-time.
+%
+Chuck Norris can win a game of Connect Four in only three moves.
+%
+What was going through the minds of all of Chuck Norris' victims before they died? His shoe.
+%
+Chuck Norris is the only man to ever defeat a brick wall in a game of tennis.
+%
+Police label anyone attacking Chuck Norris as a Code 45-11.... a suicide.
+%
+Chuck Norris doesn't churn butter. He roundhouse kicks the cows and the butter comes straight out.
+%
+Chuck Norris doesn’t wash his clothes, he disembowels them.
+%
+A Handicapped parking sign does not signify that this spot is for handicapped people. It is actually in fact a warning, that the spot belongs to Chuck Norris and that you will be handicapped if you park there.
+%
+Chuck Norris will attain statehood in 2009. His state flower will be the Magnolia.
+%
+Someone once videotaped Chuck Norris getting pissed off. It was called Walker: Texas Chain Saw Massacre.
+%
+Chuck Norris originally appeared in the "Street Fighter II" video game, but was removed by Beta Testers because every button caused him to do a roundhouse kick. When asked bout this "glitch," Norris replied, "That's no glitch."
+%
+Fool me once, shame on you. Fool Chuck Norris once and he will roundhouse you in the face.
+%
+Some kids pee their name in snow. Chuck Norris pees his name in concrete.
+%
+The Matrix Trilogy would have ended on the first movie if Keanu Reeves said, “I know Chuck Norris.”
+%
+Chuck Norris created Heavy Metal when he was upset
+%
+Some people ask for a Kleenex when they sneeze, Chuck Norris asks for a body bag.
+%
+When things go bump in the night.... it's Chuck Norris
+%
+Chuck Norris fed the Hunger Games
+%
+Chuck Norris played "Got your Nose" with Voldemort and won.
+%
+Chuck Norris had a knife thrown at him............          the knife didn't impale him, he impaled the knife
+%
+Chuck Norris doesn't let it go.
+%
+You know Chuck Norris' pet lizard, right? Last I heard, he was in the movie "Godzilla". Oh, and his pet turtle starred in "Gamera" as well.
+%
+Whatever Chuck Norris wants, it will instantly appear.
+%
+Chuck Norris once cut a knife with a stick of butter.
+%
+Chuck Norris shops at Sam's Club, but leaves without having his receipt checked
+%
+When the Boogeyman goes to sleep every night, he checks his closet for Chuck Norris.
+%
+Chuck Norris doesn't read books. He stares them down until he gets the information he wants.
+%
+There is no theory of evolution. Just a list of creatures Chuck Norris has allowed to live.
+%
+Outer space exists because it's afraid to be on the same planet with Chuck Norris.
+%
+Chuck Norris does not sleep. He waits.
+%
+Chuck Norris is currently suing NBC, claiming Law and Order are trademarked names for his left and right legs.
+%
+Chuck Norris is the reason why Waldo is hiding.
+%
+Chuck Norris counted to infinity - twice.
+%
+There is no chin behind Chuck Norris’ beard. There is only another fist.
+%
+When Chuck Norris does a pushup, he isn't lifting himself up, he's pushing the Earth down.
+%
+Chuck Norris is so fast, he can run around the world and punch himself in the back of the head.
+%
+Chuck Norris' hand is the only hand that can beat a Royal Flush.
+%
+Chuck Norris can lead a horse to water AND make it drink.
+%
+Chuck Norris doesn’t wear a watch. HE decides what time it is.
+%
+Chuck Norris can slam a revolving door.
+%
+Chuck Norris does not get frostbite. Chuck Norris bites frost.
+%
+Remember the Soviet Union? They decided to quit after watching a DeltaForce marathon on Satellite TV.
+%
+Contrary to popular belief, America is not a democracy, it is a Chucktatorship.
+%
+If you spell Chuck Norris in Scrabble, you win. Forever.
+%
+Guns don't kill people. Chuck Norris kills people.
+%
+There is no theory of evolution. Just a list of animals Chuck Norris allows to live.
+%
+The chief export of Chuck Norris is Pain.
+%
+Chuck Norris has two speeds. Walk, and Kill.
+%
+The leading causes of death in the United States are: 1. Heart Disease 2. Chuck Norris 3. Cancer.
+%
+Chuck Norris drives an ice cream truck covered in human skulls.
+%
+Chuck Norris is my Homeboy.
+%
+Chuck Norris doesn't go hunting.... CHUCK NORRIS GOES KILLING.
+%
+Chuck Norris uses pepper spray to spice up his steaks.
+%
+Chuck Norris once roundhouse kicked someone so hard that his foot broke the speed of light, went back in time, and killed Amelia Earhart while she was flying over the Pacific Ocean.
+%
+Crop circles are Chuck Norris' way of telling the world that sometimes corn needs to lie down.
+%
+Chuck Norris is ten feet tall, weighs two-tons, breathes fire, and could eat a hammer and take a shotgun blast standing.
+%
+The Great Wall of China was originally created to keep Chuck Norris out. It failed miserably.
+%
+Contrary to popular belief, Chuck Norris, not the box jellyfish of northern Australia, is the most venomous creature on earth.
+%
+Most people have 23 pairs of chromosomes. Chuck Norris has 72... and they're all poisonous.
+%
+If you ask Chuck Norris what time it is, he always says, "Two seconds 'til." After you ask, "Two seconds 'til what?" he roundhouse kicks you in the face.
+%
+When Chuck Norris sends in his taxes, he sends blank forms and includes only a picture of himself, crouched and ready to attack. Chuck Norris has not had to pay taxes, ever.
+%
+The quickest way to a man's heart is with Chuck Norris' fist.
+%
+Chuck Norris invented Kentucky Fried Chicken's famous secret recipe, with eleven herbs and spices. But nobody ever mentions the twelfth ingredient: Fear.
+%
+CNN was originally created as the "Chuck Norris Network" to update Americans with on-the-spot ass kicking in real-time.
+%
+Chuck Norris can win a game of Connect Four in only three moves.
+%
+What was going through the minds of all of Chuck Norris' victims before they died? His shoe.
+%
+Chuck Norris is the only man to ever defeat a brick wall in a game of tennis.
+%
+Police label anyone attacking Chuck Norris as a Code 45-11.... a suicide.
+%
+Chuck Norris doesn't churn butter. He roundhouse kicks the cows and the butter comes straight out.
+%
+Chuck Norris doesn’t wash his clothes, he disembowels them.
+%
+A Handicapped parking sign does not signify that this spot is for handicapped people. It is actually in fact a warning, that the spot belongs to Chuck Norris and that you will be handicapped if you park there.
+%
+Chuck Norris will attain statehood in 2009. His state flower will be the Magnolia.
+%
+Someone once videotaped Chuck Norris getting pissed off. It was called Walker: Texas Chain Saw Massacre.
+%
+Chuck Norris originally appeared in the "Street Fighter II" video game, but was removed by Beta Testers because every button caused him to do a roundhouse kick. When asked bout this "glitch," Norris replied, "That's no glitch."
+%
+Fool me once, shame on you. Fool Chuck Norris once and he will roundhouse you in the face.
+%
+In 1945 The US army asked if they could clone Chuck Norris. instead he said he could sort out the Japanese.
+%
+One glance from Chuck Norris and snow turns itself yellow.
+%
+Chuck Norris checks under his bed for Fedor Emelianenko because he takes Fedor to the vet regularly.
+%
+Chuck Norris was the image used for Papa Smurf.
+%
+Chuck Norris is so scary he makes Sharks swim backwards away from him
+%
+When Chuck Norris tosses a coin, it lands on both head and tail.
+%
+Chuck Norris found the last digit of pie
+%
+Chuck Norris Watches "the Nat.Geo. Specials" on Discovery Channel
+%
+James Bond has a license to kill. He got it from Chuck Norris.
+%
+Chuck Norris is Chuck Norris
+%
+"The Big Chuck Norris Roundhouse-Kick Theory"
+%
+That's not an eclipse....that's the sun hiding from Chuck Norris.
+%
+Chuck Norris doesn't like Mudkipz
+%
+When the Boogeyman goes to sleep every night, he checks his closet for Chuck Norris.
+%
+Chuck Norris doesn't read books. He stares them down until he gets the information he wants.
+%
+There is no theory of evolution. Just a list of creatures Chuck Norris has allowed to live.
+%
+Outer space exists because it's afraid to be on the same planet with Chuck Norris.
+%
+Chuck Norris does not sleep. He waits.
+%
+Chuck Norris is currently suing NBC, claiming Law and Order are trademarked names for his left and right legs.
+%
+Chuck Norris is the reason why Waldo is hiding.
+%
+Chuck Norris counted to infinity - twice.
+%
+There is no chin behind Chuck Norris’ beard. There is only another fist.
+%
+When Chuck Norris does a pushup, he isn't lifting himself up, he's pushing the Earth down.
+%
+Chuck Norris is so fast, he can run around the world and punch himself in the back of the head.
+%
+Chuck Norris' hand is the only hand that can beat a Royal Flush.
+%
+Chuck Norris can lead a horse to water AND make it drink.
+%
+Chuck Norris doesn’t wear a watch. HE decides what time it is.
+%
+Chuck Norris can slam a revolving door.
+%
+Chuck Norris does not get frostbite. Chuck Norris bites frost.
+%
+Remember the Soviet Union? They decided to quit after watching a DeltaForce marathon on Satellite TV.
+%
+Contrary to popular belief, America is not a democracy, it is a Chucktatorship.
+%
+If you spell Chuck Norris in Scrabble, you win. Forever.
+%
+Guns don't kill people. Chuck Norris kills people.
+%
+There is no theory of evolution. Just a list of animals Chuck Norris allows to live.
+%
+The chief export of Chuck Norris is Pain.
+%
+Chuck Norris has two speeds. Walk, and Kill.
+%
+The leading causes of death in the United States are: 1. Heart Disease 2. Chuck Norris 3. Cancer.
+%
+Chuck Norris drives an ice cream truck covered in human skulls.
+%
+Chuck Norris is my Homeboy.
+%
+Chuck Norris doesn't go hunting.... CHUCK NORRIS GOES KILLING.
+%
+Chuck Norris uses pepper spray to spice up his steaks.
+%
+Chuck Norris once roundhouse kicked someone so hard that his foot broke the speed of light, went back in time, and killed Amelia Earhart while she was flying over the Pacific Ocean.
+%
+Crop circles are Chuck Norris' way of telling the world that sometimes corn needs to lie down.
+%
+Chuck Norris is ten feet tall, weighs two-tons, breathes fire, and could eat a hammer and take a shotgun blast standing.
+%
+The Great Wall of China was originally created to keep Chuck Norris out. It failed miserably.
+%
+Contrary to popular belief, Chuck Norris, not the box jellyfish of northern Australia, is the most venomous creature on earth.
+%
+Most people have 23 pairs of chromosomes. Chuck Norris has 72... and they're all poisonous.
+%
+If you ask Chuck Norris what time it is, he always says, "Two seconds 'til." After you ask, "Two seconds 'til what?" he roundhouse kicks you in the face.
+%
+When Chuck Norris sends in his taxes, he sends blank forms and includes only a picture of himself, crouched and ready to attack. Chuck Norris has not had to pay taxes, ever.
+%
+The quickest way to a man's heart is with Chuck Norris' fist.
+%
+Chuck Norris invented Kentucky Fried Chicken's famous secret recipe, with eleven herbs and spices. But nobody ever mentions the twelfth ingredient: Fear.
+%
+CNN was originally created as the "Chuck Norris Network" to update Americans with on-the-spot ass kicking in real-time.
+%
+Chuck Norris can win a game of Connect Four in only three moves.
+%
+What was going through the minds of all of Chuck Norris' victims before they died? His shoe.
+%
+Chuck Norris is the only man to ever defeat a brick wall in a game of tennis.
+%
+Police label anyone attacking Chuck Norris as a Code 45-11.... a suicide.
+%
+Chuck Norris doesn't churn butter. He roundhouse kicks the cows and the butter comes straight out.
+%
+Chuck Norris doesn’t wash his clothes, he disembowels them.
+%
+A Handicapped parking sign does not signify that this spot is for handicapped people. It is actually in fact a warning, that the spot belongs to Chuck Norris and that you will be handicapped if you park there.
+%
+Chuck Norris will attain statehood in 2009. His state flower will be the Magnolia.
+%
+Someone once videotaped Chuck Norris getting pissed off. It was called Walker: Texas Chain Saw Massacre.
+%
+Chuck Norris originally appeared in the "Street Fighter II" video game, but was removed by Beta Testers because every button caused him to do a roundhouse kick. When asked bout this "glitch," Norris replied, "That's no glitch."
+%
+Fool me once, shame on you. Fool Chuck Norris once and he will roundhouse you in the face.
+%
+Chuck Norris doesn’t eat salad, he eats vegetarians
+%
+Every time there's an earthquake, you know Chuck Norris is hungry. The earthquake is caused by his stomach growling.
+%
+Chuck Norris wasn't born on his birthday
+%
+One time a test cheated on Chuck Norris.
+%
+Chuck Norris won a stepdance contest by standing on his hands
+%
+Chuck Norris thretened to kill Michael Jackson, MJ got so scared to turned white.
+%
+When Steven Seagal kills a ninja, he only takes its hide. When Chuck Norris kills a ninja, he uses every part.
+%
+Chuck Norris is the life of parties he dosen't attend
+%
+Chuck Norris can rub two fires together and make a stick!
+%
+Contrary to popular beleif, Rome WAS built in a day, by Chuck Norris.
+%
+Chuck Norris rolled a 20 on a 6 sided die.
+%
+When chuck Norris was in school, he made his PE teacher run laps.
+%
+Chuck Norris wins NASCAR races with all right turns.
+%
+When the Boogeyman goes to sleep every night, he checks his closet for Chuck Norris.
+%
+Chuck Norris doesn't read books. He stares them down until he gets the information he wants.
+%
+There is no theory of evolution. Just a list of creatures Chuck Norris has allowed to live.
+%
+Outer space exists because it's afraid to be on the same planet with Chuck Norris.
+%
+Chuck Norris does not sleep. He waits.
+%
+Chuck Norris is currently suing NBC, claiming Law and Order are trademarked names for his left and right legs.
+%
+Chuck Norris is the reason why Waldo is hiding.
+%
+Chuck Norris counted to infinity - twice.
+%
+There is no chin behind Chuck Norris’ beard. There is only another fist.
+%
+When Chuck Norris does a pushup, he isn't lifting himself up, he's pushing the Earth down.
+%
+Chuck Norris is so fast, he can run around the world and punch himself in the back of the head.
+%
+Chuck Norris' hand is the only hand that can beat a Royal Flush.
+%
+Chuck Norris can lead a horse to water AND make it drink.
+%
+Chuck Norris doesn’t wear a watch. HE decides what time it is.
+%
+Chuck Norris can slam a revolving door.
+%
+Chuck Norris does not get frostbite. Chuck Norris bites frost.
+%
+Remember the Soviet Union? They decided to quit after watching a DeltaForce marathon on Satellite TV.
+%
+Contrary to popular belief, America is not a democracy, it is a Chucktatorship.
+%
+If you spell Chuck Norris in Scrabble, you win. Forever.
+%
+Guns don't kill people. Chuck Norris kills people.
+%
+There is no theory of evolution. Just a list of animals Chuck Norris allows to live.
+%
+The chief export of Chuck Norris is Pain.
+%
+Chuck Norris has two speeds. Walk, and Kill.
+%
+The leading causes of death in the United States are: 1. Heart Disease 2. Chuck Norris 3. Cancer.
+%
+Chuck Norris drives an ice cream truck covered in human skulls.
+%
+Chuck Norris is my Homeboy.
+%
+Chuck Norris doesn't go hunting.... CHUCK NORRIS GOES KILLING.
+%
+Chuck Norris uses pepper spray to spice up his steaks.
+%
+Chuck Norris once roundhouse kicked someone so hard that his foot broke the speed of light, went back in time, and killed Amelia Earhart while she was flying over the Pacific Ocean.
+%
+Crop circles are Chuck Norris' way of telling the world that sometimes corn needs to lie down.
+%
+Chuck Norris is ten feet tall, weighs two-tons, breathes fire, and could eat a hammer and take a shotgun blast standing.
+%
+The Great Wall of China was originally created to keep Chuck Norris out. It failed miserably.
+%
+Contrary to popular belief, Chuck Norris, not the box jellyfish of northern Australia, is the most venomous creature on earth.
+%
+Most people have 23 pairs of chromosomes. Chuck Norris has 72... and they're all poisonous.
+%
+If you ask Chuck Norris what time it is, he always says, "Two seconds 'til." After you ask, "Two seconds 'til what?" he roundhouse kicks you in the face.
+%
+When Chuck Norris sends in his taxes, he sends blank forms and includes only a picture of himself, crouched and ready to attack. Chuck Norris has not had to pay taxes, ever.
+%
+The quickest way to a man's heart is with Chuck Norris' fist.
+%
+Chuck Norris invented Kentucky Fried Chicken's famous secret recipe, with eleven herbs and spices. But nobody ever mentions the twelfth ingredient: Fear.
+%
+CNN was originally created as the "Chuck Norris Network" to update Americans with on-the-spot ass kicking in real-time.
+%
+Chuck Norris can win a game of Connect Four in only three moves.
+%
+What was going through the minds of all of Chuck Norris' victims before they died? His shoe.
+%
+Chuck Norris is the only man to ever defeat a brick wall in a game of tennis.
+%
+Police label anyone attacking Chuck Norris as a Code 45-11.... a suicide.
+%
+Chuck Norris doesn't churn butter. He roundhouse kicks the cows and the butter comes straight out.
+%
+Chuck Norris doesn’t wash his clothes, he disembowels them.
+%
+A Handicapped parking sign does not signify that this spot is for handicapped people. It is actually in fact a warning, that the spot belongs to Chuck Norris and that you will be handicapped if you park there.
+%
+Chuck Norris will attain statehood in 2009. His state flower will be the Magnolia.
+%
+Someone once videotaped Chuck Norris getting pissed off. It was called Walker: Texas Chain Saw Massacre.
+%
+Chuck Norris originally appeared in the "Street Fighter II" video game, but was removed by Beta Testers because every button caused him to do a roundhouse kick. When asked bout this "glitch," Norris replied, "That's no glitch."
+%
+Fool me once, shame on you. Fool Chuck Norris once and he will roundhouse you in the face.
+%
+Chuck Norris is waiting for Mt. St. Helens to erupt again. He's hoping the lava is hot enough to soften his beard so he can shave for the first time.
+%
+Chuck Norris is overra...
+%
+Chuck Norris was originally in Mortal Kombat, but that version was deleted because no one can beat Chuck Norris in a fight.
+%
+Chuck Norris likes everyone on the earth, cause everyone he didn't like... Is dead...
+%
+Chunk Norris can make sour milk turn fresh
+%
+There is no limbo, only a world that doesn't know of Chuck Norris
+%
+Chuck Norris CAN believe it's not butter
+%
+Dog the Bounty Hunter can't track Chuck Norris down.
+%
+Abraham Lincoln didn't die because he was shot, Chuck Norris roundhouse-kicked so fast his foot went back in time and killed Abraham Lincoln.
+%
+When Chuck Norris inhales helium, his voice doesn't change.
+%
+When Chuck Norris drinks water, the water automatically pasteurized.
+%
+Chuck Norris once punched the ground to stop an earthquake. The resulting aftershock caused the BP oil spill
+%
+Chuck Norris can play the death waltz with his chin.
+%
+When the Boogeyman goes to sleep every night, he checks his closet for Chuck Norris.
+%
+Chuck Norris doesn't read books. He stares them down until he gets the information he wants.
+%
+There is no theory of evolution. Just a list of creatures Chuck Norris has allowed to live.
+%
+Outer space exists because it's afraid to be on the same planet with Chuck Norris.
+%
+Chuck Norris does not sleep. He waits.
+%
+Chuck Norris is currently suing NBC, claiming Law and Order are trademarked names for his left and right legs.
+%
+Chuck Norris is the reason why Waldo is hiding.
+%
+Chuck Norris counted to infinity - twice.
+%
+There is no chin behind Chuck Norris’ beard. There is only another fist.
+%
+When Chuck Norris does a pushup, he isn't lifting himself up, he's pushing the Earth down.
+%
+Chuck Norris is so fast, he can run around the world and punch himself in the back of the head.
+%
+Chuck Norris' hand is the only hand that can beat a Royal Flush.
+%
+Chuck Norris can lead a horse to water AND make it drink.
+%
+Chuck Norris doesn’t wear a watch. HE decides what time it is.
+%
+Chuck Norris can slam a revolving door.
+%
+Chuck Norris does not get frostbite. Chuck Norris bites frost.
+%
+Remember the Soviet Union? They decided to quit after watching a DeltaForce marathon on Satellite TV.
+%
+Contrary to popular belief, America is not a democracy, it is a Chucktatorship.
+%
+If you spell Chuck Norris in Scrabble, you win. Forever.
+%
+Guns don't kill people. Chuck Norris kills people.
+%
+There is no theory of evolution. Just a list of animals Chuck Norris allows to live.
+%
+The chief export of Chuck Norris is Pain.
+%
+Chuck Norris has two speeds. Walk, and Kill.
+%
+The leading causes of death in the United States are: 1. Heart Disease 2. Chuck Norris 3. Cancer.
+%
+Chuck Norris drives an ice cream truck covered in human skulls.
+%
+Chuck Norris is my Homeboy.
+%
+Chuck Norris doesn't go hunting.... CHUCK NORRIS GOES KILLING.
+%
+Chuck Norris uses pepper spray to spice up his steaks.
+%
+Chuck Norris once roundhouse kicked someone so hard that his foot broke the speed of light, went back in time, and killed Amelia Earhart while she was flying over the Pacific Ocean.
+%
+Crop circles are Chuck Norris' way of telling the world that sometimes corn needs to lie down.
+%
+Chuck Norris is ten feet tall, weighs two-tons, breathes fire, and could eat a hammer and take a shotgun blast standing.
+%
+The Great Wall of China was originally created to keep Chuck Norris out. It failed miserably.
+%
+Contrary to popular belief, Chuck Norris, not the box jellyfish of northern Australia, is the most venomous creature on earth.
+%
+Most people have 23 pairs of chromosomes. Chuck Norris has 72... and they're all poisonous.
+%
+If you ask Chuck Norris what time it is, he always says, "Two seconds 'til." After you ask, "Two seconds 'til what?" he roundhouse kicks you in the face.
+%
+When Chuck Norris sends in his taxes, he sends blank forms and includes only a picture of himself, crouched and ready to attack. Chuck Norris has not had to pay taxes, ever.
+%
+The quickest way to a man's heart is with Chuck Norris' fist.
+%
+Chuck Norris invented Kentucky Fried Chicken's famous secret recipe, with eleven herbs and spices. But nobody ever mentions the twelfth ingredient: Fear.
+%
+CNN was originally created as the "Chuck Norris Network" to update Americans with on-the-spot ass kicking in real-time.
+%
+Chuck Norris can win a game of Connect Four in only three moves.
+%
+What was going through the minds of all of Chuck Norris' victims before they died? His shoe.
+%
+Chuck Norris is the only man to ever defeat a brick wall in a game of tennis.
+%
+Police label anyone attacking Chuck Norris as a Code 45-11.... a suicide.
+%
+Chuck Norris doesn't churn butter. He roundhouse kicks the cows and the butter comes straight out.
+%
+Chuck Norris doesn’t wash his clothes, he disembowels them.
+%
+A Handicapped parking sign does not signify that this spot is for handicapped people. It is actually in fact a warning, that the spot belongs to Chuck Norris and that you will be handicapped if you park there.
+%
+Chuck Norris will attain statehood in 2009. His state flower will be the Magnolia.
+%
+Someone once videotaped Chuck Norris getting pissed off. It was called Walker: Texas Chain Saw Massacre.
+%
+Chuck Norris originally appeared in the "Street Fighter II" video game, but was removed by Beta Testers because every button caused him to do a roundhouse kick. When asked bout this "glitch," Norris replied, "That's no glitch."
+%
+Fool me once, shame on you. Fool Chuck Norris once and he will roundhouse you in the face.
+%
+More of a question than a fact: in a fight between Chuck Norris and Gordan Freeman who would win?
+%
+Chuck Norris once round-house kicked a salesman. Over the phone.
+%
+Chuck Norris can grill a popsicle
+%
+Chuck Norris' films are factual documentaries.
+%
+Casinos pay Chuck Norris not to play at anything or wish anyone good luck.
+%
+Chuck Norris once got a 200 yard punt return
+%
+Every line in a Chuck Norris haiku is "A roundhouse kick to the face."  And they all have the correct number of syllables.
+%
+An angry glare from Chuck Norris is known to kill on the spot.
+%
+Evolution's driving mechanism is nature's desperate attempt to escape Chuck Norris.
+%
+When President Roosevelt dropped the atomic bomb on Hiroshima, he did so only because it was more human then sending Chuck Norris.
+%
+Don't get Chuck Norris angry, last time somebody did that Chuck Norris made the Grand Canyon.
+%
+In Texas, there are five sizes for fountain drinks: small, medium, large, Texas sized, and Chuck Norris Sized.  It is a cup made of a human skull.
+%
+After Chuck counted to infinity the first time, he vowed to count to infinity a second time....by counting the bodies of those previously roundhoused.
+%
+When the Boogeyman goes to sleep every night, he checks his closet for Chuck Norris.
+%
+Chuck Norris doesn't read books. He stares them down until he gets the information he wants.
+%
+There is no theory of evolution. Just a list of creatures Chuck Norris has allowed to live.
+%
+Outer space exists because it's afraid to be on the same planet with Chuck Norris.
+%
+Chuck Norris does not sleep. He waits.
+%
+Chuck Norris is currently suing NBC, claiming Law and Order are trademarked names for his left and right legs.
+%
+Chuck Norris is the reason why Waldo is hiding.
+%
+Chuck Norris counted to infinity - twice.
+%
+There is no chin behind Chuck Norris’ beard. There is only another fist.
+%
+When Chuck Norris does a pushup, he isn't lifting himself up, he's pushing the Earth down.
+%
+Chuck Norris is so fast, he can run around the world and punch himself in the back of the head.
+%
+Chuck Norris' hand is the only hand that can beat a Royal Flush.
+%
+Chuck Norris can lead a horse to water AND make it drink.
+%
+Chuck Norris doesn’t wear a watch. HE decides what time it is.
+%
+Chuck Norris can slam a revolving door.
+%
+Chuck Norris does not get frostbite. Chuck Norris bites frost.
+%
+Remember the Soviet Union? They decided to quit after watching a DeltaForce marathon on Satellite TV.
+%
+Contrary to popular belief, America is not a democracy, it is a Chucktatorship.
+%
+If you spell Chuck Norris in Scrabble, you win. Forever.
+%
+Guns don't kill people. Chuck Norris kills people.
+%
+There is no theory of evolution. Just a list of animals Chuck Norris allows to live.
+%
+The chief export of Chuck Norris is Pain.
+%
+Chuck Norris has two speeds. Walk, and Kill.
+%
+The leading causes of death in the United States are: 1. Heart Disease 2. Chuck Norris 3. Cancer.
+%
+Chuck Norris drives an ice cream truck covered in human skulls.
+%
+Chuck Norris is my Homeboy.
+%
+Chuck Norris doesn't go hunting.... CHUCK NORRIS GOES KILLING.
+%
+Chuck Norris uses pepper spray to spice up his steaks.
+%
+Chuck Norris once roundhouse kicked someone so hard that his foot broke the speed of light, went back in time, and killed Amelia Earhart while she was flying over the Pacific Ocean.
+%
+Crop circles are Chuck Norris' way of telling the world that sometimes corn needs to lie down.
+%
+Chuck Norris is ten feet tall, weighs two-tons, breathes fire, and could eat a hammer and take a shotgun blast standing.
+%
+The Great Wall of China was originally created to keep Chuck Norris out. It failed miserably.
+%
+Contrary to popular belief, Chuck Norris, not the box jellyfish of northern Australia, is the most venomous creature on earth.
+%
+Most people have 23 pairs of chromosomes. Chuck Norris has 72... and they're all poisonous.
+%
+If you ask Chuck Norris what time it is, he always says, "Two seconds 'til." After you ask, "Two seconds 'til what?" he roundhouse kicks you in the face.
+%
+When Chuck Norris sends in his taxes, he sends blank forms and includes only a picture of himself, crouched and ready to attack. Chuck Norris has not had to pay taxes, ever.
+%
+The quickest way to a man's heart is with Chuck Norris' fist.
+%
+Chuck Norris invented Kentucky Fried Chicken's famous secret recipe, with eleven herbs and spices. But nobody ever mentions the twelfth ingredient: Fear.
+%
+CNN was originally created as the "Chuck Norris Network" to update Americans with on-the-spot ass kicking in real-time.
+%
+Chuck Norris can win a game of Connect Four in only three moves.
+%
+What was going through the minds of all of Chuck Norris' victims before they died? His shoe.
+%
+Chuck Norris is the only man to ever defeat a brick wall in a game of tennis.
+%
+Police label anyone attacking Chuck Norris as a Code 45-11.... a suicide.
+%
+Chuck Norris doesn't churn butter. He roundhouse kicks the cows and the butter comes straight out.
+%
+Chuck Norris doesn’t wash his clothes, he disembowels them.
+%
+A Handicapped parking sign does not signify that this spot is for handicapped people. It is actually in fact a warning, that the spot belongs to Chuck Norris and that you will be handicapped if you park there.
+%
+Chuck Norris will attain statehood in 2009. His state flower will be the Magnolia.
+%
+Someone once videotaped Chuck Norris getting pissed off. It was called Walker: Texas Chain Saw Massacre.
+%
+Chuck Norris originally appeared in the "Street Fighter II" video game, but was removed by Beta Testers because every button caused him to do a roundhouse kick. When asked bout this "glitch," Norris replied, "That's no glitch."
+%
+Fool me once, shame on you. Fool Chuck Norris once and he will roundhouse you in the face.
+%
+Taking Karate Lessons = $100, Buying MMA DVD's= $150, Subscribing to a UFC event = $50, Getting a Roundhouse Kick from Chuck Norris = PRICELESS
+%
+Chuck Norris played the game of thrones and won
+%
+Chuck Norris doesn't need sunglasses, the sun needs Chuck Norris glasses
+%
+Chuck Norris doesn't call the wrong number, you just answer the wrong phone.
+%
+Chuck Norris once won the tour de france riding a " big wheel"
+%
+May the Force be with Chuck Norris... for it's own good.
+%
+Chuck Norris once played Duck Duck Goose with a group of Kindergarteners. Only one kid made it to first grade
+%
+During the Civil War Chuck Norris was a slave, his master would often beg him for mercy
+%
+Chuck Norris' glass is never half full or half empty. It stays full even after he takes a drink.
+%
+ King Kong climbed the Empire State building in fear of Chuck Norris who was downstairs at the time.
+%
+Chuck Norris can French kiss his elbow.
+%
+Chuck Norris never trains, because he's Chuck Norris.
+%
+Every phobia known to man has a phobia of Chuck Norris
+%
+When the Boogeyman goes to sleep every night, he checks his closet for Chuck Norris.
+%
+Chuck Norris doesn't read books. He stares them down until he gets the information he wants.
+%
+There is no theory of evolution. Just a list of creatures Chuck Norris has allowed to live.
+%
+Outer space exists because it's afraid to be on the same planet with Chuck Norris.
+%
+Chuck Norris does not sleep. He waits.
+%
+Chuck Norris is currently suing NBC, claiming Law and Order are trademarked names for his left and right legs.
+%
+Chuck Norris is the reason why Waldo is hiding.
+%
+Chuck Norris counted to infinity - twice.
+%
+There is no chin behind Chuck Norris’ beard. There is only another fist.
+%
+When Chuck Norris does a pushup, he isn't lifting himself up, he's pushing the Earth down.
+%
+Chuck Norris is so fast, he can run around the world and punch himself in the back of the head.
+%
+Chuck Norris' hand is the only hand that can beat a Royal Flush.
+%
+Chuck Norris can lead a horse to water AND make it drink.
+%
+Chuck Norris doesn’t wear a watch. HE decides what time it is.
+%
+Chuck Norris can slam a revolving door.
+%
+Chuck Norris does not get frostbite. Chuck Norris bites frost.
+%
+Remember the Soviet Union? They decided to quit after watching a DeltaForce marathon on Satellite TV.
+%
+Contrary to popular belief, America is not a democracy, it is a Chucktatorship.
+%
+If you spell Chuck Norris in Scrabble, you win. Forever.
+%
+Guns don't kill people. Chuck Norris kills people.
+%
+There is no theory of evolution. Just a list of animals Chuck Norris allows to live.
+%
+The chief export of Chuck Norris is Pain.
+%
+Chuck Norris has two speeds. Walk, and Kill.
+%
+The leading causes of death in the United States are: 1. Heart Disease 2. Chuck Norris 3. Cancer.
+%
+Chuck Norris drives an ice cream truck covered in human skulls.
+%
+Chuck Norris is my Homeboy.
+%
+Chuck Norris doesn't go hunting.... CHUCK NORRIS GOES KILLING.
+%
+Chuck Norris uses pepper spray to spice up his steaks.
+%
+Chuck Norris once roundhouse kicked someone so hard that his foot broke the speed of light, went back in time, and killed Amelia Earhart while she was flying over the Pacific Ocean.
+%
+Crop circles are Chuck Norris' way of telling the world that sometimes corn needs to lie down.
+%
+Chuck Norris is ten feet tall, weighs two-tons, breathes fire, and could eat a hammer and take a shotgun blast standing.
+%
+The Great Wall of China was originally created to keep Chuck Norris out. It failed miserably.
+%
+Contrary to popular belief, Chuck Norris, not the box jellyfish of northern Australia, is the most venomous creature on earth.
+%
+Most people have 23 pairs of chromosomes. Chuck Norris has 72... and they're all poisonous.
+%
+If you ask Chuck Norris what time it is, he always says, "Two seconds 'til." After you ask, "Two seconds 'til what?" he roundhouse kicks you in the face.
+%
+When Chuck Norris sends in his taxes, he sends blank forms and includes only a picture of himself, crouched and ready to attack. Chuck Norris has not had to pay taxes, ever.
+%
+The quickest way to a man's heart is with Chuck Norris' fist.
+%
+Chuck Norris invented Kentucky Fried Chicken's famous secret recipe, with eleven herbs and spices. But nobody ever mentions the twelfth ingredient: Fear.
+%
+CNN was originally created as the "Chuck Norris Network" to update Americans with on-the-spot ass kicking in real-time.
+%
+Chuck Norris can win a game of Connect Four in only three moves.
+%
+What was going through the minds of all of Chuck Norris' victims before they died? His shoe.
+%
+Chuck Norris is the only man to ever defeat a brick wall in a game of tennis.
+%
+Police label anyone attacking Chuck Norris as a Code 45-11.... a suicide.
+%
+Chuck Norris doesn't churn butter. He roundhouse kicks the cows and the butter comes straight out.
+%
+Chuck Norris doesn’t wash his clothes, he disembowels them.
+%
+A Handicapped parking sign does not signify that this spot is for handicapped people. It is actually in fact a warning, that the spot belongs to Chuck Norris and that you will be handicapped if you park there.
+%
+Chuck Norris will attain statehood in 2009. His state flower will be the Magnolia.
+%
+Someone once videotaped Chuck Norris getting pissed off. It was called Walker: Texas Chain Saw Massacre.
+%
+Chuck Norris originally appeared in the "Street Fighter II" video game, but was removed by Beta Testers because every button caused him to do a roundhouse kick. When asked bout this "glitch," Norris replied, "That's no glitch."
+%
+Fool me once, shame on you. Fool Chuck Norris once and he will roundhouse you in the face.
+%
+Once upon a time, Chuck Norris found himself in a town called Shit Creek.....He opened a Paddle Store.
+%
+Chuck Norris Can Power Solar Panels. At Night.
+%
+When Betty White gets angry, she turns into the Hulk. When Valerie Bertinelli gets mad, she turns into Chuck Norris.
+%
+Chuck Norris is so hard, he uses diamonds as stress balls.
+%
+Chuck Norris can roundhouse kick someone through a window without breaking the glass
+%
+Chuck Norris. Enough said.
+%
+The letters in Chuck Norris cannot be unscrambled.
+%
+Chuck Norris once taught a class of martial arts.Unfortunately Chuck had forgiven to take elephant tranquilizers and killed every one just by saluting
+%
+Chuck Norris was heard in a soundproof room!
+%
+Chuck Norris can see in 3D with just one eye.
+%
+Chuck Norris owns all number 1 pencils.
+%
+Staring at Chuck Norris for extended periods of time without proper eye protection will cause blindess, and possibly foot sized brusies on the face.
+%
+Chuck Norris doesn’t brew up tea. He sucks the bag.
+%
+When the Boogeyman goes to sleep every night, he checks his closet for Chuck Norris.
+%
+Chuck Norris doesn't read books. He stares them down until he gets the information he wants.
+%
+There is no theory of evolution. Just a list of creatures Chuck Norris has allowed to live.
+%
+Outer space exists because it's afraid to be on the same planet with Chuck Norris.
+%
+Chuck Norris does not sleep. He waits.
+%
+Chuck Norris is currently suing NBC, claiming Law and Order are trademarked names for his left and right legs.
+%
+Chuck Norris is the reason why Waldo is hiding.
+%
+Chuck Norris counted to infinity - twice.
+%
+There is no chin behind Chuck Norris’ beard. There is only another fist.
+%
+When Chuck Norris does a pushup, he isn't lifting himself up, he's pushing the Earth down.
+%
+Chuck Norris is so fast, he can run around the world and punch himself in the back of the head.
+%
+Chuck Norris' hand is the only hand that can beat a Royal Flush.
+%
+Chuck Norris can lead a horse to water AND make it drink.
+%
+Chuck Norris doesn’t wear a watch. HE decides what time it is.
+%
+Chuck Norris can slam a revolving door.
+%
+Chuck Norris does not get frostbite. Chuck Norris bites frost.
+%
+Remember the Soviet Union? They decided to quit after watching a DeltaForce marathon on Satellite TV.
+%
+Contrary to popular belief, America is not a democracy, it is a Chucktatorship.
+%
+If you spell Chuck Norris in Scrabble, you win. Forever.
+%
+Guns don't kill people. Chuck Norris kills people.
+%
+There is no theory of evolution. Just a list of animals Chuck Norris allows to live.
+%
+The chief export of Chuck Norris is Pain.
+%
+Chuck Norris has two speeds. Walk, and Kill.
+%
+The leading causes of death in the United States are: 1. Heart Disease 2. Chuck Norris 3. Cancer.
+%
+Chuck Norris drives an ice cream truck covered in human skulls.
+%
+Chuck Norris is my Homeboy.
+%
+Chuck Norris doesn't go hunting.... CHUCK NORRIS GOES KILLING.
+%
+Chuck Norris uses pepper spray to spice up his steaks.
+%
+Chuck Norris once roundhouse kicked someone so hard that his foot broke the speed of light, went back in time, and killed Amelia Earhart while she was flying over the Pacific Ocean.
+%
+Crop circles are Chuck Norris' way of telling the world that sometimes corn needs to lie down.
+%
+Chuck Norris is ten feet tall, weighs two-tons, breathes fire, and could eat a hammer and take a shotgun blast standing.
+%
+The Great Wall of China was originally created to keep Chuck Norris out. It failed miserably.
+%
+Contrary to popular belief, Chuck Norris, not the box jellyfish of northern Australia, is the most venomous creature on earth.
+%
+Most people have 23 pairs of chromosomes. Chuck Norris has 72... and they're all poisonous.
+%
+If you ask Chuck Norris what time it is, he always says, "Two seconds 'til." After you ask, "Two seconds 'til what?" he roundhouse kicks you in the face.
+%
+When Chuck Norris sends in his taxes, he sends blank forms and includes only a picture of himself, crouched and ready to attack. Chuck Norris has not had to pay taxes, ever.
+%
+The quickest way to a man's heart is with Chuck Norris' fist.
+%
+Chuck Norris invented Kentucky Fried Chicken's famous secret recipe, with eleven herbs and spices. But nobody ever mentions the twelfth ingredient: Fear.
+%
+CNN was originally created as the "Chuck Norris Network" to update Americans with on-the-spot ass kicking in real-time.
+%
+Chuck Norris can win a game of Connect Four in only three moves.
+%
+What was going through the minds of all of Chuck Norris' victims before they died? His shoe.
+%
+Chuck Norris is the only man to ever defeat a brick wall in a game of tennis.
+%
+Police label anyone attacking Chuck Norris as a Code 45-11.... a suicide.
+%
+Chuck Norris doesn't churn butter. He roundhouse kicks the cows and the butter comes straight out.
+%
+Chuck Norris doesn’t wash his clothes, he disembowels them.
+%
+A Handicapped parking sign does not signify that this spot is for handicapped people. It is actually in fact a warning, that the spot belongs to Chuck Norris and that you will be handicapped if you park there.
+%
+Chuck Norris will attain statehood in 2009. His state flower will be the Magnolia.
+%
+Someone once videotaped Chuck Norris getting pissed off. It was called Walker: Texas Chain Saw Massacre.
+%
+Chuck Norris originally appeared in the "Street Fighter II" video game, but was removed by Beta Testers because every button caused him to do a roundhouse kick. When asked bout this "glitch," Norris replied, "That's no glitch."
+%
+Fool me once, shame on you. Fool Chuck Norris once and he will roundhouse you in the face.
+%
+They say death by a 1000 lashes was the most painful way to die, that was before they got roundhouse kicked in the face by Chuck Norris
+%
+Chuck Norris made a statue bleed.
+%
+Dead bodies were found of people that are still alive. These people will cross Chuck Norris in the future and will be round-house kicked back in time.
+%
+The reason why batman only comes out at night is because he's afraid he might encounter Chuck Norris in the Morning and afternoon.
+%
+The kids said when Chuck was eating Trix cereal ´´silly Chuck, Trix are for kids´´...what happened next?..............................Darfur happened.
+%
+Chuck Norris can roundhouse-kick round houses into squares.
+%
+Chuck Norris is allowed two carry-ons.
+%
+Chuck Norris can divide by zero.
+%
+Chuck Norris does not have a cell phone because he hears everything
+%
+Chuck Norris isn't appropriate...appropriate isn't Chuck Norris
+%
+Earth's rotation is purely governed by the direction that Chuck Norris is walking.
+%
+Chuck Norris drowned a man ON LAND.
+%
+The Jone's are trying to keep up with Chuck Norris
+%
+When the Boogeyman goes to sleep every night, he checks his closet for Chuck Norris.
+%
+Chuck Norris doesn't read books. He stares them down until he gets the information he wants.
+%
+There is no theory of evolution. Just a list of creatures Chuck Norris has allowed to live.
+%
+Outer space exists because it's afraid to be on the same planet with Chuck Norris.
+%
+Chuck Norris does not sleep. He waits.
+%
+Chuck Norris is currently suing NBC, claiming Law and Order are trademarked names for his left and right legs.
+%
+Chuck Norris is the reason why Waldo is hiding.
+%
+Chuck Norris counted to infinity - twice.
+%
+There is no chin behind Chuck Norris’ beard. There is only another fist.
+%
+When Chuck Norris does a pushup, he isn't lifting himself up, he's pushing the Earth down.
+%
+Chuck Norris is so fast, he can run around the world and punch himself in the back of the head.
+%
+Chuck Norris' hand is the only hand that can beat a Royal Flush.
+%
+Chuck Norris can lead a horse to water AND make it drink.
+%
+Chuck Norris doesn’t wear a watch. HE decides what time it is.
+%
+Chuck Norris can slam a revolving door.
+%
+Chuck Norris does not get frostbite. Chuck Norris bites frost.
+%
+Remember the Soviet Union? They decided to quit after watching a DeltaForce marathon on Satellite TV.
+%
+Contrary to popular belief, America is not a democracy, it is a Chucktatorship.
+%
+If you spell Chuck Norris in Scrabble, you win. Forever.
+%
+Guns don't kill people. Chuck Norris kills people.
+%
+There is no theory of evolution. Just a list of animals Chuck Norris allows to live.
+%
+The chief export of Chuck Norris is Pain.
+%
+Chuck Norris has two speeds. Walk, and Kill.
+%
+The leading causes of death in the United States are: 1. Heart Disease 2. Chuck Norris 3. Cancer.
+%
+Chuck Norris drives an ice cream truck covered in human skulls.
+%
+Chuck Norris is my Homeboy.
+%
+Chuck Norris doesn't go hunting.... CHUCK NORRIS GOES KILLING.
+%
+Chuck Norris uses pepper spray to spice up his steaks.
+%
+Chuck Norris once roundhouse kicked someone so hard that his foot broke the speed of light, went back in time, and killed Amelia Earhart while she was flying over the Pacific Ocean.
+%
+Crop circles are Chuck Norris' way of telling the world that sometimes corn needs to lie down.
+%
+Chuck Norris is ten feet tall, weighs two-tons, breathes fire, and could eat a hammer and take a shotgun blast standing.
+%
+The Great Wall of China was originally created to keep Chuck Norris out. It failed miserably.
+%
+Contrary to popular belief, Chuck Norris, not the box jellyfish of northern Australia, is the most venomous creature on earth.
+%
+Most people have 23 pairs of chromosomes. Chuck Norris has 72... and they're all poisonous.
+%
+If you ask Chuck Norris what time it is, he always says, "Two seconds 'til." After you ask, "Two seconds 'til what?" he roundhouse kicks you in the face.
+%
+When Chuck Norris sends in his taxes, he sends blank forms and includes only a picture of himself, crouched and ready to attack. Chuck Norris has not had to pay taxes, ever.
+%
+The quickest way to a man's heart is with Chuck Norris' fist.
+%
+Chuck Norris invented Kentucky Fried Chicken's famous secret recipe, with eleven herbs and spices. But nobody ever mentions the twelfth ingredient: Fear.
+%
+CNN was originally created as the "Chuck Norris Network" to update Americans with on-the-spot ass kicking in real-time.
+%
+Chuck Norris can win a game of Connect Four in only three moves.
+%
+What was going through the minds of all of Chuck Norris' victims before they died? His shoe.
+%
+Chuck Norris is the only man to ever defeat a brick wall in a game of tennis.
+%
+Police label anyone attacking Chuck Norris as a Code 45-11.... a suicide.
+%
+Chuck Norris doesn't churn butter. He roundhouse kicks the cows and the butter comes straight out.
+%
+Chuck Norris doesn’t wash his clothes, he disembowels them.
+%
+A Handicapped parking sign does not signify that this spot is for handicapped people. It is actually in fact a warning, that the spot belongs to Chuck Norris and that you will be handicapped if you park there.
+%
+Chuck Norris will attain statehood in 2009. His state flower will be the Magnolia.
+%
+Someone once videotaped Chuck Norris getting pissed off. It was called Walker: Texas Chain Saw Massacre.
+%
+Chuck Norris originally appeared in the "Street Fighter II" video game, but was removed by Beta Testers because every button caused him to do a roundhouse kick. When asked bout this "glitch," Norris replied, "That's no glitch."
+%
+Fool me once, shame on you. Fool Chuck Norris once and he will roundhouse you in the face.
+%
+Chuck Norris bowled a 301 after constructing another pin out of his beard hair
+%
+The only reason that USA lost the 2011 world cup to Japan is because Chuck Norris wasn't there.
+%
+Unlike Jack Bauer, Chuck Norris doesn't need bullets. A quick roundhouse to the face kills twice as fast.
+%
+There is no such thing as global warming. Chuck Norris was cold, so he turned the sun up.
+%
+Chuck Norris' dog pick up after him.
+%
+Jedis are now taught to use the "Chuck"
+%
+Chuck Norris dosent carry a list. He always knows what to do.
+%
+When Chuck Norris performs a roundhouse kick, he's actually measuring the circumference of the universe.
+%
+Walker: Texas Ranger went into syndication before the first episode was shot.
+%
+Chuck Norris doesn't throw up if he drinks too much. Chuck Norris throws down!
+%
+"Walker Texas Ranger: The Movie 3-D" was considered by Warner Brothers; however the technology to create the visual effects will never be possible.
+%
+When Chuck Norris creates a login, it tells him "password not strong enough", he types in his name and it tells him "password too strong."
+%
+Chuck Norris isn't allowed at the zoo because when he's there the animals are terriefied to come out their cages
+%
+When the Boogeyman goes to sleep every night, he checks his closet for Chuck Norris.
+%
+Chuck Norris doesn't read books. He stares them down until he gets the information he wants.
+%
+There is no theory of evolution. Just a list of creatures Chuck Norris has allowed to live.
+%
+Outer space exists because it's afraid to be on the same planet with Chuck Norris.
+%
+Chuck Norris does not sleep. He waits.
+%
+Chuck Norris is currently suing NBC, claiming Law and Order are trademarked names for his left and right legs.
+%
+Chuck Norris is the reason why Waldo is hiding.
+%
+Chuck Norris counted to infinity - twice.
+%
+There is no chin behind Chuck Norris’ beard. There is only another fist.
+%
+When Chuck Norris does a pushup, he isn't lifting himself up, he's pushing the Earth down.
+%
+Chuck Norris is so fast, he can run around the world and punch himself in the back of the head.
+%
+Chuck Norris' hand is the only hand that can beat a Royal Flush.
+%
+Chuck Norris can lead a horse to water AND make it drink.
+%
+Chuck Norris doesn’t wear a watch. HE decides what time it is.
+%
+Chuck Norris can slam a revolving door.
+%
+Chuck Norris does not get frostbite. Chuck Norris bites frost.
+%
+Remember the Soviet Union? They decided to quit after watching a DeltaForce marathon on Satellite TV.
+%
+Contrary to popular belief, America is not a democracy, it is a Chucktatorship.
+%
+If you spell Chuck Norris in Scrabble, you win. Forever.
+%
+Guns don't kill people. Chuck Norris kills people.
+%
+There is no theory of evolution. Just a list of animals Chuck Norris allows to live.
+%
+The chief export of Chuck Norris is Pain.
+%
+Chuck Norris has two speeds. Walk, and Kill.
+%
+The leading causes of death in the United States are: 1. Heart Disease 2. Chuck Norris 3. Cancer.
+%
+Chuck Norris drives an ice cream truck covered in human skulls.
+%
+Chuck Norris is my Homeboy.
+%
+Chuck Norris doesn't go hunting.... CHUCK NORRIS GOES KILLING.
+%
+Chuck Norris uses pepper spray to spice up his steaks.
+%
+Chuck Norris once roundhouse kicked someone so hard that his foot broke the speed of light, went back in time, and killed Amelia Earhart while she was flying over the Pacific Ocean.
+%
+Crop circles are Chuck Norris' way of telling the world that sometimes corn needs to lie down.
+%
+Chuck Norris is ten feet tall, weighs two-tons, breathes fire, and could eat a hammer and take a shotgun blast standing.
+%
+The Great Wall of China was originally created to keep Chuck Norris out. It failed miserably.
+%
+Contrary to popular belief, Chuck Norris, not the box jellyfish of northern Australia, is the most venomous creature on earth.
+%
+Most people have 23 pairs of chromosomes. Chuck Norris has 72... and they're all poisonous.
+%
+If you ask Chuck Norris what time it is, he always says, "Two seconds 'til." After you ask, "Two seconds 'til what?" he roundhouse kicks you in the face.
+%
+When Chuck Norris sends in his taxes, he sends blank forms and includes only a picture of himself, crouched and ready to attack. Chuck Norris has not had to pay taxes, ever.
+%
+The quickest way to a man's heart is with Chuck Norris' fist.
+%
+Chuck Norris invented Kentucky Fried Chicken's famous secret recipe, with eleven herbs and spices. But nobody ever mentions the twelfth ingredient: Fear.
+%
+CNN was originally created as the "Chuck Norris Network" to update Americans with on-the-spot ass kicking in real-time.
+%
+Chuck Norris can win a game of Connect Four in only three moves.
+%
+What was going through the minds of all of Chuck Norris' victims before they died? His shoe.
+%
+Chuck Norris is the only man to ever defeat a brick wall in a game of tennis.
+%
+Police label anyone attacking Chuck Norris as a Code 45-11.... a suicide.
+%
+Chuck Norris doesn't churn butter. He roundhouse kicks the cows and the butter comes straight out.
+%
+Chuck Norris doesn’t wash his clothes, he disembowels them.
+%
+A Handicapped parking sign does not signify that this spot is for handicapped people. It is actually in fact a warning, that the spot belongs to Chuck Norris and that you will be handicapped if you park there.
+%
+Chuck Norris will attain statehood in 2009. His state flower will be the Magnolia.
+%
+Someone once videotaped Chuck Norris getting pissed off. It was called Walker: Texas Chain Saw Massacre.
+%
+Chuck Norris originally appeared in the "Street Fighter II" video game, but was removed by Beta Testers because every button caused him to do a roundhouse kick. When asked bout this "glitch," Norris replied, "That's no glitch."
+%
+Fool me once, shame on you. Fool Chuck Norris once and he will roundhouse you in the face.
+%
+Aliens fear that Chuck Norris might abduct them.
+%
+Chuck Norris splattered tiger blood and Adonis' dna on Charlie Sheen with 1 roundhouse kick!
+%
+How much wood could a woodchuck chuck if a woodchuck could chuck wood?  No woodchuck could chuck Chuck's wood!
+%
+The sun only rises every morning because Chuck Norris allows it to.
+%
+Chuck Norris can do a regime change with a roundhouse kick.
+%
+Chuck Norris CAN spell with an I before E even after C.
+%
+Ghosts can see Chuck Norris
+%
+The answer to life, the universe and everything isnt 42. It's Chuck Norris.
+%
+When Chuck Norris pokes the Pillsbury Doughboy, it's not a laughing matter.
+%
+Chuck Norris once thought he was wrong. He was, however, mistaken.
+%
+Ever wonder what really happened to the dinosaurs? They all dug their own graves when they heard Chuck Norris was coming
+%
+"The wind cries Chuck Norris"
+%
+Chuck Norris doesn't need a bulletproof vest. He catches them with his bare hands.
+%
+When the Boogeyman goes to sleep every night, he checks his closet for Chuck Norris.
+%
+Chuck Norris doesn't read books. He stares them down until he gets the information he wants.
+%
+There is no theory of evolution. Just a list of creatures Chuck Norris has allowed to live.
+%
+Outer space exists because it's afraid to be on the same planet with Chuck Norris.
+%
+Chuck Norris does not sleep. He waits.
+%
+Chuck Norris is currently suing NBC, claiming Law and Order are trademarked names for his left and right legs.
+%
+Chuck Norris is the reason why Waldo is hiding.
+%
+Chuck Norris counted to infinity - twice.
+%
+There is no chin behind Chuck Norris’ beard. There is only another fist.
+%
+When Chuck Norris does a pushup, he isn't lifting himself up, he's pushing the Earth down.
+%
+Chuck Norris is so fast, he can run around the world and punch himself in the back of the head.
+%
+Chuck Norris' hand is the only hand that can beat a Royal Flush.
+%
+Chuck Norris can lead a horse to water AND make it drink.
+%
+Chuck Norris doesn’t wear a watch. HE decides what time it is.
+%
+Chuck Norris can slam a revolving door.
+%
+Chuck Norris does not get frostbite. Chuck Norris bites frost.
+%
+Remember the Soviet Union? They decided to quit after watching a DeltaForce marathon on Satellite TV.
+%
+Contrary to popular belief, America is not a democracy, it is a Chucktatorship.
+%
+If you spell Chuck Norris in Scrabble, you win. Forever.
+%
+Guns don't kill people. Chuck Norris kills people.
+%
+There is no theory of evolution. Just a list of animals Chuck Norris allows to live.
+%
+The chief export of Chuck Norris is Pain.
+%
+Chuck Norris has two speeds. Walk, and Kill.
+%
+The leading causes of death in the United States are: 1. Heart Disease 2. Chuck Norris 3. Cancer.
+%
+Chuck Norris drives an ice cream truck covered in human skulls.
+%
+Chuck Norris is my Homeboy.
+%
+Chuck Norris doesn't go hunting.... CHUCK NORRIS GOES KILLING.
+%
+Chuck Norris uses pepper spray to spice up his steaks.
+%
+Chuck Norris once roundhouse kicked someone so hard that his foot broke the speed of light, went back in time, and killed Amelia Earhart while she was flying over the Pacific Ocean.
+%
+Crop circles are Chuck Norris' way of telling the world that sometimes corn needs to lie down.
+%
+Chuck Norris is ten feet tall, weighs two-tons, breathes fire, and could eat a hammer and take a shotgun blast standing.
+%
+The Great Wall of China was originally created to keep Chuck Norris out. It failed miserably.
+%
+Contrary to popular belief, Chuck Norris, not the box jellyfish of northern Australia, is the most venomous creature on earth.
+%
+Most people have 23 pairs of chromosomes. Chuck Norris has 72... and they're all poisonous.
+%
+If you ask Chuck Norris what time it is, he always says, "Two seconds 'til." After you ask, "Two seconds 'til what?" he roundhouse kicks you in the face.
+%
+When Chuck Norris sends in his taxes, he sends blank forms and includes only a picture of himself, crouched and ready to attack. Chuck Norris has not had to pay taxes, ever.
+%
+The quickest way to a man's heart is with Chuck Norris' fist.
+%
+Chuck Norris invented Kentucky Fried Chicken's famous secret recipe, with eleven herbs and spices. But nobody ever mentions the twelfth ingredient: Fear.
+%
+CNN was originally created as the "Chuck Norris Network" to update Americans with on-the-spot ass kicking in real-time.
+%
+Chuck Norris can win a game of Connect Four in only three moves.
+%
+What was going through the minds of all of Chuck Norris' victims before they died? His shoe.
+%
+Chuck Norris is the only man to ever defeat a brick wall in a game of tennis.
+%
+Police label anyone attacking Chuck Norris as a Code 45-11.... a suicide.
+%
+Chuck Norris doesn't churn butter. He roundhouse kicks the cows and the butter comes straight out.
+%
+Chuck Norris doesn’t wash his clothes, he disembowels them.
+%
+A Handicapped parking sign does not signify that this spot is for handicapped people. It is actually in fact a warning, that the spot belongs to Chuck Norris and that you will be handicapped if you park there.
+%
+Chuck Norris will attain statehood in 2009. His state flower will be the Magnolia.
+%
+Someone once videotaped Chuck Norris getting pissed off. It was called Walker: Texas Chain Saw Massacre.
+%
+Chuck Norris originally appeared in the "Street Fighter II" video game, but was removed by Beta Testers because every button caused him to do a roundhouse kick. When asked bout this "glitch," Norris replied, "That's no glitch."
+%
+Fool me once, shame on you. Fool Chuck Norris once and he will roundhouse you in the face.
+%
+Chuck Norris: even Naruto can't believe it
+%
+Chuck Norris can fit 10 gallons of water in a 5 gallon water bucket
 %
-With the rising cost of gasoline, Chuck Norris is beginning to worry about his drinking habit. 
+Chuck Norris roundhouse kicks people in the face first and asks questions later.
 %
-The square root of Chuck Norris is pain. Do not try to square Chuck Norris, the result is death. 
+Chuck Norris is the only one who can tear a facebook page!
 %
-Chuck Norris' testicles do not produce sperm. They produce tiny white ninjas that recognize only one mission: seek and destroy. 
+Chuck Norris doesn't need air, he is air
 %
-To be or not to be? That is the question. The answer? Chuck Norris. 
+Chuck Norris once tried to teach a fat, stupid kid Martial Arts. Unsuccessfully. The kid grew up to be Steven Seagal.
 %
-Chuck Norris has never been in a fight, ever. Do you call one roundhouse kick to the face a fight? 
+Achievement Unlocked: Chuck Norris of Death
 %
-There are two types of people in the world... people that suck, and Chuck Norris. 
+Chuck Norris is the ghost in paranormal activity.
 %
-Chuck Norris never wet his bed as a child. The bed wet itself out of fear. 
+Chuck Norris can't get fired by Donald Trump
 %
-If you were somehow able to land a punch on Chuck Norris your entire arm would shatter upon impact. This is only in theory, since, come on, who in their right mind would try this? 
+Ozzy Osbourne once accidentally bit the head off a live bat - Chuck Norris once deliberately bit the head off a live pterodactyl.
 %
-70% of a human's weight is water. 70% of Chuck Norris' weight is his dick. 
+Note to self:  Don’t be the cashier to tell Chuck Norris his coupons have expired.
 %
-Jean-Claude Van Damme once kicked Chuck Norris' ass. He was then awakened from his dream by a roundhouse kick to the face. 
+Chuck Norris was what Willis was talking about.
 %
-The pie scene in "American Pie" is based on a dare Chuck Norris took when he was younger. However, in Chuck Norris' case, the "pie" was the molten crater of an active volcano. 
+Chuck Norris is entitiled to his own facts.
 %
-Chuck Norris uses 8'x10' sheets of plywood as toilet paper. 
+When the Boogeyman goes to sleep every night, he checks his closet for Chuck Norris.
 %
-Noah was the only man notified before Chuck Norris relieved himself in the Atlantic Ocean. 
+Chuck Norris doesn't read books. He stares them down until he gets the information he wants.
 %
-Chuck Norris once invited all of the other badasses from TV to duke it out in order to see who was the supreme badass. Only two showed up-- Jack Bauer and MacGyver. 
+There is no theory of evolution. Just a list of creatures Chuck Norris has allowed to live.
 %
-MacGyver immediately tried to make a bomb out of some Q-Tips and Gatorade, but Chuck Norris roundhouse-kicked him in the solar plexus. MacGyver promptly threw up his own heart. 
+Outer space exists because it's afraid to be on the same planet with Chuck Norris.
 %
-Jack Bauer tried to use his detailed knowledge of torture techniques, but to no avail: Chuck Norris thrives on pain. Chuck Norris then ripped off Jack Bauer's arm and beat him to death with it. Game, set, match. 
+Chuck Norris does not sleep. He waits.
 %
-Chuck Norris eats steak for every single meal. Most times he forgets to kill the cow. 
+Chuck Norris is currently suing NBC, claiming Law and Order are trademarked names for his left and right legs.
 %
-The First Law of Thermodynamics states that energy can neither be created nor destroyed... unless it meets Chuck Norris. 
+Chuck Norris is the reason why Waldo is hiding.
 %
-Chuck Norris doesn't go on the internet, he has every internet site stored in his memory. He refreshes webpages by blinking. 
+Chuck Norris counted to infinity - twice.
 %
-Fact: Chuck Norris doesn't consider it sex if the woman survives. 
+There is no chin behind Chuck Norris’ beard. There is only another fist.
 %
-It is said that looking into Chuck Norris' eyes will reveal your future. Unfortunately, everybody's future is always the same: death by a roundhouse-kick to the face. 
+When Chuck Norris does a pushup, he isn't lifting himself up, he's pushing the Earth down.
 %
-Chuck Norris knows everything there is to know - Except for the definition of mercy. 
+Chuck Norris is so fast, he can run around the world and punch himself in the back of the head.
 %
-Scientifically speaking, it is impossible to charge Chuck Norris with "obstruction of justice." This is because even Chuck Norris cannot be in two places at the same time. 
+Chuck Norris' hand is the only hand that can beat a Royal Flush.
 %
-Chuck Norris never has to wax his skis because they're always slick with blood. 
+Chuck Norris can lead a horse to water AND make it drink.
 %
-When you say "no one's perfect", Chuck Norris takes this as a personal insult. 
+Chuck Norris doesn’t wear a watch. HE decides what time it is.
 %
-Chuck Norris can win a game of Trivial Pursuit with one roll of the dice, and without answering a single question... just a nod of the head, and a stroke of the beard. 
+Chuck Norris can slam a revolving door.
 %
-182,000 Americans die from Chuck Norris-related accidents every year. 
+Chuck Norris does not get frostbite. Chuck Norris bites frost.
 %
-Paper beats rock, rock beats scissors, and scissors beats paper, but Chuck Norris beats all 3 at the same time. 
+Remember the Soviet Union? They decided to quit after watching a DeltaForce marathon on Satellite TV.
 %
-Jesus can walk on water, but Chuck Norris can walk on Jesus. 
+Contrary to popular belief, America is not a democracy, it is a Chucktatorship.
 %
-All roads lead to Chuck Norris. And by the transitive property, a roundhouse kick to the face. 
+If you spell Chuck Norris in Scrabble, you win. Forever.
 %
-If you're driving down the road and you think Chuck Norris just cut you off, you better thank your lucky stars it wasn't the other way around. 
+Guns don't kill people. Chuck Norris kills people.
 %
-July 4th is Independence day. And the day Chuck Norris was born. Coincidence? i think not. 
+There is no theory of evolution. Just a list of animals Chuck Norris allows to live.
 %
-Chuck Norris never goes to the dentist because his teeth are unbreakable. His enemies never go to the dentist because they have no teeth. 
+The chief export of Chuck Norris is Pain.
 %
-In the medical community, death is referred to as "Chuck Norris Disease" 
+Chuck Norris has two speeds. Walk, and Kill.
 %
-Chuck Norris was once in a knife fight, and the knife lost. 
+The leading causes of death in the United States are: 1. Heart Disease 2. Chuck Norris 3. Cancer.
 %
-If you work in an office with Chuck Norris, don't ask him for his three-hole-punch. 
+Chuck Norris drives an ice cream truck covered in human skulls.
 %
-In the Words of Julius Caesar, "Veni, Vidi, Vici, Chuck Norris". Translation: I came, I saw, and I was roundhouse-kicked inthe face by Chuck Norris. 
+Chuck Norris is my Homeboy.
 %
-The First rule of Chuck Norris is: you do not talk about Chuck Norris. 
+Chuck Norris doesn't go hunting.... CHUCK NORRIS GOES KILLING.
 %
-Chuck Norris is widely predicted to be first black president. If you're thinking to yourself, "But Chuck Norris isn't black", then you are dead wrong. And stop being a racist. 
+Chuck Norris uses pepper spray to spice up his steaks.
 %
-When Chuck Norris plays Monopoly, it affects the actual world economy. 
+Chuck Norris once roundhouse kicked someone so hard that his foot broke the speed of light, went back in time, and killed Amelia Earhart while she was flying over the Pacific Ocean.
 %
-Chuck Norris can be unlocked on the hardest level of Tekken. But only Chuck Norris is skilled enough to unlock himself. Then he roundhouse kicks the Playstation back to Japan. 
+Crop circles are Chuck Norris' way of telling the world that sometimes corn needs to lie down.
 %
-Chuck Norris drinks napalm to quell his heartburn. 
+Chuck Norris is ten feet tall, weighs two-tons, breathes fire, and could eat a hammer and take a shotgun blast standing.
 %
-Every time someone uses the word "intense", Chuck Norris always replies "you know what else is intense?" followed by a roundhouse kick to the face. 
+The Great Wall of China was originally created to keep Chuck Norris out. It failed miserably.
 %
-As an infant, Chuck Norris' parents gave him a toy hammer. He gave the world Stonehenge. 
+Contrary to popular belief, Chuck Norris, not the box jellyfish of northern Australia, is the most venomous creature on earth.
 %
-Chuck Norris once ordered a steak in a restaurant. The steak did what it was told. 
+Most people have 23 pairs of chromosomes. Chuck Norris has 72... and they're all poisonous.
 %
-Most people fear the Reaper. Chuck Norris considers him "a promising Rookie". 
+If you ask Chuck Norris what time it is, he always says, "Two seconds 'til." After you ask, "Two seconds 'til what?" he roundhouse kicks you in the face.
 %
-There are only two things that can cut diamonds: other diamonds, and Chuck Norris. 
+When Chuck Norris sends in his taxes, he sends blank forms and includes only a picture of himself, crouched and ready to attack. Chuck Norris has not had to pay taxes, ever.
 %
-President Roosevelt once rode his horse 100 miles. Chuck Norris carried his the same distance in half the time. 
+The quickest way to a man's heart is with Chuck Norris' fist.
 %
-Chuck Norris once ate four 30lb bowling balls without chewing. 
+Chuck Norris invented Kentucky Fried Chicken's famous secret recipe, with eleven herbs and spices. But nobody ever mentions the twelfth ingredient: Fear.
 %
-What many people dont know is chuck norris is the founder of planned parenthood. Not even unborn children can escape his wrath. 
+CNN was originally created as the "Chuck Norris Network" to update Americans with on-the-spot ass kicking in real-time.
 %
-Chuck Norris was banned from competitive bullriding after a 1992 exhibition in San Antonio, when he rode the bull 1,346 miles from Texas to Milwaukee Wisconsin to pick up his dry cleaning. 
+Chuck Norris can win a game of Connect Four in only three moves.
 %
-Chuck Norris qualified with a top speed of 324 mph at the Daytona 500, without a car. 
+What was going through the minds of all of Chuck Norris' victims before they died? His shoe.
 %
-Chuck Norris likes his coffee half and half: half coffee grounds, half wood-grain alcohol. 
+Chuck Norris is the only man to ever defeat a brick wall in a game of tennis.
 %
-Chuck Norris uses tabasco sauce instead of visine. 
+Police label anyone attacking Chuck Norris as a Code 45-11.... a suicide.
 %
-The chemical formula for the highly toxic cyanide ion is CN-. These are also Chuck Norris' initials. This is not a coincidence. 
+Chuck Norris doesn't churn butter. He roundhouse kicks the cows and the butter comes straight out.
 %
-Chuck Norris' credit cards have no limit. Last weekend, he maxed them out. 
+Chuck Norris doesn’t wash his clothes, he disembowels them.
 %
-Think of a hot woman. Chuck Norris did her. 
+A Handicapped parking sign does not signify that this spot is for handicapped people. It is actually in fact a warning, that the spot belongs to Chuck Norris and that you will be handicapped if you park there.
 %
-A man once claimed Chuck Norris kicked his ass twice, but it was promptly dismissed as false - no one could survive it the first time. 
+Chuck Norris will attain statehood in 2009. His state flower will be the Magnolia.
 %
-Chuck Norris sleeps with a pillow under his gun. 
+Someone once videotaped Chuck Norris getting pissed off. It was called Walker: Texas Chain Saw Massacre.
 %
-Chuck Norris owns a chain of fast-food restaurants throughout the southwest. They serve nothing but barbecue-flavored ice cream and Hot Pockets. 
+Chuck Norris originally appeared in the "Street Fighter II" video game, but was removed by Beta Testers because every button caused him to do a roundhouse kick. When asked bout this "glitch," Norris replied, "That's no glitch."
 %
-Chuck Norris doesn't chew gum. Chuck Norris chews tin foil. 
+Fool me once, shame on you. Fool Chuck Norris once and he will roundhouse you in the face.
 %
-Aliens DO indeed exist. They just know better than to visit a planet that Chuck Norris is on. 
+While visiting the hexagon, Chuck Norris was asked to demonstrate his famous roundhouse kick. Henceforth, it has been known as the Pentagon.
 %
-When in a bar, you can order a drink called a "Chuck Norris". It is also known as a "Bloody Mary", if your name happens to be Mary. 
+When Chuck Norris played the card game War with a friend, France surrendered.
 %
-Every time Chuck Norris smiles, someone dies. Unless he smiles while he's roundhouse kicking someone in the face. Then two people die. 
+If Goliath listened to Chuck Norris he would have won.
 %
-Some people ask for a Kleenex when they sneeze, Chuck Norris asks for a body bag. 
+Chuck Norris can defuse bomb even if he cut the wrong wire
 %
-There's an order to the universe: space, time, Chuck Norris.... Just kidding, Chuck Norris is first. 
+Chuck Norris sleeps in Seattle.
 %
-A man once asked Chuck Norris if his real name is "Charles". Chuck Norris did not respond, he simply stared at him until he exploded. 
+Chuck Norris shot a man with a knife
 %
-Chuck Norris starts everyday with a protein shake made from Carnation Instant Breakfast, one dozen eggs, pure Colombian cocaine, and rattlesnake venom. He injects it directly into his neck with a syringe. 
+The dictionary references Chuck Norris several times, he is metioned under Fear, Law, Order and Chucktatorship.
 %
-In a tagteam match, Chuck Norris was teamed with Hulk Hogan against King Kong Bundy and Andre The Giant. He pinned all 3 at the same time. 
+Chuck Norris CAN balance the light-switch between ON and OFF.
 %
-Chuck Norris doesn't see dead people. He makes people dead. 
+If Chuck was ever captured, he could win a game of Russian Roulette with six bullets in the revolver, he would shoot everyone else!
 %
-Chuck Norris is the only person who can simultaneously hold and fire FIVE Uzis: One in each hand, one in each foot -- and the 5th one he roundhouse-kicks into the air, so that it sprays bullets. 
+In a rain storm Chuck Norris stays dry. Rain drops are scared to hit him.
 %
-For undercover police work, Chuck Norris pins his badge underneath his shirt, directly into his chest. 
+Chuck Norris is the reason tumbleweeds tumble
 %
-In the X-Men movies, none of the X-Men super-powers are done with special effects. Chuck Norris is the stuntman for every character. 
+The Earth was almost destroyed by a 50 km wide asteroid in 1984, but Chuck Norris roundhouse kicked it into the Sun.
 %
-We live in an expanding universe. All of it is trying to get away from Chuck Norris. 
+Chuck Norris can terminate a repeating decimal.
 %
-Chuck Norris went looking for a bar but couldn't find one. He walked to a vacant lot and sat there. Sure enough within an hour an a half someone constructed a bar around him. He then ordered a shot, drank it, and then burned the place to the ground. Chuck Norris yelled over the roar of the flames, "always leave things the way you found em!" 
+When the Boogeyman goes to sleep every night, he checks his closet for Chuck Norris.
 %
-It is said that every time you masturbate, God kills a kitten. Every time God masturbates, Chuck Norris kills a lion. 
+Chuck Norris doesn't read books. He stares them down until he gets the information he wants.
 %
-The word 'Kill' was invented by Chuck Norris. Other words were 'Die', 'Beer', and 'What'. 
+There is no theory of evolution. Just a list of creatures Chuck Norris has allowed to live.
 %
-Chuck Norris is a vegetarian. Meaning, he does not eat animals until first he puts them into vegetative state with his fists. 
+Outer space exists because it's afraid to be on the same planet with Chuck Norris.
 %
-The 11th commandment is "Thou shalt not piss off Chuck Norris" This commandment is rarely enforced, as it is impossible to accomplish. 
+Chuck Norris does not sleep. He waits.
 %
-Chuck Norris is his own line at the DMV. 
+Chuck Norris is currently suing NBC, claiming Law and Order are trademarked names for his left and right legs.
 %
-Two wrongs don't make a right. Unless you're Chuck Norris. Then two wrongs make a roundhouse kick to the face. 
+Chuck Norris is the reason why Waldo is hiding.
 %
-Who let the dogs out? Chuck Norris let the dogs out... and then roundhouse kicked them through an Oldsmobile. 
+Chuck Norris counted to infinity - twice.
 %
-Chuck Norris can do a roundhouse kick faster than the speed of light. This means that if you turn on a light switch, you will be dead before the lightbulb turns on. 
+There is no chin behind Chuck Norris’ beard. There is only another fist.
 %
-When Chuck Norris goes to out to eat, he orders a whole chicken, but he only eats its soul. 
+When Chuck Norris does a pushup, he isn't lifting himself up, he's pushing the Earth down.
 %
-Chuck Norris sold his soul to the devil for his rugged good looks and unparalleled martial arts ability. Shortly after the transaction was finalized, Chuck roundhouse-kicked the devil in the face and took his soul back. The devil, who appreciates irony, couldn't stay mad and admitted he should have seen it coming. They now play poker every second Wednesday of the month. 
+Chuck Norris is so fast, he can run around the world and punch himself in the back of the head.
 %
-Chuck Norris has never won an Academy Award for acting... because he's not acting. 
+Chuck Norris' hand is the only hand that can beat a Royal Flush.
 %
-If Chuck Norris wants your opinion, he'll beat it into you. 
+Chuck Norris can lead a horse to water AND make it drink.
 %
-Not everyone that Chuck Norris is mad at gets killed. Some get away. They are called astronauts. 
+Chuck Norris doesn’t wear a watch. HE decides what time it is.
 %
-Chuck Norris has to register every part of his body as a separate lethal weapon. His spleen is considered a concealed weapon in over 50 states. 
+Chuck Norris can slam a revolving door.
 %
-A movie scene depicting Chuck Norris losing a fight with Bruce Lee was the product of history's most expensive visual effect. When adjusted for inflation, the effect cost more than the Gross National Product of Paraguay. 
+Chuck Norris does not get frostbite. Chuck Norris bites frost.
 %
-Godzilla is a Japanese rendition of Chuck Norris' first visit to Tokyo. 
+Remember the Soviet Union? They decided to quit after watching a DeltaForce marathon on Satellite TV.
 %
-They once made a Chuck Norris toilet paper, but there was a problem-- It wouldn't take shit from anybody. 
+Contrary to popular belief, America is not a democracy, it is a Chucktatorship.
 %
-Chuck Norris once rode a nine foot grizzly bear through an automatic car wash, instead of taking a shower. 
+If you spell Chuck Norris in Scrabble, you win. Forever.
 %
-"Sweating bullets" is literally what happens when Chuck Norris gets too hot. 
+Guns don't kill people. Chuck Norris kills people.
 %
-Chuck Norris' sperm can be seen with the naked eye. Each one is the size of a quarter. 
+There is no theory of evolution. Just a list of animals Chuck Norris allows to live.
 %
-After taking a steroids test doctors informed Chuck Norris that he had tested positive. He laughed upon receiving this information, and said "of course my urine tested positive, what do you think they make steroids from?" 
+The chief export of Chuck Norris is Pain.
 %
-Chuck Norris doesn't daydream. He's too busy giving other people nightmares. 
+Chuck Norris has two speeds. Walk, and Kill.
 %
-When Arnold says the line "I'll be back" in the first Terminator movie it is implied that is he going to ask Chuck Norris for help. 
+The leading causes of death in the United States are: 1. Heart Disease 2. Chuck Norris 3. Cancer.
 %
-There are no such things as tornados. Chuck Norris just hates trailer parks. 
+Chuck Norris drives an ice cream truck covered in human skulls.
 %
-Chuck Norris' Penis is a third degree blackbelt, and an honorable 32nd-degree mason. 
+Chuck Norris is my Homeboy.
 %
-Chuck Norris does not follow fashion trends, they follow him. But then he turns around and kicks their ass. Nobody follows Chuck Norris. 
+Chuck Norris doesn't go hunting.... CHUCK NORRIS GOES KILLING.
 %
-The phrase 'break a leg' was originally coined by Chuck Norris's co-stars in Walker, Texas Ranger as a good luck charm indicating that a broken leg might be the worst extent of their injuries. This never proved to be the case. 
+Chuck Norris uses pepper spray to spice up his steaks.
 %
-Chuck Norris' roundhouse kick is so powerful, it can be seen from outer space by the naked eye. 
+Chuck Norris once roundhouse kicked someone so hard that his foot broke the speed of light, went back in time, and killed Amelia Earhart while she was flying over the Pacific Ocean.
 %
-Diamonds are not, despite popular belief, carbon. They are, in fact, Chuck Norris fecal matter. This was proven a recently, when scientific analysis revealed what appeared to be Jean-Claude Van Damme bone fragments inside the Hope Diamond. 
+Crop circles are Chuck Norris' way of telling the world that sometimes corn needs to lie down.
 %
-Chuck Norris once participated in the running of the bulls. He walked. 
+Chuck Norris is ten feet tall, weighs two-tons, breathes fire, and could eat a hammer and take a shotgun blast standing.
 %
-The Drummer for Def Leppard's only got one arm. Chuck Norris needed a back scratcher. 
+The Great Wall of China was originally created to keep Chuck Norris out. It failed miserably.
 %
-Chuck Norris was the orginal sculptor of Mount Rushmore. He completed the entire project using only a bottle opener and a drywall trowel.
+Contrary to popular belief, Chuck Norris, not the box jellyfish of northern Australia, is the most venomous creature on earth.
 %
-Chuck Norris once rode a bull, and nine months later it had a calf. 
+Most people have 23 pairs of chromosomes. Chuck Norris has 72... and they're all poisonous.
 %
-Chuck Norris once lost the remote, but maintained control of the TV by yelling at it in between bites of his "Filet of Child" sandwich. 
+If you ask Chuck Norris what time it is, he always says, "Two seconds 'til." After you ask, "Two seconds 'til what?" he roundhouse kicks you in the face.
 %
-For Spring Break '05, Chuck Norris drove to Madagascar, riding a chariot pulled by two electric eels. 
+When Chuck Norris sends in his taxes, he sends blank forms and includes only a picture of himself, crouched and ready to attack. Chuck Norris has not had to pay taxes, ever.
 %
-The Manhattan Project was not intended to create nuclear weapons, it was meant to recreate the destructive power in a Chuck Norris Roundhouse Kick. They didn't even come close. 
+The quickest way to a man's heart is with Chuck Norris' fist.
 %
-Chuck Norris has banned rainbows from the state of North Dakota. 
+Chuck Norris invented Kentucky Fried Chicken's famous secret recipe, with eleven herbs and spices. But nobody ever mentions the twelfth ingredient: Fear.
 %
-Divide Chuck Norris by zero and you will in fact get one........one bad-ass motherfucker that is. 
+CNN was originally created as the "Chuck Norris Network" to update Americans with on-the-spot ass kicking in real-time.
 %
-TNT was originally developed by Chuck Norris to cure indigestion. 
+Chuck Norris can win a game of Connect Four in only three moves.
 %
-After returning from World War 2 unscathed, Bob Dole was congratulated by Chuck Norris with a handshake. The rest is history. 
+What was going through the minds of all of Chuck Norris' victims before they died? His shoe.
 %
-Chuck Norris runs on batteries. Specifically, Die Hards. 
+Chuck Norris is the only man to ever defeat a brick wall in a game of tennis.
 %
-"Let the Bodies Hit the Floor" was originally written as Chuck Norris' theme song. 
+Police label anyone attacking Chuck Norris as a Code 45-11.... a suicide.
 %
-Chuck Norris will never have a heart attack. His heart isn't nearly foolish enough to attack him. 
+Chuck Norris doesn't churn butter. He roundhouse kicks the cows and the butter comes straight out.
 %
-Only Chuck Norris can prevent forest fires. 
+Chuck Norris doesn’t wash his clothes, he disembowels them.
 %
-When Chuck Norris makes a burrito, its main ingredient is real toes. 
+A Handicapped parking sign does not signify that this spot is for handicapped people. It is actually in fact a warning, that the spot belongs to Chuck Norris and that you will be handicapped if you park there.
 %
-Chuck Norris is not Irish. His hair is soaked in the blood of his victims. 
+Chuck Norris will attain statehood in 2009. His state flower will be the Magnolia.
 %
-In the movie "The Matrix", Chuck Norris is the Matrix. If you pay close attention in the green "falling code" scenes, you can make out the faint texture of his beard. 
+Someone once videotaped Chuck Norris getting pissed off. It was called Walker: Texas Chain Saw Massacre.
 %
-Chuck Norris' dick is so big, it has it's own dick, and that dick is still bigger than yours. 
+Chuck Norris originally appeared in the "Street Fighter II" video game, but was removed by Beta Testers because every button caused him to do a roundhouse kick. When asked bout this "glitch," Norris replied, "That's no glitch."
 %
-They say curiosity killed the cat. This is false. Chuck Norris killed the cat. Every single one of them. 
+Fool me once, shame on you. Fool Chuck Norris once and he will roundhouse you in the face.
 %
-There is no such thing as a lesbian, just a woman who has never met Chuck Norris. 
+Chuck Norris doesn't look for fun. The fun looks for Chuck Norris.
 %
-Chuck Norris crossed the road. No one has ever dared question his motives. 
+Chuck Norris starts his day with 6 live chickens two cows, three pigs and a boiling hot cup of pure fury
 %
-When Chuck Norris was born, he immediately had sex with the first nurse he saw. He was her first. She was his third. That afternoon. 
+The only word that rhymes with orange is Chuck Norris
 %
-One time, at band camp, Chuck Norris ate a percussionist. 
+Everyone is so scared of Chuck Norris that they kiss his arse by writing these facts, too right they should
 %
-Chuck Norris doesn't say "who's your daddy", because he knows the answer. 
+gmail@chucknorris.com
 %
-Chuck Norris originally wrote the first dictionary. The definition for each word is as follows - A swift roundhouse kick to the face. 
+Chuck Norris play's Texas hold em with Zeus, every second Wednesday of the month
 %
-Love does not hurt. Chuck Norris does. 
+Chuck Norris has killed the Dead Sea
 %
-The term "Cleveland Steamer" got its name from Chuck Norris, when he took a dump while visiting the Rock and Roll Hall of fame and buried northern Ohio under a glacier of fecal matter. 
+On the keyboard there is no control button because Chuck Norris is always in control.
 %
-Chuck Norris once round-house kicked a salesman. Over the phone. 
+The truth hurts dosen't it, Chuck Norris' truth kills.
 %
-The pen is mighter than the sword, but only if the pen is held by Chuck Norris. 
+Chuck Norris sent a BBM to an iphone.
 %
-Chuck Norris doesn't kill two birds with one stone. Chuck Norris kills all birds, with two stones. The ones in his pants. 
+When Presidents speak, their nation listens. When Chuck Norris blinks, the whole World listens.
 %
-Chuck Norris knows the last digit of pi. 
+Chuck Norris once cried just to see what it was like. The end result was the creation of life.
 %
-Those aren't credits that roll after Walker Texas Ranger. It is actually a list of fatalities that occurred during the making of the episode. 
+Chuck Norris is the reason that the world will end in 2012. He was getting bored with the Earth
 %
-The air around Chuck Norris is always a balmy 78 degrees. 
+When the Boogeyman goes to sleep every night, he checks his closet for Chuck Norris.
 %
-When Chuck Norris wants an egg, he cracks open a chicken. 
+Chuck Norris doesn't read books. He stares them down until he gets the information he wants.
 %
-Chuck Norris plays racquetball with a waffle iron and a bowling ball. 
+There is no theory of evolution. Just a list of creatures Chuck Norris has allowed to live.
 %
-According to the Bible, God created the universe in six days. Before that, Chuck Norris created God by snapping his fingers. 
+Outer space exists because it's afraid to be on the same planet with Chuck Norris.
 %
-Chuck Norris doesn't believe in ravioli. He stuffs a live turtle with beef and smothers it in pig's blood. 
+Chuck Norris does not sleep. He waits.
 %
-Count from one to ten. That's how long it would take Chuck Norris to kill you...Fourty seven times. 
+Chuck Norris is currently suing NBC, claiming Law and Order are trademarked names for his left and right legs.
 %
-The 1972 Miami Dolphins lost one game, it was an exhibition game vs. Chuck Norris and three seven year old girls. Chuck Norris won with a roundhouse-kick to the face in overtime. 
+Chuck Norris is the reason why Waldo is hiding.
 %
-Chuck Norris is not Politically Correct. He is just Correct. Always. 
+Chuck Norris counted to infinity - twice.
 %
-Mr. T pities the fool. Chuck Norris rips the fool's fucking head off. 
+There is no chin behind Chuck Norris’ beard. There is only another fist.
 %
-Chuck Norris had to stop washing his clothes in the ocean. The tsunamis were killing people. 
+When Chuck Norris does a pushup, he isn't lifting himself up, he's pushing the Earth down.
 %
-Chuck Norris has volunteered to remain on earth after the Rapture; he will spend his time fighting the Anti-Christ. 
+Chuck Norris is so fast, he can run around the world and punch himself in the back of the head.
 %
-They were going to release a Chuck Norris edition of Clue, but the answer always turns out to be "Chuck Norris. In The Library. With a Roundhouse Kick." 
+Chuck Norris' hand is the only hand that can beat a Royal Flush.
 %
-Chuck Norris is the only known mammal in history to have an opposable thumb. On his penis. 
+Chuck Norris can lead a horse to water AND make it drink.
 %
-A man once taunted Chuck Norris with a bag of Lay's potato chips, saying "Betcha can't eat just one!" Chuck Norris proceeded to eat the chips, the bag, and the man in one deft move. 
+Chuck Norris doesn’t wear a watch. HE decides what time it is.
 %
-Chuck Norris' favorite cereal is Kellogg's Nails 'N' Gravel. 
+Chuck Norris can slam a revolving door.
 %
-In the first Jurassic Park movie, the Tyrannosaurus Rex wasn't chasing the jeep. Chuck Norris was chasing the Tyrannosaurus AND the jeep. 
+Chuck Norris does not get frostbite. Chuck Norris bites frost.
 %
-Chuck Norris has never been accused of murder for the simple fact that his roundhouse kicks are recognized world-wide as "acts of God." 
+Remember the Soviet Union? They decided to quit after watching a DeltaForce marathon on Satellite TV.
 %
-"Brokeback Mountain" is not just a movie. It's also what Chuck Norris calls the pile of dead ninjas in his front yard. 
+Contrary to popular belief, America is not a democracy, it is a Chucktatorship.
 %
-Chuck Norris does not wear a condom. Because there is no such thing as protection from Chuck Norris.
+If you spell Chuck Norris in Scrabble, you win. Forever.
 %
-Chuck Norris once had sex with a cigarette machine in the Osaka airport. 
+Guns don't kill people. Chuck Norris kills people.
 %
-Rules of fighting: 1) Don't bring a knife to a gun fight. 2) Don't bring a gun to a Chuck Norris fight. 
+There is no theory of evolution. Just a list of animals Chuck Norris allows to live.
 %
-Chuck Norris is the only man who has, literally, beaten the odds. With his fists. 
+The chief export of Chuck Norris is Pain.
 %
-In ancient China there is a legend that one day a child will be born from a dragon, grow to be a man, and vanquish evil from the land. That man is not Chuck Norris, because Chuck Norris killed that man. 
+Chuck Norris has two speeds. Walk, and Kill.
 %
-Chuck Norris wipes his ass with chain mail and sandpaper. 
+The leading causes of death in the United States are: 1. Heart Disease 2. Chuck Norris 3. Cancer.
 %
-When you play Monopoly with Chuck Norris, you do not pass go, and you do not collect two hundred dollars. You will be lucky if you make it out alive. 
+Chuck Norris drives an ice cream truck covered in human skulls.
 %
-Chuck Norris describes human beings as "a sociable holder for blood and guts". 
+Chuck Norris is my Homeboy.
 %
-Chuck Norris once got into a fight with a one-armed Ninja. Seeing that he had an unfair advantage, Chuck Norris ripped both of his arms off and one of his legs. He then roundhouse-kicked the ninja in the head, killing him instantly, and proceeded to sow his limbs back on using only a rusty tent spike and bailing wire. 
+Chuck Norris doesn't go hunting.... CHUCK NORRIS GOES KILLING.
 %
-Chuck Norris likes his ice like he likes his skulls: crushed. 
+Chuck Norris uses pepper spray to spice up his steaks.
 %
-Chuck Norris can kick through all 6 degrees of separation, hitting anyone, anywhere, in the face, at any time. 
+Chuck Norris once roundhouse kicked someone so hard that his foot broke the speed of light, went back in time, and killed Amelia Earhart while she was flying over the Pacific Ocean.
 %
-Most tough men eat nails for breakfast. chuck Norris does all of his grocery shopping at Home Depot. 
+Crop circles are Chuck Norris' way of telling the world that sometimes corn needs to lie down.
 %
-Chuck Norris did not "lose" his virginity, he stalked it and then destroyed it with extreme prejudice. 
+Chuck Norris is ten feet tall, weighs two-tons, breathes fire, and could eat a hammer and take a shotgun blast standing.
 %
-Everything King Midas touches turnes to gold. Everything Chuck Norris touches turns up dead. 
+The Great Wall of China was originally created to keep Chuck Norris out. It failed miserably.
 %
-Chuck Norris' pulse is measured on the richter scale. 
+Contrary to popular belief, Chuck Norris, not the box jellyfish of northern Australia, is the most venomous creature on earth.
 %
-Most people know that Descarte said, "I think, therefore I am." What most people don't know is that that quote continues, "...afraid of Chuck Norris." 
+Most people have 23 pairs of chromosomes. Chuck Norris has 72... and they're all poisonous.
 %
-Chuck Norris once roundhouse-kicked a ten dollar bill into 200 nickels. 
+If you ask Chuck Norris what time it is, he always says, "Two seconds 'til." After you ask, "Two seconds 'til what?" he roundhouse kicks you in the face.
 %
-For every movie about Vietnam starring Chuck Norris, the historical duration of the war decreases. Just 3 more "Missing in Action" sequels, and that war will have never actually existed. 
+When Chuck Norris sends in his taxes, he sends blank forms and includes only a picture of himself, crouched and ready to attack. Chuck Norris has not had to pay taxes, ever.
 %
-Chuck Norris' penis has a Hemi. 
+The quickest way to a man's heart is with Chuck Norris' fist.
 %
-Chuck Norris enjoys a good practical joke. His favorite is where he removes your lower intestine and pretends to make a balloon animal out of it. Then he cracks your skull open with a Volvo for not complimenting him on his balloon animal. 
+Chuck Norris invented Kentucky Fried Chicken's famous secret recipe, with eleven herbs and spices. But nobody ever mentions the twelfth ingredient: Fear.
 %
-Chuck Norris CAN in fact 'raise the roof'. And he can do it with one hand. 
+CNN was originally created as the "Chuck Norris Network" to update Americans with on-the-spot ass kicking in real-time.
 %
-Kenny G is allowed to live because Chuck Norris doesn't kill women. 
+Chuck Norris can win a game of Connect Four in only three moves.
 %
-Life is not, in fact, like a box of chocolates. It is more like a box of Chuck Norris, roundhouse kicking you in the face. And if you receive a box of Chuck Norris, you ALWAYS know what you are going to get. 
+What was going through the minds of all of Chuck Norris' victims before they died? His shoe.
 %
-For Chuck Norris, every street is "one way". HIS WAY. 
+Chuck Norris is the only man to ever defeat a brick wall in a game of tennis.
 %
-There are now five cup sizes at Starbucks: Short, Tall, Grande, Venti, and Chuck Norris. 
+Police label anyone attacking Chuck Norris as a Code 45-11.... a suicide.
 %
-During the Vietnam War, Chuck Norris allowed himself to be captured. For torture, they made him eat his own entrails. He asked for seconds. 
+Chuck Norris doesn't churn butter. He roundhouse kicks the cows and the butter comes straight out.
 %
-Chuck Norris once created a flamethrower by urinating into a lighter. 
+Chuck Norris doesn’t wash his clothes, he disembowels them.
 %
-Instead of having a cigarette after sex, Chuck Norris heads outside and brands his cattle. 
+A Handicapped parking sign does not signify that this spot is for handicapped people. It is actually in fact a warning, that the spot belongs to Chuck Norris and that you will be handicapped if you park there.
 %
-Chuck Norris actually built the stairway to heaven. 
+Chuck Norris will attain statehood in 2009. His state flower will be the Magnolia.
 %
-Whoever said "only the good die young" was probably in Chuck Norris's kindergarten class. 
+Someone once videotaped Chuck Norris getting pissed off. It was called Walker: Texas Chain Saw Massacre.
 %
-Chuck Norris once skewered a man with the Eiffel tower. 
+Chuck Norris originally appeared in the "Street Fighter II" video game, but was removed by Beta Testers because every button caused him to do a roundhouse kick. When asked bout this "glitch," Norris replied, "That's no glitch."
 %
-The best part of waking up, is not Folgers in your cup, but knowing that Chuck Norris didn't kill you in your sleep. 
+Fool me once, shame on you. Fool Chuck Norris once and he will roundhouse you in the face.
 %
-Chuck Norris doesn't own a can opener, he just chews through the can. 
+Only Chuck Norris is stronger than an Altoid.
 %
-Occam's Razor says that the simplest answer tends to be the correct one. Norris' Razor involves a flick of the wrist and a Columbian Necktie. 
+Chuck Norris has a battlecruiser AND a car.
 %
-Chuck Norris needs a monkeywrench and a blowtorch to masturbate. 
+Chuck Norris burnt a fire proof vest, UNDERWATER!
 %
-Proponents of higher-order theories of consciousness argue that consciousness is explained by the relation between two levels of mental states in which a higher-order mental state takes another mental state. If you mention this to Chuck Norris, expect an explosive roundhouse kick to the face for spouting too much fancy-talk. 
+Chuck Norris was once turned down for American Idol. When Simon was questioned about it, he replied "I'm retiring after this season". I wonder why?
 %
-Chuck Norris invented all 32 letters of the alphabet. 
+Chuck Norris doesn't cheat death, he beats it fair and square.
 %
-Remember The Ultimate Warrior? He quit wrestling because Chuck Norris wanted his nickname back. 
+When Chuck Norris roundhouse-kicks you HE decides when you will feel the impact .
 %
-If a tree falls in the forest, does anybody hear? Yes. Chuck Norris hears it. Chuck Norris can hear everything. Chuck Norris can hear the shrieking terror in your soul. 
+Chuck Norris made the big bang just by clicking his fingers
 %
-Chuck Norris actually owns IBM. It was an extremely hostile takeover. 
+Trick me once, shame on you, trick Chuck Norris.....rest in peace.
 %
-He, who laughs last, laughs best. He who laughs at Chuck Norris ? dies. 
+Chuck Norris doesn't fight.  He gives motivational seminars to die on their own to avoid a roundhouse kick to the face.
 %
-Chuck Norris is like a dog, not only because he can smell fear, but because he can piss on whatever the fuck he wants. 
+This one time at band camp... BAM! Chuck Norris.
 %
-Chuck Norris can jump-start a car using jumper cables attached to his nipples. 
+Chuck Norris protects his body guards.
 %
-Chuck Norris neither melts in your mouth nor in your hand. He shreds your trachea before ravaging your soul with a combination of chocolate, whickey, roundhouse kicks and death. Oh, and pain. Lots of pain. 
+Chuck Norris watched the first steps on the moon... From his summer home on Mars
 %
-Chuck Norris doesn't have blood. He is filled with magma. 
+The Earth is made up of two-thirds water and one-third Chuck Norris.
 %
-- 
cgit v1.2.3-70-g09d2


From 13c840fa3eb0fab916c303b07848d680481e587a Mon Sep 17 00:00:00 2001
From: Andrew Janke <janke@taran.local>
Date: Thu, 26 Feb 2015 19:30:33 -0500
Subject: Remove the GPL LICENSE file b/c it's no longer relevant

---
 plugins/chucknorris/LICENSE | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 plugins/chucknorris/LICENSE

(limited to 'plugins')

diff --git a/plugins/chucknorris/LICENSE b/plugins/chucknorris/LICENSE
deleted file mode 100644
index 5f40edd1e..000000000
--- a/plugins/chucknorris/LICENSE
+++ /dev/null
@@ -1,2 +0,0 @@
-License: GPL v2
-Thanks to http://www.k-lug.org/~kessler/projects.html for the fortune file.
-- 
cgit v1.2.3-70-g09d2


From cea941ce42b5d550489367608dd1ac4401151c97 Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Tue, 23 Jun 2015 17:07:21 -0400
Subject: sublime plugin: make "local" work by wrapping in anon function

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

(limited to 'plugins')

diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index 22cf98227..8934783c9 100644
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -1,5 +1,9 @@
+# Sublime Text Aliases
+
+() {
+
 if [[ "$OSTYPE" == linux* ]]; then
-    local _sublime_linux_paths > /dev/null 2>&1
+    local _sublime_linux_paths _sublime_path
     _sublime_linux_paths=(
         "$HOME/bin/sublime_text"
         "/opt/sublime_text/sublime_text"
@@ -19,9 +23,8 @@ if [[ "$OSTYPE" == linux* ]]; then
             break
         fi
     done
-
 elif  [[ "$OSTYPE" = darwin* ]]; then
-    local _sublime_darwin_paths > /dev/null 2>&1
+    local _sublime_darwin_paths _sublime_path
     _sublime_darwin_paths=(
         "/usr/local/bin/subl"
         "/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
@@ -38,10 +41,9 @@ elif  [[ "$OSTYPE" = darwin* ]]; then
             break
         fi
     done
-
 elif [[ "$OSTYPE" = 'cygwin' ]]; then
-    local _sublime_cygwin_paths > /dev/null 2>&1
-    _sublime_cygwin_paths=(
+    local sublime_cygwin_paths _sublime_path
+    sublime_cygwin_paths=(
         "$(cygpath $ProgramW6432/Sublime\ Text\ 2)/sublime_text.exe"
         "$(cygpath $ProgramW6432/Sublime\ Text\ 3)/sublime_text.exe"
     )
@@ -52,9 +54,10 @@ elif [[ "$OSTYPE" = 'cygwin' ]]; then
             break
         fi
     done
-
 fi
 
+}
+
 alias stt='st .'
 
 find_project()
-- 
cgit v1.2.3-70-g09d2


From 8efcf2776b2e7e00c073b149f76c04715aa695d3 Mon Sep 17 00:00:00 2001
From: Terrance Kennedy <terrance@sensu.io>
Date: Sun, 22 Apr 2018 12:03:58 -0600
Subject: pyenv plugin refactor (8x faster) (#6165)

* Refactor pyenv plugin to use PATH
---
 plugins/pyenv/pyenv.plugin.zsh | 61 ++++++++++--------------------------------
 1 file changed, 14 insertions(+), 47 deletions(-)

(limited to 'plugins')

diff --git a/plugins/pyenv/pyenv.plugin.zsh b/plugins/pyenv/pyenv.plugin.zsh
index ec3ae9f5b..76880e415 100644
--- a/plugins/pyenv/pyenv.plugin.zsh
+++ b/plugins/pyenv/pyenv.plugin.zsh
@@ -1,50 +1,17 @@
-_homebrew-installed() {
-    type brew &> /dev/null
-}
+# This plugin loads pyenv into the current shell and provides prompt info via
+# the 'pyenv_prompt_info' function. Also loads pyenv-virtualenv if available.
 
-_pyenv-from-homebrew-installed() {
-    brew --prefix pyenv &> /dev/null
-}
-
-FOUND_PYENV=0
-pyenvdirs=("$HOME/.pyenv" "/usr/local/pyenv" "/opt/pyenv")
-
-for pyenvdir in "${pyenvdirs[@]}" ; do
-    if [ -d $pyenvdir/bin -a $FOUND_PYENV -eq 0 ] ; then
-        FOUND_PYENV=1
-        export PYENV_ROOT=$pyenvdir
-        export PATH=${pyenvdir}/bin:$PATH
-        eval "$(pyenv init - zsh)"
-
-        if pyenv commands | command grep -q virtualenv-init; then
-            eval "$(pyenv virtualenv-init - zsh)"
-        fi
-
-        function pyenv_prompt_info() {
-            echo "$(pyenv version-name)"
-        }
-    fi
-done
-unset pyenvdir
-
-if [ $FOUND_PYENV -eq 0 ] ; then
-    pyenvdir=$(brew --prefix pyenv 2> /dev/null)
-    if [ $? -eq 0 -a -d $pyenvdir/bin ] ; then
-        FOUND_PYENV=1
-        export PYENV_ROOT=$pyenvdir
-        export PATH=${pyenvdir}/bin:$PATH
-        eval "$(pyenv init - zsh)"
-
-        if pyenv commands | command grep -q virtualenv-init; then
-            eval "$(pyenv virtualenv-init - zsh)"
-        fi
-
-        function pyenv_prompt_info() {
-            echo "$(pyenv version-name)"
-        }
+if (( $+commands[pyenv] )); then
+    eval "$(pyenv init - zsh)"
+    if (( $+commands[pyenv-virtualenv-init] )); then
+        eval "$(pyenv virtualenv-init - zsh)"
     fi
-fi
-
-if [ $FOUND_PYENV -eq 0 ] ; then
-    function pyenv_prompt_info() { echo "system: $(python -V 2>&1 | cut -f 2 -d ' ')" }
+    function pyenv_prompt_info() {
+        echo "$(pyenv version-name)"
+    }
+else
+    # fallback to system python
+    function pyenv_prompt_info() {
+        echo "system: $(python -V 2>&1 | cut -f 2 -d ' ')"
+    }
 fi
-- 
cgit v1.2.3-70-g09d2


From c7185c35f35d5c9a57a48815d379c5b1be47cd8a Mon Sep 17 00:00:00 2001
From: Julian Laubstein <contact@julianlaubstein.de>
Date: Sun, 22 Apr 2018 20:27:12 +0200
Subject: Add completions to asdf plugin (#6046)

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

(limited to 'plugins')

diff --git a/plugins/asdf/asdf.plugin.zsh b/plugins/asdf/asdf.plugin.zsh
index 8736d2ff8..d563cf5f8 100644
--- a/plugins/asdf/asdf.plugin.zsh
+++ b/plugins/asdf/asdf.plugin.zsh
@@ -5,3 +5,8 @@ ASDF_DIR="${ASDF_DIR:-$HOME/.asdf}"
 if [ -f $ASDF_DIR/asdf.sh ]; then
     . $ASDF_DIR/asdf.sh
 fi
+
+# Load asdf completions, if found.
+if [ -f $ASDF_DIR/completions/asdf.bash ]; then
+    . $ASDF_DIR/completions/asdf.bash
+fi
-- 
cgit v1.2.3-70-g09d2


From 7bb7ce62d3a78859aa15151ecc46df5adc9cf049 Mon Sep 17 00:00:00 2001
From: Francisco Zuviría <FranciscodeZuviria@fusap.com.ar>
Date: Sun, 22 Apr 2018 22:34:26 -0300
Subject:  On branch fzuviria.plugin.dirhistory.new-feature.navigate-history 
 Changes to be committed: 	modified:   dirhistory/dirhistory.plugin.zsh

New Feature:
  Navigate directory hierarchy using ALT-UP and ALT-DOWN. (mac keybindings not yet implemented)
  ALT-UP moves to higher hierarchy (cd ..)
  ALT-DOWN moves into the first directory found in alphabetical order
---
 plugins/dirhistory/dirhistory.plugin.zsh | 50 ++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

(limited to 'plugins')

diff --git a/plugins/dirhistory/dirhistory.plugin.zsh b/plugins/dirhistory/dirhistory.plugin.zsh
index 8138872bc..05839e35a 100644
--- a/plugins/dirhistory/dirhistory.plugin.zsh
+++ b/plugins/dirhistory/dirhistory.plugin.zsh
@@ -2,6 +2,10 @@
 #   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.
 # 
+#   Navigate directory hierarchy using ALT-UP and ALT-DOWN. (mac keybindings not yet implemented)
+#   ALT-UP moves to higher hierarchy (cd ..)
+#   ALT-DOWN moves into the first directory found in alphabetical order
+#
 
 dirhistory_past=($PWD)
 dirhistory_future=()
@@ -134,3 +138,49 @@ bindkey "\e\e[C" dirhistory_zle_dirhistory_future
 bindkey "\eO3C" dirhistory_zle_dirhistory_future
 
 
+# 
+# HIERARCHY Implemented in this section, in case someone wants to split it to another plugin if it clashes bindings
+# 
+
+# Move up in hierarchy
+function dirhistory_up() {
+  cd ..
+}
+
+# Move down in hierarchy
+function dirhistory_down() {
+  cd "`find . -mindepth 1 -maxdepth 1 -type d | sort -n | head -n 1`"
+}
+
+
+# Bind keys to hierarchy navigation
+function dirhistory_zle_dirhistory_up() {
+  zle kill-buffer   # Erase current line in buffer
+  dirhistory_up
+  zle accept-line
+}
+
+function dirhistory_zle_dirhistory_down() {
+  zle kill-buffer   # Erase current line in buffer
+  dirhistory_down
+  zle accept-line
+}
+
+zle -N dirhistory_zle_dirhistory_up
+# xterm in normal mode
+bindkey "\e[3A" dirhistory_zle_dirhistory_up
+bindkey "\e[1;3A" dirhistory_zle_dirhistory_up
+# Mac teminal (alt+up)
+    #bindkey "^[?" dirhistory_zle_dirhistory_up #dont know it
+# Putty:
+bindkey "\e\e[A" dirhistory_zle_dirhistory_up
+# GNU screen:
+bindkey "\eO3A" dirhistory_zle_dirhistory_up
+
+zle -N dirhistory_zle_dirhistory_down
+bindkey "\e[3B" dirhistory_zle_dirhistory_down
+bindkey "\e[1;3B" dirhistory_zle_dirhistory_down
+# Mac teminal (alt+down)
+    #bindkey "^[?" dirhistory_zle_dirhistory_down #dont know it
+bindkey "\e\e[B" dirhistory_zle_dirhistory_down
+bindkey "\eO3B" dirhistory_zle_dirhistory_down
-- 
cgit v1.2.3-70-g09d2


From cf5ccf06a0ac5a00addc23ecfcc3dd2b2f93ea2d Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Mon, 23 Apr 2018 13:06:49 +0200
Subject: [subl] Fix local variable definition

Fixes #6757
---
 plugins/sublime/sublime.plugin.zsh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'plugins')

diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index 8934783c9..f5bb070ab 100644
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -3,7 +3,7 @@
 () {
 
 if [[ "$OSTYPE" == linux* ]]; then
-    local _sublime_linux_paths _sublime_path
+    local _sublime_linux_paths
     _sublime_linux_paths=(
         "$HOME/bin/sublime_text"
         "/opt/sublime_text/sublime_text"
@@ -24,7 +24,7 @@ if [[ "$OSTYPE" == linux* ]]; then
         fi
     done
 elif  [[ "$OSTYPE" = darwin* ]]; then
-    local _sublime_darwin_paths _sublime_path
+    local _sublime_darwin_paths
     _sublime_darwin_paths=(
         "/usr/local/bin/subl"
         "/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
@@ -42,7 +42,7 @@ elif  [[ "$OSTYPE" = darwin* ]]; then
         fi
     done
 elif [[ "$OSTYPE" = 'cygwin' ]]; then
-    local sublime_cygwin_paths _sublime_path
+    local sublime_cygwin_paths
     sublime_cygwin_paths=(
         "$(cygpath $ProgramW6432/Sublime\ Text\ 2)/sublime_text.exe"
         "$(cygpath $ProgramW6432/Sublime\ Text\ 3)/sublime_text.exe"
-- 
cgit v1.2.3-70-g09d2


From c117d241cb4157204e9bda5285786d95e9c2fb36 Mon Sep 17 00:00:00 2001
From: oooooooo <bluecatbluedog@hotmail.com>
Date: Tue, 24 Apr 2018 03:36:55 +0900
Subject: $ rails runner [TAB] *complete* (#5881)

---
 plugins/rails/_rails | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'plugins')

diff --git a/plugins/rails/_rails b/plugins/rails/_rails
index 96f57ce64..ad7505506 100644
--- a/plugins/rails/_rails
+++ b/plugins/rails/_rails
@@ -51,6 +51,9 @@ _arguments \
 if (( CURRENT == 1 )); then
   _describe -t commands "rails subcommand" _1st_arguments
   return
+else
+  _files
+  return
 fi
 
 case "$words[1]" in
-- 
cgit v1.2.3-70-g09d2


From ef70990ce1ac0239005b267e5dcfe096969d26c3 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 24 Apr 2018 22:02:58 +0200
Subject: Simplify hub check and hardcode aliasing (#6767)

* Simplify hub check and hardcode aliasing

* Update hub completion
---
 plugins/github/_hub              | 2 ++
 plugins/github/github.plugin.zsh | 6 ++----
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'plugins')

diff --git a/plugins/github/_hub b/plugins/github/_hub
index 3a6493878..1833a9c09 100644
--- a/plugins/github/_hub
+++ b/plugins/github/_hub
@@ -89,6 +89,7 @@ __hub_setup_zsh_fns () {
       browse:'browse the project on GitHub'
       compare:'open GitHub compare view'
       ci-status:'lookup commit in GitHub Status API'
+      sync:'update local branches from upstream'
     )
     _describe -t hub-commands 'hub command' hub_commands && ret=0
 
@@ -115,6 +116,7 @@ create
 browse
 compare
 ci-status
+sync
 EOF
     __git_list_all_commands_without_hub
   }
diff --git a/plugins/github/github.plugin.zsh b/plugins/github/github.plugin.zsh
index 0ab399c97..077f07bd4 100644
--- a/plugins/github/github.plugin.zsh
+++ b/plugins/github/github.plugin.zsh
@@ -1,8 +1,6 @@
 # Set up hub wrapper for git, if it is available; http://github.com/github/hub
-if [ "$commands[(I)hub]" ]; then
-  if hub --version &>/dev/null; then
-    eval $(hub alias -s zsh)
-  fi
+if (( $+commands[hub] )); then
+  alias git=hub
 fi
 
 # Functions #################################################################
-- 
cgit v1.2.3-70-g09d2


From b85c72b5f6ed1d33414cc2d9e7afceef12b861e7 Mon Sep 17 00:00:00 2001
From: Tomasz Borek <Tomasz.Borek@gmail.com>
Date: Wed, 25 Apr 2018 14:11:46 +0200
Subject: Better app error handling in curl (#5828)

Deals with app error page, saving true error instead.

Upon app failure, Heroku returns HTML "Application Error" page.
Finding HTML page in .gitignore is confusing, so I replaced
`-s` with `-f` in curl calls, which cuts such output.

Replace instead of addition as no progress meter outputs either.

It is practically impossible to teach good programming style to students that have had prior exposure to BASIC.  As potential programmers, they are mentally mutilated beyond hope of regeneration.
      -- E. W. Dijkstra
---
 plugins/gitignore/gitignore.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/gitignore/gitignore.plugin.zsh b/plugins/gitignore/gitignore.plugin.zsh
index ba1b38711..f242169e4 100644
--- a/plugins/gitignore/gitignore.plugin.zsh
+++ b/plugins/gitignore/gitignore.plugin.zsh
@@ -1,7 +1,7 @@
-function gi() { curl -sL https://www.gitignore.io/api/${(j:,:)@} }
+function gi() { curl -fL https://www.gitignore.io/api/${(j:,:)@} }
 
 _gitignoreio_get_command_list() {
-  curl -sL https://www.gitignore.io/api/list | tr "," "\n"
+  curl -fL https://www.gitignore.io/api/list | tr "," "\n"
 }
 
 _gitignoreio () {
-- 
cgit v1.2.3-70-g09d2


From acacfec924fe68a184a9111eba0e99aa89b9015b Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@users.noreply.github.com>
Date: Wed, 25 Apr 2018 15:14:33 +0300
Subject: Remove unneeded option in glol and glola (#6059)

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

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index fa0c06500..fd55be138 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -180,8 +180,8 @@ alias glgg='git log --graph'
 alias glgga='git log --graph --decorate --all'
 alias glgm='git log --graph --max-count=10'
 alias glo='git log --oneline --decorate'
-alias glol="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"
-alias glola="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --all"
+alias glol="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'"
+alias glola="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --all"
 alias glog='git log --oneline --decorate --graph'
 alias gloga='git log --oneline --decorate --graph --all'
 alias glp="_git_log_prettily"
-- 
cgit v1.2.3-70-g09d2


From bf87e99a14320885c506c6b07c9ead8825ee53b9 Mon Sep 17 00:00:00 2001
From: Cristian Álvarez Belaustegui <cristian.alvb@gmail.com>
Date: Wed, 25 Apr 2018 22:06:26 +0200
Subject: Fix mix-fast plugin (#6708)

The mix command for listing all available actions has been changed from
`mix --help` to `mix help`.
---
 plugins/mix-fast/mix-fast.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/mix-fast/mix-fast.plugin.zsh b/plugins/mix-fast/mix-fast.plugin.zsh
index 3719c3525..e27e30d64 100644
--- a/plugins/mix-fast/mix-fast.plugin.zsh
+++ b/plugins/mix-fast/mix-fast.plugin.zsh
@@ -12,7 +12,7 @@ _mix_does_task_list_need_generating () {
 }
 
 _mix_generate () {
-  mix --help | grep -v 'iex -S' | tail -n +2 | cut -d " " -f 2 > .mix_tasks
+  mix help | grep -v 'iex -S' | tail -n +2 | cut -d " " -f 2 > .mix_tasks
 }
 
 _mix () {
-- 
cgit v1.2.3-70-g09d2


From 9cd3701ac0297f4bdf9673ea0dffa8ffdaea63e8 Mon Sep 17 00:00:00 2001
From: Konstantin Zolotarev <konstantin.zolotarev@gmail.com>
Date: Wed, 25 Apr 2018 23:12:19 +0300
Subject: Added ecto tasks (#6035)

---
 plugins/mix/_mix | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'plugins')

diff --git a/plugins/mix/_mix b/plugins/mix/_mix
index 025572a4d..ecbe7e2d3 100644
--- a/plugins/mix/_mix
+++ b/plugins/mix/_mix
@@ -21,6 +21,15 @@ _1st_arguments=(
     'deps.unlock:Unlock the given dependencies'
     'deps.update:Update the given dependencies'
     'do:Executes the tasks separated by comma'
+    'ecto.create:Create Ecto database'
+    'ecto.drop:Drop the storage for the given repository'
+    'ecto.dump:Dumps the current environment’s database structure'
+    'ecto.gen.migration:Generates a migration'
+    'ecto.gen.repo:Generates a new repository'
+    'ecto.load:Loads the current environment’s database structure'
+    'ecto.migrate:Runs Ecto migration'
+    'ecto.migrations:Displays the up / down migration status'
+    'ecto.rollback:Reverts applied migrations'
     'escript.build:Builds an escript for the project'
     'help:Print help information for tasks'
     'hex:Print hex help information'
-- 
cgit v1.2.3-70-g09d2


From 8eba19208dfd62a0565e837a715e62d9876480a0 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Fri, 27 Apr 2018 17:56:21 +0200
Subject: Revert to checking if `enable-ssh-support` is set

Fixes #6772
---
 plugins/gpg-agent/gpg-agent.plugin.zsh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'plugins')

diff --git a/plugins/gpg-agent/gpg-agent.plugin.zsh b/plugins/gpg-agent/gpg-agent.plugin.zsh
index 6a94f598f..3e24c2527 100644
--- a/plugins/gpg-agent/gpg-agent.plugin.zsh
+++ b/plugins/gpg-agent/gpg-agent.plugin.zsh
@@ -1,16 +1,16 @@
 # Enable gpg-agent if it is not running-
 # --use-standard-socket will work from version 2 upwards
 
-AGENT_SOCK=`gpgconf --list-dirs | grep agent-socket | cut -d : -f 2`
+AGENT_SOCK=$(gpgconf --list-dirs | grep agent-socket | cut -d : -f 2)
 
-if [ ! -S ${AGENT_SOCK} ]; then
-  gpg-agent --daemon --use-standard-socket >/dev/null 2>&1
+if [[ ! -S $AGENT_SOCK ]]; then
+  gpg-agent --daemon --use-standard-socket &>/dev/null
 fi
-export GPG_TTY=$(tty)
+export GPG_TTY=$TTY
 
 # Set SSH to use gpg-agent if it's enabled
-if [ -S "${AGENT_SOCK}.ssh" ]; then
-  export SSH_AUTH_SOCK="${AGENT_SOCK}.ssh"
+GNUPGCONFIG="${GNUPGHOME:-"$HOME/.gnupg"}/gpg-agent.conf"
+if [[ -r $GNUPGCONFIG ]] && command grep -q enable-ssh-support "$GNUPGCONFIG"; then
+  export SSH_AUTH_SOCK="$AGENT_SOCK.ssh"
   unset SSH_AGENT_PID
 fi
-
-- 
cgit v1.2.3-70-g09d2


From 32952ec7e8fc254e892eb1c32191d0c1901ae811 Mon Sep 17 00:00:00 2001
From: Ady Romantika <adyromantika@users.noreply.github.com>
Date: Sat, 28 Apr 2018 22:55:46 +0800
Subject: Add aliases for kubectl ingress (#6762)

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

(limited to 'plugins')

diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index 97e429aac..ec1321d8b 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -33,6 +33,12 @@ alias kes='k edit svc'
 alias kds='k describe svc'
 alias kdels='k delete svc'
 
+# Ingress management
+alias kgi='k get ingress'
+alias kei='k edit ingress'
+alias kdi='k describe ingress'
+alias kdeli='k delete ingress'
+
 # Secret management
 alias kgsec='k get secret'
 alias kdsec='k describe secret'
-- 
cgit v1.2.3-70-g09d2


From 493c30954bae3da4ccd80333b807a8d37c131da8 Mon Sep 17 00:00:00 2001
From: Oliver Baumann <baumanno@users.noreply.github.com>
Date: Mon, 30 Apr 2018 16:25:02 +0200
Subject: Parse branch-name for fresh repo (#6302)

Inside a fresh git repo, i.e. immediately after a `git init`, usually no
commit template exists yet. In this case, git renders a different
status message than "Initial commit on". We should consider this message
when attempting to parse out the branch name.

Fixes #6301
---
 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 a8eb8284b..14d875973 100644
--- a/plugins/git-prompt/gitstatus.py
+++ b/plugins/git-prompt/gitstatus.py
@@ -41,7 +41,7 @@ ahead, behind = 0, 0
 status = [(line[0], line[1], line[2:]) for line in stdout.decode('utf-8').splitlines()]
 for st in status:
     if st[0] == '#' and st[1] == '#':
-        if re.search('Initial commit on', st[2]):
+        if re.search('Initial commit on', st[2]) or re.search('No commits yet on', st[2]):
             branch = st[2].split(' ')[-1]
         elif re.search('no branch', st[2]):  # detached status
             branch = get_tagname_or_hash()
-- 
cgit v1.2.3-70-g09d2


From cafa657469bda1baf145c090e168057ae632464d Mon Sep 17 00:00:00 2001
From: Joseph Richey <joerichey@google.com>
Date: Tue, 1 May 2018 06:21:12 -0700
Subject: Correctly handle verbose/version flags for rustc (#6786)

See the help output for rustc (v1.25)
---
 plugins/rust/_rust | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/rust/_rust b/plugins/rust/_rust
index ac6aee160..6e3f344cd 100644
--- a/plugins/rust/_rust
+++ b/plugins/rust/_rust
@@ -88,14 +88,14 @@ _rustc_opts_vals=(
     --pretty='[Pretty-print the input instead of compiling]::TYPE:_values "TYPES" "$_rustc_pretty_types[@]"'
     --unpretty='[Present the input source, unstable (and less-pretty)]::TYPE:_values "TYPES" "$_rustc_unpretty_types[@]"'
     --color='[Configure coloring of output]:CONF:_values "COLORS" "$_rustc_color_types[@]"'
-    {-v,--version}'[Print version info and exit]::VERBOSE:(verbose)'
 )
 
 _rustc_opts_switches=(
     -g'[Equivalent to --debuginfo=2]'
     -O'[Equivalent to --opt-level=2]'
     --test'[Build a test harness]'
-    --verbose'[Use verbose output]'
+    {-v,--verbose}'[Use verbose output]'
+    {-V,--version}'[Print version info and exit]'
     {-h,--help}'[Display this message]'
     --no-analysis'[Parse and expand the output, but run no analysis or produce output]'
     --no-trans'[Run all passes except translation; no output]'
-- 
cgit v1.2.3-70-g09d2


From 00f311a3c1c0beff04db8a005fcfbfc251d62276 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Mon, 7 May 2018 18:00:27 +0200
Subject: Add READMEs to plugins copydir and copyfile (#6802)

* Add README to copydir plugin

* Add README to copyfile plugin
---
 plugins/copydir/README.md  | 10 ++++++++++
 plugins/copyfile/README.md | 10 ++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 plugins/copydir/README.md
 create mode 100644 plugins/copyfile/README.md

(limited to 'plugins')

diff --git a/plugins/copydir/README.md b/plugins/copydir/README.md
new file mode 100644
index 000000000..594bf1065
--- /dev/null
+++ b/plugins/copydir/README.md
@@ -0,0 +1,10 @@
+# copydir plugin
+
+Copies the path of your current folder to the system clipboard.
+
+To use, add `copydir` to your plugins array:
+```
+plugins=(... copydir)
+```
+
+Then use the command `copydir` to copy the $PWD.
diff --git a/plugins/copyfile/README.md b/plugins/copyfile/README.md
new file mode 100644
index 000000000..53138ad06
--- /dev/null
+++ b/plugins/copyfile/README.md
@@ -0,0 +1,10 @@
+# copyfile plugin
+
+Puts the contents of a file in your system clipboard so you can paste it anywhere.
+
+To use, add `copyfile` to your plugins array:
+```
+plugins=(... copyfile)
+```
+
+Then you can run the command `copyfile <filename>` to copy the file named `filename`.
-- 
cgit v1.2.3-70-g09d2


From 0011d34f71fca91a2afeca7a0c05942c7e63ee5f Mon Sep 17 00:00:00 2001
From: MikeDawg <mikedawg@badath64.addictz.sys>
Date: Sat, 3 Feb 2018 16:40:05 -0700
Subject: Removed duplicate fedora from plugins, dnf provides exact same
 features

---
 plugins/fedora/README.md         |  3 ---
 plugins/fedora/fedora.plugin.zsh | 17 +----------------
 2 files changed, 1 insertion(+), 19 deletions(-)
 delete mode 100644 plugins/fedora/README.md
 mode change 100644 => 120000 plugins/fedora/fedora.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/fedora/README.md b/plugins/fedora/README.md
deleted file mode 100644
index f384b0ffd..000000000
--- a/plugins/fedora/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-This is a plugin based on yum plugin, but using dnf as main frontend
-(from Fedora 22 onwards, yum is deprecated in favor of dnf).
- 
diff --git a/plugins/fedora/fedora.plugin.zsh b/plugins/fedora/fedora.plugin.zsh
deleted file mode 100644
index eddc3627b..000000000
--- a/plugins/fedora/fedora.plugin.zsh
+++ /dev/null
@@ -1,16 +0,0 @@
-## Aliases
-
-alias dnfs="dnf search"                       # search package
-alias dnfp="dnf info"                         # show package info
-alias dnfl="dnf list"                         # list packages
-alias dnfgl="dnf grouplist"                   # list package groups
-alias dnfli="dnf list installed"              # print all installed packages
-alias dnfmc="dnf makecache"                   # rebuilds the dnf package list
-
-alias dnfu="sudo dnf upgrade"                 # upgrade packages
-alias dnfi="sudo dnf install"                 # install package
-alias dnfgi="sudo dnf groupinstall"           # install package group
-alias dnfr="sudo dnf remove"                  # remove package
-alias dnfgr="sudo dnf groupremove"            # remove pagage group
-alias dnfrl="sudo dnf remove --remove-leaves" # remove package and leaves
-alias dnfc="sudo dnf clean all"               # clean cache
diff --git a/plugins/fedora/fedora.plugin.zsh b/plugins/fedora/fedora.plugin.zsh
new file mode 120000
index 000000000..16a214313
--- /dev/null
+++ b/plugins/fedora/fedora.plugin.zsh
@@ -0,0 +1 @@
+../dnf/dnf.plugin.zsh
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From b7e544e6f171e3bf754d80e3c5b61b4f8f065622 Mon Sep 17 00:00:00 2001
From: David Harrigan <dharrigan@users.noreply.github.com>
Date: Tue, 8 May 2018 12:13:11 +0100
Subject: gradle plugin should support kotlin gradle build files (#6529)

This change allows the gradle plugin to recongise build.gradle.kts files and
thus generate the autocomplete entries.

-=david=-

closes #6528
---
 plugins/gradle/gradle.plugin.zsh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'plugins')

diff --git a/plugins/gradle/gradle.plugin.zsh b/plugins/gradle/gradle.plugin.zsh
index 0adc04a13..c7047552d 100644
--- a/plugins/gradle/gradle.plugin.zsh
+++ b/plugins/gradle/gradle.plugin.zsh
@@ -88,7 +88,7 @@ function _gradle_arguments() {
 # and if so, regenerate the .gradle_tasks cache file
 ############################################################################
 _gradle_does_task_list_need_generating () {
-  [[ ! -f .gradletasknamecache ]] || [[ build.gradle -nt .gradletasknamecache ]]
+  [[ ! -f .gradletasknamecache ]] || [[ build.gradle -nt .gradletasknamecache || build.gradle.kts -nt .gradletasknamecache ]]
 }
 
 ##############
@@ -144,7 +144,7 @@ _gradle_parse_and_extract_tasks () {
 # Discover the gradle tasks by running "gradle tasks --all"
 ############################################################################
 _gradle_tasks () {
-  if [[ -f build.gradle ]]; then
+  if [[ -f build.gradle || -f build.gradle.kts ]]; then
     _gradle_arguments
     if _gradle_does_task_list_need_generating; then
       _gradle_parse_and_extract_tasks "$(gradle tasks --all)" > .gradletasknamecache
@@ -154,7 +154,7 @@ _gradle_tasks () {
 }
 
 _gradlew_tasks () {
-  if [[ -f build.gradle ]]; then
+  if [[ -f build.gradle || -f build.gradle.kts ]]; then
     _gradle_arguments
     if _gradle_does_task_list_need_generating; then
       _gradle_parse_and_extract_tasks "$(./gradlew tasks --all)" > .gradletasknamecache
-- 
cgit v1.2.3-70-g09d2


From 18f7ca577a41807f0c99fc9d00e1572d96d7c6cb Mon Sep 17 00:00:00 2001
From: Francisco Zuviría <FranciscodeZuviria@fusap.com.ar>
Date: Tue, 8 May 2018 12:55:59 -0300
Subject: Adhere to coding style outlined in wiki

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

(limited to 'plugins')

diff --git a/plugins/dirhistory/dirhistory.plugin.zsh b/plugins/dirhistory/dirhistory.plugin.zsh
index 05839e35a..6867086ca 100644
--- a/plugins/dirhistory/dirhistory.plugin.zsh
+++ b/plugins/dirhistory/dirhistory.plugin.zsh
@@ -144,12 +144,12 @@ bindkey "\eO3C" dirhistory_zle_dirhistory_future
 
 # Move up in hierarchy
 function dirhistory_up() {
-  cd ..
+  cd .. || return 1
 }
 
 # Move down in hierarchy
 function dirhistory_down() {
-  cd "`find . -mindepth 1 -maxdepth 1 -type d | sort -n | head -n 1`"
+  cd "$(find . -mindepth 1 -maxdepth 1 -type d | sort -n | head -n 1)" || return 1
 }
 
 
-- 
cgit v1.2.3-70-g09d2


From 825baeb31074ee43e77e7cd26ff17b619ed13bb5 Mon Sep 17 00:00:00 2001
From: Quentin Nerden <kenden@gmail.com>
Date: Wed, 9 May 2018 22:34:41 +0200
Subject: Add autocomplete plugin for minikube (#6436)

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

(limited to 'plugins')

diff --git a/plugins/minikube/minikube.plugin.zsh b/plugins/minikube/minikube.plugin.zsh
new file mode 100644
index 000000000..d8ebe79af
--- /dev/null
+++ b/plugins/minikube/minikube.plugin.zsh
@@ -0,0 +1,6 @@
+# Autocompletion for Minikube.
+#
+
+if [ $commands[minikube] ]; then
+  source <(minikube completion zsh)
+fi
-- 
cgit v1.2.3-70-g09d2


From e8c328cb394e39f8d1c7d18b85b0be12bd71c556 Mon Sep 17 00:00:00 2001
From: Hosh <hoshsadiq@users.noreply.github.com>
Date: Thu, 10 May 2018 19:53:16 +0100
Subject: Update AWS completion (#6745)

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

(limited to 'plugins')

diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index 6a0e04add..a326e2e01 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -42,11 +42,11 @@ function aws_profiles {
 
 compctl -K aws_profiles asp
 
-if _homebrew-installed && _awscli-homebrew-installed ; then
+if which aws_zsh_completer.sh &>/dev/null; then
+  _aws_zsh_completer_path=$(which aws_zsh_completer.sh 2>/dev/null)
+elif _homebrew-installed && _awscli-homebrew-installed; then
   _aws_zsh_completer_path=$_brew_prefix/libexec/bin/aws_zsh_completer.sh
-else
-  _aws_zsh_completer_path=$(which aws_zsh_completer.sh)
 fi
 
-[ -x $_aws_zsh_completer_path ] && source $_aws_zsh_completer_path
+[ -n "$_aws_zsh_completer_path" ] && [ -x $_aws_zsh_completer_path ] && source $_aws_zsh_completer_path
 unset _aws_zsh_completer_path
-- 
cgit v1.2.3-70-g09d2


From 18effd77db1156c11848bd3bfadd8fa63c747516 Mon Sep 17 00:00:00 2001
From: Xiao Fan <xiao.h.fan@gmail.com>
Date: Fri, 11 May 2018 07:28:02 -0700
Subject: last-working-dir: disable chpwd_last_working_dir in subshells (#6817)

---
 plugins/last-working-dir/last-working-dir.plugin.zsh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/last-working-dir/last-working-dir.plugin.zsh b/plugins/last-working-dir/last-working-dir.plugin.zsh
index e882b288f..53bb19e46 100644
--- a/plugins/last-working-dir/last-working-dir.plugin.zsh
+++ b/plugins/last-working-dir/last-working-dir.plugin.zsh
@@ -4,8 +4,10 @@ typeset -g ZSH_LAST_WORKING_DIRECTORY
 # Updates the last directory once directory is changed
 chpwd_functions+=(chpwd_last_working_dir)
 chpwd_last_working_dir() {
-	local cache_file="$ZSH_CACHE_DIR/last-working-dir"
-	pwd >| "$cache_file"
+	if [ "$ZSH_SUBSHELL" = 0 ]; then
+		local cache_file="$ZSH_CACHE_DIR/last-working-dir"
+		pwd >| "$cache_file"
+	fi
 }
 
 # Changes directory to the last working directory
-- 
cgit v1.2.3-70-g09d2


From 8ebf2a678507b28cf107858b316f5e874ef73d0f Mon Sep 17 00:00:00 2001
From: Giuseppe Landolfi <giuseppe.landolfi@gmail.com>
Date: Sun, 13 May 2018 01:53:45 +0200
Subject: Fine-tune dirhistory plugin mappings for Mac (#6580)

See https://github.com/robbyrussell/oh-my-zsh/pull/6533#issuecomment-360878060
---
 plugins/dirhistory/dirhistory.plugin.zsh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/dirhistory/dirhistory.plugin.zsh b/plugins/dirhistory/dirhistory.plugin.zsh
index 8138872bc..283dace29 100644
--- a/plugins/dirhistory/dirhistory.plugin.zsh
+++ b/plugins/dirhistory/dirhistory.plugin.zsh
@@ -120,7 +120,9 @@ zle -N dirhistory_zle_dirhistory_back
 bindkey "\e[3D" dirhistory_zle_dirhistory_back
 bindkey "\e[1;3D" dirhistory_zle_dirhistory_back
 # Mac teminal (alt+left/right)
-bindkey "^[b" dirhistory_zle_dirhistory_back
+if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]]; then
+  bindkey "^[b" dirhistory_zle_dirhistory_back
+fi
 # Putty:
 bindkey "\e\e[D" dirhistory_zle_dirhistory_back
 # GNU screen:
@@ -129,7 +131,9 @@ 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 "^[f" dirhistory_zle_dirhistory_future
+if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]]; then
+  bindkey "^[f" dirhistory_zle_dirhistory_future
+fi
 bindkey "\e\e[C" dirhistory_zle_dirhistory_future
 bindkey "\eO3C" dirhistory_zle_dirhistory_future
 
-- 
cgit v1.2.3-70-g09d2


From 0c63909ad3e8ed73d2b732396f2fd8ffffcf1b89 Mon Sep 17 00:00:00 2001
From: Ian Chesal <ian.chesal@gmail.com>
Date: Sun, 13 May 2018 12:56:46 -0700
Subject: Fix default location of the virtualenvwrapper script (#6348)

The `virtualenvwrapper` script has been relocated to
`/usr/local/bin/virtualenvwrapper.sh`. Update the
plugin to look in the new location first. See:

http://virtualenvwrapper.readthedocs.io/en/latest/#introduction

to confirm the change in location for this script.

This addresses issue #3047 where the solution was to source this file
from your zshrc.
---
 plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'plugins')

diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
index 6cd30732e..484f18c91 100644
--- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
@@ -6,6 +6,13 @@ if (( $+commands[$virtualenvwrapper] )); then
     unsetopt equals
     source ${${virtualenvwrapper}:c}
   }
+elif [[ -f "/usr/local/bin/virtualenvwrapper.sh" ]]; then
+  function {
+    setopt local_options
+    unsetopt equals
+    virtualenvwrapper="/usr/local/bin/virtualenvwrapper.sh"
+    source "/usr/local/bin/virtualenvwrapper.sh"
+  }
 elif [[ -f "/etc/bash_completion.d/virtualenvwrapper" ]]; then
   function {
     setopt local_options
-- 
cgit v1.2.3-70-g09d2


From 919f0a42a09371c948d89c2d63593c23658811cc Mon Sep 17 00:00:00 2001
From: Quentin Nerden <kenden@gmail.com>
Date: Sun, 13 May 2018 21:58:35 +0200
Subject: Updated autocomplete and readme (#6720)

Signed-off-by: Troy Fontaine <tfontaine@troyfontaine.com>
---
 plugins/docker/_docker | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'plugins')

diff --git a/plugins/docker/_docker b/plugins/docker/_docker
index 0c20cf28e..4d1b79a82 100644
--- a/plugins/docker/_docker
+++ b/plugins/docker/_docker
@@ -450,9 +450,9 @@ __docker_complete_events_filter() {
                 ;;
             (event)
                 local -a event_opts
-                event_opts=('attach' 'commit' 'connect' 'copy' 'create' 'delete' 'destroy' 'detach' 'die' 'disconnect' 'exec_create' 'exec_detach'
-                'exec_start' 'export' 'health_status' 'import' 'kill' 'load'  'mount' 'oom' 'pause' 'pull' 'push' 'reload' 'rename' 'resize' 'restart' 'save' 'start'
-                'stop' 'tag' 'top' 'unmount' 'unpause' 'untag' 'update')
+                event_opts=('attach' 'commit' 'connect' 'copy' 'create' 'delete' 'destroy' 'detach' 'die' 'disable' 'disconnect' 'enable' 'exec_create' 'exec_detach'
+                'exec_start' 'export' 'health_status' 'import' 'install' 'kill' 'load'  'mount' 'oom' 'pause' 'pull' 'push' 'reload' 'remove' 'rename' 'resize'
+                'restart' 'save' 'start' 'stop' 'tag' 'top' 'unmount' 'unpause' 'untag' 'update')
                 _describe -t event-filter-opts "event filter options" event_opts && ret=0
                 ;;
             (image)
@@ -3024,4 +3024,4 @@ _docker "$@"
 # indent-tabs-mode: nil
 # sh-basic-offset: 4
 # End:
-# vim: ft=zsh sw=4 ts=4 et
\ No newline at end of file
+# vim: ft=zsh sw=4 ts=4 et
-- 
cgit v1.2.3-70-g09d2


From 0608bb768fea1222410c5bd9b576bb1098409ffa Mon Sep 17 00:00:00 2001
From: Harald Nordgren <haraldnordgren@gmail.com>
Date: Mon, 14 May 2018 15:09:57 +0200
Subject: Use 'apt' instead of 'apt-get' for Ubuntu >=16.04 (#5787)

---
 plugins/ubuntu/ubuntu.plugin.zsh | 67 +++++++++++++++++++++-------------------
 1 file changed, 35 insertions(+), 32 deletions(-)

(limited to 'plugins')

diff --git a/plugins/ubuntu/ubuntu.plugin.zsh b/plugins/ubuntu/ubuntu.plugin.zsh
index 082481466..f7363feb8 100644
--- a/plugins/ubuntu/ubuntu.plugin.zsh
+++ b/plugins/ubuntu/ubuntu.plugin.zsh
@@ -5,18 +5,21 @@
 # https://github.com/trinaldi
 # Nicolas Jonas nextgenthemes.com
 # https://github.com/loctauxphilippe
+# https://github.com/HaraldNordgren
 #
 # Debian, Ubuntu and friends related zsh aliases and functions for zsh
 
+(( $+commands[apt] )) && APT=apt || APT=apt-get
+
 alias acs='apt-cache search'
 compdef _acs acs='apt-cache search'
 
 alias afs='apt-file search --regexp'
 compdef _afs afs='apt-file search --regexp'
 
-# These are apt-get only
-alias ags='apt-get source'   # asrc
-compdef _ags ags='apt-get source'
+# These are apt/apt-get only
+alias ags="$APT source"   # asrc
+compdef _ags ags="$APT source"
 
 alias acp='apt-cache policy' # app
 compdef _acp acp='apt-cache policy'
@@ -37,33 +40,33 @@ compdef _afu afu='sudo apt-file update'
 alias ppap='sudo ppa-purge'
 compdef _ppap ppap='sudo ppa-purge'
 
-alias apg='sudo apt-get'            # age - but without sudo
-alias aga='sudo apt-get autoclean' # aac
-alias agb='sudo apt-get build-dep' # abd
-alias agc='sudo apt-get clean'     # adc
-alias agd='sudo apt-get dselect-upgrade' # ads
-alias agi='sudo apt-get install'  # ai
-alias agp='sudo apt-get purge'    # ap
-alias agr='sudo apt-get remove'   # ar
-alias agu='sudo apt-get update'   # ad
-alias agud='sudo apt-get update && sudo apt-get full-upgrade' #adu
-alias agug='sudo apt-get upgrade' # ag
-alias aguu='sudo apt-get update && sudo apt-get upgrade'      #adg
-alias agar='sudo apt-get autoremove'
-
-compdef _ag apg='sudo apt-get'
-compdef _aga aga='sudo apt-get autoclean'
-compdef _agb agb='sudo apt-get build-dep'
-compdef _agc agc='sudo apt-get clean'
-compdef _agd agd='sudo apt-get dselect-upgrade'
-compdef _agi agi='sudo apt-get install'
-compdef _agp agp='sudo apt-get purge'
-compdef _agr agr='sudo apt-get remove'
-compdef _agu agu='sudo apt-get update'
-compdef _agud agud='sudo apt-get update && sudo apt-get full-upgrade'
-compdef _agug agug='sudo apt-get upgrade'
-compdef _aguu aguu='sudo apt-get update && sudo apt-get upgrade'
-compdef _agar agar='sudo apt-get autoremove'
+alias ag="sudo $APT"               # age - but without sudo
+alias aga="sudo $APT autoclean"    # aac
+alias agb="sudo $APT build-dep"    # abd
+alias agc="sudo $APT clean"        # adc
+alias agd="sudo $APT dselect-upgrade" # ads
+alias agi="sudo $APT install"      # ai
+alias agp="sudo $APT purge"        # ap
+alias agr="sudo $APT remove"       # ar
+alias agu="sudo $APT update"       # ad
+alias agud="sudo $APT update && sudo $APT dist-upgrade" #adu
+alias agug="sudo $APT upgrade"     # ag
+alias aguu="sudo $APT update && sudo $APT upgrade"      #adg
+alias agar="sudo $APT autoremove"
+
+compdef _ag ag="sudo $APT"
+compdef _aga aga="sudo $APT autoclean"
+compdef _agb agb="sudo $APT build-dep"
+compdef _agc agc="sudo $APT clean"
+compdef _agd agd="sudo $APT dselect-upgrade"
+compdef _agi agi="sudo $APT install"
+compdef _agp agp="sudo $APT purge"
+compdef _agr agr="sudo $APT remove"
+compdef _agu agu="sudo $APT update"
+compdef _agud agud="sudo $APT update && sudo $APT dist-upgrade"
+compdef _agug agug="sudo $APT upgrade"
+compdef _aguu aguu="sudo $APT update && sudo $APT upgrade"
+compdef _agar agar="sudo $APT autoremove"
 
 # Remove ALL kernel images and headers EXCEPT the one in use
 alias kclean='sudo aptitude remove -P ?and(~i~nlinux-(ima|hea) \
@@ -91,8 +94,8 @@ aar() {
 		PACKAGE=${1##*/}
 	fi
 	
-	sudo apt-add-repository $1 && sudo apt-get update
-	sudo apt-get install $PACKAGE
+	sudo apt-add-repository $1 && sudo $APT update
+	sudo $APT install $PACKAGE
 }
 
 # Prints apt history
-- 
cgit v1.2.3-70-g09d2


From 6876d9c5438b0e0e950fc85f736458ba55f8d65c Mon Sep 17 00:00:00 2001
From: Varun Patro <varun.kumar.patro@gmail.com>
Date: Mon, 14 May 2018 19:30:04 +0530
Subject: Update fasd.plugin.zsh (#6822)

If `EDITOR` variable contains arguments to an editor such as mine:
`export EDITOR=emacsclient -t -c --alternate-editor=''`
Then, the editor's arguments are passed on to `fasd`. To fix this, pass the EDITOR program in quotes.
---
 plugins/fasd/fasd.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/fasd/fasd.plugin.zsh b/plugins/fasd/fasd.plugin.zsh
index 2c302f74d..45d10858f 100644
--- a/plugins/fasd/fasd.plugin.zsh
+++ b/plugins/fasd/fasd.plugin.zsh
@@ -6,6 +6,6 @@ if [ $commands[fasd] ]; then # check if fasd is installed
   source "$fasd_cache"
   unset fasd_cache
 
-  alias v="f -e $EDITOR"
+  alias v="f -e \"$EDITOR\""
   alias o='a -e open_command'
 fi
-- 
cgit v1.2.3-70-g09d2


From 0aa645f8033ef86f8c8b0729a94fc54fbec49a25 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 15 May 2018 12:07:23 +0200
Subject: pyenv: search the pyenv command if not found (#6811)

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

(limited to 'plugins')

diff --git a/plugins/pyenv/pyenv.plugin.zsh b/plugins/pyenv/pyenv.plugin.zsh
index 76880e415..dbc7da472 100644
--- a/plugins/pyenv/pyenv.plugin.zsh
+++ b/plugins/pyenv/pyenv.plugin.zsh
@@ -1,7 +1,29 @@
 # This plugin loads pyenv into the current shell and provides prompt info via
 # the 'pyenv_prompt_info' function. Also loads pyenv-virtualenv if available.
 
-if (( $+commands[pyenv] )); then
+FOUND_PYENV=$+commands[pyenv]
+
+if [[ $FOUND_PYENV -ne 1 ]]; then
+    pyenvdirs=("$HOME/.pyenv" "/usr/local/pyenv" "/opt/pyenv")
+    for dir in $pyenvdirs; do
+        if [[ -d $dir/bin ]]; then
+            export PATH="$PATH:$dir/bin"
+            FOUND_PYENV=1
+            break
+        fi
+    done
+fi
+
+if [[ $FOUND_PYENV -ne 1 ]]; then
+    if (( $+commands[brew] )) && dir=$(brew --prefix pyenv 2>/dev/null); then
+        if [[ -d $dir/bin ]]; then
+            export PATH="$PATH:$dir/bin"
+            FOUND_PYENV=1
+        fi
+    fi
+fi
+
+if [[ $FOUND_PYENV -eq 1 ]]; then
     eval "$(pyenv init - zsh)"
     if (( $+commands[pyenv-virtualenv-init] )); then
         eval "$(pyenv virtualenv-init - zsh)"
@@ -15,3 +37,5 @@ else
         echo "system: $(python -V 2>&1 | cut -f 2 -d ' ')"
     }
 fi
+
+unset FOUND_PYENV dir
-- 
cgit v1.2.3-70-g09d2


From c3493dc5ceb87a5c74d288f30fbe4bdbf4cb97c5 Mon Sep 17 00:00:00 2001
From: rco-ableton <rco@ableton.com>
Date: Wed, 16 May 2018 17:40:42 +0200
Subject: Add Heroku pipelines support (#5660)

---
 plugins/heroku/_heroku | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

(limited to 'plugins')

diff --git a/plugins/heroku/_heroku b/plugins/heroku/_heroku
index 878d3ce1b..f26595e00 100644
--- a/plugins/heroku/_heroku
+++ b/plugins/heroku/_heroku
@@ -45,6 +45,18 @@ _1st_arguments=(
   "logs\:drains":"manage syslog drains"
   "maintenance\:on":"put the app into maintenance mode"
   "maintenance\:off":"take the app out of maintenance mode"
+  "pipelines":"list pipelines you have access to"
+  "pipelines\:add":"add this app to a pipeline"
+  "pipelines\:create":"create a new pipeline"
+  "pipelines\:destroy":"destroy a pipeline"
+  "pipelines\:diff":"compares the latest release of this app to its downstream app(s)"
+  "pipelines\:info":"show list of apps in a pipeline"
+  "pipelines\:list":"list pipelines you have access to"
+  "pipelines\:open":"open a pipeline in dashboard"
+  "pipelines\:promote":"promote the latest release of this app to its downstream app(s)"
+  "pipelines\:remove":"remove this app from its pipeline"
+  "pipelines\:rename":"rename a pipeline"
+  "pipelines\:update":"update this app's stage in a pipeline"
   "pg\:credentials":"display the DATABASE credentials"
   "pg\:diagnose":"run diagnostics report on DATABASE"
   "pg\:info":"display database information"
@@ -131,6 +143,41 @@ case "$words[1]" in
       '(-t|--tail)'{-t,--tail}'[continually stream logs]' \
     )
     ;;
+  pipelines)
+    _command_args=(
+      '(--json)'--json'[output in json format]' \
+    )
+    ;;
+  pipelines:add)
+    _command_args=(
+      '(-s|--stage)'{-s,--stage}'[stage of first app in pipeline]' \
+    )
+    ;;
+  pipelines:create)
+    _command_args=(
+      '(-s|--stage)'{-s,--stage}'[stage of first app in pipeline]' \
+    )
+    ;;
+  pipelines:info)
+    _command_args=(
+      '(--json)'--json'[output in json format]' \
+    )
+    ;;
+  pipelines:list)
+    _command_args=(
+      '(--json)'--json'[output in json format]' \
+    )
+    ;;
+  pipelines:promote)
+    _command_args=(
+      '(-t|--to)'{-t,--to}'[comma separated list of apps to promote to]' \
+    )
+    ;;
+  pipelines:update)
+    _command_args=(
+      '(-s|--stage)'{-s,--stage}'[stage of first app in pipeline]' \
+    )
+    ;;
   pgbackups:capture)
     _command_args=(
       '(-e|--expire)'{-e,--expire}'[if no slots are available to capture, delete the oldest backup to make room]' \
-- 
cgit v1.2.3-70-g09d2


From de1e3c0794ab4214412fe4f15d1e39ddffcbea42 Mon Sep 17 00:00:00 2001
From: Julien Palmas <julien.palmas@gmail.com>
Date: Mon, 22 Jun 2015 14:19:08 +0200
Subject: add pg:backups command

---
 plugins/heroku/_heroku | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins')

diff --git a/plugins/heroku/_heroku b/plugins/heroku/_heroku
index f26595e00..4122de237 100644
--- a/plugins/heroku/_heroku
+++ b/plugins/heroku/_heroku
@@ -72,6 +72,7 @@ _1st_arguments=(
   "pg\:unfollow":"stop a replica from following and make it a read/write database"
   "pg\:upgrade":"unfollow a database and upgrade it to the latest PostgreSQL version"
   "pg\:wait":"monitor database creation, exit when complete"
+  "pg\:backups":"Interact with built-in backups"
   "pgbackups":"list captured backups"
   "pgbackups\:url":"get a temporary URL for a backup"
   "pgbackups\:capture":"capture a backup from a database id"
-- 
cgit v1.2.3-70-g09d2


From e8aaab56b9f007cd5a285099fa101a63214622ee Mon Sep 17 00:00:00 2001
From: Frank Wittig <frank.wittig@here.com>
Date: Wed, 9 Apr 2014 18:11:06 +0200
Subject: allow . in profile names

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

(limited to 'plugins')

diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index a326e2e01..183b0f226 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -37,9 +37,8 @@ function asp {
 }
 
 function aws_profiles {
-  reply=($(grep profile $AWS_HOME/config|sed -e 's/.*profile \([a-zA-Z0-9_-]*\).*/\1/'))
+  reply=($(grep profile $AWS_HOME/config|sed -e 's/.*profile \([a-zA-Z0-9_\.-]*\).*/\1/'))
 }
-
 compctl -K aws_profiles asp
 
 if which aws_zsh_completer.sh &>/dev/null; then
-- 
cgit v1.2.3-70-g09d2


From 3dab7e46e8815838c8099040e11a7ae9a30ba03d Mon Sep 17 00:00:00 2001
From: dt-rush <nick.8.payne@gmail.com>
Date: Thu, 17 May 2018 08:45:04 -0400
Subject: unset chpwd_functions before running cd to work with the path, to
 avoid side-effects if the user has set any chpwd_functions which cause
 output, such as is the case if the user is using auto-ls (#6830)

---
 plugins/shrink-path/shrink-path.plugin.zsh | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'plugins')

diff --git a/plugins/shrink-path/shrink-path.plugin.zsh b/plugins/shrink-path/shrink-path.plugin.zsh
index f111962a5..6dd6a930f 100644
--- a/plugins/shrink-path/shrink-path.plugin.zsh
+++ b/plugins/shrink-path/shrink-path.plugin.zsh
@@ -94,6 +94,11 @@ shrink_path () {
         (( tilde )) && dir=${dir/$HOME/\~}
         tree=(${(s:/:)dir})
         (
+                # unset chpwd_functions since we'll be calling `cd` and don't
+                # want any side-effects (eg., if the user was using auto-ls)
+                chpwd_functions=()
+                # unset chpwd since even if chpwd_functions is (), zsh will
+                # attempt to execute chpwd
                 unfunction chpwd 2> /dev/null
                 if [[ $tree[1] == \~* ]] {
                         cd ${~tree[1]}
-- 
cgit v1.2.3-70-g09d2


From d79086bc87a8728121526081ad8b81e635904f55 Mon Sep 17 00:00:00 2001
From: Matt Lewin <matt@mogroups.com>
Date: Thu, 17 May 2018 10:18:20 -0400
Subject: Update terraform plugin with v0.11.7 commands and help (#6834)

---
 plugins/terraform/README.md  |   8 +-
 plugins/terraform/_terraform | 192 ++++++++++++++++++++++++++++++++-----------
 2 files changed, 149 insertions(+), 51 deletions(-)

(limited to 'plugins')

diff --git a/plugins/terraform/README.md b/plugins/terraform/README.md
index 46855e417..e5d9e47b6 100644
--- a/plugins/terraform/README.md
+++ b/plugins/terraform/README.md
@@ -1,7 +1,9 @@
-## atom
+## Terraform oh-my-zsh plugin
 
 Plugin for Terraform, a tool from Hashicorp for managing infrastructure safely and efficiently.
 
+Current as of Terraform v0.11.7
+
 ### Requirements
 
  * [Terraform](https://terraform.io/)
@@ -12,8 +14,8 @@ Plugin for Terraform, a tool from Hashicorp for managing infrastructure safely a
 
 ### Expanding ZSH prompt with current Terraform workspace name
 
-If you want to get current Terraform workspace name in your ZSH prompt open 
-your .zsh-theme file and in a choosen place insert:
+If you want to get current Terraform workspace name in your ZSH prompt open
+your .zsh-theme file and in a chosen place insert:
 
 ```
 $FG[045]\
diff --git a/plugins/terraform/_terraform b/plugins/terraform/_terraform
index 285d83ec7..1d1315a8a 100644
--- a/plugins/terraform/_terraform
+++ b/plugins/terraform/_terraform
@@ -3,91 +3,151 @@
 local -a _terraform_cmds
 _terraform_cmds=(
     'apply:Builds or changes infrastructure'
+    'console:Interactive console for Terraform interpolations'
     'destroy:Destroy Terraform-managed infrastructure'
+    'fmt:Rewrites config files to canonical format'
     'get:Download and install modules for the configuration'
     'graph:Create a visual graph of Terraform resources'
-    'init:Initializes Terraform configuration from a module'
+    'import:Import existing infrastructure into Terraform'
+    'init:Initialize a Terraform working directory'
     'output:Read an output from a state file'
     'plan:Generate and show an execution plan'
-    'pull:Refreshes the local state copy from the remote server'
-    'push:Uploads the local state to the remote server'
+    'providers:Prints a tree of the providers used in the configuration'
+    'push:Upload this Terraform module to Atlas to run'
     'refresh:Update local state file against real resources'
-    'remote:Configures remote state management'
     'show:Inspect Terraform state or plan'
-    'taint:Manually forcing a destroy and recreate on the next plan/apply'
+    'taint:Manually mark a resource for recreation'
+    'untaint:Manually unmark a resource as tainted'
+    'validate:Validates the Terraform files'
     'version:Prints the Terraform version'
+    'workspace:Workspace management'
 )
 
 __apply() {
     _arguments \
-        '-auto-approve[Skip interactive approval of plan before applying.]' \
         '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]' \
+        '-auto-approve[Skip interactive approval of plan before applying.]' \
+        '-lock=[(true) Lock the state file when locking is supported.]' \
+        '-lock-timeout=[(0s) Duration to retry a state lock.]' \
         '-input=[(true) Ask for input for variables if not directly set.]' \
-        '-no-color[If specified, output will not contain any color.]' \
+        '-no-color[If specified, output wil be colorless.]' \
+        '-parallelism=[(10) Limit the number of parallel resource operations.]' \
         '-refresh=[(true) Update state prior to checking for differences. This has no effect if a plan file is given to apply.]' \
-        '-state=[(path) Path to read and save state (unless state-out is specified). Defaults to "terraform.tfstate".]' \
+        '-state=[(terraform.tfstate) Path to read and save state (unless state-out is specified).]' \
         '-state-out=[(path) Path to write state to that is different than "-state". This can be used to preserve the old state.]' \
-        '-target=[(resource) A Resource Address to target. Operation will be limited to this resource and its dependencies. This flag can be used multiple times.]' \
+        '-target=[(resource) Resource to target. Operation will be limited to this resource and its dependencies. This flag can be used multiple times.]' \
         '-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \
-        '-var-file=[(path) Set variables in the Terraform configuration from a file. If "terraform.tfvars" is present, it will be automatically loaded if this flag is not specified.]'
+        '-var-file=[(foo) Set variables in the Terraform configuration from a file. If "terraform.tfvars" or any ".auto.tfvars" files are present, they will be automatically loaded.]'
+}
+
+__console() {
+    _arguments \
+        '-state=[(terraform.tfstate) Path to read state.]' \
+        '-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \
+        '-var-file=[(foo) Set variables in the Terraform configuration from a file. If "terraform.tfvars" or any ".auto.tfvars" files are present, they will be automatically loaded.]'
 }
 
 __destroy() {
     _arguments \
         '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]' \
-        '-force[If set, then the destroy confirmation will not be shown.]' \
-        '-input=[(true) Ask for input for variables if not directly set.]' \
-        '-no-color[If specified, output will not contain any color.]' \
+        '-auto-approve[Skip interactive approval before destroying.]' \
+        '-force[Deprecated: same as auto-approve.]' \
+        '-lock=[(true) Lock the state file when locking is supported.]' \
+        '-lock-timeout=[(0s) Duration to retry a state lock.]' \
+        '-no-color[If specified, output will contain no color.]' \
+        '-parallelism=[(10) Limit the number of concurrent operations.]' \
         '-refresh=[(true) Update state prior to checking for differences. This has no effect if a plan file is given to apply.]' \
-        '-state=[(path) Path to read and save state (unless state-out is specified). Defaults to "terraform.tfstate".]' \
+        '-state=[(terraform.tfstate) Path to read and save state (unless state-out is specified).]' \
         '-state-out=[(path) Path to write state to that is different than "-state". This can be used to preserve the old state.]' \
-        '-target=[(resource) Instead of affecting "dependencies" will instead also destroy any resources that depend on the target(s) specified.]' \
+        '-target=[(resource) Resource to target. Operation will be limited to this resource and its dependencies. This flag can be used multiple times.]' \
         '-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \
-        '-var-file=[(path) Set variables in the Terraform configuration from a file. If "terraform.tfvars" is present, it will be automatically loaded if this flag is not specified.]'
+        '-var-file=[(foo) Set variables in the Terraform configuration from a file. If "terraform.tfvars" or any ".auto.tfvars" files are present, they will be automatically loaded.]'
+}
+
+__fmt() {
+    _arguments \
+        '-list=[(true) List files whose formatting differs (always false if using STDIN)]' \
+        '-write=[(true) Write result to source file instead of STDOUT (always false if using STDIN or -check)]' \
+        '-diff=[(false) Display diffs of formatting changes]' \
+        '-check=[(false) Check if the input is formatted. Exit status will be 0 if all input is properly formatted and non-zero otherwise.]'
 }
 
 __get() {
     _arguments \
-        '-update=[(false) If true, modules already downloaded will be checked for updates and updated if necessary.]'
+        '-update=[(false) If true, modules already downloaded will be checked for updates and updated if necessary.]' \
+        '-no-color[If specified, output will contain no color.]'
 }
 
 __graph() {
     _arguments \
         '-draw-cycles[Highlight any cycles in the graph with colored edges. This helps when diagnosing cycle errors.]' \
-        '-module-depth=[(n) The maximum depth to expand modules. By default this is zero, which will not expand modules at all.]' \
-        '-verbose[Generate a verbose, "worst-case" graph, with all nodes for potential operations in place.]'
+        '-no-color[If specified, output will contain no color.]' \
+        '-type=[(plan) Type of graph to output. Can be: plan, plan-destroy, apply, validate, input, refresh.]'
+}
+
+__import() {
+    _arguments \
+        '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]' \
+        '-config=[(path) Path to a directory of Terraform configuration files to use to configure the provider. Defaults to pwd. If no config files are present, they must be provided via the input prompts or env vars.]' \
+        '-allow-missing-config[Allow import when no resource configuration block exists.]' \
+        '-input=[(true) Ask for input for variables if not directly set.]' \
+        '-lock=[(true) Lock the state file when locking is supported.]' \
+        '-lock-timeout=[(0s) Duration to retry a state lock.]' \
+        '-no-color[If specified, output will contain no color.]' \
+        '-provider=[(provider) Specific provider to use for import. This is used for specifying aliases, such as "aws.eu". Defaults to the normal provider prefix of the resource being imported.]' \
+        '-state=[(PATH) Path to the source state file. Defaults to the configured backend, or "terraform.tfstate"]' \
+        '-state-out=[(PATH) Path to the destination state file to write to. If this is not specified, the source state file will be used. This can be a new or existing path.]' \
+        '-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times. This is only useful with the "-config" flag.]' \
+        '-var-file=[(foo) Set variables in the Terraform configuration from a file. If "terraform.tfvars" or any ".auto.tfvars" files are present, they will be automatically loaded.]'
 }
 
 __init() {
     _arguments \
-        '-address=[(url) URL of the remote storage server. Required for HTTP backend, optional for Atlas and Consul.]' \
-        '-access-token=[(token) Authentication token for state storage server. Required for Atlas backend, optional for Consul.]' \
-        '-backend=[(atlas) Specifies the type of remote backend. Must be one of Atlas, Consul, or HTTP. Defaults to atlas.]' \
-        '-backend-config=[(path) Specifies the path to remote backend config file.]' \
-        '-name=[(name) Name of the state file in the state storage server. Required for Atlas backend.]' \
-        '-path=[(path) Path of the remote state in Consul. Required for the Consul backend.]'
+        '-backend=[(true) Configure the backend for this configuration.]' \
+        '-backend-config=[This can be either a path to an HCL file with key/value assignments (same format as terraform.tfvars) or a 'key=value' format. This is merged with what is in the configuration file. This can be specified multiple times. The backend type must be in the configuration itself.]' \
+        '-force-copy[Suppress prompts about copying state data. This is equivalent to providing a "yes" to all confirmation prompts.]' \
+        '-from-module=[Copy the contents of the given module into the target directory before initialization.]' \
+        '-get=[(true) Download any modules for this configuration.]' \
+        '-get-plugins=[(true) Download any missing plugins for this configuration.]' \
+        '-input=[(true) Ask for input if necessary. If false, will error if input was required.]' \
+        '-lock=[(true) Lock the state file when locking is supported.]' \
+        '-lock-timeout=[(0s) Duration to retry a state lock.]' \
+        '-no-color[If specified, output will contain no color.]' \
+        '-plugin-dir[Directory containing plugin binaries. This overrides all default search paths for plugins, and prevents the automatic installation of plugins. This flag can be used multiple times.]' \
+        '-reconfigure[Reconfigure the backend, ignoring any saved configuration.]' \
+        '-upgrade=[(false) If installing modules (-get) or plugins (-get-plugins), ignore previously-downloaded objects and install the latest version allowed within configured constraints.]' \
+        '-verify-plugins=[(true) Verify the authenticity and integrity of automatically downloaded plugins.]'
 }
 
 __output() {
     _arguments \
         '-state=[(path) Path to the state file to read. Defaults to "terraform.tfstate".]' \
-        '-module=[(module_name) The module path which has needed output. By default this is the root path. Other modules can be specified by a period-separated list.]'
+        '-no-color[ If specified, output will contain no color.]' \
+        '-module=[(name) If specified, returns the outputs for a specific module]' \
+        '-json[If specified, machine readable output will be printed in JSON format]'
 }
 
 __plan() {
     _arguments \
-        '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with" .backup" extension. Set to "-" to disable backup.]' \
-        '-destroy[If set, a plan will be generated to destroy all resources managed by the given configuration and state.]' \
-        '-detailed-exitcode[Return a detailed exit code when the command exits. When provided, this argument changes the exit codes and their meanings to provide more granular information about what the resulting plan contains]' \
+        '-destroy[() If set, a plan will be generated to destroy all resources managed by the given configuration and state.]' \
+        '-detailed-exitcode[() Return detailed exit codes when the command exits. This will change the meaning of exit codes to: 0 - Succeeded, diff is empty (no changes); 1 - Errored, 2 - Succeeded; there is a diff]' \
         '-input=[(true) Ask for input for variables if not directly set.]' \
-        '-module-depth=[(n) Specifies the depth of modules to show in the output. This does not affect the plan itself, only the output shown. By default, this is zero. -1 will expand all.]' \
-        '-no-color[If specified, output will not contain any color.]' \
+        '-lock=[(true) Lock the state file when locking is supported.]' \
+        '-lock-timeout=[(0s) Duration to retry a state lock.]' \
+        '-module-depth=[(n) Specifies the depth of modules to show in the output. This does not affect the plan itself, only the output shown. By default, this is -1, which will expand all.]' \
+        '-no-color[() If specified, output will contain no color.]' \
         '-out=[(path) Write a plan file to the given path. This can be used as input to the "apply" command.]' \
+        '-parallelism=[(10) Limit the number of concurrent operations.]' \
         '-refresh=[(true) Update state prior to checking for differences.]' \
         '-state=[(statefile) Path to a Terraform state file to use to look up Terraform-managed resources. By default it will use the state "terraform.tfstate" if it exists.]' \
-        '-target=[(resource) A Resource Address to target. Operation will be limited to this resource and its dependencies. This flag can be used multiple times.]' \
+        '-target=[(resource) Resource to target. Operation will be limited to this resource and its dependencies. This flag can be used multiple times.]' \
         '-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \
-        '-var-file=[(path) Set variables in the Terraform configuration from a file. If "terraform.tfvars" is present, it will be automatically loaded if this flag is not specified.]'
+        '-var-file=[(foo) Set variables in the Terraform configuration from a file. If "terraform.tfvars" or any ".auto.tfvars" files are present, they will be automatically loaded.]' \
+}
+
+__providers() {
+    _arguments \
+
 }
 
 __push() {
@@ -106,6 +166,9 @@ __push() {
 __refresh() {
     _arguments \
         '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]' \
+        '-input=[(true) Ask for input for variables if not directly set.]' \
+        '-lock=[(true) Lock the state file when locking is supported.]' \
+        '-lock-timeout=[(0s) Duration to retry a state lock.]' \
         '-no-color[If specified, output will not contain any color.]' \
         '-state=[(path) Path to read and save state (unless state-out is specified). Defaults to "terraform.tfstate".]' \
         '-state-out=[(path) Path to write state to that is different than "-state". This can be used to preserve the old state.]' \
@@ -114,19 +177,6 @@ __refresh() {
         '-var-file=[(path) Set variables in the Terraform configuration from a file. If "terraform.tfvars" is present, it will be automatically loaded if this flag is not specified.]'
 }
 
-__remote() {
-    _arguments \
-        '-address=[(url) URL of the remote storage server. Required for HTTP backend, optional for Atlas and Consul.]' \
-        '-access-token=[(token) Authentication token for state storage server. Required for Atlas backend, optional for Consul.]' \
-        '-backend=[(atlas) Specifies the type of remote backend. Must be one of Atlas, Consul, or HTTP. Defaults to atlas.]' \
-        '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]' \
-        '-disable[Disables remote state management and migrates the state to the -state path.]' \
-        '-name=[(name) Name of the state file in the state storage server. Required for Atlas backend.]' \
-        '-path=[(path) Path of the remote state in Consul. Required for the Consul backend.]' \
-        '-pull=[(true) Controls if the remote state is pulled before disabling. This defaults to true to ensure the latest state is cached before disabling.]' \
-        '-state=[(path) Path to read and save state (unless state-out is specified). Defaults to "terraform.tfstate".]'
-}
-
 __show() {
     _arguments \
         '-module-depth=[(n) The maximum depth to expand modules. By default this is zero, which will not expand modules at all.]' \
@@ -137,12 +187,46 @@ __taint() {
     _arguments \
         '-allow-missing[If specified, the command will succeed (exit code 0) even if the resource is missing.]' \
         '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]' \
+        '-lock=[(true) Lock the state file when locking is supported.]' \
+        '-lock-timeout=[(0s) Duration to retry a state lock.]' \
         '-module=[(path)  The module path where the resource lives. By default this will be root. Child modules can be specified by names. Ex. "consul" or "consul.vpc" (nested modules).]' \
         '-no-color[If specified, output will not contain any color.]' \
         '-state=[(path) Path to read and save state (unless state-out is  specified). Defaults to "terraform.tfstate".]' \
         '-state-out=[(path) Path to write updated state file. By default, the "-state" path will be used.]'
 }
 
+__untaint() {
+    _arguments \
+    '-allow-missing[If specified, the command will succeed (exit code 0) even if the resource is missing.]' \
+    '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]' \
+    '-lock=[(true) Lock the state file when locking is supported.]' \
+    '-lock-timeout=[(0s) Duration to retry a state lock.]' \
+    '-module=[(path)  The module path where the resource lives. By default this will be root. Child modules can be specified by names. Ex. "consul" or "consul.vpc" (nested modules).]' \
+    '-no-color[If specified, output will not contain any color.]' \
+    '-state=[(path) Path to read and save state (unless state-out is  specified). Defaults to "terraform.tfstate".]' \
+    '-state-out=[(path) Path to write updated state file. By default, the "-state" path will be used.]'
+}
+
+__validate() {
+    _arguments \
+    '-check-variables=[(true) If set to true (default), the command will check whether all required variables have been specified.]' \
+    '-no-color[If specified, output will not contain any color.]' \
+    '-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \
+    '-var-file=[(path) Set variables in the Terraform configuration from a file. If "terraform.tfvars" is present, it will be automatically loaded if this flag is not specified.]'
+}
+
+__workspace() {
+    local -a __workspace_cmds
+    __workspace_cmds=(
+        'delete:Delete a workspace'
+        'list:List Workspaces'
+        'new:Create a new workspace'
+        'select:Select a workspace'
+        'show:Show the name of the current workspace'
+    )
+    _describe -t workspace "workspace commands" __workspace_cmds
+}
+
 _arguments '*:: :->command'
 
 if (( CURRENT == 1 )); then
@@ -154,26 +238,38 @@ local -a _command_args
 case "$words[1]" in
   apply)
     __apply ;;
+  console)
+    __console;;
   destroy)
     __destroy ;;
+  fmt)
+    __fmt;;
   get)
     __get ;;
   graph)
     __graph ;;
+  import)
+    __import;;
   init)
     __init ;;
   output)
     __output ;;
   plan)
     __plan ;;
+  providers)
+    __providers ;;
   push)
     __push ;;
   refresh)
     __refresh ;;
-  remote)
-    __remote ;;
   show)
     __show ;;
   taint)
     __taint ;;
+  untaint)
+    __untaint ;;
+  validate)
+    __validate ;;
+  workspace)
+    test $CURRENT -lt 3 && __workspace ;;
 esac
-- 
cgit v1.2.3-70-g09d2


From a600ab4b8578ca0a8e6c6dae0373033b9d8c201c Mon Sep 17 00:00:00 2001
From: Mauro Porras P <mauroporrasp@gmail.com>
Date: Thu, 17 May 2018 09:30:03 -0500
Subject: Minor fix: "stdin" instead of "stding" (#6801)

---
 plugins/docker/_docker | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/docker/_docker b/plugins/docker/_docker
index 4d1b79a82..32ad4848a 100644
--- a/plugins/docker/_docker
+++ b/plugins/docker/_docker
@@ -889,7 +889,7 @@ __docker_container_subcommand() {
                 $opts_help \
                 $opts_attach_exec_run_start \
                 "($help -a --attach)"{-a,--attach}"[Attach container's stdout/stderr and forward all signals]" \
-                "($help -i --interactive)"{-i,--interactive}"[Attach container's stding]" \
+                "($help -i --interactive)"{-i,--interactive}"[Attach container's stdin]" \
                 "($help -)*:containers:__docker_complete_stopped_containers" && ret=0
             ;;
         (stats)
-- 
cgit v1.2.3-70-g09d2


From 2956e7820ee1dd7111084a291722c12aea01bb5c Mon Sep 17 00:00:00 2001
From: Lorenzo Bolla <lorenzo.bolla@yougov.com>
Date: Sun, 20 May 2018 13:46:27 +0100
Subject: Fix 6843 Cache kubectl completion script to file to speed up sourcing

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

(limited to 'plugins')

diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index ec1321d8b..f4062186a 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -2,8 +2,15 @@
 #
 # Author: https://github.com/pstadler
 
+KUBECTL_COMPLETION_FILENAME="$TMPPREFIX-kubectl-completion-zsh"
+
+if [[ ! -f "$KUBECTL_COMPLETION_FILENAME" ]]
+then
+    kubectl completion zsh > "$KUBECTL_COMPLETION_FILENAME"
+fi
+
 if [ $commands[kubectl] ]; then
-  source <(kubectl completion zsh)
+  source "$KUBECTL_COMPLETION_FILENAME"
 fi
 
 # This command is used ALOT both below and in daily life
-- 
cgit v1.2.3-70-g09d2


From ee96d0cf9634f25abb69a5cec68073a015dab0a5 Mon Sep 17 00:00:00 2001
From: Lorenzo Bolla <lbolla@gmail.com>
Date: Mon, 21 May 2018 00:01:55 +0100
Subject: Fix 6840 Check emacsclient version instead of emacs's (#6841)

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

(limited to 'plugins')

diff --git a/plugins/emacs/emacs.plugin.zsh b/plugins/emacs/emacs.plugin.zsh
index c102a5a1e..db0ab13af 100644
--- a/plugins/emacs/emacs.plugin.zsh
+++ b/plugins/emacs/emacs.plugin.zsh
@@ -10,7 +10,7 @@
 # - Configuration changes made at runtime are applied to all frames.
 
 
-if "$ZSH/tools/require_tool.sh" emacs 24 2>/dev/null ; then
+if "$ZSH/tools/require_tool.sh" emacsclient 24 2>/dev/null ; then
     export EMACS_PLUGIN_LAUNCHER="$ZSH/plugins/emacs/emacsclient.sh"
 
     # set EDITOR if not already defined.
-- 
cgit v1.2.3-70-g09d2


From 2642f0a8b4d037cd178356132e5dc59c9e90c631 Mon Sep 17 00:00:00 2001
From: Chuan Jin <chuan.jin.813@gmail.com>
Date: Mon, 21 May 2018 01:02:53 +0200
Subject: Add git log with date (#6789)

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

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index fd55be138..34598fb35 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -181,6 +181,8 @@ alias glgga='git log --graph --decorate --all'
 alias glgm='git log --graph --max-count=10'
 alias glo='git log --oneline --decorate'
 alias glol="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'"
+alias glod="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset'"
+alias glods="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset' --date=short"
 alias glola="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --all"
 alias glog='git log --oneline --decorate --graph'
 alias gloga='git log --oneline --decorate --graph --all'
-- 
cgit v1.2.3-70-g09d2


From 3d8ee47c7a55119318d698a90f523e04fffb878d Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Fri, 25 May 2018 20:44:56 +0200
Subject: Update README formatting

---
 plugins/transfer/README.md | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

(limited to 'plugins')

diff --git a/plugins/transfer/README.md b/plugins/transfer/README.md
index 9bf488d4e..5fa064445 100644
--- a/plugins/transfer/README.md
+++ b/plugins/transfer/README.md
@@ -1,8 +1,24 @@
-# `transfer.sh` plugin
-transfer.sh is an easy file sharing service from the command line
+# `transfer` plugin
+
+[`transfer.sh`](https://transfer.sh) is an easy to use file sharing service from the command line
 
 ## Usage
-Example
-> transfer file.txt
-> transfer directory/
 
+Add `transfer` to your plugins array in your zshrc file:
+```zsh
+plugins=(... transfer)
+```
+
+Then you can:
+
+- transfer a file:
+
+```zsh
+transfer file.txt
+```
+
+- transfer a whole directory (it will be automatically compressed):
+
+```zsh
+transfer directory/
+```
-- 
cgit v1.2.3-70-g09d2


From 9b11b7e9388dc8c736c321e56e29440dedfa6152 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sat, 26 May 2018 18:25:47 +0200
Subject: Update logic to follow npm plugin convention

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

(limited to 'plugins')

diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index f4062186a..c4e30dacd 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -1,16 +1,13 @@
-# Autocompletion for kubectl, the command line interface for Kubernetes
-#
-# Author: https://github.com/pstadler
+if (( $+commands[kubectl] )); then
+    __KUBECTL_COMPLETION_FILE="${ZSH_CACHE_DIR}/kubectl_completion"
 
-KUBECTL_COMPLETION_FILENAME="$TMPPREFIX-kubectl-completion-zsh"
+    if [[ ! -f $__KUBECTL_COMPLETION_FILE ]]; then
+        kubectl completion zsh >! $__KUBECTL_COMPLETION_FILE
+    fi
 
-if [[ ! -f "$KUBECTL_COMPLETION_FILENAME" ]]
-then
-    kubectl completion zsh > "$KUBECTL_COMPLETION_FILENAME"
-fi
+    [[ -f $__KUBECTL_COMPLETION_FILE ]] && source $__KUBECTL_COMPLETION_FILE
 
-if [ $commands[kubectl] ]; then
-  source "$KUBECTL_COMPLETION_FILENAME"
+    unset __KUBECTL_COMPLETION_FILE
 fi
 
 # This command is used ALOT both below and in daily life
-- 
cgit v1.2.3-70-g09d2


From d6aeaad83d73855776f7c937ef51428523295352 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pyapar@gmail.com>
Date: Sat, 26 May 2018 21:09:32 +0430
Subject: [plugin] update NPX docs (#6849)

---
 plugins/npx/README.md | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/npx/README.md b/plugins/npx/README.md
index 2c94e4515..1c052930b 100644
--- a/plugins/npx/README.md
+++ b/plugins/npx/README.md
@@ -11,7 +11,21 @@ This plugin automatically registers npx command-not-found handler if `npx` exist
 plugins=(.... npx)
 ```
 
-- Globally install npx binary (you need node.js installed too!)
+- Globally install npx binary (npx will be auto installed with recent versions of Node.js)
 ```bash
 sudo npm install -g npx
-```
\ No newline at end of file
+```
+
+## Note
+
+The shell auto-fallback doesn't auto-install plain packages. In order to get it to install something, you need to add `@`:
+
+```
+➜  jasmine@latest # or just `jasmine@`
+npx: installed 13 in 1.896s
+Randomized with seed 54385
+Started
+```
+
+It does it this way so folks using the fallback don't accidentally try to install regular typoes.
+
-- 
cgit v1.2.3-70-g09d2


From c09783c2554e505cc04ef0fc7465341475050947 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sat, 26 May 2018 19:02:03 +0200
Subject: Revert "unset chpwd_functions before running cd ... (#6830)"

This reverts commit 3dab7e46e8815838c8099040e11a7ae9a30ba03d.
---
 plugins/shrink-path/shrink-path.plugin.zsh | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'plugins')

diff --git a/plugins/shrink-path/shrink-path.plugin.zsh b/plugins/shrink-path/shrink-path.plugin.zsh
index 6dd6a930f..f111962a5 100644
--- a/plugins/shrink-path/shrink-path.plugin.zsh
+++ b/plugins/shrink-path/shrink-path.plugin.zsh
@@ -94,11 +94,6 @@ shrink_path () {
         (( tilde )) && dir=${dir/$HOME/\~}
         tree=(${(s:/:)dir})
         (
-                # unset chpwd_functions since we'll be calling `cd` and don't
-                # want any side-effects (eg., if the user was using auto-ls)
-                chpwd_functions=()
-                # unset chpwd since even if chpwd_functions is (), zsh will
-                # attempt to execute chpwd
                 unfunction chpwd 2> /dev/null
                 if [[ $tree[1] == \~* ]] {
                         cd ${~tree[1]}
-- 
cgit v1.2.3-70-g09d2


From 66cb4005ab6cfcd6b092c1b482e767af214e83bb Mon Sep 17 00:00:00 2001
From: Kaleb Elwert <belak@coded.io>
Date: Wed, 1 Mar 2017 15:32:00 -0800
Subject: Update shrink-path to use cd -q for bypassing the chpwd callbacks

---
 plugins/shrink-path/shrink-path.plugin.zsh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'plugins')

diff --git a/plugins/shrink-path/shrink-path.plugin.zsh b/plugins/shrink-path/shrink-path.plugin.zsh
index f111962a5..e7eed1705 100644
--- a/plugins/shrink-path/shrink-path.plugin.zsh
+++ b/plugins/shrink-path/shrink-path.plugin.zsh
@@ -94,13 +94,12 @@ shrink_path () {
         (( tilde )) && dir=${dir/$HOME/\~}
         tree=(${(s:/:)dir})
         (
-                unfunction chpwd 2> /dev/null
                 if [[ $tree[1] == \~* ]] {
-                        cd ${~tree[1]}
+                        cd -q ${~tree[1]}
                         result=$tree[1]
                         shift tree
                 } else {
-                        cd /
+                        cd -q /
                 }
                 for dir in $tree; {
                         if (( lastfull && $#tree == 1 )) {
@@ -117,7 +116,7 @@ shrink_path () {
                                 (( short )) && break
                         done
                         result+="/$part"
-                        cd $dir
+                        cd -q $dir
                         shift tree
                 }
                 echo ${result:-/}
-- 
cgit v1.2.3-70-g09d2


From 5896c87155f9346a2926786c6d578d0a5696d712 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sat, 26 May 2018 19:31:17 +0200
Subject: shrink-path: match only the beginning of the directory (#6862)

Fixes #6317
---
 plugins/shrink-path/shrink-path.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/shrink-path/shrink-path.plugin.zsh b/plugins/shrink-path/shrink-path.plugin.zsh
index e7eed1705..29e6f0deb 100644
--- a/plugins/shrink-path/shrink-path.plugin.zsh
+++ b/plugins/shrink-path/shrink-path.plugin.zsh
@@ -88,10 +88,10 @@ shrink_path () {
 
         if (( named )) {
                 for part in ${(k)nameddirs}; {
-                        [[ $dir == ${nameddirs[$part]}(/*|) ]] && dir=${dir/${nameddirs[$part]}/\~$part}
+                        [[ $dir == ${nameddirs[$part]}(/*|) ]] && dir=${dir/#${nameddirs[$part]}/\~$part}
                 }
         }
-        (( tilde )) && dir=${dir/$HOME/\~}
+        (( tilde )) && dir=${dir/#$HOME/\~}
         tree=(${(s:/:)dir})
         (
                 if [[ $tree[1] == \~* ]] {
-- 
cgit v1.2.3-70-g09d2


From 90a5bd06ca76aff04f76a5d43a432ed9340dd78d Mon Sep 17 00:00:00 2001
From: Lorenzo Bolla <lbolla@gmail.com>
Date: Sat, 26 May 2018 19:44:49 +0100
Subject: Prefer virtualenvwrapper_lazy (#6842)

This gives much faster start up times and only loads virtualenvwrapper
when needed.

Fix #6839
---
 plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
index 484f18c91..2a7c0b92a 100644
--- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
@@ -1,6 +1,14 @@
 virtualenvwrapper='virtualenvwrapper.sh'
+virtualenvwrapper_lazy='virtualenvwrapper_lazy.sh'
 
-if (( $+commands[$virtualenvwrapper] )); then
+if (( $+commands[$virtualenvwrapper_lazy] )); then
+  function {
+    setopt local_options
+    unsetopt equals
+    virtualenvwrapper=${${virtualenvwrapper_lazy}:c}
+    source ${${virtualenvwrapper_lazy}:c}
+  }
+elif (( $+commands[$virtualenvwrapper] )); then
   function {
     setopt local_options
     unsetopt equals
-- 
cgit v1.2.3-70-g09d2


From 8bbef9180e3ba16e717a9587d0c965ab901c1226 Mon Sep 17 00:00:00 2001
From: Erwan ROUSSEL <erwan.roussel51@gmail.com>
Date: Sat, 26 May 2018 22:22:22 +0200
Subject: Npm's plugin documentation (#6864)

* Documentation for Npm plugin added

* Fix style and add alias descriptions
---
 plugins/npm/README.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 plugins/npm/README.md

(limited to 'plugins')

diff --git a/plugins/npm/README.md b/plugins/npm/README.md
new file mode 100644
index 000000000..202e2b0a4
--- /dev/null
+++ b/plugins/npm/README.md
@@ -0,0 +1,26 @@
+## npm plugin
+
+The npm plugin provides completion as well as adding many useful aliases.
+
+To use it, add npm to the plugins array of your zshrc file:
+```
+plugins=(... npm)
+```
+
+## Aliases
+
+| Alias   | Command                      | Descripton                                                      |
+|:------  |:-----------------------------|:----------------------------------------------------------------|
+| `npmg`  | `npm i -g`                   | Install dependencies globally                                   |
+| `npmS`  | `npm i -S`                   | Install and save to dependencies in your package.json           |
+| `npmD`  | `npm i -D`                   | Install and save to dev-dependencies in your package.json       |
+| `npmE`  | `PATH="$(npm bin)":"$PATH"`  | Run command from node_modules folder based on current directory |
+| `npmO`  | `npm outdated`               | Check which npm modules are outdated                            |
+| `npmV`  | `npm -v`                     | Check package versions                                          |
+| `npmL`  | `npm list`                   | List installed packages                                         |
+| `npmL0` | `npm ls --depth=0`           | List top-level installed packages                               |
+| `npmst` | `npm start`                  | Run npm start                                                   |
+| `npmt`  | `npm test`                   | Run npm test                                                    |
+| `npmR`  | `npm run`                    | Run npm scripts                                                 |
+| `npmP`  | `npm publish`                | Run npm publish                                                 |
+| `npmI`  | `npm init`                   | Run npm init                                                    |
-- 
cgit v1.2.3-70-g09d2


From ce2890bef95b4b0a5b14ed8dd50ad2f78f8dee72 Mon Sep 17 00:00:00 2001
From: Michael Fladischer <michael@fladi.at>
Date: Mon, 28 May 2018 11:23:05 +0200
Subject: [plugins/vundle] Use HTTPS to clone repository. (#6857)

The git protocol is likely to be blocked in some networks while HTTPS usually
works.
---
 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 0f071597a..c84cacd0e 100644
--- a/plugins/vundle/vundle.plugin.zsh
+++ b/plugins/vundle/vundle.plugin.zsh
@@ -6,7 +6,7 @@ function vundle-init () {
 
   if [ ! -d ~/.vim/bundle/Vundle.vim/.git ] && [ ! -f ~/.vim/bundle/Vundle.vim/.git ]
   then
-    git clone git://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim
+    git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim
     echo "\n\tRead about vim configuration for vundle at https://github.com/VundleVim/Vundle.vim\n"
   fi
 }
-- 
cgit v1.2.3-70-g09d2


From ebda8af870acc295388ed187f0139a8bffa83196 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Mon, 28 May 2018 17:09:53 +0200
Subject: Clarify ssh-agent settings position

---
 plugins/ssh-agent/README.md | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'plugins')

diff --git a/plugins/ssh-agent/README.md b/plugins/ssh-agent/README.md
index 00af42f01..85d8c8a85 100644
--- a/plugins/ssh-agent/README.md
+++ b/plugins/ssh-agent/README.md
@@ -11,6 +11,8 @@ plugins=(... ssh-agent)
 
 ## Instructions
 
+**IMPORTANT: put these settings _before_ the line that sources oh-my-zsh**
+
 To enable **agent forwarding support** add the following to your zshrc file:
 
 ```zsh
-- 
cgit v1.2.3-70-g09d2


From 6ace3cd18dd3cbc0e2631fa98051194b703fe4d7 Mon Sep 17 00:00:00 2001
From: Paul Ossenbruggen <possen@quintescent.net>
Date: Tue, 5 Jun 2018 06:37:20 -0700
Subject: add xx command to Xcode plugin. Allows quick opening of files in
 Xcode. (#6812)

---
 plugins/xcode/README.md        |  6 +++++-
 plugins/xcode/xcode.plugin.zsh | 13 ++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/xcode/README.md b/plugins/xcode/README.md
index c12ce047f..37f882638 100644
--- a/plugins/xcode/README.md
+++ b/plugins/xcode/README.md
@@ -19,7 +19,7 @@ plugins=(... xcode)
 | xcdd  | Purge all temporary build information    | rm -rf ~/Library/Developer/Xcode/DerivedData/* |
 | xcp   | Show currently selected Xcode directory  | xcode-select --print-path                      |
 | xcsel | Select different Xcode directory by path | sudo xcode-select --switch                     |
-
+| xx    | Opens the files listed in Xcode          | open -a "Xcode.app"                            |
 
 
 ## Functions
@@ -29,6 +29,10 @@ plugins=(... xcode)
 Opens the current directory in Xcode as an Xcode project. This will open one of the `.xcworkspace` and `.xcodeproj` files that it can find in the current working directory. You can also specify a directory to look in for the Xcode files.
 Returns 1 if it didn't find any relevant files.
 
+###  `xx`
+
+Opens the files listed in Xcode, multiple files are opened in a multi-file browser.
+
 ###  `simulator`
 
 Opens the iOS Simulator from your command line, dependent on whichever is the active developer directory for Xcode. (That is, it respects the `xcsel` setting.)
diff --git a/plugins/xcode/xcode.plugin.zsh b/plugins/xcode/xcode.plugin.zsh
index f711c39fb..b46e05f2f 100644
--- a/plugins/xcode/xcode.plugin.zsh
+++ b/plugins/xcode/xcode.plugin.zsh
@@ -27,6 +27,17 @@ function xc {
   fi
 }
 
+# Opens a file or files in the Xcode IDE. Multiple files are opened in multi-file browser
+# original author: @possen
+function xx {
+  if [[ $# == 0 ]]; then
+    echo "Specify file(s) to open in xcode."
+    return 1
+  fi
+  echo "${xcode_files}"
+  open -a "Xcode.app" "$@"
+}
+
 # "XCode-SELect by Version" - select Xcode by just version number
 # Uses naming convention:
 #  - different versions of Xcode are named Xcode-<version>.app or stored
@@ -70,7 +81,7 @@ function xcselv {
 
 function _omz_xcode_print_xcselv_usage {
   cat << EOF >&2
-Usage: 
+Usage:
   xcselv <version>
   xcselv [options]
 
-- 
cgit v1.2.3-70-g09d2


From f461d21de1bd0c1394e57a2e3af69778692e4ba4 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Wed, 6 Jun 2018 17:14:19 +0200
Subject: virtualenvwrapper: set $WORKON_HOME if undefined

This uses the default that virtualenvwrapper.sh would set if it was called. If the user
changes its value after the plugin is loaded, the plugin will work all the same.

Fixes #6882
Closes #6870
Closes #6883
---
 plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins')

diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
index 2a7c0b92a..e27c6bb76 100644
--- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
@@ -7,6 +7,7 @@ if (( $+commands[$virtualenvwrapper_lazy] )); then
     unsetopt equals
     virtualenvwrapper=${${virtualenvwrapper_lazy}:c}
     source ${${virtualenvwrapper_lazy}:c}
+    [[ -z "$WORKON_HOME" ]] && WORKON_HOME="$HOME/.virtualenvs"
   }
 elif (( $+commands[$virtualenvwrapper] )); then
   function {
-- 
cgit v1.2.3-70-g09d2


From 019e0d7c71429650de33b5fb48b066ee46f37199 Mon Sep 17 00:00:00 2001
From: Andre Figueiredo <andretf.inf@gmail.com>
Date: Sun, 10 Jun 2018 12:55:47 -0400
Subject: fix(typo) (#6905)

*trupd* for "trizen -Sy" fixed to *trupg*
---
 plugins/archlinux/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/archlinux/README.md b/plugins/archlinux/README.md
index c3521c523..0d1fdea3a 100644
--- a/plugins/archlinux/README.md
+++ b/plugins/archlinux/README.md
@@ -23,7 +23,7 @@
 | trupd   | trizen -Sy && sudo abs             | Update and refresh the local package and ABS databases              |
 | trupd   | trizen -Sy && sudo aur             | Update and refresh the local package and AUR databases              |
 | trupd   | trizen -Sy                         | Update and refresh the local package database                       |
-| trupd   | trizen -Syua                       | Sync with repositories before upgrading all packages (from AUR too) |
+| trupg   | trizen -Syua                       | Sync with repositories before upgrading all packages (from AUR too) |
 | trsu    | trizen -Syua --no-confirm          | Same as `trupg`, but without confirmation                           |
 | upgrade | trizen -Syu                        | Sync with repositories before upgrading packages                    |
 
-- 
cgit v1.2.3-70-g09d2


From 0808c0f6efaaf988ea6530645394d97fef810f01 Mon Sep 17 00:00:00 2001
From: Matteo Giaccone <matteo.giaccone@acmos.net>
Date: Tue, 12 Jun 2018 18:23:31 +0200
Subject: Remove default for git reset (#4993)

The command will do the same as before, but now you can also specify
a path.

Example:
grh branch-name
grhh tag-name
---
 plugins/git/git.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 34598fb35..413d780e1 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -211,8 +211,8 @@ alias grbc='git rebase --continue'
 alias grbi='git rebase -i'
 alias grbm='git rebase master'
 alias grbs='git rebase --skip'
-alias grh='git reset HEAD'
-alias grhh='git reset HEAD --hard'
+alias grh='git reset'
+alias grhh='git reset --hard'
 alias grmv='git remote rename'
 alias grrm='git remote remove'
 alias grset='git remote set-url'
-- 
cgit v1.2.3-70-g09d2


From 3dcf9fd662b2eb74dc84bd739ca66b8a5bf4f52b Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 12 Jun 2018 18:40:31 +0200
Subject: Delete python completion in favor of zsh's one

---
 plugins/python/_python | 54 --------------------------------------------------
 1 file changed, 54 deletions(-)
 delete mode 100644 plugins/python/_python

(limited to 'plugins')

diff --git a/plugins/python/_python b/plugins/python/_python
deleted file mode 100644
index f517d4806..000000000
--- a/plugins/python/_python
+++ /dev/null
@@ -1,54 +0,0 @@
-#compdef python
-
-# Python 2.6
-# Python 3.0
-
-local curcontext="$curcontext" state line expl
-typeset -A opt_args
-
-local -a args
-
-if _pick_variant python3=Python\ 3 python2 --version; then
-  args=(
-    '(-bb)-b[issue warnings about str(bytes_instance), str(bytearray_instance) and comparing bytes/bytearray with str]'
-    '(-b)-bb[issue errors about str(bytes_instance), str(bytearray_instance) and comparing bytes/bytearray with str]'
-  )
-else
-  args=(
-    '-Q+[division options]:division option:(old warn warnall new)'
-    '(-tt)-t[issue warnings about inconsistent tab usage]'
-    '(-t)-tt[issue errors about inconsistent tab usage]'
-    '-3[warn about Python 3.x incompatibilities]'
-  )
-fi
-
-_arguments -C -s -S "$args[@]" \
-  "-B[don't write .py\[co\] files on import]" \
-  '(1 -)-c+[program passed in as string (terminates option list)]:python command:' \
-  '-d[debug output from parser]' \
-  '-E[ignore PYTHON* environment variables (such as PYTHONPATH)]' \
-  '(1 * -)-h[display help information]' \
-  '-i[inspect interactively after running script]' \
-  '(1 * -)-m[run library module as a script (terminates option list)]:module:->modules' \
-  '-O[optimize generated bytecode slightly]' \
-  '-OO[remove doc-strings in addition to the -O optimizations]' \
-  "-s[don't add user site directory to sys.path]" \
-  "-S[don't imply 'import site' on initialization]" \
-  '-u[unbuffered binary stdout and stderr]' \
-  '-v[verbose (trace import statements)]' \
-  '(1 * -)'{-V,--version}'[display version information]' \
-  '-W+[warning control]:warning filter (action\:message\:category\:module\:lineno):(default always ignore module once error)' \
-  '-x[skip first line of source, allowing use of non-Unix forms of #!cmd]' \
-  '(-)1:script file:_files -g "*.py(|c|o)(-.)"' \
-  '*::script argument: _normal' && return
-
-if [[ "$state" = modules ]]; then
-  local -a modules
-  modules=(
-    ${${=${(f)"$(_call_program modules $words[1] -c \
-      'from\ pydoc\ import\ help\;\ help\(\"modules\"\)')"}[2,-3]}:#\(package\)}
-  )
-  _wanted modules expl module compadd -a modules && return
-fi
-
-return 1
-- 
cgit v1.2.3-70-g09d2


From 321200d708027b56e95525cba3d4a6bb3d86983e Mon Sep 17 00:00:00 2001
From: Peter Butkovic <butkovic@gmail.com>
Date: Tue, 12 Jun 2018 19:19:59 +0200
Subject: added tmuxinator aliases (#3147)

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

(limited to 'plugins')

diff --git a/plugins/tmuxinator/tmuxinator.plugin.zsh b/plugins/tmuxinator/tmuxinator.plugin.zsh
new file mode 100644
index 000000000..166fa9881
--- /dev/null
+++ b/plugins/tmuxinator/tmuxinator.plugin.zsh
@@ -0,0 +1,5 @@
+# aliases
+alias txs='tmuxinator start'
+alias txo='tmuxinator open'
+alias txn='tmuxinator new'
+alias txl='tmuxinator list'
-- 
cgit v1.2.3-70-g09d2


From 7a9bab1d77e2c22c331ce98a7245d0ba5d348353 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 12 Jun 2018 19:20:10 +0200
Subject: Update tmuxinator completion to 03c8babb

---
 plugins/tmuxinator/_tmuxinator | 55 ++++++++++++++----------------------------
 1 file changed, 18 insertions(+), 37 deletions(-)

(limited to 'plugins')

diff --git a/plugins/tmuxinator/_tmuxinator b/plugins/tmuxinator/_tmuxinator
index 551267ed2..37032f8d8 100644
--- a/plugins/tmuxinator/_tmuxinator
+++ b/plugins/tmuxinator/_tmuxinator
@@ -1,40 +1,21 @@
-#compdef tmuxinator mux
-#autoload
+_tmuxinator() {
+  local commands projects
+  commands=(${(f)"$(tmuxinator commands zsh)"})
+  projects=(${(f)"$(tmuxinator completions start)"})
 
-local curcontext="$curcontext" state line ret=1
-local -a _configs
-
-_arguments -C \
-  '1: :->cmds' \
-  '2:: :->args' && ret=0
-
-_configs=(${$(echo ~/.tmuxinator/*.yml):r:t})
-
-case $state in
-  cmds)
-    _values "tmuxinator command" \
-        "new[create a new project file and open it in your editor]" \
-        "start[start a tmux session using project's tmuxinator config]" \
-        "open[create a new project file and open it in your editor]" \
-        "copy[copy source_project project file to a new project called new_project]" \
-        "delete[deletes the project called project_name]" \
-        "debug[output the shell commands generated by a projet]" \
-        "implode[deletes all existing projects!]" \
-        "list[list all existing projects]" \
-        "doctor[look for problems in your configuration]" \
-        "help[shows this help document]" \
-        "version[shows tmuxinator version number]" \
-        $_configs
-    ret=0
-    ;;
-  args)
-    case $line[1] in
-      start|open|copy|delete|debug)
-        [[ -n "$_configs" ]] && _values 'configs' $_configs
-        ret=0
-        ;;
+  if (( CURRENT == 2 )); then
+    _describe -t commands "tmuxinator subcommands" commands
+    _describe -t projects "tmuxinator projects" projects
+  elif (( CURRENT == 3)); then
+    case $words[2] in
+      copy|debug|delete|open|start)
+        _arguments '*:projects:($projects)'
+      ;;
     esac
-    ;;
-esac
+  fi
+
+  return
+}
 
-return ret
+compdef _tmuxinator tmuxinator mux
+alias mux="tmuxinator"
-- 
cgit v1.2.3-70-g09d2


From be5bff2e86872c00536191265aa9fdef225af100 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 12 Jun 2018 19:54:47 +0200
Subject: Allow FreeBSD to correctly detect number of CPUs

Use the same scheme as Darwin - sysctl instead of nproc, which doesn't exist in FreeBSD

Closes #2545

Co-authored-by: Daniel Bye <dbye@users.noreply.github.com>
---
 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 6b10b78d1..ea199d09a 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -57,7 +57,7 @@ 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
-      if [[ "$OSTYPE" = darwin* ]]
+      if [[ "$OSTYPE" = (darwin|freebsd)* ]]
       then
         local cores_num="$(sysctl -n hw.ncpu)"
       else
-- 
cgit v1.2.3-70-g09d2


From 09fbc163663cd814488cb4be474f034525a8cca0 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 12 Jun 2018 20:45:38 +0200
Subject: Refactor lein plugin (#6914)

* Add upstream lein completion (cee9029d)
* Delete lein.plugin.zsh
---
 plugins/lein/_lein           | 69 ++++++++++++++++++++++++++++++++++++++++++++
 plugins/lein/lein.plugin.zsh | 43 ---------------------------
 2 files changed, 69 insertions(+), 43 deletions(-)
 create mode 100644 plugins/lein/_lein
 delete mode 100644 plugins/lein/lein.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/lein/_lein b/plugins/lein/_lein
new file mode 100644
index 000000000..9d022e968
--- /dev/null
+++ b/plugins/lein/_lein
@@ -0,0 +1,69 @@
+#compdef lein
+
+# Lein ZSH completion function
+# Drop this somewhere in your $fpath (like /usr/share/zsh/site-functions)
+# and rename it _lein
+
+_lein() {
+  if (( CURRENT > 2 )); then
+    # shift words so _arguments doesn't have to be concerned with second command
+    (( CURRENT-- ))
+    shift words
+    # use _call_function here in case it doesn't exist
+    _call_function 1 _lein_${words[1]}
+  else
+    _values "lein command" \
+      "change[Rewrite project.clj by applying a function.]" \
+      "check[Check syntax and warn on reflection.]" \
+      "classpath[Print the classpath of the current project.]" \
+      "clean[Remove all files from project's target-path.]" \
+      "compile[Compile Clojure source into .class files.]" \
+      "deploy[Build and deploy jar to remote repository.]" \
+      "deps[Download all dependencies.]" \
+      "do[Higher-order task to perform other tasks in succession.]" \
+      "help[Display a list of tasks or help for a given task.]" \
+      "install[Install the current project to the local repository.]" \
+      "jar[Package up all the project's files into a jar file.]" \
+      "javac[Compile Java source files.]" \
+      "new[Generate project scaffolding based on a template.]" \
+      "plugin[DEPRECATED. Please use the :user profile instead.]" \
+      "pom[Write a pom.xml file to disk for Maven interoperability.]" \
+      "release[Perform :release-tasks.]" \
+      "repl[Start a repl session either with the current project or standalone.]" \
+      "retest[Run only the test namespaces which failed last time around.]" \
+      "run[Run a -main function with optional command-line arguments.]" \
+      "search[Search remote maven repositories for matching jars.]" \
+      "show-profiles[List all available profiles or display one if given an argument.]" \
+      "test[Run the project's tests.]" \
+      "trampoline[Run a task without nesting the project's JVM inside Leiningen's.]" \
+      "uberjar[Package up the project files and dependencies into a jar file.]" \
+      "update-in[Perform arbitrary transformations on your project map.]" \
+      "upgrade[Upgrade Leiningen to specified version or latest stable.]" \
+      "vcs[Interact with the version control system.]" \
+      "version[Print version for Leiningen and the current JVM.]" \
+      "with-profile[Apply the given task with the profile(s) specified.]"
+  fi
+}
+
+_lein_plugin() {
+  _values "lein plugin commands" \
+    "install[Download, package, and install plugin jarfile into ~/.lein/plugins]" \
+    "uninstall[Delete the plugin jarfile: \[GROUP/\]ARTIFACT-ID VERSION]"
+}
+
+
+_lein_namespaces() {
+  if [ -f "./project.clj" -a -d "$1" ]; then
+    _values "lein valid namespaces" \
+      $(find "$1" -type f -name "*.clj" -exec awk '/^\(ns */ {gsub("\\)", "", $2); print $2}' '{}' '+')
+  fi
+}
+
+
+_lein_run() {
+  _lein_namespaces "src/"
+}
+
+_lein_test() {
+  _lein_namespaces "test/"
+}
diff --git a/plugins/lein/lein.plugin.zsh b/plugins/lein/lein.plugin.zsh
deleted file mode 100644
index f4e50b447..000000000
--- a/plugins/lein/lein.plugin.zsh
+++ /dev/null
@@ -1,43 +0,0 @@
-function _lein_commands() {
-    local ret=1 state
-    _arguments ':subcommand:->subcommand' && ret=0
-
-    case $state in
-      subcommand)
-        subcommands=(
-          "classpath:print the classpath of the current project"
-          "clean:remove compiled files and dependencies from project"
-          "compile:ahead-of-time compile the project"
-          "deploy:build jar and deploy to remote repository"
-          "deps:download and install all dependencies"
-          "help:display a list of tasks or help for a given task"
-          "install:install the project and its dependencies in your local repository"
-          "int:enter an interactive task shell"
-          "interactive:enter an interactive task shell"
-          "jack-in:jack in to a clojure slime session from emacs."
-          "jar:create a jar file containing the compiled .class files"
-          "javac:compile java source files"
-          "new:create a new project skeleton"
-          "plugin:manage user-level plugins"
-          "pom:write a pom.xml file to disk for maven interop"
-          "repl:start a repl session either with the current project or standalone"
-          "retest:run only the test namespaces which failed last time around"
-          "run:run the project's -main function"
-          "search:search remote maven repositories for matching jars"
-          "swank:launch swank server for Emacs to connect"
-          "test:run the project's tests"
-          "test!:run a project's tests after cleaning and fetching dependencies"
-          "trampoline:run a task without nesting the project's JVM inside Leiningen's."
-          "uberjar:Create a jar including the contents of each of deps"
-          "upgrade:upgrade leiningen to the latest stable release"
-          "version:print leiningen's version"
-        )
-        _describe -t subcommands 'leiningen subcommands' subcommands && ret=0
-        ;;
-      *) _files
-    esac
-
-    return ret
-}
-
-compdef _lein_commands lein
-- 
cgit v1.2.3-70-g09d2


From 5efa5138bf4ab168b1ca197dfdeef0e4c3ade271 Mon Sep 17 00:00:00 2001
From: Parham Alvani <parham.alvani@gmail.com>
Date: Thu, 14 Jun 2018 23:02:15 +0430
Subject: silence mode of curl (#6898)

Uses silence mode of curl for better autocomplete.

Co-authored-by: Dominik Rimpf <dev@d-rimpf.de>
---
 plugins/gitignore/gitignore.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/gitignore/gitignore.plugin.zsh b/plugins/gitignore/gitignore.plugin.zsh
index f242169e4..15e38d3b7 100644
--- a/plugins/gitignore/gitignore.plugin.zsh
+++ b/plugins/gitignore/gitignore.plugin.zsh
@@ -1,7 +1,7 @@
 function gi() { curl -fL https://www.gitignore.io/api/${(j:,:)@} }
 
 _gitignoreio_get_command_list() {
-  curl -fL https://www.gitignore.io/api/list | tr "," "\n"
+  curl -sfL https://www.gitignore.io/api/list | tr "," "\n"
 }
 
 _gitignoreio () {
-- 
cgit v1.2.3-70-g09d2


From 4105faf620cd324712568ca9b6c3665979adc698 Mon Sep 17 00:00:00 2001
From: Edwin de Jong <edwin.de.jong@simacan.com>
Date: Fri, 15 Jun 2018 21:04:25 +0200
Subject: Update sbt to add publish-local to commands (#3112)

---
 plugins/sbt/_sbt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins')

diff --git a/plugins/sbt/_sbt b/plugins/sbt/_sbt
index 91372aa72..a601c9b97 100644
--- a/plugins/sbt/_sbt
+++ b/plugins/sbt/_sbt
@@ -17,6 +17,7 @@ _sbt_commands=(
   'package-src:produce a source artifact, such as a jar containing sources'
   'publish:publish artifacts to a repository'
   'publish-local:publish artifacts to the local repository'
+  'publish-m2:publish artifacts to the local Maven 2 repository'
   'run:run a main class'
   'run-main:run the main class selected by the first argument'
   'test:execute all tests'
-- 
cgit v1.2.3-70-g09d2


From 2647a8ccfd8beebda0d5362fd3ec610dda8d6441 Mon Sep 17 00:00:00 2001
From: Yann VR <yannvr@gmail.com>
Date: Fri, 15 Jun 2018 20:40:31 +0100
Subject: Meteor-1-2 arguments update (#4538)

Fixes #4280
Fixes #4321
---
 plugins/meteor/_meteor | 43 ++++++++++++++++++++++++++++++-------------
 1 file changed, 30 insertions(+), 13 deletions(-)

(limited to 'plugins')

diff --git a/plugins/meteor/_meteor b/plugins/meteor/_meteor
index cd7fc304f..69ac7a1b7 100644
--- a/plugins/meteor/_meteor
+++ b/plugins/meteor/_meteor
@@ -13,19 +13,36 @@ _meteor_installed_packages() {
 
 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'
+  "run: [default] Run this project in local development mode."
+  "debug: Run the project, but suspend the server process for debugging."
+  "create: Create a new project."
+  "update: Upgrade this project's dependencies to their latest versions."
+  "add: Add a package to this project."
+  "remove: Remove a package from this project."
+  "list: List the packages explicitly used by your project."
+  "add-platform: Add a platform to this project."
+  "remove-platform: Remove a platform from this project."
+  "list-platforms: List the platforms added to your project."
+  "build: Build this project for all platforms."
+  "lint: Build this project and run the linters printing all errors and warnings."
+  "shell: Launch a Node REPL for interactively evaluating server-side code."
+  "mongo: Connect to the Mongo database for the specified site."
+  "reset: Reset the project state. Erases the local database."
+  "deploy: Deploy this project to Meteor."
+  "logs: Show logs for specified site."
+  "authorized: View or change authorized users and organizations for a site."
+  "claim: Claim a site deployed with an old Meteor version."
+  "login: Log in to your Meteor developer account."
+  "logout: Log out of your Meteor developer account."
+  "whoami: Prints the username of your Meteor developer account."
+  "test-packages: Test one or more packages."
+  "admin: Administrative commands."
+  "list-sites: List sites for which you are authorized."
+  "publish-release: Publish a new meteor release to the package server."
+  "publish: Publish a new version of a package to the package server."
+  "publish-for-arch: Builds an already-published package for a new platform."
+  "search: Search through the package server database."
+  "show: Show detailed information about a release or package."
 )
 
 local expl
-- 
cgit v1.2.3-70-g09d2


From 125dd32361df63626ff7a3ff2ebc3416d2e3be55 Mon Sep 17 00:00:00 2001
From: Adnan Y <ad@nanlabs.net>
Date: Fri, 10 Apr 2015 16:12:03 -0700
Subject: meteor: completion updated with more commands

---
 plugins/meteor/_meteor | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'plugins')

diff --git a/plugins/meteor/_meteor b/plugins/meteor/_meteor
index 69ac7a1b7..48b9fa4c1 100644
--- a/plugins/meteor/_meteor
+++ b/plugins/meteor/_meteor
@@ -43,6 +43,8 @@ _1st_arguments=(
   "publish-for-arch: Builds an already-published package for a new platform."
   "search: Search through the package server database."
   "show: Show detailed information about a release or package."
+  "install-sdk:Installs SDKs for a platform."
+  "configure-android:Run the Android configuration tool from Meteor’s ADK environment."
 )
 
 local expl
-- 
cgit v1.2.3-70-g09d2


From ef1e89b44b1a969d1ad08bf788a860be0c6f0379 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Fri, 15 Jun 2018 23:05:01 +0200
Subject: meteor: fix formatting and reorganise

---
 plugins/meteor/_meteor | 64 +++++++++++++++++++++++++-------------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

(limited to 'plugins')

diff --git a/plugins/meteor/_meteor b/plugins/meteor/_meteor
index 48b9fa4c1..6a15c4bc2 100644
--- a/plugins/meteor/_meteor
+++ b/plugins/meteor/_meteor
@@ -13,38 +13,38 @@ _meteor_installed_packages() {
 
 local -a _1st_arguments
 _1st_arguments=(
-  "run: [default] Run this project in local development mode."
-  "debug: Run the project, but suspend the server process for debugging."
-  "create: Create a new project."
-  "update: Upgrade this project's dependencies to their latest versions."
-  "add: Add a package to this project."
-  "remove: Remove a package from this project."
-  "list: List the packages explicitly used by your project."
-  "add-platform: Add a platform to this project."
-  "remove-platform: Remove a platform from this project."
-  "list-platforms: List the platforms added to your project."
-  "build: Build this project for all platforms."
-  "lint: Build this project and run the linters printing all errors and warnings."
-  "shell: Launch a Node REPL for interactively evaluating server-side code."
-  "mongo: Connect to the Mongo database for the specified site."
-  "reset: Reset the project state. Erases the local database."
-  "deploy: Deploy this project to Meteor."
-  "logs: Show logs for specified site."
-  "authorized: View or change authorized users and organizations for a site."
-  "claim: Claim a site deployed with an old Meteor version."
-  "login: Log in to your Meteor developer account."
-  "logout: Log out of your Meteor developer account."
-  "whoami: Prints the username of your Meteor developer account."
-  "test-packages: Test one or more packages."
-  "admin: Administrative commands."
-  "list-sites: List sites for which you are authorized."
-  "publish-release: Publish a new meteor release to the package server."
-  "publish: Publish a new version of a package to the package server."
-  "publish-for-arch: Builds an already-published package for a new platform."
-  "search: Search through the package server database."
-  "show: Show detailed information about a release or package."
+  "add-platform:Add a platform to this project."
+  "add:Add a package to this project."
+  "admin:Administrative commands."
+  "authorized:View or change authorized users and organizations for a site."
+  "build:Build this project for all platforms."
+  "claim:Claim a site deployed with an old Meteor version."
+  "configure-android:Run the Android configuration tool from Meteor's ADK environment."
+  "create:Create a new project."
+  "debug:Run the project, but suspend the server process for debugging."
+  "deploy:Deploy this project to Meteor."
   "install-sdk:Installs SDKs for a platform."
-  "configure-android:Run the Android configuration tool from Meteor’s ADK environment."
+  "lint:Build this project and run the linters printing all errors and warnings."
+  "list-platforms:List the platforms added to your project."
+  "list-sites:List sites for which you are authorized."
+  "list:List the packages explicitly used by your project."
+  "login:Log in to your Meteor developer account."
+  "logout:Log out of your Meteor developer account."
+  "logs:Show logs for specified site."
+  "mongo:Connect to the Mongo database for the specified site."
+  "publish-for-arch:Builds an already-published package for a new platform."
+  "publish-release:Publish a new meteor release to the package server."
+  "publish:Publish a new version of a package to the package server."
+  "remove-platform:Remove a platform from this project."
+  "remove:Remove a package from this project."
+  "reset:Reset the project state. Erases the local database."
+  "run:[default] Run this project in local development mode."
+  "search:Search through the package server database."
+  "shell:Launch a Node REPL for interactively evaluating server-side code."
+  "show:Show detailed information about a release or package."
+  "test-packages:Test one or more packages."
+  "update:Upgrade this project's dependencies to their latest versions."
+  "whoami:Prints the username of your Meteor developer account."
 )
 
 local expl
@@ -64,4 +64,4 @@ case "$words[2]" in
     add)
       _meteor_all_packages
       _wanted packages expl 'all packages' compadd -a packages ;;
-esac
\ No newline at end of file
+esac
-- 
cgit v1.2.3-70-g09d2


From f258bcba8d93065ade5ea4000afa5e60e84aae76 Mon Sep 17 00:00:00 2001
From: Przemysław Włodek <przem.wlodek@gmail.com>
Date: Sun, 17 Jun 2018 00:03:14 +0200
Subject: Fix yarn alias that conflicts with yeoman cli (#6453)

Yeoman cli alias is 'yo' so 'yarn outdated' can't be aliased to 'yo'.
See: http://yeoman.io/
---
 plugins/yarn/yarn.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/yarn/yarn.plugin.zsh b/plugins/yarn/yarn.plugin.zsh
index 5fa512377..939820edb 100644
--- a/plugins/yarn/yarn.plugin.zsh
+++ b/plugins/yarn/yarn.plugin.zsh
@@ -4,7 +4,7 @@ alias y="yarn "
 alias ya="yarn add"
 alias ycc="yarn cache clean"
 alias yh="yarn help"
-alias yo="yarn outdated"
+alias yout="yarn outdated"
 alias yui="yarn upgrade-interactive"
 
 _yarn ()
-- 
cgit v1.2.3-70-g09d2


From c99844d84891076dceb5638bd6f4ad1599358cea Mon Sep 17 00:00:00 2001
From: kang <kjxstar@gmail.com>
Date: Sun, 17 Jun 2018 06:07:03 +0800
Subject: adb: fix `adb -s` device completion (#6489)

---
 plugins/adb/_adb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/adb/_adb b/plugins/adb/_adb
index 8cbf6593c..e3c20d751 100644
--- a/plugins/adb/_adb
+++ b/plugins/adb/_adb
@@ -48,8 +48,8 @@ _arguments \
 
 case "$state" in
 	specify_device)
-	_values  'devices' $(adb devices -l|awk 'NR>1&& $1 ~ /^[a-zA-Z0-9].*$/ \
-		{printf "%s[%s] ",$1,$6 }')
+	_values -C 'devices' ${$(adb devices -l|awk 'NR>1&& $1 \
+		{sub(/ +/," ",$0);gsub(":","\\:",$1); printf "%s[%s] ",$1, $NF}'):-""}
 	return
 	;;
 esac
-- 
cgit v1.2.3-70-g09d2


From 48e2c828ef3d60750d157f388830d639c9b2e0bc Mon Sep 17 00:00:00 2001
From: Henry Bley-Vroman <bley.vroman@gmail.com>
Date: Mon, 18 Jun 2018 15:04:42 -0400
Subject: Thefuck: homebrew install documentation and thefuck repo link (#5940)

* Thefuck: homebrew install documentation and thefuck repo link
* thefuck: reformat error message
---
 plugins/thefuck/thefuck.plugin.zsh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/thefuck/thefuck.plugin.zsh b/plugins/thefuck/thefuck.plugin.zsh
index 765e2b9a5..ac88e67de 100644
--- a/plugins/thefuck/thefuck.plugin.zsh
+++ b/plugins/thefuck/thefuck.plugin.zsh
@@ -1,6 +1,7 @@
 if [[ -z $commands[thefuck] ]]; then
-    echo 'thefuck is not installed, you should "pip install thefuck" first'
-    return -1
+    echo 'thefuck is not installed, you should "pip install thefuck" or "brew install thefuck" first.'
+    echo 'See https://github.com/nvbn/thefuck#installation'
+    return 1
 fi
 
 # Register alias
-- 
cgit v1.2.3-70-g09d2


From 0d80e9b4ee4925da24f5c2ef9082f6660d983113 Mon Sep 17 00:00:00 2001
From: Elton Chen-Yu Ho <b01505026@ntu.edu.tw>
Date: Tue, 19 Jun 2018 04:12:07 +0800
Subject: Fix zshrc alias when $EDITOR uses parameters (#6146)

According to #5003

if one exports EDITOR with parameters, say:
`export EDITOR='subl -w'`

running command:
`zshrc`

will result in:
`zsh: command not found: subl -w`

This can be fixed by updating common-aliases.plugin.zsh line 16 with:
`alias zshrc='${=EDITOR} ~/.zshrc' # Quick access to the ~/.zshrc file`

Fixes #5003
---
 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 742798f27..6a7daf845 100644
--- a/plugins/common-aliases/common-aliases.plugin.zsh
+++ b/plugins/common-aliases/common-aliases.plugin.zsh
@@ -13,7 +13,7 @@ alias lS='ls -1FSsh'
 alias lart='ls -1Fcart'
 alias lrt='ls -1Fcrt'
 
-alias zshrc='$EDITOR ~/.zshrc' # Quick access to the ~/.zshrc file
+alias zshrc='${=EDITOR} ~/.zshrc' # Quick access to the ~/.zshrc file
 
 alias grep='grep --color'
 alias sgrep='grep -R -n -H -C 5 --exclude-dir={.git,.svn,CVS} '
-- 
cgit v1.2.3-70-g09d2


From 6af58f492f8c5219e27f74cf6378e92834d1b3e5 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Mon, 18 Jun 2018 22:47:51 +0200
Subject: common-aliases: delete unexistant command

`display_info` doesn't exist in any known platform

Fixes #5208
---
 plugins/common-aliases/common-aliases.plugin.zsh | 2 --
 1 file changed, 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/common-aliases/common-aliases.plugin.zsh b/plugins/common-aliases/common-aliases.plugin.zsh
index 6a7daf845..785a09c63 100644
--- a/plugins/common-aliases/common-aliases.plugin.zsh
+++ b/plugins/common-aliases/common-aliases.plugin.zsh
@@ -44,8 +44,6 @@ alias p='ps -f'
 alias sortnr='sort -n -r'
 alias unexport='unset'
 
-alias whereami=display_info
-
 alias rm='rm -i'
 alias cp='cp -i'
 alias mv='mv -i'
-- 
cgit v1.2.3-70-g09d2


From a0b8eab5f0cd339082c1fe33d7bcfc34e38918b5 Mon Sep 17 00:00:00 2001
From: doofin <8177dph@gmail.com>
Date: Tue, 19 Jun 2018 23:38:10 +0800
Subject: Update sbt.plugin.zsh (#6930)

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

(limited to 'plugins')

diff --git a/plugins/sbt/sbt.plugin.zsh b/plugins/sbt/sbt.plugin.zsh
index 15acfec4f..8fabf0add 100644
--- a/plugins/sbt/sbt.plugin.zsh
+++ b/plugins/sbt/sbt.plugin.zsh
@@ -7,6 +7,7 @@
  
 # aliases - mnemonic: prefix is 'sb'
 alias sbc='sbt compile'
+alias sbcc='sbt clean compile'
 alias sbco='sbt console'
 alias sbcq='sbt console-quick'
 alias sbcl='sbt clean'
-- 
cgit v1.2.3-70-g09d2


From 6c1dab232033b79534d4583a4d6f40340bdf334c Mon Sep 17 00:00:00 2001
From: Ruben Di Battista <rubendibattista@users.noreply.github.com>
Date: Wed, 20 Jun 2018 23:27:38 +0200
Subject: Fix autojump sourcing on OSX with Macports (#4801)

* Fix autojump sourcing on OSX with Macports

The last version of autojump available on Macports does not have
anymore different shell scripts (.sh, .zsh, .bash ...) to be sourced
but just one autojump.sh that takes care of that located at
/opt/local/etc/profile.d/autojump.sh

fix # 4625

* Fix bug with macports autojump on OSX.
---
 plugins/autojump/autojump.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh
index 7339fad9e..c0af67631 100644
--- a/plugins/autojump/autojump.plugin.zsh
+++ b/plugins/autojump/autojump.plugin.zsh
@@ -15,8 +15,8 @@ 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 /opt/local/etc/profile.d/autojump.zsh ]; then # mac os x with ports
-    . /opt/local/etc/profile.d/autojump.zsh
+  elif [ -f /opt/local/etc/profile.d/autojump.sh ]; then # mac os x with ports
+    . /opt/local/etc/profile.d/autojump.sh
   elif [ $commands[brew] -a -f `brew --prefix`/etc/autojump.sh ]; then # mac os x with brew
     . `brew --prefix`/etc/autojump.sh
   fi
-- 
cgit v1.2.3-70-g09d2


From 547a6ce260362b06e86a9c366dc29984c0954124 Mon Sep 17 00:00:00 2001
From: Jeremy Jones <jeremy@jeremyjones.tech>
Date: Sat, 23 Jun 2018 23:52:53 -0500
Subject: fix path completion issue with go run subcommand (#6929)

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

(limited to 'plugins')

diff --git a/plugins/golang/golang.plugin.zsh b/plugins/golang/golang.plugin.zsh
index d9d450690..d5c78ce6c 100644
--- a/plugins/golang/golang.plugin.zsh
+++ b/plugins/golang/golang.plugin.zsh
@@ -135,7 +135,7 @@ __go_tool_complete() {
   run)
       _arguments -s -w : \
           ${build_flags[@]} \
-          '*:file:_path_files -g "*.go"'
+          '*:file:_files -g "*.go"'
       ;;
   tool)
       if (( CURRENT == 3 )); then
-- 
cgit v1.2.3-70-g09d2


From 787c6899d4db04b3e6cef9a02c6a2ff3d896ece3 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Fri, 29 Jun 2018 17:50:32 +0200
Subject: rand-quote: update URL

Fixes #6949
---
 plugins/rand-quote/rand-quote.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/rand-quote/rand-quote.plugin.zsh b/plugins/rand-quote/rand-quote.plugin.zsh
index 8f345d9aa..a64e9b4ed 100644
--- a/plugins/rand-quote/rand-quote.plugin.zsh
+++ b/plugins/rand-quote/rand-quote.plugin.zsh
@@ -1,4 +1,4 @@
-# Get a random quote fron the site http://www.quotationspage.com/random.php3
+# Get a random quote fron the site http://www.quotationspage.com/random.php
 # Created by Eduardo San Martin Morote aka Posva
 # http://posva.github.io
 # Sun Jun 09 10:59:36 CEST 2013 
@@ -13,7 +13,7 @@ END_COLOR="\e[m"
 if [[ -x `which curl` ]]; then
     function quote()
     {
-        Q=$(curl -s --connect-timeout 2 "http://www.quotationspage.com/random.php3" | iconv -c -f ISO-8859-1 -t UTF-8 | grep -m 1 "dt ")
+        Q=$(curl -s --connect-timeout 2 "http://www.quotationspage.com/random.php" | iconv -c -f ISO-8859-1 -t UTF-8 | grep -m 1 "dt ")
         TXT=$(echo "$Q" | sed -e 's/<\/dt>.*//g' -e 's/.*html//g' -e 's/^[^a-zA-Z]*//' -e 's/<\/a..*$//g')
         W=$(echo "$Q" | sed -e 's/.*\/quotes\///g' -e 's/<.*//g' -e 's/.*">//g')
         if [ "$W" -a "$TXT" ]; then
-- 
cgit v1.2.3-70-g09d2


From 1e255a1a8d19f713482c7f2caa639733e8f86b39 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Fri, 29 Jun 2018 17:55:55 +0200
Subject: rand-quote: add README

---
 plugins/rand-quote/README.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 plugins/rand-quote/README.md

(limited to 'plugins')

diff --git a/plugins/rand-quote/README.md b/plugins/rand-quote/README.md
new file mode 100644
index 000000000..c387aaa22
--- /dev/null
+++ b/plugins/rand-quote/README.md
@@ -0,0 +1,15 @@
+# rand-quote plugin
+
+Displays a random quote taken from [quotationspage.com](http://www.quotationspage.com/random.php)
+
+Created by [Eduardo San Martin Morote, aka Posva](https://posva.github.io)
+
+## Usage
+
+Add the plugin to the plugins array in your zshrc file and restart zsh:
+
+```zsh
+plugins=(... rand-quote)
+```
+
+Then, run `quote` to get a new random quote.
-- 
cgit v1.2.3-70-g09d2


From 76bfa7dd2a5422569c48ceb5429fb31adf1f23c2 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Fri, 29 Jun 2018 18:16:10 +0200
Subject: rand-quote: refactor rand-quote function

- Make function variables local
- Use prompt color sequences
- Use guard clause to check for curl
- Improved syntax
---
 plugins/rand-quote/rand-quote.plugin.zsh | 36 +++++++++++---------------------
 1 file changed, 12 insertions(+), 24 deletions(-)

(limited to 'plugins')

diff --git a/plugins/rand-quote/rand-quote.plugin.zsh b/plugins/rand-quote/rand-quote.plugin.zsh
index a64e9b4ed..371b997d3 100644
--- a/plugins/rand-quote/rand-quote.plugin.zsh
+++ b/plugins/rand-quote/rand-quote.plugin.zsh
@@ -1,26 +1,14 @@
-# Get a random quote fron the site http://www.quotationspage.com/random.php
-# Created by Eduardo San Martin Morote aka Posva
-# http://posva.github.io
-# Sun Jun 09 10:59:36 CEST 2013 
-# Don't remove this header, thank you
-# Usage: quote
-
-WHO_COLOR="\e[0;33m"
-TEXT_COLOR="\e[0;35m"
-COLON_COLOR="\e[0;35m"
-END_COLOR="\e[m"
-
-if [[ -x `which curl` ]]; then
-    function quote()
-    {
-        Q=$(curl -s --connect-timeout 2 "http://www.quotationspage.com/random.php" | iconv -c -f ISO-8859-1 -t UTF-8 | grep -m 1 "dt ")
-        TXT=$(echo "$Q" | sed -e 's/<\/dt>.*//g' -e 's/.*html//g' -e 's/^[^a-zA-Z]*//' -e 's/<\/a..*$//g')
-        W=$(echo "$Q" | sed -e 's/.*\/quotes\///g' -e 's/<.*//g' -e 's/.*">//g')
-        if [ "$W" -a "$TXT" ]; then
-          echo "${WHO_COLOR}${W}${COLON_COLOR}: ${TEXT_COLOR}“${TXT}”${END_COLOR}"
-        fi
-    }
-    #quote
-else
+if ! (( $+commands[curl] )); then
     echo "rand-quote plugin needs curl to work" >&2
+    return
 fi
+
+function quote {
+    emulate -L zsh
+    Q=$(curl -s --connect-timeout 2 "http://www.quotationspage.com/random.php" | iconv -c -f ISO-8859-1 -t UTF-8 | grep -m 1 "dt ")
+
+    TXT=$(echo "$Q" | sed -e 's/<\/dt>.*//g' -e 's/.*html//g' -e 's/^[^a-zA-Z]*//' -e 's/<\/a..*$//g')
+    WHO=$(echo "$Q" | sed -e 's/.*\/quotes\///g' -e 's/<.*//g' -e 's/.*">//g')
+
+    [[ -n "$WHO" && -n "$TXT" ]] && print -P "%F{3}${WHO}%f: “%F{5}${TXT}%f”"
+}
-- 
cgit v1.2.3-70-g09d2


From 0639582f73be6aec42d856a242ad1783eb05f973 Mon Sep 17 00:00:00 2001
From: Sascha Rudolph <chirox@mailbox.org>
Date: Fri, 29 Jun 2018 18:22:46 +0200
Subject: 6098 - add support for apt in debian plugin (#6122)

Signed-off-by: Sascha Rudolph <sascharenerudolph@gmail.com>
---
 plugins/debian/debian.plugin.zsh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index 19966b6ac..42690e53e 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -5,9 +5,12 @@
 #
 # Debian-related zsh aliases and functions for zsh
 
-# Use aptitude if installed, or apt-get if not.
+# Use apt or aptitude if installed, fallback is apt-get
 # You can just set apt_pref='apt-get' to override it.
-if [[ -e $( which -p aptitude 2>&1 ) ]]; then
+if [[ -e $( which -p apt 2>&1 ) ]]; then
+    apt_pref='apt'
+    apt_upgr='upgrade'
+elif [[ -e $( which -p aptitude 2>&1 ) ]]; then
     apt_pref='aptitude'
     apt_upgr='safe-upgrade'
 else
-- 
cgit v1.2.3-70-g09d2


From b6ca933a02ed780c8ed776e74b141e45a5389f98 Mon Sep 17 00:00:00 2001
From: Michal Juriš <michaljuris@gmail.com>
Date: Sat, 30 Jun 2018 22:25:53 +0200
Subject: Add alias for 'git rebase develop' (#6006)

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

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 413d780e1..04ff22164 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -208,6 +208,7 @@ alias gra='git remote add'
 alias grb='git rebase'
 alias grba='git rebase --abort'
 alias grbc='git rebase --continue'
+alias grbd='git rebase develop'
 alias grbi='git rebase -i'
 alias grbm='git rebase master'
 alias grbs='git rebase --skip'
-- 
cgit v1.2.3-70-g09d2


From b09890a3e42b82810c6a2c79b3cf427fbf136a65 Mon Sep 17 00:00:00 2001
From: Justin Aiken <60tonangel@gmail.com>
Date: Sat, 30 Jun 2018 14:45:20 -0600
Subject: Added more levels of zeus compeletion (#2058)

---
 plugins/zeus/_zeus | 110 ++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 87 insertions(+), 23 deletions(-)

(limited to 'plugins')

diff --git a/plugins/zeus/_zeus b/plugins/zeus/_zeus
index 5a13bd9ec..78f0c545e 100644
--- a/plugins/zeus/_zeus
+++ b/plugins/zeus/_zeus
@@ -2,33 +2,97 @@
 #autoload
 
 # in order to make this work, you will need to have the gem zeus installed
-
-# zeus zsh completion, based on adb completion
+# zeus zsh completion
 
 local -a _1st_arguments
-_1st_arguments=(
-'console:Lets you interact with your Rails application from the command line. (alias = c)'
-'cucumber:Runs cucumber.'
-'dbconsole:Figures out which database you are using and drops you into whichever command line interface.'
-'destroy:Figures out what generate did, and undoes it. (alias = d)'
-'generate:Uses templates to create a whole lot of things. (alias = g)'
-'rake:Execute rake tasks.'
-'runner:Runs Ruby code in the context of Rails non-interactively. (alias = r)'
-'server:Launches a small web server named WEBrick which comes bundled with Ruby. (alias = s)'
-'start:Preloads the zeus environment'
-'test:Runs RSpec tests. (alias = rspec, testrb)'
-'version:Shows the version number.'
-)
+if [[ -e .zeus.sock ]]; then
+  _1st_arguments=(
+  'console:Lets you interact with your Rails application from the command line. (alias = c)'
+  'cucumber:Runs cucumber.'
+  'dbconsole:Figures out which database you are using and drops you into whichever command line interface.'
+  'destroy:Figures out what generate did, and undoes it. (alias = d)'
+  'generate:Uses templates to create a whole lot of things. (alias = g)'
+  'rake:Execute rake tasks.'
+  'runner:Runs Ruby code in the context of Rails non-interactively. (alias = r)'
+  'server:Launches a small web server named WEBrick which comes bundled with Ruby. (alias = s)'
+  'test:Runs RSpec tests. (alias = rspec, testrb)'
+  'version:Shows the version number.'
+  )
+else
+  _1st_arguments=(
+  'start:Preloads the zeus environment'
+  'init:Generate a zeus.json file'
+  )
+fi
+
+_rails_generate_arguments() {
+    generate_arguments=(
+      controller
+      generator
+      helper
+      integration_test
+      mailer
+      migration
+      model
+      observer
+      performance_test
+      plugin
+      resource
+      scaffold
+      scaffold_controller
+      session_migration
+      stylesheets
+    )
+}
+
+_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
+}
+
+_zrake ()
+{
+    local expl
+    declare -a tasks
+
+    if [ -f Rakefile ]; then
+      if _rake_does_task_list_need_generating; then
+        echo "\nGenerating .rake_tasks..." > /dev/stderr
+        rake --silent --tasks | cut -d " " -f 2 > .rake_tasks
+      fi
+      tasks=(`cat .rake_tasks`)
+      _wanted tasks expl 'rake' compadd $tasks
+    fi
+}
 
 local expl
-local -a pkgs installed_pkgs
+local curcontext="$curcontext" state line
+typeset -A opt_args
 
-_arguments \
-	'*:: :->subcmds' && return 0
+_arguments -C \
+    ':command:->command' \
+    '*::options:->options'
 
-if (( CURRENT == 1 )); then
-	_describe -t commands "zeus subcommand" _1st_arguments
-	return
-fi
 
-_files
+case $state in
+  (command)
+    _describe -t commands "zeus subcommand" _1st_arguments
+    return
+  ;;
+
+  (options)
+    case $line[1] in
+      (rake)
+        _zrake
+      ;;
+      (generate|g|destroy|d)
+        _rails_generate_arguments
+        _wanted generate_arguments expl 'all generate' compadd -a generate_arguments
+      ;;
+    esac
+  ;;
+esac
-- 
cgit v1.2.3-70-g09d2


From 302270174d8173be35e8c1b464a0d9e731650c15 Mon Sep 17 00:00:00 2001
From: Michael Stucki <michael@stucki.io>
Date: Sun, 1 Jul 2018 18:20:34 +0200
Subject: Use existing ssh-agent when invoking a sudo shell (#3891)

When invoking a shell as root using ```sudo -s```, the ssh-agent plugin
starts a new agent although it already exists.

The problem boils down to a check if ssh-agent is running using
```ps x```. If that is extended to ```ps ax``` for root, then the
existing ssh-agent will still work.
---
 plugins/ssh-agent/ssh-agent.plugin.zsh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index 20f97c6f1..fe4946c6d 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -30,7 +30,12 @@ if [[ $_agent_forwarding == "yes" && -n "$SSH_AUTH_SOCK" ]]; then
 elif [[ -f "$_ssh_env_cache" ]]; then
 	# Source SSH settings, if applicable
 	. $_ssh_env_cache > /dev/null
-	ps x | grep ssh-agent | grep -q $SSH_AGENT_PID || {
+	if [[ $USER == "root" ]]; then
+		FILTER="ax"
+	else
+		FILTER="x"
+	fi
+	ps $FILTER | grep ssh-agent | grep -q $SSH_AGENT_PID || {
 		_start_agent
 	}
 else
-- 
cgit v1.2.3-70-g09d2


From 4aaafc0fe811f5be85b8c7b3e5db61d030a2d857 Mon Sep 17 00:00:00 2001
From: Hosmel Quintana <hosmelq@gmail.com>
Date: Sun, 1 Jul 2018 11:39:44 -0600
Subject: Add Homestead plugin (#3712)

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

(limited to 'plugins')

diff --git a/plugins/homestead/homestead.plugin.zsh b/plugins/homestead/homestead.plugin.zsh
new file mode 100644
index 000000000..cdbc564e4
--- /dev/null
+++ b/plugins/homestead/homestead.plugin.zsh
@@ -0,0 +1,10 @@
+# Homestead basic command completion
+_homestead_get_command_list () {
+  homestead --no-ansi | sed "1,/Available commands/d" | awk '/^ +[a-z]+/ { print $1 }'
+}
+
+_homestead () {
+  compadd `_homestead_get_command_list`
+}
+
+compdef _homestead homestead
-- 
cgit v1.2.3-70-g09d2


From 2de926aa109181907def20c21f28d8a5e32b9d85 Mon Sep 17 00:00:00 2001
From: Thomas Kriechbaumer <Kriechi@users.noreply.github.com>
Date: Sun, 1 Jul 2018 20:00:09 +0200
Subject: add ufw completion script (#3835)

---
 plugins/ufw/_ufw | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 117 insertions(+)
 create mode 100644 plugins/ufw/_ufw

(limited to 'plugins')

diff --git a/plugins/ufw/_ufw b/plugins/ufw/_ufw
new file mode 100644
index 000000000..08f871f35
--- /dev/null
+++ b/plugins/ufw/_ufw
@@ -0,0 +1,117 @@
+#compdef ufw
+#autoload
+
+typeset -A opt_args
+
+function _ufw_delete_rules {
+  if ufw status &> /dev/null ; then
+    ufw status numbered \
+      | perl -n -e'/\[ +(\d+)\] +([^ ].+)/ && print "\"$1\[$2\]\" "'
+  fi
+}
+
+function _ufw_app_profiles {
+  grep -rhoP "(?<=\[)[^\]]+" /etc/ufw/applications.d/ \
+    | awk '{ print "\""$0"\""}' \
+    | tr '\n' ' '
+}
+
+local -a _1st_arguments
+_1st_arguments=(
+  'allow:add allow rule'
+  'app:Application profile commands'
+  'default:set default policy'
+  'delete:delete RULE'
+  'deny:add deny rule'
+  'disable:disables the firewall'
+  'enable:enables the firewall'
+  'insert:insert RULE at NUM'
+  'limit:add limit rule'
+  'logging:set logging to LEVEL'
+  'reject:add reject rule'
+  'reload:reloads firewall'
+  'reset:reset firewall'
+  'show:show firewall report'
+  'status:show firewall status'
+  'version:display version information'
+)
+
+local context state line curcontext="$curcontext"
+
+_arguments -C \
+  '(--dry-run)--dry-run[dry run]' \
+  '1:: :->cmds' \
+  '2:: :->subcmds' \
+  '3:: :->subsubcmds' \
+&& return 0
+
+echo "DEBUG: $(date)| $state | $line[1] | $line| $word[1]| $word| $CURRENT|" >> log.log
+
+local rules
+
+case "$state" in
+  (cmds)
+    _describe -t commands "ufw commands" _1st_arguments
+    return 0
+    ;;
+  (subcmds)
+    case "$line[1]" in
+      (app)
+        _values 'app' \
+          'list[list application profiles]' \
+          'info[show information on PROFILE]' \
+          'update[update PROFILE]' \
+          'default[set default application policy]' \
+        && ret=0
+        ;;
+      (status)
+        _values 'status' \
+          'numbered[show firewall status as numbered list of RULES]' \
+          'verbose[show verbose firewall status]' \
+        && ret=0
+        ;;
+      (logging)
+        _values 'logging' \
+          'on' 'off' 'low' 'medium' 'high' 'full' \
+        && ret=0
+        ;;
+      (default)
+        _values 'default' \
+          'allow' 'deny' 'reject' \
+        && ret=0
+        ;;
+      (show)
+        _values 'show' \
+          'raw' 'builtins' 'before-rules' 'user-rules' 'after-rules' 'logging-rules' 'listening' 'added' \
+        && ret=0
+        ;;
+      (delete)
+        rules="$(_ufw_delete_rules)"
+        if [[ -n "$rules" ]] ; then
+          _values 'delete' \
+            ${(Q)${(z)"$(_ufw_delete_rules)"}} \
+          && ret=0
+        fi
+        ;;
+    esac
+    ;;
+  (subsubcmds)
+    case "$line[1]" in
+      (app)
+        case "$line[2]" in
+          (info|update)
+            _values 'profiles' \
+              ${(Q)${(z)"$(_ufw_app_profiles)"}} \
+            && ret=0
+            ;;
+        esac
+        ;;
+      (default)
+        _values 'default-direction' \
+          'incoming' 'outgoing' \
+        && ret=0
+        ;;
+    esac
+esac
+
+return
-- 
cgit v1.2.3-70-g09d2


From 78e7ec2186201a941f47d2f1f7a986bae3828e59 Mon Sep 17 00:00:00 2001
From: Shadab Zafar <dufferzafar0@gmail.com>
Date: Sun, 1 Jul 2018 23:43:49 +0530
Subject: Add magic-enter plugin (#4082)

* Added magic-enter plugin

To bind commonly used tasks to the enter key

* Allow the magic-enter commands to be modified by the user
---
 plugins/magic-enter/Readme.md              | 14 ++++++++++++++
 plugins/magic-enter/magic-enter.plugin.zsh | 24 ++++++++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 plugins/magic-enter/Readme.md
 create mode 100644 plugins/magic-enter/magic-enter.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/magic-enter/Readme.md b/plugins/magic-enter/Readme.md
new file mode 100644
index 000000000..b401ab415
--- /dev/null
+++ b/plugins/magic-enter/Readme.md
@@ -0,0 +1,14 @@
+## Magic Enter
+
+**Maintainer:** [@dufferzafar](https://github.com/dufferzafar)
+
+Makes your enter key magical, by binding commonly used commands to it.
+
+You can set the commands to be run in your .zshrc, before the line containing plugins!
+
+```bash
+MAGIC_ENTER_GIT_COMMAND='git status -u .'
+MAGIC_ENTER_OTHER_COMMAND='ls -lh .'
+
+plugins=(magic-enter)
+```
diff --git a/plugins/magic-enter/magic-enter.plugin.zsh b/plugins/magic-enter/magic-enter.plugin.zsh
new file mode 100644
index 000000000..8e1859678
--- /dev/null
+++ b/plugins/magic-enter/magic-enter.plugin.zsh
@@ -0,0 +1,24 @@
+# Bind quick stuff to enter!
+#
+# Pressing enter in a git directory runs `git status`
+# in other directories `ls`
+magic-enter () {
+
+  # If commands are not already set, use the defaults
+  [ -z "$MAGIC_ENTER_GIT_COMMAND" ] && MAGIC_ENTER_GIT_COMMAND="git status -u ."
+  [ -z "$MAGIC_ENTER_OTHER_COMMAND" ] && MAGIC_ENTER_OTHER_COMMAND="ls -lh ."
+
+  if [[ -z $BUFFER ]]; then
+    echo ""
+    if git rev-parse --is-inside-work-tree &>/dev/null; then
+      eval "$MAGIC_ENTER_GIT_COMMAND"
+    else
+      eval "$MAGIC_ENTER_OTHER_COMMAND"
+    fi
+    zle redisplay
+  else
+    zle accept-line
+  fi
+}
+zle -N magic-enter
+bindkey "^M" magic-enter
-- 
cgit v1.2.3-70-g09d2


From 29a2394c8f88efe04a61460a9a171228c39b1de0 Mon Sep 17 00:00:00 2001
From: Alberto Re <alberto.re@gmail.com>
Date: Sun, 1 Jul 2018 20:16:08 +0200
Subject: Adds `vagrant_prompt_info` function to your shell (#4081)

---
 plugins/vagrant-prompt/README.md                 |  6 ++++
 plugins/vagrant-prompt/vagrant-prompt.plugin.zsh | 38 ++++++++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 plugins/vagrant-prompt/README.md
 create mode 100644 plugins/vagrant-prompt/vagrant-prompt.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/vagrant-prompt/README.md b/plugins/vagrant-prompt/README.md
new file mode 100644
index 000000000..c5bc55d17
--- /dev/null
+++ b/plugins/vagrant-prompt/README.md
@@ -0,0 +1,6 @@
+This plugin prompts the status of the Vagrant VMs. It supports single-host and
+multi-host configurations as well.
+
+Look inside the source for documentation about custom variables. 
+
+Alberto Re <alberto.re@gmail.com>
diff --git a/plugins/vagrant-prompt/vagrant-prompt.plugin.zsh b/plugins/vagrant-prompt/vagrant-prompt.plugin.zsh
new file mode 100644
index 000000000..28bf31f91
--- /dev/null
+++ b/plugins/vagrant-prompt/vagrant-prompt.plugin.zsh
@@ -0,0 +1,38 @@
+# vim:ft=zsh ts=2 sw=2 sts=2
+#
+# To display Vagrant infos on your prompt add the vagrant_prompt_info to the
+# $PROMPT variable in your theme. Example:
+#
+# PROMPT='%{$fg[$NCOLOR]%}%B%n%b%{$reset_color%}:%{$fg[blue]%}%B%c/%b%{$reset_color%} $(vagrant_prompt_info)$(svn_prompt_info)$(git_prompt_info)%(!.#.$) '
+#
+# `vagrant_prompt_info` makes use of some custom variables. This is an example
+# definition:
+#
+# ZSH_THEME_VAGRANT_PROMPT_PREFIX="%{$fg_bold[blue]%}["
+# ZSH_THEME_VAGRANT_PROMPT_SUFFIX="%{$fg_bold[blue]%}]%{$reset_color%} "
+# ZSH_THEME_VAGRANT_PROMPT_RUNNING="%{$fg_no_bold[green]%}●"
+# ZSH_THEME_VAGRANT_PROMPT_POWEROFF="%{$fg_no_bold[red]%}●"
+# ZSH_THEME_VAGRANT_PROMPT_SUSPENDED="%{$fg_no_bold[yellow]%}●"
+# ZSH_THEME_VAGRANT_PROMPT_NOT_CREATED="%{$fg_no_bold[white]%}○"
+
+function vagrant_prompt_info() {
+  test -d .vagrant && test -f Vagrantfile
+  if [[ "$?" == "0" ]]; then
+    statuses=$(vagrant status 2> /dev/null | grep -P "\w+\s+[\w\s]+\s\(\w+\)")
+    statuses=("${(f)statuses}")
+    printf '%s' $ZSH_THEME_VAGRANT_PROMPT_PREFIX
+    for vm_details in $statuses; do
+      vm_state=$(echo $vm_details | grep -o -E "saved|poweroff|not created|running")
+      if [[ "$vm_state" == "running" ]]; then
+        printf '%s' $ZSH_THEME_VAGRANT_PROMPT_RUNNING
+      elif [[ "$vm_state" == "saved" ]]; then
+        printf '%s' $ZSH_THEME_VAGRANT_PROMPT_SUSPENDED
+      elif [[ "$vm_state" == "not created" ]]; then
+        printf '%s' $ZSH_THEME_VAGRANT_PROMPT_NOT_CREATED
+      elif [[ "$vm_state" == "poweroff" ]]; then
+        printf '%s' $ZSH_THEME_VAGRANT_PROMPT_POWEROFF
+      fi
+    done
+    printf '%s' $ZSH_THEME_VAGRANT_PROMPT_SUFFIX
+  fi
+}
-- 
cgit v1.2.3-70-g09d2


From 27321265258ce4e0b0c0b1bdb90eb5e72b9b1c29 Mon Sep 17 00:00:00 2001
From: miguelpuyol <miguelpuyol@gmail.com>
Date: Sun, 1 Jul 2018 20:42:29 +0200
Subject: Add Spring Boot Run command (#4460)

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

(limited to 'plugins')

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index ee6fe2770..d422ba5c7 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -59,11 +59,13 @@ alias mvn-updates='mvn versions:display-dependency-updates'
 alias mvntc7='mvn tomcat7:run' 
 alias mvntc='mvn tomcat:run'
 alias mvnjetty='mvn jetty:run'
+alias mvnboot='mvn spring-boot:run'
 alias mvndt='mvn dependency:tree'
 alias mvns='mvn site'
 alias mvnsrc='mvn dependency:sources'
 alias mvndocs='mvn dependency:resolve -Dclassifier=javadoc'
 
+
 function listMavenCompletions { 
     reply=(
         # common lifecycle
-- 
cgit v1.2.3-70-g09d2


From c7d8ad1e7511749f584adae37f0ff1ccd0922ec6 Mon Sep 17 00:00:00 2001
From: meehow <michal@ert.pl>
Date: Sun, 1 Jul 2018 20:45:15 +0200
Subject: sudo added to nmap commands which require sudo (#4476)

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

(limited to 'plugins')

diff --git a/plugins/nmap/nmap.plugin.zsh b/plugins/nmap/nmap.plugin.zsh
index d09f2c615..82c275f23 100644
--- a/plugins/nmap/nmap.plugin.zsh
+++ b/plugins/nmap/nmap.plugin.zsh
@@ -17,16 +17,16 @@
 
 alias nmap_open_ports="nmap --open"
 alias nmap_list_interfaces="nmap --iflist"
-alias nmap_slow="nmap -sS -v -T1"
-alias nmap_fin="nmap -sF -v"
-alias nmap_full="nmap -sS -T4 -PE -PP -PS80,443 -PY -g 53 -A -p1-65535 -v"
-alias nmap_check_for_firewall="nmap -sA -p1-65535 -v -T4"
+alias nmap_slow="sudo nmap -sS -v -T1"
+alias nmap_fin="sudo nmap -sF -v"
+alias nmap_full="sudo nmap -sS -T4 -PE -PP -PS80,443 -PY -g 53 -A -p1-65535 -v"
+alias nmap_check_for_firewall="sudo nmap -sA -p1-65535 -v -T4"
 alias nmap_ping_through_firewall="nmap -PS -PA"
 alias nmap_fast="nmap -F -T5 --version-light --top-ports 300"
-alias nmap_detect_versions="nmap -sV -p1-65535 -O --osscan-guess -T4 -Pn"
+alias nmap_detect_versions="sudo nmap -sV -p1-65535 -O --osscan-guess -T4 -Pn"
 alias nmap_check_for_vulns="nmap --script=vulscan"
-alias nmap_full_udp="nmap -sS -sU -T4 -A -v -PE -PS22,25,80 -PA21,23,80,443,3389 "
-alias nmap_traceroute="nmap -sP -PE -PS22,25,80 -PA21,23,80,3389 -PU -PO --traceroute "
+alias nmap_full_udp="sudo nmap -sS -sU -T4 -A -v -PE -PS22,25,80 -PA21,23,80,443,3389 "
+alias nmap_traceroute="sudo nmap -sP -PE -PS22,25,80 -PA21,23,80,3389 -PU -PO --traceroute "
 alias nmap_full_with_scripts="sudo nmap -sS -sU -T4 -A -v -PE -PP -PS21,22,23,25,80,113,31339 -PA80,113,443,10042 -PO --script all " 
 alias nmap_web_safe_osscan="sudo nmap -p 80,443 -O -v --osscan-guess --fuzzy "
 
-- 
cgit v1.2.3-70-g09d2


From 27b9aed87f2c05e0c7e18716741ec3381e27f889 Mon Sep 17 00:00:00 2001
From: Pierre Barbier de Reuille <pierre.barbierdereuille@gmail.com>
Date: Sun, 1 Jul 2018 20:48:53 +0200
Subject: Added "-n name" option to vim-interaction plugin (#4522)

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

(limited to 'plugins')

diff --git a/plugins/vim-interaction/vim-interaction.plugin.zsh b/plugins/vim-interaction/vim-interaction.plugin.zsh
index b774be342..010f998d3 100644
--- a/plugins/vim-interaction/vim-interaction.plugin.zsh
+++ b/plugins/vim-interaction/vim-interaction.plugin.zsh
@@ -8,10 +8,11 @@ function callvim
 {
   if [[ $# == 0 ]]; then
     cat <<EOH
-usage: callvim [-b cmd] [-a cmd] [file ... fileN]
+usage: callvim [-b cmd] [-a cmd] [-n name] [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
+  -n name    Name of the GVIM server to connect to
   file       The file to edit
   ... fileN  The other files to add to the argslist
 EOH
@@ -21,13 +22,16 @@ EOH
   local cmd=""
   local before="<esc>"
   local after=""
-  while getopts ":b:a:" option
+  local name="GVIM"
+  while getopts ":b:a:n:" option
   do
     case $option in
       a) after="$OPTARG"
          ;;
       b) before="$OPTARG"
          ;;
+      n) name="$OPTARG"
+         ;;
     esac
   done
   shift $((OPTIND-1))
@@ -43,7 +47,7 @@ EOH
     files=':args! '"${@:A:q}<cr>"
   fi
   cmd="$before$files$after"
-  gvim --remote-send "$cmd"
+  gvim --servername "$name" --remote-send "$cmd"
   if typeset -f postCallVim > /dev/null; then
     postCallVim
   fi
-- 
cgit v1.2.3-70-g09d2


From ac0d71467be9de2e399ef99ae58d7780e1d2ff4c Mon Sep 17 00:00:00 2001
From: 当轩 <me@dangxuan.pro>
Date: Mon, 2 Jul 2018 05:07:35 +0800
Subject: add plugin:percol (#4582)

* add plugin:percol

* fix format

* check percol

* fix empty history in gnome terminal
---
 plugins/percol/README.md         | 23 +++++++++++++++++++++++
 plugins/percol/percol.plugin.zsh | 22 ++++++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 plugins/percol/README.md
 create mode 100644 plugins/percol/percol.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/percol/README.md b/plugins/percol/README.md
new file mode 100644
index 000000000..97cca6876
--- /dev/null
+++ b/plugins/percol/README.md
@@ -0,0 +1,23 @@
+## percol
+
+Provides some useful function to make [percol](https://github.com/mooz/percol) work with zsh history and [jump plugin](https://github.com/robbyrussell/oh-my-zsh/blob/master/plugins/jump/jump.plugin.zsh)
+
+### Preview
+![Preview](http://t1.qpic.cn/mblogpic/eb1c8f9d2b9f62d19fa8/2000.jpg)
+
+### Requirements
+
+```shell
+pip install percol
+```
+
+And [jump](https://github.com/robbyrussell/oh-my-zsh/blob/master/plugins/jump/jump.plugin.zsh) for `oh-my-zsh` is a optional requirement.
+
+### Usage
+
+For default
+
+- `^-r` bind to `percol_select_history`.You can use it to grep your history with percol.
+
+- `^-b` bind to `percol_select_marks`.You can use it to grep your bookmarks with percol.
+
diff --git a/plugins/percol/percol.plugin.zsh b/plugins/percol/percol.plugin.zsh
new file mode 100644
index 000000000..c6adf4e1e
--- /dev/null
+++ b/plugins/percol/percol.plugin.zsh
@@ -0,0 +1,22 @@
+if which percol &> /dev/null; then
+    function percol_select_history() {
+        local tac
+        which gtac &> /dev/null && tac="gtac" || { which tac &> /dev/null && tac="tac" || { tac="tail -r" } }
+        BUFFER=$(fc -l -n 1 | eval $tac | percol --query "$LBUFFER")
+        CURSOR=$#BUFFER
+        zle -R -c
+    }
+
+    zle -N percol_select_history
+    bindkey '^R' percol_select_history
+
+    if which marks &> /dev/null; then
+        function percol_select_marks() {
+            BUFFER=$(marks | percol --query "$LBUFFER" | awk '{print $3}')
+            CURSOR=$#BUFFER # move cursor
+            zle -R -c       # refresh
+        }
+        zle -N percol_select_marks
+        bindkey '^B' percol_select_marks
+    fi
+fi
-- 
cgit v1.2.3-70-g09d2


From 5c0911c184b012797ef4d0ed2a79d67b6b0976e3 Mon Sep 17 00:00:00 2001
From: Maciej Sypień <egel@users.noreply.github.com>
Date: Sun, 1 Jul 2018 23:12:14 +0200
Subject: update nvm completions with v0.29.0 (#4701)

---
 plugins/nvm/_nvm | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'plugins')

diff --git a/plugins/nvm/_nvm b/plugins/nvm/_nvm
index 1414dcbb1..1eec48b0a 100644
--- a/plugins/nvm/_nvm
+++ b/plugins/nvm/_nvm
@@ -6,16 +6,23 @@
 local -a _1st_arguments
 _1st_arguments=(
   'help:show help'
-  'install:download and install a version'
+  '--version:print out the latest released version of nvm'
+  'install:download and install a version in <node|iojs|node version number>'
   'uninstall:uninstall a version'
-  'use:modify PATH to use version'
-  'run:run version with given arguments'
+  'use:modify PATH to use <version>. Uses .nvmrc if available'
+  'exec:run <command> on <version>. Uses .nvmrc if available'
+  'run:run `node` on <version> with <args> as arguments. Uses .nvmrc if available'
+  'current:list installed versions'
   'ls:list installed versions or versions matching a given description'
+  'version:resolve the given description to a single local version'
+  'version-remote:resolve the given description to a single remote version'
   'ls-remote:list remote versions available for install'
-  'deactivate:undo effects of NVM on current shell'
+  'deactivate:undo effects of `nvm` on current shell'
   'alias:show or set aliases'
   'unalias:deletes an alias'
-  'copy-packages:install global NPM packages to current version'
+  'reinstall-packages:reinstall global `npm` packages contained in <version> to current version'
+  'unload:unload `nvm` from shell'
+  'which:display path to installed node version. Uses .nvmrc if available'
 )
 
 _arguments -C '*:: :->subcmds' && return 0
@@ -23,4 +30,4 @@ _arguments -C '*:: :->subcmds' && return 0
 if (( CURRENT == 1 )); then
   _describe -t commands "nvm subcommand" _1st_arguments
   return
-fi
\ No newline at end of file
+fi
-- 
cgit v1.2.3-70-g09d2


From af085542bdc0e835093ed2b86f90251bc1f3d719 Mon Sep 17 00:00:00 2001
From: Alexandre Nicastro <kryndex@gmail.com>
Date: Sun, 1 Jul 2018 18:21:20 -0300
Subject: Stop error "permission denied: /npm_completion" (#6340)

Fixes #5874

Related:
https://github.com/lukechilds/zsh-nvm/issues/23
https://github.com/zsh-users/antigen/issues/586
---
 plugins/npm/npm.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/npm/npm.plugin.zsh b/plugins/npm/npm.plugin.zsh
index 43af35ddb..f62174a4f 100644
--- a/plugins/npm/npm.plugin.zsh
+++ b/plugins/npm/npm.plugin.zsh
@@ -1,5 +1,5 @@
 (( $+commands[npm] )) && {
-    __NPM_COMPLETION_FILE="${ZSH_CACHE_DIR}/npm_completion"
+    __NPM_COMPLETION_FILE="${ZSH_CACHE_DIR:-$ZSH/cache}/npm_completion"
 
     if [[ ! -f $__NPM_COMPLETION_FILE ]]; then
         npm completion >! $__NPM_COMPLETION_FILE 2>/dev/null
-- 
cgit v1.2.3-70-g09d2


From 9711d8f7316339b21c1043c74020c944eda7a2f5 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Mon, 2 Jul 2018 17:04:09 +0200
Subject: Rename kube-ps1.zsh to kube-ps1.plugin.zsh

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

(limited to 'plugins')

diff --git a/plugins/kube-ps1/kube-ps1.plugin.zsh b/plugins/kube-ps1/kube-ps1.plugin.zsh
new file mode 100644
index 000000000..e1cb4339d
--- /dev/null
+++ b/plugins/kube-ps1/kube-ps1.plugin.zsh
@@ -0,0 +1,123 @@
+#!/bin/zsh
+
+# Kubernetes prompt helper for bash/zsh
+# Displays current context and namespace
+
+# Copyright 2017 Jon Mosco
+#
+#  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.
+
+# Debug
+[[ -n $DEBUG ]] && set -x
+
+setopt PROMPT_SUBST
+add-zsh-hook precmd _kube_ps1_load
+zmodload zsh/stat
+
+# Default values for the prompt
+# Override these values in ~/.zshrc or ~/.bashrc
+KUBE_PS1_DEFAULT="${KUBE_PS1_DEFAULT:=true}"
+KUBE_PS1_PREFIX="("
+KUBE_PS1_DEFAULT_LABEL="${KUBE_PS1_DEFAULT_LABEL:="⎈ "}"
+KUBE_PS1_DEFAULT_LABEL_IMG="${KUBE_PS1_DEFAULT_LABEL_IMG:=false}"
+KUBE_PS1_SEPERATOR="|"
+KUBE_PS1_PLATFORM="${KUBE_PS1_PLATFORM:="kubectl"}"
+KUBE_PS1_DIVIDER=":"
+KUBE_PS1_SUFFIX=")"
+KUBE_PS1_UNAME=$(uname)
+KUBE_PS1_LAST_TIME=0
+
+kube_ps1_label () {
+
+  [[ "${KUBE_PS1_DEFAULT_LABEL_IMG}" == false ]] && return
+
+  if [[ "${KUBE_PS1_DEFAULT_LABEL_IMG}" == true ]]; then
+    local KUBE_LABEL="☸️ "
+  fi
+
+  KUBE_PS1_DEFAULT_LABEL="${KUBE_LABEL}"
+
+}
+
+_kube_ps1_split() {
+  type setopt >/dev/null 2>&1 && setopt SH_WORD_SPLIT
+  local IFS=$1
+  echo $2
+}
+
+_kube_ps1_file_newer_than() {
+
+  local mtime
+  local file=$1
+  local check_time=$2
+  mtime=$(stat +mtime "${file}")
+
+  [ "${mtime}" -gt "${check_time}" ]
+
+}
+
+_kube_ps1_load() {
+  # kubectl will read the environment variable $KUBECONFIG
+  # otherwise set it to ~/.kube/config
+  KUBECONFIG="${KUBECONFIG:=$HOME/.kube/config}"
+
+  for conf in $(_kube_ps1_split : "${KUBECONFIG}"); do
+    # TODO: check existence of $conf
+    if _kube_ps1_file_newer_than "${conf}" "${KUBE_PS1_LAST_TIME}"; then
+      _kube_ps1_get_context_ns
+      return
+    fi
+  done
+}
+
+_kube_ps1_get_context_ns() {
+
+  # Set the command time
+  KUBE_PS1_LAST_TIME=$(date +%s)
+
+  if [[ "${KUBE_PS1_DEFAULT}" == true ]]; then
+    local KUBE_BINARY="${KUBE_PS1_PLATFORM}"
+  elif [[ "${KUBE_PS1_DEFAULT}" == false ]] && [[ "${KUBE_PS1_PLATFORM}" == "kubectl" ]];then
+    local KUBE_BINARY="kubectl"
+  elif [[ "${KUBE_PS1_PLATFORM}" == "oc" ]]; then
+    local KUBE_BINARY="oc"
+  fi
+
+  KUBE_PS1_CONTEXT="$(${KUBE_BINARY} config current-context)"
+  KUBE_PS1_NAMESPACE="$(${KUBE_BINARY} config view --minify --output 'jsonpath={..namespace}')"
+  # Set namespace to default if it is not defined
+  KUBE_PS1_NAMESPACE="${KUBE_PS1_NAMESPACE:-default}"
+
+}
+
+# source our symbol
+kube_ps1_label
+
+# Build our prompt
+kube_ps1 () {
+  local reset_color="%f"
+  local blue="%F{blue}"
+  local red="%F{red}"
+  local cyan="%F{cyan}"
+
+  KUBE_PS1="${reset_color}$KUBE_PS1_PREFIX"
+  KUBE_PS1+="${blue}$KUBE_PS1_DEFAULT_LABEL"
+  KUBE_PS1+="${reset_color}$KUBE_PS1_SEPERATOR"
+  KUBE_PS1+="${red}$KUBE_PS1_CONTEXT${reset_color}"
+  KUBE_PS1+="$KUBE_PS1_DIVIDER"
+  KUBE_PS1+="${cyan}$KUBE_PS1_NAMESPACE${reset_color}"
+  KUBE_PS1+="$KUBE_PS1_SUFFIX"
+
+  echo "${KUBE_PS1}"
+
+}
diff --git a/plugins/kube-ps1/kube-ps1.zsh b/plugins/kube-ps1/kube-ps1.zsh
deleted file mode 100644
index e1cb4339d..000000000
--- a/plugins/kube-ps1/kube-ps1.zsh
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/zsh
-
-# Kubernetes prompt helper for bash/zsh
-# Displays current context and namespace
-
-# Copyright 2017 Jon Mosco
-#
-#  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.
-
-# Debug
-[[ -n $DEBUG ]] && set -x
-
-setopt PROMPT_SUBST
-add-zsh-hook precmd _kube_ps1_load
-zmodload zsh/stat
-
-# Default values for the prompt
-# Override these values in ~/.zshrc or ~/.bashrc
-KUBE_PS1_DEFAULT="${KUBE_PS1_DEFAULT:=true}"
-KUBE_PS1_PREFIX="("
-KUBE_PS1_DEFAULT_LABEL="${KUBE_PS1_DEFAULT_LABEL:="⎈ "}"
-KUBE_PS1_DEFAULT_LABEL_IMG="${KUBE_PS1_DEFAULT_LABEL_IMG:=false}"
-KUBE_PS1_SEPERATOR="|"
-KUBE_PS1_PLATFORM="${KUBE_PS1_PLATFORM:="kubectl"}"
-KUBE_PS1_DIVIDER=":"
-KUBE_PS1_SUFFIX=")"
-KUBE_PS1_UNAME=$(uname)
-KUBE_PS1_LAST_TIME=0
-
-kube_ps1_label () {
-
-  [[ "${KUBE_PS1_DEFAULT_LABEL_IMG}" == false ]] && return
-
-  if [[ "${KUBE_PS1_DEFAULT_LABEL_IMG}" == true ]]; then
-    local KUBE_LABEL="☸️ "
-  fi
-
-  KUBE_PS1_DEFAULT_LABEL="${KUBE_LABEL}"
-
-}
-
-_kube_ps1_split() {
-  type setopt >/dev/null 2>&1 && setopt SH_WORD_SPLIT
-  local IFS=$1
-  echo $2
-}
-
-_kube_ps1_file_newer_than() {
-
-  local mtime
-  local file=$1
-  local check_time=$2
-  mtime=$(stat +mtime "${file}")
-
-  [ "${mtime}" -gt "${check_time}" ]
-
-}
-
-_kube_ps1_load() {
-  # kubectl will read the environment variable $KUBECONFIG
-  # otherwise set it to ~/.kube/config
-  KUBECONFIG="${KUBECONFIG:=$HOME/.kube/config}"
-
-  for conf in $(_kube_ps1_split : "${KUBECONFIG}"); do
-    # TODO: check existence of $conf
-    if _kube_ps1_file_newer_than "${conf}" "${KUBE_PS1_LAST_TIME}"; then
-      _kube_ps1_get_context_ns
-      return
-    fi
-  done
-}
-
-_kube_ps1_get_context_ns() {
-
-  # Set the command time
-  KUBE_PS1_LAST_TIME=$(date +%s)
-
-  if [[ "${KUBE_PS1_DEFAULT}" == true ]]; then
-    local KUBE_BINARY="${KUBE_PS1_PLATFORM}"
-  elif [[ "${KUBE_PS1_DEFAULT}" == false ]] && [[ "${KUBE_PS1_PLATFORM}" == "kubectl" ]];then
-    local KUBE_BINARY="kubectl"
-  elif [[ "${KUBE_PS1_PLATFORM}" == "oc" ]]; then
-    local KUBE_BINARY="oc"
-  fi
-
-  KUBE_PS1_CONTEXT="$(${KUBE_BINARY} config current-context)"
-  KUBE_PS1_NAMESPACE="$(${KUBE_BINARY} config view --minify --output 'jsonpath={..namespace}')"
-  # Set namespace to default if it is not defined
-  KUBE_PS1_NAMESPACE="${KUBE_PS1_NAMESPACE:-default}"
-
-}
-
-# source our symbol
-kube_ps1_label
-
-# Build our prompt
-kube_ps1 () {
-  local reset_color="%f"
-  local blue="%F{blue}"
-  local red="%F{red}"
-  local cyan="%F{cyan}"
-
-  KUBE_PS1="${reset_color}$KUBE_PS1_PREFIX"
-  KUBE_PS1+="${blue}$KUBE_PS1_DEFAULT_LABEL"
-  KUBE_PS1+="${reset_color}$KUBE_PS1_SEPERATOR"
-  KUBE_PS1+="${red}$KUBE_PS1_CONTEXT${reset_color}"
-  KUBE_PS1+="$KUBE_PS1_DIVIDER"
-  KUBE_PS1+="${cyan}$KUBE_PS1_NAMESPACE${reset_color}"
-  KUBE_PS1+="$KUBE_PS1_SUFFIX"
-
-  echo "${KUBE_PS1}"
-
-}
-- 
cgit v1.2.3-70-g09d2


From da8745eb9abe5565519218c1b732548de0b66b75 Mon Sep 17 00:00:00 2001
From: Roman Sedov <darragon-nn@yandex.ru>
Date: Tue, 3 Jul 2018 18:45:42 +0300
Subject: convenient vscode plugin for oh-my-zsh (#6903)

---
 plugins/vscode/README.md         | 38 ++++++++++++++++++++++++++++++++++++++
 plugins/vscode/vscode.plugin.zsh | 19 +++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 plugins/vscode/README.md
 create mode 100644 plugins/vscode/vscode.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/vscode/README.md b/plugins/vscode/README.md
new file mode 100644
index 000000000..ef1fdea30
--- /dev/null
+++ b/plugins/vscode/README.md
@@ -0,0 +1,38 @@
+# VS code
+
+This plugin makes interaction between the command line and the code editor easier.
+
+To start using it, add the `vscode` plugin to your `plugins` array in `~/.zshrc`:
+
+```zsh
+plugins=(... vscode)
+```
+
+## Common aliases
+
+| Alias                   | Command                        | Description                                                                                                 |
+| ----------------------- | ------------------------------ | ----------------------------------------------------------------------------------------------------------- |
+| vsc                     | code .                         | Open the current folder in VS code                                                                          |
+| vsca `dir`              | code --add `dir`               | Add folder(s) to the last active window                                                                     |
+| vscd `file` `file`      | code --diff `file` `file`      | Compare two files with each other.                                                                          |
+| vscg `file:line[:char]` | code --goto `file:line[:char]` | Open a file at the path on the specified line and character position.                                       |
+| vscn                    | code --new-window              | Force to open a new window.                                                                                 |
+| vscr                    | code --reuse-window            | Force to open a file or folder in the last active window.                                                   |
+| vscw                    | code --wait                    | Wait for the files to be closed before returning.                                                           |
+| vscu `dir`              | code --user-data-dir `dir`     | Specifies the directory that user data is kept in. Can be used to open multiple distinct instances of Code. |
+
+## Extensions aliases
+
+| Alias                   | Command                                                          | Description                       |
+| ----------------------- | ---------------------------------------------------------------- | --------------------------------- |
+| vsce `dir`              | code --extensions-dir `dir`                                      | Set the root path for extensions. |
+| vscie `id or vsix-path` | code --install-extension `extension-id> or <extension-vsix-path` | Installs an extension.            |
+| vscue `id or vsix-path` | code --uninstall-extension `id or vsix-path`                     | Uninstalls an extension.          |
+
+## Other options:
+
+| Alias        | Command                   | Description                                                                                                           |
+| ------------ | ------------------------- | --------------------------------------------------------------------------------------------------------------------- |
+| vscv         | code --verbose            | Print verbose output (implies --wait).                                                                                |
+| vscl `level` | code --log `level`        | Log level to use. Default is 'info'. Allowed values are 'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off'. |
+| vsced        | code --disable-extensions | Disable all installed extensions.                                                                                     |
diff --git a/plugins/vscode/vscode.plugin.zsh b/plugins/vscode/vscode.plugin.zsh
new file mode 100644
index 000000000..d0aad3b33
--- /dev/null
+++ b/plugins/vscode/vscode.plugin.zsh
@@ -0,0 +1,19 @@
+# VScode zsh plugin
+# author: https://github.com/MarsiBarsi
+
+alias vsc='code .'
+alias vsca='code --add'
+alias vscd='code --diff'
+alias vscg='code --goto'
+alias vscn='code --new-window'
+alias vscr='code --reuse-window'
+alias vscw='code --wait'
+alias vscu='code --user-data-dir'
+
+alias vsce='code --extensions-dir'
+alias vscie='code --install-extension'
+alias vscue='code --uninstall-extension'
+
+alias vscv='code --verbose'
+alias vscl='code --log'
+alias vsced='code --disable-extensions'
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From dd8cf513972e3a98db984e018485034e0a482cb4 Mon Sep 17 00:00:00 2001
From: Shawn Milochik <shawn@milochik.com>
Date: Tue, 3 Jul 2018 11:46:33 -0400
Subject: Spelling fix (#6963)

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

(limited to 'plugins')

diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index c4e30dacd..f91475b6c 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -10,7 +10,7 @@ if (( $+commands[kubectl] )); then
     unset __KUBECTL_COMPLETION_FILE
 fi
 
-# This command is used ALOT both below and in daily life
+# This command is used a LOT both below and in daily life
 alias k=kubectl
 
 # Apply a YML file
-- 
cgit v1.2.3-70-g09d2


From b0052c7958db673bcf9d7a14103599c11e2b0513 Mon Sep 17 00:00:00 2001
From: Matthieu PETIOT <matt@ardeidae.com>
Date: Wed, 4 Jul 2018 12:48:46 +0200
Subject: Add argument to set644 and set755 perms alias. (#6959)

This can avoid big mistakes as this I just made.
I thought I could give it an argument. So, now, it is possible.
---
 plugins/perms/README.md        | 6 +++---
 plugins/perms/perms.plugin.zsh | 8 ++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'plugins')

diff --git a/plugins/perms/README.md b/plugins/perms/README.md
index 873c21d42..324b3f3cc 100644
--- a/plugins/perms/README.md
+++ b/plugins/perms/README.md
@@ -4,6 +4,6 @@ Plugin to handle some unix filesystem permissions quickly
 
 ### Usage
 
-* `set755` recursively sets all directories located within the current working directory and sub directories to octal 755.
-* `set644` recursively sets all files located within the current working directory and sub directories to octal 644.
-* `fixperms` is a wrapper around `set755` and `set644` applied to a specified directory or the current directory otherwise. It also prompts prior to execution unlike the other two  aliases.
\ No newline at end of file
+* `set755` recursively sets all given directories (default to .) to octal 755.
+* `set644` recursively sets all given files (default to .) to octal 644.
+* `fixperms` is a wrapper around `set755` and `set644` applied to a specified directory or the current directory otherwise. It also prompts prior to execution unlike the other two  aliases.
diff --git a/plugins/perms/perms.plugin.zsh b/plugins/perms/perms.plugin.zsh
index 7cdebab7f..1a7472c1c 100644
--- a/plugins/perms/perms.plugin.zsh
+++ b/plugins/perms/perms.plugin.zsh
@@ -6,10 +6,14 @@
 ### Aliases
 
 # Set all files' permissions to 644 recursively in a directory
-alias set644='find . -type f ! -perm 644 -print0 | xargs -0 chmod 644'
+set644() {
+	find "${@:-.}" -type f ! -perm 644 -print0 | xargs -0 chmod 644
+}
 
 # Set all directories' permissions to 755 recursively in a directory
-alias set755='find . -type d ! -perm 755 -print0 | xargs -0 chmod 755'
+set755() {
+	find "${@:-.}" -type d ! -perm 755 -print0 | xargs -0 chmod 755
+}
 
 ### Functions
 
-- 
cgit v1.2.3-70-g09d2


From d232e6866c08a7b192d31c435ad2e00ccc48e03a Mon Sep 17 00:00:00 2001
From: Thomas Kriechbaumer <Kriechi@users.noreply.github.com>
Date: Mon, 9 Jul 2018 19:27:02 +0200
Subject: ufw: remove debug print (#6976)

---
 plugins/ufw/_ufw | 2 --
 1 file changed, 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/ufw/_ufw b/plugins/ufw/_ufw
index 08f871f35..f5ad03377 100644
--- a/plugins/ufw/_ufw
+++ b/plugins/ufw/_ufw
@@ -45,8 +45,6 @@ _arguments -C \
   '3:: :->subsubcmds' \
 && return 0
 
-echo "DEBUG: $(date)| $state | $line[1] | $line| $word[1]| $word| $CURRENT|" >> log.log
-
 local rules
 
 case "$state" in
-- 
cgit v1.2.3-70-g09d2


From be342b1bc8306cc24c2bb6145ceae78839a3008f Mon Sep 17 00:00:00 2001
From: Azat S <to@azat.io>
Date: Tue, 10 Jul 2018 14:41:20 +0300
Subject: Yarn upgrade-interactive (#5796)

* Add Yarn upgrade-ineractive CLI command

* Remove dots at the end of completions
---
 plugins/yarn/yarn.plugin.zsh | 42 ++++++++++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 16 deletions(-)

(limited to 'plugins')

diff --git a/plugins/yarn/yarn.plugin.zsh b/plugins/yarn/yarn.plugin.zsh
index 939820edb..eee811b16 100644
--- a/plugins/yarn/yarn.plugin.zsh
+++ b/plugins/yarn/yarn.plugin.zsh
@@ -28,24 +28,30 @@ _yarn ()
 
     _production=('(--production)--production[Do not install project devDependencies]')
 
+    _upgrade=(
+        '(--exact)--exact[Install exact version]'
+        '(--tilde)--tilde[Install most recent release with the same minor version]'
+     )
+
     _1st_arguments=(
       'help:Display help information about yarn' \
-      'init:Initialize for the development of a package.' \
-      'add:Add a package to use in your current package.' \
-      'install:Install all the dependencies listed within package.json in the local node_modules folder.' \
-      'publish:Publish a package to a package manager.' \
-      'remove:Remove a package that will no longer be used in your current package.' \
-      'cache:Clear the local cache. It will be populated again the next time yarn or yarn install is run.' \
-      'clean:Frees up space by removing unnecessary files and folders from dependencies.' \
-      'check:Verifies that versions of the package dependencies in the current project’s package.json matches that of yarn’s lock file.' \
-      'ls:List all installed packages.' \
-      'global:Makes binaries available to use on your operating system.' \
-      'info:<package> [<field>] - fetch information about a package and return it in a tree format.' \
-      'outdated:Checks for outdated package dependencies.' \
-      'run:Runs a defined package script.' \
-      'self-update:Updates Yarn to the latest version.' \
-      'upgrade:Upgrades packages to their latest version based on the specified range.' \
-      'why:<query> - Show information about why a package is installed.'
+      'init:Initialize for the development of a package' \
+      'add:Add a package to use in your current package' \
+      'install:Install all the dependencies listed within package.json in the local node_modules folder' \
+      'publish:Publish a package to a package manager' \
+      'remove:Remove a package that will no longer be used in your current package' \
+      'cache:Clear the local cache. It will be populated again the next time yarn or yarn install is run' \
+      'clean:Frees up space by removing unnecessary files and folders from dependencies' \
+      'check:Verifies that versions of the package dependencies in the current project’s package.json matches that of yarn’s lock file' \
+      'ls:List all installed packages' \
+      'global:Makes binaries available to use on your operating system' \
+      'info:<package> [<field>] - fetch information about a package and return it in a tree format' \
+      'outdated:Checks for outdated package dependencies' \
+      'run:Runs a defined package script' \
+      'self-update:Updates Yarn to the latest version' \
+      'upgrade:Upgrades packages to their latest version based on the specified range' \
+      'upgrade-interactive:Selectively upgrades specific packages in a simple way' \
+      'why:<query> - Show information about why a package is installed'
     )
     _arguments \
     '*:: :->subcmds' && return 0
@@ -78,6 +84,10 @@ _yarn ()
         _arguments \
         $_dopts
         ;;
+        upgrade-interactive)
+        _arguments \
+        $_upgrade
+        ;;
         *)
         _arguments \
         ;;
-- 
cgit v1.2.3-70-g09d2


From 7cb5fa8aea3d325fee08e3c1708abd12cdea1c1c Mon Sep 17 00:00:00 2001
From: Arthur <192247+arteezy@users.noreply.github.com>
Date: Wed, 11 Jul 2018 03:31:47 +0600
Subject: Fix dotenv plugin accepted file format and clarify README (#6093)

* Fix dotenv plugin accepted file format

* clarify README and add disclaimer section
---
 plugins/dotenv/README.md         | 19 +++++++++++++++----
 plugins/dotenv/dotenv.plugin.zsh |  8 +++++++-
 2 files changed, 22 insertions(+), 5 deletions(-)

(limited to 'plugins')

diff --git a/plugins/dotenv/README.md b/plugins/dotenv/README.md
index ade09fbb2..e0e75571f 100644
--- a/plugins/dotenv/README.md
+++ b/plugins/dotenv/README.md
@@ -2,19 +2,19 @@
 
 Automatically load your project ENV variables from `.env` file when you `cd` into project root directory.
 
-Storing configuration in the environment is one of the tenets of a [twelve-factor app](http://www.12factor.net). Anything that is likely to change between deployment environments–such as resource handles for databases or credentials for external services–should be extracted from the code into environment variables.
+Storing configuration in the environment is one of the tenets of a [twelve-factor app](http://www.12factor.net). Anything that is likely to change between deployment environments, such as resource handles for databases or credentials for external services, should be extracted from the code into environment variables.
 
 ## Installation
 
 Just add the plugin to your `.zshrc`:
 
 ```sh
-plugins=(git man dotenv)
+plugins=(... dotenv)
 ```
 
 ## Usage
 
-Create `.env` file inside your project directory and put your local ENV variables there.
+Create `.env` file inside your project root directory and put your ENV variables there.
 
 For example:
 ```sh
@@ -30,5 +30,16 @@ SECRET_KEY=7c6c72d959416d5aa368a409362ec6e2ac90d7f
 MONGO_URI=mongodb://127.0.0.1:27017
 PORT=3001
 ```
+You can even mix both formats, although it's probably a bad idea.
 
-**It's strongly recommended to add `.env` file to `.gitignore`**, because usually it contains sensitive information such as your credentials, secret keys, passwords etc. You don't want to commit this file, it supposed to be local only.
+## Version Control
+
+**It's strongly recommended to add `.env` file to `.gitignore`**, because usually it contains sensitive information such as your credentials, secret keys, passwords etc. You don't want to commit this file, it's supposed to be local only.
+
+## Disclaimer
+
+This plugin only sources the `.env` file. Nothing less, nothing more. It doesn't do any checks. It's designed to be the fastest and simplest option. You're responsible for the `.env` file content. You can put some code (or weird symbols) there, but do it on your own risk. `dotenv` is the basic tool, yet it does the job.
+
+If you need more advanced and feature-rich ENV management, check out these awesome projects:
+* [direnv](https://github.com/direnv/direnv)
+* [zsh-autoenv](https://github.com/Tarrasch/zsh-autoenv)
diff --git a/plugins/dotenv/dotenv.plugin.zsh b/plugins/dotenv/dotenv.plugin.zsh
index 9dd784229..fa47c4c68 100644
--- a/plugins/dotenv/dotenv.plugin.zsh
+++ b/plugins/dotenv/dotenv.plugin.zsh
@@ -2,7 +2,13 @@
 
 source_env() {
   if [[ -f .env ]]; then
-    source .env
+    if [[ -o a ]]; then
+      source .env
+    else
+      set -a
+      source .env
+      set +a
+    fi
   fi
 }
 
-- 
cgit v1.2.3-70-g09d2


From 1a657c6c4d44dbfcffb4c633a58e623f4d692706 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 10 Jul 2018 21:23:25 +0200
Subject: yarn: use zsh-completions completion (ff73f40)

Version: ff73f40 (2018-05-02)

Fixes #5859
Fixes #5878
Fixes #5983
Fixes #6013
---
 plugins/yarn/_yarn           | 345 +++++++++++++++++++++++++++++++++++++++++++
 plugins/yarn/yarn.plugin.zsh |  92 ------------
 2 files changed, 345 insertions(+), 92 deletions(-)
 create mode 100644 plugins/yarn/_yarn

(limited to 'plugins')

diff --git a/plugins/yarn/_yarn b/plugins/yarn/_yarn
new file mode 100644
index 000000000..382f58a0a
--- /dev/null
+++ b/plugins/yarn/_yarn
@@ -0,0 +1,345 @@
+#compdef yarn
+# ------------------------------------------------------------------------------
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#     * Redistributions of source code must retain the above copyright
+#       notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#     * Neither the name of the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL ZSH-USERS BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for yarn (https://yarnpkg.com/)
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
+#
+# ------------------------------------------------------------------------------
+
+_commands=(
+  'access'
+  'autoclean:Clean and remove unnecessary files from package dependencies'
+  'cache:List or clean every cached package'
+  "check:Verify package dependencies agains yarn's lock file"
+  'config:Manages the yarn configuration files'
+  'generate-lock-entry:Generates a lock file entry'
+  'global:Install packages globally on your operating system'
+  'help:Show information about a command'
+  'import:Generate yarn.lock from an existing npm-installed node_modules folder'
+  'info:Show information about a package'
+  'init:Interactively creates or updates a package.json file'
+  'install:Install all the dependencies listed within package.json'
+  'licenses:List licenses for installed packages'
+  'link:Symlink a package folder during development'
+  'list:List installed packages'
+  'login:Store registry username and email'
+  'logout:Clear registry username and email'
+  'outdated:Check for outdated package dependencies'
+  'owner:Manage package owners'
+  'pack:Create a compressed gzip archive of package dependencies'
+  'publish:Publish a package to the npm registry'
+  'run:Run a defined package script'
+  'tag:Add, remove, or list tags on a package'
+  'team:Maintain team memberships'
+  'unlink:Unlink a previously created symlink for a package'
+  'version:Update the package version'
+  'versions:Display version information of currently installed Yarn, Node.js, and its dependencies'
+  'why:Show information about why a package is installed'
+)
+
+_global_commands=(
+  'add:Installs a package and any packages that it depends on'
+  'bin:Displays the location of the yarn bin folder'
+  'remove:Remove installed package from dependencies updating package.json'
+  'upgrade:Upgrades packages to their latest version based on the specified range'
+  'upgrade-interactive'
+)
+
+_yarn_commands_scripts() {
+  local -a scripts
+  scripts=($(yarn run --json 2>/dev/null | sed -E '/Commands available|possibleCommands/!d;s/.*Commands available from binary scripts: ([^"]+)".*/\1/;s/.*"items":\[([^]]+).*/\1/;s/[" ]//g' | tr , '\n' | sed -e 's/:/\\:/g'))
+  _describe 'command or script' _commands -- _global_commands -- scripts
+}
+
+_yarn_scripts() {
+  local -a scripts
+  scripts=($(yarn run --json 2>/dev/null | sed -E '/Commands available|possibleCommands/!d;s/.*Commands available from binary scripts: ([^"]+)".*/\1/;s/.*"items":\[([^]]+).*/\1/;s/[" ]//g' | tr , '\n' | sed -e 's/:/\\:/g'))
+  _describe 'script' scripts
+}
+
+_yarn_global_commands() {
+  local -a cmds
+  cmds=('ls:List installed packages')
+  _describe 'command' _global_commands
+}
+
+_yarn_commands() {
+  _describe 'command' _commands -- _global_commands
+}
+
+_yarn() {
+  local context state state_descr line
+  typeset -A opt_args
+
+  _arguments \
+    '(-h --help)'{-h,--help}'[output usage information]' \
+    '(-V --version)'{-V,--version}'[output the version number]' \
+    '--verbose[output verbose messages on internal operations]' \
+    '--offline[trigger an error if any required dependencies are not available in local cache]' \
+    '--prefer-offline[use network only if dependencies are not available in local cache]' \
+    '--strict-semver' \
+    '--json' \
+    "--ignore-scripts[don't run lifecycle scripts]" \
+    '--har[save HAR output of network traffic]' \
+    '--ignore-platform[ignore platform checks]' \
+    '--ignore-engines[ignore engines check]' \
+    '--ignore-optional[ignore optional dependencies]' \
+    '--force[install and build packages even if they were built before, overwrite lockfile]' \
+    '--skip-integrity-check[run install without checking if node_modules is installed]' \
+    '--check-files[install will verify file tree of packages for consistency]' \
+    "--no-bin-links[don't generate bin links when setting up packages]" \
+    '--flat[only allow one version of a package]' \
+    '(--prod --production)'{--prod,--production} \
+    "--no-lockfile[don't read or generate a lockfile]" \
+    "--pure-lockfile[don't generate a lockfile]" \
+    "--frozen-lockfile[don't generate a lockfile and fail if an update is needed]" \
+    '--link-duplicates[create hardlinks to the repeated modules in node_modules]' \
+    '--global-folder=[modules folder]:folder:_files -/' \
+    '--modules-folder=[rather than installing modules into the node_modules folder relative to the cwd, output them here]:folder:_files -/' \
+    '--cache-folder=[specify a custom folder to store the yarn cache]:folder:_files -/' \
+    '--mutex=[use a mutex to ensure only one yarn instance is executing]:type[\:specifier]' \
+    '--no-emoji[disable emoji in output]' \
+    '(-s --silent)'{-s,--silent}'[skip Yarn console logs, other types of logs (script output) will be printed]' \
+    '--proxy=:host:_hosts' \
+    '--https-proxy=:host:_hosts' \
+    '--no-progress[disable progress bar]' \
+    '--network-concurrency=[maximum number of concurrent network requests]:number' \
+    '--network-timeout=[TCP timeout for network requests]:milliseconds' \
+    '--non-interactive[do not show interactive prompts]' \
+    '1: :_yarn_commands_scripts' \
+    '*:: :->command_args'
+
+
+  case $state in
+    command_args)
+      case $words[1] in
+        help)
+          _arguments \
+            '1: :_yarn_commands' \
+        ;;
+
+        access)
+          _arguments \
+            '1: :(public restricted grant revoke ls-packages ls-collaborators edit)'
+        ;;
+
+        add)
+          _arguments \
+            '(-D --dev)'{-D,--dev}'[install packages in devDependencies]' \
+            '(-P --peer)'{-P,--peer}'[install packages in peerDependencies]' \
+            '(-O --optional)'{-O,--optional}'[install packages in optionalDependencies]' \
+            '(-E --exact)'{-E,--exact}'[install packages as exact versions]' \
+            '(-T --tilde)'{-T,--tilde}'[install the most recent release of the packages that have the same minor version]' \
+            '*:package-name:'
+        ;;
+
+        cache)
+          _arguments \
+            '1: :(ls dir clean)'
+        ;;
+
+        check)
+          _arguments \
+            '--integrity' \
+            '--verify-tree'
+        ;;
+
+        config)
+          _arguments \
+            '1: :(set get delete list)' \
+            '*:: :->config_args'
+        ;;
+
+        global)
+          _arguments \
+            '--prefix=[bin prefix to use to install binaries]' \
+            '1: :_yarn_global_commands' \
+            '*:: :->command_args'
+        ;;
+
+        info)
+          _arguments \
+            '1:package:' \
+            '2:field'
+        ;;
+
+        init)
+          _arguments \
+            '(-y --yes)'{-y,--yes}'[install packages in devDependencies]'
+        ;;
+
+        licenses)
+          _arguments \
+            '1: :(ls generate-disclaimer)' \
+        ;;
+
+        link|unlink|outdated)
+          _arguments \
+            '1:package' \
+        ;;
+
+        list)
+          _arguments \
+            '--depth[Limit the depth of the shown dependencies]:depth'
+        ;;
+
+        owner)
+          _arguments \
+            '1: :(ls add rm)' \
+            '*:: :->owner_args'
+        ;;
+
+        pack)
+          _arguments \
+            '(-f --filename)'{-f,--filename}':filename:_files'
+        ;;
+
+        publish)
+          _arguments \
+            '--new-version:version:' \
+            '--message:message:' \
+            '--no-git-tag-version' \
+            '--access:access:' \
+            '--tag:tag:' \
+            '1: :_files'
+        ;;
+
+        remove|upgrade)
+          _arguments \
+            '*:package:'
+        ;;
+
+        run)
+          _arguments \
+            '1: :_yarn_scripts'
+        ;;
+
+        tag)
+          _arguments \
+            '1: :(ls add rm)' \
+            '*:: :->tag_args'
+        ;;
+
+        team)
+          _arguments \
+            '1: :(create destroy add rm ls)' \
+            '*:: :->team_args'
+        ;;
+
+        version)
+          _arguments \
+            '--new-version:version:' \
+            '--message:message:' \
+            '--no-git-tag-version'
+        ;;
+
+        why)
+          _arguments \
+            '1:query:_files'
+        ;;
+      esac
+    ;;
+  esac
+
+  case $state in
+    config_args)
+      case $words[1] in
+        get|delete)
+          _arguments \
+            '1:key:'
+        ;;
+
+        set)
+          _arguments \
+            '(-g --global)'{-g,--global} \
+            '1:key:' \
+            '2:value:'
+        ;;
+      esac
+    ;;
+
+    owner_args)
+      case $words[1] in
+        ls)
+          _arguments \
+            '1:package:'
+        ;;
+
+        add|rm)
+          _arguments \
+            '1:user:' \
+            '2:package:'
+        ;;
+      esac
+    ;;
+
+    tag_args)
+      case $words[1] in
+        ls)
+          _arguments \
+            '1:package'
+        ;;
+
+        add|rm)
+          _arguments \
+            '1:package:' \
+            '2:tag:'
+        ;;
+      esac
+    ;;
+
+    team_args)
+      case $words[1] in
+        create|destroy|ls)
+          _arguments \
+            '1:scope\:team:'
+        ;;
+
+        add|rm)
+          _arguments \
+            '1:scope\:team:' \
+            '2:user:'
+        ;;
+      esac
+    ;;
+  esac
+}
+
+_yarn "$@"
+
+# 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/yarn/yarn.plugin.zsh b/plugins/yarn/yarn.plugin.zsh
index eee811b16..7a9a7e4d4 100644
--- a/plugins/yarn/yarn.plugin.zsh
+++ b/plugins/yarn/yarn.plugin.zsh
@@ -1,98 +1,6 @@
-# Alias sorted alphabetically
-
 alias y="yarn "
 alias ya="yarn add"
 alias ycc="yarn cache clean"
 alias yh="yarn help"
 alias yout="yarn outdated"
 alias yui="yarn upgrade-interactive"
-
-_yarn ()
-{
-    local -a _1st_arguments _dopts _dev _production
-    local expl
-    typeset -A opt_args
-
-    _dopts=(
-        '(--force)--force[This refetches all packages, even ones that were previously installed.]'
-    )
-
-    _installopts=(
-        '(--flat)--flat[Only allow one version of a package. On the first run this will prompt you to choose a single version for each package that is depended on at multiple version ranges.]'
-        '(--har)--har[Outputs an HTTP archive from all the network requests performed during the installation.]'
-        '(--no-lockfile)--no-lockfile[Don’t read or generate a yarn.lock lockfile.]'
-        '(--pure-lockfile)--pure-lockfile[Don’t generate a yarn.lock lockfile.]'
-    )
-
-    _dev=('(--dev)--dev[Save installed packages into the project"s package.json devDependencies]')
-
-    _production=('(--production)--production[Do not install project devDependencies]')
-
-    _upgrade=(
-        '(--exact)--exact[Install exact version]'
-        '(--tilde)--tilde[Install most recent release with the same minor version]'
-     )
-
-    _1st_arguments=(
-      'help:Display help information about yarn' \
-      'init:Initialize for the development of a package' \
-      'add:Add a package to use in your current package' \
-      'install:Install all the dependencies listed within package.json in the local node_modules folder' \
-      'publish:Publish a package to a package manager' \
-      'remove:Remove a package that will no longer be used in your current package' \
-      'cache:Clear the local cache. It will be populated again the next time yarn or yarn install is run' \
-      'clean:Frees up space by removing unnecessary files and folders from dependencies' \
-      'check:Verifies that versions of the package dependencies in the current project’s package.json matches that of yarn’s lock file' \
-      'ls:List all installed packages' \
-      'global:Makes binaries available to use on your operating system' \
-      'info:<package> [<field>] - fetch information about a package and return it in a tree format' \
-      'outdated:Checks for outdated package dependencies' \
-      'run:Runs a defined package script' \
-      'self-update:Updates Yarn to the latest version' \
-      'upgrade:Upgrades packages to their latest version based on the specified range' \
-      'upgrade-interactive:Selectively upgrades specific packages in a simple way' \
-      'why:<query> - Show information about why a package is installed'
-    )
-    _arguments \
-    '*:: :->subcmds' && return 0
-
-    if (( CURRENT == 1 )); then
-        _describe -t commands "yarn subcommand" _1st_arguments
-        return
-    fi
-
-    case "$words[1]" in
-        add)
-        _arguments \
-        $_dopts \
-        $_dev \
-        $_production
-        ;;
-        install)
-        _arguments \
-        $_installopts \
-        $_dopts \
-        $_dev \
-        $_no_color \
-        $_production
-        ;;
-        update)
-        _arguments \
-        $_dopts
-        ;;
-        remove)
-        _arguments \
-        $_dopts
-        ;;
-        upgrade-interactive)
-        _arguments \
-        $_upgrade
-        ;;
-        *)
-        _arguments \
-        ;;
-    esac
-
-}
-
-compdef _yarn yarn
-- 
cgit v1.2.3-70-g09d2


From 344b13c4a5f4fb69817efe148c9ed63fa428c5f3 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Wed, 11 Jul 2018 21:21:01 +0200
Subject: yarn: add aliases for common commands

Fixes #5722
Fixes #5864
Fixes #5920
Fixes #6566
Fixes #6579
Fixes #6686
Fixes #6740
---
 plugins/yarn/yarn.plugin.zsh | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/yarn/yarn.plugin.zsh b/plugins/yarn/yarn.plugin.zsh
index 7a9a7e4d4..fe752357f 100644
--- a/plugins/yarn/yarn.plugin.zsh
+++ b/plugins/yarn/yarn.plugin.zsh
@@ -1,6 +1,18 @@
-alias y="yarn "
+alias y="yarn"
 alias ya="yarn add"
+alias yad="yarn add --dev"
+alias yap="yarn add --peer"
+alias yb="yarn build"
 alias ycc="yarn cache clean"
+alias ygu="yarn global upgrade"
 alias yh="yarn help"
+alias yin="yarn install"
+alias yls="yarn list"
 alias yout="yarn outdated"
+alias yrm="yarn remove"
+alias yrun="yarn run"
+alias yst="yarn start"
+alias yt="yarn test"
+alias yuc="yarn global upgrade && yarn cache clean"
 alias yui="yarn upgrade-interactive"
+alias yup="yarn upgrade"
-- 
cgit v1.2.3-70-g09d2


From 4c0b82b482be7fd36d5abceefe9901ea5ab3da9e Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Wed, 11 Jul 2018 21:40:24 +0200
Subject: yarn: add README

---
 plugins/yarn/README.md | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 plugins/yarn/README.md

(limited to 'plugins')

diff --git a/plugins/yarn/README.md b/plugins/yarn/README.md
new file mode 100644
index 000000000..c4e6d6da5
--- /dev/null
+++ b/plugins/yarn/README.md
@@ -0,0 +1,33 @@
+# Yarn plugin
+
+This plugin adds completion for the [Yarn package manager](https://yarnpkg.com/en/),
+as well as some aliases for common Yarn commands.
+
+To use it, add `yarn` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... yarn)
+```
+
+## Aliases
+
+| Alias | Command                                   | Description                                                 |
+|-------|-------------------------------------------|-------------------------------------------------------------|
+| y     | `yarn`                                    | The Yarn command                                            |
+| ya    | `yarn add`                                | Install a package in dependencies (`package.json`)          |
+| yad   | `yarn add --dev`                          | Install a package in devDependencies (`package.json`)       |
+| yap   | `yarn add --peer`                         | Install a package in peerDependencies (`package.json`)      |
+| yb    | `yarn build`                              | Run the build script defined in `package.json`              |
+| ycc   | `yarn cache clean`                        | Clean yarn's global cache of packages                       |
+| ygu   | `yarn global upgrade`                     | Upgrade packages installed globally to their latest version |
+| yh    | `yarn help`                               | Show help for a yarn command                                |
+| yin   | `yarn install`                            | Install dependencies defined in `package.json`              |
+| yls   | `yarn list`                               | List installed packages                                     |
+| yout  | `yarn outdated`                           | Check for outdated package dependencies                     |
+| yrm   | `yarn remove`                             | Remove installed packages                                   |
+| yrun  | `yarn run`                                | Run a defined package script                                |
+| yst   | `yarn start`                              | Run the start script defined in `package.json`              |
+| yt    | `yarn test`                               | Run the test script defined in `package.json`               |
+| yuc   | `yarn global upgrade && yarn cache clean` | Upgrade global packages and clean yarn's global cache       |
+| yui   | `yarn upgrade-interactive`                | Prompt for which outdated packages to upgrade               |
+| yup   | `yarn upgrade`                            | Upgrade packages to their latest version                    |
-- 
cgit v1.2.3-70-g09d2


From f88396e3271b2459e92dfef37ed773fd01c446b8 Mon Sep 17 00:00:00 2001
From: Arun Sathiya <arun@sathiya.me>
Date: Fri, 13 Jul 2018 02:38:22 +0530
Subject: wp-cli: fix README typo for wptu command (#6987)

---
 plugins/wp-cli/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/wp-cli/README.md b/plugins/wp-cli/README.md
index da398ed1a..4d8cad452 100644
--- a/plugins/wp-cli/README.md
+++ b/plugins/wp-cli/README.md
@@ -75,7 +75,7 @@ This plugin adds [tab completion](http://wp-cli.org/#complete) for `wp-cli` as w
 - wptp='wp theme path'
 - wpts='wp theme search'
 - wptst='wp theme status'
-- wptu='wp theme updatet'
+- wptu='wp theme update'
 
 ### User
 - wpuac='wp user add-cap'
-- 
cgit v1.2.3-70-g09d2


From d302e3eebeb5e3dd25811fae7035c2427739be91 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Wed, 18 Jul 2018 23:34:38 +0200
Subject: bundler: fix bundle version git error

It seems that `bundle version` calls git to know the commit sha, while `bundle --version` only shows the version of bundler.

Fixes #6988
---
 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 ea199d09a..b0b286af5 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -55,7 +55,7 @@ done
 
 bundle_install() {
   if _bundler-installed && _within-bundled-project; then
-    local bundler_version=`bundle version | cut -d' ' -f3`
+    local bundler_version=`bundle --version | cut -d' ' -f3`
     if [[ $bundler_version > '1.4.0' || $bundler_version = '1.4.0' ]]; then
       if [[ "$OSTYPE" = (darwin|freebsd)* ]]
       then
-- 
cgit v1.2.3-70-g09d2


From a3ab45db8b10a44329d7b715e2457fdd666c696e Mon Sep 17 00:00:00 2001
From: Jon Mosco <1970496+jonmosco@users.noreply.github.com>
Date: Thu, 19 Jul 2018 10:32:31 -0400
Subject: updating kube-ps1 to align with upstream changes (#6995)

---
 plugins/kube-ps1/README.md           |  49 ++++++++-------
 plugins/kube-ps1/kube-ps1.plugin.zsh | 112 +++++++++++++++++++++--------------
 2 files changed, 95 insertions(+), 66 deletions(-)

(limited to 'plugins')

diff --git a/plugins/kube-ps1/README.md b/plugins/kube-ps1/README.md
index a572773a3..fcb73cd2d 100644
--- a/plugins/kube-ps1/README.md
+++ b/plugins/kube-ps1/README.md
@@ -1,13 +1,12 @@
-Kubernetes prompt for zsh
-=========================
+# Kubernetes prompt for zsh
 
-A Kubernetes (k8s) zsh prompt that displays the current cluster cluster
+A Kubernetes zsh prompt that displays the current cluster cluster
 and the namespace.
 
 Inspired by several tools used to simplify usage of kubectl
 
-NOTE: If you are not using zsh, check out [kube-ps1](https://github.com/jonmosco/kube-ps1) designed for bash
-as well as zsh.
+NOTE: If you are not using zsh, check out [kube-ps1](https://github.com/jonmosco/kube-ps1)
+designed for bash as well as zsh.
 
 ## Requirements
 
@@ -32,28 +31,33 @@ fast switching between clusters and namespaces.
 The prompt layout is:
 
 ```
-(<logo>|<cluster>:<namespace>)
+(<symbol>|<cluster>:<namespace>)
 ```
 
-Supported platforms:
-* k8s - Kubernetes
-* ocp - OpenShift
+## Enabling
 
-## Install
+In order to use kube-ps1 with Oh My Zsh, you'll need to enable them in the
+.zshrc file. You'll find the zshrc file in your $HOME directory. Open it with
+your favorite text editor and you'll see a spot to list all the plugins you
+want to load.
 
-1. Clone this repository
-2. Source the kube-ps1.zsh in your ~./.zshrc
-
-ZSH:
+```shell
+vim $HOME/.zshrc
 ```
-source path/kube-ps1.sh
-PROMPT='$(kube_ps1) '
+
+Add kube-ps1 to the list of enabled plugins:
+
+```shell
+plugins=(
+  git
+  kube-ps1
+)
 ```
 
 ## Colors
 
-The colors are of my opinion. Blue was used as the prefix to match the Kubernetes
-color as closely as possible. Red was chosen as the cluster name to stand out, and cyan
+Blue was used as the prefix to match the Kubernetes color as closely as
+possible. Red was chosen as the cluster name to stand out, and cyan
 for the namespace.  These can of course be changed.
 
 ## Customization
@@ -62,14 +66,15 @@ The default settings can be overridden in ~/.zshrc
 
 | Variable | Default | Meaning |
 | :------- | :-----: | ------- |
-| `KUBE_PS1_DEFAULT` | `true` | Default settings for the prompt |
+| `KUBE_PS1_BINARY` | `kubectl` | Default Kubernetes binary |
 | `KUBE_PS1_PREFIX` | `(` | Prompt opening character  |
-| `KUBE_PS1_DEFAULT_LABEL` | `⎈ ` | Default prompt symbol |
+| `KUBE_PS1_SYMBOL_ENABLE` | `true ` | Display the prompt Symbol. If set to `false`, this will also disable `KUBE_PS1_SEPARATOR` |
+| `KUBE_PS1_SYMBOL_DEFAULT` | `⎈ ` | Default prompt symbol. Unicode `\u2388` |
+| `KUBE_PS1_SYMBOL_USE_IMG` | `false` | ☸️  ,  Unicode `\u2638` as the prompt symbol |
+| `KUBE_PS1_NS_ENABLE` | `true` | Display the namespace. If set to `false`, this will also disable `KUBE_PS1_DIVIDER` |
 | `KUBE_PS1_SEPERATOR` | `\|` | Separator between symbol and cluster name |
-| `KUBE_PS1_PLATFORM` | `kubectl` | Cluster type and binary to use |
 | `KUBE_PS1_DIVIDER` | `:` | Separator between cluster and namespace |
 | `KUBE_PS1_SUFFIX` | `)` | Prompt closing character |
-| `KUBE_PS1_DEFAULT_LABEL_IMG` | `false` | Use Kubernetes img as the label: ☸️  |
 
 ## Contributors
 
diff --git a/plugins/kube-ps1/kube-ps1.plugin.zsh b/plugins/kube-ps1/kube-ps1.plugin.zsh
index e1cb4339d..fadef80d7 100644
--- a/plugins/kube-ps1/kube-ps1.plugin.zsh
+++ b/plugins/kube-ps1/kube-ps1.plugin.zsh
@@ -1,9 +1,10 @@
 #!/bin/zsh
 
 # Kubernetes prompt helper for bash/zsh
+# ported to oh-my-zsh
 # Displays current context and namespace
 
-# Copyright 2017 Jon Mosco
+# Copyright 2018 Jon Mosco
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,32 +22,39 @@
 [[ -n $DEBUG ]] && set -x
 
 setopt PROMPT_SUBST
-add-zsh-hook precmd _kube_ps1_load
+autoload -U add-zsh-hook
+add-zsh-hook precmd _kube_ps1_update_cache
 zmodload zsh/stat
+zmodload zsh/datetime
 
 # Default values for the prompt
-# Override these values in ~/.zshrc or ~/.bashrc
-KUBE_PS1_DEFAULT="${KUBE_PS1_DEFAULT:=true}"
-KUBE_PS1_PREFIX="("
-KUBE_PS1_DEFAULT_LABEL="${KUBE_PS1_DEFAULT_LABEL:="⎈ "}"
-KUBE_PS1_DEFAULT_LABEL_IMG="${KUBE_PS1_DEFAULT_LABEL_IMG:=false}"
-KUBE_PS1_SEPERATOR="|"
-KUBE_PS1_PLATFORM="${KUBE_PS1_PLATFORM:="kubectl"}"
-KUBE_PS1_DIVIDER=":"
-KUBE_PS1_SUFFIX=")"
-KUBE_PS1_UNAME=$(uname)
+# Override these values in ~/.zshrc
+KUBE_PS1_BINARY="${KUBE_PS1_BINARY:-kubectl}"
+KUBE_PS1_SYMBOL_ENABLE="${KUBE_PS1_SYMBOL_ENABLE:-true}"
+KUBE_PS1_SYMBOL_DEFAULT="${KUBE_PS1_SYMBOL_DEFAULT:-\u2388 }"
+KUBE_PS1_SYMBOL_USE_IMG="${KUBE_PS1_SYMBOL_USE_IMG:-false}"
+KUBE_PS1_NS_ENABLE="${KUBE_PS1_NS_ENABLE:-true}"
+KUBE_PS1_SEPARATOR="${KUBE_PS1_SEPARATOR-|}"
+KUBE_PS1_DIVIDER="${KUBE_PS1_DIVIDER-:}"
+KUBE_PS1_PREFIX="${KUBE_PS1_PREFIX-(}"
+KUBE_PS1_SUFFIX="${KUBE_PS1_SUFFIX-)}"
 KUBE_PS1_LAST_TIME=0
 
-kube_ps1_label () {
+_kube_ps1_binary_check() {
+  command -v "$1" >/dev/null
+}
 
-  [[ "${KUBE_PS1_DEFAULT_LABEL_IMG}" == false ]] && return
+_kube_ps1_symbol() {
+  [[ "${KUBE_PS1_SYMBOL_ENABLE}" == false ]] && return
 
-  if [[ "${KUBE_PS1_DEFAULT_LABEL_IMG}" == true ]]; then
-    local KUBE_LABEL="☸️ "
-  fi
+  KUBE_PS1_SYMBOL="${KUBE_PS1_SYMBOL_DEFAULT}"
+  KUBE_PS1_SYMBOL_IMG="\u2638 "
 
-  KUBE_PS1_DEFAULT_LABEL="${KUBE_LABEL}"
+  if [[ "${KUBE_PS1_SYMBOL_USE_IMG}" == true ]]; then
+    KUBE_PS1_SYMBOL="${KUBE_PS1_SYMBOL_IMG}"
+  fi
 
+  echo "${KUBE_PS1_SYMBOL}"
 }
 
 _kube_ps1_split() {
@@ -56,23 +64,45 @@ _kube_ps1_split() {
 }
 
 _kube_ps1_file_newer_than() {
-
   local mtime
   local file=$1
   local check_time=$2
-  mtime=$(stat +mtime "${file}")
 
-  [ "${mtime}" -gt "${check_time}" ]
+  zmodload -e "zsh/stat"
+  if [[ "$?" -eq 0 ]]; then
+    mtime=$(stat +mtime "${file}")
+  elif stat -c "%s" /dev/null &> /dev/null; then
+    # GNU stat
+    mtime=$(stat -c %Y "${file}")
+  else
+    # BSD stat
+    mtime=$(stat -f %m "$file")
+  fi
 
+  [[ "${mtime}" -gt "${check_time}" ]]
 }
 
-_kube_ps1_load() {
-  # kubectl will read the environment variable $KUBECONFIG
-  # otherwise set it to ~/.kube/config
+_kube_ps1_update_cache() {
   KUBECONFIG="${KUBECONFIG:=$HOME/.kube/config}"
+  if ! _kube_ps1_binary_check "${KUBE_PS1_BINARY}"; then
+    # No ability to fetch context/namespace; display N/A.
+    KUBE_PS1_CONTEXT="BINARY-N/A"
+    KUBE_PS1_NAMESPACE="N/A"
+    return
+  fi
 
-  for conf in $(_kube_ps1_split : "${KUBECONFIG}"); do
-    # TODO: check existence of $conf
+  if [[ "${KUBECONFIG}" != "${KUBE_PS1_KUBECONFIG_CACHE}" ]]; then
+    # User changed KUBECONFIG; unconditionally refetch.
+    KUBE_PS1_KUBECONFIG_CACHE=${KUBECONFIG}
+    _kube_ps1_get_context_ns
+    return
+  fi
+
+  # kubectl will read the environment variable $KUBECONFIG
+  # otherwise set it to ~/.kube/config
+  local conf
+  for conf in $(_kube_ps1_split : "${KUBECONFIG:-${HOME}/.kube/config}"); do
+    [[ -r "${conf}" ]] || continue
     if _kube_ps1_file_newer_than "${conf}" "${KUBE_PS1_LAST_TIME}"; then
       _kube_ps1_get_context_ns
       return
@@ -83,26 +113,20 @@ _kube_ps1_load() {
 _kube_ps1_get_context_ns() {
 
   # Set the command time
-  KUBE_PS1_LAST_TIME=$(date +%s)
-
-  if [[ "${KUBE_PS1_DEFAULT}" == true ]]; then
-    local KUBE_BINARY="${KUBE_PS1_PLATFORM}"
-  elif [[ "${KUBE_PS1_DEFAULT}" == false ]] && [[ "${KUBE_PS1_PLATFORM}" == "kubectl" ]];then
-    local KUBE_BINARY="kubectl"
-  elif [[ "${KUBE_PS1_PLATFORM}" == "oc" ]]; then
-    local KUBE_BINARY="oc"
+  KUBE_PS1_LAST_TIME=$EPOCHSECONDS
+
+  KUBE_PS1_CONTEXT="$(${KUBE_PS1_BINARY} config current-context 2>/dev/null)"
+  if [[ -z "${KUBE_PS1_CONTEXT}" ]]; then
+    KUBE_PS1_CONTEXT="N/A"
+    KUBE_PS1_NAMESPACE="N/A"
+    return
+  elif [[ "${KUBE_PS1_NS_ENABLE}" == true ]]; then
+    KUBE_PS1_NAMESPACE="$(${KUBE_PS1_BINARY} config view --minify --output 'jsonpath={..namespace}' 2>/dev/null)"
+    # Set namespace to 'default' if it is not defined
+    KUBE_PS1_NAMESPACE="${KUBE_PS1_NAMESPACE:-default}"
   fi
-
-  KUBE_PS1_CONTEXT="$(${KUBE_BINARY} config current-context)"
-  KUBE_PS1_NAMESPACE="$(${KUBE_BINARY} config view --minify --output 'jsonpath={..namespace}')"
-  # Set namespace to default if it is not defined
-  KUBE_PS1_NAMESPACE="${KUBE_PS1_NAMESPACE:-default}"
-
 }
 
-# source our symbol
-kube_ps1_label
-
 # Build our prompt
 kube_ps1 () {
   local reset_color="%f"
@@ -111,7 +135,7 @@ kube_ps1 () {
   local cyan="%F{cyan}"
 
   KUBE_PS1="${reset_color}$KUBE_PS1_PREFIX"
-  KUBE_PS1+="${blue}$KUBE_PS1_DEFAULT_LABEL"
+  KUBE_PS1+="${blue}$(_kube_ps1_symbol)"
   KUBE_PS1+="${reset_color}$KUBE_PS1_SEPERATOR"
   KUBE_PS1+="${red}$KUBE_PS1_CONTEXT${reset_color}"
   KUBE_PS1+="$KUBE_PS1_DIVIDER"
-- 
cgit v1.2.3-70-g09d2


From 626b30b2a3d99a03058fea167281163d8d96d6f9 Mon Sep 17 00:00:00 2001
From: Johan Kaving <johan@kaving.se>
Date: Thu, 19 Jul 2018 16:53:19 +0200
Subject: Update git-flow-avh to 0.6.0 (#6498)

This updates the git-flow-avh plugin to the latest version
from https://github.com/petervanderdoes/git-flow-completion
(0.6.0 at the time of this commit).

This mainly adds support for the "git flow bugfix" command.

This PR replaces #4626 as well as #4705, both of which adds support for the bugfix command but doesn't use the official version from https://github.com/petervanderdoes/git-flow-completion

Fixes #4705
Fixes #4626
Fixes #5903
---
 plugins/git-flow-avh/git-flow-avh.plugin.zsh | 819 ++++++++++++++++-----------
 1 file changed, 474 insertions(+), 345 deletions(-)
 mode change 100644 => 100755 plugins/git-flow-avh/git-flow-avh.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/git-flow-avh/git-flow-avh.plugin.zsh b/plugins/git-flow-avh/git-flow-avh.plugin.zsh
old mode 100644
new mode 100755
index ba98fff01..1f3fa1e28
--- a/plugins/git-flow-avh/git-flow-avh.plugin.zsh
+++ b/plugins/git-flow-avh/git-flow-avh.plugin.zsh
@@ -22,398 +22,527 @@
 
 _git-flow ()
 {
-	local curcontext="$curcontext" state line
-	typeset -A opt_args
-
-	_arguments -C \
-		':command:->command' \
-		'*::options:->options'
-
-	case $state in
-		(command)
-
-			local -a subcommands
-			subcommands=(
-				'init:Initialize a new git repo with support for the branching model.'
-				'feature:Manage your feature branches.'
-				'config:Manage your configuration.'
-				'release:Manage your release branches.'
-				'hotfix:Manage your hotfix branches.'
-				'support:Manage your support branches.'
-				'version:Shows version information.'
-				'finish:Finish the branch you are currently on.'
-				'delete:Delete the branch you are currently on.'
-				'publish:Publish the branch you are currently on.'
-			)
-			_describe -t commands 'git flow' subcommands
-		;;
-
-		(options)
-			case $line[1] in
-
-				(init)
-					_arguments \
-						-f'[Force setting of gitflow branches, even if already configured]'
-					;;
-
-					(version)
-					;;
-
-					(hotfix)
-						__git-flow-hotfix
-					;;
-
-					(release)
-						__git-flow-release
-					;;
-
-					(feature)
-						__git-flow-feature
-					;;
-					(config)
-					__git-flow-config
-					;;
-
-			esac
-		;;
-	esac
+    local curcontext="$curcontext" state line
+    typeset -A opt_args
+
+    _arguments -C \
+        ':command:->command' \
+        '*::options:->options'
+
+    case $state in
+        (command)
+
+            local -a subcommands
+            subcommands=(
+                'init:Initialize a new git repo with support for the branching model.'
+                'feature:Manage your feature branches.'
+                'bugfix:Manage your bugfix branches.'
+                'config:Manage your configuration.'
+                'release:Manage your release branches.'
+                'hotfix:Manage your hotfix branches.'
+                'support:Manage your support branches.'
+                'version:Shows version information.'
+                'finish:Finish the branch you are currently on.'
+                'delete:Delete the branch you are currently on.'
+                'publish:Publish the branch you are currently on.'
+                'rebase:Rebase the branch you are currently on.'
+            )
+            _describe -t commands 'git flow' subcommands
+        ;;
+
+        (options)
+            case $line[1] in
+
+                (init)
+                    _arguments \
+                        -f'[Force setting of gitflow branches, even if already configured]'
+                    ;;
+
+                    (version)
+                    ;;
+
+                    (hotfix)
+                        __git-flow-hotfix
+                    ;;
+
+                    (release)
+                        __git-flow-release
+                    ;;
+
+                    (feature)
+                        __git-flow-feature
+                    ;;
+                    (bugfix)
+                        __git-flow-bugfix
+                    ;;
+
+                    (config)
+                    __git-flow-config
+                    ;;
+
+            esac
+        ;;
+    esac
 }
 
 __git-flow-release ()
 {
-	local curcontext="$curcontext" state line
-	typeset -A opt_args
-
-	_arguments -C \
-		':command:->command' \
-		'*::options:->options'
-
-	case $state in
-		(command)
-
-			local -a subcommands
-			subcommands=(
-				'start:Start a new release branch.'
-				'finish:Finish a release branch.'
-				'list:List all your release branches. (Alias to `git flow release`)'
-				'publish:Publish release branch to remote.'
-				'track:Checkout remote release branch.'
-				'delete:Delete a release branch.'
-			)
-			_describe -t commands 'git flow release' subcommands
-			_arguments \
-				-v'[Verbose (more) output]'
-		;;
-
-		(options)
-			case $line[1] in
-
-				(start)
-					_arguments \
-						-F'[Fetch from origin before performing finish]'\
-						':version:__git_flow_version_list'
-				;;
-
-				(finish)
-					_arguments \
-						-F'[Fetch from origin before performing finish]' \
-						-s'[Sign the release tag cryptographically]'\
-						-u'[Use the given GPG-key for the digital signature (implies -s)]'\
-						-m'[Use the given tag message]'\
-						-p'[Push to $ORIGIN after performing finish]'\
-						':version:__git_flow_version_list'
-				;;
-
-				(delete)
-					_arguments \
-						-f'[Force deletion]' \
-						-r'[Delete remote branch]' \
-						':version:__git_flow_version_list'
-				;;
-
-				(publish)
-					_arguments \
-						':version:__git_flow_version_list'
-				;;
-
-				(track)
-					_arguments \
-						':version:__git_flow_version_list'
-				;;
-
-				*)
-					_arguments \
-						-v'[Verbose (more) output]'
-				;;
-			esac
-		;;
-	esac
+    local curcontext="$curcontext" state line
+    typeset -A opt_args
+
+    _arguments -C \
+        ':command:->command' \
+        '*::options:->options'
+
+    case $state in
+        (command)
+
+            local -a subcommands
+            subcommands=(
+                'start:Start a new release branch.'
+                'finish:Finish a release branch.'
+                'list:List all your release branches. (Alias to `git flow release`)'
+                'publish:Publish release branch to remote.'
+                'track:Checkout remote release branch.'
+                'rebase:Rebase from integration branch.'
+                'delete:Delete a release branch.'
+            )
+            _describe -t commands 'git flow release' subcommands
+            _arguments \
+                -v'[Verbose (more) output]'
+        ;;
+
+        (options)
+            case $line[1] in
+
+                (start)
+                    _arguments \
+                        -F'[Fetch from origin before performing finish]'\
+                        ':version:__git_flow_version_list'
+                ;;
+
+                (finish)
+                    _arguments \
+                        -F'[Fetch from origin before performing finish]' \
+                        -s'[Sign the release tag cryptographically]'\
+                        -u'[Use the given GPG-key for the digital signature (implies -s)]'\
+                        -m'[Use the given tag message]'\
+                        -p'[Push to $ORIGIN after performing finish]'\
+                        ':version:__git_flow_version_list'
+                ;;
+
+                (delete)
+                    _arguments \
+                        -f'[Force deletion]' \
+                        -r'[Delete remote branch]' \
+                        ':version:__git_flow_version_list'
+                ;;
+
+                (publish)
+                    _arguments \
+                        ':version:__git_flow_version_list'
+                ;;
+
+                (track)
+                    _arguments \
+                        ':version:__git_flow_version_list'
+                ;;
+
+                (rebase)
+                    _arguments \
+                        -i'[Do an interactive rebase]' \
+                        ':branch:__git_branch_names'
+                ;;
+
+                *)
+                    _arguments \
+                        -v'[Verbose (more) output]'
+                ;;
+            esac
+        ;;
+    esac
 }
 
 __git-flow-hotfix ()
 {
-	local curcontext="$curcontext" state line
-	typeset -A opt_args
-
-	_arguments -C \
-		':command:->command' \
-		'*::options:->options'
-
-	case $state in
-		(command)
-
-			local -a subcommands
-			subcommands=(
-				'start:Start a new hotfix branch.'
-				'finish:Finish a hotfix branch.'
-				'delete:Delete a hotfix branch.'
-				'list:List all your hotfix branches. (Alias to `git flow hotfix`)'
-			)
-			_describe -t commands 'git flow hotfix' subcommands
-			_arguments \
-				-v'[Verbose (more) output]'
-		;;
-
-		(options)
-			case $line[1] in
-
-				(start)
-					_arguments \
-						-F'[Fetch from origin before performing finish]'\
-						':hotfix:__git_flow_version_list'\
-						':branch-name:__git_branch_names'
-				;;
-
-				(finish)
-					_arguments \
-						-F'[Fetch from origin before performing finish]' \
-						-s'[Sign the release tag cryptographically]'\
-						-u'[Use the given GPG-key for the digital signature (implies -s)]'\
-						-m'[Use the given tag message]'\
-						-p'[Push to $ORIGIN after performing finish]'\
-						':hotfix:__git_flow_hotfix_list'
-				;;
-
-				(delete)
-					_arguments \
-						-f'[Force deletion]' \
-						-r'[Delete remote branch]' \
-						':hotfix:__git_flow_hotfix_list'
-				;;
-
-				*)
-					_arguments \
-						-v'[Verbose (more) output]'
-				;;
-			esac
-		;;
-	esac
+    local curcontext="$curcontext" state line
+    typeset -A opt_args
+
+    _arguments -C \
+        ':command:->command' \
+        '*::options:->options'
+
+    case $state in
+        (command)
+
+            local -a subcommands
+            subcommands=(
+                'start:Start a new hotfix branch.'
+                'finish:Finish a hotfix branch.'
+                'delete:Delete a hotfix branch.'
+                'rebase:Rebase from integration branch.'
+                'list:List all your hotfix branches. (Alias to `git flow hotfix`)'
+                'rename:Rename a hotfix branch.'
+            )
+            _describe -t commands 'git flow hotfix' subcommands
+            _arguments \
+                -v'[Verbose (more) output]'
+        ;;
+
+        (options)
+            case $line[1] in
+
+                (start)
+                    _arguments \
+                        -F'[Fetch from origin before performing finish]'\
+                        ':hotfix:__git_flow_version_list'\
+                        ':branch-name:__git_branch_names'
+                ;;
+
+                (finish)
+                    _arguments \
+                        -F'[Fetch from origin before performing finish]' \
+                        -s'[Sign the release tag cryptographically]'\
+                        -u'[Use the given GPG-key for the digital signature (implies -s)]'\
+                        -m'[Use the given tag message]'\
+                        -p'[Push to $ORIGIN after performing finish]'\
+                        ':hotfix:__git_flow_hotfix_list'
+                ;;
+
+                (delete)
+                    _arguments \
+                        -f'[Force deletion]' \
+                        -r'[Delete remote branch]' \
+                        ':hotfix:__git_flow_hotfix_list'
+                ;;
+
+                (rebase)
+                    _arguments \
+                        -i'[Do an interactive rebase]' \
+                        ':branch:__git_branch_names'
+                ;;
+
+                *)
+                    _arguments \
+                        -v'[Verbose (more) output]'
+                ;;
+            esac
+        ;;
+    esac
 }
 
 __git-flow-feature ()
 {
-	local curcontext="$curcontext" state line
-	typeset -A opt_args
-
-	_arguments -C \
-		':command:->command' \
-		'*::options:->options'
-
-	case $state in
-		(command)
-
-			local -a subcommands
-			subcommands=(
-				'start:Start a new feature branch.'
-				'finish:Finish a feature branch.'
-				'delete:Delete a feature branch.'
-				'list:List all your feature branches. (Alias to `git flow feature`)'
-				'publish:Publish feature branch to remote.'
-				'track:Checkout remote feature branch.'
-				'diff:Show all changes.'
-				'rebase:Rebase from integration branch.'
-				'checkout:Checkout local feature branch.'
-				'pull:Pull changes from remote.'
-			)
-			_describe -t commands 'git flow feature' subcommands
-			_arguments \
-				-v'[Verbose (more) output]'
-		;;
-
-		(options)
-			case $line[1] in
-
-				(start)
-					_arguments \
-						-F'[Fetch from origin before performing finish]'\
-						':feature:__git_flow_feature_list'\
-						':branch-name:__git_branch_names'
-				;;
-
-				(finish)
-					_arguments \
-						-F'[Fetch from origin before performing finish]' \
-						-r'[Rebase instead of merge]'\
-						':feature:__git_flow_feature_list'
-				;;
-
-				(delete)
-					_arguments \
-						-f'[Force deletion]' \
-						-r'[Delete remote branch]' \
-						':feature:__git_flow_feature_list'
-				;;
-
-				(publish)
-					_arguments \
-						':feature:__git_flow_feature_list'\
-				;;
-
-				(track)
-					_arguments \
-						':feature:__git_flow_feature_list'\
-				;;
-
-				(diff)
-					_arguments \
-						':branch:__git_branch_names'\
-				;;
-
-				(rebase)
-					_arguments \
-						-i'[Do an interactive rebase]' \
-						':branch:__git_branch_names'
-				;;
-
-				(checkout)
-					_arguments \
-						':branch:__git_flow_feature_list'\
-				;;
-
-				(pull)
-					_arguments \
-						':remote:__git_remotes'\
-						':branch:__git_branch_names'
-				;;
-
-				*)
-					_arguments \
-						-v'[Verbose (more) output]'
-				;;
-			esac
-		;;
-	esac
+    local curcontext="$curcontext" state line
+    typeset -A opt_args
+
+    _arguments -C \
+        ':command:->command' \
+        '*::options:->options'
+
+    case $state in
+        (command)
+
+            local -a subcommands
+            subcommands=(
+                'start:Start a new feature branch.'
+                'finish:Finish a feature branch.'
+                'delete:Delete a feature branch.'
+                'list:List all your feature branches. (Alias to `git flow feature`)'
+                'publish:Publish feature branch to remote.'
+                'track:Checkout remote feature branch.'
+                'diff:Show all changes.'
+                'rebase:Rebase from integration branch.'
+                'checkout:Checkout local feature branch.'
+                'pull:Pull changes from remote.'
+                'rename:Rename a feature branch.'
+            )
+            _describe -t commands 'git flow feature' subcommands
+            _arguments \
+                -v'[Verbose (more) output]'
+        ;;
+
+        (options)
+            case $line[1] in
+
+                (start)
+                    _arguments \
+                        -F'[Fetch from origin before performing finish]'\
+                        ':feature:__git_flow_feature_list'\
+                        ':branch-name:__git_branch_names'
+                ;;
+
+                (finish)
+                    _arguments \
+                        -F'[Fetch from origin before performing finish]' \
+                        -r'[Rebase instead of merge]'\
+                        ':feature:__git_flow_feature_list'
+                ;;
+
+                (delete)
+                    _arguments \
+                        -f'[Force deletion]' \
+                        -r'[Delete remote branch]' \
+                        ':feature:__git_flow_feature_list'
+                ;;
+
+                (publish)
+                    _arguments \
+                        ':feature:__git_flow_feature_list'\
+                ;;
+
+                (track)
+                    _arguments \
+                        ':feature:__git_flow_feature_list'\
+                ;;
+
+                (diff)
+                    _arguments \
+                        ':branch:__git_branch_names'\
+                ;;
+
+                (rebase)
+                    _arguments \
+                        -i'[Do an interactive rebase]' \
+                        ':branch:__git_branch_names'
+                ;;
+
+                (checkout)
+                    _arguments \
+                        ':branch:__git_flow_feature_list'\
+                ;;
+
+                (pull)
+                    _arguments \
+                        ':remote:__git_remotes'\
+                        ':branch:__git_branch_names'
+                ;;
+
+                *)
+                    _arguments \
+                        -v'[Verbose (more) output]'
+                ;;
+            esac
+        ;;
+    esac
+}
+
+__git-flow-bugfix ()
+{
+    local curcontext="$curcontext" state line
+    typeset -A opt_args
+
+    _arguments -C \
+        ':command:->command' \
+        '*::options:->options'
+
+    case $state in
+        (command)
+
+            local -a subcommands
+            subcommands=(
+                'start:Start a new bugfix branch.'
+                'finish:Finish a bugfix branch.'
+                'delete:Delete a bugfix branch.'
+                'list:List all your bugfix branches. (Alias to `git flow bugfix`)'
+                'publish:Publish bugfix branch to remote.'
+                'track:Checkout remote bugfix branch.'
+                'diff:Show all changes.'
+                'rebase:Rebase from integration branch.'
+                'checkout:Checkout local bugfix branch.'
+                'pull:Pull changes from remote.'
+                'rename:Rename a bugfix branch.'
+            )
+            _describe -t commands 'git flow bugfix' subcommands
+            _arguments \
+                -v'[Verbose (more) output]'
+        ;;
+
+        (options)
+            case $line[1] in
+
+                (start)
+                    _arguments \
+                        -F'[Fetch from origin before performing finish]'\
+                        ':bugfix:__git_flow_bugfix_list'\
+                        ':branch-name:__git_branch_names'
+                ;;
+
+                (finish)
+                    _arguments \
+                        -F'[Fetch from origin before performing finish]' \
+                        -r'[Rebase instead of merge]'\
+                        ':bugfix:__git_flow_bugfix_list'
+                ;;
+
+                (delete)
+                    _arguments \
+                        -f'[Force deletion]' \
+                        -r'[Delete remote branch]' \
+                        ':bugfix:__git_flow_bugfix_list'
+                ;;
+
+                (publish)
+                    _arguments \
+                        ':bugfix:__git_flow_bugfix_list'\
+                ;;
+
+                (track)
+                    _arguments \
+                        ':bugfix:__git_flow_bugfix_list'\
+                ;;
+
+                (diff)
+                    _arguments \
+                        ':branch:__git_branch_names'\
+                ;;
+
+                (rebase)
+                    _arguments \
+                        -i'[Do an interactive rebase]' \
+                        ':branch:__git_branch_names'
+                ;;
+
+                (checkout)
+                    _arguments \
+                        ':branch:__git_flow_bugfix_list'\
+                ;;
+
+                (pull)
+                    _arguments \
+                        ':remote:__git_remotes'\
+                        ':branch:__git_branch_names'
+                ;;
+
+                *)
+                    _arguments \
+                        -v'[Verbose (more) output]'
+                ;;
+            esac
+        ;;
+    esac
 }
 
 __git-flow-config ()
 {
-	local curcontext="$curcontext" state line
-	typeset -A opt_args
-
-	_arguments -C \
-		':command:->command' \
-		'*::options:->options'
-
-	case $state in
-		(command)
-
-			local -a subcommands
-			subcommands=(
-				'list:List the configuration. (Alias to `git flow config`)'
-				'set:Set the configuration option'
-			)
-			_describe -t commands 'git flow config' subcommands
-		;;
-
-		(options)
-			case $line[1] in
-
-				(set)
-					_arguments \
-						--local'[Use repository config file]' \
-						--global'[Use global config file]'\
-						--system'[Use system config file]'\
-						--file'[Use given config file]'\
-						':option:(master develop feature hotfix release support	versiontagprefix)'
-				;;
-
-				*)
-					_arguments \
-						--local'[Use repository config file]' \
-						--global'[Use global config file]'\
-						--system'[Use system config file]'\
-						--file'[Use given config file]'
-				;;
-			esac
-		;;
-	esac
+    local curcontext="$curcontext" state line
+    typeset -A opt_args
+
+    _arguments -C \
+        ':command:->command' \
+        '*::options:->options'
+
+    case $state in
+        (command)
+
+            local -a subcommands
+            subcommands=(
+                'list:List the configuration. (Alias to `git flow config`)'
+                'set:Set the configuration option'
+            )
+            _describe -t commands 'git flow config' subcommands
+        ;;
+
+        (options)
+            case $line[1] in
+
+                (set)
+                    _arguments \
+                        --local'[Use repository config file]' \
+                        --global'[Use global config file]'\
+                        --system'[Use system config file]'\
+                        --file'[Use given config file]'\
+                        ':option:(master develop feature hotfix release support versiontagprefix)'
+                ;;
+
+                *)
+                    _arguments \
+                        --local'[Use repository config file]' \
+                        --global'[Use global config file]'\
+                        --system'[Use system config file]'\
+                        --file'[Use given config file]'
+                ;;
+            esac
+        ;;
+    esac
 }
 __git_flow_version_list ()
 {
-	local expl
-	declare -a versions
+    local expl
+    declare -a versions
 
-	versions=(${${(f)"$(_call_program versions git flow release list 2> /dev/null | tr -d ' |*')"}})
-	__git_command_successful || return
+    versions=(${${(f)"$(_call_program versions git flow release list 2> /dev/null | tr -d ' |*')"}})
+    __git_command_successful || return
 
-	_wanted versions expl 'version' compadd $versions
+    _wanted versions expl 'version' compadd $versions
 }
 
 __git_flow_feature_list ()
 {
-	local expl
-	declare -a features
+    local expl
+    declare -a features
+
+    features=(${${(f)"$(_call_program features git flow feature list 2> /dev/null | tr -d ' |*')"}})
+    __git_command_successful || return
+
+    _wanted features expl 'feature' compadd $features
+}
+
+__git_flow_bugfix_list ()
+{
+    local expl
+    declare -a bugfixes
 
-	features=(${${(f)"$(_call_program features git flow feature list 2> /dev/null | tr -d ' |*')"}})
-	__git_command_successful || return
+    bugfixes=(${${(f)"$(_call_program bugfixes git flow bugfix list 2> /dev/null | tr -d ' |*')"}})
+    __git_command_successful || return
 
-	_wanted features expl 'feature' compadd $features
+    _wanted bugfixes expl 'bugfix' compadd $bugfixes
 }
 
 __git_remotes () {
-	local expl gitdir remotes
+    local expl gitdir remotes
 
-	gitdir=$(_call_program gitdir git rev-parse --git-dir 2>/dev/null)
-	__git_command_successful || return
+    gitdir=$(_call_program gitdir git rev-parse --git-dir 2>/dev/null)
+    __git_command_successful || return
 
-	remotes=(${${(f)"$(_call_program remotes git config --get-regexp '"^remote\..*\.url$"')"}//#(#b)remote.(*).url */$match[1]})
-	__git_command_successful || return
+    remotes=(${${(f)"$(_call_program remotes git config --get-regexp '"^remote\..*\.url$"')"}//#(#b)remote.(*).url */$match[1]})
+    __git_command_successful || return
 
-	# TODO: Should combine the two instead of either or.
-	if (( $#remotes > 0 )); then
-		_wanted remotes expl remote compadd $* - $remotes
-	else
-		_wanted remotes expl remote _files $* - -W "($gitdir/remotes)" -g "$gitdir/remotes/*"
-	fi
+    # TODO: Should combine the two instead of either or.
+    if (( $#remotes > 0 )); then
+        _wanted remotes expl remote compadd $* - $remotes
+    else
+        _wanted remotes expl remote _files $* - -W "($gitdir/remotes)" -g "$gitdir/remotes/*"
+    fi
 }
 
 __git_flow_hotfix_list ()
 {
-	local expl
-	declare -a hotfixes
+    local expl
+    declare -a hotfixes
 
-	hotfixes=(${${(f)"$(_call_program hotfixes git flow hotfix list 2> /dev/null | tr -d ' |*')"}})
-	__git_command_successful || return
+    hotfixes=(${${(f)"$(_call_program hotfixes git flow hotfix list 2> /dev/null | tr -d ' |*')"}})
+    __git_command_successful || return
 
-	_wanted hotfixes expl 'hotfix' compadd $hotfixes
+    _wanted hotfixes expl 'hotfix' compadd $hotfixes
 }
 
 __git_branch_names () {
-	local expl
-	declare -a branch_names
+    local expl
+    declare -a branch_names
 
-	branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads 2>/dev/null)"}#refs/heads/})
-	__git_command_successful || return
+    branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads 2>/dev/null)"}#refs/heads/})
+    __git_command_successful || return
 
-	_wanted branch-names expl branch-name compadd $* - $branch_names
+    _wanted branch-names expl branch-name compadd $* - $branch_names
 }
 
 __git_command_successful () {
-	if (( ${#pipestatus:#0} > 0 )); then
-		_message 'not a git repository'
-		return 1
-	fi
-	return 0
+    if (( ${#pipestatus:#0} > 0 )); then
+        _message 'not a git repository'
+        return 1
+    fi
+    return 0
 }
 
 zstyle ':completion:*:*:git:*' user-commands flow:'provide high-level repository operations'
-- 
cgit v1.2.3-70-g09d2


From 6ca57e035cc7c199ca7c1d893594270ec570f4d3 Mon Sep 17 00:00:00 2001
From: Thi <thii@users.noreply.github.com>
Date: Fri, 20 Jul 2018 00:20:45 +0900
Subject: [plugins/xcode] Fix opening project using a wrong Xcode version
 (#6829)

---
 plugins/xcode/xcode.plugin.zsh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/xcode/xcode.plugin.zsh b/plugins/xcode/xcode.plugin.zsh
index b46e05f2f..b80c3e36d 100644
--- a/plugins/xcode/xcode.plugin.zsh
+++ b/plugins/xcode/xcode.plugin.zsh
@@ -22,8 +22,11 @@ function xc {
     fi
     return 1
   else
-    echo "Found ${xcode_proj[1]}"
-    open "${xcode_proj[1]}"
+    local active_path
+    active_path=$(xcode-select -p)
+    active_path=${active_path%%/Contents/Developer*}
+    echo "Found ${xcode_proj[1]}. Opening with ${active_path}"
+    open -a "$active_path" "${xcode_proj[1]}"
   fi
 }
 
-- 
cgit v1.2.3-70-g09d2


From a24a0b1a8e464fd4c6ab6c2f95ef5a8f025ff093 Mon Sep 17 00:00:00 2001
From: MarkPochert <MarkPochert@users.noreply.github.com>
Date: Sun, 29 Jul 2018 17:43:15 +0200
Subject: Update z to latest version (#7021)

---
 plugins/z/z.1  |  6 ++++-
 plugins/z/z.sh | 75 ++++++++++++++++++++++++++++++++--------------------------
 2 files changed, 47 insertions(+), 34 deletions(-)

(limited to 'plugins')

diff --git a/plugins/z/z.1 b/plugins/z/z.1
index bbc1bf5df..d4cac1ac2 100644
--- a/plugins/z/z.1
+++ b/plugins/z/z.1
@@ -22,6 +22,9 @@ OPTIONS
 \fB\-c\fR
 restrict matches to subdirectories of the current directory
 .TP
+\fB\-e\fR
+echo the best match, don't cd
+.TP
 \fB\-h\fR
 show a brief help message
 .TP
@@ -90,7 +93,8 @@ Set \fB$_Z_OWNER\fR to allow usage when in 'sudo -s' mode.
 (These settings should go in .bashrc/.zshrc before the line added above.)
 .RE
 .RS
-Install the provided man page \fBz.1\fR somewhere like \fB/usr/local/man/man1\fR.
+Install the provided man page \fBz.1\fR somewhere in your \f$MANPATH, like
+\fB/usr/local/man/man1\fR.
 .RE
 .SS
 Aging:
diff --git a/plugins/z/z.sh b/plugins/z/z.sh
index d0eeb97ef..4fc75dc6a 100644
--- a/plugins/z/z.sh
+++ b/plugins/z/z.sh
@@ -1,4 +1,4 @@
-# Copyright (c) 2009 rupa deadwyler under the WTFPL license
+# Copyright (c) 2009 rupa deadwyler. Licensed under the WTFPL license, Version 2
 
 # maintains a jump-list of the directories you actually use
 #
@@ -21,6 +21,7 @@
 #     * z -r foo  # cd to highest ranked dir matching foo
 #     * z -t foo  # cd to most recently accessed dir matching foo
 #     * z -l foo  # list matches instead of cd
+#     * z -e foo  # echo the best match, don't cd
 #     * z -c foo  # restrict matches to subdirs of $PWD
 
 [ -d "${_Z_DATA:-$HOME/.z}" ] && {
@@ -31,9 +32,21 @@ _z() {
 
     local datafile="${_Z_DATA:-$HOME/.z}"
 
+    # if symlink, dereference
+    [ -h "$datafile" ] && datafile=$(readlink "$datafile")
+
     # bail if we don't own ~/.z and $_Z_OWNER not set
     [ -z "$_Z_OWNER" -a -f "$datafile" -a ! -O "$datafile" ] && return
 
+    _z_dirs () {
+        local line
+        while read line; do
+            # only count directories
+            [ -d "${line%%\|*}" ] && echo "$line"
+        done < "$datafile"
+        return 0
+    }
+
     # add entries
     if [ "$1" = "--add" ]; then
         shift
@@ -49,10 +62,7 @@ _z() {
 
         # maintain the data file
         local tempfile="$datafile.$RANDOM"
-        while read line; do
-            # only count directories
-            [ -d "${line%%\|*}" ] && echo $line
-        done < "$datafile" | awk -v path="$*" -v now="$(date +%s)" -F"|" '
+        _z_dirs | awk -v path="$*" -v now="$(date +%s)" -F"|" '
             BEGIN {
                 rank[path] = 1
                 time[path] = now
@@ -75,7 +85,7 @@ _z() {
                 } else for( x in rank ) print x "|" rank[x] "|" time[x]
             }
         ' 2>/dev/null >| "$tempfile"
-        # do our best to avoid clobbering the datafile in a race condition
+        # do our best to avoid clobbering the datafile in a race condition.
         if [ $? -ne 0 -a -f "$datafile" ]; then
             env rm -f "$tempfile"
         else
@@ -85,17 +95,15 @@ _z() {
 
     # tab completion
     elif [ "$1" = "--complete" -a -s "$datafile" ]; then
-        while read line; do
-            [ -d "${line%%\|*}" ] && echo $line
-        done < "$datafile" | awk -v q="$2" -F"|" '
+        _z_dirs | awk -v q="$2" -F"|" '
             BEGIN {
-                if( q == tolower(q) ) imatch = 1
                 q = substr(q, 3)
-                gsub(" ", ".*", q)
+                if( q == tolower(q) ) imatch = 1
+                gsub(/ /, ".*", q)
             }
             {
                 if( imatch ) {
-                    if( tolower($1) ~ tolower(q) ) print $1
+                    if( tolower($1) ~ q ) print $1
                 } else if( $1 ~ q ) print $1
             }
         ' 2>/dev/null
@@ -106,11 +114,12 @@ _z() {
             --) while [ "$1" ]; do shift; local fnd="$fnd${fnd:+ }$1";done;;
             -*) local opt=${1:1}; while [ "$opt" ]; do case ${opt:0:1} in
                     c) local fnd="^$PWD $fnd";;
-                    h) echo "${_Z_CMD:-z} [-chlrtx] args" >&2; return;;
-                    x) sed -i -e "\:^${PWD}|.*:d" "$datafile";;
+                    e) local echo=1;;
+                    h) echo "${_Z_CMD:-z} [-cehlrtx] args" >&2; return;;
                     l) local list=1;;
                     r) local typ="rank";;
                     t) local typ="recent";;
+                    x) sed -i -e "\:^${PWD}|.*:d" "$datafile";;
                 esac; opt=${opt:1}; done;;
              *) local fnd="$fnd${fnd:+ }$1";;
         esac; local last=$1; [ "$#" -gt 0 ] && shift; done
@@ -119,16 +128,14 @@ _z() {
         # if we hit enter on a completion just go there
         case "$last" in
             # completions will always start with /
-            /*) [ -z "$list" -a -d "$last" ] && cd "$last" && return;;
+            /*) [ -z "$list" -a -d "$last" ] && builtin cd "$last" && return;;
         esac
 
         # no file yet
         [ -f "$datafile" ] || return
 
         local cd
-        cd="$(while read line; do
-            [ -d "${line%%\|*}" ] && echo $line
-        done < "$datafile" | awk -v t="$(date +%s)" -v list="$list" -v typ="$typ" -v q="$fnd" -F"|" '
+        cd="$( < <( _z_dirs ) awk -v t="$(date +%s)" -v list="$list" -v typ="$typ" -v q="$fnd" -F"|" '
             function frecent(rank, time) {
                 # relate frequency and time
                 dx = t - time
@@ -137,19 +144,21 @@ _z() {
                 if( dx < 604800 ) return rank / 2
                 return rank / 4
             }
-            function output(files, out, common) {
+            function output(matches, best_match, common) {
                 # list or return the desired directory
                 if( list ) {
                     cmd = "sort -n >&2"
-                    for( x in files ) {
-                        if( files[x] ) printf "%-10s %s\n", files[x], x | cmd
+                    for( x in matches ) {
+                        if( matches[x] ) {
+                            printf "%-10s %s\n", matches[x], x | cmd
+                        }
                     }
                     if( common ) {
                         printf "%-10s %s\n", "common:", common > "/dev/stderr"
                     }
                 } else {
-                    if( common ) out = common
-                    print out
+                    if( common ) best_match = common
+                    print best_match
                 }
             }
             function common(matches) {
@@ -160,11 +169,9 @@ _z() {
                     }
                 }
                 if( short == "/" ) return
-                # use a copy to escape special characters, as we want to return
-                # the original. yeah, this escaping is awful.
-                clean_short = short
-                gsub(/\[\(\)\[\]\|\]/, "\\\\&", clean_short)
-                for( x in matches ) if( matches[x] && x !~ clean_short ) return
+                for( x in matches ) if( matches[x] && index(x, short) != 1 ) {
+                    return
+                }
                 return short
             }
             BEGIN {
@@ -197,8 +204,10 @@ _z() {
                 }
             }
         ')"
-        [ $? -gt 0 ] && return
-        [ "$cd" ] && cd "$cd"
+
+        [ $? -eq 0 ] && [ "$cd" ] && {
+          if [ "$echo" ]; then echo "$cd"; else builtin cd "$cd"; fi
+        }
     fi
 }
 
@@ -212,11 +221,11 @@ if type compctl >/dev/null 2>&1; then
         # populate directory list, avoid clobbering any other precmds.
         if [ "$_Z_NO_RESOLVE_SYMLINKS" ]; then
             _z_precmd() {
-                _z --add "${PWD:a}"
+                (_z --add "${PWD:a}" &)
             }
         else
             _z_precmd() {
-                _z --add "${PWD:A}"
+                (_z --add "${PWD:A}" &)
             }
         fi
         [[ -n "${precmd_functions[(r)_z_precmd]}" ]] || {
@@ -237,7 +246,7 @@ elif type complete >/dev/null 2>&1; then
     [ "$_Z_NO_PROMPT_COMMAND" ] || {
         # populate directory list. avoid clobbering other PROMPT_COMMANDs.
         grep "_z --add" <<< "$PROMPT_COMMAND" >/dev/null || {
-            PROMPT_COMMAND="$PROMPT_COMMAND"$'\n''_z --add "$(command pwd '$_Z_RESOLVE_SYMLINKS' 2>/dev/null)" 2>/dev/null;'
+            PROMPT_COMMAND="$PROMPT_COMMAND"$'\n''(_z --add "$(command pwd '$_Z_RESOLVE_SYMLINKS' 2>/dev/null)" 2>/dev/null &);'
         }
     }
 fi
-- 
cgit v1.2.3-70-g09d2


From 5fa7824ea59ec12a976f348a83399e66699456ea Mon Sep 17 00:00:00 2001
From: Thanh Ha <zxiiro@gmail.com>
Date: Sun, 29 Jul 2018 11:45:35 -0400
Subject: git-prompt: fix error when multiple tags exist (#6998)

When a commit has multiple tags associated to it, the git-prompt will
throw the following error:

git_super_status:[:4: integer expression expected: v0.21.x\ntags/v0.21.5,
git_super_status:[:7: integer expression expected: origin/v0.21.x,
git_super_status:[:11: integer expression expected: origin/v0.21.x,
git_super_status:[:14: integer expression expected: v0.21.x
git_super_status:[:23: integer expression expected: v0.21.x

This is due to the prompt expecting the tag field to be a single word
with no spaces in between but if there are multiple tags the python
script returns a string with ', ' space separated list of tags.
This throws off the parser. The solution is to ensure that the python
script returns a space-less string ensuring the git-prompt parser to
properly parse the data.

Signed-off-by: Thanh Ha <zxiiro@linux.com>
---
 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 14d875973..a4d07cde6 100644
--- a/plugins/git-prompt/gitstatus.py
+++ b/plugins/git-prompt/gitstatus.py
@@ -22,7 +22,7 @@ def get_tagname_or_hash():
         tagname = 'tags/' + output[m.start()+len('tag: '): m.end()-1]
 
     if tagname:
-        return tagname
+        return tagname.replace(' ', '')
     elif hash_:
         return hash_
     return None
-- 
cgit v1.2.3-70-g09d2


From f33691fbb60ae38e51b121f06d90b22912cc8569 Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Sun, 27 Sep 2015 22:06:58 -0400
Subject: tmux: detabify source code

Also changes the tmux detection test to do an early exit if tmux is absent,
to reduce the indentation level of the main body of code.
---
 plugins/tmux/tmux.plugin.zsh | 147 +++++++++++++++++++++----------------------
 1 file changed, 70 insertions(+), 77 deletions(-)

(limited to 'plugins')

diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
index fb514a44c..4c4e62f54 100644
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -10,89 +10,82 @@ alias tksv='tmux kill-server'
 alias tkss='tmux kill-session -t'
 
 # Only run if tmux is actually installed
-if which tmux &> /dev/null
-	then
-	# Configuration variables
-	#
-	# Automatically start tmux
-	[[ -n "$ZSH_TMUX_AUTOSTART" ]] || ZSH_TMUX_AUTOSTART=false
-	# Only autostart once. If set to false, tmux will attempt to
-	# autostart every time your zsh configs are reloaded.
-	[[ -n "$ZSH_TMUX_AUTOSTART_ONCE" ]] || ZSH_TMUX_AUTOSTART_ONCE=true
-	# Automatically connect to a previous session if it exists
-	[[ -n "$ZSH_TMUX_AUTOCONNECT" ]] || ZSH_TMUX_AUTOCONNECT=true
-	# Automatically close the terminal when tmux exits
-	[[ -n "$ZSH_TMUX_AUTOQUIT" ]] || ZSH_TMUX_AUTOQUIT=$ZSH_TMUX_AUTOSTART
-	# Set term to screen or screen-256color based on current terminal support
-	[[ -n "$ZSH_TMUX_FIXTERM" ]] || ZSH_TMUX_FIXTERM=true
-	# Set '-CC' option for iTerm2 tmux integration
-	[[ -n "$ZSH_TMUX_ITERM2" ]] || ZSH_TMUX_ITERM2=false
-	# The TERM to use for non-256 color terminals.
-	# Tmux states this should be screen, but you may need to change it on
-	# systems without the proper terminfo
-	[[ -n "$ZSH_TMUX_FIXTERM_WITHOUT_256COLOR" ]] || ZSH_TMUX_FIXTERM_WITHOUT_256COLOR="screen"
-	# The TERM to use for 256 color terminals.
-	# Tmux states this should be screen-256color, but you may need to change it on
-	# systems without the proper terminfo
-	[[ -n "$ZSH_TMUX_FIXTERM_WITH_256COLOR" ]] || ZSH_TMUX_FIXTERM_WITH_256COLOR="screen-256color"
+if ! which tmux &> /dev/null; then
+  print "zsh tmux plugin: tmux not found. Please install tmux before using this plugin."
+  return 1
+fi
+
+# Configuration variables
+#
+# Automatically start tmux
+[[ -n "$ZSH_TMUX_AUTOSTART" ]] || ZSH_TMUX_AUTOSTART=false
+# Only autostart once. If set to false, tmux will attempt to
+# autostart every time your zsh configs are reloaded.
+[[ -n "$ZSH_TMUX_AUTOSTART_ONCE" ]] || ZSH_TMUX_AUTOSTART_ONCE=true
+# Automatically connect to a previous session if it exists
+[[ -n "$ZSH_TMUX_AUTOCONNECT" ]] || ZSH_TMUX_AUTOCONNECT=true
+# Automatically close the terminal when tmux exits
+[[ -n "$ZSH_TMUX_AUTOQUIT" ]] || ZSH_TMUX_AUTOQUIT=$ZSH_TMUX_AUTOSTART
+# Set term to screen or screen-256color based on current terminal support
+[[ -n "$ZSH_TMUX_FIXTERM" ]] || ZSH_TMUX_FIXTERM=true
+# Set '-CC' option for iTerm2 tmux integration
+[[ -n "$ZSH_TMUX_ITERM2" ]] || ZSH_TMUX_ITERM2=false
+# The TERM to use for non-256 color terminals.
+# Tmux states this should be screen, but you may need to change it on
+# systems without the proper terminfo
+[[ -n "$ZSH_TMUX_FIXTERM_WITHOUT_256COLOR" ]] || ZSH_TMUX_FIXTERM_WITHOUT_256COLOR="screen"
+# The TERM to use for 256 color terminals.
+# Tmux states this should be screen-256color, but you may need to change it on
+# systems without the proper terminfo
+[[ -n "$ZSH_TMUX_FIXTERM_WITH_256COLOR" ]] || ZSH_TMUX_FIXTERM_WITH_256COLOR="screen-256color"
 
 
-	# Get the absolute path to the current directory
-	local zsh_tmux_plugin_path="$(cd "$(dirname "$0")" && pwd)"
+# Get the absolute path to the current directory
+local zsh_tmux_plugin_path="$(cd "$(dirname "$0")" && pwd)"
 
-	# Determine if the terminal supports 256 colors
-	if [[ `tput colors` == "256" ]]
-	then
-		export ZSH_TMUX_TERM=$ZSH_TMUX_FIXTERM_WITH_256COLOR
-	else
-		export ZSH_TMUX_TERM=$ZSH_TMUX_FIXTERM_WITHOUT_256COLOR
-	fi
+# Determine if the terminal supports 256 colors
+if [[ `tput colors` == "256" ]]; then
+  export ZSH_TMUX_TERM=$ZSH_TMUX_FIXTERM_WITH_256COLOR
+else
+  export ZSH_TMUX_TERM=$ZSH_TMUX_FIXTERM_WITHOUT_256COLOR
+fi
 
-	# Set the correct local config file to use.
-    if [[ "$ZSH_TMUX_ITERM2" == "false" ]] && [[ -f $HOME/.tmux.conf || -h $HOME/.tmux.conf ]]
-	then
-		#use this when they have a ~/.tmux.conf
-		export _ZSH_TMUX_FIXED_CONFIG="$zsh_tmux_plugin_path/tmux.extra.conf"
-	else
-		#use this when they don't have a ~/.tmux.conf
-		export _ZSH_TMUX_FIXED_CONFIG="$zsh_tmux_plugin_path/tmux.only.conf"
-	fi
+# Set the correct local config file to use.
+if [[ "$ZSH_TMUX_ITERM2" == "false" ]] && [[ -f $HOME/.tmux.conf || -h $HOME/.tmux.conf ]]; then
+  #use this when they have a ~/.tmux.conf
+  export _ZSH_TMUX_FIXED_CONFIG="$zsh_tmux_plugin_path/tmux.extra.conf"
+else
+  #use this when they don't have a ~/.tmux.conf
+  export _ZSH_TMUX_FIXED_CONFIG="$zsh_tmux_plugin_path/tmux.only.conf"
+fi
 
-	# Wrapper function for tmux.
-	function _zsh_tmux_plugin_run()
-	{
-		# We have other arguments, just run them
-		if [[ -n "$@" ]]
-		then
-			\tmux $@
-		# Try to connect to an existing session.
-		elif [[ "$ZSH_TMUX_AUTOCONNECT" == "true" ]]
-		then
-			\tmux `[[ "$ZSH_TMUX_ITERM2" == "true" ]] && echo '-CC '` attach || \tmux `[[ "$ZSH_TMUX_ITERM2" == "true" ]] && echo '-CC '` `[[ "$ZSH_TMUX_FIXTERM" == "true" ]] && echo '-f '$_ZSH_TMUX_FIXED_CONFIG` new-session
-			[[ "$ZSH_TMUX_AUTOQUIT" == "true" ]] && exit
-		# Just run tmux, fixing the TERM variable if requested.
-		else
-			\tmux `[[ "$ZSH_TMUX_ITERM2" == "true" ]] && echo '-CC '` `[[ "$ZSH_TMUX_FIXTERM" == "true" ]] && echo '-f '$_ZSH_TMUX_FIXED_CONFIG`
-			[[ "$ZSH_TMUX_AUTOQUIT" == "true" ]] && exit
-		fi
-	}
+# Wrapper function for tmux.
+function _zsh_tmux_plugin_run() {
+  # We have other arguments, just run them
+  if [[ -n "$@" ]]; then
+    \tmux $@
+  # Try to connect to an existing session.
+  elif [[ "$ZSH_TMUX_AUTOCONNECT" == "true" ]]; then
+    \tmux `[[ "$ZSH_TMUX_ITERM2" == "true" ]] && echo '-CC '` attach || \tmux `[[ "$ZSH_TMUX_ITERM2" == "true" ]] && echo '-CC '` `[[ "$ZSH_TMUX_FIXTERM" == "true" ]] && echo '-f '$_ZSH_TMUX_FIXED_CONFIG` new-session
+    [[ "$ZSH_TMUX_AUTOQUIT" == "true" ]] && exit
+      # Just run tmux, fixing the TERM variable if requested.
+  else
+    \tmux `[[ "$ZSH_TMUX_ITERM2" == "true" ]] && echo '-CC '` `[[ "$ZSH_TMUX_FIXTERM" == "true" ]] && echo '-f '$_ZSH_TMUX_FIXED_CONFIG`
+    [[ "$ZSH_TMUX_AUTOQUIT" == "true" ]] && exit
+  fi
+}
 
-	# Use the completions for tmux for our function
-	compdef _tmux _zsh_tmux_plugin_run
+# Use the completions for tmux for our function
+compdef _tmux _zsh_tmux_plugin_run
 
-	# Alias tmux to our wrapper function.
-	alias tmux=_zsh_tmux_plugin_run
+# Alias tmux to our wrapper function.
+alias tmux=_zsh_tmux_plugin_run
 
-	# Autostart if not already in tmux and enabled.
-	if [[ ! -n "$TMUX" && "$ZSH_TMUX_AUTOSTART" == "true" ]]
-	then
-		# Actually don't autostart if we already did and multiple autostarts are disabled.
-		if [[ "$ZSH_TMUX_AUTOSTART_ONCE" == "false" || "$ZSH_TMUX_AUTOSTARTED" != "true" ]]
-		then
-			export ZSH_TMUX_AUTOSTARTED=true
-			_zsh_tmux_plugin_run
-		fi
-	fi
-else
-	print "zsh tmux plugin: tmux not found. Please install tmux before using this plugin."
+# Autostart if not already in tmux and enabled.
+if [[ ! -n "$TMUX" && "$ZSH_TMUX_AUTOSTART" == "true" ]]; then
+  # Actually don't autostart if we already did and multiple autostarts are disabled.
+  if [[ "$ZSH_TMUX_AUTOSTART_ONCE" == "false" || "$ZSH_TMUX_AUTOSTARTED" != "true" ]]; then
+    export ZSH_TMUX_AUTOSTARTED=true
+    _zsh_tmux_plugin_run
+  fi
 fi
-- 
cgit v1.2.3-70-g09d2


From 19716a8e3df053f26500db126a03a8a471436bc8 Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Sun, 27 Sep 2015 22:22:50 -0400
Subject: tmux: refactor

- Consolidates the switch-adding logic for readability.
- Replaces "[[ ... ]] && ..." with "if [[ ... ]]; then ..." in some
  cases to avoid a spurious nonzero exit status from _zsh_tmux_plugin_run.
- Puts error message on stderr instead of stdout
---
 plugins/tmux/tmux.plugin.zsh | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

(limited to 'plugins')

diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
index 4c4e62f54..1b97cae73 100644
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -11,7 +11,7 @@ alias tkss='tmux kill-session -t'
 
 # Only run if tmux is actually installed
 if ! which tmux &> /dev/null; then
-  print "zsh tmux plugin: tmux not found. Please install tmux before using this plugin."
+  print "zsh tmux plugin: tmux not found. Please install tmux before using this plugin." >&2
   return 1
 fi
 
@@ -40,9 +40,6 @@ fi
 [[ -n "$ZSH_TMUX_FIXTERM_WITH_256COLOR" ]] || ZSH_TMUX_FIXTERM_WITH_256COLOR="screen-256color"
 
 
-# Get the absolute path to the current directory
-local zsh_tmux_plugin_path="$(cd "$(dirname "$0")" && pwd)"
-
 # Determine if the terminal supports 256 colors
 if [[ `tput colors` == "256" ]]; then
   export ZSH_TMUX_TERM=$ZSH_TMUX_FIXTERM_WITH_256COLOR
@@ -53,25 +50,33 @@ fi
 # Set the correct local config file to use.
 if [[ "$ZSH_TMUX_ITERM2" == "false" ]] && [[ -f $HOME/.tmux.conf || -h $HOME/.tmux.conf ]]; then
   #use this when they have a ~/.tmux.conf
-  export _ZSH_TMUX_FIXED_CONFIG="$zsh_tmux_plugin_path/tmux.extra.conf"
+  export _ZSH_TMUX_FIXED_CONFIG="${0:h:a}/tmux.extra.conf"
 else
   #use this when they don't have a ~/.tmux.conf
-  export _ZSH_TMUX_FIXED_CONFIG="$zsh_tmux_plugin_path/tmux.only.conf"
+  export _ZSH_TMUX_FIXED_CONFIG="${0:h:a}/tmux.only.conf"
 fi
 
 # Wrapper function for tmux.
 function _zsh_tmux_plugin_run() {
-  # We have other arguments, just run them
+  local tmux_cmd
+  tmux_cmd=(command tmux)
+  [[ "$ZSH_TMUX_ITERM2" == "true" ]] && tmux_cmd+="-CC"
+  [[ "$ZSH_TMUX_FIXTERM" == "true" ]] && tmux_cmd+=(-f $_ZSH_TMUX_FIXED_CONFIG)
   if [[ -n "$@" ]]; then
+    # We have other arguments, just run them
     \tmux $@
-  # Try to connect to an existing session.
   elif [[ "$ZSH_TMUX_AUTOCONNECT" == "true" ]]; then
-    \tmux `[[ "$ZSH_TMUX_ITERM2" == "true" ]] && echo '-CC '` attach || \tmux `[[ "$ZSH_TMUX_ITERM2" == "true" ]] && echo '-CC '` `[[ "$ZSH_TMUX_FIXTERM" == "true" ]] && echo '-f '$_ZSH_TMUX_FIXED_CONFIG` new-session
-    [[ "$ZSH_TMUX_AUTOQUIT" == "true" ]] && exit
-      # Just run tmux, fixing the TERM variable if requested.
+    # Try to connect to an existing session.
+    $tmux_cmd attach || $tmux_cmd new-session
+    if [[ "$ZSH_TMUX_AUTOQUIT" == "true" ]]; then
+      exit
+    fi
   else
-    \tmux `[[ "$ZSH_TMUX_ITERM2" == "true" ]] && echo '-CC '` `[[ "$ZSH_TMUX_FIXTERM" == "true" ]] && echo '-f '$_ZSH_TMUX_FIXED_CONFIG`
-    [[ "$ZSH_TMUX_AUTOQUIT" == "true" ]] && exit
+    # Just run tmux, fixing the TERM variable if requested.
+    $tmux_cmd
+    if [[ "$ZSH_TMUX_AUTOQUIT" == "true" ]]; then
+      exit
+    fi
   fi
 }
 
-- 
cgit v1.2.3-70-g09d2


From f584de5930467fd53e8b7d2e51f5227bc405e4b2 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Fri, 3 Aug 2018 22:06:26 +0200
Subject: tmux: refactor and simplify tmux function logic

---
 plugins/tmux/tmux.plugin.zsh | 82 ++++++++++++++++++++------------------------
 1 file changed, 38 insertions(+), 44 deletions(-)

(limited to 'plugins')

diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
index 1b97cae73..2d161c377 100644
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -1,6 +1,9 @@
-#
-# Aliases
-#
+if ! (( $+commands[tmux] )); then
+  print "zsh tmux plugin: tmux not found. Please install tmux before using this plugin." >&2
+  return 1
+fi
+
+# ALIASES
 
 alias ta='tmux attach -t'
 alias tad='tmux attach -d -t'
@@ -9,85 +12,76 @@ alias tl='tmux list-sessions'
 alias tksv='tmux kill-server'
 alias tkss='tmux kill-session -t'
 
-# Only run if tmux is actually installed
-if ! which tmux &> /dev/null; then
-  print "zsh tmux plugin: tmux not found. Please install tmux before using this plugin." >&2
-  return 1
-fi
-
-# Configuration variables
-#
+# CONFIGURATION VARIABLES
 # Automatically start tmux
-[[ -n "$ZSH_TMUX_AUTOSTART" ]] || ZSH_TMUX_AUTOSTART=false
+: ${ZSH_TMUX_AUTOSTART:=false}
 # Only autostart once. If set to false, tmux will attempt to
 # autostart every time your zsh configs are reloaded.
-[[ -n "$ZSH_TMUX_AUTOSTART_ONCE" ]] || ZSH_TMUX_AUTOSTART_ONCE=true
+: ${ZSH_TMUX_AUTOSTART_ONCE:=true}
 # Automatically connect to a previous session if it exists
-[[ -n "$ZSH_TMUX_AUTOCONNECT" ]] || ZSH_TMUX_AUTOCONNECT=true
+: ${ZSH_TMUX_AUTOCONNECT:=true}
 # Automatically close the terminal when tmux exits
-[[ -n "$ZSH_TMUX_AUTOQUIT" ]] || ZSH_TMUX_AUTOQUIT=$ZSH_TMUX_AUTOSTART
+: ${ZSH_TMUX_AUTOQUIT:=$ZSH_TMUX_AUTOSTART}
 # Set term to screen or screen-256color based on current terminal support
-[[ -n "$ZSH_TMUX_FIXTERM" ]] || ZSH_TMUX_FIXTERM=true
+: ${ZSH_TMUX_FIXTERM:=true}
 # Set '-CC' option for iTerm2 tmux integration
-[[ -n "$ZSH_TMUX_ITERM2" ]] || ZSH_TMUX_ITERM2=false
+: ${ZSH_TMUX_ITERM2:=false}
 # The TERM to use for non-256 color terminals.
 # Tmux states this should be screen, but you may need to change it on
 # systems without the proper terminfo
-[[ -n "$ZSH_TMUX_FIXTERM_WITHOUT_256COLOR" ]] || ZSH_TMUX_FIXTERM_WITHOUT_256COLOR="screen"
+: ${ZSH_TMUX_FIXTERM_WITHOUT_256COLOR:=screen}
 # The TERM to use for 256 color terminals.
 # Tmux states this should be screen-256color, but you may need to change it on
 # systems without the proper terminfo
-[[ -n "$ZSH_TMUX_FIXTERM_WITH_256COLOR" ]] || ZSH_TMUX_FIXTERM_WITH_256COLOR="screen-256color"
-
+: ${ZSH_TMUX_FIXTERM_WITH_256COLOR:=screen-256color}
 
 # Determine if the terminal supports 256 colors
-if [[ `tput colors` == "256" ]]; then
+if [[ $(tput colors) == 256 ]]; then
   export ZSH_TMUX_TERM=$ZSH_TMUX_FIXTERM_WITH_256COLOR
 else
   export ZSH_TMUX_TERM=$ZSH_TMUX_FIXTERM_WITHOUT_256COLOR
 fi
 
 # Set the correct local config file to use.
-if [[ "$ZSH_TMUX_ITERM2" == "false" ]] && [[ -f $HOME/.tmux.conf || -h $HOME/.tmux.conf ]]; then
-  #use this when they have a ~/.tmux.conf
+if [[ "$ZSH_TMUX_ITERM2" == "false" && -e "$HOME/.tmux.conf" ]]; then
   export _ZSH_TMUX_FIXED_CONFIG="${0:h:a}/tmux.extra.conf"
 else
-  #use this when they don't have a ~/.tmux.conf
   export _ZSH_TMUX_FIXED_CONFIG="${0:h:a}/tmux.only.conf"
 fi
 
 # Wrapper function for tmux.
 function _zsh_tmux_plugin_run() {
-  local tmux_cmd
-  tmux_cmd=(command tmux)
-  [[ "$ZSH_TMUX_ITERM2" == "true" ]] && tmux_cmd+="-CC"
-  [[ "$ZSH_TMUX_FIXTERM" == "true" ]] && tmux_cmd+=(-f $_ZSH_TMUX_FIXED_CONFIG)
   if [[ -n "$@" ]]; then
-    # We have other arguments, just run them
-    \tmux $@
-  elif [[ "$ZSH_TMUX_AUTOCONNECT" == "true" ]]; then
-    # Try to connect to an existing session.
-    $tmux_cmd attach || $tmux_cmd new-session
-    if [[ "$ZSH_TMUX_AUTOQUIT" == "true" ]]; then
-      exit
-    fi
-  else
-    # Just run tmux, fixing the TERM variable if requested.
-    $tmux_cmd
-    if [[ "$ZSH_TMUX_AUTOQUIT" == "true" ]]; then
-      exit
-    fi
+    command tmux "$@"
+    return $?
+  fi
+
+  local -a tmux_cmd=(command tmux)
+  [[ "$ZSH_TMUX_ITERM2" == "true" ]] && tmux_cmd+=(-CC)
+
+  # Try to connect to an existing session.
+  if [[ "$ZSH_TMUX_AUTOCONNECT" == "true" ]]; then
+    $tmux_cmd attach
+  fi
+
+  # If failed, just run tmux, fixing the TERM variable if requested.
+  if [[ $? -ne 0 ]]; then
+    [[ "$ZSH_TMUX_FIXTERM" == "true" ]] && tmux_cmd+=(-f "$_ZSH_TMUX_FIXED_CONFIG")
+    $tmux_cmd new-session
+  fi
+
+  if [[ "$ZSH_TMUX_AUTOQUIT" == "true" ]]; then
+    exit
   fi
 }
 
 # Use the completions for tmux for our function
 compdef _tmux _zsh_tmux_plugin_run
-
 # Alias tmux to our wrapper function.
 alias tmux=_zsh_tmux_plugin_run
 
 # Autostart if not already in tmux and enabled.
-if [[ ! -n "$TMUX" && "$ZSH_TMUX_AUTOSTART" == "true" ]]; then
+if [[ -z "$TMUX" && "$ZSH_TMUX_AUTOSTART" == "true" ]]; then
   # Actually don't autostart if we already did and multiple autostarts are disabled.
   if [[ "$ZSH_TMUX_AUTOSTART_ONCE" == "false" || "$ZSH_TMUX_AUTOSTARTED" != "true" ]]; then
     export ZSH_TMUX_AUTOSTARTED=true
-- 
cgit v1.2.3-70-g09d2


From 76d3eedf7fa47886658c79884884f4077ce09107 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 7 Aug 2018 00:40:18 +0200
Subject: tmux: fix regression after f584de5

Fixes #7041
---
 plugins/tmux/tmux.plugin.zsh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'plugins')

diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
index 2d161c377..ff7de746b 100644
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -60,9 +60,7 @@ function _zsh_tmux_plugin_run() {
   [[ "$ZSH_TMUX_ITERM2" == "true" ]] && tmux_cmd+=(-CC)
 
   # Try to connect to an existing session.
-  if [[ "$ZSH_TMUX_AUTOCONNECT" == "true" ]]; then
-    $tmux_cmd attach
-  fi
+  [[ "$ZSH_TMUX_AUTOCONNECT" == "true" ]] && $tmux_cmd attach
 
   # If failed, just run tmux, fixing the TERM variable if requested.
   if [[ $? -ne 0 ]]; then
-- 
cgit v1.2.3-70-g09d2


From 91b771914bc7c43dd7c7a43b586c5de2c225ceb7 Mon Sep 17 00:00:00 2001
From: kapsh <kapsh@kap.sh>
Date: Wed, 28 Jun 2017 11:03:55 +0300
Subject: extract: check file extension as lowercase (#6158)

Fixes #6157
---
 plugins/extract/extract.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/extract/extract.plugin.zsh b/plugins/extract/extract.plugin.zsh
index 34f8d8710..d56044805 100644
--- a/plugins/extract/extract.plugin.zsh
+++ b/plugins/extract/extract.plugin.zsh
@@ -29,7 +29,7 @@ extract() {
 
 		success=0
 		extract_dir="${1:t:r}"
-		case "$1" in
+		case "${1:l}" in
 			(*.tar.gz|*.tgz) (( $+commands[pigz] )) && { pigz -dc "$1" | tar xv } || tar zxvf "$1" ;;
 			(*.tar.bz2|*.tbz|*.tbz2) tar xvjf "$1" ;;
 			(*.tar.xz|*.txz)
@@ -45,7 +45,7 @@ extract() {
 			(*.bz2) bunzip2 "$1" ;;
 			(*.xz) unxz "$1" ;;
 			(*.lzma) unlzma "$1" ;;
-			(*.Z) uncompress "$1" ;;
+			(*.z) uncompress "$1" ;;
 			(*.zip|*.war|*.jar|*.sublime-package|*.ipsw|*.xpi|*.apk) unzip "$1" -d $extract_dir ;;
 			(*.rar) unrar x -ad "$1" ;;
 			(*.7z) 7za x "$1" ;;
-- 
cgit v1.2.3-70-g09d2


From 05713785b0774f78e0aeb4cc4d793fdb529307db Mon Sep 17 00:00:00 2001
From: John Burwell <jburwell@users.noreply.github.com>
Date: Tue, 7 Aug 2018 12:10:35 -0400
Subject: asdf: add Homebrew and completion support (#6749)

* Modifies the search logic for asdf to include Homebrew when it is
installed. The implementation is adapted from the pyenv plugin.
---
 plugins/asdf/asdf.plugin.zsh | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'plugins')

diff --git a/plugins/asdf/asdf.plugin.zsh b/plugins/asdf/asdf.plugin.zsh
index d563cf5f8..75395c718 100644
--- a/plugins/asdf/asdf.plugin.zsh
+++ b/plugins/asdf/asdf.plugin.zsh
@@ -1,12 +1,17 @@
-# Find where asdf should be installed.
+# Find where asdf should be installed
 ASDF_DIR="${ASDF_DIR:-$HOME/.asdf}"
 
-# Load asdf, if found.
-if [ -f $ASDF_DIR/asdf.sh ]; then
-    . $ASDF_DIR/asdf.sh
+# If not found, check for Homebrew package
+if [[ ! -d $ASDF_DIR ]] && (( $+commands[brew] )); then
+   ASDF_DIR="$(brew --prefix asdf)"
 fi
 
-# Load asdf completions, if found.
-if [ -f $ASDF_DIR/completions/asdf.bash ]; then
-    . $ASDF_DIR/completions/asdf.bash
+# Load command
+if [[ -f "$ASDF_DIR/asdf.sh" ]]; then
+    . "$ASDF_DIR/asdf.sh"
+
+    # Load completions
+    if [[ -f "$ASDF_DIR/completions/asdf.bash" ]]; then
+        . "$ASDF_DIR/completions/asdf.bash"
+    fi
 fi
-- 
cgit v1.2.3-70-g09d2


From e934624b32f8c370306355ab8a78667a5a6240d3 Mon Sep 17 00:00:00 2001
From: Tony Lotts <tonylotts@users.noreply.github.com>
Date: Wed, 8 Aug 2018 00:14:38 +0800
Subject: Add function to search Dash.app (#2557)

* Add function to search Dash

* Pass all arguements instead of just the first

* Adding docset completion with help from @kapeli and [arx]
---
 plugins/dash/dash.plugin.zsh | 86 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 86 insertions(+)
 create mode 100644 plugins/dash/dash.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/dash/dash.plugin.zsh b/plugins/dash/dash.plugin.zsh
new file mode 100644
index 000000000..5d0ec9a97
--- /dev/null
+++ b/plugins/dash/dash.plugin.zsh
@@ -0,0 +1,86 @@
+# Usage: dash [keyword:]query
+dash() { open dash://"$*" }
+compdef _dash dash
+
+_dash() {
+  # No sense doing this for anything except the 2nd position and if we haven't
+  # specified which docset to query against
+  if [[ $CURRENT -eq 2 && ! "$words[2]" =~ ":" ]]; then
+    local -a _all_docsets
+    _all_docsets=()
+    # Use defaults to get the array of docsets from preferences
+    # Have to smash it into one big line so that each docset is an element of
+    # our DOCSETS array
+    DOCSETS=("${(@f)$(defaults read com.kapeli.dash docsets | tr -d '\n' | grep -oE '\{.*?\}')}")
+
+    # remove all newlines since defaults prints so pretty like
+    # Now get each docset and output each on their own line
+    for doc in "$DOCSETS[@]"; do
+      # Only output docsets that are actually enabled
+      if [[ "`echo $doc | grep -Eo \"isEnabled = .*?;\" | sed 's/[^01]//g'`" == "0" ]]; then
+        continue
+      fi
+
+      keyword=''
+
+      # Order of preference as explained to me by @kapeli via email
+      KEYWORD_LOCATORS=(keyword suggestedKeyword platform)
+      for locator in "$KEYWORD_LOCATORS[@]"; do
+        # Echo the docset, try to find the appropriate keyword
+        # Strip doublequotes and colon from any keyword so that everything has the
+        # same format when output (we'll add the colon in the completion)
+        keyword=`echo $doc | grep -Eo "$locator = .*?;" | sed -e "s/$locator = \(.*\);/\1/" -e "s/[\":]//g"`
+        if [[ ! -z "$keyword" ]]; then
+          # if we fall back to platform, we should do some checking per @kapeli
+          if [[ "$locator" == "platform" ]]; then
+            # Since these are the only special cases right now, let's not do the
+            # expensive processing unless we have to
+            if [[ "$keyword" == "python" ||  "$keyword" == "java" || \
+                  "$keyword" == "qt" || "$keyword" == "cocs2d" ]]; then
+              docsetName=`echo $doc | grep -Eo "docsetName = .*?;" | sed -e "s/docsetName = \(.*\);/\1/" -e "s/[\":]//g"`
+              if [[ "$keyword" == "python" ]]; then
+                if [[ "$docsetName" == "Python 2" ]]; then
+                  keyword="python2"
+                elif [[ "$docsetName" == "Python 3" ]]; then
+                  keyword="python3"
+                fi
+              elif [[ "$keyword" == "java" ]]; then
+                if [[ "$docsetName" == "Java SE7" ]]; then
+                  keyword="java7"
+                elif [[ "$docsetName" == "Java SE6" ]]; then
+                  keyword="java6"
+                elif [[ "$docsetName" == "Java SE8" ]]; then
+                  keyword="java8"
+                fi
+              elif [[ "$keyword" == "qt" ]]; then
+                if [[ "$docsetName" == "Qt 5" ]]; then
+                  keyword="qt5"
+                elif [[ "$docsetName" == "Qt 4" ]]; then
+                  keyword="qt4"
+                elif [[ "$docsetName" == "Qt" ]]; then
+                  keyword="qt4"
+                fi
+              elif [[ "$keyword" == "cocos2d" ]]; then
+                if [[ "$docsetName" == "Cocos3D" ]]; then
+                  keyword="cocos3d"
+                fi
+              fi
+            fi
+          fi
+
+          # Bail once we have a match
+          break
+        fi
+      done
+
+      # If we have a keyword, add it to the list!
+      if [[ ! -z "$keyword" ]]; then
+        _all_docsets+=($keyword)
+      fi
+    done
+
+    # special thanks to [arx] on #zsh for getting me sorted on this piece
+    compadd -qS: -- "$_all_docsets[@]"
+    return
+  fi
+}
-- 
cgit v1.2.3-70-g09d2


From 19b925e741fa46d2222210469a4dffc34a634ebd Mon Sep 17 00:00:00 2001
From: Janosch Schwalm <janosch.schwalm@gmail.com>
Date: Tue, 7 Aug 2018 20:42:02 +0200
Subject: use https everywhere (#6574)

* use https everywhere

* use https links on the files that are left

Also, removed some broken links and updated redirections.
---
 lib/spectrum.zsh                                   |  2 +-
 lib/termsupport.zsh                                |  2 +-
 plugins/bbedit/README.md                           |  6 +++---
 plugins/bgnotify/README.md                         |  2 +-
 plugins/bwana/bwana.plugin.zsh                     |  4 ++--
 plugins/catimg/catimg.plugin.zsh                   |  2 +-
 plugins/catimg/catimg.sh                           |  2 +-
 plugins/coffee/_coffee                             |  4 ++--
 .../command-not-found/command-not-found.plugin.zsh |  2 +-
 plugins/debian/debian.plugin.zsh                   |  2 +-
 plugins/docker/_docker                             |  2 +-
 plugins/dotenv/README.md                           |  2 +-
 plugins/droplr/README.md                           |  2 +-
 plugins/ember-cli/README.md                        |  4 ++--
 plugins/ember-cli/ember-cli.plugin.zsh             |  2 +-
 plugins/emoji/README.md                            |  6 +++---
 plugins/emoji/emoji-data.txt                       |  4 ++--
 plugins/emoji/update_emoji.pl                      | 12 +++++------
 plugins/forklift/README.md                         |  2 +-
 plugins/frontend-search/README.md                  | 12 +++++------
 plugins/frontend-search/frontend-search.plugin.zsh | 10 ++++-----
 plugins/geeknote/README.md                         |  2 +-
 plugins/git-extras/README.md                       |  2 +-
 plugins/git-extras/git-extras.plugin.zsh           |  6 +++---
 plugins/git-flow-avh/git-flow-avh.plugin.zsh       |  4 ++--
 plugins/git-hubflow/git-hubflow.plugin.zsh         |  2 +-
 plugins/git-prompt/git-prompt.plugin.zsh           |  2 +-
 plugins/github/README.md                           |  6 +++---
 plugins/github/github.plugin.zsh                   |  4 ++--
 plugins/globalias/README.md                        |  2 +-
 plugins/hanami/README.md                           |  4 ++--
 plugins/history-substring-search/README.md         |  6 +++---
 plugins/httpie/README.md                           |  4 ++--
 plugins/jake-node/jake-node.plugin.zsh             |  4 ++--
 plugins/kitchen/_kitchen                           |  4 ++--
 plugins/kube-ps1/kube-ps1.plugin.zsh               |  2 +-
 plugins/lighthouse/lighthouse.plugin.zsh           |  2 +-
 plugins/lol/lol.plugin.zsh                         |  4 ++--
 plugins/mix-fast/README.md                         |  4 ++--
 plugins/osx/osx.plugin.zsh                         |  2 +-
 plugins/osx/spotify                                |  2 +-
 plugins/pass/_pass                                 |  2 +-
 plugins/per-directory-history/README.md            | 24 +++++++++++-----------
 .../per-directory-history.zsh                      |  2 +-
 plugins/percol/README.md                           |  3 ---
 plugins/perl/perl.plugin.zsh                       |  2 +-
 plugins/pod/_pod                                   |  2 +-
 plugins/pow/pow.plugin.zsh                         |  2 +-
 plugins/rake-fast/README.md                        |  2 +-
 plugins/repo/README.md                             |  2 +-
 plugins/safe-paste/safe-paste.plugin.zsh           |  4 ++--
 plugins/scala/_scala                               |  4 ++--
 plugins/scd/README.md                              |  4 ++--
 plugins/scw/_scw                                   |  2 +-
 plugins/shrink-path/README.md                      |  6 +++---
 plugins/shrink-path/shrink-path.plugin.zsh         |  6 +++---
 plugins/spring/README.md                           | 10 ++++-----
 plugins/sprunge/sprunge.plugin.zsh                 | 22 ++++++++++----------
 plugins/ssh-agent/README.md                        |  2 +-
 plugins/sublime/README.md                          |  2 +-
 plugins/svn/README.md                              |  2 +-
 plugins/systemadmin/systemadmin.plugin.zsh         |  1 -
 plugins/taskwarrior/README.md                      |  2 +-
 plugins/taskwarrior/_task                          |  2 +-
 plugins/textastic/README.md                        |  4 ++--
 plugins/ubuntu/ubuntu.plugin.zsh                   |  2 +-
 plugins/urltools/urltools.plugin.zsh               |  2 +-
 plugins/vault/README.md                            |  8 ++++----
 plugins/wp-cli/README.md                           |  6 +++---
 plugins/wp-cli/wp-cli.plugin.zsh                   |  2 +-
 plugins/xcode/xcode.plugin.zsh                     |  2 +-
 plugins/zsh-navigation-tools/LICENSE               |  8 ++++----
 themes/adben.zsh-theme                             |  6 +++---
 themes/agnoster.zsh-theme                          |  2 +-
 themes/arrow.zsh-theme                             |  2 +-
 themes/avit.zsh-theme                              |  2 +-
 themes/bira.zsh-theme                              |  2 +-
 themes/clean.zsh-theme                             |  2 +-
 themes/duellj.zsh-theme                            |  2 +-
 themes/funky.zsh-theme                             |  4 ++--
 themes/gnzh.zsh-theme                              |  1 -
 themes/half-life.zsh-theme                         |  4 ++--
 themes/itchy.zsh-theme                             |  2 --
 themes/jreese.zsh-theme                            |  2 --
 themes/lambda.zsh-theme                            |  2 --
 themes/lukerandall.zsh-theme                       |  2 +-
 themes/macovsky-ruby.zsh-theme                     |  2 +-
 themes/macovsky.zsh-theme                          |  2 +-
 themes/mh.zsh-theme                                |  4 ++--
 themes/michelebologna.zsh-theme                    | 10 ++++-----
 themes/mikeh.zsh-theme                             |  4 ++--
 themes/philips.zsh-theme                           |  2 +-
 themes/pmcgee.zsh-theme                            |  2 +-
 themes/rkj.zsh-theme                               |  2 +-
 themes/sorin.zsh-theme                             |  8 ++++----
 themes/sporty_256.zsh-theme                        |  2 +-
 themes/steeef.zsh-theme                            |  4 ++--
 themes/sunaku.zsh-theme                            |  1 -
 themes/tonotdo.zsh-theme                           |  4 ++--
 themes/xiong-chiamiov-plus.zsh-theme               |  2 +-
 themes/xiong-chiamiov.zsh-theme                    |  2 +-
 tools/theme_chooser.sh                             |  2 +-
 102 files changed, 187 insertions(+), 199 deletions(-)

(limited to 'plugins')

diff --git a/lib/spectrum.zsh b/lib/spectrum.zsh
index 87092d8ae..312ab2248 100644
--- a/lib/spectrum.zsh
+++ b/lib/spectrum.zsh
@@ -1,7 +1,7 @@
 #! /bin/zsh
 # A script to make using 256 colors in zsh less painful.
 # P.C. Shyamshankar <sykora@lucentbeing.com>
-# Copied from http://github.com/sykora/etc/blob/master/zsh/functions/spectrum/
+# Copied from https://github.com/sykora/etc/blob/master/zsh/functions/spectrum/
 
 typeset -AHg FX FG BG
 
diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 871ab28df..87d55ee89 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -80,7 +80,7 @@ preexec_functions+=(omz_termsupport_preexec)
 
 
 # Keep Apple Terminal.app's current working directory updated
-# Based on this answer: http://superuser.com/a/315029
+# Based on this answer: https://superuser.com/a/315029
 # With extra fixes to handle multibyte chars and non-UTF-8 locales
 
 if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]] && [[ -z "$INSIDE_EMACS" ]]; then
diff --git a/plugins/bbedit/README.md b/plugins/bbedit/README.md
index ec2b743d6..263c54c47 100644
--- a/plugins/bbedit/README.md
+++ b/plugins/bbedit/README.md
@@ -1,11 +1,11 @@
 ## bbedit
 
-Plugin for BBEdit, an HTML and text editor for Mac OS X 
+Plugin for BBEdit, an HTML and text editor for Mac OS X
 
 ### Requirements
 
- * [BBEdit](http://www.barebones.com/products/bbedit/)
- * [BBEdit Command-Line Tools](http://www.barebones.com/support/bbedit/cmd-line-tools.html)
+ * [BBEdit](https://www.barebones.com/products/bbedit/)
+ * [BBEdit Command-Line Tools](https://www.barebones.com/support/bbedit/cmd-line-tools.html)
 
 ### Usage
 
diff --git a/plugins/bgnotify/README.md b/plugins/bgnotify/README.md
index fad299159..1d8fac54d 100644
--- a/plugins/bgnotify/README.md
+++ b/plugins/bgnotify/README.md
@@ -13,7 +13,7 @@ Just add bgnotify to your plugins list in your `.zshrc`
 - On OS X you'll need [terminal-notifier](https://github.com/alloy/terminal-notifier)
   * `brew install terminal-notifier` (or `gem install terminal-notifier`)
 - On ubuntu you're already all set!
-- On windows you can use [notifu](http://www.paralint.com/projects/notifu/) or the Cygwin Ports libnotify package
+- On windows you can use [notifu](https://www.paralint.com/projects/notifu/) or the Cygwin Ports libnotify package
 
 
 ## Screenshots
diff --git a/plugins/bwana/bwana.plugin.zsh b/plugins/bwana/bwana.plugin.zsh
index 455da8621..b9a04793f 100644
--- a/plugins/bwana/bwana.plugin.zsh
+++ b/plugins/bwana/bwana.plugin.zsh
@@ -1,5 +1,5 @@
 #
-# Requires http://www.bruji.com/bwana/
+# Requires https://www.bruji.com/bwana/
 #
 if [[ -e /Applications/Bwana.app ]] ||
     ( system_profiler -detailLevel mini SPApplicationsDataType | grep -q Bwana )
@@ -9,5 +9,5 @@ then
   }
 else
   echo "Bwana lets you read man files in Safari through a man: URI scheme" 
-  echo "To use it within Zsh, install it from http://www.bruji.com/bwana/"
+  echo "To use it within Zsh, install it from https://www.bruji.com/bwana/"
 fi
diff --git a/plugins/catimg/catimg.plugin.zsh b/plugins/catimg/catimg.plugin.zsh
index cb92f5986..5f58ecde3 100644
--- a/plugins/catimg/catimg.plugin.zsh
+++ b/plugins/catimg/catimg.plugin.zsh
@@ -1,6 +1,6 @@
 ################################################################################
 # catimg script by Eduardo San Martin Morote aka Posva                         #
-# http://posva.net                                                             #
+# https://posva.net                                                            #
 #                                                                              #
 # Ouput the content of an image to the stdout using the 256 colors of the      #
 # terminal.                                                                    #
diff --git a/plugins/catimg/catimg.sh b/plugins/catimg/catimg.sh
index cd0f2e333..83ccf6a95 100755
--- a/plugins/catimg/catimg.sh
+++ b/plugins/catimg/catimg.sh
@@ -1,6 +1,6 @@
 ################################################################################
 # catimg script by Eduardo San Martin Morote aka Posva                         #
-# http://posva.net                                                             #
+# https://posva.net                                                            #
 #                                                                              #
 # Ouput the content of an image to the stdout using the 256 colors of the      #
 # terminal.                                                                    #
diff --git a/plugins/coffee/_coffee b/plugins/coffee/_coffee
index 10b6b8164..5e52b30e6 100644
--- a/plugins/coffee/_coffee
+++ b/plugins/coffee/_coffee
@@ -1,6 +1,6 @@
 #compdef coffee
 # ------------------------------------------------------------------------------
-# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# Copyright (c) 2011 Github zsh-users - https://github.com/zsh-users
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -28,7 +28,7 @@
 # Description
 # -----------
 #
-#  Completion script for Coffee.js v0.6.11 (http://coffeejs.org)
+#  Completion script for Coffee.js v0.6.11 (https://coffeescript.org)
 #
 # ------------------------------------------------------------------------------
 # Authors
diff --git a/plugins/command-not-found/command-not-found.plugin.zsh b/plugins/command-not-found/command-not-found.plugin.zsh
index 0e2f2133f..ba1262de6 100644
--- a/plugins/command-not-found/command-not-found.plugin.zsh
+++ b/plugins/command-not-found/command-not-found.plugin.zsh
@@ -1,5 +1,5 @@
 # Uses the command-not-found package zsh support
-# as seen in http://www.porcheron.info/command-not-found-for-zsh/
+# as seen in https://www.porcheron.info/command-not-found-for-zsh/
 # this is installed in Ubuntu
 
 [[ -e /etc/zsh_command_not_found ]] && source /etc/zsh_command_not_found
diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index 42690e53e..654b692d2 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -179,7 +179,7 @@ apt-copy() {
 #   apt-history remove
 #   apt-history rollback
 #   apt-history list
-# Based On: http://linuxcommando.blogspot.com/2008/08/how-to-show-apt-log-history.html
+# Based On: https://linuxcommando.blogspot.com/2008/08/how-to-show-apt-log-history.html
 apt-history () {
   case "$1" in
     install)
diff --git a/plugins/docker/_docker b/plugins/docker/_docker
index 32ad4848a..df4b44961 100644
--- a/plugins/docker/_docker
+++ b/plugins/docker/_docker
@@ -1,6 +1,6 @@
 #compdef docker dockerd
 #
-# zsh completion for docker (http://docker.com)
+# zsh completion for docker (https://docker.com)
 #
 # version:  0.3.0
 # github:   https://github.com/felixr/docker-zsh-completion
diff --git a/plugins/dotenv/README.md b/plugins/dotenv/README.md
index e0e75571f..e880e9d69 100644
--- a/plugins/dotenv/README.md
+++ b/plugins/dotenv/README.md
@@ -2,7 +2,7 @@
 
 Automatically load your project ENV variables from `.env` file when you `cd` into project root directory.
 
-Storing configuration in the environment is one of the tenets of a [twelve-factor app](http://www.12factor.net). Anything that is likely to change between deployment environments, such as resource handles for databases or credentials for external services, should be extracted from the code into environment variables.
+Storing configuration in the environment is one of the tenets of a [twelve-factor app](https://www.12factor.net). Anything that is likely to change between deployment environments, such as resource handles for databases or credentials for external services, should be extracted from the code into environment variables.
 
 ## Installation
 
diff --git a/plugins/droplr/README.md b/plugins/droplr/README.md
index 25cf61db7..6daa2540d 100644
--- a/plugins/droplr/README.md
+++ b/plugins/droplr/README.md
@@ -16,4 +16,4 @@ Author: [Fabio Fernandes](https://github.com/fabiofl)
 
 - Upload a file: `droplr ./path/to/file/`
 
-- Shorten a link: `droplr http://example.com`
+- Shorten a link: `droplr https://example.com`
diff --git a/plugins/ember-cli/README.md b/plugins/ember-cli/README.md
index 1f92bba32..2e4ed7068 100644
--- a/plugins/ember-cli/README.md
+++ b/plugins/ember-cli/README.md
@@ -1,8 +1,8 @@
 # Ember CLI
 
-**Maintainers:** [BilalBudhani](http://www.github.com/BilalBudhani), [eubenesa](http://www.github.com/eubenesa)
+**Maintainers:** [BilalBudhani](https://github.com/BilalBudhani), [eubenesa](https://github.com/eubenesa)
 
-Ember CLI (http://www.ember-cli.com/)
+Ember CLI (https://www.ember-cli.com/)
 
 ### List of Aliases
 
diff --git a/plugins/ember-cli/ember-cli.plugin.zsh b/plugins/ember-cli/ember-cli.plugin.zsh
index a0f346829..3d06fd2f5 100644
--- a/plugins/ember-cli/ember-cli.plugin.zsh
+++ b/plugins/ember-cli/ember-cli.plugin.zsh
@@ -1,5 +1,5 @@
 # Ember CLI
-# Visit http://www.ember-cli.com/ to view user guide
+# Visit https://www.ember-cli.com/ to view user guide
 
 alias es='ember serve'
 alias ea='ember addon'
diff --git a/plugins/emoji/README.md b/plugins/emoji/README.md
index 889e567e6..8b8860a86 100644
--- a/plugins/emoji/README.md
+++ b/plugins/emoji/README.md
@@ -71,7 +71,7 @@ PROMPT="$surfer  > "
 
 ##  Technical Details
 
-The emoji names and codes are sourced from Unicode Technical Report \#51, which provides information on emoji support in Unicode. It can be found at http://www.unicode.org/reports/tr51/index.html.
+The emoji names and codes are sourced from Unicode Technical Report \#51, which provides information on emoji support in Unicode. It can be found at https://www.unicode.org/reports/tr51/index.html.
 
 The group definitions are added by this OMZ plugin. They are not based on external definitions. (As far as I can tell. -apjanke)
 
@@ -108,7 +108,7 @@ The `$emoji_skintone` associative array maps skin tone IDs to the variation sele
 echo "$emoji[smiling_face_with_open_mouth]$emoji_skintone[4]"
 ```
 
-Note that `$emoji_skintone` is an associative array, and its keys are the *names* of "Fitzpatrick Skin Type" groups, not linear indexes into a normal array. The names are `1_2`, `3`, `4`, `5`, and `6`. (Types 1 and 2 are combined into a single color.) See the [Diversity section in Unicode TR 51](http://www.unicode.org/reports/tr51/index.html#Diversity) for details.
+Note that `$emoji_skintone` is an associative array, and its keys are the *names* of "Fitzpatrick Skin Type" groups, not linear indexes into a normal array. The names are `1_2`, `3`, `4`, `5`, and `6`. (Types 1 and 2 are combined into a single color.) See the [Diversity section in Unicode TR 51](https://www.unicode.org/reports/tr51/index.html#Diversity) for details.
 
 ##  TODO
 
@@ -130,6 +130,6 @@ This does *not* mean that it should use Gemoji at run time. None of the `zsh` pl
 
 ####  ZWJ combining function
 
-One of the newer features of Unicode emoji is the ability to use the "Zero-Width Joiner" character to compose multiple emoji characters in to a single "emoji ligature" glyph. For example, this is [how Apple supports "family" emoji with various genders and skin tones](http://www.unicode.org/reports/tr51/index.html#ZWJ_Sequences).
+One of the newer features of Unicode emoji is the ability to use the "Zero-Width Joiner" character to compose multiple emoji characters in to a single "emoji ligature" glyph. For example, this is [how Apple supports "family" emoji with various genders and skin tones](https://www.unicode.org/reports/tr51/index.html#ZWJ_Sequences).
 
 These are a pain to write out (and probably worse to read), and it might be convenient to have a couple functions for concisely composing them, if wider support for them appears.
diff --git a/plugins/emoji/emoji-data.txt b/plugins/emoji/emoji-data.txt
index 7b4c015f7..2d6d64e2b 100644
--- a/plugins/emoji/emoji-data.txt
+++ b/plugins/emoji/emoji-data.txt
@@ -17,7 +17,7 @@
 #             none:      not applicable
 #   Field 4 — Emoji_Sources:
 #             one or more values from {z, a, j, w, x}
-#             see the key in http://www.unicode.org/draft/reports/tr51/tr51.html#Major_Sources
+#             see the key in https://www.unicode.org/draft/reports/tr51/tr51.html#Major_Sources
 #             NA:        not applicable
 #   Comment — currently contains the version where the character was first encoded,
 #             followed by:
@@ -1200,7 +1200,7 @@
 1F1F2 1F1ED ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇭) flag for Marshall Islands
 1F1F2 1F1F0 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇰) flag for Macedonia
 1F1F2 1F1F1 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇱) flag for Mali
-1F1F2 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇲) flag for Myanmar 
+1F1F2 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇲) flag for Myanmar
 1F1F2 1F1F3 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇳) flag for Mongolia
 1F1F2 1F1F4 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇴) flag for Macau
 1F1F2 1F1F5 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇵) flag for Northern Mariana Islands
diff --git a/plugins/emoji/update_emoji.pl b/plugins/emoji/update_emoji.pl
index 04f3ce8e7..8034052b7 100644
--- a/plugins/emoji/update_emoji.pl
+++ b/plugins/emoji/update_emoji.pl
@@ -5,15 +5,15 @@
 # This script generates the emoji.plugin.zsh emoji definitions from the Unicode
 # character data for the emoji characters.
 #
-# The data file can be found at http://unicode.org/Public/emoji/latest/emoji-data.txt
-# as referenced in Unicode TR51 (http://www.unicode.org/reports/tr51/index.html).
+# The data file can be found at https://unicode.org/Public/emoji/latest/emoji-data.txt
+# as referenced in Unicode TR51 (https://www.unicode.org/reports/tr51/index.html).
 #
 # This is known to work with the data file from version 1.0. It may not work with later
 # versions if the format changes. In particular, this reads line comments to get the
 # emoji character name and unicode version.
 #
 # Country names have punctuation and other non-letter characters removed from their name,
-# to avoid possible complications with having to escape the strings when using them as 
+# to avoid possible complications with having to escape the strings when using them as
 # array subscripts. The definition file seems to use some combining characters like accents
 # that get stripped during this process.
 
@@ -41,7 +41,7 @@ sub process_emoji_data_file {
 #
 # This contains the definition for:
 #   \$emoji         - which maps character names to Unicode characters
-#   \$emoji_flags   - maps country names to Unicode flag characters using region indicators 
+#   \$emoji_flags   - maps country names to Unicode flag characters using region indicators
 
 # Main emoji
 typeset -gAH emoji
@@ -63,7 +63,7 @@ typeset -gAH emoji_mod
 		next if /^\s*#/ or /^\s*$/;
 
 		if (/^(\S.*?\S)\s*;\s*(\w+)\s*;\s*(\w+)\s*;\s*(\w+)\s*;\s*(\w.*?)\s*#\s*V(\S+)\s\(.*?\)\s*(\w.*\S)\s*$/) {
-			my ($code, $style, $level, $modifier_status, $sources, $version, $keycap_name) 
+			my ($code, $style, $level, $modifier_status, $sources, $version, $keycap_name)
 				= ($1, $2, $3, $4, $5, $6, $7);
 			#print "code=$code style=$style level=$level modifier_status=$modifier_status sources=$sources version=$version name=$keycap_name\n";
 			my @code_points = split /\s+/, $code;
@@ -84,7 +84,7 @@ typeset -gAH emoji_mod
 			if ($flag_country) {
 				$outfh->print("emoji_flags[$zsh_flag_country]=\$'$zsh_code'\n");
 			} else {
-				$outfh->print("emoji[$omz_name]=\$'$zsh_code'\n");				
+				$outfh->print("emoji[$omz_name]=\$'$zsh_code'\n");
 			}
 			# Modifiers are included in both the main set and their separate map,
 			# because they have a standalone representation as a color swatch.
diff --git a/plugins/forklift/README.md b/plugins/forklift/README.md
index 6c5cbab23..6c4ce1e81 100644
--- a/plugins/forklift/README.md
+++ b/plugins/forklift/README.md
@@ -4,7 +4,7 @@ Plugin for ForkLift, an FTP application for OS X.
 
 ### Requirements
 
-* [ForkLift](http://www.binarynights.com/forklift/)
+* [ForkLift](https://binarynights.com/)
 
 ### Usage
 
diff --git a/plugins/frontend-search/README.md b/plugins/frontend-search/README.md
index 4d956e38f..f06e79102 100644
--- a/plugins/frontend-search/README.md
+++ b/plugins/frontend-search/README.md
@@ -35,13 +35,13 @@ Available search contexts are:
 | angularjs     | `https://google.com/search?as_sitesearch=angularjs.org&as_q=`            |
 | aurajs        | `http://aurajs.com/api/#stq=`                                            |
 | bem           | `https://google.com/search?as_sitesearch=bem.info&as_q=`                 |
-| bootsnipp     | `http://bootsnipp.com/search?q=`                                         |
-| caniuse       | `http://caniuse.com/#search=`                                            |
-| codepen       | `http://codepen.io/search?q=`                                            |
+| bootsnipp     | `https://bootsnipp.com/search?q=`                                         |
+| caniuse       | `https://caniuse.com/#search=`                                            |
+| codepen       | `https://codepen.io/search?q=`                                            |
 | compassdoc    | `http://compass-style.org/search?q=`                                     |
 | cssflow       | `http://www.cssflow.com/search?q=`                                       |
 | dartlang      | `https://api.dartlang.org/apidocs/channels/stable/dartdoc-viewer/dart:`  |
-| emberjs       | `http://emberjs.com/api/#stp=1&stq=`                                     |
+| emberjs       | `https://emberjs.com/api/#stp=1&stq=`                                     |
 | fontello      | `http://fontello.com/#search=`                                           |
 | html5please   | `http://html5please.com/#`                                               |
 | jquery        | `https://api.jquery.com/?s=`                                             |
@@ -51,7 +51,7 @@ Available search contexts are:
 | qunit         | `https://api.qunitjs.com/?s=`                                            |
 | reactjs       | `https://google.com/search?as_sitesearch=facebook.github.io/react&as_q=` |
 | smacss        | `https://google.com/search?as_sitesearch=smacss.com&as_q=`               |
-| stackoverflow | `http://stackoverflow.com/search?q=`                                     |
+| stackoverflow | `https://stackoverflow.com/search?q=`                                     |
 | unheap        | `http://www.unheap.com/?s=`                                              |
 
 If you want to have another context, open an Issue and tell us!
@@ -62,4 +62,4 @@ If you want to have another context, open an Issue and tell us!
 **Wilson Mendes (willmendesneto)**
 + <https://plus.google.com/+WilsonMendes>
 + <https://twitter.com/willmendesneto>
-+ <http://github.com/willmendesneto>
++ <https://github.com/willmendesneto>
diff --git a/plugins/frontend-search/frontend-search.plugin.zsh b/plugins/frontend-search/frontend-search.plugin.zsh
index 3fd49ab8e..14877fb0d 100644
--- a/plugins/frontend-search/frontend-search.plugin.zsh
+++ b/plugins/frontend-search/frontend-search.plugin.zsh
@@ -29,13 +29,13 @@ function frontend() {
     angularjs      'https://google.com/search?as_sitesearch=angularjs.org&as_q='
     aurajs         'http://aurajs.com/api/#stq='
     bem            'https://google.com/search?as_sitesearch=bem.info&as_q='
-    bootsnipp      'http://bootsnipp.com/search?q='
-    caniuse        'http://caniuse.com/#search='
-    codepen        'http://codepen.io/search?q='
+    bootsnipp      'https://bootsnipp.com/search?q='
+    caniuse        'https://caniuse.com/#search='
+    codepen        'https://codepen.io/search?q='
     compassdoc     'http://compass-style.org/search?q='
     cssflow        'http://www.cssflow.com/search?q='
     dartlang       'https://api.dartlang.org/apidocs/channels/stable/dartdoc-viewer/dart:'
-    emberjs        'http://emberjs.com/api/#stp=1&stq='
+    emberjs        'https://emberjs.com/api/#stp=1&stq='
     fontello       'http://fontello.com/#search='
     html5please    'http://html5please.com/#'
     jquery         'https://api.jquery.com/?s='
@@ -45,7 +45,7 @@ function frontend() {
     qunit          'https://api.qunitjs.com/?s='
     reactjs        'https://google.com/search?as_sitesearch=facebook.github.io/react&as_q='
     smacss         'https://google.com/search?as_sitesearch=smacss.com&as_q='
-    stackoverflow  'http://stackoverflow.com/search?q='
+    stackoverflow  'https://stackoverflow.com/search?q='
     unheap         'http://www.unheap.com/?s='
   )
 
diff --git a/plugins/geeknote/README.md b/plugins/geeknote/README.md
index a6b50e27f..3f2353112 100644
--- a/plugins/geeknote/README.md
+++ b/plugins/geeknote/README.md
@@ -1,6 +1,6 @@
 ## ZSH-Geeknote
 
-[Geeknote](https://github.com/VitaliyRodnenko/geeknote) plugin for [oh-my-zsh framework](http://github.com/robbyrussell/oh-my-zsh).
+[Geeknote](https://github.com/VitaliyRodnenko/geeknote) plugin for oh-my-zsh.
 
 Plugins provides:
 
diff --git a/plugins/git-extras/README.md b/plugins/git-extras/README.md
index 8f12e297e..987f0d800 100644
--- a/plugins/git-extras/README.md
+++ b/plugins/git-extras/README.md
@@ -1,6 +1,6 @@
 # git-extras
 
-This plugin provides completion definitions for some of the commands defined by [git-extras](http://github.com/tj/git-extras).
+This plugin provides completion definitions for some of the commands defined by [git-extras](https://github.com/tj/git-extras).
 
 ##  Setup notes
 
diff --git a/plugins/git-extras/git-extras.plugin.zsh b/plugins/git-extras/git-extras.plugin.zsh
index 0dcd630e8..afc1679cc 100644
--- a/plugins/git-extras/git-extras.plugin.zsh
+++ b/plugins/git-extras/git-extras.plugin.zsh
@@ -2,7 +2,7 @@
 # Description
 # -----------
 #
-#  Completion script for git-extras (http://github.com/tj/git-extras).
+#  Completion script for git-extras (https://github.com/tj/git-extras).
 #
 #  This depends on and reuses some of the internals of the _git completion
 #  function that ships with zsh itself. It will not work with the _git that ships
@@ -19,8 +19,8 @@
 # Inspirations
 # -----------
 #
-#  * git-extras (http://github.com/tj/git-extras)
-#  * git-flow-completion (http://github.com/bobthecow/git-flow-completion)
+#  * git-extras (https://github.com/tj/git-extras)
+#  * git-flow-completion (https://github.com/bobthecow/git-flow-completion)
 #
 # ------------------------------------------------------------------------------
 
diff --git a/plugins/git-flow-avh/git-flow-avh.plugin.zsh b/plugins/git-flow-avh/git-flow-avh.plugin.zsh
index 1f3fa1e28..db8b5ff89 100755
--- a/plugins/git-flow-avh/git-flow-avh.plugin.zsh
+++ b/plugins/git-flow-avh/git-flow-avh.plugin.zsh
@@ -5,8 +5,8 @@
 #
 # To achieve git-flow completion nirvana:
 #
-#  0. Update your zsh's git-completion module to the newest verion.
-#     From here. http://zsh.git.sourceforge.net/git/gitweb.cgi?p=zsh/zsh;a=blob_plain;f=Completion/Unix/Command/_git;hb=HEAD
+#  0. Update your zsh's git-completion module to the newest version.
+#     From here: https://github.com/zsh-users/zsh/blob/master/Completion/Unix/Command/_git
 #
 #  1. Install this file. Either:
 #
diff --git a/plugins/git-hubflow/git-hubflow.plugin.zsh b/plugins/git-hubflow/git-hubflow.plugin.zsh
index b0157c7a1..8d968229f 100644
--- a/plugins/git-hubflow/git-hubflow.plugin.zsh
+++ b/plugins/git-hubflow/git-hubflow.plugin.zsh
@@ -6,7 +6,7 @@
 # To achieve git-hubflow completion nirvana:
 #
 #  0. Update your zsh's git-completion module to the newest version.
-#     From here. http://zsh.git.sourceforge.net/git/gitweb.cgi?p=zsh/zsh;a=blob_plain;f=Completion/Unix/Command/_git;hb=HEAD
+#     From here: https://github.com/zsh-users/zsh/blob/master/Completion/Unix/Command/_git
 #
 #  1. Install this file. Either:
 #
diff --git a/plugins/git-prompt/git-prompt.plugin.zsh b/plugins/git-prompt/git-prompt.plugin.zsh
index 5175bf70f..2776f297f 100644
--- a/plugins/git-prompt/git-prompt.plugin.zsh
+++ b/plugins/git-prompt/git-prompt.plugin.zsh
@@ -1,5 +1,5 @@
 # ZSH Git Prompt Plugin from:
-# http://github.com/olivierverdier/zsh-git-prompt
+# https://github.com/olivierverdier/zsh-git-prompt
 
 __GIT_PROMPT_DIR="${0:A:h}"
 
diff --git a/plugins/github/README.md b/plugins/github/README.md
index fea607876..2b66e390f 100644
--- a/plugins/github/README.md
+++ b/plugins/github/README.md
@@ -11,14 +11,14 @@ This plugin supports working with GitHub from the command line. It provides a fe
 * `empty_gh` - Creates a new empty repo (with a `README.md`) and pushes it to GitHub
 * `new_gh` - Initializes an existing directory as a repo and pushes it to GitHub
 * `exist_gh` - Takes an existing repo and pushes it to GitHub
-* `git.io` - Shortens a URL using [git.io](http://git.io)
+* `git.io` - Shortens a URL using [git.io](https://git.io)
 
 
 ##  Installation
 
-[Hub](http://github.com/github/hub) needs to be installed if you want to use it. On OS X with Homebrew, this can be done with `brew install hub`. The `hub` completion definition needs to be added to your `$FPATH` before initializing OMZ.
+[Hub](https://github.com/github/hub) needs to be installed if you want to use it. On OS X with Homebrew, this can be done with `brew install hub`. The `hub` completion definition needs to be added to your `$FPATH` before initializing OMZ.
 
-The [`github` Ruby gem](http://github.com/defunkt/github-gem) needs to be installed if you want to use it.
+The [`github` Ruby gem](https://github.com/defunkt/github-gem) needs to be installed if you want to use it.
 
 ###  Configuration
 
diff --git a/plugins/github/github.plugin.zsh b/plugins/github/github.plugin.zsh
index 077f07bd4..fd19fb524 100644
--- a/plugins/github/github.plugin.zsh
+++ b/plugins/github/github.plugin.zsh
@@ -1,4 +1,4 @@
-# Set up hub wrapper for git, if it is available; http://github.com/github/hub
+# Set up hub wrapper for git, if it is available; https://github.com/github/hub
 if (( $+commands[hub] )); then
   alias git=hub
 fi
@@ -63,7 +63,7 @@ exist_gh() { # [DIRECTORY]
 # git.io "GitHub URL"
 #
 # Shorten GitHub url, example:
-#   https://github.com/nvogel/dotzsh    >   http://git.io/8nU25w  
+#   https://github.com/nvogel/dotzsh    >   https://git.io/8nU25w
 # source: https://github.com/nvogel/dotzsh
 # documentation: https://github.com/blog/985-git-io-github-url-shortener
 #
diff --git a/plugins/globalias/README.md b/plugins/globalias/README.md
index ba9888ccb..0b064105d 100644
--- a/plugins/globalias/README.md
+++ b/plugins/globalias/README.md
@@ -2,7 +2,7 @@
 
 Expands all glob expressions, subcommands and aliases (including global).
 
-Idea from: http://blog.patshead.com/2012/11/automatically-expaning-zsh-global-aliases---simplified.html.
+Idea from: https://blog.patshead.com/2012/11/automatically-expaning-zsh-global-aliases---simplified.html.
 
 ## Usage
 
diff --git a/plugins/hanami/README.md b/plugins/hanami/README.md
index ef3451faf..3ac8defbb 100644
--- a/plugins/hanami/README.md
+++ b/plugins/hanami/README.md
@@ -1,12 +1,12 @@
 # Hanami Plugin #
-This plugin adds convenient ways to work with [Hanami](http://hanamirb.org/) via console.
+This plugin adds convenient ways to work with [Hanami](https://hanamirb.org/) via console.
 It's inspired by Rails plugin, so if you've used it, you'll feel like home.
 
 ## Usage ##
 
 For example, type `hc` into your console when you're within Hanami project directory to run
 the application console. Have a look at available shortcuts below. You can read more about
-these commands [on the official website](http://hanamirb.org/guides/command-line/applications/).
+these commands [on the official website](https://hanamirb.org/guides/command-line/applications/).
 
 ## Aliases ##
 
diff --git a/plugins/history-substring-search/README.md b/plugins/history-substring-search/README.md
index 0c02e91b1..7fb0fa0b6 100644
--- a/plugins/history-substring-search/README.md
+++ b/plugins/history-substring-search/README.md
@@ -6,9 +6,9 @@ feature, where you can type in any part of any previously entered command
 and press the UP and DOWN arrow keys to cycle through the matching commands.
 You can also use K and J in VI mode or ^P and ^N in EMACS mode for the same.
 
-[1]: http://fishshell.com
-[2]: http://www.zsh.org/mla/users/2009/msg00818.html
-[3]: http://sourceforge.net/projects/fizsh/
+[1]: https://fishshell.com
+[2]: https://www.zsh.org/mla/users/2009/msg00818.html
+[3]: https://sourceforge.net/projects/fizsh/
 [4]: https://github.com/robbyrussell/oh-my-zsh/pull/215
 [5]: https://github.com/zsh-users/zsh-history-substring-search
 [6]: https://github.com/zsh-users/zsh-syntax-highlighting
diff --git a/plugins/httpie/README.md b/plugins/httpie/README.md
index 1d4ec48bd..56aa6a8ca 100644
--- a/plugins/httpie/README.md
+++ b/plugins/httpie/README.md
@@ -1,6 +1,6 @@
 ## HTTPie
 **Maintainer:** [lululau](https://github.com/lululau)
 
-This plugin adds completion for HTTPie, which is a command line HTTP client, a user-friendly cURL replacement. 
+This plugin adds completion for HTTPie, which is a command line HTTP client, a user-friendly cURL replacement.
 
-[HTTPie Homepage](http://httpie.org)
+[HTTPie Homepage](https://httpie.org)
diff --git a/plugins/jake-node/jake-node.plugin.zsh b/plugins/jake-node/jake-node.plugin.zsh
index a9eef4029..3b692f899 100644
--- a/plugins/jake-node/jake-node.plugin.zsh
+++ b/plugins/jake-node/jake-node.plugin.zsh
@@ -3,7 +3,7 @@
 # Warning : Jakefile should have the right case : Jakefile or jakefile
 # Tested on : MacOSX 10.7 (Lion), Ubuntu 11.10
 # Author : Alexandre Lacheze (@al3xstrat)
-# Inspiration : http://weblog.rubyonrails.org/2006/3/9/fast-rake-task-completion-for-zsh 
+# Inspiration : https://weblog.rubyonrails.org/2006/3/9/fast-rake-task-completion-for-zsh
 
 function _jake () {
   if [ -f Jakefile ]||[ -f jakefile ]; then
@@ -11,4 +11,4 @@ function _jake () {
   fi
 }
 
-compdef _jake jake
\ No newline at end of file
+compdef _jake jake
diff --git a/plugins/kitchen/_kitchen b/plugins/kitchen/_kitchen
index dee5c5809..29a3125e4 100644
--- a/plugins/kitchen/_kitchen
+++ b/plugins/kitchen/_kitchen
@@ -1,6 +1,6 @@
 #compdef kitchen
 # ------------------------------------------------------------------------------
-# Copyright (c) 2014 Github zsh-users - http://github.com/zsh-users
+# Copyright (c) 2014 Github zsh-users - https://github.com/zsh-users
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -28,7 +28,7 @@
 # Description
 # -----------
 #
-#  Completion script for Test Kitchen (http://kitchen.ci/).
+#  Completion script for Test Kitchen (https://kitchen.ci/).
 #
 # ------------------------------------------------------------------------------
 # Authors
diff --git a/plugins/kube-ps1/kube-ps1.plugin.zsh b/plugins/kube-ps1/kube-ps1.plugin.zsh
index fadef80d7..df7277a26 100644
--- a/plugins/kube-ps1/kube-ps1.plugin.zsh
+++ b/plugins/kube-ps1/kube-ps1.plugin.zsh
@@ -10,7 +10,7 @@
 # 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
+#     https://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,
diff --git a/plugins/lighthouse/lighthouse.plugin.zsh b/plugins/lighthouse/lighthouse.plugin.zsh
index 48cddbccc..4a47b6010 100644
--- a/plugins/lighthouse/lighthouse.plugin.zsh
+++ b/plugins/lighthouse/lighthouse.plugin.zsh
@@ -1,7 +1,7 @@
 # To use: add a .lighthouse file into your directory with the URL to the
 # individual project. For example:
 # https://rails.lighthouseapp.com/projects/8994
-# Example usage: http://screencast.com/t/ZDgwNDUwNT
+# Example usage: https://screencast.com/t/ZDgwNDUwNT
 open_lighthouse_ticket () {
   if [ ! -f .lighthouse-url ]; then
     echo "There is no .lighthouse-url file in the current directory..."
diff --git a/plugins/lol/lol.plugin.zsh b/plugins/lol/lol.plugin.zsh
index e9a62a863..585f96e4f 100644
--- a/plugins/lol/lol.plugin.zsh
+++ b/plugins/lol/lol.plugin.zsh
@@ -1,5 +1,5 @@
 # LOL!!1
-# Source: http://aur.archlinux.org/packages/lolbash/lolbash/lolbash.sh
+# Source: https://aur.archlinux.org/packages/lolbash/lolbash/lolbash.sh
 
 alias wtf='dmesg'
 alias onoz='cat /var/log/errors.log'
@@ -45,7 +45,7 @@ alias bringz='git pull'
 alias chicken='git add'
 alias oanward='git commit -m'
 alias ooanward='git commit -am'
-alias yolo='git commit -m "$(curl -s whatthecommit.com/index.txt)"'
+alias yolo='git commit -m "$(curl -s https://whatthecommit.com/index.txt)"'
 alias letcat='git checkout'
 alias violenz='git rebase'
 
diff --git a/plugins/mix-fast/README.md b/plugins/mix-fast/README.md
index 9a5eccc3f..644f12409 100644
--- a/plugins/mix-fast/README.md
+++ b/plugins/mix-fast/README.md
@@ -8,7 +8,7 @@ to update cache you should remove .mix_tasks file
 
 Inspired by and based on rake-fast zsh plugin.
 
-This is entirely based on [this pull request by Ullrich Schäfer](https://github.com/robb/.dotfiles/pull/10/), which is inspired by [this Ruby on Rails trick from 2006](http://weblog.rubyonrails.org/2006/3/9/fast-mix-task-completion-for-zsh/).
+This is entirely based on [this pull request by Ullrich Schäfer](https://github.com/robb/.dotfiles/pull/10/), which is inspired by [this Ruby on Rails trick from 2006](https://weblog.rubyonrails.org/2006/3/9/fast-rake-task-completion-for-zsh/).
 
 
 ## Installation
@@ -25,4 +25,4 @@ You might consider adding `.mix_tasks` to your [global .gitignore](https://help.
 
 `mix`, then press tab
 
-Currently maintained by [styx](https://github.com/styx/)
\ No newline at end of file
+Currently maintained by [styx](https://github.com/styx/)
diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index b7d6aca72..d99cf0b1e 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -241,7 +241,7 @@ if [[ ! -z "$playlist" ]]; then
 
 			case "$state" in
 				on|off)
-					# Inspired by: http://stackoverflow.com/a/14675583
+					# Inspired by: https://stackoverflow.com/a/14675583
 					osascript 1>/dev/null 2>&1 <<-EOF
 					tell application "System Events" to perform action "AXPress" of (menu item "${state}" of menu "Shuffle" of menu item "Shuffle" of menu "Controls" of menu bar item "Controls" of menu bar 1 of application process "iTunes" )
 EOF
diff --git a/plugins/osx/spotify b/plugins/osx/spotify
index 69f6c5419..2ab98d3a0 100644
--- a/plugins/osx/spotify
+++ b/plugins/osx/spotify
@@ -408,7 +408,7 @@ while [ $# -gt 0 ]; do
             uri=`osascript -e 'tell application "Spotify" to spotify url of current track'`;
             remove='spotify:track:'
             url=${uri#$remove}
-            url="http://open.spotify.com/track/$url"
+            url="https://open.spotify.com/track/$url"
 
             if [ "$2" = "" ]; then
                 cecho "Spotify URL: $url"
diff --git a/plugins/pass/_pass b/plugins/pass/_pass
index 7a9b1f955..715229e76 100644
--- a/plugins/pass/_pass
+++ b/plugins/pass/_pass
@@ -8,7 +8,7 @@
 # All Rights Reserved.
 #
 # This file is licensed under the GPLv2+.
-# Please visit http://git.zx2c4.com/password-store/tree/COPYING for more information.
+# Please visit https://git.zx2c4.com/password-store/tree/COPYING for more information.
 #
 # Oh my zsh plugin maintainer: Santiago Borrazás <sanbor@gmail.com>
 
diff --git a/plugins/per-directory-history/README.md b/plugins/per-directory-history/README.md
index 196f74e6c..ea445d329 100644
--- a/plugins/per-directory-history/README.md
+++ b/plugins/per-directory-history/README.md
@@ -4,13 +4,13 @@
 Per directory history for zsh, as well as global history, and the
 ability to toggle between them with ^G.
 
-This is a implementation of per directory history for zsh, some 
-implementations of which exist in bash[1][],[2][].  It also implements 
-a per-directory-history-toggle-history function to change from using the 
-directory history to using the global history.  In both cases the history is 
-always saved to both the global history and the directory history, so the 
-toggle state will not effect the saved histories.  Being able to switch 
-between global and directory histories on the fly is a novel feature as far 
+This is a implementation of per directory history for zsh, some
+implementations of which exist in bash[1][],[2][].  It also implements
+a per-directory-history-toggle-history function to change from using the
+directory history to using the global history.  In both cases the history is
+always saved to both the global history and the directory history, so the
+toggle state will not effect the saved histories.  Being able to switch
+between global and directory histories on the fly is a novel feature as far
 as I am aware.
 
 This is a standalone repository for the script, however it is also included in
@@ -34,7 +34,7 @@ Usage
 Configuration
 -------------------------------------------------------------------------------
 
-* HISTORY_BASE a global variable that defines the base directory in which the 
+* HISTORY_BASE a global variable that defines the base directory in which the
   directory histories are stored
 * per-directory-history-toggle-history is the function to toggle the history
 
@@ -42,14 +42,14 @@ Configuration
 History
 -------------------------------------------------------------------------------
 
-The idea/inspiration for a per directory history is from [Stewart MacArthur][1] 
-and [Dieter][2], the implementation idea is from [Bart Schaefer][3].  The 
+The idea/inspiration for a per directory history is from [Stewart MacArthur][1]
+and [Dieter][2], the implementation idea is from [Bart Schaefer][3].  The
 implementation is by [Jim Hester][5] in September 2012.
 
 [1]: http://www.compbiome.com/2010/07/bash-per-directory-bash-history.html
 [2]: http://dieter.plaetinck.be/per_directory_bash
-[3]: http://www.zsh.org/mla/users/1997/msg00226.html
+[3]: https://www.zsh.org/mla/users/1997/msg00226.html
 [4]: https://github.com/robbyrussell/oh-my-zsh
 [5]: http://jimhester.com
-[6]: http://github.com/jimhester/per-directory-history
+[6]: https://github.com/jimhester/per-directory-history
 
diff --git a/plugins/per-directory-history/per-directory-history.zsh b/plugins/per-directory-history/per-directory-history.zsh
index 1242dc420..53ad963e7 100644
--- a/plugins/per-directory-history/per-directory-history.zsh
+++ b/plugins/per-directory-history/per-directory-history.zsh
@@ -26,7 +26,7 @@
 #
 # [1]: http://www.compbiome.com/2010/07/bash-per-directory-bash-history.html
 # [2]: http://dieter.plaetinck.be/per_directory_bash
-# [3]: http://www.zsh.org/mla/users/1997/msg00226.html
+# [3]: https://www.zsh.org/mla/users/1997/msg00226.html
 #
 ################################################################################
 #
diff --git a/plugins/percol/README.md b/plugins/percol/README.md
index 97cca6876..b262e414e 100644
--- a/plugins/percol/README.md
+++ b/plugins/percol/README.md
@@ -2,9 +2,6 @@
 
 Provides some useful function to make [percol](https://github.com/mooz/percol) work with zsh history and [jump plugin](https://github.com/robbyrussell/oh-my-zsh/blob/master/plugins/jump/jump.plugin.zsh)
 
-### Preview
-![Preview](http://t1.qpic.cn/mblogpic/eb1c8f9d2b9f62d19fa8/2000.jpg)
-
 ### Requirements
 
 ```shell
diff --git a/plugins/perl/perl.plugin.zsh b/plugins/perl/perl.plugin.zsh
index 1fbf7c122..678e88d97 100644
--- a/plugins/perl/perl.plugin.zsh
+++ b/plugins/perl/perl.plugin.zsh
@@ -21,7 +21,7 @@ alias pd='perldoc'
 alias ple='perl -wlne'
 
 # show the latest stable release of Perl
-alias latest-perl='curl -s http://www.perl.org/get.html | perl -wlne '\''if (/perl\-([\d\.]+)\.tar\.gz/) { print $1; exit;}'\'
+alias latest-perl='curl -s https://www.perl.org/get.html | perl -wlne '\''if (/perl\-([\d\.]+)\.tar\.gz/) { print $1; exit;}'\'
 
 
 
diff --git a/plugins/pod/_pod b/plugins/pod/_pod
index 508a47102..80d23daad 100644
--- a/plugins/pod/_pod
+++ b/plugins/pod/_pod
@@ -7,7 +7,7 @@
 # -----------------------------------------------------------------------------
 #          FILE:  _pod
 #   DESCRIPTION:  Cocoapods (0.33.1) autocomplete plugin for Oh-My-Zsh
-#                 http://cocoapods.org
+#                 https://cocoapods.org
 #                 Generated with `pod --completion-script
 #        AUTHOR:  Alexandre Joly (alexandre.joly@mekanics.ch)
 #        GITHUB:  https://github.com/mekanics
diff --git a/plugins/pow/pow.plugin.zsh b/plugins/pow/pow.plugin.zsh
index ded3336a7..0b8ccd15b 100644
--- a/plugins/pow/pow.plugin.zsh
+++ b/plugins/pow/pow.plugin.zsh
@@ -73,7 +73,7 @@ powed(){
 }
 
 # Restart pow process
-# taken from http://www.matthewratzloff.com/blog/2011/12/23/restarting-pow-when-dns-stops-responding
+# taken from https://www.matthewratzloff.com
 repow(){
   lsof | grep 20560 | awk '{print $2}' | xargs kill -9
   launchctl unload ~/Library/LaunchAgents/cx.pow.powd.plist
diff --git a/plugins/rake-fast/README.md b/plugins/rake-fast/README.md
index 1417befa1..23cbd80fc 100644
--- a/plugins/rake-fast/README.md
+++ b/plugins/rake-fast/README.md
@@ -8,7 +8,7 @@ checks the file modification time to see if it needs to regenerate the cache
 file.
 
 This is entirely based on [this pull request by Ullrich Schäfer](https://github.com/robb/.dotfiles/pull/10/),
-which is inspired by [this Ruby on Rails trick from 2006](http://weblog.rubyonrails.org/2006/3/9/fast-rake-task-completion-for-zsh/).
+which is inspired by [this Ruby on Rails trick from 2006](https://weblog.rubyonrails.org/2006/3/9/fast-rake-task-completion-for-zsh/).
 
 Think about that. 2006.
 
diff --git a/plugins/repo/README.md b/plugins/repo/README.md
index 0b77e6d48..4d9366adf 100644
--- a/plugins/repo/README.md
+++ b/plugins/repo/README.md
@@ -2,6 +2,6 @@
 **Maintainer:** [Stibbons](https://github.com/Stibbons)
 
 This plugin mainly add support automatic completion for the repo command line tool:
-http://code.google.com/p/git-repo/
+https://code.google.com/p/git-repo/
 
 * `r` aliases `repo`
diff --git a/plugins/safe-paste/safe-paste.plugin.zsh b/plugins/safe-paste/safe-paste.plugin.zsh
index 17c212c19..75f1791d7 100644
--- a/plugins/safe-paste/safe-paste.plugin.zsh
+++ b/plugins/safe-paste/safe-paste.plugin.zsh
@@ -1,7 +1,7 @@
-# Code from Mikael Magnusson: http://www.zsh.org/mla/users/2011/msg00367.html
+# Code from Mikael Magnusson: https://www.zsh.org/mla/users/2011/msg00367.html
 #
 # Requires xterm, urxvt, iTerm2 or any other terminal that supports bracketed
-# paste mode as documented: http://www.xfree86.org/current/ctlseqs.html
+# paste mode as documented: https://www.xfree86.org/current/ctlseqs.html
 
 # create a new keymap to use while pasting
 bindkey -N paste
diff --git a/plugins/scala/_scala b/plugins/scala/_scala
index 80434680c..f7511a647 100644
--- a/plugins/scala/_scala
+++ b/plugins/scala/_scala
@@ -1,6 +1,6 @@
 #compdef scala scalac
 # ------------------------------------------------------------------------------
-# Copyright (c) 2012 Github zsh-users - http://github.com/zsh-users
+# Copyright (c) 2012 Github zsh-users - https://github.com/zsh-users
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -28,7 +28,7 @@
 # Description
 # -----------
 #
-#  Completion script for scala and scalac (http://www.scala-lang.org/).
+#  Completion script for scala and scalac (https://www.scala-lang.org/).
 #
 # ------------------------------------------------------------------------------
 # Authors
diff --git a/plugins/scd/README.md b/plugins/scd/README.md
index 86ab67203..8c156da1f 100644
--- a/plugins/scd/README.md
+++ b/plugins/scd/README.md
@@ -14,8 +14,8 @@ directory aliases, which appear as named directories in zsh session.
 ## INSTALLATION NOTES
 
 Besides oh-my-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
+shells and is also available as [Vim](https://www.vim.org/) plugin and
+[IPython](https://ipython.org/) extension.  For installation details, see
 https://github.com/pavoljuhas/smart-change-directory.
 
 ## SYNOPSIS
diff --git a/plugins/scw/_scw b/plugins/scw/_scw
index f9fdf916e..0eb125c65 100644
--- a/plugins/scw/_scw
+++ b/plugins/scw/_scw
@@ -1,6 +1,6 @@
 #compdef scw
 #
-# zsh completion for scw (http://scaleway.com)
+# zsh completion for scw (https://www.scaleway.com)
 #
 # Inspired by https://github.com/felixr/docker-zsh-completion
 
diff --git a/plugins/shrink-path/README.md b/plugins/shrink-path/README.md
index 51fa8a051..b990aea91 100644
--- a/plugins/shrink-path/README.md
+++ b/plugins/shrink-path/README.md
@@ -57,10 +57,10 @@ supported.
 
 Copyright (C) 2008 by Daniel Friesel <derf@xxxxxxxxxxxxxxxxxx>
 
-License: WTFPL <http://sam.zoy.org/wtfpl>
+License: WTFPL <http://www.wtfpl.net>
 
-Ref: http://www.zsh.org/mla/workers/2009/msg00415.html
-     http://www.zsh.org/mla/workers/2009/msg00419.html
+Ref: https://www.zsh.org/mla/workers/2009/msg00415.html
+     https://www.zsh.org/mla/workers/2009/msg00419.html
 
 
 ## Misc
diff --git a/plugins/shrink-path/shrink-path.plugin.zsh b/plugins/shrink-path/shrink-path.plugin.zsh
index 29e6f0deb..86102e651 100644
--- a/plugins/shrink-path/shrink-path.plugin.zsh
+++ b/plugins/shrink-path/shrink-path.plugin.zsh
@@ -24,10 +24,10 @@
 # Keywords: prompt directory truncate shrink collapse fish
 #
 # Copyright (C) 2008 by Daniel Friesel <derf@xxxxxxxxxxxxxxxxxx>
-# License: WTFPL <http://sam.zoy.org/wtfpl>
+# License: WTFPL <http://www.wtfpl.net>
 #
-# Ref: http://www.zsh.org/mla/workers/2009/msg00415.html
-#      http://www.zsh.org/mla/workers/2009/msg00419.html
+# Ref: https://www.zsh.org/mla/workers/2009/msg00415.html
+#      https://www.zsh.org/mla/workers/2009/msg00419.html
 
 shrink_path () {
         setopt localoptions
diff --git a/plugins/spring/README.md b/plugins/spring/README.md
index 62bfd8013..816181326 100644
--- a/plugins/spring/README.md
+++ b/plugins/spring/README.md
@@ -10,16 +10,16 @@ oh-my-zsh Spring Boot plugin
      $ cd ~/.oh-my-zsh/plugins
      $ git clone git@github.com:linux-china/oh-my-zsh-spring-boot-plugin.git spring
 
-Adjust your .zshrc file and add spring to plugins=(...)  
- 
-## Tips 
+Adjust your .zshrc file and add spring to plugins=(...)
+
+## Tips
 
 * Install Spring Cloud plugin: spring install org.springframework.cloud:spring-cloud-cli:1.0.2.RELEASE
 
 ## Reference
 
-* Spring Boot: http://projects.spring.io/spring-boot/
-* Spring Boot CLI: http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#cli
+* Spring Boot: https://spring.io/projects/spring-boot
+* Spring Boot CLI: https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#cli
 
 Maintainer : linux_china ([@linux_china](https://twitter.com/linux_china))
 
diff --git a/plugins/sprunge/sprunge.plugin.zsh b/plugins/sprunge/sprunge.plugin.zsh
index fcc9004f8..e1c89b729 100644
--- a/plugins/sprunge/sprunge.plugin.zsh
+++ b/plugins/sprunge/sprunge.plugin.zsh
@@ -1,40 +1,40 @@
 # Contributed and SLIGHTLY modded by Matt Parnell/ilikenwf <parwok -at- gmail>
 # Created by the blogger at the URL below...I don't know where to find his/her name
-# Original found at http://www.shellperson.net/sprunge-pastebin-script/
- 
+# Original found at https://www.shellperson.net/sprunge-pastebin-script/
+
 usage() {
 description | fmt -s >&2
 }
- 
+
 description() {
 cat << HERE
- 
+
 DESCRIPTION
   Upload data and fetch URL from the pastebin http://sprunge.us
- 
+
 USAGE
   $0 filename.txt
   $0 text string
   $0 < filename.txt
   piped_data | $0
- 
+
 NOTES
 --------------------------------------------------------------------------
 * INPUT METHODS *
 $0 can accept piped data, STDIN redirection [<filename.txt], text strings following the command as arguments, or filenames as arguments.  Only one of these methods can be used at a time, so please see the note on precedence.  Also, note that using a pipe or STDIN redirection will treat tabs as spaces, or disregard them entirely (if they appear at the beginning of a line).  So I suggest using a filename as an argument if tabs are important either to the function or readability of the code.
- 
+
 * PRECEDENCE *
 STDIN redirection has precedence, then piped input, then a filename as an argument, and finally text strings as an arguments.
- 
+
   EXAMPLE:
   echo piped | "$0" arguments.txt < stdin_redirection.txt
- 
+
 In this example, the contents of file_as_stdin_redirection.txt would be uploaded. Both the piped_text and the file_as_argument.txt are ignored. If there is piped input and arguments, the arguments will be ignored, and the piped input uploaded.
- 
+
 * FILENAMES *
 If a filename is misspelled or doesn't have the necessary path description, it will NOT generate an error, but will instead treat it as a text string and upload it.
 --------------------------------------------------------------------------
- 
+
 HERE
 exit
 }
diff --git a/plugins/ssh-agent/README.md b/plugins/ssh-agent/README.md
index 85d8c8a85..0b96d9bb5 100644
--- a/plugins/ssh-agent/README.md
+++ b/plugins/ssh-agent/README.md
@@ -35,6 +35,6 @@ zstyle :omz:plugins:ssh-agent lifetime 4h
 
 ## Credits
 
-Based on code from Joseph M. Reagle: http://www.cygwin.com/ml/cygwin/2001-06/msg00537.html
+Based on code from Joseph M. Reagle: https://www.cygwin.com/ml/cygwin/2001-06/msg00537.html
 
 Agent-forwarding support based on ideas from Florent Thoumie and Jonas Pfenniger
diff --git a/plugins/sublime/README.md b/plugins/sublime/README.md
index 5379891ad..2ad629fad 100644
--- a/plugins/sublime/README.md
+++ b/plugins/sublime/README.md
@@ -4,7 +4,7 @@ Plugin for Sublime Text, a cross platform text and code editor, available for Li
 
 ### Requirements
 
- * [Sublime Text](http://www.sublimetext.com/)
+ * [Sublime Text](https://www.sublimetext.com/)
 
 ### Usage
 
diff --git a/plugins/svn/README.md b/plugins/svn/README.md
index 1f7b70c86..cab166a4f 100644
--- a/plugins/svn/README.md
+++ b/plugins/svn/README.md
@@ -1,7 +1,7 @@
 # `svn` plugin
 
 This plugin adds some utility functions to display additional information regarding your current
-svn repository. See http://subversion.apache.org/ for the full svn documentation.
+svn repository. See https://subversion.apache.org/ for the full svn documentation.
 
 To use it, add `svn` to your plugins array:
 
diff --git a/plugins/systemadmin/systemadmin.plugin.zsh b/plugins/systemadmin/systemadmin.plugin.zsh
index 8c2633355..a74f818dd 100644
--- a/plugins/systemadmin/systemadmin.plugin.zsh
+++ b/plugins/systemadmin/systemadmin.plugin.zsh
@@ -3,7 +3,6 @@
 # -----------
 #
 # This is one for the system administrator, operation and maintenance.
-# Some of which come from http://justinlilly.com/dotfiles/zsh.html
 #
 # ------------------------------------------------------------------------------
 # Authors
diff --git a/plugins/taskwarrior/README.md b/plugins/taskwarrior/README.md
index 053151e78..2a86510dd 100644
--- a/plugins/taskwarrior/README.md
+++ b/plugins/taskwarrior/README.md
@@ -1,6 +1,6 @@
 # taskwarrior
 
-This plugin adds smart tab completion for [TaskWarrior](http://taskwarrior.org/).
+This plugin adds smart tab completion for [TaskWarrior](https://taskwarrior.org/).
 It uses the zsh tab completion script (`_task`) shipped with TaskWarrior for the
 completion definitions.
 
diff --git a/plugins/taskwarrior/_task b/plugins/taskwarrior/_task
index 46628be94..c38d6cad9 100644
--- a/plugins/taskwarrior/_task
+++ b/plugins/taskwarrior/_task
@@ -21,7 +21,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 typeset -g _task_cmds _task_projects _task_tags _task_config _task_modifiers
 _task_projects=($(task _projects))
diff --git a/plugins/textastic/README.md b/plugins/textastic/README.md
index 369c2c137..3f3bcea1e 100644
--- a/plugins/textastic/README.md
+++ b/plugins/textastic/README.md
@@ -1,10 +1,10 @@
 ## textastic
 
-Plugin for Textastic, a text and code editor for Mac OS X 
+Plugin for Textastic, a text and code editor for Mac OS X
 
 ### Requirements
 
- * [Textastic](http://www.textasticapp.com/mac.html)
+ * [Textastic](https://www.textasticapp.com/mac.html)
 
 ### Usage
 
diff --git a/plugins/ubuntu/ubuntu.plugin.zsh b/plugins/ubuntu/ubuntu.plugin.zsh
index f7363feb8..198f06743 100644
--- a/plugins/ubuntu/ubuntu.plugin.zsh
+++ b/plugins/ubuntu/ubuntu.plugin.zsh
@@ -105,7 +105,7 @@ aar() {
 #   apt-history remove
 #   apt-history rollback
 #   apt-history list
-# Based On: http://linuxcommando.blogspot.com/2008/08/how-to-show-apt-log-history.html
+# Based On: https://linuxcommando.blogspot.com/2008/08/how-to-show-apt-log-history.html
 apt-history () {
   case "$1" in
     install)
diff --git a/plugins/urltools/urltools.plugin.zsh b/plugins/urltools/urltools.plugin.zsh
index fa337acba..47d9a34e4 100644
--- a/plugins/urltools/urltools.plugin.zsh
+++ b/plugins/urltools/urltools.plugin.zsh
@@ -2,7 +2,7 @@
 # Adds handy command line aliases useful for dealing with URLs
 #
 # Taken from:
-# http://ruslanspivak.com/2010/06/02/urlencode-and-urldecode-from-a-command-line/
+# https://ruslanspivak.com/2010/06/02/urlencode-and-urldecode-from-a-command-line/
 
 if [[ $(whence $URLTOOLS_METHOD) = "" ]]; then
     URLTOOLS_METHOD=""
diff --git a/plugins/vault/README.md b/plugins/vault/README.md
index 0f61c9410..5cdbb16f0 100644
--- a/plugins/vault/README.md
+++ b/plugins/vault/README.md
@@ -3,16 +3,16 @@
 - Adds autocomplete options for all vault commands.
 
 ####Show help for all commands
-![General Help](http://i.imgur.com/yv5Db1r.png "Help for all commands")
+![General Help](https://i.imgur.com/yv5Db1r.png "Help for all commands")
 
 
 ####Create new Vault token
-![Create token](http://i.imgur.com/xMegNgh.png "Create token")
+![Create token](https://i.imgur.com/xMegNgh.png "Create token")
 
 
 ####Enable audit backends
-![Audit backends](http://i.imgur.com/fKLeiSF.png "Audit backends")
+![Audit backends](https://i.imgur.com/fKLeiSF.png "Audit backends")
 
 
 
-Crafted with <3 by Valentin Bud ([@valentinbud](https://twitter.com/valentinbud))
\ No newline at end of file
+Crafted with <3 by Valentin Bud ([@valentinbud](https://twitter.com/valentinbud))
diff --git a/plugins/wp-cli/README.md b/plugins/wp-cli/README.md
index 4d8cad452..43c41eb53 100644
--- a/plugins/wp-cli/README.md
+++ b/plugins/wp-cli/README.md
@@ -2,11 +2,11 @@
 
 **Maintainer:** [joshmedeski](https://github.com/joshmedeski)
 
-WordPress Command Line Interface (http://wp-cli.org/)
+WordPress Command Line Interface (https://wp-cli.org/)
 
 WP-CLI is a set of command-line tools for managing WordPress installations. You can update plugins, set up multisite installs and much more, without using a web browser.
 
-This plugin adds [tab completion](http://wp-cli.org/#complete) for `wp-cli` as well as several aliases.
+This plugin adds [tab completion](https://wp-cli.org/#tab-completions) for `wp-cli` as well as several aliases.
 
 ## List of Aliases
 
@@ -101,7 +101,7 @@ This plugin adds [tab completion](http://wp-cli.org/#complete) for `wp-cli` as w
 - wpwm='wp widget move'
 - wpwu='wp widget update'
 
-The entire list of wp-cli commands can be found here: http://wp-cli.org/commands/
+The entire list of wp-cli commands can be found here: https://wp-cli.org/commands/
 
 I only included the commands that are most used. Please feel free to contribute to this project if you want more commands.
 
diff --git a/plugins/wp-cli/wp-cli.plugin.zsh b/plugins/wp-cli/wp-cli.plugin.zsh
index 7b41c3257..45fac0761 100644
--- a/plugins/wp-cli/wp-cli.plugin.zsh
+++ b/plugins/wp-cli/wp-cli.plugin.zsh
@@ -1,6 +1,6 @@
 # WP-CLI
 # A command line interface for WordPress
-# http://wp-cli.org/
+# https://wp-cli.org/
 
 # Cache
 
diff --git a/plugins/xcode/xcode.plugin.zsh b/plugins/xcode/xcode.plugin.zsh
index b80c3e36d..89703fe3c 100644
--- a/plugins/xcode/xcode.plugin.zsh
+++ b/plugins/xcode/xcode.plugin.zsh
@@ -4,7 +4,7 @@ alias xcp='xcode-select --print-path'
 alias xcsel='sudo xcode-select --switch'
 
 # original author: @subdigital
-# source: http://gist.github.com/subdigital/5420709
+# source: https://gist.github.com/subdigital/5420709
 function xc {
   local xcode_proj
   if [[ $# == 0 ]]; then
diff --git a/plugins/zsh-navigation-tools/LICENSE b/plugins/zsh-navigation-tools/LICENSE
index 075c80ccd..4ee028112 100644
--- a/plugins/zsh-navigation-tools/LICENSE
+++ b/plugins/zsh-navigation-tools/LICENSE
@@ -27,7 +27,7 @@ GPLv3  License
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -671,7 +671,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -690,11 +690,11 @@ might be different; for a GUI interface, you would use an "about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/themes/adben.zsh-theme b/themes/adben.zsh-theme
index e4774cf0e..b9ac77d00 100644
--- a/themes/adben.zsh-theme
+++ b/themes/adben.zsh-theme
@@ -6,7 +6,7 @@
 # # a) displaying a pseudo-random message from a database of quotations
 # # (https://en.wikipedia.org/wiki/Fortune_%28Unix%29)
 # # b) displaying randomly command line tips from The command line fu
-# # (http://www.commandlinefu.com) community: in order to make use of this functionality
+# # (https://www.commandlinefu.com) community: in order to make use of this functionality
 # # you will need Internet connection.
 # # This theme provides as well information for the current user's context, like;
 # # branch and status for the current version control system (git and svn currently
@@ -23,11 +23,11 @@
 # # optionally:
 # # -Oh-myzsh vcs plug-ins git and svn.
 # # -Solarized theme (https://github.com/altercation/solarized/)
-# # -OS X: iTerm 2 (http://www.iterm2.com/)
+# # -OS X: iTerm 2 (https://iterm2.com/)
 # # -font Source code pro (https://github.com/adobe/source-code-pro)
 # #
 # # This theme's look and feel is based on the Aaron Toponce's zsh theme, more info:
-# # http://pthree.org/2008/11/23/727/
+# # https://pthree.org/2008/11/23/727/
 # # enjoy!
 ########## COLOR ###########
 for COLOR in CYAN WHITE YELLOW MAGENTA BLACK BLUE RED DEFAULT GREEN GREY; do
diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index b0a794f4d..d91f98735 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -13,7 +13,7 @@
 #
 # In addition, I recommend the
 # [Solarized theme](https://github.com/altercation/solarized/) and, if you're
-# using it on Mac OS X, [iTerm 2](http://www.iterm2.com/) over Terminal.app -
+# using it on Mac OS X, [iTerm 2](https://iterm2.com/) over Terminal.app -
 # it has significantly better color fidelity.
 #
 # # Goals
diff --git a/themes/arrow.zsh-theme b/themes/arrow.zsh-theme
index d62dcdcb9..a3e77d65d 100644
--- a/themes/arrow.zsh-theme
+++ b/themes/arrow.zsh-theme
@@ -8,7 +8,7 @@ ZSH_THEME_GIT_PROMPT_SUFFIX=""
 ZSH_THEME_GIT_PROMPT_DIRTY="*"
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 
-# See http://geoff.greer.fm/lscolors/
+# See https://geoff.greer.fm/lscolors/
 export LSCOLORS="exfxcxdxbxbxbxbxbxbxbx"
 export LS_COLORS="di=34;40:ln=35;40:so=32;40:pi=33;40:ex=31;40:bd=31;40:cd=31;40:su=31;40:sg=31;40:tw=31;40:ow=31;40:"
 
diff --git a/themes/avit.zsh-theme b/themes/avit.zsh-theme
index c43fcc9fe..cf439f757 100644
--- a/themes/avit.zsh-theme
+++ b/themes/avit.zsh-theme
@@ -102,7 +102,7 @@ ZSH_THEME_GIT_TIME_SHORT_COMMIT_MEDIUM="%{$fg[yellow]%}"
 ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG="%{$fg[red]%}"
 ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL="%{$fg[white]%}"
 
-# LS colors, made with http://geoff.greer.fm/lscolors/
+# LS colors, made with https://geoff.greer.fm/lscolors/
 export LSCOLORS="exfxcxdxbxegedabagacad"
 export LS_COLORS='di=34;40:ln=35;40:so=32;40:pi=33;40:ex=31;40:bd=34;46:cd=34;43:su=0;41:sg=0;46:tw=0;42:ow=0;43:'
 export GREP_COLOR='1;33'
diff --git a/themes/bira.zsh-theme b/themes/bira.zsh-theme
index 29bda0be8..675483996 100644
--- a/themes/bira.zsh-theme
+++ b/themes/bira.zsh-theme
@@ -1,4 +1,4 @@
-# ZSH Theme - Preview: http://gyazo.com/8becc8a7ed5ab54a0262a470555c3eed.png
+# ZSH Theme - Preview: https://gyazo.com/8becc8a7ed5ab54a0262a470555c3eed.png
 local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
 
 
diff --git a/themes/clean.zsh-theme b/themes/clean.zsh-theme
index 7ee29cb8c..5c96e4726 100644
--- a/themes/clean.zsh-theme
+++ b/themes/clean.zsh-theme
@@ -9,6 +9,6 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%b%{$fg_bold[blue]%})%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[red]%}✗"
 
-# LS colors, made with http://geoff.greer.fm/lscolors/
+# LS colors, made with https://geoff.greer.fm/lscolors/
 export LSCOLORS="Gxfxcxdxbxegedabagacad"
 export LS_COLORS='no=00:fi=00:di=01;34:ln=00;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=41;33;01:ex=00;32:*.cmd=00;32:*.exe=01;32:*.com=01;32:*.bat=01;32:*.btm=01;32:*.dll=01;32:*.tar=00;31:*.tbz=00;31:*.tgz=00;31:*.rpm=00;31:*.deb=00;31:*.arj=00;31:*.taz=00;31:*.lzh=00;31:*.lzma=00;31:*.zip=00;31:*.zoo=00;31:*.z=00;31:*.Z=00;31:*.gz=00;31:*.bz2=00;31:*.tb2=00;31:*.tz2=00;31:*.tbz2=00;31:*.avi=01;35:*.bmp=01;35:*.fli=01;35:*.gif=01;35:*.jpg=01;35:*.jpeg=01;35:*.mng=01;35:*.mov=01;35:*.mpg=01;35:*.pcx=01;35:*.pbm=01;35:*.pgm=01;35:*.png=01;35:*.ppm=01;35:*.tga=01;35:*.tif=01;35:*.xbm=01;35:*.xpm=01;35:*.dl=01;35:*.gl=01;35:*.wmv=01;35:*.aiff=00;32:*.au=00;32:*.mid=00;32:*.mp3=00;32:*.ogg=00;32:*.voc=00;32:*.wav=00;32:'
diff --git a/themes/duellj.zsh-theme b/themes/duellj.zsh-theme
index 3849c35be..f70b39bc3 100644
--- a/themes/duellj.zsh-theme
+++ b/themes/duellj.zsh-theme
@@ -1,6 +1,6 @@
 # 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
+# entry in a nice long thread on the Arch Linux forums: https://bbs.archlinux.org/viewtopic.php?pid=521888#p521888
 PROMPT=$'%{\e[0;34m%}%B┌─[%b%{\e[0m%}%{\e[1;32m%}%n%{\e[1;34m%}@%{\e[0m%}%{\e[0;36m%}%m%{\e[0;34m%}%B]%b%{\e[0m%} - %b%{\e[0;34m%}%B[%b%{\e[1;37m%}%~%{\e[0;34m%}%B]%b%{\e[0m%} - %{\e[0;34m%}%B[%b%{\e[0;33m%}%!%{\e[0;34m%}%B]%b%{\e[0m%}
 %{\e[0;34m%}%B└─%B[%{\e[1;35m%}$%{\e[0;34m%}%B]%{\e[0m%}%b '
 RPROMPT='[%*]'
diff --git a/themes/funky.zsh-theme b/themes/funky.zsh-theme
index 2451296d9..574538f88 100644
--- a/themes/funky.zsh-theme
+++ b/themes/funky.zsh-theme
@@ -1,5 +1,5 @@
 # Taken from Tassilo's Blog
-# http://tsdh.wordpress.com/2007/12/06/my-funky-zsh-prompt/
+# https://tsdh.wordpress.com/2007/12/06/my-funky-zsh-prompt/
 
 local blue_op="%{$fg[blue]%}[%{$reset_color%}"
 local blue_cp="%{$fg[blue]%}]%{$reset_color%}"
@@ -11,4 +11,4 @@ local smiley="%(?,%{$fg[green]%}:%)%{$reset_color%},%{$fg[red]%}:(%{$reset_color
 PROMPT="╭─${path_p}─${user_host}─${ret_status}─${hist_no}
 ╰─${blue_op}${smiley}${blue_cp} %# "
 local cur_cmd="${blue_op}%_${blue_cp}"
-PROMPT2="${cur_cmd}> "
\ No newline at end of file
+PROMPT2="${cur_cmd}> "
diff --git a/themes/gnzh.zsh-theme b/themes/gnzh.zsh-theme
index 04b0450a8..c763ef3c6 100644
--- a/themes/gnzh.zsh-theme
+++ b/themes/gnzh.zsh-theme
@@ -1,4 +1,3 @@
-# ZSH Theme - Preview: http://dl.dropbox.com/u/4109351/pics/gnzh-zsh-theme.png
 # Based on bira theme
 
 setopt prompt_subst
diff --git a/themes/half-life.zsh-theme b/themes/half-life.zsh-theme
index 8b458cde9..c79027ed6 100644
--- a/themes/half-life.zsh-theme
+++ b/themes/half-life.zsh-theme
@@ -1,11 +1,11 @@
 # prompt style and colors based on Steve Losh's Prose theme:
-# http://github.com/sjl/oh-my-zsh/blob/master/themes/prose.zsh-theme
+# https://github.com/sjl/oh-my-zsh/blob/master/themes/prose.zsh-theme
 #
 # vcs_info modifications from Bart Trojanowski's zsh prompt:
 # http://www.jukie.net/bart/blog/pimping-out-zsh-prompt
 #
 # git untracked files modification from Brian Carper:
-# http://briancarper.net/blog/570/git-info-in-your-zsh-prompt
+# https://briancarper.net/blog/570/git-info-in-your-zsh-prompt
 
 function virtualenv_info {
     [ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`') '
diff --git a/themes/itchy.zsh-theme b/themes/itchy.zsh-theme
index c23889edf..e1f2d56e2 100644
--- a/themes/itchy.zsh-theme
+++ b/themes/itchy.zsh-theme
@@ -1,5 +1,3 @@
-# Inspired by http://peepcode.com/blog/2012/my-command-line-prompt
-
 local smiley="%(?,%{$fg[green]%}☺%{$reset_color%},%{$fg[red]%}☹%{$reset_color%})"
 
 local user="%{$fg[cyan]%}%n%{$reset_color%}"
diff --git a/themes/jreese.zsh-theme b/themes/jreese.zsh-theme
index 0fa6b4ecd..de42a1010 100644
--- a/themes/jreese.zsh-theme
+++ b/themes/jreese.zsh-theme
@@ -1,5 +1,3 @@
-# ZSH Theme - Preview: http://dl.dropbox.com/u/1552408/Screenshots/2010-04-08-oh-my-zsh.png
-
 if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="green"; fi
 local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
 
diff --git a/themes/lambda.zsh-theme b/themes/lambda.zsh-theme
index 63292d331..6e67773ea 100644
--- a/themes/lambda.zsh-theme
+++ b/themes/lambda.zsh-theme
@@ -1,5 +1,3 @@
-# ZSH Theme - Preview: http://cl.ly/350F0F0k1M2y3A2i3p1S
-
 PROMPT='λ %~/ $(git_prompt_info)%{$reset_color%}'
 
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}"
diff --git a/themes/lukerandall.zsh-theme b/themes/lukerandall.zsh-theme
index f4045bd8e..cdecd284f 100644
--- a/themes/lukerandall.zsh-theme
+++ b/themes/lukerandall.zsh-theme
@@ -1,4 +1,4 @@
-# ZSH Theme - Preview: http://cl.ly/f701d00760f8059e06dc
+# ZSH Theme - Preview: https://cl.ly/f701d00760f8059e06dc
 # Thanks to gallifrey, upon whose theme this is based
 
 local return_code="%(?..%{$fg_bold[red]%}%? ↵%{$reset_color%})"
diff --git a/themes/macovsky-ruby.zsh-theme b/themes/macovsky-ruby.zsh-theme
index 69d80d588..abda6232c 100644
--- a/themes/macovsky-ruby.zsh-theme
+++ b/themes/macovsky-ruby.zsh-theme
@@ -1,4 +1,4 @@
-# ZSH Theme - Preview: http://gyazo.com/8becc8a7ed5ab54a0262a470555c3eed.png
+# ZSH Theme - Preview: https://i.gyazo.com/8becc8a7ed5ab54a0262a470555c3eed.png
 local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
 
 if [ -e ~/.rvm/bin/rvm-prompt ]; then
diff --git a/themes/macovsky.zsh-theme b/themes/macovsky.zsh-theme
index 2e6dce42d..d3f7d16b4 100644
--- a/themes/macovsky.zsh-theme
+++ b/themes/macovsky.zsh-theme
@@ -1,4 +1,4 @@
-# ZSH Theme - Preview: http://gyazo.com/8becc8a7ed5ab54a0262a470555c3eed.png
+# ZSH Theme - Preview: https://i.gyazo.com/8becc8a7ed5ab54a0262a470555c3eed.png
 local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
 
 if [ -e ~/.rvm/bin/rvm-prompt ]; then
diff --git a/themes/mh.zsh-theme b/themes/mh.zsh-theme
index 34a3765b1..2b2cc9b68 100644
--- a/themes/mh.zsh-theme
+++ b/themes/mh.zsh-theme
@@ -1,5 +1,5 @@
 # mh theme
-# preview: http://cl.ly/1y2x0W0E3t2C0F29043z
+# preview: https://cl.ly/1y2x0W0E3t2C0F29043z
 
 # features:
 # path is autoshortened to ~30 characters
@@ -19,6 +19,6 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%b%{$fg_bold[gray]%})%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[red]%}✱"
 
-# LS colors, made with http://geoff.greer.fm/lscolors/
+# LS colors, made with https://geoff.greer.fm/lscolors/
 export LSCOLORS="Gxfxcxdxbxegedabagacad"
 export LS_COLORS='no=00:fi=00:di=01;34:ln=00;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=41;33;01:ex=00;32:*.cmd=00;32:*.exe=01;32:*.com=01;32:*.bat=01;32:*.btm=01;32:*.dll=01;32:*.tar=00;31:*.tbz=00;31:*.tgz=00;31:*.rpm=00;31:*.deb=00;31:*.arj=00;31:*.taz=00;31:*.lzh=00;31:*.lzma=00;31:*.zip=00;31:*.zoo=00;31:*.z=00;31:*.Z=00;31:*.gz=00;31:*.bz2=00;31:*.tb2=00;31:*.tz2=00;31:*.tbz2=00;31:*.avi=01;35:*.bmp=01;35:*.fli=01;35:*.gif=01;35:*.jpg=01;35:*.jpeg=01;35:*.mng=01;35:*.mov=01;35:*.mpg=01;35:*.pcx=01;35:*.pbm=01;35:*.pgm=01;35:*.png=01;35:*.ppm=01;35:*.tga=01;35:*.tif=01;35:*.xbm=01;35:*.xpm=01;35:*.dl=01;35:*.gl=01;35:*.wmv=01;35:*.aiff=00;32:*.au=00;32:*.mid=00;32:*.mp3=00;32:*.ogg=00;32:*.voc=00;32:*.wav=00;32:'
diff --git a/themes/michelebologna.zsh-theme b/themes/michelebologna.zsh-theme
index 110e3f203..7ff6a7ffe 100644
--- a/themes/michelebologna.zsh-theme
+++ b/themes/michelebologna.zsh-theme
@@ -1,16 +1,16 @@
 # Michele Bologna's theme
-# http://michelebologna.net
+# https://www.michelebologna.net
 #
 # This a theme for oh-my-zsh. Features a colored prompt with:
-# * username@host: [jobs] [git] workdir % 
-# * hostname color is based on hostname characters. When using as root, the 
+# * username@host: [jobs] [git] workdir %
+# * hostname color is based on hostname characters. When using as root, the
 # prompt shows only the hostname in red color.
 # * [jobs], if applicable, counts the number of suspended jobs tty
 # * [git], if applicable, represents the status of your git repo (more on that
 # later)
 # * '%' prompt will be green if last command return value is 0, yellow otherwise.
-# 
-# git prompt is inspired by official git contrib prompt: 
+#
+# git prompt is inspired by official git contrib prompt:
 # https://github.com/git/git/tree/master/contrib/completion/git-prompt.sh
 # and it adds:
 # * the current branch
diff --git a/themes/mikeh.zsh-theme b/themes/mikeh.zsh-theme
index a95383ba5..f231b91bb 100644
--- a/themes/mikeh.zsh-theme
+++ b/themes/mikeh.zsh-theme
@@ -15,7 +15,7 @@ mikeh_precmd() {
 
 # 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
+# entry in a nice long thread on the Arch Linux forums: https://bbs.archlinux.org/viewtopic.php?pid=521888#p521888
 PROMPT=$'%{\e[0;34m%}%B..[%b%{\e[0m%}%{\e[1;32m%}%n%{\e[1;30m%}@%{\e[0m%}%{\e[0;36m%}%m%{\e[0;34m%}%B]%b%{\e[0m%} - %b%{\e[0;34m%}%B[%b%{\e[1;37m%}%~%{\e[0;34m%}%B]%b%{\e[0m%} - %{\e[0;34m%}%B[%b%{\e[0;33m%}'%D{"%a %b %d, %I:%M"}%b$'%{\e[0;34m%}%B]%b%{\e[0m%}
 %{\e[0;34m%}%B..%B[%{\e[1;35m%}$%{\e[0;34m%}%B] <($vcs_info_msg_0_)>%{\e[0m%}%b '
-PS2=$' \e[0;34m%}%B>%{\e[0m%}%b '
\ No newline at end of file
+PS2=$' \e[0;34m%}%B>%{\e[0m%}%b '
diff --git a/themes/philips.zsh-theme b/themes/philips.zsh-theme
index f6e5b324e..fec734bad 100644
--- a/themes/philips.zsh-theme
+++ b/themes/philips.zsh-theme
@@ -9,6 +9,6 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%b%{$fg_bold[blue]%})%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 ZSH_THEME_GIT_PROMPT_DIRTY="*"
 
-# LS colors, made with http://geoff.greer.fm/lscolors/
+# LS colors, made with https://geoff.greer.fm/lscolors/
 export LSCOLORS="Gxfxcxdxbxegedabagacad"
 export LS_COLORS='no=00:fi=00:di=01;34:ln=00;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=41;33;01:ex=00;32:*.cmd=00;32:*.exe=01;32:*.com=01;32:*.bat=01;32:*.btm=01;32:*.dll=01;32:*.tar=00;31:*.tbz=00;31:*.tgz=00;31:*.rpm=00;31:*.deb=00;31:*.arj=00;31:*.taz=00;31:*.lzh=00;31:*.lzma=00;31:*.zip=00;31:*.zoo=00;31:*.z=00;31:*.Z=00;31:*.gz=00;31:*.bz2=00;31:*.tb2=00;31:*.tz2=00;31:*.tbz2=00;31:*.avi=01;35:*.bmp=01;35:*.fli=01;35:*.gif=01;35:*.jpg=01;35:*.jpeg=01;35:*.mng=01;35:*.mov=01;35:*.mpg=01;35:*.pcx=01;35:*.pbm=01;35:*.pgm=01;35:*.png=01;35:*.ppm=01;35:*.tga=01;35:*.tif=01;35:*.xbm=01;35:*.xpm=01;35:*.dl=01;35:*.gl=01;35:*.wmv=01;35:*.aiff=00;32:*.au=00;32:*.mid=00;32:*.mp3=00;32:*.ogg=00;32:*.voc=00;32:*.wav=00;32:*.patch=00;34:*.o=00;32:*.so=01;35:*.ko=01;31:*.la=00;33'
diff --git a/themes/pmcgee.zsh-theme b/themes/pmcgee.zsh-theme
index e4e45c71a..58a9b8bef 100644
--- a/themes/pmcgee.zsh-theme
+++ b/themes/pmcgee.zsh-theme
@@ -11,6 +11,6 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[red]%}*"
 
-# LS colors, made with http://geoff.greer.fm/lscolors/
+# LS colors, made with https://geoff.greer.fm/lscolors/
 export LSCOLORS="Gxfxcxdxbxegedabagacad"
 export LS_COLORS='no=00:fi=00:di=01;34:ln=00;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=41;33;01:ex=00;32:*.cmd=00;32:*.exe=01;32:*.com=01;32:*.bat=01;32:*.btm=01;32:*.dll=01;32:*.tar=00;31:*.tbz=00;31:*.tgz=00;31:*.rpm=00;31:*.deb=00;31:*.arj=00;31:*.taz=00;31:*.lzh=00;31:*.lzma=00;31:*.zip=00;31:*.zoo=00;31:*.z=00;31:*.Z=00;31:*.gz=00;31:*.bz2=00;31:*.tb2=00;31:*.tz2=00;31:*.tbz2=00;31:*.avi=01;35:*.bmp=01;35:*.fli=01;35:*.gif=01;35:*.jpg=01;35:*.jpeg=01;35:*.mng=01;35:*.mov=01;35:*.mpg=01;35:*.pcx=01;35:*.pbm=01;35:*.pgm=01;35:*.png=01;35:*.ppm=01;35:*.tga=01;35:*.tif=01;35:*.xbm=01;35:*.xpm=01;35:*.dl=01;35:*.gl=01;35:*.wmv=01;35:*.aiff=00;32:*.au=00;32:*.mid=00;32:*.mp3=00;32:*.ogg=00;32:*.voc=00;32:*.wav=00;32:'
diff --git a/themes/rkj.zsh-theme b/themes/rkj.zsh-theme
index fe06161c8..d7c9314e3 100644
--- a/themes/rkj.zsh-theme
+++ b/themes/rkj.zsh-theme
@@ -1,6 +1,6 @@
 # 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
+# entry in a nice long thread on the Arch Linux forums: https://bbs.archlinux.org/viewtopic.php?pid=521888#p521888
 
 function retcode() {}
 
diff --git a/themes/sorin.zsh-theme b/themes/sorin.zsh-theme
index ac6a49840..e478d2672 100644
--- a/themes/sorin.zsh-theme
+++ b/themes/sorin.zsh-theme
@@ -1,10 +1,10 @@
 # sorin.zsh-theme
-# screenshot: http://i.imgur.com/aipDQ.png
+# screenshot: https://i.imgur.com/aipDQ.png
 
 if [[ "$TERM" != "dumb" ]] && [[ "$DISABLE_LS_COLORS" != "true" ]]; then
   MODE_INDICATOR="%{$fg_bold[red]%}❮%{$reset_color%}%{$fg[red]%}❮❮%{$reset_color%}"
   local return_status="%{$fg[red]%}%(?..⏎)%{$reset_color%}"
-  
+
   PROMPT='%{$fg[cyan]%}%c$(git_prompt_info) %(!.%{$fg_bold[red]%}#.%{$fg_bold[green]%}❯)%{$reset_color%} '
 
   ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[blue]%}git%{$reset_color%}:%{$fg[red]%}"
@@ -20,10 +20,10 @@ if [[ "$TERM" != "dumb" ]] && [[ "$DISABLE_LS_COLORS" != "true" ]]; then
   ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} ➜"
   ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} ═"
   ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭"
-else 
+else
   MODE_INDICATOR="❮❮❮"
   local return_status="%(?::⏎)"
-  
+
   PROMPT='%c$(git_prompt_info) %(!.#.❯) '
 
   ZSH_THEME_GIT_PROMPT_PREFIX=" git:"
diff --git a/themes/sporty_256.zsh-theme b/themes/sporty_256.zsh-theme
index db0fc4277..e008a8664 100644
--- a/themes/sporty_256.zsh-theme
+++ b/themes/sporty_256.zsh-theme
@@ -1,6 +1,6 @@
 # zsh theme requires 256 color enabled terminal
 # i.e TERM=xterm-256color
-# Preview - http://www.flickr.com/photos/adelcampo/4556482563/sizes/o/
+# Preview - https://www.flickr.com/photos/adelcampo/4556482563/sizes/o/
 # based on robbyrussell's shell but louder!
 
 PROMPT='%{$fg_bold[blue]%}$(git_prompt_info) %F{208}%c%f
diff --git a/themes/steeef.zsh-theme b/themes/steeef.zsh-theme
index 622c90465..3532d3bc7 100644
--- a/themes/steeef.zsh-theme
+++ b/themes/steeef.zsh-theme
@@ -1,11 +1,11 @@
 # prompt style and colors based on Steve Losh's Prose theme:
-# http://github.com/sjl/oh-my-zsh/blob/master/themes/prose.zsh-theme
+# https://github.com/sjl/oh-my-zsh/blob/master/themes/prose.zsh-theme
 #
 # vcs_info modifications from Bart Trojanowski's zsh prompt:
 # http://www.jukie.net/bart/blog/pimping-out-zsh-prompt
 #
 # git untracked files modification from Brian Carper:
-# http://briancarper.net/blog/570/git-info-in-your-zsh-prompt
+# https://briancarper.net/blog/570/git-info-in-your-zsh-prompt
 
 export VIRTUAL_ENV_DISABLE_PROMPT=1
 
diff --git a/themes/sunaku.zsh-theme b/themes/sunaku.zsh-theme
index 440fa90b4..77f3acc7b 100644
--- a/themes/sunaku.zsh-theme
+++ b/themes/sunaku.zsh-theme
@@ -1,5 +1,4 @@
 # Git-centric variation of the "fishy" theme.
-# See screenshot at http://ompldr.org/vOHcwZg
 
 ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%}+"
 ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[magenta]%}!"
diff --git a/themes/tonotdo.zsh-theme b/themes/tonotdo.zsh-theme
index a6407034c..426e2bf35 100644
--- a/themes/tonotdo.zsh-theme
+++ b/themes/tonotdo.zsh-theme
@@ -7,6 +7,6 @@ ZSH_THEME_GIT_PROMPT_SUFFIX=""
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[blue]%})"
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[yellow]%}✗%{$fg_bold[blue]%})"
 
-# LS colors, made with http://geoff.greer.fm/lscolors/
+# LS colors, made with https://geoff.greer.fm/lscolors/
 export LSCOLORS="Gxfxcxdxbxegedabagacad"
-export LS_COLORS='no=00:fi=00:di=01;34:ln=00;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=41;33;01:ex=00;32:*.cmd=00;32:*.exe=01;32:*.com=01;32:*.bat=01;32:*.btm=01;32:*.dll=01;32:*.tar=00;31:*.tbz=00;31:*.tgz=00;31:*.rpm=00;31:*.deb=00;31:*.arj=00;31:*.taz=00;31:*.lzh=00;31:*.lzma=00;31:*.zip=00;31:*.zoo=00;31:*.z=00;31:*.Z=00;31:*.gz=00;31:*.bz2=00;31:*.tb2=00;31:*.tz2=00;31:*.tbz2=00;31:*.avi=01;35:*.bmp=01;35:*.fli=01;35:*.gif=01;35:*.jpg=01;35:*.jpeg=01;35:*.mng=01;35:*.mov=01;35:*.mpg=01;35:*.pcx=01;35:*.pbm=01;35:*.pgm=01;35:*.png=01;35:*.ppm=01;35:*.tga=01;35:*.tif=01;35:*.xbm=01;35:*.xpm=01;35:*.dl=01;35:*.gl=01;35:*.wmv=01;35:*.aiff=00;32:*.au=00;32:*.mid=00;32:*.mp3=00;32:*.ogg=00;32:*.voc=00;32:*.wav=00;32:'
\ No newline at end of file
+export LS_COLORS='no=00:fi=00:di=01;34:ln=00;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=41;33;01:ex=00;32:*.cmd=00;32:*.exe=01;32:*.com=01;32:*.bat=01;32:*.btm=01;32:*.dll=01;32:*.tar=00;31:*.tbz=00;31:*.tgz=00;31:*.rpm=00;31:*.deb=00;31:*.arj=00;31:*.taz=00;31:*.lzh=00;31:*.lzma=00;31:*.zip=00;31:*.zoo=00;31:*.z=00;31:*.Z=00;31:*.gz=00;31:*.bz2=00;31:*.tb2=00;31:*.tz2=00;31:*.tbz2=00;31:*.avi=01;35:*.bmp=01;35:*.fli=01;35:*.gif=01;35:*.jpg=01;35:*.jpeg=01;35:*.mng=01;35:*.mov=01;35:*.mpg=01;35:*.pcx=01;35:*.pbm=01;35:*.pgm=01;35:*.png=01;35:*.ppm=01;35:*.tga=01;35:*.tif=01;35:*.xbm=01;35:*.xpm=01;35:*.dl=01;35:*.gl=01;35:*.wmv=01;35:*.aiff=00;32:*.au=00;32:*.mid=00;32:*.mp3=00;32:*.ogg=00;32:*.voc=00;32:*.wav=00;32:'
diff --git a/themes/xiong-chiamiov-plus.zsh-theme b/themes/xiong-chiamiov-plus.zsh-theme
index 5fb4fe6f4..aa6ef7421 100644
--- a/themes/xiong-chiamiov-plus.zsh-theme
+++ b/themes/xiong-chiamiov-plus.zsh-theme
@@ -1,6 +1,6 @@
 # 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
+# entry in a nice long thread on the Arch Linux forums: https://bbs.archlinux.org/viewtopic.php?pid=521888#p521888
 PROMPT=$'%{\e[0;34m%}%B┌─[%b%{\e[0m%}%{\e[1;32m%}%n%{\e[1;30m%}@%{\e[0m%}%{\e[0;36m%}%m%{\e[0;34m%}%B]%b%{\e[0m%} - %b%{\e[0;34m%}%B[%b%{\e[1;37m%}%~%{\e[0;34m%}%B]%b%{\e[0m%} - %{\e[0;34m%}%B[%b%{\e[0;33m%}'%D{"%a %b %d, %H:%M"}%b$'%{\e[0;34m%}%B]%b%{\e[0m%}
 %{\e[0;34m%}%B└─%B[%{\e[1;35m%}$%{\e[0;34m%}%B] <$(git_prompt_info)>%{\e[0m%}%b '
 PS2=$' \e[0;34m%}%B>%{\e[0m%}%b '
diff --git a/themes/xiong-chiamiov.zsh-theme b/themes/xiong-chiamiov.zsh-theme
index 0ed335fb5..b67d9947c 100644
--- a/themes/xiong-chiamiov.zsh-theme
+++ b/themes/xiong-chiamiov.zsh-theme
@@ -1,6 +1,6 @@
 # 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
+# entry in a nice long thread on the Arch Linux forums: https://bbs.archlinux.org/viewtopic.php?pid=521888#p521888
 PROMPT=$'%{\e[0;34m%}%B┌─[%b%{\e[0m%}%{\e[1;32m%}%n%{\e[1;30m%}@%{\e[0m%}%{\e[0;36m%}%m%{\e[0;34m%}%B]%b%{\e[0m%} - %b%{\e[0;34m%}%B[%b%{\e[1;37m%}%~%{\e[0;34m%}%B]%b%{\e[0m%} - %{\e[0;34m%}%B[%b%{\e[0;33m%}'%D{"%a %b %d, %H:%M"}%b$'%{\e[0;34m%}%B]%b%{\e[0m%}
 %{\e[0;34m%}%B└─%B[%{\e[1;35m%}$%{\e[0;34m%}%B]>%{\e[0m%}%b '
 PS2=$' \e[0;34m%}%B>%{\e[0m%}%b '
diff --git a/tools/theme_chooser.sh b/tools/theme_chooser.sh
index 2c2a379ba..82ae5857c 100755
--- a/tools/theme_chooser.sh
+++ b/tools/theme_chooser.sh
@@ -5,7 +5,7 @@
 # the extent permitted by applicable law. You can redistribute it
 # and/or modify it under the terms of the Do What The Fuck You Want
 # To Public License, Version 2, as published by Sam Hocevar. See
-# http://sam.zoy.org/wtfpl/COPYING for more details.
+# http://www.wtfpl.net/txt/copying/ for more details.
 
 THEMES_DIR="$ZSH/themes"
 FAVLIST="${HOME}/.zsh_favlist"
-- 
cgit v1.2.3-70-g09d2


From 2991f237aeacb0a1918cdd6d4b98fe4b21980038 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 7 Aug 2018 21:04:09 +0200
Subject: bundler: allow aliases in `bundle exec`

This means that if you have, for example, `alias rs='rails server'`, you can
run `be rs` and have it expanded to `bundle exec rails server`.

Fixes #5818
---
 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 b0b286af5..589f2cfce 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -1,4 +1,4 @@
-alias be="bundle exec"
+alias be="bundle exec "
 alias bl="bundle list"
 alias bp="bundle package"
 alias bo="bundle open"
-- 
cgit v1.2.3-70-g09d2


From 850975eb78908e8272e42685da8b5ced3a428c97 Mon Sep 17 00:00:00 2001
From: Johan Kaving <johan@kaving.se>
Date: Tue, 7 Aug 2018 21:39:38 +0200
Subject: Add support for ForkLift 3 (#6490)

This adds support for ForkLift 3, which uses a different
application id and also uses a popover instead of a sheet for
entering the directory to go to.

This also improves the handling of different versions of ForkLift,
by first choosing any currently running instance, and if none is
running starting the newest available version.

Fixes #6565.
---
 plugins/forklift/forklift.plugin.zsh | 100 ++++++++++++++++++++++++-----------
 1 file changed, 69 insertions(+), 31 deletions(-)

(limited to 'plugins')

diff --git a/plugins/forklift/forklift.plugin.zsh b/plugins/forklift/forklift.plugin.zsh
index 692ca5790..274c4a822 100644
--- a/plugins/forklift/forklift.plugin.zsh
+++ b/plugins/forklift/forklift.plugin.zsh
@@ -1,6 +1,6 @@
 # Open folder in ForkLift.app or ForkLift2.app from console
 # Author: Adam Strzelecki nanoant.com, modified by Bodo Tasche bitboxer.de
-#         Updated to support ForkLift2 by Johan Kaving
+#         Updated to support ForkLift 2 and ForkLift 3 by Johan Kaving
 #
 # Usage:
 #   fl [<folder>]
@@ -24,46 +24,84 @@ function fl {
   fi
   osascript 2>&1 1>/dev/null <<END
 
-    try
-      tell application "Finder"
-        set appName to name of application file id "com.binarynights.ForkLift2"
-      end tell
-    on error err_msg number err_num
-      tell application "Finder"
-        set appName to name of application file id "com.binarynights.ForkLift"
-      end tell
-    end try
+  try
+    tell application "Finder"
+        set forkLift3 to name of application file id "com.binarynights.ForkLift-3"
+    end tell
+  on error err_msg number err_num
+    set forkLift3 to null
+  end try
+  try
+    tell application "Finder"
+        set forkLift2 to name of application file id "com.binarynights.ForkLift2"
+    end tell
+  on error err_msg number err_num
+    set forkLift2 to null
+  end try
+  try
+    tell application "Finder"
+        set forkLift to name of application file id "com.binarynights.ForkLift"
+    end tell
+  on error err_msg number err_num
+    set forkLift to null
+  end try
 
-    if application appName is running
-      tell application appName
+  if forkLift3 is not null and application forkLift3 is running then
+    tell application forkLift3
         activate
-      end tell
-    else
-      tell application appName
+        set forkLiftVersion to version
+    end tell
+  else if forkLift2 is not null and application forkLift2 is running then
+    tell application forkLift2
         activate
-      end tell
-      repeat until application appName is running
-        delay 1
-      end repeat
-      tell application appName
+        set forkLiftVersion to version
+    end tell
+  else if forkLift is not null and application forkLift is running then
+    tell application forkLift
         activate
-      end tell
+        set forkLiftVersion to version
+    end tell
+  else
+    if forkLift3 is not null then
+        set appName to forkLift3
+    else if forkLift2 is not null then
+        set appName to forkLift2
+    else if forkLift is not null then
+        set appName to forkLift
     end if
+    
+    tell application appName
+        activate
+        set forkLiftVersion to version
+    end tell
+    repeat until application appName is running
+        delay 1
+    end repeat
+    tell application appName
+        activate
+    end tell
+  end if
 
-    tell application "System Events"
-      tell application process "ForkLift"
+  tell application "System Events"
+    tell application process "ForkLift"
         try
-          set topWindow to window 1
+            set topWindow to window 1
         on error
-          keystroke "n" using command down
-          set topWindow to window 1
+            keystroke "n" using command down
+            set topWindow to window 1
         end try
         keystroke "g" using {command down, shift down}
-        tell sheet 1 of topWindow
-          set value of text field 1 to "$PWD"
-          keystroke return
-        end tell
-      end tell
+        if forkLiftVersion starts with "3" then
+            tell pop over of list of group of splitter group of splitter group of topWindow
+                set value of text field 1 to "$PWD"
+            end tell
+        else
+            tell sheet 1 of topWindow
+                set value of text field 1 to "$PWD"
+            end tell
+        end if
+        keystroke return
     end tell
+  end tell
 END
 }
-- 
cgit v1.2.3-70-g09d2


From 0cc371181a0727e7de261cd78b3fe6cc11d6a8a2 Mon Sep 17 00:00:00 2001
From: Jeff Dickey <216188+jdxcode@users.noreply.github.com>
Date: Tue, 7 Aug 2018 12:41:53 -0700
Subject: use official heroku autocomplete (#6919)

---
 plugins/heroku/_heroku           | 199 ---------------------------------------
 plugins/heroku/heroku.plugin.zsh |   9 ++
 2 files changed, 9 insertions(+), 199 deletions(-)
 delete mode 100644 plugins/heroku/_heroku
 create mode 100644 plugins/heroku/heroku.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/heroku/_heroku b/plugins/heroku/_heroku
deleted file mode 100644
index 4122de237..000000000
--- a/plugins/heroku/_heroku
+++ /dev/null
@@ -1,199 +0,0 @@
-#compdef heroku
-
-# Heroku Autocomplete plugin for Oh-My-Zsh
-# Requires: The Heroku client gem (https://github.com/heroku/heroku)
-# Author: Ali B. (http://awhitebox.com)
-
-local -a _1st_arguments
-_1st_arguments=(
-  "account\:confirm_billing":"Confirm that your account can be billed at the end of the month"
-  "addons":"list installed addons"
-  "addons\:list":"list all available addons"
-  "addons\:add":"install an addon"
-  "addons\:upgrade":"upgrade an existing addon"
-  "addons\:downgrade":"downgrade an existing addon"
-  "addons\:remove":"uninstall an addon"
-  "addons\:open":"open an addon's dashboard in your browser"
-  "apps":"list your apps"
-  "apps\:info":"show detailed app information"
-  "apps\:create":"create a new app"
-  "apps\:rename":"rename the app"
-  "apps\:open":"open the app in a web browser"
-  "apps\:destroy":"permanently destroy an app"
-  "auth\:login":"log in with your heroku credentials"
-  "auth\:logout":"clear local authentication credentials"
-  "config":"display the config vars for an app"
-  "config\:pull":"pull heroku config vars down to the local environment"
-  "config\:push":"push local config vars to heroku"
-  "config\:set":"set one or more config vars"
-  "config\:unset":"unset one or more config vars"
-  "domains":"list custom domains for an app"
-  "domains\:add":"add a custom domain to an app"
-  "domains\:remove":"remove a custom domain from an app"
-  "domains\:clear":"remove all custom domains from an app"
-  "features":"list available app features"
-  "features\:disable":"disables a feature"
-  "features\:enable":"enables an feature"
-  "features\:info":"displays additional information about feature"
-  "help":"list available commands or display help for a specific command"
-  "keys":"display keys for the current user"
-  "keys\:add":"add a key for the current user"
-  "keys\:remove":"remove a key from the current user"
-  "keys\:clear":"remove all authentication keys from the current user"
-  "logs":"display recent log output"
-  "logs\:cron":"DEPRECATED: display cron logs from legacy logging"
-  "logs\:drains":"manage syslog drains"
-  "maintenance\:on":"put the app into maintenance mode"
-  "maintenance\:off":"take the app out of maintenance mode"
-  "pipelines":"list pipelines you have access to"
-  "pipelines\:add":"add this app to a pipeline"
-  "pipelines\:create":"create a new pipeline"
-  "pipelines\:destroy":"destroy a pipeline"
-  "pipelines\:diff":"compares the latest release of this app to its downstream app(s)"
-  "pipelines\:info":"show list of apps in a pipeline"
-  "pipelines\:list":"list pipelines you have access to"
-  "pipelines\:open":"open a pipeline in dashboard"
-  "pipelines\:promote":"promote the latest release of this app to its downstream app(s)"
-  "pipelines\:remove":"remove this app from its pipeline"
-  "pipelines\:rename":"rename a pipeline"
-  "pipelines\:update":"update this app's stage in a pipeline"
-  "pg\:credentials":"display the DATABASE credentials"
-  "pg\:diagnose":"run diagnostics report on DATABASE"
-  "pg\:info":"display database information"
-  "pg\:kill":"kill a query"
-  "pg\:killall":"terminates ALL connections"
-  "pg\:maintenance":"manage maintenance for DATABASE"
-  "pg\:promote":"sets DATABASE as your DATABASE_URL"
-  "pg\:ps":"view active queries with execution time"
-  "pg\:psql":"open a psql shell to the database"
-  "pg\:pull":"pull from REMOTE_SOURCE_DATABASE to LOCAL_TARGET_DATABASE"
-  "pg\:push":"push from LOCAL_SOURCE_DATABASE to REMOTE_TARGET_DATABASE"
-  "pg\:reset":"delete all data in DATABASE"
-  "pg\:unfollow":"stop a replica from following and make it a read/write database"
-  "pg\:upgrade":"unfollow a database and upgrade it to the latest PostgreSQL version"
-  "pg\:wait":"monitor database creation, exit when complete"
-  "pg\:backups":"Interact with built-in backups"
-  "pgbackups":"list captured backups"
-  "pgbackups\:url":"get a temporary URL for a backup"
-  "pgbackups\:capture":"capture a backup from a database id"
-  "pgbackups\:restore":"restore a backup to a database"
-  "pgbackups\:destroy":"destroys a backup"
-  "plugins":"list installed plugins"
-  "plugins\:install":"install a plugin"
-  "plugins\:uninstall":"uninstall a plugin"
-  "ps\:dynos":"scale to QTY web processes"
-  "ps\:workers":"scale to QTY background processes"
-  "ps":"list processes for an app"
-  "ps\:restart":"restart an app process"
-  "ps\:scale":"scale processes by the given amount"
-  "releases":"list releases"
-  "releases\:info":"view detailed information for a release"
-  "rollback":"roll back to an older release"
-  "run":"run an attached process"
-  "run\:rake":"remotely execute a rake command"
-  "run\:console":"open a remote console session"
-  "sharing":"list collaborators on an app"
-  "sharing\:add":"add a collaborator to an app"
-  "sharing\:remove":"remove a collaborator from an app"
-  "sharing\:transfer":"transfer an app to a new owner"
-  "ssl":"list certificates for an app"
-  "ssl\:add":"add an ssl certificate to an app"
-  "ssl\:remove":"remove an ssl certificate from an app"
-  "ssl\:clear":"remove all ssl certificates from an app"
-  "stack":"show the list of available stacks"
-  "stack\:migrate":"prepare migration of this app to a new stack"
-  "version":"show heroku client version"
-)
-
-_arguments '*:: :->command'
-
-if (( CURRENT == 1 )); then
-  _describe -t commands "heroku 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]' \
-    )
-    ;;
-  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]' \
-    )
-    ;;
-  pipelines)
-    _command_args=(
-      '(--json)'--json'[output in json format]' \
-    )
-    ;;
-  pipelines:add)
-    _command_args=(
-      '(-s|--stage)'{-s,--stage}'[stage of first app in pipeline]' \
-    )
-    ;;
-  pipelines:create)
-    _command_args=(
-      '(-s|--stage)'{-s,--stage}'[stage of first app in pipeline]' \
-    )
-    ;;
-  pipelines:info)
-    _command_args=(
-      '(--json)'--json'[output in json format]' \
-    )
-    ;;
-  pipelines:list)
-    _command_args=(
-      '(--json)'--json'[output in json format]' \
-    )
-    ;;
-  pipelines:promote)
-    _command_args=(
-      '(-t|--to)'{-t,--to}'[comma separated list of apps to promote to]' \
-    )
-    ;;
-  pipelines:update)
-    _command_args=(
-      '(-s|--stage)'{-s,--stage}'[stage of first app in pipeline]' \
-    )
-    ;;
-  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 \
-  '(--app)--app[the app name]' \
-  '(--remote)--remote[the remote name]' \
-  '(--help)--help[help about the current command]' \
-  && return 0
diff --git a/plugins/heroku/heroku.plugin.zsh b/plugins/heroku/heroku.plugin.zsh
new file mode 100644
index 000000000..9a99b4211
--- /dev/null
+++ b/plugins/heroku/heroku.plugin.zsh
@@ -0,0 +1,9 @@
+HEROKU_AC_CACHE_DIR="$HOME/.cache"
+if [ "$(uname -s)" = "Darwin" ]; then
+  HEROKU_AC_CACHE_DIR="$HOME/Library/Caches"
+fi
+if [ ! -z "$XDG_CACHE_HOME" ]; then
+  HEROKU_AC_CACHE_DIR="$XDG_CACHE_DIR"
+fi
+HEROKU_AC_ZSH_SETUP_PATH=$HEROKU_AC_CACHE_DIR/heroku/autocomplete/zsh_setup
+[ -f $HEROKU_AC_ZSH_SETUP_PATH ] && source $HEROKU_AC_ZSH_SETUP_PATH
-- 
cgit v1.2.3-70-g09d2


From 8961a3794cc2f5bc31b592367e82aa1766f24bbd Mon Sep 17 00:00:00 2001
From: Joseph Richey <joerichey@google.com>
Date: Tue, 7 Aug 2018 13:54:45 -0700
Subject: plugins/go: Simplify/fix recursive golang format (#7027)

Per the [`go` command specification](https://golang.org/cmd/go/#hdr-Package_lists),
the `...` wildcard matches the empty string. This makes commands like
`go <action> . ./...` unnecessary: they should use `go <action> ./...`.

This also fixes a bug with the `gofa` shortcut, where it would emit an
error if called from a directory containing no go source files (but
having subdirectories that _did_ contain go files).
---
 plugins/golang/golang.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/golang/golang.plugin.zsh b/plugins/golang/golang.plugin.zsh
index d5c78ce6c..64c80e864 100644
--- a/plugins/golang/golang.plugin.zsh
+++ b/plugins/golang/golang.plugin.zsh
@@ -184,7 +184,7 @@ alias gob='go build'
 alias goc='go clean'
 alias god='go doc'
 alias gof='go fmt'
-alias gofa='go fmt . ./...'
+alias gofa='go fmt ./...'
 alias gog='go get'
 alias goi='go install'
 alias gol='go list'
-- 
cgit v1.2.3-70-g09d2


From 9ecde7f73211607353954b6fd76fef56d7e663b3 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 7 Aug 2018 23:54:07 +0200
Subject: dotenv: call function on startup

Fixes #7017
---
 plugins/dotenv/dotenv.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/dotenv/dotenv.plugin.zsh b/plugins/dotenv/dotenv.plugin.zsh
index fa47c4c68..a0c2d0051 100644
--- a/plugins/dotenv/dotenv.plugin.zsh
+++ b/plugins/dotenv/dotenv.plugin.zsh
@@ -1,5 +1,3 @@
-#!/bin/zsh
-
 source_env() {
   if [[ -f .env ]]; then
     if [[ -o a ]]; then
@@ -14,3 +12,5 @@ source_env() {
 
 autoload -U add-zsh-hook
 add-zsh-hook chpwd source_env
+
+source_env
-- 
cgit v1.2.3-70-g09d2


From c781d708da064b42af19e20113d042b65e886d94 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Wed, 8 Aug 2018 00:05:34 +0200
Subject: dotenv: test and warn of incorrect.env syntax

Fixes #6337
---
 plugins/dotenv/dotenv.plugin.zsh | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'plugins')

diff --git a/plugins/dotenv/dotenv.plugin.zsh b/plugins/dotenv/dotenv.plugin.zsh
index a0c2d0051..b701b5596 100644
--- a/plugins/dotenv/dotenv.plugin.zsh
+++ b/plugins/dotenv/dotenv.plugin.zsh
@@ -1,5 +1,8 @@
 source_env() {
   if [[ -f .env ]]; then
+    # test .env syntax
+    zsh -fn .env || echo 'dotenv: error when sourcing `.env` file' >&2
+
     if [[ -o a ]]; then
       source .env
     else
-- 
cgit v1.2.3-70-g09d2


From 91d55dce11cc975309cd7dc8955c51f82de8548c Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Wed, 8 Aug 2018 13:36:27 +0200
Subject: bundler: update README with latest changes

---
 plugins/bundler/README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/bundler/README.md b/plugins/bundler/README.md
index 04d551447..dc2f17008 100644
--- a/plugins/bundler/README.md
+++ b/plugins/bundler/README.md
@@ -2,7 +2,8 @@
 
 - adds completion for basic bundler commands
 - adds short aliases for common bundler commands
-  - `be` aliased to `bundle exec`
+  - `be` aliased to `bundle exec`.  
+    It also supports aliases (if `rs` is `rails server`, `be rs` will bundle-exec `rails server`).
   - `bl` aliased to `bundle list`
   - `bp` aliased to `bundle package`
   - `bo` aliased to `bundle open`
@@ -13,7 +14,8 @@
   - looks for a binstub under `./bin/` and executes it (if present)
   - calls `bundle exec <gem executable>` otherwise
 
-For a full list of *common gems* being wrapped by default please look at the `bundler.plugin.zsh` file.
+Common gems wrapped by default (by name of the executable):
+`annotate`, `cap`, `capify`, `cucumber`, `foodcritic`, `guard`, `hanami`, `irb`, `jekyll`, `kitchen`, `knife`, `middleman`, `nanoc`, `pry`, `puma`, `rackup`, `rainbows`, `rake`, `rspec`, `shotgun`, `sidekiq`, `spec`, `spork`, `spring`, `strainer`, `tailor`, `taps`, `thin`, `thor`, `unicorn` and `unicorn_rails`.
 
 ## Configuration
 
-- 
cgit v1.2.3-70-g09d2


From 44473d785e435373350bc6b3253eec104c05b404 Mon Sep 17 00:00:00 2001
From: Michal Halenka <michal.halenka@gmail.com>
Date: Wed, 8 Aug 2018 14:12:55 +0200
Subject: Add doctl autocompletion (#6501)

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

(limited to 'plugins')

diff --git a/plugins/doctl/doctl.plugin.zsh b/plugins/doctl/doctl.plugin.zsh
new file mode 100644
index 000000000..d23ed085c
--- /dev/null
+++ b/plugins/doctl/doctl.plugin.zsh
@@ -0,0 +1,9 @@
+# Autocompletion for doctl, the command line tool for DigitalOcean service
+#
+# doctl project: https://github.com/digitalocean/doctl
+#
+# Author: https://github.com/HalisCz
+
+if [ $commands[doctl] ]; then
+  source <(doctl completion zsh)
+fi
-- 
cgit v1.2.3-70-g09d2


From 60db5cdb582134db2778d25d7cb7a40c0249e8d9 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Thu, 9 Aug 2018 17:19:40 +0200
Subject: tmux: fix invalid syntax on old zsh versions

First reported on https://github.com/robbyrussell/oh-my-zsh/commit/f584de5930467fd53e8b7d2e51f5227bc405e4b2#r29984052
---
 plugins/tmux/tmux.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
index ff7de746b..4a7986389 100644
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -56,7 +56,8 @@ function _zsh_tmux_plugin_run() {
     return $?
   fi
 
-  local -a tmux_cmd=(command tmux)
+  local -a tmux_cmd
+  tmux_cmd=(command tmux)
   [[ "$ZSH_TMUX_ITERM2" == "true" ]] && tmux_cmd+=(-CC)
 
   # Try to connect to an existing session.
-- 
cgit v1.2.3-70-g09d2


From 3a31074d34c825028a7fbbd1a2ea55a5793a3d01 Mon Sep 17 00:00:00 2001
From: Tom Milligan <tommilligan@users.noreply.github.com>
Date: Thu, 9 Aug 2018 16:37:47 +0100
Subject: Update docker plugin from upstream docker/cli (#7018)

Update `docker` plugin from [docker/cli master](https://github.com/tommilligan/cli/blob/master/contrib/completion/zsh/_docker)

- bugfix for `docker update` autocompletion: https://github.com/docker/cli/pull/1232
- added `scope` subcommand: https://github.com/docker/cli/pull/1227/files
---
 plugins/docker/_docker | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/docker/_docker b/plugins/docker/_docker
index df4b44961..31b83c777 100644
--- a/plugins/docker/_docker
+++ b/plugins/docker/_docker
@@ -431,7 +431,7 @@ __docker_complete_events_filter() {
     integer ret=1
     declare -a opts
 
-    opts=('container' 'daemon' 'event' 'image' 'label' 'network' 'type' 'volume')
+    opts=('container' 'daemon' 'event' 'image' 'label' 'network' 'scope' 'type' 'volume')
 
     if compset -P '*='; then
         case "${${words[-1]%=*}#*=}" in
@@ -461,6 +461,11 @@ __docker_complete_events_filter() {
             (network)
                 __docker_complete_networks && ret=0
                 ;;
+            (scope)
+                local -a scope_opts
+                scope_opts=('local' 'swarm')
+                _describe -t scope-filter-opts "scope filter options" scope_opts && ret=0
+                ;;
             (type)
                 local -a type_opts
                 type_opts=('container' 'daemon' 'image' 'network' 'volume')
@@ -923,7 +928,7 @@ __docker_container_subcommand() {
             local state
             _arguments $(__docker_arguments) \
                 $opts_help \
-                opts_create_run_update \
+                $opts_create_run_update \
                 "($help -)*: :->values" && ret=0
             case $state in
                 (values)
-- 
cgit v1.2.3-70-g09d2


From 5fbf9120935af9b5e81b72f942be09891c6e508f Mon Sep 17 00:00:00 2001
From: Alexander Kapshuna <kapsh@kap.sh>
Date: Thu, 9 Aug 2018 19:16:15 +0300
Subject: extract: whl files support (#7045)

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

(limited to 'plugins')

diff --git a/plugins/extract/_extract b/plugins/extract/_extract
index 172425d2c..3baefa339 100644
--- a/plugins/extract/_extract
+++ b/plugins/extract/_extract
@@ -3,5 +3,5 @@
 
 _arguments \
   '(-r --remove)'{-r,--remove}'[Remove archive.]' \
-  "*::archive file:_files -g '(#i)*.(7z|Z|apk|bz2|deb|gz|ipsw|jar|lzma|rar|sublime-package|tar|tar.bz2|tar.gz|tar.xz|tar.zma|tbz|tbz2|tgz|tlz|txz|war|xpi|xz|zip)(-.)'" \
+  "*::archive file:_files -g '(#i)*.(7z|Z|apk|bz2|deb|gz|ipsw|jar|lzma|rar|sublime-package|tar|tar.bz2|tar.gz|tar.xz|tar.zma|tbz|tbz2|tgz|tlz|txz|war|whl|xpi|xz|zip)(-.)'" \
     && return 0
diff --git a/plugins/extract/extract.plugin.zsh b/plugins/extract/extract.plugin.zsh
index d56044805..4c72ce870 100644
--- a/plugins/extract/extract.plugin.zsh
+++ b/plugins/extract/extract.plugin.zsh
@@ -46,7 +46,7 @@ extract() {
 			(*.xz) unxz "$1" ;;
 			(*.lzma) unlzma "$1" ;;
 			(*.z) uncompress "$1" ;;
-			(*.zip|*.war|*.jar|*.sublime-package|*.ipsw|*.xpi|*.apk) unzip "$1" -d $extract_dir ;;
+			(*.zip|*.war|*.jar|*.sublime-package|*.ipsw|*.xpi|*.apk|*.whl) unzip "$1" -d $extract_dir ;;
 			(*.rar) unrar x -ad "$1" ;;
 			(*.7z) 7za x "$1" ;;
 			(*.deb)
-- 
cgit v1.2.3-70-g09d2


From 9624ce992ec3482041c3086bc88f0485eb8d9bd3 Mon Sep 17 00:00:00 2001
From: Thi <thii@users.noreply.github.com>
Date: Fri, 10 Aug 2018 02:10:32 +0900
Subject: Add shell completion for Swift Package Manager (#7046)

This was generated by the Swift compiler 4.1.2 using the following
command:

swift package completion-tool generate-zsh-script
---
 plugins/swiftpm/_swift | 362 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 362 insertions(+)
 create mode 100644 plugins/swiftpm/_swift

(limited to 'plugins')

diff --git a/plugins/swiftpm/_swift b/plugins/swiftpm/_swift
new file mode 100644
index 000000000..901b5d9e2
--- /dev/null
+++ b/plugins/swiftpm/_swift
@@ -0,0 +1,362 @@
+#compdef swift
+local context state state_descr line
+typeset -A opt_args
+
+_swift() {
+    _arguments -C \
+        '(- :)--help[prints the synopsis and a list of the most commonly used commands]: :->arg' \
+        '(-): :->command' \
+        '(-)*:: :->arg' && return
+
+    case $state in
+        (command)
+            local tools
+            tools=(
+                'build:build sources into binary products'
+                'run:build and run an executable product'
+                'package:perform operations on Swift packages'
+                'test:build and run tests'
+            )
+            _alternative \
+                'tools:common:{_describe "tool" tools }' \
+                'compiler: :_swift_compiler' && _ret=0
+            ;;
+        (arg)
+            case ${words[1]} in
+                (build)
+                    _swift_build
+                    ;;
+                (run)
+                    _swift_run
+                    ;;
+                (package)
+                    _swift_package
+                    ;;
+                (test)
+                    _swift_test
+                    ;;
+                (*)
+                    _swift_compiler
+                    ;;
+            esac
+            ;;
+    esac
+}
+
+_swift_dependency() {
+    local dependencies
+    dependencies=( $(swift package completion-tool list-dependencies) )
+    _describe '' dependencies
+}
+
+_swift_executable() {
+    local executables
+    executables=( $(swift package completion-tool list-executables) )
+    _describe '' executables
+}
+
+# Generates completions for swift build
+#
+# In the final compdef file, set the following file header:
+#
+#     #compdef _swift_build
+#     local context state state_descr line
+#     typeset -A opt_args
+_swift_build() {
+    arguments=(
+        "-Xcc[Pass flag through to all C compiler invocations]:Pass flag through to all C compiler invocations: "
+        "-Xswiftc[Pass flag through to all Swift compiler invocations]:Pass flag through to all Swift compiler invocations: "
+        "-Xlinker[Pass flag through to all linker invocations]:Pass flag through to all linker invocations: "
+        "-Xcxx[Pass flag through to all C++ compiler invocations]:Pass flag through to all C++ compiler invocations: "
+        "(--configuration -c)"{--configuration,-c}"[Build with configuration (debug|release) ]: :{_values '' 'debug[build with DEBUG configuration]' 'release[build with RELEASE configuration]'}"
+        "--build-path[Specify build/cache directory ]:Specify build/cache directory :_files"
+        "(--chdir -C)"{--chdir,-C}"[]: :_files"
+        "--package-path[Change working directory before any other operation]:Change working directory before any other operation:_files"
+        "--disable-prefetching[]"
+        "--disable-sandbox[Disable using the sandbox when executing subprocesses]"
+        "--version[]"
+        "--destination[]: :_files"
+        "(--verbose -v)"{--verbose,-v}"[Increase verbosity of informational output]"
+        "--no-static-swift-stdlib[Do not link Swift stdlib statically]"
+        "--static-swift-stdlib[Link Swift stdlib statically]"
+        "--enable-build-manifest-caching[Enable llbuild manifest caching [Experimental]]"
+        "--build-tests[Build both source and test targets]"
+        "--product[Build the specified product]:Build the specified product: "
+        "--target[Build the specified target]:Build the specified target: "
+        "--show-bin-path[Print the binary output path]"
+    )
+    _arguments $arguments && return
+}
+
+# Generates completions for swift run
+#
+# In the final compdef file, set the following file header:
+#
+#     #compdef _swift_run
+#     local context state state_descr line
+#     typeset -A opt_args
+_swift_run() {
+    arguments=(
+        ":The executable to run:_swift_executable"
+        "-Xcc[Pass flag through to all C compiler invocations]:Pass flag through to all C compiler invocations: "
+        "-Xswiftc[Pass flag through to all Swift compiler invocations]:Pass flag through to all Swift compiler invocations: "
+        "-Xlinker[Pass flag through to all linker invocations]:Pass flag through to all linker invocations: "
+        "-Xcxx[Pass flag through to all C++ compiler invocations]:Pass flag through to all C++ compiler invocations: "
+        "(--configuration -c)"{--configuration,-c}"[Build with configuration (debug|release) ]: :{_values '' 'debug[build with DEBUG configuration]' 'release[build with RELEASE configuration]'}"
+        "--build-path[Specify build/cache directory ]:Specify build/cache directory :_files"
+        "(--chdir -C)"{--chdir,-C}"[]: :_files"
+        "--package-path[Change working directory before any other operation]:Change working directory before any other operation:_files"
+        "--disable-prefetching[]"
+        "--disable-sandbox[Disable using the sandbox when executing subprocesses]"
+        "--version[]"
+        "--destination[]: :_files"
+        "(--verbose -v)"{--verbose,-v}"[Increase verbosity of informational output]"
+        "--no-static-swift-stdlib[Do not link Swift stdlib statically]"
+        "--static-swift-stdlib[Link Swift stdlib statically]"
+        "--enable-build-manifest-caching[Enable llbuild manifest caching [Experimental]]"
+        "--skip-build[Skip building the executable product]"
+    )
+    _arguments $arguments && return
+}
+
+# Generates completions for swift package
+#
+# In the final compdef file, set the following file header:
+#
+#     #compdef _swift_package
+#     local context state state_descr line
+#     typeset -A opt_args
+_swift_package() {
+    arguments=(
+        "-Xcc[Pass flag through to all C compiler invocations]:Pass flag through to all C compiler invocations: "
+        "-Xswiftc[Pass flag through to all Swift compiler invocations]:Pass flag through to all Swift compiler invocations: "
+        "-Xlinker[Pass flag through to all linker invocations]:Pass flag through to all linker invocations: "
+        "-Xcxx[Pass flag through to all C++ compiler invocations]:Pass flag through to all C++ compiler invocations: "
+        "(--configuration -c)"{--configuration,-c}"[Build with configuration (debug|release) ]: :{_values '' 'debug[build with DEBUG configuration]' 'release[build with RELEASE configuration]'}"
+        "--build-path[Specify build/cache directory ]:Specify build/cache directory :_files"
+        "(--chdir -C)"{--chdir,-C}"[]: :_files"
+        "--package-path[Change working directory before any other operation]:Change working directory before any other operation:_files"
+        "--disable-prefetching[]"
+        "--disable-sandbox[Disable using the sandbox when executing subprocesses]"
+        "--version[]"
+        "--destination[]: :_files"
+        "(--verbose -v)"{--verbose,-v}"[Increase verbosity of informational output]"
+        "--no-static-swift-stdlib[Do not link Swift stdlib statically]"
+        "--static-swift-stdlib[Link Swift stdlib statically]"
+        "--enable-build-manifest-caching[Enable llbuild manifest caching [Experimental]]"
+        '(-): :->command'
+        '(-)*:: :->arg'
+    )
+    _arguments $arguments && return
+    case $state in
+        (command)
+            local modes
+            modes=(
+                'update:Update package dependencies'
+                'show-dependencies:Print the resolved dependency graph'
+                'resolve:Resolve package dependencies'
+                'fetch:'
+                'completion-tool:Completion tool (for shell completions)'
+                'edit:Put a package in editable mode'
+                'tools-version:Manipulate tools version of the current package'
+                'describe:Describe the current package'
+                'clean:Delete build artifacts'
+                'reset:Reset the complete cache/build directory'
+                'unedit:Remove a package from editable mode'
+                'generate-xcodeproj:Generates an Xcode project'
+                'init:Initialize a new package'
+                'dump-package:Print parsed Package.swift as JSON'
+            )
+            _describe "mode" modes
+            ;;
+        (arg)
+            case ${words[1]} in
+                (update)
+                    _swift_package_update
+                    ;;
+                (show-dependencies)
+                    _swift_package_show-dependencies
+                    ;;
+                (resolve)
+                    _swift_package_resolve
+                    ;;
+                (fetch)
+                    _swift_package_fetch
+                    ;;
+                (completion-tool)
+                    _swift_package_completion-tool
+                    ;;
+                (edit)
+                    _swift_package_edit
+                    ;;
+                (tools-version)
+                    _swift_package_tools-version
+                    ;;
+                (describe)
+                    _swift_package_describe
+                    ;;
+                (clean)
+                    _swift_package_clean
+                    ;;
+                (reset)
+                    _swift_package_reset
+                    ;;
+                (unedit)
+                    _swift_package_unedit
+                    ;;
+                (generate-xcodeproj)
+                    _swift_package_generate-xcodeproj
+                    ;;
+                (init)
+                    _swift_package_init
+                    ;;
+                (dump-package)
+                    _swift_package_dump-package
+                    ;;
+            esac
+            ;;
+    esac
+}
+
+_swift_package_update() {
+    arguments=(
+    )
+    _arguments $arguments && return
+}
+
+_swift_package_show-dependencies() {
+    arguments=(
+        "--format[text|dot|json|flatlist]: :{_values '' 'text[list dependencies using text format]' 'dot[list dependencies using dot format]' 'json[list dependencies using JSON format]'}"
+    )
+    _arguments $arguments && return
+}
+
+_swift_package_resolve() {
+    arguments=(
+        ":The name of the package to resolve:_swift_dependency"
+        "--version[The version to resolve at]:The version to resolve at: "
+        "--branch[The branch to resolve at]:The branch to resolve at: "
+        "--revision[The revision to resolve at]:The revision to resolve at: "
+    )
+    _arguments $arguments && return
+}
+
+_swift_package_fetch() {
+    arguments=(
+    )
+    _arguments $arguments && return
+}
+
+_swift_package_completion-tool() {
+    arguments=(
+        ": :{_values '' 'generate-bash-script[generate Bash completion script]' 'generate-zsh-script[generate Bash completion script]' 'list-dependencies[list all dependencies' names]' 'list-executables[list all executables' names]'}"
+    )
+    _arguments $arguments && return
+}
+
+_swift_package_edit() {
+    arguments=(
+        ":The name of the package to edit:_swift_dependency"
+        "--revision[The revision to edit]:The revision to edit: "
+        "--branch[The branch to create]:The branch to create: "
+        "--path[Create or use the checkout at this path]:Create or use the checkout at this path:_files"
+    )
+    _arguments $arguments && return
+}
+
+_swift_package_tools-version() {
+    arguments=(
+        "--set[Set tools version of package to the given value]:Set tools version of package to the given value: "
+        "--set-current[Set tools version of package to the current tools version in use]"
+    )
+    _arguments $arguments && return
+}
+
+_swift_package_describe() {
+    arguments=(
+        "--type[json|text]: :{_values '' 'text[describe using text format]' 'json[describe using JSON format]'}"
+    )
+    _arguments $arguments && return
+}
+
+_swift_package_clean() {
+    arguments=(
+    )
+    _arguments $arguments && return
+}
+
+_swift_package_reset() {
+    arguments=(
+    )
+    _arguments $arguments && return
+}
+
+_swift_package_unedit() {
+    arguments=(
+        ":The name of the package to unedit:_swift_dependency"
+        "--force[Unedit the package even if it has uncommited and unpushed changes.]"
+    )
+    _arguments $arguments && return
+}
+
+_swift_package_generate-xcodeproj() {
+    arguments=(
+        "--xcconfig-overrides[Path to xcconfig file]:Path to xcconfig file:_files"
+        "--enable-code-coverage[Enable code coverage in the generated project]"
+        "--output[Path where the Xcode project should be generated]:Path where the Xcode project should be generated:_files"
+    )
+    _arguments $arguments && return
+}
+
+_swift_package_init() {
+    arguments=(
+        "--type[empty|library|executable|system-module]: :{_values '' 'empty[generates an empty project]' 'library[generates project for a dynamic library]' 'executable[generates a project for a cli executable]' 'system-module[generates a project for a system module]'}"
+    )
+    _arguments $arguments && return
+}
+
+_swift_package_dump-package() {
+    arguments=(
+    )
+    _arguments $arguments && return
+}
+
+# Generates completions for swift test
+#
+# In the final compdef file, set the following file header:
+#
+#     #compdef _swift_test
+#     local context state state_descr line
+#     typeset -A opt_args
+_swift_test() {
+    arguments=(
+        "-Xcc[Pass flag through to all C compiler invocations]:Pass flag through to all C compiler invocations: "
+        "-Xswiftc[Pass flag through to all Swift compiler invocations]:Pass flag through to all Swift compiler invocations: "
+        "-Xlinker[Pass flag through to all linker invocations]:Pass flag through to all linker invocations: "
+        "-Xcxx[Pass flag through to all C++ compiler invocations]:Pass flag through to all C++ compiler invocations: "
+        "(--configuration -c)"{--configuration,-c}"[Build with configuration (debug|release) ]: :{_values '' 'debug[build with DEBUG configuration]' 'release[build with RELEASE configuration]'}"
+        "--build-path[Specify build/cache directory ]:Specify build/cache directory :_files"
+        "(--chdir -C)"{--chdir,-C}"[]: :_files"
+        "--package-path[Change working directory before any other operation]:Change working directory before any other operation:_files"
+        "--disable-prefetching[]"
+        "--disable-sandbox[Disable using the sandbox when executing subprocesses]"
+        "--version[]"
+        "--destination[]: :_files"
+        "(--verbose -v)"{--verbose,-v}"[Increase verbosity of informational output]"
+        "--no-static-swift-stdlib[Do not link Swift stdlib statically]"
+        "--static-swift-stdlib[Link Swift stdlib statically]"
+        "--enable-build-manifest-caching[Enable llbuild manifest caching [Experimental]]"
+        "--skip-build[Skip building the test target]"
+        "(--list-tests -l)"{--list-tests,-l}"[Lists test methods in specifier format]"
+        "--generate-linuxmain[Generate LinuxMain.swift entries for the package]"
+        "--parallel[Run the tests in parallel.]"
+        "(--specifier -s)"{--specifier,-s}"[]: : "
+        "--filter[Run test cases matching regular expression, Format: <test-target>.<test-case> or <test-target>.<test-case>/<test>]:Run test cases matching regular expression, Format: <test-target>.<test-case> or <test-target>.<test-case>/<test>: "
+    )
+    _arguments $arguments && return
+}
+
+_swift_compiler() {
+}
+
+_swift
-- 
cgit v1.2.3-70-g09d2


From 052a6dbd16045d37b07c4bad550077d5ccc82228 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Thu, 9 Aug 2018 19:24:03 +0200
Subject: docker-machine: add official completion

Fixes #6962
---
 plugins/docker-machine/_docker-machine | 359 +++++++++++++++++++++++++++++++++
 1 file changed, 359 insertions(+)
 create mode 100644 plugins/docker-machine/_docker-machine

(limited to 'plugins')

diff --git a/plugins/docker-machine/_docker-machine b/plugins/docker-machine/_docker-machine
new file mode 100644
index 000000000..7c19ba8e7
--- /dev/null
+++ b/plugins/docker-machine/_docker-machine
@@ -0,0 +1,359 @@
+#compdef docker-machine
+# Description
+# -----------
+#  zsh completion for docker-machine
+#  https://github.com/leonhartX/docker-machine-zsh-completion
+# -------------------------------------------------------------------------
+# Version
+# -------
+#  0.1.1
+# -------------------------------------------------------------------------
+# Authors
+# -------
+#  * Ke Xu <leonhartx.k@gmail.com>
+# -------------------------------------------------------------------------
+# Inspiration
+# -----------
+#  * @sdurrheimer docker-compose-zsh-completion https://github.com/sdurrheimer/docker-compose-zsh-completion
+#  * @ilkka _docker-machine
+
+
+__docker-machine_get_hosts() {
+    [[ $PREFIX = -* ]] && return 1
+    local state
+    declare -a hosts
+    state=$1; shift
+    if [[ $state != all ]]; then
+        hosts=(${(f)"$(_call_program commands docker-machine ls -q --filter state=$state)"})
+    else
+        hosts=(${(f)"$(_call_program commands docker-machine ls -q)"})
+    fi
+    _describe 'host' hosts "$@" && ret=0
+    return ret
+}
+
+__docker-machine_hosts_with_state() {
+    declare -a hosts
+    hosts=(${(f)"$(_call_program commands docker-machine ls -f '{{.Name}}\:{{.DriverName}}\({{.State}}\)\ {{.URL}}')"})
+    _describe 'host' hosts
+}
+
+__docker-machine_hosts_all() {
+    __docker-machine_get_hosts all "$@"
+}
+
+__docker-machine_hosts_running() {
+    __docker-machine_get_hosts Running "$@"
+}
+
+__docker-machine_get_swarm() {
+    declare -a swarms
+    swarms=(${(f)"$(_call_program commands docker-machine ls -f {{.Swarm}} | awk '{print $1}')"})
+    _describe 'swarm' swarms
+}
+
+__docker-machine_hosts_and_files() {
+    _alternative "hosts:host:__docker-machine_hosts_all -qS ':'" 'files:files:_path_files'
+}
+
+__docker-machine_filters() {
+    [[ $PREFIX = -* ]] && return 1
+    integer ret=1
+
+    if compset -P '*='; then
+        case "${${words[-1]%=*}#*=}" in
+            (driver)
+                _describe -t driver-filter-opts "driver filter" opts_driver && ret=0
+                ;;
+            (swarm)
+                __docker-machine_get_swarm && ret=0
+                ;;
+            (state)
+                opts_state=('Running' 'Paused' 'Saved' 'Stopped' 'Stopping' 'Starting' 'Error')
+                _describe -t state-filter-opts "state filter" opts_state && ret=0
+                ;;
+            (name)
+                __docker-machine_hosts_all && ret=0
+                ;;
+            (label)
+                _message 'label' && ret=0
+                ;;
+            *)
+                _message 'value' && ret=0
+                ;;
+        esac
+    else
+        opts=('driver' 'swarm' 'state' 'name' 'label')
+        _describe -t filter-opts "filter" opts -qS "=" && ret=0
+    fi
+    return ret
+}
+
+__get_swarm_discovery() {
+    declare -a masters serivces
+    local service
+    services=()
+    masters=($(docker-machine ls -f {{.Swarm}} |grep '(master)' |awk '{print $1}'))
+    for master in $masters; do
+         service=${${${(f)"$(_call_program commands docker-machine inspect -f '{{.HostOptions.SwarmOptions.Discovery}}:{{.Name}}' $master)"}/:/\\:}}
+         services=($services $service)
+    done
+    _describe -t services "swarm service" services && ret=0
+    return ret
+}
+
+__get_create_argument() {
+    typeset -g docker_machine_driver
+    if [[ CURRENT -le 2 ]]; then
+        docker_machine_driver="none"
+    elif [[ CURRENT > 2 && $words[CURRENT-2] = '-d' || $words[CURRENT-2] = '--driver' ]]; then
+        docker_machine_driver=$words[CURRENT-1]
+    elif [[ $words[CURRENT-1] =~ '^(-d|--driver)=' ]]; then
+        docker_machine_driver=${${words[CURRENT-1]}/*=/}
+    fi
+    local driver_opt_cmd
+    local -a opts_provider opts_common opts_read_argument
+    opts_read_argument=(
+        ": :->argument"
+    )
+    opts_common=(
+        $opts_help \
+        '(--driver -d)'{--driver=,-d=}'[Driver to create machine with]:dirver:->driver-option' \
+        '--engine-install-url=[Custom URL to use for engine installation]:url' \
+        '*--engine-opt=[Specify arbitrary flags to include with the created engine in the form flag=value]:flag' \
+        '*--engine-insecure-registry=[Specify insecure registries to allow with the created engine]:registry' \
+        '*--engine-registry-mirror=[Specify registry mirrors to use]:mirror' \
+        '*--engine-label=[Specify labels for the created engine]:label' \
+        '--engine-storage-driver=[Specify a storage driver to use with the engine]:storage-driver:->storage-driver-option' \
+        '*--engine-env=[Specify environment variables to set in the engine]:environment' \
+        '--swarm[Configure Machine with Swarm]' \
+        '--swarm-image=[Specify Docker image to use for Swarm]:image' \
+        '--swarm-master[Configure Machine to be a Swarm master]' \
+        '--swarm-discovery=[Discovery service to use with Swarm]:service:->swarm-service' \
+        '--swarm-strategy=[Define a default scheduling strategy for Swarm]:strategy:(spread binpack random)' \
+        '*--swarm-opt=[Define arbitrary flags for swarm]:flag' \
+        '*--swarm-join-opt=[Define arbitrary flags for Swarm join]:flag' \
+        '--swarm-host=[ip/socket to listen on for Swarm master]:host' \
+        '--swarm-addr=[addr to advertise for Swarm (default: detect and use the machine IP)]:address' \
+        '--swarm-experimental[Enable Swarm experimental features]' \
+        '*--tls-san=[Support extra SANs for TLS certs]:option'
+    )
+    driver_opt_cmd="docker-machine create -d $docker_machine_driver | grep $docker_machine_driver | sed -e 's/\(--.*\)\ *\[\1[^]]*\]/*\1/g' -e 's/\(\[[^]]*\)/\\\\\\1\\\\/g' -e 's/\".*\"\(.*\)/\1/g' | awk '{printf \"%s[\", \$1; for(i=2;i<=NF;i++) {printf \"%s \", \$i}; print \"]\"}'"
+    if [[ $docker_machine_driver != "none" ]]; then
+        opts_provider=(${(f)"$(_call_program commands $driver_opt_cmd)"})
+        _arguments \
+            $opts_provider \
+            $opts_read_argument \
+            $opts_common && ret=0
+    else
+        _arguments $opts_common && ret=0
+    fi
+    case $state in
+        (driver-option)
+            _describe -t driver-option "driver" opts_driver && ret=0
+            ;;
+        (storage-driver-option)
+            _describe -t storage-driver-option "storage driver" opts_storage_driver && ret=0
+            ;;
+        (swarm-service)
+            __get_swarm_discovery && ret=0
+            ;;
+        (argument)
+            ret=0
+            ;;
+    esac
+    return ret
+}
+
+
+__docker-machine_subcommand() {
+    local -a opts_help
+    opts_help=("(- :)--help[Print usage]")
+    local -a opts_only_host opts_driver opts_storage_driver opts_stragery
+    opts_only_host=(
+        "$opts_help"
+        "*:host:__docker-machine_hosts_all"
+    )
+    opts_driver=('amazonec2' 'azure' 'digitalocean' 'exoscale' 'generic' 'google' 'hyperv' 'none' 'openstack' 'rackspace' 'softlayer' 'virtualbox' 'vmwarefusion' 'vmwarevcloudair' 'vmwarevsphere')
+    opts_storage_driver=('overlay' 'aufs' 'btrfs' 'devicemapper' 'vfs' 'zfs')
+    integer ret=1
+
+    case "$words[1]" in
+        (active)
+            _arguments \
+                $opts_help \
+                '(--timeout -t)'{--timeout=,-t=}'[Timeout in seconds, default to 10s]:seconds' && ret=0
+            ;;
+        (config)
+            _arguments \
+                $opts_help \
+                '--swarm[Display the Swarm config instead of the Docker daemon]' \
+                "*:host:__docker-machine_hosts_all" && ret=0
+            ;;
+        (create)
+            __get_create_argument
+           ;;
+        (env)
+            _arguments \
+                $opts_help \
+                '--swarm[Display the Swarm config instead of the Docker daemon]' \
+                '--shell=[Force environment to be configured for a specified shell: \[fish, cmd, powershell\], default is auto-detect]:shell' \
+                '(--unset -u)'{--unset,-u}'[Unset variables instead of setting them]' \
+                '--no-proxy[Add machine IP to NO_PROXY environment variable]' \
+                '*:host:__docker-machine_hosts_running' && ret=0
+            ;;
+        (help)
+            _arguments ':subcommand:__docker-machine_commands' && ret=0
+            ;;
+        (inspect)
+            _arguments \
+                $opts_help \
+                '(--format -f)'{--format=,-f=}'[Format the output using the given go template]:template' \
+                '*:host:__docker-machine_hosts_all' && ret=0
+            ;;
+        (ip)
+            _arguments \
+                $opts_help \
+                '*:host:__docker-machine_hosts_running' && ret=0
+            ;;
+        (kill)
+             _arguments \
+                $opts_help \
+                '*:host:__docker-machine_hosts_with_state' && ret=0
+            ;;
+        (ls)
+            _arguments \
+                $opts_help \
+                '(--quiet -q)'{--quiet,-q}'[Enable quiet mode]' \
+                '*--filter=[Filter output based on conditions provided]:filter:->filter-options' \
+                '(--timeout -t)'{--timeout=,-t=}'[Timeout in seconds, default to 10s]:seconds' \
+                '(--format -f)'{--format=,-f=}'[Pretty-print machines using a Go template]:template' && ret=0
+            case $state in
+                (filter-options)
+                    __docker-machine_filters && ret=0
+                    ;;
+            esac
+            ;;
+        (provision)
+            _arguments $opts_only_host && ret=0
+            ;;
+        (regenerate-certs)
+            _arguments \
+                $opts_help \
+                '(--force -f)'{--force,-f}'[Force rebuild and do not prompt]' \
+                '*:host:__docker-machine_hosts_all' && ret=0
+            ;;
+        (restart)
+            _arguments \
+                $opts_help \
+                '*:host:__docker-machine_hosts_with_state' && ret=0
+            ;;
+        (rm)
+            _arguments \
+                $opts_help \
+                '(--force -f)'{--force,-f}'[Remove local configuration even if machine cannot be removed, also implies an automatic yes (`-y`)]' \
+                '-y[Assumes automatic yes to proceed with remove, without prompting further user confirmation]' \
+                '*:host:__docker-machine_hosts_with_state' && ret=0
+            ;;
+        (scp)
+            _arguments \
+                $opts_help \
+                '(--recursive -r)'{--recursive,-r}'[Copy files recursively (required to copy directories))]' \
+                '*:files:__docker-machine_hosts_and_files' && ret=0
+            ;;
+        (ssh)
+            _arguments \
+                $opts_help \
+                '*:host:__docker-machine_hosts_running' && ret=0
+            ;;
+        (start)
+            _arguments \
+                $opts_help \
+                '*:host:__docker-machine_hosts_with_state' && ret=0
+            ;;
+        (status)
+            _arguments $opts_only_host && ret=0
+            ;;
+        (stop)
+            _arguments \
+                $opts_help \
+                '*:host:__docker-machine_hosts_with_state' && ret=0
+            ;;
+        (upgrade)
+            _arguments $opts_only_host && ret=0
+            ;;
+        (url)
+            _arguments \
+                $opts_help \
+                '*:host:__docker-machine_hosts_running' && ret=0
+            ;;
+    esac
+
+    return ret
+}
+
+
+__docker-machine_commands() {
+    local cache_policy
+
+    zstyle -s ":completion:${curcontext}:" cache-policy cache_policy
+    if [[ -z "$cache_policy" ]]; then
+        zstyle ":completion:${curcontext}:" cache-policy __docker-machine_caching_policy
+    fi
+
+    if ( [[ ${+_docker_machine_subcommands} -eq 0 ]] || _cache_invalid docker_machine_subcommands) \
+        && ! _retrieve_cache docker_machine_subcommands;
+    then
+        local -a lines
+        lines=(${(f)"$(_call_program commands docker-machine 2>&1)"})
+        _docker_machine_subcommands=(${${${lines[$((${lines[(i)Commands:]} + 1)),${lines[(I)  *]}]}## #}/$'\t'##/:})
+        (( $#_docker_machine_subcommands > 0 )) && _store_cache docker_machine_subcommands _docker_machine_subcommands
+    fi
+    _describe -t docker-machine-commands "docker-machine command" _docker_machine_subcommands
+}
+
+__docker-machine_caching_policy() {
+    oldp=( "$1"(Nmh+1) )
+    (( $#oldp ))
+}
+
+_docker-machine() {
+    if [[ $service != docker-machine ]]; then
+        _call_function - _$service
+        return
+    fi
+
+    local curcontext="$curcontext" state line
+    integer ret=1
+    typeset -A opt_args
+
+    _arguments -C \
+        "(- :)"{-h,--help}"[Show help]" \
+        "(-D --debug)"{-D,--debug}"[Enable debug mode]" \
+        '(-s --stroage-path)'{-s,--storage-path}'[Configures storage path]:file:_files' \
+        '--tls-ca-cert[CA to verify remotes against]:file:_files' \
+        '--tls-ca-key[Private key to generate certificates]:file:_files' \
+        '--tls-client-cert[Client cert to use for TLS]:file:_files' \
+        '--tls-client-key[Private key used in client TLS auth]:file:_files' \
+        '--github-api-token[Token to use for requests to the Github API]' \
+        '--native-ssh[Use the native (Go-based) SSH implementation.]' \
+        '--bugsnag-api-token[BugSnag API token for crash reporting]' \
+        '(- :)'{-v,--version}'[Print the version]' \
+        "(-): :->command" \
+        "(-)*:: :->option-or-argument" && ret=0
+
+    case $state in
+        (command)
+            __docker-machine_commands && ret=0
+            ;;
+        (option-or-argument)
+            curcontext=${curcontext%:*:*}:docker-machine-$words[1]:
+            __docker-machine_subcommand && ret=0
+            ret=0
+            ;;
+    esac
+
+    return ret
+}
+
+_docker-machine "$@"
-- 
cgit v1.2.3-70-g09d2


From f2f078a1bbbce1631a99150029541544e621b6be Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Thu, 9 Aug 2018 20:17:43 +0200
Subject: pass: update completion (2018-08-03)

---
 plugins/pass/_pass | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'plugins')

diff --git a/plugins/pass/_pass b/plugins/pass/_pass
index 715229e76..5f3b8f541 100644
--- a/plugins/pass/_pass
+++ b/plugins/pass/_pass
@@ -6,11 +6,17 @@
 #    Brian Mattern <rephorm@rephorm.com>
 #    Jason A. Donenfeld <Jason@zx2c4.com>.
 # All Rights Reserved.
-#
 # This file is licensed under the GPLv2+.
 # Please visit https://git.zx2c4.com/password-store/tree/COPYING for more information.
+
+
+# If you use multiple repositories, you can configure completion like this:
 #
-# Oh my zsh plugin maintainer: Santiago Borrazás <sanbor@gmail.com>
+# compdef _pass workpass
+# zstyle ':completion::complete:workpass::' prefix "$HOME/work/pass"
+# workpass() {
+#   PASSWORD_STORE_DIR=$HOME/work/pass pass $@
+# }
 
 
 _pass () {
@@ -117,8 +123,9 @@ _pass_cmd_show () {
 }
 _pass_complete_entries_helper () {
 	local IFS=$'\n'
-	local prefix="${PASSWORD_STORE_DIR:-$HOME/.password-store}"
-	_values -C 'passwords' ${$(find -L "$prefix" \( -name .git -o -name .gpg-id \) -prune -o $@ -print 2>/dev/null | sed -e "s#${prefix}/\{0,1\}##" -e 's#\.gpg##' | sort):-""}
+	local prefix
+	zstyle -s ":completion:${curcontext}:" prefix prefix || prefix="${PASSWORD_STORE_DIR:-$HOME/.password-store}"
+	_values -C 'passwords' ${$(find -L "$prefix" \( -name .git -o -name .gpg-id \) -prune -o $@ -print 2>/dev/null | sed -e "s#${prefix}/\{0,1\}##" -e 's#\.gpg##' -e 's#\\#\\\\#' | sort):-""}
 }
 
 _pass_complete_entries_with_subdirs () {
-- 
cgit v1.2.3-70-g09d2


From 1691cf8a99e437a6f7860334105207640cd46978 Mon Sep 17 00:00:00 2001
From: Tushar Tiwari <tushart91@gmail.com>
Date: Mon, 13 Aug 2018 15:11:25 -0400
Subject: Add alias for git add --verbose (#3167)

Add alias `gav='git add -v'`
fixes #6793
---
 plugins/git/git.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 04ff22164..d093dcc83 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -44,6 +44,7 @@ alias ga='git add'
 alias gaa='git add --all'
 alias gapa='git add --patch'
 alias gau='git add --update'
+alias gav='git add --verbose'
 alias gap='git apply'
 
 alias gb='git branch'
-- 
cgit v1.2.3-70-g09d2


From af1709cfdc57bce75f641f5ea8171ae97d6f246c Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Mon, 13 Aug 2018 22:07:07 +0200
Subject: kubectl: use kubectl to define aliases

This prevents conflicts with other utilities named k (see #6408).
---
 plugins/kubectl/kubectl.plugin.zsh | 64 +++++++++++++++++++-------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

(limited to 'plugins')

diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index f91475b6c..a4a6b1b88 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -14,53 +14,53 @@ fi
 alias k=kubectl
 
 # Apply a YML file
-alias kaf='k apply -f'
+alias kaf='kubectl apply -f'
 
 # Drop into an interactive terminal on a container
-alias keti='k exec -ti'
+alias keti='kubectl exec -ti'
 
 # Manage configuration quickly to switch contexts between local, dev ad staging.
-alias kcuc='k config use-context'
-alias kcsc='k config set-context'
-alias kcdc='k config delete-context'
-alias kccc='k config current-context'
+alias kcuc='kubectl config use-context'
+alias kcsc='kubectl config set-context'
+alias kcdc='kubectl config delete-context'
+alias kccc='kubectl config current-context'
 
 # Pod management.
-alias kgp='k get pods'
-alias kep='k edit pods'
-alias kdp='k describe pods'
-alias kdelp='k delete pods'
+alias kgp='kubectl get pods'
+alias kep='kubectl edit pods'
+alias kdp='kubectl describe pods'
+alias kdelp='kubectl delete pods'
 
 # Service management.
-alias kgs='k get svc'
-alias kes='k edit svc'
-alias kds='k describe svc'
-alias kdels='k delete svc'
+alias kgs='kubectl get svc'
+alias kes='kubectl edit svc'
+alias kds='kubectl describe svc'
+alias kdels='kubectl delete svc'
 
 # Ingress management
-alias kgi='k get ingress'
-alias kei='k edit ingress'
-alias kdi='k describe ingress'
-alias kdeli='k delete ingress'
+alias kgi='kubectl get ingress'
+alias kei='kubectl edit ingress'
+alias kdi='kubectl describe ingress'
+alias kdeli='kubectl delete ingress'
 
 # Secret management
-alias kgsec='k get secret'
-alias kdsec='k describe secret'
-alias kdelsec='k delete secret'
+alias kgsec='kubectl get secret'
+alias kdsec='kubectl describe secret'
+alias kdelsec='kubectl delete secret'
 
 # Deployment management.
-alias kgd='k get deployment'
-alias ked='k edit deployment'
-alias kdd='k describe deployment'
-alias kdeld='k delete deployment'
-alias ksd='k scale deployment'
-alias krsd='k rollout status deployment'
+alias kgd='kubectl get deployment'
+alias ked='kubectl edit deployment'
+alias kdd='kubectl describe deployment'
+alias kdeld='kubectl delete deployment'
+alias ksd='kubectl scale deployment'
+alias krsd='kubectl rollout status deployment'
 
 # Rollout management.
-alias kgrs='k get rs'
-alias krh='k rollout history'
-alias kru='k rollout undo'
+alias kgrs='kubectl get rs'
+alias krh='kubectl rollout history'
+alias kru='kubectl rollout undo'
 
 # Logs
-alias kl='k logs'
-alias klf='k logs -f'
+alias kl='kubectl logs'
+alias klf='kubectl logs -f'
-- 
cgit v1.2.3-70-g09d2


From 035d78120cb41297068967d3205a23bee22b9543 Mon Sep 17 00:00:00 2001
From: Peter Bittner <django@bittner.it>
Date: Wed, 15 Aug 2018 19:44:06 +0200
Subject: Add Git alias for `git diff --staged` (#7064)

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

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index d093dcc83..93b835b77 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -89,6 +89,7 @@ alias gd='git diff'
 alias gdca='git diff --cached'
 alias gdcw='git diff --cached --word-diff'
 alias gdct='git describe --tags `git rev-list --tags --max-count=1`'
+alias gds='git diff --staged'
 alias gdt='git diff-tree --no-commit-id --name-only -r'
 alias gdw='git diff --word-diff'
 
-- 
cgit v1.2.3-70-g09d2


From a52a5fb1f4a5ca4bacc67e117872cfc4eb1d6417 Mon Sep 17 00:00:00 2001
From: Dennis Hägler <dennis.haegler@gmail.com>
Date: Thu, 16 Aug 2018 17:52:45 +0200
Subject: Remove the white space

The white space is causing an error and bundler cannot find any 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 589f2cfce..b0b286af5 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -1,4 +1,4 @@
-alias be="bundle exec "
+alias be="bundle exec"
 alias bl="bundle list"
 alias bp="bundle package"
 alias bo="bundle open"
-- 
cgit v1.2.3-70-g09d2


From ff6b4c835be54a9529a88849b83284aee61a7126 Mon Sep 17 00:00:00 2001
From: 15cm <sinkerine@gmail.com>
Date: Wed, 26 Apr 2017 15:56:50 +0800
Subject: tmux: do not auto-load tmux inside of Emacs/Vim

When Emacs and Vim are launched from outside of an interactive shell,
$TMUX and $STY are not set; check for Emacs and Vim environment
variables instead.
---
 plugins/tmux/tmux.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
index 4a7986389..7ddf42099 100644
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -80,7 +80,7 @@ compdef _tmux _zsh_tmux_plugin_run
 alias tmux=_zsh_tmux_plugin_run
 
 # Autostart if not already in tmux and enabled.
-if [[ -z "$TMUX" && "$ZSH_TMUX_AUTOSTART" == "true" ]]; then
+if [[ -z "$TMUX" && "$ZSH_TMUX_AUTOSTART" == "true" && -z "$INSIDE_EMACS" && -z "$EMACS" && -z "$VIM" ]]; then
   # Actually don't autostart if we already did and multiple autostarts are disabled.
   if [[ "$ZSH_TMUX_AUTOSTART_ONCE" == "false" || "$ZSH_TMUX_AUTOSTARTED" != "true" ]]; then
     export ZSH_TMUX_AUTOSTARTED=true
-- 
cgit v1.2.3-70-g09d2


From e8b9958926c6e41fc681983bf4ec7d96e21e27db Mon Sep 17 00:00:00 2001
From: John Burwell <meaux@cockamamy.net>
Date: Sun, 3 Apr 2016 01:08:06 -0400
Subject: Add jenv plugin

Initializes jenv and provides the jenv_prompt_info funtion to add
Java version information to prompts.  This function is stubbed in
prompt_info_functions script to allow it to be safely called
regardless of whether or not the jenv plugin is loaded.

It also splits detection of the plugin/versions directory and bin directory
to suppport the way Homebrew splits the jenv bin and data directories
---
 lib/prompt_info_functions.zsh |  2 +-
 plugins/jenv/README.md        |  3 +++
 plugins/jenv/jenv.plugin.zsh  | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 plugins/jenv/README.md
 create mode 100644 plugins/jenv/jenv.plugin.zsh

(limited to 'plugins')

diff --git a/lib/prompt_info_functions.zsh b/lib/prompt_info_functions.zsh
index 335c02a3d..1d5c23e41 100644
--- a/lib/prompt_info_functions.zsh
+++ b/lib/prompt_info_functions.zsh
@@ -12,7 +12,7 @@
 # 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 {
+  virtualenv_prompt_info jenv_prompt_info {
   return 1
 }
 
diff --git a/plugins/jenv/README.md b/plugins/jenv/README.md
new file mode 100644
index 000000000..2f27d6786
--- /dev/null
+++ b/plugins/jenv/README.md
@@ -0,0 +1,3 @@
+# jenv oh-my-zsh plugin
+
+[jenv](http://www.jenv.be/) is a Java version manager similiar to [rbenv](http://rbenv.org/) and [pyenv]|(https://github.com/yyuu/pyenv).  This plugin initializes jenv and adds provides the jenv_prompt_info function to add Java version information to prompts.
diff --git a/plugins/jenv/jenv.plugin.zsh b/plugins/jenv/jenv.plugin.zsh
new file mode 100644
index 000000000..f131aa2f9
--- /dev/null
+++ b/plugins/jenv/jenv.plugin.zsh
@@ -0,0 +1,33 @@
+_homebrew-installed() {
+    type brew &> /dev/null
+}
+
+_jenv-from-homebrew-installed() {
+    brew --prefix jenv &> /dev/null
+}
+
+jenvdirs=("$HOME/.jenv" "/usr/local/jenv" "/opt/jenv")
+if _homebrew-installed && _jenv-from-homebrew-installed ; then
+    jenvdirs+=($(brew --prefix jenv) "${jenvdirs[@]}")
+fi
+
+FOUND_JENV=0
+for jenvdir in "${jenvdirs[@]}" ; do
+    if [ -d $jenvdir/bin -a $FOUND_JENV -eq 0 ] ; then
+        FOUND_JENV=1
+        export PATH="${jenvdir}/bin:$PATH"
+        eval "$(jenv init - zsh)"
+
+        function jenv_prompt_info() {
+          echo "$(jenv version-name)"
+        }
+    fi
+    if [ -d $jenvdir/versions -a $FOUND_JENV -eq 0 ] ; then
+        export JENV_ROOT=$jenvdir
+    fi
+done
+unset jenvdir
+
+if [ $FOUND_JENV -eq 0 ] ; then
+    function jenv_prompt_info() { echo "system: $(java -version 2>&1 | cut -f 2 -d ' ')" }
+fi
-- 
cgit v1.2.3-70-g09d2


From 3a822bb5fdc30e5b623f409af5c894fe9ad90d15 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sun, 19 Aug 2018 19:32:48 +0200
Subject: jenv: refactor and optimize logic

---
 plugins/jenv/jenv.plugin.zsh | 43 ++++++++++++++++++++-----------------------
 1 file changed, 20 insertions(+), 23 deletions(-)

(limited to 'plugins')

diff --git a/plugins/jenv/jenv.plugin.zsh b/plugins/jenv/jenv.plugin.zsh
index f131aa2f9..6c52635bb 100644
--- a/plugins/jenv/jenv.plugin.zsh
+++ b/plugins/jenv/jenv.plugin.zsh
@@ -1,33 +1,30 @@
-_homebrew-installed() {
-    type brew &> /dev/null
-}
-
-_jenv-from-homebrew-installed() {
-    brew --prefix jenv &> /dev/null
-}
-
 jenvdirs=("$HOME/.jenv" "/usr/local/jenv" "/opt/jenv")
-if _homebrew-installed && _jenv-from-homebrew-installed ; then
-    jenvdirs+=($(brew --prefix jenv) "${jenvdirs[@]}")
-fi
 
 FOUND_JENV=0
-for jenvdir in "${jenvdirs[@]}" ; do
-    if [ -d $jenvdir/bin -a $FOUND_JENV -eq 0 ] ; then
+for jenvdir in $jenvdirs; do
+    if [[ -d "${jenvdir}/bin" ]]; then
         FOUND_JENV=1
-        export PATH="${jenvdir}/bin:$PATH"
-        eval "$(jenv init - zsh)"
+        break
+    fi
+done
 
-        function jenv_prompt_info() {
-          echo "$(jenv version-name)"
-        }
+if [[ $FOUND_JENV -eq 0 ]]; then
+    if (( $+commands[brew] )) && jenvdir="$(brew --prefix jenv)"; then
+        FOUND_JENV=1
     fi
-    if [ -d $jenvdir/versions -a $FOUND_JENV -eq 0 ] ; then
+fi
+
+if [[ $FOUND_JENV -eq 1 ]]; then
+    export PATH="${jenvdir}/bin:$PATH"
+    eval "$(jenv init - zsh)"
+
+    function jenv_prompt_info() { jenv version-name 2>/dev/null }
+
+    if [[ -d "${jenvdir}/versions" ]]; then
         export JENV_ROOT=$jenvdir
     fi
-done
-unset jenvdir
-
-if [ $FOUND_JENV -eq 0 ] ; then
+else
     function jenv_prompt_info() { echo "system: $(java -version 2>&1 | cut -f 2 -d ' ')" }
 fi
+
+unset jenvdir FOUND_JENV
-- 
cgit v1.2.3-70-g09d2


From 873dc9cfb8ddc3c9bb398e9dbb27ebea7f6cab81 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sun, 19 Aug 2018 19:41:49 +0200
Subject: jenv: update README

---
 plugins/jenv/README.md | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/jenv/README.md b/plugins/jenv/README.md
index 2f27d6786..8899d21ae 100644
--- a/plugins/jenv/README.md
+++ b/plugins/jenv/README.md
@@ -1,3 +1,13 @@
-# jenv oh-my-zsh plugin
+# jenv plugin
 
-[jenv](http://www.jenv.be/) is a Java version manager similiar to [rbenv](http://rbenv.org/) and [pyenv]|(https://github.com/yyuu/pyenv).  This plugin initializes jenv and adds provides the jenv_prompt_info function to add Java version information to prompts.
+[jenv](https://www.jenv.be/) is a Java version manager similiar to [rbenv](https://github.com/rbenv/rbenv)
+and [pyenv]|(https://github.com/yyuu/pyenv).
+
+This plugin initializes jenv and adds provides the jenv_prompt_info function to add Java
+version information to prompts.
+
+To use, add `jenv` to your plugins array in your zshrc file:
+
+```zsh
+plugins=(... jenv)
+```
-- 
cgit v1.2.3-70-g09d2


From 3edd424af2316628c7ab8d86b9b2e0207f48fd6f Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sun, 19 Aug 2018 19:43:35 +0200
Subject: jenv: small fix

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

(limited to 'plugins')

diff --git a/plugins/jenv/jenv.plugin.zsh b/plugins/jenv/jenv.plugin.zsh
index 6c52635bb..cead0077b 100644
--- a/plugins/jenv/jenv.plugin.zsh
+++ b/plugins/jenv/jenv.plugin.zsh
@@ -27,4 +27,4 @@ else
     function jenv_prompt_info() { echo "system: $(java -version 2>&1 | cut -f 2 -d ' ')" }
 fi
 
-unset jenvdir FOUND_JENV
+unset jenvdir jenvdirs FOUND_JENV
-- 
cgit v1.2.3-70-g09d2


From be65adc6c364e842307c7b4e8da30f0162b629f0 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sun, 19 Aug 2018 21:36:21 +0200
Subject: git-extras: update completion (2018-05-24 0f76863)

---
 plugins/git-extras/git-extras.plugin.zsh | 225 ++++++++++++++++++++++++++-----
 1 file changed, 194 insertions(+), 31 deletions(-)

(limited to 'plugins')

diff --git a/plugins/git-extras/git-extras.plugin.zsh b/plugins/git-extras/git-extras.plugin.zsh
index afc1679cc..ef6c35988 100644
--- a/plugins/git-extras/git-extras.plugin.zsh
+++ b/plugins/git-extras/git-extras.plugin.zsh
@@ -47,6 +47,14 @@ __gitex_commits() {
     _describe -t commits commit commits && ret=0
 }
 
+__gitex_remote_names() {
+    local expl
+    declare -a remote_names
+    remote_names=(${(f)"$(_call_program remotes git remote 2>/dev/null)"})
+    __git_command_successful || return
+    _wanted remote-names expl remote-name compadd $* - $remote_names
+}
+
 __gitex_tag_names() {
     local expl
     declare -a tag_names
@@ -69,7 +77,11 @@ __gitex_specific_branch_names() {
     declare -a branch_names
     branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads/"$1" 2>/dev/null)"}#refs/heads/$1/})
     __git_command_successful || return
-    _wanted branch-names expl branch-name compadd $* - $branch_names
+    _wanted branch-names expl branch-name compadd - $branch_names
+}
+
+__gitex_chore_branch_names() {
+    __gitex_specific_branch_names 'chore'
 }
 
 __gitex_feature_branch_names() {
@@ -102,6 +114,11 @@ __gitex_author_names() {
 }
 
 # subcommands
+_git-authors() {
+    _arguments  -C \
+        '(--list -l)'{--list,-l}'[show authors]' \
+        '--no-email[without email]' \
+}
 
 _git-bug() {
     local curcontext=$curcontext state line ret=1
@@ -126,8 +143,16 @@ _git-bug() {
                     _arguments -C \
                         ':branch-name:__gitex_bug_branch_names'
                     ;;
+                -r|--remote )
+                    _arguments -C \
+                        ':remote-name:__gitex_remote_names'
+                    ;;
             esac
+            return 0
     esac
+
+    _arguments \
+        '(--remote -r)'{--remote,-r}'[setup remote tracking branch]'
 }
 
 
@@ -136,6 +161,40 @@ _git-changelog() {
         '(-l --list)'{-l,--list}'[list commits]' \
 }
 
+_git-chore() {
+    local curcontext=$curcontext state line ret=1
+    declare -A opt_args
+
+    _arguments -C \
+        ': :->command' \
+        '*:: :->option-or-argument' && ret=0
+
+    case $state in
+        (command)
+            declare -a commands
+            commands=(
+                'finish:merge and delete the chore branch'
+            )
+            _describe -t commands command commands && ret=0
+            ;;
+        (option-or-argument)
+            curcontext=${curcontext%:*}-$line[1]:
+            case $line[1] in
+                (finish)
+                    _arguments -C \
+                        ':branch-name:__gitex_chore_branch_names'
+                    ;;
+                -r|--remote )
+                    _arguments -C \
+                        ':remote-name:__gitex_remote_names'
+                    ;;
+            esac
+            return 0
+    esac
+
+    _arguments \
+        '(--remote -r)'{--remote,-r}'[setup remote tracking branch]'
+}
 
 
 _git-contrib() {
@@ -149,6 +208,27 @@ _git-count() {
         '--all[detailed commit count]'
 }
 
+_git-create-branch() {
+    local curcontext=$curcontext state line
+    _arguments -C \
+        ': :->command' \
+        '*:: :->option-or-argument'
+
+    case "$state" in
+        (command)
+            _arguments \
+                '(--remote -r)'{--remote,-r}'[setup remote tracking branch]'
+            ;;
+        (option-or-argument)
+            curcontext=${curcontext%:*}-$line[1]:
+            case $line[1] in
+                -r|--remote )
+                    _arguments -C \
+                        ':remote-name:__gitex_remote_names'
+                    ;;
+            esac
+    esac
+}
 
 _git-delete-branch() {
     _arguments \
@@ -220,10 +300,17 @@ _git-feature() {
                     _arguments -C \
                         ':branch-name:__gitex_feature_branch_names'
                     ;;
+                -r|--remote )
+                    _arguments -C \
+                        ':remote-name:__gitex_remote_names'
+                    ;;
             esac
+            return 0
     esac
-}
 
+    _arguments \
+        '(--remote -r)'{--remote,-r}'[setup remote tracking branch]'
+}
 
 _git-graft() {
     _arguments \
@@ -231,14 +318,39 @@ _git-graft() {
         ':dest-branch-name:__gitex_branch_names'
 }
 
+_git-guilt() {
+    _arguments -C \
+        '(--email -e)'{--email,-e}'[display author emails instead of names]' \
+        '(--ignore-whitespace -w)'{--ignore-whitespace,-w}'[ignore whitespace only changes]' \
+        '(--debug -d)'{--debug,-d}'[output debug information]' \
+        '-h[output usage information]'
+}
 
 _git-ignore() {
     _arguments  -C \
         '(--local -l)'{--local,-l}'[show local gitignore]' \
-        '(--global -g)'{--global,-g}'[show global gitignore]'
+        '(--global -g)'{--global,-g}'[show global gitignore]' \
+        '(--private -p)'{--private,-p}'[show repo gitignore]'
 }
 
 
+_git-ignore() {
+    _arguments  -C \
+        '(--append -a)'{--append,-a}'[append .gitignore]' \
+        '(--replace -r)'{--replace,-r}'[replace .gitignore]' \
+        '(--list-in-table -l)'{--list-in-table,-l}'[print available types in table format]' \
+        '(--list-alphabetically -L)'{--list-alphabetically,-L}'[print available types in alphabetical order]' \
+        '(--search -s)'{--search,-s}'[search word in available types]'
+}
+
+
+_git-merge-into() {
+    _arguments '--ff-only[merge only fast-forward]'
+    _arguments \
+        ':src:__gitex_branch_names' \
+        ':dest:__gitex_branch_names'
+}
+
 _git-missing() {
     _arguments \
         ':first-branch-name:__gitex_branch_names' \
@@ -269,8 +381,16 @@ _git-refactor() {
                     _arguments -C \
                         ':branch-name:__gitex_refactor_branch_names'
                     ;;
+                -r|--remote )
+                    _arguments -C \
+                        ':remote-name:__gitex_remote_names'
+                    ;;
             esac
+            return 0
     esac
+
+    _arguments \
+        '(--remote -r)'{--remote,-r}'[setup remote tracking branch]'
 }
 
 
@@ -279,6 +399,23 @@ _git-squash() {
         ':branch-name:__gitex_branch_names'
 }
 
+_git-stamp() {
+    _arguments  -C \
+         '(--replace -r)'{--replace,-r}'[replace stamps with same id]'
+}
+
+_git-standup() {
+    _arguments -C \
+        '-a[Specify the author of commits. Use "all" to specify all authors.]' \
+        '-d[Show history since N days ago]' \
+        '-D[Specify the date format displayed in commit history]' \
+        '-f[Fetch commits before showing history]' \
+        '-g[Display GPG signed info]' \
+        '-h[Display help message]' \
+        '-L[Enable the inclusion of symbolic links]' \
+        '-m[The depth of recursive directory search]'
+}
+
 _git-summary() {
     _arguments '--line[summarize with lines rather than commits]'
     __gitex_commits
@@ -291,45 +428,71 @@ _git-undo(){
         '(--hard -h)'{--hard,-h}'[wipes your commit(s)]'
 }
 
-zstyle ':completion:*:*:git:*' user-commands \
+zstyle -g existing_user_commands ':completion:*:*:git:*' user-commands
+
+zstyle ':completion:*:*:git:*' user-commands $existing_user_commands \
     alias:'define, search and show aliases' \
-    archive-file:'export the current HEAD of the git repository to a archive' \
+    archive-file:'export the current head of the git repository to an archive' \
+    authors:'generate authors report' \
     back:'undo and stage latest commits' \
-    bug:'create a bug branch' \
-    changelog:'populate changelog file with commits since the previous tag' \
-    commits-since:'list commits since a given date' \
-    contrib:'display author contributions' \
-    count:'count commits' \
-    create-branch:'create local and remote branch' \
-    delete-branch:'delete local and remote branch' \
-    delete-merged-branches:'delete merged branches'\
-    delete-submodule:'delete submodule' \
-    delete-tag:'delete local and remote tag' \
-    effort:'display effort statistics' \
-    extras:'git-extras' \
-    feature:'create a feature branch' \
+    bug:'create bug branch' \
+    bulk:'run bulk commands' \
+    changelog:'generate a changelog report' \
+    chore:'create chore branch' \
+    clear-soft:'soft clean up a repository' \
+    clear:'rigorously clean up a repository' \
+    commits-since:'show commit logs since some date' \
+    contrib:'show user contributions' \
+    count:'show commit count' \
+    create-branch:'create branches' \
+    delete-branch:'delete branches' \
+    delete-merged-branches:'delete merged branches' \
+    delete-submodule:'delete submodules' \
+    delete-tag:'delete tags' \
+    delta:'lists changed files' \
+    effort:'show effort statistics on file(s)' \
+    extras:'awesome git utilities' \
+    feature:'create/merge feature branch' \
+    force-clone:'overwrite local repositories with clone' \
     fork:'fork a repo on github' \
-    fresh-branch:'create empty local branch' \
-    gh-pages:'create the GitHub Pages branch' \
-    graft:'merge commits from source branch to destination branch' \
-    ignore:'add patterns to .gitignore' \
-    info:'show info about the repository' \
-    local-commits:'list unpushed commits on the local branch' \
+    fresh-branch:'create fresh branches' \
+    gh-pages:'create the github pages branch' \
+    graft:'merge and destroy a given branch' \
+    guilt:'calculate change between two revisions' \
+    ignore-io:'get sample gitignore file' \
+    ignore:'add .gitignore patterns' \
+    info:'returns information on current repository' \
+    local-commits:'list local commits' \
     lock:'lock a file excluded from version control' \
     locked:'ls files that have been locked' \
+    merge-into:'merge one branch into another' \
+    merge-repo:'merge two repo histories' \
     missing:'show commits missing from another branch' \
+    mr:'checks out a merge request locally' \
+    obliterate:'rewrite past commits to remove some files' \
     pr:'checks out a pull request locally' \
+    psykorebase:'rebase a branch with a merge commit' \
+    pull-request:'create pull request to GitHub project' \
+    reauthor:'replace the author and/or committer identities in commits and tags' \
     rebase-patch:'rebases a patch' \
-    refactor:'create a refactor branch' \
+    refactor:'create refactor branch' \
     release:'commit, tag and push changes to the repository' \
+    rename-branch:'rename a branch' \
     rename-tag:'rename a tag' \
-    repl:'read-eval-print-loop' \
+    repl:'git read-eval-print-loop' \
     reset-file:'reset one file' \
     root:'show path of root' \
-    setup:'setup a git repository' \
+    scp:'copy files to ssh compatible `git-remote`' \
+    sed:'replace patterns in git-controlled files' \
+    setup:'set up a git repository' \
+    show-merged-branches:'show merged branches' \
     show-tree:'show branch tree of commit history' \
-    squash:'merge commits from source branch into the current one as a single commit' \
-    summary:'repository summary' \
-    touch:'one step creation of new files' \
-    undo:'remove the latest commit' \
+    show-unmerged-branches:'show unmerged branches' \
+    squash:'import changes from a branch' \
+    stamp:'stamp the last commit message' \
+    standup:'recall the commit history' \
+    summary:'show repository summary' \
+    sync:'sync local branch with remote branch' \
+    touch:'touch and add file to the index' \
+    undo:'remove latest commits' \
     unlock:'unlock a file excluded from version control'
-- 
cgit v1.2.3-70-g09d2


From b743ce92249726fe444911213bf2ed55099158d3 Mon Sep 17 00:00:00 2001
From: Sumit Sahrawat <sumitsahrawat@outlook.com>
Date: Mon, 20 Aug 2018 01:09:58 +0530
Subject: Add scu-* aliases for 'systemctl --user' commands (#6661)

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

(limited to 'plugins')

diff --git a/plugins/systemd/systemd.plugin.zsh b/plugins/systemd/systemd.plugin.zsh
index 5a35ecbc7..7cd27d450 100644
--- a/plugins/systemd/systemd.plugin.zsh
+++ b/plugins/systemd/systemd.plugin.zsh
@@ -10,7 +10,13 @@ sudo_commands=(
 
 for c in $user_commands; do; alias sc-$c="systemctl $c"; done
 for c in $sudo_commands; do; alias sc-$c="sudo systemctl $c"; done
+for c in $user_commands; do; alias scu-$c="systemctl --user $c"; done
+for c in $sudo_commands; do; alias scu-$c="systemctl --user $c"; done
 
 alias sc-enable-now="sc-enable --now"
 alias sc-disable-now="sc-disable --now"
 alias sc-mask-now="sc-mask --now"
+
+alias scu-enable-now="scu-enable --now"
+alias scu-disable-now="scu-disable --now"
+alias scu-mask-now="scu-mask --now"
-- 
cgit v1.2.3-70-g09d2


From 0de3b29fd3fde0d5d95271cb076a12931ccee7d8 Mon Sep 17 00:00:00 2001
From: Rob Loach <robloach@gmail.com>
Date: Sun, 19 Aug 2018 15:46:22 -0400
Subject: composer: Fix bin directory when Composer is not available (#6240)

* Fix for Composer's bin when Composer isn't global

When Composer isn't globally installed, the `composer global` call results in an error. This checks to see if Composer is available before making the call. When Composer isn't available, it will just manually set the directories.

* Fix Composer brackets in global bin directory

* composer: Apply feedback from ricpelo

This applies ricpelo's feedback at https://github.com/robbyrussell/oh-my-zsh/pull/6240#pullrequestreview-64253321

* composer: Fix path check syntax

* composer: test with $commands[] syntax
---
 plugins/composer/composer.plugin.zsh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh
index d00813e39..634961023 100644
--- a/plugins/composer/composer.plugin.zsh
+++ b/plugins/composer/composer.plugin.zsh
@@ -51,5 +51,10 @@ alias cgrm='composer global remove'
 # 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 global config bin-dir --absolute 2>/dev/null)
+# Add Composer's global binaries to PATH, using Composer if available.
+if (( $+commands[composer] )); then
+  export PATH=$PATH:$(composer global config bin-dir --absolute 2>/dev/null)
+else
+  [ -d $HOME/.composer/vendor/bin ] && export PATH=$PATH:$HOME/.composer/vendor/bin
+  [ -d $HOME/.config/composer/vendor/bin ] && export PATH=$PATH:$HOME/.config/composer/vendor/bin
+fi
-- 
cgit v1.2.3-70-g09d2


From dc948826b21470081c7d6b8dd22ceee45ce96c7c Mon Sep 17 00:00:00 2001
From: Scott Kidder <scott.kidder11@gmail.com>
Date: Sun, 19 Aug 2018 16:14:55 -0400
Subject: ember-cli : Add alias for ember test --serve (#6492)

---
 plugins/ember-cli/README.md            | 3 ++-
 plugins/ember-cli/ember-cli.plugin.zsh | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/ember-cli/README.md b/plugins/ember-cli/README.md
index 2e4ed7068..b46373619 100644
--- a/plugins/ember-cli/README.md
+++ b/plugins/ember-cli/README.md
@@ -1,6 +1,6 @@
 # Ember CLI
 
-**Maintainers:** [BilalBudhani](https://github.com/BilalBudhani), [eubenesa](https://github.com/eubenesa)
+**Maintainers:** [BilalBudhani](https://github.com/BilalBudhani), [eubenesa](https://github.com/eubenesa), [scottkidder](https://github.com/scottkidder]
 
 Ember CLI (https://www.ember-cli.com/)
 
@@ -17,5 +17,6 @@ Alias | Ember-CLI command
 **ein** | *ember init*
 **ei** | *ember install*
 **et** | *ember test*
+**ets** | *ember test --serve*
 **eu** | *ember update*
 **ev** | *ember version*
diff --git a/plugins/ember-cli/ember-cli.plugin.zsh b/plugins/ember-cli/ember-cli.plugin.zsh
index 3d06fd2f5..67842c120 100644
--- a/plugins/ember-cli/ember-cli.plugin.zsh
+++ b/plugins/ember-cli/ember-cli.plugin.zsh
@@ -10,6 +10,7 @@ alias eh='ember help'
 alias ein='ember init'
 alias ei='ember install'
 alias et='ember test'
+alias ets='ember test --serve'
 alias eu='ember update'
 
 # version
-- 
cgit v1.2.3-70-g09d2


From fceae90219c1c8b422a6d0e220e45ce59b9b737a Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sun, 19 Aug 2018 22:33:44 +0200
Subject: jenv: fix brew directory search

`brew --prefix jenv` doesn't ensure jenv is installed so we have to recheck if the
bin folder is still there.
---
 plugins/jenv/jenv.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/jenv/jenv.plugin.zsh b/plugins/jenv/jenv.plugin.zsh
index cead0077b..14c586be9 100644
--- a/plugins/jenv/jenv.plugin.zsh
+++ b/plugins/jenv/jenv.plugin.zsh
@@ -10,7 +10,7 @@ done
 
 if [[ $FOUND_JENV -eq 0 ]]; then
     if (( $+commands[brew] )) && jenvdir="$(brew --prefix jenv)"; then
-        FOUND_JENV=1
+        [[ -d "${jenvdir}/bin" ]] && FOUND_JENV=1
     fi
 fi
 
-- 
cgit v1.2.3-70-g09d2


From 314f9dfcb393af65a326ee4cbbf77363aaf415c3 Mon Sep 17 00:00:00 2001
From: jack <jiyuanyi1992@gmail.com>
Date: Fri, 24 Aug 2018 02:01:01 +0800
Subject: github: fix new_gh to force-add .gitignore (#7086)

---
 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 fd19fb524..8e4b97352 100644
--- a/plugins/github/github.plugin.zsh
+++ b/plugins/github/github.plugin.zsh
@@ -36,7 +36,7 @@ new_gh() { # [DIRECTORY]
   print '.*'"\n"'*~' >> .gitignore
   git add [^.]* \
     || return
-  git add .gitignore \
+  git add -f .gitignore \
     || return
   git commit -m 'Initial commit.' \
     || return
-- 
cgit v1.2.3-70-g09d2


From 2bb10441da3e9715d580706c9a3aab060350b0e3 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Thu, 23 Aug 2018 20:28:20 +0200
Subject: nyan: deprecate plugin with removal notice

Fixes #6826
---
 plugins/nyan/nyan.plugin.zsh | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'plugins')

diff --git a/plugins/nyan/nyan.plugin.zsh b/plugins/nyan/nyan.plugin.zsh
index ac9d0017e..c21c784d9 100644
--- a/plugins/nyan/nyan.plugin.zsh
+++ b/plugins/nyan/nyan.plugin.zsh
@@ -1,5 +1,10 @@
-if [[ -x `which nc` ]]; then
-  alias nyan='nc -v nyancat.dakko.us 23' # nyan cat
-fi
-
-
+print -Pn '%F{yellow}'
+cat >&2 <<-EOD
+	nyan plugin:
+	The nyancat server used by this plugin was shut down due to increased
+	bandwidth costs, so the nyan plugin no longer works. You can get the
+	same functionality in some distributions by installing the nyancat package,
+	or you can compile it yourself.
+	See https://github.com/klange/nyancat for more information.
+EOD
+print -Pn '%f'
-- 
cgit v1.2.3-70-g09d2


From 652356b9b99b26317478a8756893f896abbed6cd Mon Sep 17 00:00:00 2001
From: Joel Wallis Jucá <joelwallis@gmail.com>
Date: Thu, 23 Aug 2018 17:04:42 -0300
Subject: git: add the `git show` alias `gsh` (#5591)

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

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 93b835b77..36f0ff448 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -226,6 +226,7 @@ alias grv='git remote -v'
 
 alias gsb='git status -sb'
 alias gsd='git svn dcommit'
+alias gsh='git show'
 alias gsi='git submodule init'
 alias gsps='git show --pretty=short --show-signature'
 alias gsr='git svn rebase'
-- 
cgit v1.2.3-70-g09d2


From 36808ff61ef5ca8888f14ba920c44a8350fb5ad2 Mon Sep 17 00:00:00 2001
From: Franklin Yu <franklinyu@hotmail.com>
Date: Wed, 3 Aug 2016 11:57:48 -0400
Subject: [plugin/chruby] Add "system" to completion list

Detect system Ruby in default PATH, and provide "system" completion if
Ruby is found.
---
 plugins/chruby/chruby.plugin.zsh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/chruby/chruby.plugin.zsh b/plugins/chruby/chruby.plugin.zsh
index 758b4a56c..8a1577267 100644
--- a/plugins/chruby/chruby.plugin.zsh
+++ b/plugins/chruby/chruby.plugin.zsh
@@ -95,5 +95,11 @@ function chruby_prompt_info() {
 }
 
 # complete on installed rubies
-_chruby() { compadd $(chruby | tr -d '* ') }
+_chruby() {
+    compadd $(chruby | tr -d '* ')
+    local default_path='/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin'
+    if PATH=${default_path} type ruby &> /dev/null; then
+        compadd system
+    fi
+}
 compdef _chruby chruby
-- 
cgit v1.2.3-70-g09d2


From 2c1100c0e5af5999621872321aaa11533ae24097 Mon Sep 17 00:00:00 2001
From: Ryan Stull <rstull1250@gmail.com>
Date: Wed, 29 Aug 2018 09:15:11 -0400
Subject: Updating 'sbcl' to 'sbcln' (#7095)

Changing 'sbcl' to 'sbcln' so it doesn't collide with 'Steel Bank Common Lisp', a popular lisp implementation.
---
 plugins/sbt/sbt.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/sbt/sbt.plugin.zsh b/plugins/sbt/sbt.plugin.zsh
index 8fabf0add..f883b7fee 100644
--- a/plugins/sbt/sbt.plugin.zsh
+++ b/plugins/sbt/sbt.plugin.zsh
@@ -10,7 +10,7 @@ alias sbc='sbt compile'
 alias sbcc='sbt clean compile'
 alias sbco='sbt console'
 alias sbcq='sbt console-quick'
-alias sbcl='sbt clean'
+alias sbcln='sbt clean'
 alias sbcp='sbt console-project'
 alias sbd='sbt doc'
 alias sbdc='sbt dist:clean'
-- 
cgit v1.2.3-70-g09d2


From e93378aacd313a11b83da1d0d7480c1840cd2532 Mon Sep 17 00:00:00 2001
From: Kris Kalavantavanich <krismath.K@gmail.com>
Date: Wed, 29 Aug 2018 20:18:20 +0700
Subject: [plugins/git] Updated git clone alias (#6893)

* Updated git clone alias

`git clone --recursive` has been deprecated in favor of `--recurse-submodules`.
See: https://stackoverflow.com/questions/3796927
---
 plugins/git/git.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 36f0ff448..916866ff5 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -71,7 +71,7 @@ alias gcam='git commit -a -m'
 alias gcsm='git commit -s -m'
 alias gcb='git checkout -b'
 alias gcf='git config --list'
-alias gcl='git clone --recursive'
+alias gcl='git clone --recurse-submodules'
 alias gclean='git clean -fd'
 alias gpristine='git reset --hard && git clean -dfx'
 alias gcm='git checkout master'
-- 
cgit v1.2.3-70-g09d2


From 39221643b06e5c5ee884978787b08c74de850ec2 Mon Sep 17 00:00:00 2001
From: Dan O'Brien <dobrien.nj@gmail.com>
Date: Wed, 29 Aug 2018 14:51:50 -0400
Subject: Add aliases for kubectl nodes (#7093)

* Add aliases for kubectl nodes

* change to have 'o' at the end.

My teammate noticed there's no namespacing shortcuts either and will be doing a PR on them with kgna.
---
 plugins/kubectl/kubectl.plugin.zsh | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'plugins')

diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index a4a6b1b88..492e6ff00 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -64,3 +64,9 @@ alias kru='kubectl rollout undo'
 # Logs
 alias kl='kubectl logs'
 alias klf='kubectl logs -f'
+
+# Node Management
+alias kgno='kubectl get nodes'
+alias keno='kubectl edit node'
+alias kdno='kubectl describe node'
+alias kdelno='kubectl delete node'
-- 
cgit v1.2.3-70-g09d2


From 5cc6de67bd65d78cdf021345a5fa5d697049b347 Mon Sep 17 00:00:00 2001
From: Aiden <38707987+aidenhx@users.noreply.github.com>
Date: Thu, 30 Aug 2018 02:53:24 +0800
Subject: Update brew.plugin.zsh (#6947)

add aliases for `brew pin` and `brew list --pinned`
---
 plugins/brew/brew.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'plugins')

diff --git a/plugins/brew/brew.plugin.zsh b/plugins/brew/brew.plugin.zsh
index 6fb7f3453..60b81f8ec 100644
--- a/plugins/brew/brew.plugin.zsh
+++ b/plugins/brew/brew.plugin.zsh
@@ -1,4 +1,6 @@
+alias brewp='brew pin'
 alias brews='brew list -1'
+alias brewsp='brew list --pinned'
 alias bubo='brew update && brew outdated'
 alias bubc='brew upgrade && brew cleanup'
 alias bubu='bubo && bubc'
-- 
cgit v1.2.3-70-g09d2


From 8ec0937653f30277361621191e8cee01b7fc089d Mon Sep 17 00:00:00 2001
From: Matthew Murphy <mashumafi@users.noreply.github.com>
Date: Wed, 29 Aug 2018 14:55:23 -0400
Subject: Update golang.plugin.zsh (#6750)

add alias to cd to $GOPATH, $GOPATH/src, $GOPATH/bin
---
 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 64c80e864..919c98629 100644
--- a/plugins/golang/golang.plugin.zsh
+++ b/plugins/golang/golang.plugin.zsh
@@ -188,6 +188,9 @@ alias gofa='go fmt ./...'
 alias gog='go get'
 alias goi='go install'
 alias gol='go list'
+alias gop='cd $GOPATH'
+alias gopb='cd $GOPATH/bin'
+alias gops='cd $GOPATH/src'
 alias gor='go run'
 alias got='go test'
 alias gov='go vet'
-- 
cgit v1.2.3-70-g09d2


From e7c9bf8d669bd4ec0c63041e37adb17f3fc1b567 Mon Sep 17 00:00:00 2001
From: Vinod Damle <vdamle@users.noreply.github.com>
Date: Wed, 29 Aug 2018 14:56:30 -0400
Subject: kubectl: add alias for `kubectl cp` (#7068)

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

(limited to 'plugins')

diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index 492e6ff00..197ada37b 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -65,8 +65,11 @@ alias kru='kubectl rollout undo'
 alias kl='kubectl logs'
 alias klf='kubectl logs -f'
 
+# File copy
+alias kcp='kubectl cp'
+
 # Node Management
 alias kgno='kubectl get nodes'
 alias keno='kubectl edit node'
 alias kdno='kubectl describe node'
-alias kdelno='kubectl delete node'
+alias kdelno='kubectl delete node'
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From 2b6434e8793a876e5465edd9c75819166878aba6 Mon Sep 17 00:00:00 2001
From: Konstantin Gribov <grossws@gmail.com>
Date: Wed, 29 Aug 2018 21:57:02 +0300
Subject: Fixed `fwl` function in `firewalld` plugin when `sources` used
 (#7011)

`firewall-cmd --get-active-zones` returns something like this:

```
dmz
  sources: ipset:dmz-hosts
public
  interfaces: eth0
```

if zone binding is based on source ips, so strings with `sources: ...` should be excluded along with `interfaces: ...` to get zones list.
---
 plugins/firewalld/firewalld.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/firewalld/firewalld.plugin.zsh b/plugins/firewalld/firewalld.plugin.zsh
index bfbf6f48f..5b1090636 100644
--- a/plugins/firewalld/firewalld.plugin.zsh
+++ b/plugins/firewalld/firewalld.plugin.zsh
@@ -6,7 +6,7 @@ alias fwrp="sudo firewall-cmd --runtime-to-permanent"
 function fwl () {
   # converts output to zsh array ()
   # @f flag split on new line
-  zones=("${(@f)$(sudo firewall-cmd --get-active-zones | grep -v interfaces)}")
+  zones=("${(@f)$(sudo firewall-cmd --get-active-zones | grep -v 'interfaces\|sources')}")
 
   for i in $zones; do
     sudo firewall-cmd --zone $i --list-all
-- 
cgit v1.2.3-70-g09d2


From 84aa274604f33bf440df81fbe73543b072018d47 Mon Sep 17 00:00:00 2001
From: Janosch Schwalm <janosch.schwalm@gmail.com>
Date: Wed, 29 Aug 2018 20:59:27 +0200
Subject: executing gradlew, when gradlew-file exists (#6485)

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

(limited to 'plugins')

diff --git a/plugins/gradle/gradle.plugin.zsh b/plugins/gradle/gradle.plugin.zsh
index c7047552d..8df62c2e2 100644
--- a/plugins/gradle/gradle.plugin.zsh
+++ b/plugins/gradle/gradle.plugin.zsh
@@ -1,6 +1,18 @@
 ##############################################################################
 # A descriptive listing of core Gradle commands
 ############################################################################
+
+gradle-or-gradlew() {
+	if [ -f ./gradlew ] ; then
+		echo "executing gradlew instead of gradle";
+		./gradlew "$@";
+	else
+		gradle "$@";
+	fi
+}
+
+alias gradle=gradle-or-gradlew;
+
 function _gradle_core_commands() {
     local ret=1 state
     _arguments ':subcommand:->subcommand' && ret=0
-- 
cgit v1.2.3-70-g09d2


From 3cd8eaf9bb1382ff4f35e614904a4f16553e0dcb Mon Sep 17 00:00:00 2001
From: Janosch Schwalm <janosch.schwalm@gmail.com>
Date: Wed, 29 Aug 2018 21:00:06 +0200
Subject: execute mvnw with "mvn" when mvnw-file is present (#6484)

* executing mvnw, when mvnw-file exists
indriectly enable autocompletion for mvnw

* inform the user :)
---
 plugins/mvn/mvn.plugin.zsh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'plugins')

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index d422ba5c7..74583c6dc 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -20,6 +20,15 @@ BACKGROUND_CYAN=$(tput setab 6)
 BACKGROUND_WHITE=$(tput setab 7)
 RESET_FORMATTING=$(tput sgr0)
 
+# if found a ./mvnw file execute it otherwise execute orignal mvn
+mvn-or-mvnw() {
+	if [ -f ./mvnw ] ; then
+		echo "executing mvnw instead of mvn"		
+		./mvnw "$@";
+	else
+		mvn "$@";
+	fi
+}
 
 # Wrapper function for Maven's mvn command.
 mvn-color() {
@@ -40,6 +49,9 @@ mvn-color() {
 # Override the mvn command with the colorized one.
 #alias mvn="mvn-color"
 
+# either use orignal mvn oder the mvn wrapper
+alias mvn="mvn-or-mvnw"
+
 # aliases
 alias mvncie='mvn clean install eclipse:eclipse'
 alias mvnci='mvn clean install'
@@ -276,3 +288,5 @@ function listMavenCompletions {
 }
 
 compctl -K listMavenCompletions mvn
+compctl -K listMavenCompletions mvn-or-mvnw
+
-- 
cgit v1.2.3-70-g09d2


From 285b540167a665bbe45da780f3fb35da2d4aea60 Mon Sep 17 00:00:00 2001
From: Balint Gyapjas <balint@gyapjas.de>
Date: Wed, 29 Aug 2018 21:00:35 +0200
Subject: vi-mode show indicator on zle-line-init and SIGWINCH (#6449)

---
 plugins/vi-mode/vi-mode.plugin.zsh | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'plugins')

diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh
index 82a2f3040..a1889d451 100644
--- a/plugins/vi-mode/vi-mode.plugin.zsh
+++ b/plugins/vi-mode/vi-mode.plugin.zsh
@@ -4,9 +4,15 @@ function zle-keymap-select() {
   zle -R
 }
 
+# Ensures that MODE_INDITCATOR is displayed on terminal start up.
+function zle-line-init() {
+  zle reset-prompt
+}
+
 # Ensure that the prompt is redrawn when the terminal size changes.
 TRAPWINCH() {
   zle &&  zle -R
+  zle reset-prompt
 }
 
 zle -N zle-keymap-select
-- 
cgit v1.2.3-70-g09d2


From 94df5038632df5453ffd0ff4b6367399bc5fe7e8 Mon Sep 17 00:00:00 2001
From: Serhii Kuts <sergeykuc@gmail.com>
Date: Wed, 29 Aug 2018 22:01:40 +0300
Subject: Update kubectl.plugin.zsh (#6636)

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

(limited to 'plugins')

diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index 197ada37b..680ec1a8c 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -31,6 +31,9 @@ alias kep='kubectl edit pods'
 alias kdp='kubectl describe pods'
 alias kdelp='kubectl delete pods'
 
+# get pod by label: kgpl "app=myapp" -n myns
+alias kgpl='function _kgpl(){ label=$1; shift; kgp -l $label $*; };_kgpl'
+
 # Service management.
 alias kgs='kubectl get svc'
 alias kes='kubectl edit svc'
@@ -61,6 +64,9 @@ alias kgrs='kubectl get rs'
 alias krh='kubectl rollout history'
 alias kru='kubectl rollout undo'
 
+# Port forwarding
+alias kpf="k port-forward"
+
 # Logs
 alias kl='kubectl logs'
 alias klf='kubectl logs -f'
-- 
cgit v1.2.3-70-g09d2


From dc8811f81779d0e06ac2cd1372a586576e2c8aef Mon Sep 17 00:00:00 2001
From: Fadi Hadzh <fdhadzh@gmail.com>
Date: Thu, 30 Aug 2018 00:06:11 +0300
Subject: fix nmap vuln category name (#7044)

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

(limited to 'plugins')

diff --git a/plugins/nmap/nmap.plugin.zsh b/plugins/nmap/nmap.plugin.zsh
index 82c275f23..8c691bdaa 100644
--- a/plugins/nmap/nmap.plugin.zsh
+++ b/plugins/nmap/nmap.plugin.zsh
@@ -13,7 +13,7 @@
 #  -O - enable OS detection
 #  -sA - TCP ACK scan
 #  -F - fast scan
-#  --script=vulscan - also access vulnerabilities in target
+#  --script=vuln - also access vulnerabilities in target
 
 alias nmap_open_ports="nmap --open"
 alias nmap_list_interfaces="nmap --iflist"
@@ -24,7 +24,7 @@ alias nmap_check_for_firewall="sudo nmap -sA -p1-65535 -v -T4"
 alias nmap_ping_through_firewall="nmap -PS -PA"
 alias nmap_fast="nmap -F -T5 --version-light --top-ports 300"
 alias nmap_detect_versions="sudo nmap -sV -p1-65535 -O --osscan-guess -T4 -Pn"
-alias nmap_check_for_vulns="nmap --script=vulscan"
+alias nmap_check_for_vulns="nmap --script=vuln"
 alias nmap_full_udp="sudo nmap -sS -sU -T4 -A -v -PE -PS22,25,80 -PA21,23,80,443,3389 "
 alias nmap_traceroute="sudo nmap -sP -PE -PS22,25,80 -PA21,23,80,3389 -PU -PO --traceroute "
 alias nmap_full_with_scripts="sudo nmap -sS -sU -T4 -A -v -PE -PP -PS21,22,23,25,80,113,31339 -PA80,113,443,10042 -PO --script all " 
-- 
cgit v1.2.3-70-g09d2


From 9f1ffc64f1cc9b82ee38b5a947033aa77e16e178 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Fri, 31 Aug 2018 21:18:18 +0200
Subject: vi-mode: reset-prompt if zle is active (TRAPWINCH)

Fixes zle errors when resizing:

  TRAPWINCH:zle: widgets can only be called when ZLE is active
---
 plugins/vi-mode/vi-mode.plugin.zsh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh
index a1889d451..6cadd166a 100644
--- a/plugins/vi-mode/vi-mode.plugin.zsh
+++ b/plugins/vi-mode/vi-mode.plugin.zsh
@@ -11,8 +11,7 @@ function zle-line-init() {
 
 # Ensure that the prompt is redrawn when the terminal size changes.
 TRAPWINCH() {
-  zle &&  zle -R
-  zle reset-prompt
+  zle && { zle -R; zle reset-prompt }
 }
 
 zle -N zle-keymap-select
-- 
cgit v1.2.3-70-g09d2


From 0853b74fef0fa3a05af7487ff9b15a7f714bb037 Mon Sep 17 00:00:00 2001
From: Ross Lafferty <ross.lafferty@gmail.com>
Date: Sat, 1 Sep 2018 07:37:05 -0400
Subject: jump: fix printf path output (#7105)

Using the `jump` plugin, using the `marks` command will yield this output:
```
$ marks
desktop marks:printf:5: bad option: ->
dotfiles        marks:printf:5: bad option: ->
home    marks:printf:5: bad option: ->
```

the `marks` function uses `printf` with `->` and I believe `-` is used by `printf` for left-justification.  changing this to `-- "->"` seems to render the appropriate output.

```
desktop -> /Users/uname/Desktop
dotfiles        -> /Users/uname/.dotfiles
home    -> /Users/uname
```
---
 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 86d9553a2..168dfaba2 100644
--- a/plugins/jump/jump.plugin.zsh
+++ b/plugins/jump/jump.plugin.zsh
@@ -32,7 +32,7 @@ marks() {
 		local markname="$fg[cyan]${link:t}$reset_color"
 		local markpath="$fg[blue]$(readlink $link)$reset_color"
 		printf "%s\t" $markname
-		printf "-> %s \t\n" $markpath
+		printf -- "-> %s \t\n" $markpath
 	done
 }
 
-- 
cgit v1.2.3-70-g09d2


From e41699044277c914a280bc9800b45662b01771f1 Mon Sep 17 00:00:00 2001
From: "Cristian Măgherușan-Stanciu @magheru_san"
 <cristim@users.noreply.github.com>
Date: Mon, 3 Sep 2018 17:09:31 +0200
Subject: fasd: drop-in replace the autojump j alias (#3860)

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

(limited to 'plugins')

diff --git a/plugins/fasd/fasd.plugin.zsh b/plugins/fasd/fasd.plugin.zsh
index 45d10858f..eaaa96f42 100644
--- a/plugins/fasd/fasd.plugin.zsh
+++ b/plugins/fasd/fasd.plugin.zsh
@@ -8,4 +8,5 @@ if [ $commands[fasd] ]; then # check if fasd is installed
 
   alias v="f -e \"$EDITOR\""
   alias o='a -e open_command'
+  alias j='zz'
 fi
-- 
cgit v1.2.3-70-g09d2


From 69e637c35578305e19dbfc520e65c514180db6ef Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Mon, 3 Sep 2018 17:13:18 +0200
Subject: fasd: use xdg-open in o alias back again

Fixes #6314
---
 plugins/fasd/fasd.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/fasd/fasd.plugin.zsh b/plugins/fasd/fasd.plugin.zsh
index eaaa96f42..36a0428a7 100644
--- a/plugins/fasd/fasd.plugin.zsh
+++ b/plugins/fasd/fasd.plugin.zsh
@@ -7,6 +7,6 @@ if [ $commands[fasd] ]; then # check if fasd is installed
   unset fasd_cache
 
   alias v="f -e \"$EDITOR\""
-  alias o='a -e open_command'
+  alias o='a -e xdg-open'
   alias j='zz'
 fi
-- 
cgit v1.2.3-70-g09d2


From 86542dcd8627d0e9a4b1acd8c01a9cdae4697698 Mon Sep 17 00:00:00 2001
From: Maxime Brunet <32458727+maxbrunet@users.noreply.github.com>
Date: Tue, 4 Sep 2018 16:25:45 -0400
Subject: Add fzf plugin (#6910)

---
 plugins/fzf/README.md      | 19 ++++++++++++++++++
 plugins/fzf/fzf.plugin.zsh | 50 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+)
 create mode 100644 plugins/fzf/README.md
 create mode 100644 plugins/fzf/fzf.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/fzf/README.md b/plugins/fzf/README.md
new file mode 100644
index 000000000..b3a434347
--- /dev/null
+++ b/plugins/fzf/README.md
@@ -0,0 +1,19 @@
+# fzf
+
+This plugin enables [junegunn's fzf](https://github.com/junegunn/fzf) fuzzy auto-completion and key bindings
+
+```zsh
+# Set fzf installation directory path
+export FZF_BASE=/path/to/fzf/install/dir
+
+# Uncomment the following line to disable fuzzy completion
+# export DISABLE_FZF_AUTO_COMPLETION="true"
+
+# Uncomment the following line to disable key bindings (CTRL-T, CTRL-R, ALT-C)
+# export DISABLE_FZF_KEY_BINDINGS="true"
+
+plugins=(
+  ...
+  fzf
+)
+```
diff --git a/plugins/fzf/fzf.plugin.zsh b/plugins/fzf/fzf.plugin.zsh
new file mode 100644
index 000000000..b28b97994
--- /dev/null
+++ b/plugins/fzf/fzf.plugin.zsh
@@ -0,0 +1,50 @@
+test -d "${FZF_BASE}" && fzf_base="${FZF_BASE}"
+
+if [[ -z "${fzf_base}" ]]; then
+  fzfdirs=(
+    "${HOME}/.fzf"
+    "/usr/local/opt/fzf"
+    "/usr/share/fzf"
+  )
+  for dir in ${fzfdirs}; do
+      if [[ -d "${dir}" ]]; then
+          fzf_base="${dir}"
+          break
+      fi
+  done
+
+  if [[ -z "${fzf_base}" ]]; then
+      if (( ${+commands[brew]} )) && dir="$(brew --prefix fzf 2>/dev/null)"; then
+          if [[ -d "${dir}" ]]; then
+              fzf_base="${dir}"
+          fi
+      fi
+  fi
+fi
+
+if [[ -n "${fzf_base}" ]]; then
+
+  # Setup fzf
+  # ---------
+  if [[ ! "$PATH" == *$fzf_base/bin* ]]; then
+    export PATH="$PATH:$fzf_base/bin"
+  fi
+  
+  # Auto-completion
+  # ---------------
+  if [[ ! "$DISABLE_FZF_AUTO_COMPLETION" == "true" ]]; then
+    [[ $- == *i* ]] && source "$fzf_base/shell/completion.zsh" 2> /dev/null
+  fi
+  
+  # Key bindings
+  # ------------
+  if [[ ! "$DISABLE_FZF_KEY_BINDINGS" == "true" ]]; then
+    source "$fzf_base/shell/key-bindings.zsh"
+  fi
+
+else
+  print "[oh-my-zsh] fzf plugin: Cannot find fzf installation directory.\n"\
+        "Please add \`export FZF_BASE=/path/to/fzf/install/dir\` to your .zshrc" >&2
+fi
+
+unset fzf_base
-- 
cgit v1.2.3-70-g09d2


From f73c29a8203f8df539a72d28763bc5f521b775c0 Mon Sep 17 00:00:00 2001
From: Michele Bologna <michele.bologna@gmail.com>
Date: Thu, 6 Sep 2018 20:34:37 +0200
Subject: Feat: add Salt completion plugin (#7031)

* Feat: add Salt completion

* Docs: add README
---
 plugins/salt/README.md |   5 +
 plugins/salt/_salt     | 279 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 284 insertions(+)
 create mode 100644 plugins/salt/README.md
 create mode 100644 plugins/salt/_salt

(limited to 'plugins')

diff --git a/plugins/salt/README.md b/plugins/salt/README.md
new file mode 100644
index 000000000..3d224cce7
--- /dev/null
+++ b/plugins/salt/README.md
@@ -0,0 +1,5 @@
+## Salt autocomplete plugin
+
+A copy of the completion script from the
+[salt](https://github.com/saltstack/salt/blob/develop/pkg/zsh_completion.zsh)
+git repo.
diff --git a/plugins/salt/_salt b/plugins/salt/_salt
new file mode 100644
index 000000000..10b782af4
--- /dev/null
+++ b/plugins/salt/_salt
@@ -0,0 +1,279 @@
+#compdef salt salt-call salt-cp salt-run salt-key
+# The use-cache style is checked in a few places to allow caching minions, modules,
+# or the directory salt is installed in.
+# you can cache those three with:
+# zstyle ':completion:*:salt(|-cp|-call|-run|-key):*' use-cache true
+# and/or selectively:
+# zstyle ':completion::complete:salt-key:set-option-a-1:'             use-cache false
+# zstyle ':completion::complete:salt(|-cp|-call):minions:'            use-cache true
+# zstyle ':completion::complete:salt(|-call):modules:'                use-cache true
+# zstyle ':completion::complete:salt(|-cp|-call|-run|-key):salt_dir:' use-cache true
+#
+# cache validation can be controled with the style cache-ttl.
+# it expects two arguments: number (days|hours|weeks|months)
+# to invalidate the minion cache after four days:
+# zstyle ':completion::complete:salt(|-cp|-call):minions:'            cache-ttl 4 days
+
+
+local state line curcontext="$curcontext" salt_dir
+
+_modules(){
+    local _funcs expl curcontext=${curcontext%:*}:modules
+
+    if ! zstyle -m ":completion:$curcontext:" cache-policy '*'; then
+        zstyle ":completion:$curcontext:" cache-policy _salt_caching_policy
+    fi
+
+    if _cache_invalid salt/modules || ! _retrieve_cache salt/modules; then
+        _funcs=( ${${(Q)${${(s. .)"$(_call_program salt-call-cmd salt-call --local --log-level error --out txt sys.list_functions)"}%%[],]##}#\[}:#local:} )
+        _store_cache salt/modules _funcs
+    fi
+
+    _wanted modules expl modules _multi_parts "$@" . _funcs
+}
+
+_runners(){
+    local _runs expl curcontext=${curcontext%:*}:runners
+
+    if ! zstyle -m ":completion:$curcontext:" cache-policy '*'; then
+        zstyle ":completion:$curcontext:" cache-policy _salt_caching_policy
+    fi
+
+    if _cache_invalid salt/runners || ! _retrieve_cache salt/runners; then
+        _runs=( ${${(Q)${${(s. .)"$(_call_program salt-call-cmd salt-call --local --log-level error --out txt sys.list_runner_functions)"}%%[],]##}#\[}:#local:} )
+        _store_cache salt/runners _runs
+    fi
+
+    _wanted modules expl runners _multi_parts "$@" . _runs
+}
+
+_minions(){
+    local type requested_type include_all key expl; typeset -A _peons
+
+    # when completing the minion argument for salt and salt-cp, set the argument section
+    # of the context to `minion' not `argument-1'
+    if [[ $service = salt(|-cp) ]]; then
+       curcontext=${curcontext%:*}:minions
+    fi
+
+    # only pass the argument accepted, unaccepted, rejected, denied or all to -t/-T
+    # the argument is used as part of an tag, accepted-minions, rejected-minions, etc.
+    # while un, acc, den, etc will work, you will possibly ignore user customized tags.
+    zparseopts -D -E 't+:=requested_type' 'T+:=include_all'
+
+    if ! zstyle -m ":completion:$curcontext:" cache-policy '*'; then
+        zstyle ":completion:$curcontext:" cache-policy _salt_caching_policy
+    fi
+
+    if _cache_invalid salt/minions || ! _retrieve_cache salt/minions; then
+        # it would be awesome if salt-key could prefix or suffix a word to denote
+        # the key's state. It would remove the need for this loop, calling salt-key N times.
+        for type in accepted unaccepted rejected denied; do
+            salt-key -l $type 2>/dev/null | while read -r key; do
+              [[ $key == *' Keys:' ]] && continue
+              _peons+=( "$key" $type )
+            done
+        done
+        _store_cache salt/minions _peons
+    fi
+
+    # if salt-key's --include-all option isn't on the line, ignore the -T options
+    (( words[(I)--include-all] )) || unset include_all
+
+    if (( requested_type[(I)all] )); then
+        requested_type=( -t accepted -t unaccepted -t rejected -t denied )
+        unset include_all
+    fi
+
+    for type in ${${requested_type:#-t}:-accepted} ${include_all:#-T}; do
+        _wanted $type-minions expl minion compadd "$@" -M 'r:|.=* r:|=*' ${(k)_peons[(R)$~type]}
+    done
+}
+
+(( $+functions[_salt_caching_policy] )) ||
+_salt_caching_policy() {
+    local oldp ttl d t
+    zstyle -a ":completion:$curcontext:" cache-ttl ttl
+
+    if (( $#ttl >= 2 )); then
+      [[ $ttl[1] == <-> ]] && integer t=$ttl[1]
+
+      case $ttl[2] in
+        seconds#)d=s;;
+        months#) d=M;;
+        weeks#)  d=w;;
+        hours#)  d=h;;
+        *)       d=d;;
+      esac
+    fi
+
+    oldp=( "$1"(Nm${d:-d}+${t:-1}) )
+    (( $#oldp ))
+}
+
+local -a _{target,master,logging,minion}_options _{common,out}_opts _target_opt_pat
+_target_opt_pat=(
+    '(-[ELGNRCIS]|--(pcre|list|grain(|-pcre)|nodegroup|range|compound|pillar|ipcidr))'
+    '(-E --pcre -L --list -G --grain --grain-pcre -N --nodegroup -R --range -C --compound -I --pillar -S --ipcidr)'
+)
+
+_target_options=(
+    "$_target_opt_pat[2]"{-E,--pcre}'[use pcre regular expressions]:pcre:'
+    "$_target_opt_pat[2]"{-L,--list}'[take a comma or whitespace delimited list of servers.]:list:'
+    "$_target_opt_pat[2]"{-G,--grain}'[use a grain value to identify targets]:Grains:'
+    "$_target_opt_pat[2]--grain-pcre[use a grain value to identify targets.]:pcre:"
+    "$_target_opt_pat[2]"{-N,--nodegroup}'[use one of the predefined nodegroups to identify a list of targets.]:Nodegroup:'
+    "$_target_opt_pat[2]"{-R,--range}'[use a range expression to identify targets.]:Range:'
+    "$_target_opt_pat[2]"{-C,--compound}'[Use multiple targeting options.]:Compound:'
+    "$_target_opt_pat[2]"{-I,--pillar}'[use a pillar value to identify targets.]:Pillar:'
+    "$_target_opt_pat[2]"{-S,--ipcidr}'[Match based on Subnet (CIDR notation) or IPv4 address.]:Cidr:'
+)
+
+_common_opts=(
+    "--version[show program's version number and exit]"
+    "--versions-report[show program's dependencies version number and exit]"
+    '(-h --help)'{-h,--help}'[show this help message and exit]'
+    '(-c --config-dir)'{-c,--config-dir}'[Pass in an alternative configuration directory.(default: /etc/salt/)]:Config Directory:_files -/'
+    '(-t --timeout)'{-t,--timeout}'[Change the timeout for the running command; default=5]:Timeout (seconds):'
+)
+
+_master_options=(
+    '(-s --static)'{-s,--static}'[Return the data from minions as a group after they all return.]'
+    "--async[Run the salt command but don't wait for a reply]"
+    '(--state-output --state_output)'{--state-output,--state_output}'[Override the configured state_output value for minion output. Default: full]:Outputs:(full terse mixed changes)'
+    '--subset[Execute the routine on a random subset of the targeted minions]:Subset:'
+    '(-v --verbose)'{-v,--verbose}'[Turn on command verbosity, display jid and active job queries]'
+    '--hide-timeout[Hide minions that timeout]'
+    '(-b --batch --batch-size)'{-b,--batch,--batch-size}'[Execute the salt job in batch mode, pass number or percentage to batch.]:Batch Size:'
+    '(-a --auth --eauth --extrenal-auth)'{-a,--auth,--eauth,--external-auth}'[Specify an external authentication system to use.]:eauth:'
+    '(-T --make-token)'{-T,--make-token}'[Generate and save an authentication token for re-use.]'
+    '--return[Set an alternative return method.]:Returners:_path_files -W "$salt_dir/returners" -g "[^_]*.py(\:r)"'
+    '(-d --doc --documentation)'{-d,--doc,--documentation}'[Return the documentation for the specified module]'
+    '--args-separator[Set the special argument used as a delimiter between command arguments of compound commands.]:Arg separator:'
+)
+
+_minion_options=(
+    '--return[Set an alternative return method.]:Returners:_path_files -W "$salt_dir"/returners" -g "[^_]*.py(\:r)"'
+    '(-d --doc --documentation)'{-d,--doc,--documentation}'[Return the documentation for the specified module]'
+    '(-g --grains)'{-g,--grains}'[Return the information generated by the salt grains]'
+    {*-m,*--module-dirs}'[Specify an additional directory to pull modules from.]:Module Dirs:_files -/'
+    '--master[Specify the master to use.]:Master:'
+    '--local[Run salt-call locally, as if there was no master running.]'
+    '--file-root[Set this directory as the base file root.]:File Root:_files -/'
+    '--pillar-root[Set this directory as the base pillar root.]:Pillar Root:_files -/'
+    '--retcode-passthrough[Exit with the salt call retcode and not the salt binary retcode]'
+    '--id[Specify the minion id to use.]:Minion ID:'
+    '--skip-grains[Do not load grains.]'
+    '--refresh-grains-cache[Force a refresh of the grains cache]'
+)
+
+_runner_options=(
+    '--hard-crash[raise any original exception rather than exiting gracefully]'
+    '(-d --doc --documentation)'{-d,--doc,--documentation}'[Return the documentation for the specified module]'
+)
+
+_key_options=(
+    '(-u --user)'{-u+,--user=}'[specify user to run salt-key]:user:_users'
+    '--hard-crash[raise any original exception rather than exiting gracefully]'
+    '(-q --quiet)'{-q,--quiet}'[quiet mode]'
+    '(-y --yes)'{-y,--yes}'[assume yes]'
+    '--rotate-aes-key[prevents the master from refreshing the key session when keys are deleted or rejected]:boolean:(true false)'
+    '--gen-keys=[set a name to generate a keypair for use with salt]:key name'
+    '--gen-keys-dir=[set the directory to save the generated keypair]: : _directories'
+    '--keysize=[set the size for keypair]:key size'
+    '--gen-signature[create a signature file of the masters public-key]'
+    '--priv=[the private-key file to create a signature with]:private key:_files'
+    '--signature-path=[the path where the signature file should be written]: : _directories'
+    '--pub=[the public-key file to create a signature for]:public key:_files'
+    '--auto-create[auto-create a signing key-pair if it does not yet exist]'
+    '--include-all[include non-pending keys when accepting/rejecting]'
+    - '(set)'
+    {-l+,--list=}'[list public keys]:key type:((
+        preaccepted\:"unaccepted/unsigned keys" unaccepted\:"unaccepted/unsigned keys" un\:"unaccepted/unsigned keys"
+        accepted\:"accepted/signed keys" acc\:"accepted/signed keys"
+        rejected\:"rejected keys" rej\:"rejected keys"
+        den\:"denied keys" denied\:"denied keys" all
+      ))'
+    {-a+,--accept=}'[accept key]:key:_minions -t unaccepted -T rejected'
+    {-A,--accept-all}'[accept all keys]'
+    {-r+,--reject=}'[reject key]:key:_minions -t rejected -T accepted'
+    {-p+,--print=}'[print the specified public key]:key:_minions -t all'
+    {-P,--print-all}'[print all public keys]'
+    {-d+,--delete=}'[delete the specified public key]:key:_minions -t all'
+    {-D,--delete-all}'[delete all public keys]'
+    {-f+,--finger=}'[print the specified key'\''s fingerprint]:key:_minions -t all'
+    {-F,--finger-all}'[print the fingerprint of all keys]'
+)
+
+_logging_options=(
+    '(-l --log-level)'{-l,--log-level}'[Console logging log level.(default: warning)]:Log Level:(all garbage trace debug info warning error critical quiet)'
+    '--log-file[Log file path. Default: /var/log/salt/master.]:Log File:_files'
+    '--log-file-level=[Logfile logging log level.Default: warning]:Log Level:(all garbage trace debug info warning error critical quiet)'
+)
+
+_out_opts=(
+    '(--out --output)'{--out,--output}'[Print the output using the specified outputter.]:Outputters:_path_files -W "$salt_dir/output" -g "[^_]*.py(\:r)"'
+    '(--out-indent --output-indent)'{--out-indent,--output-indent}'[Print the output indented by the provided value in spaces.]:Number:'
+    '(--out-file --output-file)'{--out-file,--output-file}'[Write the output to the specified file]:Output File:_files'
+    '(--no-color --no-colour)'{--no-color,--no-colour}'[Disable all colored output]'
+    '(--force-color --force-colour)'{--force-color,--force-colour}'[Force colored output]'
+)
+
+_salt_comp(){
+    case "$service" in
+        salt)
+            _arguments -C \
+                "${words[(r)$_target_opt_pat[1]]+!}:minions:_minions" \
+                ':modules:_modules' \
+                "$_target_options[@]" \
+                "$_common_opts[@]" \
+                "$_master_options[@]" \
+                "$_logging_options[@]" \
+                "$_out_opts[@]"
+            ;;
+        salt-call)
+            _arguments -C \
+                ':modules:_modules' \
+                "$_minion_options[@]" \
+                "$_common_opts[@]" \
+                "$_logging_options[@]" \
+                "$_out_opts[@]"
+            ;;
+        salt-cp)
+            _arguments -C \
+                "${words[(r)$_target_opt_pat[1]]+!}:minions:_minions" \
+                "$_target_options[@]" \
+                "$_common_opts[@]" \
+                "$_logging_options[@]" \
+                ':Source File:_files' \
+                ':Destination File:_files'
+            ;;
+        salt-run)
+            _arguments -C \
+                ":runners:_runners" \
+                "$_runner_options[@]" \
+                "$_common_opts[@]" \
+                "$_logging_options[@]"
+            ;;
+        salt-key)
+            _arguments -C \
+                "$_key_options[@]" \
+                "${_common_opts[@]:#'-t --timeout\)'*}" \
+                "${_logging_options[@]:#'(-l --log-level)'*}"
+            ;;
+    esac
+}
+
+() {
+    local curcontext=${curcontext%:*}:salt_dir
+    if ! zstyle -m ":completion:$curcontext:" cache-policy '*'; then
+        zstyle ":completion:$curcontext:" cache-policy _salt_caching_policy
+    fi
+
+    if _cache_invalid salt/salt_dir || ! _retrieve_cache salt/salt_dir; then
+        salt_dir="${$(python2 -c 'import salt; print(salt.__file__);')%__init__*}"
+        _store_cache salt/salt_dir salt_dir
+    fi
+}
+
+_salt_comp "$@"
-- 
cgit v1.2.3-70-g09d2


From bb908495deae22314c3355235133063087698796 Mon Sep 17 00:00:00 2001
From: Maxime Brunet <32458727+maxbrunet@users.noreply.github.com>
Date: Sat, 8 Sep 2018 09:31:13 -0400
Subject: fzf: Fix shell directory for archlinux package (#7119)

* fzf: Fix shell directory for archlinux package

* fzf: Don't clutter PATH if fzf already available

* brew has it available via symlink in /usr/local/bin
* Fedora and Arch packages have it place in /usr/bin

* fzf: Fix archlinux guess by using release file

* fzf: unset leftover variables
---
 plugins/fzf/fzf.plugin.zsh | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'plugins')

diff --git a/plugins/fzf/fzf.plugin.zsh b/plugins/fzf/fzf.plugin.zsh
index b28b97994..27e2d9246 100644
--- a/plugins/fzf/fzf.plugin.zsh
+++ b/plugins/fzf/fzf.plugin.zsh
@@ -24,22 +24,29 @@ fi
 
 if [[ -n "${fzf_base}" ]]; then
 
+  # Fix fzf shell directory for Archlinux package
+  if [[ ! -d "${fzf_base}/shell" ]] && [[ -f /etc/arch-release ]]; then
+    fzf_shell="${fzf_base}"
+  else
+    fzf_shell="${fzf_base}/shell"
+  fi
+
   # Setup fzf
   # ---------
-  if [[ ! "$PATH" == *$fzf_base/bin* ]]; then
+  if ! (( ${+commands[fzf]} )) && [[ ! "$PATH" == *$fzf_base/bin* ]]; then
     export PATH="$PATH:$fzf_base/bin"
   fi
   
   # Auto-completion
   # ---------------
   if [[ ! "$DISABLE_FZF_AUTO_COMPLETION" == "true" ]]; then
-    [[ $- == *i* ]] && source "$fzf_base/shell/completion.zsh" 2> /dev/null
+    [[ $- == *i* ]] && source "${fzf_shell}/completion.zsh" 2> /dev/null
   fi
   
   # Key bindings
   # ------------
   if [[ ! "$DISABLE_FZF_KEY_BINDINGS" == "true" ]]; then
-    source "$fzf_base/shell/key-bindings.zsh"
+    source "${fzf_shell}/key-bindings.zsh"
   fi
 
 else
@@ -47,4 +54,4 @@ else
         "Please add \`export FZF_BASE=/path/to/fzf/install/dir\` to your .zshrc" >&2
 fi
 
-unset fzf_base
+unset fzf_base fzf_shell dir fzfdirs
-- 
cgit v1.2.3-70-g09d2


From 08a280863661dd44aad20d494187d9c4ba12fac9 Mon Sep 17 00:00:00 2001
From: Iulian Onofrei <6d0847b9@opayq.com>
Date: Sun, 9 Sep 2018 01:39:23 +0300
Subject: Fix incorrect error message when running bi without having bundler
 installed (#7112)

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

(limited to 'plugins')

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index b0b286af5..668e15d2f 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -54,8 +54,12 @@ done
 ## Functions
 
 bundle_install() {
-  if _bundler-installed && _within-bundled-project; then
-    local bundler_version=`bundle --version | cut -d' ' -f3`
+  if ! _bundler-installed; then
+    echo "Bundler is not installed"
+  elif ! _within-bundled-project; then
+    echo "Can't 'bundle install' outside a bundled project"
+  else
+    local bundler_version=`bundle version | cut -d' ' -f3`
     if [[ $bundler_version > '1.4.0' || $bundler_version = '1.4.0' ]]; then
       if [[ "$OSTYPE" = (darwin|freebsd)* ]]
       then
@@ -67,8 +71,6 @@ bundle_install() {
     else
       bundle install $@
     fi
-  else
-    echo "Can't 'bundle install' outside a bundled project"
   fi
 }
 
-- 
cgit v1.2.3-70-g09d2


From d4cae83152d17fd73514532d57fb75a878b651cc Mon Sep 17 00:00:00 2001
From: Matthieu PETIOT <matt@ardeidae.com>
Date: Mon, 10 Sep 2018 20:10:31 +0200
Subject: osx: add function to remove .DS_Store files (#7008)

rmdsstore removes .DS_Store files recursively in the current directory by default, or for the given directories.
---
 plugins/osx/README.md      | 33 +++++++++++++++++----------------
 plugins/osx/osx.plugin.zsh |  7 ++++++-
 2 files changed, 23 insertions(+), 17 deletions(-)

(limited to 'plugins')

diff --git a/plugins/osx/README.md b/plugins/osx/README.md
index d3a8f94df..7c75c65f5 100644
--- a/plugins/osx/README.md
+++ b/plugins/osx/README.md
@@ -42,19 +42,20 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ## Commands
 
-| Command         | Description                                      |
-| :-------------- | :----------------------------------------------- |
-| `tab`           | Open the current directory in a new tab          |
-| `split_tab`     | Split the current terminal tab horizontally      |
-| `vsplit_tab`    | Split the current terminal tab vertically        |
-| `ofd`           | Open the current directory in a Finder window    |
-| `pfd`           | Return the path of the frontmost Finder window   |
-| `pfs`           | Return the current Finder selection              |
-| `cdf`           | `cd` to the current Finder directory             |
-| `pushdf`        | `pushd` to the current Finder directory          |
-| `quick-look`    | Quick-Look a specified file                      |
-| `man-preview`   | Open a specified man page in Preview app         |
-| `showfiles`     | Show hidden files                                |
-| `hidefiles`     | Hide the hidden files                            |
-| `itunes`        | Control iTunes. User `itunes -h` for usage details |
-| `spotify`       | Control Spotify and search by artist, album, track and etc.|
+| Command         | Description                                         |
+| :-------------- | :-------------------------------------------------- |
+| `tab`           | Open the current directory in a new tab             |
+| `split_tab`     | Split the current terminal tab horizontally         |
+| `vsplit_tab`    | Split the current terminal tab vertically           |
+| `ofd`           | Open the current directory in a Finder window       |
+| `pfd`           | Return the path of the frontmost Finder window      |
+| `pfs`           | Return the current Finder selection                 |
+| `cdf`           | `cd` to the current Finder directory                |
+| `pushdf`        | `pushd` to the current Finder directory             |
+| `quick-look`    | Quick-Look a specified file                         |
+| `man-preview`   | Open a specified man page in Preview app            |
+| `showfiles`     | Show hidden files                                   |
+| `hidefiles`     | Hide the hidden files                               |
+| `itunes`        | Control iTunes. User `itunes -h` for usage details  |
+| `spotify`       | Control Spotify and search by artist, album, track… |
+| `rmdsstore`     | Remove .DS\_Store files recursively in a directory  |
diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index d99cf0b1e..6a4b6eec4 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -209,7 +209,7 @@ if [[ ! -z "$playlist" ]]; then
 					opt="play"
 				else
 					opt="stop"
-				fi	
+				fi
                   else
                     opt="set allPlaylists to (get name of every playlist)"
                   fi
@@ -282,3 +282,8 @@ source ${ZSH}/plugins/osx/spotify
 # Show/hide hidden files in the Finder
 alias showfiles="defaults write com.apple.finder AppleShowAllFiles -bool true && killall Finder"
 alias hidefiles="defaults write com.apple.finder AppleShowAllFiles -bool false && killall Finder"
+
+# Remove .DS_Store files recursively in a directory, default .
+rmdsstore() {
+	find "${@:-.}" -type f -name .DS_Store -delete
+}
-- 
cgit v1.2.3-70-g09d2


From 1487a2ad844bbdff24e1db1cfb086138f477c7e9 Mon Sep 17 00:00:00 2001
From: Garth Mortensen <voldemortensen@users.noreply.github.com>
Date: Tue, 11 Sep 2018 12:22:55 -0600
Subject: urltools: add readme (#7126)

---
 plugins/urltools/README.md | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 plugins/urltools/README.md

(limited to 'plugins')

diff --git a/plugins/urltools/README.md b/plugins/urltools/README.md
new file mode 100644
index 000000000..548301c72
--- /dev/null
+++ b/plugins/urltools/README.md
@@ -0,0 +1,29 @@
+# URLTools plugin
+
+This plugin provides two aliases to URL-encode and URL-decode strings.
+
+To start using it, add the `urltools` plugin to your plugins array in `~/.zshrc`:
+
+```zsh
+plugins=(... urltools)
+```
+
+Original author: [Ian Chesal](https://github.com/ianchesal)
+Original idea and aliases: [Ruslan Spivak](https://ruslanspivak.wordpress.com/2010/06/02/urlencode-and-urldecode-from-a-command-line/)
+
+## Commands
+
+| Command     | Description                  |
+| :---------- | :--------------------------- |
+| `urlencode` | URL-encodes the given string |
+| `urldecode` | URL-decodes the given string |
+
+## Examples
+
+```zsh
+urlencode 'https://github.com/robbyrussell/oh-my-zsh/search?q=urltools&type=Code'
+# returns https%3A%2F%2Fgithub.com%2Frobbyrussell%2Foh-my-zsh%2Fsearch%3Fq%3Durltools%26type%3DCode
+
+urldecode 'https%3A%2F%2Fgithub.com%2Frobbyrussell%2Foh-my-zsh%2Fsearch%3Fq%3Durltools%26type%3DCode'
+# returns https://github.com/robbyrussell/oh-my-zsh/search?q=urltools&type=Code
+```
-- 
cgit v1.2.3-70-g09d2


From 3d2542f41b8de36877b419f6e74e954d4db06a97 Mon Sep 17 00:00:00 2001
From: Poyoman <big-bug@laposte.net>
Date: Wed, 12 Sep 2018 15:52:42 +0200
Subject: git: add pull rebase --autostash aliases (#6791)

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

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 916866ff5..e6e7125f7 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -248,6 +248,8 @@ alias gunignore='git update-index --no-assume-unchanged'
 alias gunwip='git log -n 1 | grep -q -c "\-\-wip\-\-" && git reset HEAD~1'
 alias gup='git pull --rebase'
 alias gupv='git pull --rebase -v'
+alias gupa='git pull --rebase --autostash'
+alias gupav='git pull --rebase --autostash -v'
 alias glum='git pull upstream master'
 
 alias gwch='git whatchanged -p --abbrev-commit --pretty=medium'
-- 
cgit v1.2.3-70-g09d2


From 69ba6e435970546cd6612941ba0569bbe6847bdb Mon Sep 17 00:00:00 2001
From: Gant Laborde <gantman@gmail.com>
Date: Wed, 12 Sep 2018 16:28:59 +0200
Subject: git: add alias to `git stash --all` (#5511)

Stash tracked, ignored and untracked files. Leaves the working directory absolutely clean.
---
 plugins/git/git.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index e6e7125f7..2efb4b881 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -239,6 +239,7 @@ alias gstd='git stash drop'
 alias gstl='git stash list'
 alias gstp='git stash pop'
 alias gsts='git stash show --text'
+alias gstall='git stash --all'
 alias gsu='git submodule update'
 
 alias gts='git tag -s'
-- 
cgit v1.2.3-70-g09d2


From d5f0a0a413146761bfee5f2a206c68cdb577159f Mon Sep 17 00:00:00 2001
From: "Jefferson F. Pires" <jeffersfp@gmail.com>
Date: Wed, 12 Sep 2018 11:57:48 -0300
Subject: git: add glols alias for glol --stat (#5871)

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

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 2efb4b881..3a549be3e 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -183,6 +183,7 @@ alias glgga='git log --graph --decorate --all'
 alias glgm='git log --graph --max-count=10'
 alias glo='git log --oneline --decorate'
 alias glol="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'"
+alias glols="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --stat"
 alias glod="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset'"
 alias glods="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset' --date=short"
 alias glola="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --all"
-- 
cgit v1.2.3-70-g09d2


From bf05bb3a1b95768be4e154b0269297ad3724d1dc Mon Sep 17 00:00:00 2001
From: Garth Mortensen <voldemortensen@users.noreply.github.com>
Date: Wed, 12 Sep 2018 10:13:13 -0600
Subject: dash: update dash bundle identifier (#7127)

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

(limited to 'plugins')

diff --git a/plugins/dash/dash.plugin.zsh b/plugins/dash/dash.plugin.zsh
index 5d0ec9a97..b00d4877e 100644
--- a/plugins/dash/dash.plugin.zsh
+++ b/plugins/dash/dash.plugin.zsh
@@ -11,7 +11,7 @@ _dash() {
     # Use defaults to get the array of docsets from preferences
     # Have to smash it into one big line so that each docset is an element of
     # our DOCSETS array
-    DOCSETS=("${(@f)$(defaults read com.kapeli.dash docsets | tr -d '\n' | grep -oE '\{.*?\}')}")
+    DOCSETS=("${(@f)$(defaults read com.kapeli.dashdoc docsets | tr -d '\n' | grep -oE '\{.*?\}')}")
 
     # remove all newlines since defaults prints so pretty like
     # Now get each docset and output each on their own line
-- 
cgit v1.2.3-70-g09d2


From a3afeca3ebb613d5290c481a9766e11d95f3d9bb Mon Sep 17 00:00:00 2001
From: Simen Bekkhus <sbekkhus91@gmail.com>
Date: Wed, 12 Sep 2018 18:38:21 +0200
Subject: git: add gbD alias to force-delete branch (#5844)

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

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 3a549be3e..a65826852 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -51,6 +51,7 @@ alias gb='git branch'
 alias gba='git branch -a'
 alias gbd='git branch -d'
 alias gbda='git branch --no-color --merged | command grep -vE "^(\*|\s*(master|develop|dev)\s*$)" | command xargs -n 1 git branch -d'
+alias gbD='git branch -D'
 alias gbl='git blame -b -w'
 alias gbnm='git branch --no-merged'
 alias gbr='git branch --remote'
-- 
cgit v1.2.3-70-g09d2


From 0db7da0cd5c72611e8f9bdf184bafe15f9f09668 Mon Sep 17 00:00:00 2001
From: Yago Nobre <yagonobre@users.noreply.github.com>
Date: Wed, 12 Sep 2018 14:05:57 -0300
Subject: git: add push force aliases (#6297)

* gpf to --force-with-lease
* gpf! to --force
---
 plugins/git/git.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index a65826852..1d548d12d 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -202,6 +202,8 @@ alias gma='git merge --abort'
 
 alias gp='git push'
 alias gpd='git push --dry-run'
+alias gpf='git push --force-with-lease'
+alias gpf!='git push --force'
 alias gpoat='git push origin --all && git push origin --tags'
 compdef _git gpoat=git-push
 alias gpu='git push upstream'
-- 
cgit v1.2.3-70-g09d2


From 5ee93f4f1542123413e9ff9a3b79394937e85881 Mon Sep 17 00:00:00 2001
From: Luis Ferrer-Labarca <ferrerluis97@gmail.com>
Date: Wed, 12 Sep 2018 13:08:12 -0400
Subject: git: add git rm aliases (#5433)

* grm for 'git rm'
* grmc for 'git rm --cached'
---
 plugins/git/git.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 1d548d12d..16bf9e0db 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -220,6 +220,8 @@ alias grbm='git rebase master'
 alias grbs='git rebase --skip'
 alias grh='git reset'
 alias grhh='git reset --hard'
+alias grm='git rm'
+alias grmc='git rm --cached'
 alias grmv='git remote rename'
 alias grrm='git remote remove'
 alias grset='git remote set-url'
-- 
cgit v1.2.3-70-g09d2


From 509a5549008c178e982bc8f728a07a2e2dbc58a9 Mon Sep 17 00:00:00 2001
From: Max Gautier <mgautier@student.42.fr>
Date: Wed, 12 Sep 2018 19:35:10 +0200
Subject: git: use color auto for ref names in git log (#5729)

Allow the ref names to have differents colors if they are remote refs
or local refs, and another color for HEAD
(use the same coloring scheme as --decorate option)
---
 plugins/git/git.plugin.zsh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 16bf9e0db..45a706173 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -183,11 +183,11 @@ alias glgg='git log --graph'
 alias glgga='git log --graph --decorate --all'
 alias glgm='git log --graph --max-count=10'
 alias glo='git log --oneline --decorate'
-alias glol="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'"
-alias glols="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --stat"
-alias glod="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset'"
-alias glods="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset' --date=short"
-alias glola="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --all"
+alias glol="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'"
+alias glols="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --stat"
+alias glod="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset'"
+alias glods="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset' --date=short"
+alias glola="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --all"
 alias glog='git log --oneline --decorate --graph'
 alias gloga='git log --oneline --decorate --graph --all'
 alias glp="_git_log_prettily"
-- 
cgit v1.2.3-70-g09d2


From 16bfd6fd7f5ef50d80657862b2331d37956cbd60 Mon Sep 17 00:00:00 2001
From: Erik <ethorelli@gmail.com>
Date: Wed, 12 Sep 2018 16:56:18 -0400
Subject: react-native: add aliases for newer iPhones (#7134)

Added aliases for iPhone 7, 7 Plus, 8, 8 Plus, SE, and X
---
 plugins/react-native/react-native.plugin.zsh | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'plugins')

diff --git a/plugins/react-native/react-native.plugin.zsh b/plugins/react-native/react-native.plugin.zsh
index 0566941a1..09c137264 100644
--- a/plugins/react-native/react-native.plugin.zsh
+++ b/plugins/react-native/react-native.plugin.zsh
@@ -9,6 +9,12 @@ alias rnios5='react-native run-ios --simulator "iPhone 5"'
 alias rnios5s='react-native run-ios --simulator "iPhone 5s"'
 alias rnios6='react-native run-ios --simulator "iPhone 6"'
 alias rnios6s='react-native run-ios --simulator "iPhone 6s"'
+alias rnios7='react-native run-ios --simulator "iPhone 7"'
+alias rnios7p='react-native run-ios --simulator "iPhone 7 Plus"'
+alias rnios8='react-native run-ios --simulator "iPhone 8"'
+alias rnios8p='react-native run-ios --simulator "iPhone 8 Plus"'
+alias rniosse='react-native run-ios --simulator "iPhone SE"'
+alias rniosx='react-native run-ios --simulator "iPhone X"'
 
 alias rnland='react-native log-android'
 alias rnlios='react-native log-ios'
-- 
cgit v1.2.3-70-g09d2


From d77d636b4c08f45d0784f3f9f901fbef754ae762 Mon Sep 17 00:00:00 2001
From: Ivan Eisenberg <ivan.eisenberg@gmail.com>
Date: Thu, 13 Sep 2018 14:41:26 -0500
Subject: git-flow: add "gflfp" alias for feature publish (#6350)

- Add `gflfp` as an alias for `git flow feature publish`
- Update README.md documentation
---
 plugins/git-flow/README.md           | 35 ++++++++++++++++++-----------------
 plugins/git-flow/git-flow.plugin.zsh |  1 +
 2 files changed, 19 insertions(+), 17 deletions(-)

(limited to 'plugins')

diff --git a/plugins/git-flow/README.md b/plugins/git-flow/README.md
index f37f418db..5d8049e3b 100644
--- a/plugins/git-flow/README.md
+++ b/plugins/git-flow/README.md
@@ -10,22 +10,23 @@ plugins=(... git-flow)
 
 ## Aliases
 
-More information about `git-flow` commands: 
+More information about `git-flow` commands:
 https://github.com/nvie/gitflow/wiki/Command-Line-Arguments
 
-| Alias   | Command                   | Description                            |
-|---------|---------------------------|----------------------------------------|
-| `gfl`   | `git flow`                | Git-Flow command                       |
-| `gfli`  | `git flow init`           | Initialize git-flow repository         |
-| `gcd`   | `git checkout develop`    | Check out develop branch               |
-| `gch`   | `git checkout hotfix`     | Check out hotfix branch                |
-| `gcr`   | `git checkout release`    | Check out release branch               |
-| `gflf`  | `git flow feature`        | List existing feature branches         |
-| `gflh`  | `git flow hotfix`         | List existing hotfix branches          |
-| `gflr`  | `git flow release`        | List existing release branches         |
-| `gflfs` | `git flow feature start`  | Start a new feature: `gflfs <name>`    |
-| `gflhs` | `git flow hotfix start`   | Start a new hotfix: `gflhs <version>`  |
-| `gflrs` | `git flow release start`  | Start a new release: `gflrs <version>` |
-| `gflff` | `git flow feature finish` | Finish feature: `gflff <name>`         |
-| `gflhf` | `git flow hotfix finish`  | Finish hotfix: `gflhf <version>`       |
-| `gflrf` | `git flow release finish` | Finish release: `gflrf <version>`      |
+| Alias   | Command                    | Description                            |
+|---------|----------------------------|----------------------------------------|
+| `gfl`   | `git flow`                 | Git-Flow command                       |
+| `gfli`  | `git flow init`            | Initialize git-flow repository         |
+| `gcd`   | `git checkout develop`     | Check out develop branch               |
+| `gch`   | `git checkout hotfix`      | Check out hotfix branch                |
+| `gcr`   | `git checkout release`     | Check out release branch               |
+| `gflf`  | `git flow feature`         | List existing feature branches         |
+| `gflh`  | `git flow hotfix`          | List existing hotfix branches          |
+| `gflr`  | `git flow release`         | List existing release branches         |
+| `gflfs` | `git flow feature start`   | Start a new feature: `gflfs <name>`    |
+| `gflhs` | `git flow hotfix start`    | Start a new hotfix: `gflhs <version>`  |
+| `gflrs` | `git flow release start`   | Start a new release: `gflrs <version>` |
+| `gflff` | `git flow feature finish`  | Finish feature: `gflff <name>`         |
+| `gflfp` | `git flow feature publish` | Publish feature: `gflfp <name>`        |
+| `gflhf` | `git flow hotfix finish`   | Finish hotfix: `gflhf <version>`       |
+| `gflrf` | `git flow release finish`  | Finish release: `gflrf <version>`      |
diff --git a/plugins/git-flow/git-flow.plugin.zsh b/plugins/git-flow/git-flow.plugin.zsh
index 5f5e4aa73..eab969d8a 100644
--- a/plugins/git-flow/git-flow.plugin.zsh
+++ b/plugins/git-flow/git-flow.plugin.zsh
@@ -33,6 +33,7 @@ alias gflfs='git flow feature start'
 alias gflhs='git flow hotfix start'
 alias gflrs='git flow release start'
 alias gflff='git flow feature finish'
+alias gflfp='git flow feature publish'
 alias gflhf='git flow hotfix finish'
 alias gflrf='git flow release finish'
 alias gflfp='git flow feature publish'
-- 
cgit v1.2.3-70-g09d2


From 315eb77336919d907adf1296ce234d8bc778c005 Mon Sep 17 00:00:00 2001
From: Erik <ethorelli@gmail.com>
Date: Thu, 13 Sep 2018 15:42:13 -0400
Subject: react-native: update readme with new aliases (#7135)

---
 plugins/react-native/README.md | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

(limited to 'plugins')

diff --git a/plugins/react-native/README.md b/plugins/react-native/README.md
index 980246cf1..4a4047ea3 100644
--- a/plugins/react-native/README.md
+++ b/plugins/react-native/README.md
@@ -11,19 +11,25 @@ plugins=(... react-native)
 
 ## Aliases
 
-| Alias       | React Native command                           |
-|:------------|:-----------------------------------------------|
-| **rn**      | `react-native`                                 |
-| **rns**     | `react-native start`                           |
-| **rnlink**  | `react-native link`                            |
-| _App testing_                                                |
-| **rnand**   | `react-native run-android`                     |
-| **rnios**   | `react-native run-ios`                         |
-| **rnios4s** | `react-native run-ios --simulator "iPhone 4s"` |
-| **rnios5**  | `react-native run-ios --simulator "iPhone 5"`  |
-| **rnios5s** | `react-native run-ios --simulator "iPhone 5s"` |
-| **rnios6**  | `react-native run-ios --simulator "iPhone 6"`  |
-| **rnios6s** | `react-native run-ios --simulator "iPhone 6s"` |
-| _Logging_                                                    |
-| **rnland**  | `react-native log-android`                     |
-| **rnlios**  | `react-native log-ios`                         |
+| Alias       | React Native command                               |
+|:------------|:---------------------------------------------------|
+| **rn**      | `react-native`                                     |
+| **rns**     | `react-native start`                               |
+| **rnlink**  | `react-native link`                                |
+| _App testing_                                                    |
+| **rnand**   | `react-native run-android`                         |
+| **rnios**   | `react-native run-ios`                             |
+| **rnios4s** | `react-native run-ios --simulator "iPhone 4s"`     |
+| **rnios5**  | `react-native run-ios --simulator "iPhone 5"`      |
+| **rnios5s** | `react-native run-ios --simulator "iPhone 5s"`     |
+| **rnios6**  | `react-native run-ios --simulator "iPhone 6"`      |
+| **rnios6s** | `react-native run-ios --simulator "iPhone 6s"`     |
+| **rnios7**  | `react-native run-ios --simulator "iPhone7"`       |
+| **rnios7p** | `react-native run-ios --simulator "iPhone 7 Plus"` |
+| **rnios8**  | `react-native run-ios --simulator "iPhone 8"`      |
+| **rnios8p** | `react-native run-ios --simulator "iPhone 8 Plus"` |
+| **rniosse** | `react-native run-ios --simulator "iPhone SE"`     |
+| **rniosx**  | `react-native run-ios --simulator "iPhone X"`      |
+| _Logging_                                                        |
+| **rnland**  | `react-native log-android`                         |
+| **rnlios**  | `react-native log-ios`                             |
-- 
cgit v1.2.3-70-g09d2


From 4d940109e3c2a81ca44df1dd6e807b7a5538fff8 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sat, 15 Sep 2018 23:57:12 +0200
Subject: misc: remove execution permission from various files

---
 plugins/bgnotify/bgnotify.plugin.zsh                         | 0
 plugins/catimg/catimg.sh                                     | 0
 plugins/dnf/README.md                                        | 0
 plugins/git-flow-avh/git-flow-avh.plugin.zsh                 | 0
 plugins/n98-magerun/n98-magerun.plugin.zsh                   | 0
 plugins/scd/scd                                              | 0
 plugins/wd/wd.sh                                             | 0
 plugins/zsh-navigation-tools/zsh-navigation-tools.plugin.zsh | 0
 themes/trapd00r.zsh-theme                                    | 0
 9 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 plugins/bgnotify/bgnotify.plugin.zsh
 mode change 100755 => 100644 plugins/catimg/catimg.sh
 mode change 100755 => 100644 plugins/dnf/README.md
 mode change 100755 => 100644 plugins/git-flow-avh/git-flow-avh.plugin.zsh
 mode change 100755 => 100644 plugins/n98-magerun/n98-magerun.plugin.zsh
 mode change 100755 => 100644 plugins/scd/scd
 mode change 100755 => 100644 plugins/wd/wd.sh
 mode change 100755 => 100644 plugins/zsh-navigation-tools/zsh-navigation-tools.plugin.zsh
 mode change 100755 => 100644 themes/trapd00r.zsh-theme

(limited to 'plugins')

diff --git a/plugins/bgnotify/bgnotify.plugin.zsh b/plugins/bgnotify/bgnotify.plugin.zsh
old mode 100755
new mode 100644
diff --git a/plugins/catimg/catimg.sh b/plugins/catimg/catimg.sh
old mode 100755
new mode 100644
diff --git a/plugins/dnf/README.md b/plugins/dnf/README.md
old mode 100755
new mode 100644
diff --git a/plugins/git-flow-avh/git-flow-avh.plugin.zsh b/plugins/git-flow-avh/git-flow-avh.plugin.zsh
old mode 100755
new mode 100644
diff --git a/plugins/n98-magerun/n98-magerun.plugin.zsh b/plugins/n98-magerun/n98-magerun.plugin.zsh
old mode 100755
new mode 100644
diff --git a/plugins/scd/scd b/plugins/scd/scd
old mode 100755
new mode 100644
diff --git a/plugins/wd/wd.sh b/plugins/wd/wd.sh
old mode 100755
new mode 100644
diff --git a/plugins/zsh-navigation-tools/zsh-navigation-tools.plugin.zsh b/plugins/zsh-navigation-tools/zsh-navigation-tools.plugin.zsh
old mode 100755
new mode 100644
diff --git a/themes/trapd00r.zsh-theme b/themes/trapd00r.zsh-theme
old mode 100755
new mode 100644
-- 
cgit v1.2.3-70-g09d2


From 918a78cfdb92b9301168cb9d62d8ddbbdfd907f6 Mon Sep 17 00:00:00 2001
From: Nicolas <nllobera@gmail.com>
Date: Sun, 16 Sep 2018 20:16:16 +0200
Subject: man: rename file to *.plugin.zsh (#6016)

Also fixed minor typo

Closes #6108

Co-authored-by: Matt <sifrawr@gmail.com>
---
 plugins/man/man.plugin.zsh | 27 +++++++++++++++++++++++++++
 plugins/man/man.zsh        | 27 ---------------------------
 2 files changed, 27 insertions(+), 27 deletions(-)
 create mode 100644 plugins/man/man.plugin.zsh
 delete mode 100644 plugins/man/man.zsh

(limited to 'plugins')

diff --git a/plugins/man/man.plugin.zsh b/plugins/man/man.plugin.zsh
new file mode 100644
index 000000000..94aa4918d
--- /dev/null
+++ b/plugins/man/man.plugin.zsh
@@ -0,0 +1,27 @@
+# ------------------------------------------------------------------------------
+# Author
+# ------
+#
+# * Jerry Ling<jerryling315@gmail.com>
+#
+# ------------------------------------------------------------------------------
+# Usage
+# -----
+#
+# man will be inserted before the command
+#
+# ------------------------------------------------------------------------------
+
+man-command-line() {
+    [[ -z $BUFFER ]] && zle up-history
+    [[ $BUFFER != man\ * ]] && LBUFFER="man $LBUFFER"
+}
+zle -N man-command-line
+# Defined shortcut keys: [Esc]man
+bindkey "\e"man man-command-line
+
+
+# ------------------------------------------------------------------------------
+# Also, you might want to use man-preview included in 'osx' plugin
+# just substitute "man" in the function with "man-preview" after you included OS X in
+# the .zshrc
diff --git a/plugins/man/man.zsh b/plugins/man/man.zsh
deleted file mode 100644
index 3490b0b61..000000000
--- a/plugins/man/man.zsh
+++ /dev/null
@@ -1,27 +0,0 @@
-# ------------------------------------------------------------------------------
-# Author
-# ------
-#
-# * Jerry Ling<jerryling315@gmail.com>
-#
-# ------------------------------------------------------------------------------
-# Usgae
-# -----
-#
-# man will be inserted before the command
-#
-# ------------------------------------------------------------------------------
-
-man-command-line() {
-    [[ -z $BUFFER ]] && zle up-history
-    [[ $BUFFER != man\ * ]] && LBUFFER="man $LBUFFER"
-}
-zle -N man-command-line
-# Defined shortcut keys: [Esc]man
-bindkey "\e"man man-command-line
-
-
-# ------------------------------------------------------------------------------
-# Also, you might want to use man-preview included in 'osx' plugin
-# just substitute "man" in the function with "man-preview" after you included OS X in
-# the .zshrc
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From 178df729b17b4e3a0fd4b0a0f334eb3705c9d5f7 Mon Sep 17 00:00:00 2001
From: Erik <ethorelli@gmail.com>
Date: Fri, 21 Sep 2018 10:50:54 -0400
Subject: react-native: add iPhone XR, XS, and XS Max simulators (#7145)

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

(limited to 'plugins')

diff --git a/plugins/react-native/react-native.plugin.zsh b/plugins/react-native/react-native.plugin.zsh
index 09c137264..220aa2dce 100644
--- a/plugins/react-native/react-native.plugin.zsh
+++ b/plugins/react-native/react-native.plugin.zsh
@@ -15,6 +15,9 @@ alias rnios8='react-native run-ios --simulator "iPhone 8"'
 alias rnios8p='react-native run-ios --simulator "iPhone 8 Plus"'
 alias rniosse='react-native run-ios --simulator "iPhone SE"'
 alias rniosx='react-native run-ios --simulator "iPhone X"'
+alias rniosxs='react-native run-ios --simulator "iPhone XS"'
+alias rniosxsm='react-native run-ios --simulator "iPhone XS Max"'
+alias rniosxr='react-native run-ios --simulator "iPhone XR"'
 
 alias rnland='react-native log-android'
 alias rnlios='react-native log-ios'
-- 
cgit v1.2.3-70-g09d2


From 008006bbcd15e357c0417eb9d43ae08d24a23bdf Mon Sep 17 00:00:00 2001
From: Erik <ethorelli@gmail.com>
Date: Fri, 21 Sep 2018 10:51:35 -0400
Subject: react-native: add new iPhone model simulators to README (#7146)

---
 plugins/react-native/README.md | 48 +++++++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 22 deletions(-)

(limited to 'plugins')

diff --git a/plugins/react-native/README.md b/plugins/react-native/README.md
index 4a4047ea3..ebe1be0e0 100644
--- a/plugins/react-native/README.md
+++ b/plugins/react-native/README.md
@@ -11,25 +11,29 @@ plugins=(... react-native)
 
 ## Aliases
 
-| Alias       | React Native command                               |
-|:------------|:---------------------------------------------------|
-| **rn**      | `react-native`                                     |
-| **rns**     | `react-native start`                               |
-| **rnlink**  | `react-native link`                                |
-| _App testing_                                                    |
-| **rnand**   | `react-native run-android`                         |
-| **rnios**   | `react-native run-ios`                             |
-| **rnios4s** | `react-native run-ios --simulator "iPhone 4s"`     |
-| **rnios5**  | `react-native run-ios --simulator "iPhone 5"`      |
-| **rnios5s** | `react-native run-ios --simulator "iPhone 5s"`     |
-| **rnios6**  | `react-native run-ios --simulator "iPhone 6"`      |
-| **rnios6s** | `react-native run-ios --simulator "iPhone 6s"`     |
-| **rnios7**  | `react-native run-ios --simulator "iPhone7"`       |
-| **rnios7p** | `react-native run-ios --simulator "iPhone 7 Plus"` |
-| **rnios8**  | `react-native run-ios --simulator "iPhone 8"`      |
-| **rnios8p** | `react-native run-ios --simulator "iPhone 8 Plus"` |
-| **rniosse** | `react-native run-ios --simulator "iPhone SE"`     |
-| **rniosx**  | `react-native run-ios --simulator "iPhone X"`      |
-| _Logging_                                                        |
-| **rnland**  | `react-native log-android`                         |
-| **rnlios**  | `react-native log-ios`                             |
+| Alias         | React Native command                               |
+| :------------ | :------------------------------------------------- |
+| **rn**        | `react-native`                                     |
+| **rns**       | `react-native start`                               |
+| **rnlink**    | `react-native link`                                |
+| _App testing_ |
+| **rnand**     | `react-native run-android`                         |
+| **rnios**     | `react-native run-ios`                             |
+| **rnios4s**   | `react-native run-ios --simulator "iPhone 4s"`     |
+| **rnios5**    | `react-native run-ios --simulator "iPhone 5"`      |
+| **rnios5s**   | `react-native run-ios --simulator "iPhone 5s"`     |
+| **rnios6**    | `react-native run-ios --simulator "iPhone 6"`      |
+| **rnios6s**   | `react-native run-ios --simulator "iPhone 6s"`     |
+| **rnios7**    | `react-native run-ios --simulator "iPhone7"`       |
+| **rnios7p**   | `react-native run-ios --simulator "iPhone 7 Plus"` |
+| **rnios8**    | `react-native run-ios --simulator "iPhone 8"`      |
+| **rnios8p**   | `react-native run-ios --simulator "iPhone 8 Plus"` |
+| **rniosse**   | `react-native run-ios --simulator "iPhone SE"`     |
+| **rniosx**    | `react-native run-ios --simulator "iPhone X"`      |
+| **rniosxs**   | `react-native run-ios --simulator "iPhone XS"`     |
+| **rniosxsm**  | `react-native run-ios --simulator "iPhone XS Max"` |
+| **rniosxr**   | `react-native run-ios --simulator "iPhone XR"`     |
+
+| _Logging_     |
+| **rnland**    | `react-native log-android`                         |
+| **rnlios**    | `react-native log-ios`                             |
-- 
cgit v1.2.3-70-g09d2


From 627393eadaf715adcf8308cd2e6b93413dfae72d Mon Sep 17 00:00:00 2001
From: Igor Rootsi <igor.rootsi@gmail.com>
Date: Fri, 21 Sep 2018 17:54:04 +0300
Subject: docker-compose: add dcupd alias for detached mode start (#7144)

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

(limited to 'plugins')

diff --git a/plugins/docker-compose/docker-compose.plugin.zsh b/plugins/docker-compose/docker-compose.plugin.zsh
index 24bea318b..9ffe1edf6 100644
--- a/plugins/docker-compose/docker-compose.plugin.zsh
+++ b/plugins/docker-compose/docker-compose.plugin.zsh
@@ -18,6 +18,7 @@ alias dcrm='docker-compose rm'
 alias dcr='docker-compose run'
 alias dcstop='docker-compose stop'
 alias dcup='docker-compose up'
+alias dcupd='docker-compose up -d'
 alias dcdn='docker-compose down'
 alias dcl='docker-compose logs'
 alias dclf='docker-compose logs -f'
-- 
cgit v1.2.3-70-g09d2


From c7d903b77e93f70849d7fdcbefc2a8831006c4dd Mon Sep 17 00:00:00 2001
From: Batuhan's Unmaintained Account <batuhanosmantaskaya@gmail.com>
Date: Sun, 23 Sep 2018 12:12:27 -0400
Subject: Remove Optional Static Type Checker's (mypy) Cache Files on `pyclean`

Remove Optional Static Type Checker's (mypy) Cache Files on `pyclean`
---
 plugins/python/python.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/python/python.plugin.zsh b/plugins/python/python.plugin.zsh
index a10c06fd3..f754ea261 100644
--- a/plugins/python/python.plugin.zsh
+++ b/plugins/python/python.plugin.zsh
@@ -1,12 +1,13 @@
 # Find python file
 alias pyfind='find . -name "*.py"'
 
-# Remove python compiled byte-code in either current directory or in a
+# Remove python compiled byte-code and mypy cache in either current directory or in a
 # list of specified directories
 function pyclean() {
     ZSH_PYCLEAN_PLACES=${*:-'.'}
     find ${ZSH_PYCLEAN_PLACES} -type f -name "*.py[co]" -delete
     find ${ZSH_PYCLEAN_PLACES} -type d -name "__pycache__" -delete
+    find ${ZSH_PYCLEAN_PLACES} -type d -name ".mypy_cache" -delete
 }
 
 # Grep among .py files
-- 
cgit v1.2.3-70-g09d2


From d326cc5c411ac17f1a2befa1e717d221b2bbbf35 Mon Sep 17 00:00:00 2001
From: Frederick Zhang <frederick888@tsundere.moe>
Date: Sat, 7 Jan 2017 20:32:56 +1100
Subject: target name completion

---
 plugins/cargo/_cargo | 45 ++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 38 insertions(+), 7 deletions(-)

(limited to 'plugins')

diff --git a/plugins/cargo/_cargo b/plugins/cargo/_cargo
index 54e709ca0..3eb3acb96 100644
--- a/plugins/cargo/_cargo
+++ b/plugins/cargo/_cargo
@@ -31,7 +31,7 @@ case $state in
                     '--no-default-features[do not build the default features]' \
                     '--no-run[compile but do not run]' \
                     '(-p,--package)'{-p=,--package=}'[package to run benchmarks for]:packages:_get_package_names' \
-                    '--target=[target triple]' \
+                    '--target=[target triple]: :_get_targets' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
                     '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
                     '--color=:colorization option:(auto always never)' \
@@ -48,7 +48,7 @@ case $state in
                     '--no-default-features[do not build the default features]' \
                     '(-p,--package)'{-p=,--package=}'[package to build]:packages:_get_package_names' \
                     '--release=[build in release mode]' \
-                    '--target=[target triple]' \
+                    '--target=[target triple]: :_get_targets' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
                     '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
                     '--color=:colorization option:(auto always never)' \
@@ -61,7 +61,7 @@ case $state in
                     '(-p,--package)'{-p=,--package=}'[package to clean]:packages:_get_package_names' \
                     '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
                     '--release[whether or not to clean release artifacts]' \
-                    '--target=[target triple(default:all)]' \
+                    '--target=[target triple(default:all)]: :_get_targets' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
                     '--color=:colorization option:(auto always never)' \
                     ;;
@@ -79,7 +79,7 @@ case $state in
                     '(-p, --package)'{-p,--package}'=[package to document]' \
                     '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
                     '--release[build artifacts in release mode, with optimizations]' \
-                    '--target=[build for the target triple]' \
+                    '--target=[build for the target triple]: :_get_targets' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
                     '--color=:colorization option:(auto always never)' \
                     ;;
@@ -276,7 +276,7 @@ case $state in
                     '--profile=[profile to build the selected target for]' \
                     '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
                     '--release[build artifacts in release mode, with optimizations]' \
-                    '--target=[target triple which compiles will be for]' \
+                    '--target=[target triple which compiles will be for]: :_get_targets' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
                     "${command_scope_spec[@]}" \
                     ;;
@@ -294,7 +294,7 @@ case $state in
                     '(-p, --package)'{-p,--package}'=[package to document]' \
                     '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
                     '--release[build artifacts in release mode, with optimizations]' \
-                    '--target=[build for the target triple]' \
+                    '--target=[build for the target triple]: :_get_targets' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
                     "${command_scope_spec[@]}" \
                     ;;
@@ -323,7 +323,7 @@ case $state in
                     '(-p,--package)'{-p=,--package=}'[package to run tests for]:packages:_get_package_names' \
                     '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
                     '--release[build artifacts in release mode, with optimizations]' \
-                    '--target=[target triple]' \
+                    '--target=[target triple]: :_get_targets' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
                     '--color=:colorization option:(auto always never)' \
                     '1: :_test_names' \
@@ -484,6 +484,37 @@ _benchmark_names()
     _get_names_from_array "bench"
 }
 
+#Gets the target names from config files
+_get_targets()
+{
+    local CURRENT_PATH
+    if [[ $(uname -o) = "Cygwin" && -f "$PWD"/Cargo.toml ]]; then
+            CURRENT_PATH=$PWD
+    else
+            CURRENT_PATH=$(_locate_manifest)
+    fi
+    if [[ -z "$CURRENT_PATH" ]]; then
+            return 1
+    fi
+    local -a TARGETS
+    local -a FIND_PATHS=( "/" )
+    local -a FLINES
+    local FIND_PATH FLINE
+    while [[ "$CURRENT_PATH" != "/" ]]; do
+        FIND_PATHS+=( "$CURRENT_PATH" )
+        CURRENT_PATH=$(dirname $CURRENT_PATH)
+    done
+    for FIND_PATH in ${FIND_PATHS[@]}; do
+        if [[ -f "$FIND_PATH"/.cargo/config ]]; then
+            FLINES=( `grep "$FIND_PATH"/.cargo/config -e "^\[target\."` )
+            for FLINE in ${FLINES[@]}; do
+                TARGETS+=(`sed 's/^\[target\.\(.*\)\]$/\1/' <<< $FLINE`)
+            done
+        fi
+    done
+    _describe 'target' TARGETS
+}
+
 # These flags are mutally exclusive specifiers for the scope of a command; as
 # they are used in multiple places without change, they are expanded into the
 # appropriate command's `_arguments` where appropriate.
-- 
cgit v1.2.3-70-g09d2


From da30a1d6d2709d768c68de122d6d0ab96c5a9a90 Mon Sep 17 00:00:00 2001
From: Frederick Zhang <frederick888@tsundere.moe>
Date: Sat, 7 Jan 2017 20:48:11 +1100
Subject: add description for --color

---
 plugins/cargo/_cargo | 54 ++++++++++++++++++++++++++--------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

(limited to 'plugins')

diff --git a/plugins/cargo/_cargo b/plugins/cargo/_cargo
index 3eb3acb96..99eac2bdb 100644
--- a/plugins/cargo/_cargo
+++ b/plugins/cargo/_cargo
@@ -34,7 +34,7 @@ case $state in
                     '--target=[target triple]: :_get_targets' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
                     '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
-                    '--color=:colorization option:(auto always never)' \
+                    '--color=[coloring]:colorization option:(auto always never)' \
                     ;;
 
             build)
@@ -51,7 +51,7 @@ case $state in
                     '--target=[target triple]: :_get_targets' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
                     '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
-                    '--color=:colorization option:(auto always never)' \
+                    '--color=[coloring]:colorization option:(auto always never)' \
                     ;;
 
             clean)
@@ -63,7 +63,7 @@ case $state in
                     '--release[whether or not to clean release artifacts]' \
                     '--target=[target triple(default:all)]: :_get_targets' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=:colorization option:(auto always never)' \
+                    '--color=[coloring]:colorization option:(auto always never)' \
                     ;;
 
             doc)
@@ -81,7 +81,7 @@ case $state in
                     '--release[build artifacts in release mode, with optimizations]' \
                     '--target=[build for the target triple]: :_get_targets' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=:colorization option:(auto always never)' \
+                    '--color=[coloring]:colorization option:(auto always never)' \
                     ;;
 
             fetch)
@@ -90,7 +90,7 @@ case $state in
                     '--manifest-path=[path to manifest]: :_files -/' \
                     '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=:colorization option:(auto always never)' \
+                    '--color=[coloring]:colorization option:(auto always never)' \
                     ;;
 
             generate-lockfile)
@@ -99,7 +99,7 @@ case $state in
                     '--manifest-path=[path to manifest]: :_files -/' \
                     '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=:colorization option:(auto always never)' \
+                    '--color=[coloring]:colorization option:(auto always never)' \
                     ;;
 
             git-checkout)
@@ -109,7 +109,7 @@ case $state in
                     '--reference=[REF]' \
                     '--url=[URL]' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=:colorization option:(auto always never)' \
+                    '--color=[coloring]:colorization option:(auto always never)' \
                     ;;
 
             help)
@@ -126,14 +126,14 @@ case $state in
                     '--name=[set the resulting package name]' \
                     '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=:colorization option:(auto always never)' \
+                    '--color=[coloring]:colorization option:(auto always never)' \
                     ;;
 
             install)
                 _arguments \
                     '--bin=[only install the specified binary]' \
                     '--branch=[branch to use when installing from git]' \
-                    '--color=:colorization option:(auto always never)' \
+                    '--color=[coloring]:colorization option:(auto always never)' \
                     '--debug[build in debug mode instead of release mode]' \
                     '--example[install the specified example instead of binaries]' \
                     '--features=[space separated feature list]' \
@@ -163,7 +163,7 @@ case $state in
                     '--host=[Host to set the token for]' \
                     '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=:colorization option:(auto always never)' \
+                    '--color=[coloring]:colorization option:(auto always never)' \
                     ;;
 
             metadata)
@@ -177,7 +177,7 @@ case $state in
                     '--features=[space separated feature list]' \
                     '--all-features[enable all available features]' \
                     '--format-version=[format version(default: 1)]' \
-                    '--color=:colorization option:(auto always never)' \
+                    '--color=[coloring]:colorization option:(auto always never)' \
                     ;;
 
             new)
@@ -188,7 +188,7 @@ case $state in
                     '--name=[set the resulting package name]' \
                     '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=:colorization option:(auto always never)' \
+                    '--color=[coloring]:colorization option:(auto always never)' \
                     ;;
 
             owner)
@@ -201,7 +201,7 @@ case $state in
                     '(-r, --remove)'{-r,--remove}'[remove owner LOGIN]' \
                     '--token[API token to use when authenticating]' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=:colorization option:(auto always never)' \
+                    '--color=[coloring]:colorization option:(auto always never)' \
                     ;;
 
             package)
@@ -213,7 +213,7 @@ case $state in
                     '--no-verify[do not build to verify contents]' \
                     '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=:colorization option:(auto always never)' \
+                    '--color=[coloring]:colorization option:(auto always never)' \
                     ;;
 
             pkgid)
@@ -222,7 +222,7 @@ case $state in
                     '--manifest-path=[path to manifest]: :_files -/' \
                     '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=:colorization option:(auto always never)' \
+                    '--color=[coloring]:colorization option:(auto always never)' \
                     ;;
 
             publish)
@@ -234,7 +234,7 @@ case $state in
                     '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
                     '--token[token to use when uploading]' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=:colorization option:(auto always never)' \
+                    '--color=[coloring]:colorization option:(auto always never)' \
                     ;;
 
             read-manifest)
@@ -242,7 +242,7 @@ case $state in
                     '(-h, --help)'{-h,--help}'[show help message]' \
                     '--manifest-path=[path to manifest]: :_files -/' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=:colorization option:(auto always never)' \
+                    '--color=[coloring]:colorization option:(auto always never)' \
                     ;;
 
             run)
@@ -259,13 +259,13 @@ case $state in
                     '--release=[build in release mode]' \
                     '--target=[target triple]' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=:colorization option:(auto always never)' \
+                    '--color=[coloring]:colorization option:(auto always never)' \
                     '*: :_normal' \
                     ;;
 
             rustc)
                 _arguments \
-                    '--color=:colorization option:(auto always never)' \
+                    '--color=[coloring]:colorization option:(auto always never)' \
                     '--features=[features to compile for the package]' \
                     '--all-features[enable all available features]' \
                     '(-h, --help)'{-h,--help}'[show help message]' \
@@ -283,7 +283,7 @@ case $state in
 
             rustdoc)
                 _arguments \
-                    '--color=:colorization option:(auto always never)' \
+                    '--color=[coloring]:colorization option:(auto always never)' \
                     '--features=[space-separated list of features to also build]' \
                     '--all-features[enable all available features]' \
                     '(-h, --help)'{-h,--help}'[show help message]' \
@@ -301,7 +301,7 @@ case $state in
 
             search)
                 _arguments \
-                    '--color=:colorization option:(auto always never)' \
+                    '--color=[coloring]:colorization option:(auto always never)' \
                     '(-h, --help)'{-h,--help}'[show help message]' \
                     '--host=[host of a registry to search in]' \
                     '--limit=[limit the number of results]' \
@@ -325,14 +325,14 @@ case $state in
                     '--release[build artifacts in release mode, with optimizations]' \
                     '--target=[target triple]: :_get_targets' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=:colorization option:(auto always never)' \
+                    '--color=[coloring]:colorization option:(auto always never)' \
                     '1: :_test_names' \
                     ;;
 
             uninstall)
                 _arguments \
                     '--bin=[only uninstall the binary NAME]' \
-                    '--color=:colorization option:(auto always never)' \
+                    '--color=[coloring]:colorization option:(auto always never)' \
                     '(-h, --help)'{-h,--help}'[show help message]' \
                     '(-q, --quiet)'{-q,--quiet}'[less output printed to stdout]' \
                     '--root=[directory to uninstall packages from]' \
@@ -348,7 +348,7 @@ case $state in
                     '--precise=[update single dependency to PRECISE]: :' \
                     '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=:colorization option:(auto always never)' \
+                    '--color=[coloring]:colorization option:(auto always never)' \
                     ;;
 
             verify-project)
@@ -357,14 +357,14 @@ case $state in
                     '--manifest-path=[path to manifest]: :_files -/' \
                     '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=:colorization option:(auto always never)' \
+                    '--color=[coloring]:colorization option:(auto always never)' \
                     ;;
 
             version)
                 _arguments \
                     '(-h, --help)'{-h,--help}'[show help message]' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=:colorization option:(auto always never)' \
+                    '--color=[coloring]:colorization option:(auto always never)' \
                     ;;
 
             yank)
@@ -375,7 +375,7 @@ case $state in
                     '--token[API token to use when authenticating]' \
                     '--undo[undo a yank, putting a version back into the index]' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=:colorization option:(auto always never)' \
+                    '--color=[coloring]:colorization option:(auto always never)' \
                     '--vers[yank version]' \
                     ;;
         esac
-- 
cgit v1.2.3-70-g09d2


From b9533ccac2846d74693158eef1759d198231a79b Mon Sep 17 00:00:00 2001
From: Frederick Zhang <frederick888@tsundere.moe>
Date: Sat, 7 Jan 2017 20:54:48 +1100
Subject: complete --message-format

---
 plugins/cargo/_cargo | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'plugins')

diff --git a/plugins/cargo/_cargo b/plugins/cargo/_cargo
index 99eac2bdb..7ed95c0ce 100644
--- a/plugins/cargo/_cargo
+++ b/plugins/cargo/_cargo
@@ -34,6 +34,7 @@ case $state in
                     '--target=[target triple]: :_get_targets' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
                     '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
+                    '--message-format=[error format]:format option:(human json)' \
                     '--color=[coloring]:colorization option:(auto always never)' \
                     ;;
 
@@ -51,6 +52,7 @@ case $state in
                     '--target=[target triple]: :_get_targets' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
                     '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
+                    '--message-format=[error format]:format option:(human json)' \
                     '--color=[coloring]:colorization option:(auto always never)' \
                     ;;
 
@@ -259,12 +261,14 @@ case $state in
                     '--release=[build in release mode]' \
                     '--target=[target triple]' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
+                    '--message-format=[error format]:format option:(human json)' \
                     '--color=[coloring]:colorization option:(auto always never)' \
                     '*: :_normal' \
                     ;;
 
             rustc)
                 _arguments \
+                    '--message-format=[error format]:format option:(human json)' \
                     '--color=[coloring]:colorization option:(auto always never)' \
                     '--features=[features to compile for the package]' \
                     '--all-features[enable all available features]' \
@@ -283,6 +287,7 @@ case $state in
 
             rustdoc)
                 _arguments \
+                    '--message-format=[error format]:format option:(human json)' \
                     '--color=[coloring]:colorization option:(auto always never)' \
                     '--features=[space-separated list of features to also build]' \
                     '--all-features[enable all available features]' \
@@ -325,6 +330,7 @@ case $state in
                     '--release[build artifacts in release mode, with optimizations]' \
                     '--target=[target triple]: :_get_targets' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
+                    '--message-format=[error format]:format option:(human json)' \
                     '--color=[coloring]:colorization option:(auto always never)' \
                     '1: :_test_names' \
                     ;;
-- 
cgit v1.2.3-70-g09d2


From 5423f7fa2ad255ec417fc3aea0c69077f0530ccb Mon Sep 17 00:00:00 2001
From: Frederick Zhang <frederick888@tsundere.moe>
Date: Tue, 24 Jan 2017 03:48:57 +1100
Subject: complete installed sub-commands

---
 plugins/cargo/_cargo | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'plugins')

diff --git a/plugins/cargo/_cargo b/plugins/cargo/_cargo
index 7ed95c0ce..e26fbfeba 100644
--- a/plugins/cargo/_cargo
+++ b/plugins/cargo/_cargo
@@ -390,6 +390,7 @@ esac
 }
 
 _cargo_cmds(){
+local IFS=$'\n'
 local -a commands;commands=(
 'bench:execute all benchmarks of a local package'
 'build:compile the current project'
@@ -420,6 +421,7 @@ local -a commands;commands=(
 'verify-project:check Cargo.toml'
 'version:show version information'
 'yank:remove pushed file from index'
+$( cargo --list | sed -n '1!p' | tr -d ' ' | egrep -v "^bench$|^build$|^clean$|^doc$|^fetch$|^generate-lockfile$|^git-checkout$|^help$|^init$|^install$|^locate-project$|^login$|^metadata$|^new$|^owner$|^package$|^pkgid$|^publish$|^read-manifest$|^run$|^rustc$|^rustdoc$|^search$|^test$|^uninstall$|^update$|^verify-project$|^version$|^yank$" | sed -r "s/(.*)/echo \"\1:$\(cargo help \1 | head -n 1\)\"/" | sh )
 )
 _describe 'command' commands
 
-- 
cgit v1.2.3-70-g09d2


From 5d0b90a7ef8fde6d8c53a5d88b5599af6b5da75e Mon Sep 17 00:00:00 2001
From: Frederick Zhang <Frederick888@Tsundere.moe>
Date: Mon, 26 Jun 2017 12:47:27 +1000
Subject: redir debug output to std

---
 plugins/cargo/_cargo | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/cargo/_cargo b/plugins/cargo/_cargo
index e26fbfeba..7d6ca9fc5 100644
--- a/plugins/cargo/_cargo
+++ b/plugins/cargo/_cargo
@@ -421,7 +421,7 @@ local -a commands;commands=(
 'verify-project:check Cargo.toml'
 'version:show version information'
 'yank:remove pushed file from index'
-$( cargo --list | sed -n '1!p' | tr -d ' ' | egrep -v "^bench$|^build$|^clean$|^doc$|^fetch$|^generate-lockfile$|^git-checkout$|^help$|^init$|^install$|^locate-project$|^login$|^metadata$|^new$|^owner$|^package$|^pkgid$|^publish$|^read-manifest$|^run$|^rustc$|^rustdoc$|^search$|^test$|^uninstall$|^update$|^verify-project$|^version$|^yank$" | sed -r "s/(.*)/echo \"\1:$\(cargo help \1 | head -n 1\)\"/" | sh )
+$( cargo --list | sed -n '1!p' | tr -d ' ' | egrep -v "^bench$|^build$|^clean$|^doc$|^fetch$|^generate-lockfile$|^git-checkout$|^help$|^init$|^install$|^locate-project$|^login$|^metadata$|^new$|^owner$|^package$|^pkgid$|^publish$|^read-manifest$|^run$|^rustc$|^rustdoc$|^search$|^test$|^uninstall$|^update$|^verify-project$|^version$|^yank$" | sed -r "s/(.*)/echo \"\1:$\(cargo help \1 2>&1 | head -n 1\)\"/" | sh )
 )
 _describe 'command' commands
 
-- 
cgit v1.2.3-70-g09d2


From 440d8ef344686b699c918edc7c878a362b3a5038 Mon Sep 17 00:00:00 2001
From: Frederick Zhang <Frederick888@Tsundere.moe>
Date: Mon, 26 Jun 2017 12:56:16 +1000
Subject: fix escaping

---
 plugins/cargo/_cargo | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/cargo/_cargo b/plugins/cargo/_cargo
index 7d6ca9fc5..01089dff4 100644
--- a/plugins/cargo/_cargo
+++ b/plugins/cargo/_cargo
@@ -421,7 +421,7 @@ local -a commands;commands=(
 'verify-project:check Cargo.toml'
 'version:show version information'
 'yank:remove pushed file from index'
-$( cargo --list | sed -n '1!p' | tr -d ' ' | egrep -v "^bench$|^build$|^clean$|^doc$|^fetch$|^generate-lockfile$|^git-checkout$|^help$|^init$|^install$|^locate-project$|^login$|^metadata$|^new$|^owner$|^package$|^pkgid$|^publish$|^read-manifest$|^run$|^rustc$|^rustdoc$|^search$|^test$|^uninstall$|^update$|^verify-project$|^version$|^yank$" | sed -r "s/(.*)/echo \"\1:$\(cargo help \1 2>&1 | head -n 1\)\"/" | sh )
+$( cargo --list | sed -n '1!p' | tr -d ' ' | egrep -v "^bench$|^build$|^clean$|^doc$|^fetch$|^generate-lockfile$|^git-checkout$|^help$|^init$|^install$|^locate-project$|^login$|^metadata$|^new$|^owner$|^package$|^pkgid$|^publish$|^read-manifest$|^run$|^rustc$|^rustdoc$|^search$|^test$|^uninstall$|^update$|^verify-project$|^version$|^yank$" | sed -r "s/(.*)/echo \"\1:$\(cargo help \1 2>\&1 | head -n 1\)\"/" | sh )
 )
 _describe 'command' commands
 
-- 
cgit v1.2.3-70-g09d2


From 1e161e839f5b544955096b30b01841307b4e4d2f Mon Sep 17 00:00:00 2001
From: Frederick Zhang <frederick888@tsundere.moe>
Date: Mon, 24 Sep 2018 18:02:03 +1000
Subject: fix subcommands completion

---
 plugins/cargo/_cargo | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/cargo/_cargo b/plugins/cargo/_cargo
index 01089dff4..7d7d9b2d8 100644
--- a/plugins/cargo/_cargo
+++ b/plugins/cargo/_cargo
@@ -421,7 +421,7 @@ local -a commands;commands=(
 'verify-project:check Cargo.toml'
 'version:show version information'
 'yank:remove pushed file from index'
-$( cargo --list | sed -n '1!p' | tr -d ' ' | egrep -v "^bench$|^build$|^clean$|^doc$|^fetch$|^generate-lockfile$|^git-checkout$|^help$|^init$|^install$|^locate-project$|^login$|^metadata$|^new$|^owner$|^package$|^pkgid$|^publish$|^read-manifest$|^run$|^rustc$|^rustdoc$|^search$|^test$|^uninstall$|^update$|^verify-project$|^version$|^yank$" | sed -r "s/(.*)/echo \"\1:$\(cargo help \1 2>\&1 | head -n 1\)\"/" | sh )
+$( cargo --list | sed -n '1!p' | tr -s ' ' | cut -d ' ' -f 2 | egrep -v "^bench$|^build$|^clean$|^doc$|^fetch$|^generate-lockfile$|^git-checkout$|^help$|^init$|^install$|^locate-project$|^login$|^metadata$|^new$|^owner$|^package$|^pkgid$|^publish$|^read-manifest$|^run$|^rustc$|^rustdoc$|^search$|^test$|^uninstall$|^update$|^verify-project$|^version$|^yank$" | sed -r "s/(.*)/echo \"\1:$\(cargo help \1 2>\&1 | head -n 1\)\"/" | sh )
 )
 _describe 'command' commands
 
-- 
cgit v1.2.3-70-g09d2


From 14fead09641c17eb87e573e13b3c750bb98ea8cf Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Mon, 24 Sep 2018 18:52:11 +0200
Subject: vi-mode: disable displayed mode on startup

This change had the unintended consequence of overriding the functions to ensure
that application mode was set to use $terminfo sequences, introduced in #6449.

Fixes #7137
---
 plugins/vi-mode/vi-mode.plugin.zsh | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'plugins')

diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh
index 6cadd166a..93964594b 100644
--- a/plugins/vi-mode/vi-mode.plugin.zsh
+++ b/plugins/vi-mode/vi-mode.plugin.zsh
@@ -4,11 +4,6 @@ function zle-keymap-select() {
   zle -R
 }
 
-# Ensures that MODE_INDITCATOR is displayed on terminal start up.
-function zle-line-init() {
-  zle reset-prompt
-}
-
 # Ensure that the prompt is redrawn when the terminal size changes.
 TRAPWINCH() {
   zle && { zle -R; zle reset-prompt }
-- 
cgit v1.2.3-70-g09d2


From 5e1d351339d9ea10023fbf175efcd0515cea0a94 Mon Sep 17 00:00:00 2001
From: Chris <hostinspace@gmail.com>
Date: Tue, 25 Sep 2018 13:56:29 +0200
Subject: bgnotify: use double dash in kdialog title option (#7153)

The options for kdialog in KDE use double dashes
---
 plugins/bgnotify/bgnotify.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/bgnotify/bgnotify.plugin.zsh b/plugins/bgnotify/bgnotify.plugin.zsh
index 459f5214e..b3a6890b8 100644
--- a/plugins/bgnotify/bgnotify.plugin.zsh
+++ b/plugins/bgnotify/bgnotify.plugin.zsh
@@ -42,7 +42,7 @@ bgnotify () { ## args: (title, subtitle)
   elif hash notify-send 2>/dev/null; then #ubuntu gnome!
     notify-send "$1" "$2"
   elif hash kdialog 2>/dev/null; then #ubuntu kde!
-    kdialog  -title "$1" --passivepopup  "$2" 5
+    kdialog --title "$1" --passivepopup  "$2" 5
   elif hash notifu 2>/dev/null; then #cygwyn support!
     notifu /m "$2" /p "$1"
   fi
-- 
cgit v1.2.3-70-g09d2


From 7f6e6cf346268a6d2cdf6fe167a60827aab53f0b Mon Sep 17 00:00:00 2001
From: Erik <ethorelli@gmail.com>
Date: Tue, 25 Sep 2018 11:36:35 -0400
Subject: react-native: fix table in README (#7159)

Fixes the broken bottom "Logging" section of the table
---
 plugins/react-native/README.md | 1 -
 1 file changed, 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/react-native/README.md b/plugins/react-native/README.md
index ebe1be0e0..d1fce0fc2 100644
--- a/plugins/react-native/README.md
+++ b/plugins/react-native/README.md
@@ -33,7 +33,6 @@ plugins=(... react-native)
 | **rniosxs**   | `react-native run-ios --simulator "iPhone XS"`     |
 | **rniosxsm**  | `react-native run-ios --simulator "iPhone XS Max"` |
 | **rniosxr**   | `react-native run-ios --simulator "iPhone XR"`     |
-
 | _Logging_     |
 | **rnland**    | `react-native log-android`                         |
 | **rnlios**    | `react-native log-ios`                             |
-- 
cgit v1.2.3-70-g09d2


From b4007b54000d9ea681d69bb5e3dba0fdddaa91d9 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Wed, 26 Sep 2018 23:59:57 +0200
Subject: git-auto-fetch: small README fixes

---
 plugins/git-auto-fetch/README.md | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'plugins')

diff --git a/plugins/git-auto-fetch/README.md b/plugins/git-auto-fetch/README.md
index 04f1c9445..35f3c2f71 100644
--- a/plugins/git-auto-fetch/README.md
+++ b/plugins/git-auto-fetch/README.md
@@ -1,9 +1,11 @@
-# Git auto fetch
+# Git auto-fetch
 
 Automatically fetches all changes from all remotes while you are working in git-initialized directory.
 
-####Usage
-Add ```git-auto-fetch``` to the plugins array in your zshrc file:
+#### Usage
+
+Add `git-auto-fetch` to the plugins array in your zshrc file:
+
 ```shell
 plugins=(... git-auto-fetch)
 ```
@@ -14,10 +16,10 @@ You can change fetch interval in your .zshrc:
 ```
 GIT_AUTO_FETCH_INTERVAL=1200 #in seconds
 ```
-Log of ```git fetch --all``` will be saved into .git/FETCH_LOG
+Log of `git fetch --all` will be saved into `.git/FETCH_LOG`
 
 
-####Toggle auto fetch per folder
+#### Toggle auto fetch per folder
 If you are using mobile connection or for any other reason you can disable git-auto-fetch for any folder:
 
 ```shell
-- 
cgit v1.2.3-70-g09d2


From 23688fc7ab925111fdb0db07670b6b641e380ec9 Mon Sep 17 00:00:00 2001
From: Iulian Onofrei <6d0847b9@opayq.com>
Date: Sat, 29 Sep 2018 17:01:41 +0300
Subject: Add option to color any help command

This allows you to use `colored git log --help` for example, to get
colored output.
---
 plugins/colored-man-pages/colored-man-pages.plugin.zsh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/colored-man-pages/colored-man-pages.plugin.zsh b/plugins/colored-man-pages/colored-man-pages.plugin.zsh
index 1bea536e0..ac6a94654 100644
--- a/plugins/colored-man-pages/colored-man-pages.plugin.zsh
+++ b/plugins/colored-man-pages/colored-man-pages.plugin.zsh
@@ -16,7 +16,7 @@ EOF
 	fi
 fi
 
-function man() {
+function colored() {
 	env \
 		LESS_TERMCAP_mb=$(printf "\e[1;31m") \
 		LESS_TERMCAP_md=$(printf "\e[1;31m") \
@@ -28,5 +28,9 @@ function man() {
 		PAGER="${commands[less]:-$PAGER}" \
 		_NROFF_U=1 \
 		PATH="$HOME/bin:$PATH" \
-			man "$@"
+			"$@"
+}
+
+function man() {
+	colored man "$@"
 }
-- 
cgit v1.2.3-70-g09d2


From 441595d036cb88555793806cd2a77744dc849de3 Mon Sep 17 00:00:00 2001
From: Griko Nibras <grikomsn@gmail.com>
Date: Mon, 1 Oct 2018 17:05:34 +0700
Subject: sudo: add README file (#7177)

---
 plugins/sudo/README.md | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 plugins/sudo/README.md

(limited to 'plugins')

diff --git a/plugins/sudo/README.md b/plugins/sudo/README.md
new file mode 100644
index 000000000..ebfdfd10d
--- /dev/null
+++ b/plugins/sudo/README.md
@@ -0,0 +1,57 @@
+# sudo
+
+Easily prefix your current or previous commands with `sudo` by pressing <kbd>esc</kbd> twice
+
+## Enabling the plugin
+
+1.  Open your `.zshrc` file and add `sudo` in the plugins section:
+
+    ```zsh
+    plugins=(
+        # all your enabled plugins
+        sudo
+    )
+    ```
+
+2.  Reload the source file or restart your Terminal session:
+
+    ```console
+    $ source ~/.zshrc
+    $
+    ```
+
+## Usage examples
+
+### Current typed commands
+
+Say you have typed a long command and forgot to add `sudo` in front:
+
+```console
+$ apt-get install build-essential
+```
+
+By pressing the <kbd>esc</kbd> key twice, you will have the same command with `sudo` prefixed without typing:
+
+```console
+$ sudo apt-get install build-essential
+```
+
+### Previous executed commands
+
+Say you want to delete a system file and denied:
+
+```console
+$ rm some-system-file.txt
+-su: some-system-file.txt: Permission denied
+$
+```
+
+By pressing the <kbd>esc</kbd> key twice, you will have the same command with `sudo` prefixed without typing:
+
+```console
+$ rm some-system-file.txt
+-su: some-system-file.txt: Permission denied
+$ sudo rm some-system-file.txt
+Password:
+$
+```
-- 
cgit v1.2.3-70-g09d2


From 7f96f4476c922b037eb287af2e727e17653db1ef Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Mon, 1 Oct 2018 12:14:15 +0200
Subject: jenv: update README

---
 plugins/jenv/README.md | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/jenv/README.md b/plugins/jenv/README.md
index 8899d21ae..c043c626e 100644
--- a/plugins/jenv/README.md
+++ b/plugins/jenv/README.md
@@ -1,9 +1,9 @@
 # jenv plugin
 
 [jenv](https://www.jenv.be/) is a Java version manager similiar to [rbenv](https://github.com/rbenv/rbenv)
-and [pyenv]|(https://github.com/yyuu/pyenv).
+and [pyenv](https://github.com/yyuu/pyenv).
 
-This plugin initializes jenv and adds provides the jenv_prompt_info function to add Java
+This plugin initializes jenv and provides the `jenv_prompt_info` function to add Java
 version information to prompts.
 
 To use, add `jenv` to your plugins array in your zshrc file:
@@ -11,3 +11,17 @@ To use, add `jenv` to your plugins array in your zshrc file:
 ```zsh
 plugins=(... jenv)
 ```
+
+## Theme example
+
+You can modify your `$PROMPT` or `$RPROMPT` variables to run `jenv_prompt_info`.
+
+For example:
+```
+PROMPT="%~$ "
+RPROMPT='$(jenv_prompt_info)'
+```
+changes your prompt to:
+```
+~/java/project$ ▋                                       oracle64-1.6.0.39
+```
-- 
cgit v1.2.3-70-g09d2


From 86fc391f8cd18ba2227dd00b48b1746de89341a8 Mon Sep 17 00:00:00 2001
From: David McKissick <dwm0816@outlook.com>
Date: Mon, 1 Oct 2018 03:37:59 -0700
Subject: iwhois: add README (#7176)

---
 plugins/iwhois/README.md         | 24 ++++++++++++++++++++++++
 plugins/iwhois/iwhois.plugin.zsh |  3 ---
 2 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 plugins/iwhois/README.md

(limited to 'plugins')

diff --git a/plugins/iwhois/README.md b/plugins/iwhois/README.md
new file mode 100644
index 000000000..1626b8524
--- /dev/null
+++ b/plugins/iwhois/README.md
@@ -0,0 +1,24 @@
+# iwhois
+
+Provides a whois command with a more accurate and up-to-date list of whois servers
+using CNAMES, via [whois.geek.nz](https://github.com/iwantmyname/whois.geek.nz).
+
+To use it, add iwhois to the plugins array of your zshrc file:
+```
+plugins=(... iwhois)
+```
+
+### Usage
+
+The plugin defines the function `iwhois` that takes a domain name as an argument:
+
+```
+$ iwhois github.com
+   Domain Name: GITHUB.COM
+   Registry Domain ID: 1264983250_DOMAIN_COM-VRSN
+   Registrar WHOIS Server: whois.markmonitor.com
+   Registrar URL: http://www.markmonitor.com
+   Updated Date: 2017-06-26T16:02:39Z
+   Creation Date: 2007-10-09T18:20:50Z
+   ...
+```
diff --git a/plugins/iwhois/iwhois.plugin.zsh b/plugins/iwhois/iwhois.plugin.zsh
index 38790bf28..22a75eec1 100644
--- a/plugins/iwhois/iwhois.plugin.zsh
+++ b/plugins/iwhois/iwhois.plugin.zsh
@@ -1,6 +1,3 @@
-# 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}'`
-- 
cgit v1.2.3-70-g09d2


From 6dcea3deca431649dd715aad8c16038751e5a923 Mon Sep 17 00:00:00 2001
From: Saurav Jaiswal <sauravjaiswal999@gmail.com>
Date: Mon, 1 Oct 2018 20:15:56 +0530
Subject: fedora: add README and deprecation warning (#7178)

---
 plugins/fedora/README.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 plugins/fedora/README.md

(limited to 'plugins')

diff --git a/plugins/fedora/README.md b/plugins/fedora/README.md
new file mode 100644
index 000000000..6594799b3
--- /dev/null
+++ b/plugins/fedora/README.md
@@ -0,0 +1 @@
+The fedora plugin is deprecated. Use the [dnf plugin](https://github.com/robbyrussell/oh-my-zsh/tree/master/plugins/dnf) instead.
-- 
cgit v1.2.3-70-g09d2


From ca8c7bad1419b65ba4d64fbb838cad1f592cb539 Mon Sep 17 00:00:00 2001
From: Brian Mitchell <bman4789@gmail.com>
Date: Tue, 2 Oct 2018 01:10:03 -0500
Subject: brew: add README (#7183)

---
 plugins/brew/README.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 plugins/brew/README.md

(limited to 'plugins')

diff --git a/plugins/brew/README.md b/plugins/brew/README.md
new file mode 100644
index 000000000..d50dfc219
--- /dev/null
+++ b/plugins/brew/README.md
@@ -0,0 +1,19 @@
+# brew plugin
+
+The plugin adds several aliases for common [brew](https://brew.sh) commands.
+
+To use it, add `brew` to the plugins array of your zshrc file:
+```
+plugins=(... brew)
+```
+
+## Aliases
+
+| Alias  | Command              | Description   |
+|--------|----------------------|---------------|
+| brewp  | `brew pin`           | Pin a specified formulae, preventing them from being upgraded when issuing the brew upgrade <formulae> command. |
+| brews  | `brew list -1`       | List installed formulae, one entry per line, or the installed files for a given formulae. |
+| brewsp | `brew list --pinned` | Show the versions of pinned formulae, or only the specified (pinned) formulae if formulae are given. |
+| bubo   | `brew update && brew outdated` | Fetch the newest version of Homebrew and all formulae, then list outdated formulae. |
+| bubc   | `brew upgrade && brew cleanup` | Upgrade outdated, unpinned brews (with existing install options), then removes stale lock files and outdated downloads for formulae and casks, and removes old versions of installed formulae. |
+| bubo   | `bubo && bubc`       | Updates Homebrew, lists outdated formulae, upgrades oudated and unpinned formulae, and removes stale and outdated downloads and versions. |
-- 
cgit v1.2.3-70-g09d2


From 28b5ec644c8c04dab6578d821b850f48b0925598 Mon Sep 17 00:00:00 2001
From: Alexandre Jacques <alexandre.jacques@enabling.com.br>
Date: Tue, 2 Oct 2018 04:00:33 -0300
Subject: django: add README (#7181)

---
 plugins/django/README.md | 56 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 plugins/django/README.md

(limited to 'plugins')

diff --git a/plugins/django/README.md b/plugins/django/README.md
new file mode 100644
index 000000000..415f6b7ea
--- /dev/null
+++ b/plugins/django/README.md
@@ -0,0 +1,56 @@
+# Django plugin
+
+This plugin adds completion and hints for the [Django Project](https://www.djangoproject.com/) `manage.py` commands
+and options.
+
+To use it, add `django` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... django)
+```
+
+## Usage
+
+```zsh
+$> python manage.py (press <TAB> here)
+```
+
+Would result in:
+
+```zsh
+cleanup                    -- remove old data from the database
+compilemessages            -- compile .po files to .mo for use with gettext
+createcachetable           -- creates table for SQL cache backend
+createsuperuser            -- create a superuser
+dbshell                    -- run command-line client for the current database
+diffsettings               -- display differences between the current settings and Django defaults
+dumpdata                   -- output contents of database as a fixture
+flush                      -- execute 'sqlflush' on the current database
+inspectdb                  -- output Django model module for tables in database
+loaddata                   -- install the named fixture(s) in the database
+makemessages               -- pull out all strings marked for translation
+reset                      -- executes 'sqlreset' for the given app(s)
+runfcgi                    -- run this project as a fastcgi
+runserver                  -- start a lightweight web server for development
+...
+```
+
+If you want to see the options available for a specific command, try:
+
+```zsh
+$> python manage.py makemessages (press <TAB> here)
+```
+
+And that would result in:
+
+```zsh
+--all         -a  -- re-examine all code and templates
+--domain      -d  -- domain of the message files (default: "django")
+--extensions  -e  -- file extension(s) to examine (default: ".html")
+--help            -- display help information
+--locale      -l  -- locale to process (default: all)
+--pythonpath      -- directory to add to the Python path
+--settings        -- python path to settings module
+...
+```
+
-- 
cgit v1.2.3-70-g09d2


From 8bc9f23b7cb85108754ea402a02d7ebf0041175f Mon Sep 17 00:00:00 2001
From: Rubén Durán Balda <ruduran@users.noreply.github.com>
Date: Tue, 2 Oct 2018 09:01:49 +0200
Subject: brew: fix typo in README (#7184)

---
 plugins/brew/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/brew/README.md b/plugins/brew/README.md
index d50dfc219..aab55ea39 100644
--- a/plugins/brew/README.md
+++ b/plugins/brew/README.md
@@ -16,4 +16,4 @@ plugins=(... brew)
 | brewsp | `brew list --pinned` | Show the versions of pinned formulae, or only the specified (pinned) formulae if formulae are given. |
 | bubo   | `brew update && brew outdated` | Fetch the newest version of Homebrew and all formulae, then list outdated formulae. |
 | bubc   | `brew upgrade && brew cleanup` | Upgrade outdated, unpinned brews (with existing install options), then removes stale lock files and outdated downloads for formulae and casks, and removes old versions of installed formulae. |
-| bubo   | `bubo && bubc`       | Updates Homebrew, lists outdated formulae, upgrades oudated and unpinned formulae, and removes stale and outdated downloads and versions. |
+| bubu   | `bubo && bubc`       | Updates Homebrew, lists outdated formulae, upgrades oudated and unpinned formulae, and removes stale and outdated downloads and versions. |
-- 
cgit v1.2.3-70-g09d2


From 69bd9ab3f040a8ad55b59cbd306aa91852184064 Mon Sep 17 00:00:00 2001
From: Zach Whitten <zwhitten+github@gmail.com>
Date: Tue, 2 Oct 2018 13:58:14 -0400
Subject: mix: add README (#7185)

---
 plugins/mix/README.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 plugins/mix/README.md

(limited to 'plugins')

diff --git a/plugins/mix/README.md b/plugins/mix/README.md
new file mode 100644
index 000000000..63476dd6b
--- /dev/null
+++ b/plugins/mix/README.md
@@ -0,0 +1,18 @@
+# Mix plugin
+
+This plugin adds completions for the [Elixir's Mix build tool](https://hexdocs.pm/mix/Mix.html).
+
+To use it, add `mix` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... mix)
+```
+## Supported Task Types
+
+| Task Type               | Documentation                                            |
+|-------------------------|----------------------------------------------------------|
+| Elixir                  | [Elixir Lang](https://elixir-lang.org/)                  |
+| Phoenix v1.2.1 and below| [Phoenix](https://hexdocs.pm/phoenix/1.2.1/Phoenix.html) |
+| Phoenix v1.3.0 and above| [Phoenix](https://hexdocs.pm/phoenix/Phoenix.html)       |
+| Ecto                    | [Ecto](https://hexdocs.pm/ecto/Ecto.html)                |
+| Hex                     | [Hex](https://hex.pm/)                                   |
-- 
cgit v1.2.3-70-g09d2


From 64e262ea48e2cc7b3d3c861883323cc4fb250a80 Mon Sep 17 00:00:00 2001
From: Patrick Stegmann <wonderb0lt@users.noreply.github.com>
Date: Tue, 2 Oct 2018 20:53:38 +0200
Subject: kubectl: add kga and kgaa aliases (#6744)

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

(limited to 'plugins')

diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index 680ec1a8c..4a6e5b53a 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -65,7 +65,11 @@ alias krh='kubectl rollout history'
 alias kru='kubectl rollout undo'
 
 # Port forwarding
-alias kpf="k port-forward"
+alias kpf="kubectl port-forward"
+
+# Tools for accessing all information
+alias kga='kubectl get all'
+alias kgaa='kubectl get all --all-namespaces'
 
 # Logs
 alias kl='kubectl logs'
-- 
cgit v1.2.3-70-g09d2


From e5915858eb7f3119b8e292afe2d8aef8e58e34fa Mon Sep 17 00:00:00 2001
From: Benjamin Krein <superbenk@gmail.com>
Date: Tue, 2 Oct 2018 14:55:45 -0400
Subject: kubectl: add aliases for namespaces and configmaps (#7102)

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

(limited to 'plugins')

diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index 4a6e5b53a..832a482e4 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -46,6 +46,18 @@ alias kei='kubectl edit ingress'
 alias kdi='kubectl describe ingress'
 alias kdeli='kubectl delete ingress'
 
+# Namespace management
+alias kgns='kubectl get namespaces'
+alias kens='kubectl edit namespace'
+alias kdns='kubectl describe namespace'
+alias kdelns='kubectl delete namespace'
+
+# ConfigMap management
+alias kgcm='kubectl get configmaps'
+alias kecm='kubectl edit configmap'
+alias kdcm='kubectl describe configmap'
+alias kdelcm='kubectl delete configmap'
+
 # Secret management
 alias kgsec='kubectl get secret'
 alias kdsec='kubectl describe secret'
-- 
cgit v1.2.3-70-g09d2


From 7e93b8409f40e38f20aafed26570ed8c54a70e0a Mon Sep 17 00:00:00 2001
From: Serdar Dalgıç <serdardalgic@users.noreply.github.com>
Date: Tue, 2 Oct 2018 21:14:28 +0200
Subject: kubectl: add aliases for delete and watch/wide options (#6790)

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

(limited to 'plugins')

diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index 832a482e4..59601f413 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -25,8 +25,14 @@ alias kcsc='kubectl config set-context'
 alias kcdc='kubectl config delete-context'
 alias kccc='kubectl config current-context'
 
+# General aliases
+alias kdel='kubectl delete'
+alias kdelf='kubectl delete -f'
+
 # Pod management.
 alias kgp='kubectl get pods'
+alias kgpw='kgp --watch'
+alias kgpwide='kgp -o wide'
 alias kep='kubectl edit pods'
 alias kdp='kubectl describe pods'
 alias kdelp='kubectl delete pods'
@@ -36,6 +42,8 @@ alias kgpl='function _kgpl(){ label=$1; shift; kgp -l $label $*; };_kgpl'
 
 # Service management.
 alias kgs='kubectl get svc'
+alias kgsw='kgs --watch'
+alias kgswide='kgs -o wide'
 alias kes='kubectl edit svc'
 alias kds='kubectl describe svc'
 alias kdels='kubectl delete svc'
@@ -65,6 +73,8 @@ alias kdelsec='kubectl delete secret'
 
 # Deployment management.
 alias kgd='kubectl get deployment'
+alias kgdw='kgd --watch'
+alias kgdwide='kgd -o wide'
 alias ked='kubectl edit deployment'
 alias kdd='kubectl describe deployment'
 alias kdeld='kubectl delete deployment'
-- 
cgit v1.2.3-70-g09d2


From a8e69686aa6c782eed3d749de5fb54758de10734 Mon Sep 17 00:00:00 2001
From: gramps <richmoyer@gmail.com>
Date: Tue, 2 Oct 2018 14:16:50 -0500
Subject: chucknorris: add README (#7186)

---
 plugins/chucknorris/README.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 plugins/chucknorris/README.md

(limited to 'plugins')

diff --git a/plugins/chucknorris/README.md b/plugins/chucknorris/README.md
new file mode 100644
index 000000000..be7b97e24
--- /dev/null
+++ b/plugins/chucknorris/README.md
@@ -0,0 +1,20 @@
+# chucknorris
+
+Chuck Norris fortunes plugin for oh-my-zsh
+
+**Maintainers**: [apjanke](https://github.com/apjanke) [maff](https://github.com/maff)
+
+To use it add `chucknorris` to the plugins array in you zshrc file.
+
+```zsh
+plugins=(... chucknorris)
+```
+
+
+Depends on fortune (and cowsay if using chuck_cow) being installed (available via homebrew, apt, ...). Perfectly suitable as MOTD.
+
+
+| Command     | Description                     |
+| ----------- | ------------------------------- |
+| `chuck`     | Print random Chuck Norris quote |
+| `chuck_cow` | Print quote in cowthink         |
-- 
cgit v1.2.3-70-g09d2


From b67883f9632932dde00c09498eb44ee4f3628288 Mon Sep 17 00:00:00 2001
From: gramps <richmoyer@gmail.com>
Date: Tue, 2 Oct 2018 14:22:59 -0500
Subject: Create README.md

---
 plugins/tmuxinator/README.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 plugins/tmuxinator/README.md

(limited to 'plugins')

diff --git a/plugins/tmuxinator/README.md b/plugins/tmuxinator/README.md
new file mode 100644
index 000000000..25631d095
--- /dev/null
+++ b/plugins/tmuxinator/README.md
@@ -0,0 +1,18 @@
+# Tmuxinator plugin
+
+This plugin provides 4 aliases for tmuxinator commands.
+
+To use it add `tmuxinator` to the plugins array in your zshrc file.
+
+```zsh
+plugins=(... tmuxinator)
+```
+
+## Aliases
+
+| Alias  | Command          | Description              |
+| ------ | ---------------- | ------------------------ |
+| `txs ` | tmuxinator start | Start                    |
+| `txo ` | tmuxinator open  | Open project for editing |
+| `txn ` | tmuxinator new   | Create project           |
+| `txl ` | tmuxinator list  | List projects            |
-- 
cgit v1.2.3-70-g09d2


From ac3b345365354252b7c264d5ff4fe6957c11798d Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 2 Oct 2018 21:31:26 +0200
Subject: dircycle: trigger appropriate hooks after directory change (#7161)

This commit triggers precmd and chpwd hook functions iff we changed directory.

This has the same behavior as zsh's hook function execution, which tries to run
the functions in the order specified and silently ignores any function that
does not exist.

See http://zsh.sourceforge.net/Doc/Release/Functions.html#Hook-Functions

Also moved duplicate nopushdminus logic to the `switch-to-dir` function.
---
 plugins/dircycle/dircycle.plugin.zsh | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'plugins')

diff --git a/plugins/dircycle/dircycle.plugin.zsh b/plugins/dircycle/dircycle.plugin.zsh
index 8c58cab4c..bb69f6b3f 100644
--- a/plugins/dircycle/dircycle.plugin.zsh
+++ b/plugins/dircycle/dircycle.plugin.zsh
@@ -9,31 +9,36 @@
 #  pushd -N: start counting from right of `dirs' output
 
 switch-to-dir () {
-	[[ ${#dirstack} -eq 0 ]] && return
+	setopt localoptions nopushdminus
+	[[ ${#dirstack} -eq 0 ]] && return 1
 
 	while ! builtin pushd -q $1 &>/dev/null; do
 		# We found a missing directory: pop it out of the dir stack
 		builtin popd -q $1
 
 		# Stop trying if there are no more directories in the dir stack
-		[[ ${#dirstack} -eq 0 ]] && break
+		[[ ${#dirstack} -eq 0 ]] && return 1
 	done
 }
 
 insert-cycledleft () {
-	emulate -L zsh
-	setopt nopushdminus
+	switch-to-dir +1 || return
 
-	switch-to-dir +1
+	local fn
+	for fn (chpwd $chpwd_functions precmd $precmd_functions); do
+		(( $+functions[$fn] )) && $fn
+	done
 	zle reset-prompt
 }
 zle -N insert-cycledleft
 
 insert-cycledright () {
-	emulate -L zsh
-	setopt nopushdminus
+	switch-to-dir -0 || return
 
-	switch-to-dir -0
+	local fn
+	for fn (chpwd $chpwd_functions precmd $precmd_functions); do
+		(( $+functions[$fn] )) && $fn
+	done
 	zle reset-prompt
 }
 zle -N insert-cycledright
-- 
cgit v1.2.3-70-g09d2


From ca3984759afb4d9aa1fb02beb8a3571d3206435c Mon Sep 17 00:00:00 2001
From: gramps <richmoyer@gmail.com>
Date: Tue, 2 Oct 2018 14:40:26 -0500
Subject: suse: add README (#7187)

---
 plugins/suse/README.md       | 90 ++++++++++++++++++++++++++++++++++++++++++
 plugins/suse/suse.plugin.zsh | 94 ++++++++++++++++++++++----------------------
 2 files changed, 136 insertions(+), 48 deletions(-)
 create mode 100644 plugins/suse/README.md

(limited to 'plugins')

diff --git a/plugins/suse/README.md b/plugins/suse/README.md
new file mode 100644
index 000000000..0e8a7f7ba
--- /dev/null
+++ b/plugins/suse/README.md
@@ -0,0 +1,90 @@
+# suse
+
+**Maintainer**: [r-darwish](https://github.com/r-darwish)
+
+ Alias for Zypper according to the official Zypper's alias
+
+ To use it add `suse` to the plugins array in you zshrc file.
+
+```zsh
+plugins=(... suse)
+```
+
+## Main commands
+
+| Alias            | Commands                      | Description                                                    |
+| ---------------- | ----------------------------- | -------------------------------------------------------------- |
+| z                | `sudo zypper`                 | call zypper                                                    |
+| zh               | `sudo zypper -h`              | print help                                                     |
+| zhse             | `sudo zypper -h se`           | print help for the search command                              |
+| zlicenses        | `sudo zypper licenses`        | prints a report about licenses and EULAs of installed packages |
+| zps              | `sudo zypper ps`              | list process using deleted files                               |
+| zshell           | `sudo zypper shell`           | open a zypper shell session                                    |
+| zsource-download | `sudo zypper source-download` | download source rpms for all installed packages                |
+| ztos             | `sudo zypper tos`             | shows  the  ID string of the target operating system           |
+| zvcmp            | `sudo zypper vcmp`            | tell whether version1 is older or newer than version2          |
+
+## Packages commands
+
+| Alias | Commands          | Description                                                        |
+| ----- | ----------------- | ------------------------------------------------------------------ |
+| zin   | `sudo zypper in`  | install packages                                                   |
+| zinr  | `sudo zypper inr` | install newly added packages recommended by already installed ones |
+| zrm   | `sudo zypper rm`  | remove packages                                                    |
+| zsi   | `sudo zypper si`  | install source of a package                                        |
+| zve   | `sudo zypper ve`  | verify dependencies of installed packages                          |
+
+## Updates commands
+
+| Alias  | Commands            | Description            |
+| ------ | ------------------- | ---------------------- |
+| zdup   | `sudo zypper dup`   | upgrade packages       |
+| zlp    | `sudo zypper lp`    | list necessary patches |
+| zlu    | `sudo zypper lu`    | list updates           |
+| zpchk  | `sudo zypper pchk`  | check for patches      |
+| zup    | `sudo zypper up`    | update packages        |
+| zpatch | `sudo zypper patch` | install patches        |
+
+## Request commands
+
+| Alias         | Commands                   | Description                                          |
+| ------------- | -------------------------- | ---------------------------------------------------- |
+| zif           | `sudo zypper if`           | display info about packages                          |
+| zpa           | `sudo zypper pa`           | list packages                                        |
+| zpatch-info   | `sudo zypper patch-info`   | display info about patches                           |
+| zpattern-info | `sudo zypper pattern-info` | display info about patterns                          |
+| zproduct-info | `sudo zypper product-info` | display info about products                          |
+| zpch          | `sudo zypper pch`          | list all patches                                     |
+| zpd           | `sudo zypper pd`           | list products                                        |
+| zpt           | `sudo zypper pt`           | list patterns                                        |
+| zse           | `sudo zypper se`           | search for packages                                  |
+| zwp           | `sudo zypper wp`           | list all packages providing the specified capability |
+
+## Repositories commands
+
+| Alias | Commands            | Description                              |
+| ----- | ------------------- | ---------------------------------------- |
+| zar   | `sudo zypper ar`    | add a repository                         |
+| zcl   | `sudo zypper clean` | clean cache                              |
+| zlr   | `sudo zypper lr`    | list repositories                        |
+| zmr   | `sudo zypper mr`    | modify repositories                      |
+| znr   | `sudo zypper nr`    | rename repositories (for the alias only) |
+| zref  | `sudo zypper ref`   | refresh repositories                     |
+| zrr   | `sudo zypper rr`    | remove repositories                      |
+
+## Services commands
+| Alias | Commands           | Description                                                    |
+| ----- | ------------------ | -------------------------------------------------------------- |
+| zas   | `sudo zypper as`   | adds a service specified by URI to the system                  |
+| zms   | `sudo zypper ms`   | modify properties of specified services                        |
+| zrefs | `sudo zypper refs` | refreshing a service mean executing the service's special task |
+| zrs   | `sudo zypper rs`   | remove specified repository index service from the system      |
+| zls   | `sudo zypper ls`   | list services defined on the system                            |
+
+## Package Locks Management commands
+| Alias | Commands         | Description                         |
+| ----- | ---------------- | ----------------------------------- |
+| zal   | `sudo zypper al` | add a package lock                  |
+| zcl   | `sudo zypper cl` | remove unused locks                 |
+| zll   | `sudo zypper ll` | list currently active package locks |
+| zrl   | `sudo zypper rl` | remove specified package lock       |
diff --git a/plugins/suse/suse.plugin.zsh b/plugins/suse/suse.plugin.zsh
index f7215528b..60f7042eb 100644
--- a/plugins/suse/suse.plugin.zsh
+++ b/plugins/suse/suse.plugin.zsh
@@ -1,61 +1,59 @@
-#Alias for Zypper according to the official Zypper's alias
-
 #Main commands
-alias z='sudo zypper' #call zypper
-alias zh='sudo zypper -h' #print help
-alias zhse='sudo zypper -h se' #print help for the search command
-alias zlicenses='sudo zypper licenses' #prints a report about licenses and EULAs of installed packages
-alias zps='sudo zypper ps' #list process using deleted files
-alias zshell='sudo zypper shell' #open a zypper shell session
-alias zsource-download='sudo zypper source-download' #download source rpms for all installed packages
-alias ztos='sudo zypper tos' #shows  the  ID string of the target operating system
-alias zvcmp='sudo zypper vcmp' #tell whether version1 is older or newer than version2
+alias z='sudo zypper'
+alias zh='sudo zypper -h'
+alias zhse='sudo zypper -h se'
+alias zlicenses='sudo zypper licenses'
+alias zps='sudo zypper ps'
+alias zshell='sudo zypper shell'
+alias zsource-download='sudo zypper source-download'
+alias ztos='sudo zypper tos'
+alias zvcmp='sudo zypper vcmp'
 
 #Packages commands
-alias zin='sudo zypper in' #install packages
-alias zinr='sudo zypper inr' #install newly added packages recommended by already installed ones
-alias zrm='sudo zypper rm' #remove packages
-alias zsi='sudo zypper si' #install source of a package
-alias zve='sudo zypper ve' #verify dependencies of installed packages
+alias zin='sudo zypper in'
+alias zinr='sudo zypper inr'
+alias zrm='sudo zypper rm'
+alias zsi='sudo zypper si'
+alias zve='sudo zypper ve'
 
 #Updates commands
-alias zdup='sudo zypper dup' #upgrade packages
-alias zlp='sudo zypper lp' #list necessary patchs
-alias zlu='sudo zypper lu' #list updates
-alias zpchk='sudo zypper pchk' #check for patches
-alias zup='sudo zypper up' #update packages
-alias zpatch='sudo zypper patch' #install patches
+alias zdup='sudo zypper dup'
+alias zlp='sudo zypper lp'
+alias zlu='sudo zypper lu'
+alias zpchk='sudo zypper pchk'
+alias zup='sudo zypper up'
+alias zpatch='sudo zypper patch'
 
 #Request commands
-alias zif='sudo zypper if' #display info about packages
-alias zpa='sudo zypper pa' #list packages
-alias zpatch-info='sudo zypper patch-info' #display info about patches
-alias zpattern-info='sudo zypper patch-info' #display info about patterns
-alias zproduct-info='sudo zypper patch-info' #display info about products
-alias zpch='sudo zypper pch' #list all patches
-alias zpd='sudo zypper pd' #list products
-alias zpt='sudo zypper pt' #list patterns
-alias zse='sudo zypper se' #search for packages
-alias zwp='sudo zypper wp' #list all packages providing the specified capability
+alias zif='sudo zypper if'
+alias zpa='sudo zypper pa'
+alias zpatch-info='sudo zypper patch-info'
+alias zpattern-info='sudo zypper pattern-info'
+alias zproduct-info='sudo zypper product-info'
+alias zpch='sudo zypper pch'
+alias zpd='sudo zypper pd'
+alias zpt='sudo zypper pt'
+alias zse='sudo zypper se'
+alias zwp='sudo zypper wp'
 
 #Repositories commands
-alias zar='sudo zypper ar' #add a repository
-alias zcl='sudo zypper clean' #clean cache
-alias zlr='sudo zypper lr' #list repositories
-alias zmr='sudo zypper mr' #modify repositories
-alias znr='sudo zypper nr' #rename repositories (for the alias only)
-alias zref='sudo zypper ref' #refresh repositories
-alias zrr='sudo zypper rr' #remove repositories
+alias zar='sudo zypper ar'
+alias zcl='sudo zypper clean'
+alias zlr='sudo zypper lr'
+alias zmr='sudo zypper mr'
+alias znr='sudo zypper nr'
+alias zref='sudo zypper ref'
+alias zrr='sudo zypper rr'
 
 #Services commands
-alias zas='sudo zypper as' #adds a service specified by URI to the system
-alias zms='sudo zypper ms' #modify properties of specified services
-alias zrefs='sudo zypper refs' #refreshing a service mean executing the service's special task
-alias zrs='sudo zypper rs' #remove specified repository index service from the system
-alias zls='sudo zypper ls' #list services defined on the system
+alias zas='sudo zypper as'
+alias zms='sudo zypper ms'
+alias zrefs='sudo zypper refs'
+alias zrs='sudo zypper rs'
+alias zls='sudo zypper ls'
 
 #Package Locks Management commands
-alias zal='sudo zypper al' #add a package lock
-alias zcl='sudo zypper cl' #Remove unused locks
-alias zll='sudo zypper ll' #list currently active package locks
-alias zrl='sudo zypper rl' #remove specified package lock
+alias zal='sudo zypper al'
+alias zcl='sudo zypper cl'
+alias zll='sudo zypper ll'
+alias zrl='sudo zypper rl'
-- 
cgit v1.2.3-70-g09d2


From 2c559a496c7ca95e04b4d5cc0b71334a0f10a2c3 Mon Sep 17 00:00:00 2001
From: gramps <richmoyer@gmail.com>
Date: Tue, 2 Oct 2018 14:44:06 -0500
Subject: rsync: add README (#7188)

---
 plugins/rsync/README.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 plugins/rsync/README.md

(limited to 'plugins')

diff --git a/plugins/rsync/README.md b/plugins/rsync/README.md
new file mode 100644
index 000000000..032ee7f3b
--- /dev/null
+++ b/plugins/rsync/README.md
@@ -0,0 +1,16 @@
+# rsync
+
+This plugin adds aliases for frequent [rsync](https://rsync.samba.org/) commands.
+
+To use it add `rsync` to the plugins array in you zshrc file.
+
+```zsh
+plugins=(... rsync)
+```
+
+| Alias               | Command                                          |
+| ------------------- | ------------------------------------------------ |
+| *rsync-copy*        | `rsync -avz --progress -h`                       |
+| *rsync-move*        | `rsync -avz --progress -h --remove-source-files` |
+| *rsync-update*      | `rsync -avzu --progress -h`                      |
+| *rsync-synchronize* | `rsync -avzu --delete --progress -h`             |
-- 
cgit v1.2.3-70-g09d2


From 3ed19ce45ebcc4bcdff57e0c30f2335af9f40869 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 2 Oct 2018 21:49:06 +0200
Subject: added completion and link

---
 plugins/tmuxinator/README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/tmuxinator/README.md b/plugins/tmuxinator/README.md
index 25631d095..994d8d46d 100644
--- a/plugins/tmuxinator/README.md
+++ b/plugins/tmuxinator/README.md
@@ -1,6 +1,7 @@
 # Tmuxinator plugin
 
-This plugin provides 4 aliases for tmuxinator commands.
+This plugin provides completion for [tmuxinator](https://github.com/tmuxinator/tmuxinator),
+as well as aliases for frequent tmuxinator commands.
 
 To use it add `tmuxinator` to the plugins array in your zshrc file.
 
@@ -12,7 +13,7 @@ plugins=(... tmuxinator)
 
 | Alias  | Command          | Description              |
 | ------ | ---------------- | ------------------------ |
-| `txs ` | tmuxinator start | Start                    |
+| `txs ` | tmuxinator start | Start Tmuxinator         |
 | `txo ` | tmuxinator open  | Open project for editing |
 | `txn ` | tmuxinator new   | Create project           |
 | `txl ` | tmuxinator list  | List projects            |
-- 
cgit v1.2.3-70-g09d2


From 5cf46edef39649f6d75b9553318786de247c4e99 Mon Sep 17 00:00:00 2001
From: Fernando <fernando82@gmail.com>
Date: Tue, 2 Oct 2018 16:54:43 -0300
Subject: vscode: rename vsce and vsced aliases (#7190)

Changed aliases from
```
alias vsce='code --extensions-dir'
alias vsced='code --disable-extensions'
```
to
```
alias vsced='code --extensions-dir'
alias vscde='code --disable-extensions'
```

`vsce` is the command line to publish extensions:
https://code.visualstudio.com/docs/extensions/publish-extension
---
 plugins/vscode/README.md         | 4 ++--
 plugins/vscode/vscode.plugin.zsh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'plugins')

diff --git a/plugins/vscode/README.md b/plugins/vscode/README.md
index ef1fdea30..8ee45525a 100644
--- a/plugins/vscode/README.md
+++ b/plugins/vscode/README.md
@@ -25,7 +25,7 @@ plugins=(... vscode)
 
 | Alias                   | Command                                                          | Description                       |
 | ----------------------- | ---------------------------------------------------------------- | --------------------------------- |
-| vsce `dir`              | code --extensions-dir `dir`                                      | Set the root path for extensions. |
+| vsced `dir`             | code --extensions-dir `dir`                                      | Set the root path for extensions. |
 | vscie `id or vsix-path` | code --install-extension `extension-id> or <extension-vsix-path` | Installs an extension.            |
 | vscue `id or vsix-path` | code --uninstall-extension `id or vsix-path`                     | Uninstalls an extension.          |
 
@@ -35,4 +35,4 @@ plugins=(... vscode)
 | ------------ | ------------------------- | --------------------------------------------------------------------------------------------------------------------- |
 | vscv         | code --verbose            | Print verbose output (implies --wait).                                                                                |
 | vscl `level` | code --log `level`        | Log level to use. Default is 'info'. Allowed values are 'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off'. |
-| vsced        | code --disable-extensions | Disable all installed extensions.                                                                                     |
+| vscde        | code --disable-extensions | Disable all installed extensions.                                                                                     |
diff --git a/plugins/vscode/vscode.plugin.zsh b/plugins/vscode/vscode.plugin.zsh
index d0aad3b33..902c23ecf 100644
--- a/plugins/vscode/vscode.plugin.zsh
+++ b/plugins/vscode/vscode.plugin.zsh
@@ -10,10 +10,10 @@ alias vscr='code --reuse-window'
 alias vscw='code --wait'
 alias vscu='code --user-data-dir'
 
-alias vsce='code --extensions-dir'
+alias vsced='code --extensions-dir'
 alias vscie='code --install-extension'
 alias vscue='code --uninstall-extension'
 
 alias vscv='code --verbose'
 alias vscl='code --log'
-alias vsced='code --disable-extensions'
\ No newline at end of file
+alias vscde='code --disable-extensions'
-- 
cgit v1.2.3-70-g09d2


From 3db25d578ac8c0f4c3ca96a4242ba553f561557d Mon Sep 17 00:00:00 2001
From: Michal Mazur <michal@michalmazur.com>
Date: Tue, 2 Oct 2018 15:56:50 -0400
Subject: vagrant: fix typo in completion (#5846)

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

(limited to 'plugins')

diff --git a/plugins/vagrant/_vagrant b/plugins/vagrant/_vagrant
index a32347daa..a99a8f0e7 100644
--- a/plugins/vagrant/_vagrant
+++ b/plugins/vagrant/_vagrant
@@ -22,7 +22,7 @@ _1st_arguments=(
     'push:Deploys code in this environment to a configured destination'
     'rdp:Connects to machine via RDP'
     'reload:Reload the vagrant environment'
-    'resume:Resumes a suspend vagrant environment'
+    'resume:Resumes a suspended vagrant environment'
     'rsync:Syncs rsync synced folders to remote machine'
     'rsync-auto:Syncs rsync synced folders automatically when files change'
     'share:Shares your Vagrant environment with anyone in the world'
-- 
cgit v1.2.3-70-g09d2


From 0fdb911da0ac6f167c558af129a64211c1a560ee Mon Sep 17 00:00:00 2001
From: Sagar Patil <sagar010797@gmail.com>
Date: Wed, 3 Oct 2018 03:21:14 +0530
Subject: python: add README (#7191)

---
 plugins/python/README.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 plugins/python/README.md

(limited to 'plugins')

diff --git a/plugins/python/README.md b/plugins/python/README.md
new file mode 100644
index 000000000..2d955c5cb
--- /dev/null
+++ b/plugins/python/README.md
@@ -0,0 +1,16 @@
+# python plugin
+
+The plugin adds several aliases for useful [python](https://www.python.org/) commands.
+
+To use it, add `python` to the plugins array of your zshrc file:
+```
+plugins=(... python)
+```
+
+## Aliases
+
+| Command          | Description                                                                     |
+|------------------|---------------------------------------------------------------------------------|
+| `pyfind`         | Finds .py files recursively in the current directory                            |
+| `pyclean [dirs]` | Deletes byte-code and cache files from a list of directories or the current one |
+| `pygrep <text>`  | Looks for `text` in .py files                                                   |
-- 
cgit v1.2.3-70-g09d2


From 729339c7808f65b95d9fc68f67fed45336ec6eef Mon Sep 17 00:00:00 2001
From: Luiz Guilherme Fonseca Rosa <luizguilhermefr@gmail.com>
Date: Tue, 2 Oct 2018 21:37:02 -0300
Subject: Update laravel.plugin.zsh

Add some laravel aliases
---
 plugins/laravel/laravel.plugin.zsh | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'plugins')

diff --git a/plugins/laravel/laravel.plugin.zsh b/plugins/laravel/laravel.plugin.zsh
index ed932ee89..7ddfd85ba 100644
--- a/plugins/laravel/laravel.plugin.zsh
+++ b/plugins/laravel/laravel.plugin.zsh
@@ -1,3 +1,26 @@
 #!zsh
 alias artisan='php artisan'
 alias bob='php artisan bob::build'
+
+# Development
+alias pas='php artisan serve'
+
+# Database
+alias pam='php artisan migrate'
+alias pamf='php artisan migrate:fresh'
+alias pamfs='php artisan migrate:fresh --seed'
+alias pamr='php artisan migrate:rollback'
+alias pads='php artisan db:seed'
+
+# Makers
+alias pamm='php artisan make:model'
+alias pamc='php artisan make:controller'
+alias pams='php artisan make:seeder'
+alias pamt='php artisan make:test'
+
+
+# Clears
+alias pacac='php artisan cache:clear'
+alias pacoc='php artisan config:clear'
+alias pavic='php artisan view:clear'
+alias paroc='php artisan route:clear'
-- 
cgit v1.2.3-70-g09d2


From c2113d7cc67e2865a4692918198fba27e8360fe5 Mon Sep 17 00:00:00 2001
From: Luiz Guilherme Fonseca Rosa <luizguilhermefr@gmail.com>
Date: Tue, 2 Oct 2018 21:44:26 -0300
Subject: Create Laravel plugin README

---
 plugins/laravel/README.md | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 plugins/laravel/README.md

(limited to 'plugins')

diff --git a/plugins/laravel/README.md b/plugins/laravel/README.md
new file mode 100644
index 000000000..c7ae17f80
--- /dev/null
+++ b/plugins/laravel/README.md
@@ -0,0 +1,39 @@
+# Laravel
+
+Enable some cool aliases for Laravel [artisan console](https://laravel.com/docs/5.7/artisan). To use it, add `laravel` to the plugins array of your zshrc file:
+```
+plugins=(... laravel)
+```
+
+| Alias | Description |
+|:-:|:-:|
+| `artisan`  | `php artisan`  |
+| `pas`  | `php artisan serve` |
+
+## Database
+
+| Alias | Description |
+|:-:|:-:|
+| `pam`  |  `php artisan migrate` |
+| `pamf`  |  `php artisan migrate:fresh` |
+| `pamfs`  |  `php artisan migrate:fresh --seed` |
+| `pamr`  |  `php artisan migrate:rollback` |
+| `pads`  |  `php artisan db:seed` |
+
+## Makers
+
+| Alias | Description |
+|:-:|:-:|
+| `pamm`  |  `php artisan make:model` |
+| `pamc`  |  `php artisan make:controller` |
+| `pams`  |  `php artisan make:seeder` |
+| `pamt`  |  `php artisan make:test` |
+
+## Clears
+
+| Alias | Description |
+|:-:|:-:|
+| `pacac`  |  `php artisan cache:clear` |
+| `pacoc`  |  `php artisan config:clear` |
+| `pavic`  |  `php artisan view:clear` |
+| `paroc`  |  `php artisan route:clear` |
-- 
cgit v1.2.3-70-g09d2


From e03fe0c3019e6359705f5234cbba4b6e389ab5a4 Mon Sep 17 00:00:00 2001
From: Denys Dovhan <denysdovhan@gmail.com>
Date: Wed, 3 Oct 2018 16:12:26 +0300
Subject: Add README.md to gulp plugin. Issue #7175

---
 plugins/gulp/README.md | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 plugins/gulp/README.md

(limited to 'plugins')

diff --git a/plugins/gulp/README.md b/plugins/gulp/README.md
new file mode 100644
index 000000000..eae1b66ad
--- /dev/null
+++ b/plugins/gulp/README.md
@@ -0,0 +1,8 @@
+# gulp plugin
+
+This plugin adds autocompletion for your `gulp` tasks. It grabs all available tasks from the `gulpfile.js` in the current directory.
+
+To use it, add `gulp` to the plugins array of your `.zshrc` file:
+```
+plugins=(... gulp)
+```
-- 
cgit v1.2.3-70-g09d2


From ca45d510dd5fdd2cc1e92e969c95dbf7e31efb24 Mon Sep 17 00:00:00 2001
From: Rubén Durán Balda <ruduran@users.noreply.github.com>
Date: Wed, 3 Oct 2018 16:19:46 +0200
Subject: jump: fix behavior when reusing a mark (#7197)

Force the mark to point to the new dir, replacing the old one.

Fixes #7195
---
 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 168dfaba2..5a3e7fdf0 100644
--- a/plugins/jump/jump.plugin.zsh
+++ b/plugins/jump/jump.plugin.zsh
@@ -19,7 +19,7 @@ mark() {
 		MARK="$1"
 	fi
 	if read -q \?"Mark $PWD as ${MARK}? (y/n) "; then
-		mkdir -p "$MARKPATH"; ln -s "$PWD" "$MARKPATH/$MARK"
+		mkdir -p "$MARKPATH"; ln -sfh "$PWD" "$MARKPATH/$MARK"
 	fi
 }
 
-- 
cgit v1.2.3-70-g09d2


From 47004414a0a73ecd33c2a1d4b17dd4f79222ba08 Mon Sep 17 00:00:00 2001
From: Griko Nibras <grikomsn@gmail.com>
Date: Wed, 3 Oct 2018 22:23:49 +0700
Subject: encode64: add README (#7192)

---
 plugins/encode64/README.md | 69 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 plugins/encode64/README.md

(limited to 'plugins')

diff --git a/plugins/encode64/README.md b/plugins/encode64/README.md
new file mode 100644
index 000000000..9850da85f
--- /dev/null
+++ b/plugins/encode64/README.md
@@ -0,0 +1,69 @@
+# encode64
+
+Alias plugin for encoding or decoding using `base64` command
+
+## Functions and Aliases
+
+| Function   | Alias | Description                    |
+| ---------- | ----- | ------------------------------ |
+| `encode64` | `e64` | Encodes given data to base64   |
+| `decode64` | `d64` | Decodes given data from base64 |
+
+## Enabling plugin
+
+1. Edit your `.zshrc` file and add `encode64` to the list of plugins:
+
+   ```sh
+   plugins=(
+     # ...other enabled plugins
+     encode64
+   )
+   ```
+
+2. Restart your terminal session or reload configuration by running:
+
+   ```sh
+   source ~/.zshrc
+   ```
+
+## Usage and examples
+
+### Encoding
+
+- From parameter
+
+  ```console
+  $ encode64 "oh-my-zsh"
+  b2gtbXktenNo
+  $ e64 "oh-my-zsh"
+  b2gtbXktenNo
+  ```
+
+- From piping
+
+  ```console
+  $ echo "oh-my-zsh" | encode64
+  b2gtbXktenNo==
+  $ echo "oh-my-zsh" | e64
+  b2gtbXktenNo==
+  ```
+
+### Decoding
+
+- From parameter
+
+  ```console
+  $ decode64 b2gtbXktenNo
+  oh-my-zsh%
+  $ d64 b2gtbXktenNo
+  oh-my-zsh%
+  ```
+
+- From piping
+
+  ```console
+  $ echo "b2gtbXktenNoCg==" | decode64
+  oh-my-zsh
+  $ echo "b2gtbXktenNoCg==" | decode64
+  oh-my-zsh
+  ```
-- 
cgit v1.2.3-70-g09d2


From fe4ac966fab20f9f29c0a9905372b4b52083ef24 Mon Sep 17 00:00:00 2001
From: Jonatan Skogsfors <jonatan@skogsfors.net>
Date: Wed, 3 Oct 2018 17:30:17 +0200
Subject: jump: use more compatible flag for ln (#7205)

The flag '-h' isn't universal across implementation. According to FreeBSD man page for ln you can use 'n'.
---
 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 5a3e7fdf0..a19a86022 100644
--- a/plugins/jump/jump.plugin.zsh
+++ b/plugins/jump/jump.plugin.zsh
@@ -19,7 +19,7 @@ mark() {
 		MARK="$1"
 	fi
 	if read -q \?"Mark $PWD as ${MARK}? (y/n) "; then
-		mkdir -p "$MARKPATH"; ln -sfh "$PWD" "$MARKPATH/$MARK"
+		mkdir -p "$MARKPATH"; ln -sfn "$PWD" "$MARKPATH/$MARK"
 	fi
 }
 
-- 
cgit v1.2.3-70-g09d2


From 0f6e3dc223942f553fa512d4d8d2d9eb3df3ab8e Mon Sep 17 00:00:00 2001
From: Denys Dovhan <denysd96@gmail.com>
Date: Wed, 3 Oct 2018 18:54:07 +0300
Subject: grunt: add README (#7198)

---
 plugins/grunt/README.md | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 plugins/grunt/README.md

(limited to 'plugins')

diff --git a/plugins/grunt/README.md b/plugins/grunt/README.md
new file mode 100644
index 000000000..a69a9b7fc
--- /dev/null
+++ b/plugins/grunt/README.md
@@ -0,0 +1,37 @@
+# grunt plugin
+
+This plugin adds completions for [grunt](https://github.com/gruntjs/grunt).
+
+To use it, add `grunt` to the plugins array of your `.zshrc` file:
+```zsh
+plugins=(... grunt)
+```
+
+## Enable caching
+
+If you want to use the cache, set the following in your `.zshrc`:
+```zsh
+zstyle ':completion:*' use-cache yes
+```
+
+## Settings
+
+* Show grunt file path:
+  ```zsh
+  zstyle ':completion::complete:grunt::options:' show_grunt_path yes
+  ```
+* Cache expiration days (default: 7):
+  ```zsh
+  zstyle ':completion::complete:grunt::options:' expire 1
+  ```
+* Not update options cache if target gruntfile is changed.
+  ```zsh
+  zstyle ':completion::complete:grunt::options:' no_update_options yes
+  ```
+
+Note that if you change the zstyle settings, you should delete the cache file and restart zsh.
+
+```zsh
+$ rm ~/.zcompcache/grunt
+$ exec zsh
+```
-- 
cgit v1.2.3-70-g09d2


From 8bc176f1248c3ade50fb831afd60f3bc044f8ae4 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Wed, 3 Oct 2018 17:56:27 +0200
Subject: add link

---
 plugins/gulp/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/gulp/README.md b/plugins/gulp/README.md
index eae1b66ad..4ed2b99b3 100644
--- a/plugins/gulp/README.md
+++ b/plugins/gulp/README.md
@@ -1,6 +1,6 @@
 # gulp plugin
 
-This plugin adds autocompletion for your `gulp` tasks. It grabs all available tasks from the `gulpfile.js` in the current directory.
+This plugin adds autocompletion for your [`gulp`](https://gulpjs.com/) tasks. It grabs all available tasks from the `gulpfile.js` in the current directory.
 
 To use it, add `gulp` to the plugins array of your `.zshrc` file:
 ```
-- 
cgit v1.2.3-70-g09d2


From af7d165a7f84f83a4c5d9f434a5320a5844d8ad3 Mon Sep 17 00:00:00 2001
From: Denys Dovhan <denysd96@gmail.com>
Date: Wed, 3 Oct 2018 18:59:30 +0300
Subject: node: add README (#7201)

---
 plugins/node/README.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 plugins/node/README.md

(limited to 'plugins')

diff --git a/plugins/node/README.md b/plugins/node/README.md
new file mode 100644
index 000000000..c392dc0bf
--- /dev/null
+++ b/plugins/node/README.md
@@ -0,0 +1,16 @@
+# node plugin
+
+To use it, add `node` to the plugins array of your zshrc file:
+```zsh
+plugins=(... node)
+```
+
+This plugin adds `node-docs` function that open specific section in [Node.js](https://nodejs.org) documentation (depending on the installed version).
+For example:
+
+```zsh
+# Opens https://nodejs.org/docs/latest-v10.x/api/fs.html
+$ node-docs fs
+# Opens https://nodejs.org/docs/latest-v10.x/api/path.html
+$ node-docs path 
+```
-- 
cgit v1.2.3-70-g09d2


From d1e1f1f340518c8db07401a04ba8550624785317 Mon Sep 17 00:00:00 2001
From: Denys Dovhan <denysd96@gmail.com>
Date: Wed, 3 Oct 2018 19:01:03 +0300
Subject: nvm: add README (#7202)

---
 plugins/nvm/README.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 plugins/nvm/README.md

(limited to 'plugins')

diff --git a/plugins/nvm/README.md b/plugins/nvm/README.md
new file mode 100644
index 000000000..079cf0009
--- /dev/null
+++ b/plugins/nvm/README.md
@@ -0,0 +1,9 @@
+# nvm plugin
+
+This plugin adds autocompletions for [nvm](https://github.com/creationix/nvm) — a Node.js version manager.
+It also automatically sources nvm, so you don't need to do it manually in your `.zshrc`.
+
+To use it, add `nvm` to the plugins array of your zshrc file:
+```zsh
+plugins=(... nvm)
+```
-- 
cgit v1.2.3-70-g09d2


From 2e0a5cbefd97f4e40baa2b7b351e2d44d260a59e Mon Sep 17 00:00:00 2001
From: Denys Dovhan <denysd96@gmail.com>
Date: Wed, 3 Oct 2018 19:02:21 +0300
Subject: web-search: add README (#7203)

---
 plugins/web-search/README.md | 50 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 plugins/web-search/README.md

(limited to 'plugins')

diff --git a/plugins/web-search/README.md b/plugins/web-search/README.md
new file mode 100644
index 000000000..d790d944d
--- /dev/null
+++ b/plugins/web-search/README.md
@@ -0,0 +1,50 @@
+# web-search plugin
+
+This plugin adds aliases for searching with Google, Wiki, Bing, YouTube and other popular services.
+
+Open your `~/.zshrc` file and enable the `web-search` plugin:
+
+```zsh
+plugins=( ... web-search)
+```
+
+## Usage
+
+You can use the `web-search` plugin in these two forms:
+
+* `web_search <context> <term> [more terms if you want]`
+* `<context> <term> [more terms if you want]`
+
+For example, these two are equivalent:
+
+```zsh
+$ web_search google oh-my-zsh
+$ google oh-my-zsh
+```
+
+Available search contexts are:
+
+| Context               | URL                                      |
+|-----------------------|------------------------------------------|
+| `bing`                | `https://www.bing.com/search?q=`         |
+| `google`              | `https://www.google.com/search?q=`       |
+| `yahoo`               | `https://search.yahoo.com/search?p=`     |
+| `ddg` or `duckduckgo` | `https://www.duckduckgo.com/?q=`         |
+| `sp` or `startpage`   | `https://www.startpage.com/do/search?q=` |
+| `yandex`              | `https://yandex.ru/yandsearch?text=`     |
+| `github`              | `https://github.com/search?q=`           |
+| `baidu`               | `https://www.baidu.com/s?wd=`            |
+| `ecosia`              | `https://www.ecosia.org/search?q=`       |
+| `goodreads`           | `https://www.goodreads.com/search?q=`    |
+| `qwant`               | `https://www.qwant.com/?q=`              |
+
+Also there are aliases for bang-searching DuckDuckGo:
+
+| Context   | Bang  |
+|-----------|-------|
+| `wiki`    | `!w`  |
+| `news`    | `!n`  |
+| `youtube` | `!yt` |
+| `map`     | `!m`  |
+| `image`   | `!i`  |
+| `ducky`   | `!`   |
-- 
cgit v1.2.3-70-g09d2


From 544dfdd6da2ff3edc04bfd903fdb943960d743aa Mon Sep 17 00:00:00 2001
From: Sebastian Müller <sbmueller@users.noreply.github.com>
Date: Wed, 3 Oct 2018 18:08:50 +0200
Subject: macports: add README (#7204)

---
 plugins/macports/README.md           | 21 +++++++++++++++++++++
 plugins/macports/macports.plugin.zsh |  4 +---
 2 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 plugins/macports/README.md

(limited to 'plugins')

diff --git a/plugins/macports/README.md b/plugins/macports/README.md
new file mode 100644
index 000000000..ded823f3f
--- /dev/null
+++ b/plugins/macports/README.md
@@ -0,0 +1,21 @@
+# Macports plugin
+
+This plugin adds completion for the package manager [Macports](https://macports.com/),
+as well as some aliases for common Macports commands.
+
+To use it, add `macports` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... macports)
+```
+
+## Aliases
+
+| Alias | Command                            | Description                                                  |
+|-------|------------------------------------|--------------------------------------------------------------|
+| pc    | `sudo port clean --all installed`  | Clean up intermediate installation files for installed ports |
+| pi    | `sudo port install`                | Install package given as argument                            |
+| psu   | `sudo port selfupdate`             | Update ports tree with MacPorts repository                   |
+| puni  | `sudo port uninstall inactive`     | Uninstall inactive ports                                     |
+| puo   | `sudo port upgrade outdated`       | Upgrade ports with newer versions available                  |
+| pup   | `psu && puo`                       | Update ports tree, then upgrade ports to newest versions     |
diff --git a/plugins/macports/macports.plugin.zsh b/plugins/macports/macports.plugin.zsh
index 277352e32..d1fde30d4 100644
--- a/plugins/macports/macports.plugin.zsh
+++ b/plugins/macports/macports.plugin.zsh
@@ -1,8 +1,6 @@
-#Aliases
 alias pc="sudo port clean --all installed"
-alias pi="sudo port install $1"
+alias pi="sudo port install"
 alias psu="sudo port selfupdate"
 alias puni="sudo port uninstall inactive"
 alias puo="sudo port upgrade outdated"
 alias pup="psu && puo"
-
-- 
cgit v1.2.3-70-g09d2


From dfe7d6eca119ac58be04a2ef1bf142c3e78b6c1a Mon Sep 17 00:00:00 2001
From: Bjorn Stange <bjorn248@gmail.com>
Date: Wed, 3 Oct 2018 12:13:48 -0400
Subject: golang: add README (#7207)

---
 plugins/golang/README.md | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 plugins/golang/README.md

(limited to 'plugins')

diff --git a/plugins/golang/README.md b/plugins/golang/README.md
new file mode 100644
index 000000000..72845b2a1
--- /dev/null
+++ b/plugins/golang/README.md
@@ -0,0 +1,29 @@
+# Golang plugin
+
+This plugin adds completion for the [Go Programming Language](https://golang.org/),
+as well as some aliases for common Golang commands.
+
+To use it, add `golang` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... golang)
+```
+
+## Aliases
+
+| Alias   | Command                 | Description                                                   |
+| ------- | ----------------------- | ------------------------------------------------------------- |
+| gob     | `go build`              | Build your code                                               |
+| goc     | `go clean`              | Removes object files from package source directories          |
+| god     | `go doc`                | Prints documentation comments                                 |
+| gof     | `go fmt`                | Gofmt formats (aligns and indents) Go programs.               |
+| gofa    | `go fmt ./...`          | Run go fmt for all packages in current directory, recursively |
+| gog     | `go get`                | Downloads packages and then installs them to $GOPATH          |
+| goi     | `go install`            | Compiles and installs packages to $GOPATH                     |
+| gol     | `go list`               | Lists Go packages                                             |
+| gop     | `cd $GOPATH`            | Takes you to $GOPATH                                          |
+| gopb    | `cd $GOPATH/bin`        | Takes you to $GOPATH/bin                                      |
+| gops    | `cd $GOPATH/src`        | Takes you to $GOPATH/src                                      |
+| gor     | `go run`                | Compiles and runs your code                                   |
+| got     | `go test`               | Runs tests                                                    |
+| gov     | `go vet`                | Vet examines Go source code and reports suspicious constructs |
-- 
cgit v1.2.3-70-g09d2


From 5ce96c3f77347e3c5bb60a86fb72b9c2333e34c3 Mon Sep 17 00:00:00 2001
From: Zach Whitten <zwhitten+github@gmail.com>
Date: Wed, 3 Oct 2018 14:10:40 -0400
Subject: mix: add Nerves tasks to completion (#7180)

---
 plugins/mix/README.md | 1 +
 plugins/mix/_mix      | 8 ++++++++
 2 files changed, 9 insertions(+)

(limited to 'plugins')

diff --git a/plugins/mix/README.md b/plugins/mix/README.md
index 63476dd6b..878f370f2 100644
--- a/plugins/mix/README.md
+++ b/plugins/mix/README.md
@@ -16,3 +16,4 @@ plugins=(... mix)
 | Phoenix v1.3.0 and above| [Phoenix](https://hexdocs.pm/phoenix/Phoenix.html)       |
 | Ecto                    | [Ecto](https://hexdocs.pm/ecto/Ecto.html)                |
 | Hex                     | [Hex](https://hex.pm/)                                   |
+| Nerves                  | [Nerves](https://nerves-project.org/)                    |
diff --git a/plugins/mix/_mix b/plugins/mix/_mix
index ecbe7e2d3..61fa1cf25 100644
--- a/plugins/mix/_mix
+++ b/plugins/mix/_mix
@@ -31,6 +31,9 @@ _1st_arguments=(
     'ecto.migrations:Displays the up / down migration status'
     'ecto.rollback:Reverts applied migrations'
     'escript.build:Builds an escript for the project'
+    'firmware:Nerves - Build a firmware image for the selected target platform'
+    'firmware.burn:Nerves - Writes the generated firmware image to an attached SDCard or file'
+    'firmware.image:Nerves - Create a firmware image file that can be copied byte-for-byte'
     'help:Print help information for tasks'
     'hex:Print hex help information'
     'hex.config:Read or update hex config'
@@ -48,6 +51,11 @@ _1st_arguments=(
     'local.phoenix:Updates Phoenix locally'
     'local.phx:Updates the Phoenix project generator locally'
     'local.rebar:Install rebar locally'
+    'nerves.artifact:Create an artifact for a specified Nerves package'
+    'nerves.artifact.get:Nerves get artifacts'
+    'nerves.info:Prints Nerves system information'
+    'nerves.new:Create a new Nerves application'
+    'nerves.release.init:Prepare a new Nerves project for use with releases'
     'new:Create a new Elixir project'
     'phoenix.digest:Digests and compress static files'
     'phoenix.gen.channel:Generates a Phoenix channel'
-- 
cgit v1.2.3-70-g09d2


From 2d967d66e618ad6d95978ba5ede33fa5f24fe489 Mon Sep 17 00:00:00 2001
From: Zach Whitten <zwhitten+github@gmail.com>
Date: Wed, 3 Oct 2018 14:52:38 -0400
Subject: ubuntu: update plugin README (#7199)

---
 plugins/ubuntu/README.md | 52 ++++++++++++++++++++++++++++++++++++++++++++++++
 plugins/ubuntu/readme.md | 21 -------------------
 2 files changed, 52 insertions(+), 21 deletions(-)
 create mode 100644 plugins/ubuntu/README.md
 delete mode 100644 plugins/ubuntu/readme.md

(limited to 'plugins')

diff --git a/plugins/ubuntu/README.md b/plugins/ubuntu/README.md
new file mode 100644
index 000000000..caa6a90b4
--- /dev/null
+++ b/plugins/ubuntu/README.md
@@ -0,0 +1,52 @@
+# Ubuntu plugin
+
+This plugin adds completions and aliases for [Ubuntu](https://www.ubuntu.com/).
+
+To use it, add `ubuntu` to the plugins array in your zshrc file: 
+
+```zsh
+plugins=(... ubuntu)
+```
+
+## Aliases
+
+Commands that use `$APT` will use apt if installed or defer to apt-get otherwise. 
+
+| Alias   | Command                                                                | Description                                                                                       |
+|---------|------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------|
+| acs     | `apt-cache search`                                                     | Search the apt-cache with the specified criteria                                                  |
+| acp     | `apt-cache policy`                                                     | Display the package source priorities                                                             | 
+| afs     | `apt-file search --regexp`                                             | Perform a regular expression apt-file search                                                      |
+| afu     | `sudo apt-file update`                                                 | Generates or updates the apt-file package database                                                | 
+| ag      | `sudo $APT`                                                            | Run apt-get with sudo                                                                             | 
+| aga     | `sudo $APT autoclean`                                                  | Clears out the local reposityory of retrieved package files that can no longer be downloaded      | 
+| agb     | `sudo $APT build-dep <source_pkg>`                                     | Installs/Removes packages to satisfy the dependencies of a specified build pkg                    | 
+| agc     | `sudo $APT clean`                                                      | Clears out the local repository of retrieved package files leaving everything from the lock files | 
+| agd     | `sudo $APT dselect-upgrade`                                            | Follows dselect choices for package installation                                                  | 
+| agi     | `sudo $APT install <pkg>`                                              | Install the specified package                                                                     | 
+| agli    | `apt list --installed`                                                 | List the installed packages                                                                       | 
+| aglu    | `sudo apt-get -u upgrade --assume-no`                                  | Run an apt-get upgrade assuming no to all prompts                                                 | 
+| agp     | `sudo $APT purge <pkg>`                                                | Remove a package including any configuration files                                                | 
+| agr     | `sudo $APT remove <pkg>`                                               | Remove a package                                                                                  | 
+| ags     | `$APT source <pkg>`                                                    | Fetch the source for the specified package                                                        | 
+| agu     | `sudo $APT update`                                                     | Update package list                                                                               | 
+| agud    | `sudo $APT update && sudo $APT dist-upgrade`                           | Update packages list and perform a distribution upgrade                                           | 
+| agug    | `sudo $APT upgrade`                                                    | Upgrade available packages                                                                        | 
+| agar    | `sudo $APT autoremove`                                                 | Remove automatically installed packages no longer needed                                          | 
+| aguu    | `sudo $APT update && sudo $APT upgrade`                                | Update packages list and upgrade available packages                                               | 
+| allpkgs | `dpkg --get-selections \| grep -v deinstall`                           | Print all installed packages                                                                      | 
+| kclean  | `sudo aptitude remove -P ?and(~i~nlinux-(ima\|hea) ?not(~n$(uname -r)))`  |Remove ALL kernel images and headers EXCEPT the one in use                                         |
+| mydeb   | `time dpkg-buildpackage -rfakeroot -us -uc`                            | Create a basic .deb package                                                                       |
+| ppap    | `sudo ppa-purge <ppa>`                                                 | Remove the specified PPA                                                                          | 
+
+
+## Functions
+
+| Function          | Usage                                 |Description                                                               |
+|-------------------|---------------------------------------|--------------------------------------------------------------------------|
+| aar               | `aar ppa:xxxxxx/xxxxxx [packagename]` | apt-add-repository with automatic install/upgrade of the desired package |
+| apt-history       | `apt-history <action>`                | Prints the Apt history of the specified action                           |
+| apt-list-packages | `apt-list-packages`                   | List packages by size                                                    |
+| kerndeb           | `kerndeb`                             | Kernel-package building shortcut                                         | 
+
+
diff --git a/plugins/ubuntu/readme.md b/plugins/ubuntu/readme.md
deleted file mode 100644
index 99d62a6f7..000000000
--- a/plugins/ubuntu/readme.md
+++ /dev/null
@@ -1,21 +0,0 @@
-This plugin was created because the aliases in the debian plugin are inconsistent and hard to remember. Also this apt-priority detection that switched between apt-get and aptitude was dropped to keep it simpler. This plugin uses apt-get for everything but a few things that are only possible with aptitude I guess. Ubuntu does not have aptitude installed by default.
-
-acs = Apt-Cache Search  
-acp = Apt-Cache Policy
-
-ag  = sudo Apt-Get  
-agi = sudo Apt-Get Install  
-agd = sudo Apt-Get Dselect-upgrade  
-By now you already can guess almost all aliases  
-
-There are two exeptions since ...  
-agu  = sudo Apt-Get Update  - we have ...  
-agug = sudo Apt-Get UpGrade - as the exceptional 4 letter alias for a single command.
-
-afs = Apt-File Search --regexp - this has the regexp switch on without being represented in the alias, I guess this makes sense since the debian plugin has it, I never used that command.
-
-Then there are the 2 other 4 letter aliases for combined commands, that are straight forward and easy to remember.  
-aguu = sudo Apt-Get Update && sudo apt-get Upgrade      - better then adg or not?  
-agud = sudo Apt-Get Update && sudo apt-get full-upgrade
-
-For a full list aliases and the functions just watch the plugins code https://github.com/robbyrussell/oh-my-zsh/blob/master/plugins/ubuntu/ubuntu.plugin.zsh, look at the comments if you want to switch from the debian plugin. Ubuntu, Mint and & co users will like the new aar function to install packages from ppas with a single command.
-- 
cgit v1.2.3-70-g09d2


From 9d57a90b41b1d8c3d80de8a8b0ac23154231388c Mon Sep 17 00:00:00 2001
From: Sagar Patil <sagar010797@gmail.com>
Date: Thu, 4 Oct 2018 02:36:02 +0530
Subject: emoji-clock: add README (#7208)

---
 plugins/emoji-clock/README.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 plugins/emoji-clock/README.md

(limited to 'plugins')

diff --git a/plugins/emoji-clock/README.md b/plugins/emoji-clock/README.md
new file mode 100644
index 000000000..4934f380b
--- /dev/null
+++ b/plugins/emoji-clock/README.md
@@ -0,0 +1,14 @@
+# emoji-clock
+
+The plugin displays current time as an emoji symbol with half hour accuracy.
+
+To use it, add `emoji-clock` to the plugins array of your zshrc file:
+```
+plugins=(... emoji-clock)
+```
+
+## Features
+
+| Function          | Description                                                          |
+|-------------------|----------------------------------------------------------------------|
+| `emoji-clock`     | Displays current time in clock emoji symbol with half hour accuracy  |
-- 
cgit v1.2.3-70-g09d2


From c64964469559cea37a19cdfe847a95f41562993f Mon Sep 17 00:00:00 2001
From: MasterOfTheTiger <ted.jameson@pm.me>
Date: Thu, 4 Oct 2018 03:48:29 -0700
Subject: ruby: add README (#7212)

---
 plugins/ruby/README.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 plugins/ruby/README.md

(limited to 'plugins')

diff --git a/plugins/ruby/README.md b/plugins/ruby/README.md
new file mode 100644
index 000000000..ad2755bbf
--- /dev/null
+++ b/plugins/ruby/README.md
@@ -0,0 +1,20 @@
+# Ruby plugin
+
+This plugin adds aliases for common commands used in dealing with [Ruby](https://www.ruby-lang.org/en/) and [gem packages](https://rubygems.org/).
+
+To use it, add `ruby` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... ruby)
+```
+
+## Aliases
+
+| Alias | Command                                | Description                                          |
+|-------|----------------------------------------|------------------------------------------------------|
+| rb    | `ruby`                                 | The Ruby command                                     |
+| sgem  | `sudo gem`                             | Run sudo gem on the system ruby, not the active ruby |
+| rfind | `find . -name "*.rb" \| xargs grep -n` | Find ruby file                                       |
+| gin   | `gem install`                          | Install a gem into the local repository              |
+| gun   | `gem uninstall`                        | Uninstall gems from the local repository             |
+| gli   | `gem list`                             | Display gems installed locally                       |
-- 
cgit v1.2.3-70-g09d2


From ceb8e7d3040113938c60b23b9466584cb66cb15d Mon Sep 17 00:00:00 2001
From: Griko Nibras <grikomsn@gmail.com>
Date: Thu, 4 Oct 2018 18:04:04 +0700
Subject: dircycle: add README (#7213)

---
 plugins/dircycle/README.md | 79 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 plugins/dircycle/README.md

(limited to 'plugins')

diff --git a/plugins/dircycle/README.md b/plugins/dircycle/README.md
new file mode 100644
index 000000000..9e1b3f644
--- /dev/null
+++ b/plugins/dircycle/README.md
@@ -0,0 +1,79 @@
+# dircycle
+
+Plugin for cycling through the directory stack
+
+This plugins enables directory navigation similar when using back and forward on browsers or common file explorers like Finder or Nautilus.
+
+This is a small zle trick that lets you cycle your directory stack left or right using Ctrl+Shift+Left/Right. This is useful when moving back and forth between directories in development environments, and can be thought of as kind of a nondestructive pushd/popd.
+
+## Enabling the plugin
+
+1. Open your `.zshrc` file and add `dircycle` in the plugins section:
+
+   ```zsh
+   plugins=(
+       # all your enabled plugins
+       dircycle
+   )
+   ```
+
+2. Reload the source file or restart your Terminal session:
+
+   ```console
+   $ source ~/.zshrc
+   $
+   ```
+
+## Usage Examples
+
+Say you opened these directories on the terminal:
+
+```console
+~$ cd Projects
+~/Projects$ cd Hacktoberfest
+~/Projects/Hacktoberfest$ cd oh-my-zsh
+~/Projects/Hacktoberfest/oh-my-zsh$ dirs -v
+0       ~/Projects/Hacktoberfest/oh-my-zsh
+1       ~/Projects/Hacktoberfest
+2       ~/Projects
+3       ~
+```
+
+By pressing <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Left</kbd>, the current working directory or `$CWD` will be from `oh-my-zsh` to `Hacktoberfest`. Press it again and it will be at `Projects`.
+
+And by pressing <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Right</kbd>, the `$CWD` will be from `Projects` to `Hacktoberfest`. Press it again and it will be at `oh-my-zsh`.
+
+Here's a example history table with the same accessed directories like above:
+
+| Current `$CWD`  | Key press                                             | New `$CWD`      |
+| --------------- | ----------------------------------------------------- | --------------- |
+| `oh-my-zsh`     | <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Left</kbd>  | `Hacktoberfest` |
+| `Hacktoberfest` | <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Left</kbd>  | `Projects`      |
+| `Projects`      | <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Left</kbd>  | `~`             |
+| `~`             | <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Right</kbd> | `Projects`      |
+| `Projects`      | <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Right</kbd> | `Hacktoberfest` |
+| `Hacktoberfest` | <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Right</kbd> | `oh-my-zsh`     |
+| `oh-my-zsh`     | <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Right</kbd> | `~`             |
+
+Note the last traversal, when pressing <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Right</kbd> on a last known `$CWD`, it will change back to the first known `$CWD`, which in the example is `~`.
+
+Here's an asciinema cast demonstrating the example above:
+
+[![asciicast](https://asciinema.org/a/204406.png)](https://asciinema.org/a/204406)
+
+## Functions
+
+| Function             | Description                                                                                               |
+| -------------------- | --------------------------------------------------------------------------------------------------------- |
+| `insert-cycledleft`  | Change `$CWD` to the previous known stack, binded on <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Left</kbd> |
+| `insert-cycledright` | Change `$CWD` to the next known stack, binded on <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Right</kbd>    |
+
+You can bind these functions to other key sequences, as long as you know the bindkey sequence:
+
+For example, these commands bind to Alt+Shift+Left/Right in xterm-256color:
+```
+bindkey '^[[1;4D' insert-cycledleft
+bindkey '^[[1;4C' insert-cycledright
+```
+
+You can get the bindkey sequence pressing <kbd>Ctrl</kbd> + <kbd>V</kbd>, then pressing the keyboard shortcut you want to use.
-- 
cgit v1.2.3-70-g09d2


From 7f96366970045f0552069359180737ec76b3d619 Mon Sep 17 00:00:00 2001
From: MasterOfTheTiger <ted.jameson@pm.me>
Date: Thu, 4 Oct 2018 04:06:21 -0700
Subject: go: add README and deprecation warning (#7214)

---
 plugins/go/README.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 plugins/go/README.md

(limited to 'plugins')

diff --git a/plugins/go/README.md b/plugins/go/README.md
new file mode 100644
index 000000000..6ce6f4ee2
--- /dev/null
+++ b/plugins/go/README.md
@@ -0,0 +1 @@
+The go plugin is deprecated. Use the [golang plugin](https://github.com/robbyrussell/oh-my-zsh/tree/master/plugins/golang) instead.
-- 
cgit v1.2.3-70-g09d2


From b231840d95a57de6173bbf205a9b5808766f53e3 Mon Sep 17 00:00:00 2001
From: Bjorn Stange <bjorn248@gmail.com>
Date: Thu, 4 Oct 2018 07:07:47 -0400
Subject: vagrant: add README (#7215)

---
 plugins/vagrant/README.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 plugins/vagrant/README.md

(limited to 'plugins')

diff --git a/plugins/vagrant/README.md b/plugins/vagrant/README.md
new file mode 100644
index 000000000..5978c2f53
--- /dev/null
+++ b/plugins/vagrant/README.md
@@ -0,0 +1,9 @@
+# Vagrant plugin
+
+This plugin adds completion for [Vagrant](https://www.vagrantup.com/)
+
+To use it, add `vagrant` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... vagrant)
+```
-- 
cgit v1.2.3-70-g09d2


From 67f3c72d1070a4e0cece351a233bd3e89cfb72ed Mon Sep 17 00:00:00 2001
From: Aswath K <aswath.sana@gmail.com>
Date: Thu, 4 Oct 2018 16:40:52 +0530
Subject: bower: add README (#7216)

---
 plugins/bower/README.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 plugins/bower/README.md

(limited to 'plugins')

diff --git a/plugins/bower/README.md b/plugins/bower/README.md
new file mode 100644
index 000000000..743b6a0ea
--- /dev/null
+++ b/plugins/bower/README.md
@@ -0,0 +1,18 @@
+# Bower plugin
+
+This plugin adds completion for [Bower](https://bower.io/) and a few useful aliases for common Bower commands.
+
+To use it, add `bower` to the plugins array in your zshrc file:
+
+```
+plugins=(... bower)
+```
+
+## Aliases
+
+| Alias | Command         | Description                                            |
+|-------|-----------------|--------------------------------------------------------|
+| bi    | `bower install` | Installs the project dependencies listed in bower.json |
+| bl    | `bower list`    | List local packages and possible updates               |
+| bs    | `bower search`  | Finds all packages or a specific package.              |
+
-- 
cgit v1.2.3-70-g09d2


From 77d70c9f99f7629b4718ad5931920fd0e4db2d4e Mon Sep 17 00:00:00 2001
From: Umberto Nicoletti <umberto.nicoletti@gmail.com>
Date: Thu, 4 Oct 2018 13:12:07 +0200
Subject: postgres: add README (#7217)

---
 plugins/postgres/README.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 plugins/postgres/README.md

(limited to 'plugins')

diff --git a/plugins/postgres/README.md b/plugins/postgres/README.md
new file mode 100644
index 000000000..59445f31c
--- /dev/null
+++ b/plugins/postgres/README.md
@@ -0,0 +1,22 @@
+# Postgres plugin
+
+This plugin adds some aliases for useful Postgres commands.
+
+:warning: this plugin works exclusively with Postgres installed via Homebrew on OSX
+because Postgres paths are hardcoded to `/usr/local/var/postgres`.
+
+To use it, add `postgres` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... postgres)
+```
+
+## Aliases
+
+| Alias       | Command                                                                         | Description                                                 |
+|-------------|---------------------------------------------------------------------------------|-------------------------------------------------------------|
+| startpost   | `pg_ctl -D /usr/local/var/postgres -l /usr/local/var/postgres/server.log start` | Start postgres server                                       |
+| stoppost    | `pg_ctl -D /usr/local/var/postgres stop -s -m fast`                             | Stop postgres server                                        |
+| restartpost | `stoppost && sleep 1 && startpost`                                              | Restart (calls stop, then start)                            |
+| reloadpost  | `pg_ctl reload -D /usr/local/var/postgres -s`                                   | Reload postgres configuration (some setting require restart)|
+| statuspost  | `pg_ctl status -D /usr/local/var/postgres -s`                                   | Check startus of postgres server (running, stopped)         |
-- 
cgit v1.2.3-70-g09d2


From 6f9a514511aba3b53e3db5b0bc0ea012af927f9d Mon Sep 17 00:00:00 2001
From: Sergey Lysenko <soulwish.ls@gmail.com>
Date: Thu, 4 Oct 2018 14:13:04 +0300
Subject: laravel4: add README (#7220)

---
 plugins/laravel4/README.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 plugins/laravel4/README.md

(limited to 'plugins')

diff --git a/plugins/laravel4/README.md b/plugins/laravel4/README.md
new file mode 100644
index 000000000..c945601f7
--- /dev/null
+++ b/plugins/laravel4/README.md
@@ -0,0 +1,18 @@
+# Laravel 4 plugin
+
+This plugin adds some aliases for common [Laravel 4](https://laravel.com/docs/4.2) commands.
+
+To use it, add `laravel4` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... laravel4)
+```
+
+## Aliases
+
+| Alias | Command                                   | Description                                     |
+|-----------|-------------------------------------------|-------------------------------------------------------------|
+| la4       | `php artisan`                             | Main Artisan command                        |
+| la4dump   | `php artisan dump-autoload`               | Regenerate framework autoload files         |
+| la4cache  | `php artisan cache:clear`                 | Flush the application cache                 |
+| la4routes | `php artisan routes`                      | List all registered routes                  |
-- 
cgit v1.2.3-70-g09d2


From d05bf3962bc230f2013c7f7c55f764d98afa2344 Mon Sep 17 00:00:00 2001
From: Sergey Lysenko <soulwish.ls@gmail.com>
Date: Thu, 4 Oct 2018 14:17:01 +0300
Subject: laravel5: add README (#7221)

---
 plugins/laravel5/README.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 plugins/laravel5/README.md

(limited to 'plugins')

diff --git a/plugins/laravel5/README.md b/plugins/laravel5/README.md
new file mode 100644
index 000000000..933342a9e
--- /dev/null
+++ b/plugins/laravel5/README.md
@@ -0,0 +1,18 @@
+# Laravel 5 plugin
+
+This plugin adds some aliases for common [Laravel 5](https://laravel.com/docs) commands.
+
+To use it, add `laravel5` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... laravel5)
+```
+
+## Aliases
+
+| Alias     | Command                      | Description                                        |
+|-----------|------------------------------|----------------------------------------------------|
+| la5       | `php artisan`                | Main Artisan command                               |
+| la5cache  | `php artisan cache:clear`    | Flush the application cache                        |
+| la5routes | `php artisan route:list`     | List all registered routes                         |
+| la5vendor | `php artisan vendor:publish` | Publish any publishable assets from vendor package |
-- 
cgit v1.2.3-70-g09d2


From a6d40b8f8beec16f582b0a4404cf1b6c8a848689 Mon Sep 17 00:00:00 2001
From: Sergey Lysenko <soulwish.ls@gmail.com>
Date: Thu, 4 Oct 2018 14:23:07 +0300
Subject: laravel: add README (#7222)

---
 plugins/laravel/README.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 plugins/laravel/README.md

(limited to 'plugins')

diff --git a/plugins/laravel/README.md b/plugins/laravel/README.md
new file mode 100644
index 000000000..067c1e9fb
--- /dev/null
+++ b/plugins/laravel/README.md
@@ -0,0 +1,19 @@
+# Laravel plugin
+
+This plugin adds aliases and autocompletion for Laravel [Artisan](https://laravel.com/docs/artisan) and [Bob](http://daylerees.github.io/laravel-bob/) command-line interfaces.
+
+**NOTE:** completion might not work for recent Laravel versions since it hasn't been updated since 2012.
+In that case, check out plugins `laravel4` and `laravel5`.
+
+To use it, add `laravel` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... laravel)
+```
+
+## Aliases
+
+| Alias     | Command                  | Description          |
+|-----------|--------------------------|----------------------|
+| artisan   | `php artisan`            | Main Artisan command |
+| bob       | `php artisan bob::build` | Main Bob command     |
-- 
cgit v1.2.3-70-g09d2


From 6f24f4a18ae4c12102a1ec0621a51fc24f0ffe8c Mon Sep 17 00:00:00 2001
From: Zach Whitten <zwhitten+github@gmail.com>
Date: Thu, 4 Oct 2018 07:30:33 -0400
Subject: gradle: add README (#7211)

---
 plugins/gradle/README.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 plugins/gradle/README.md

(limited to 'plugins')

diff --git a/plugins/gradle/README.md b/plugins/gradle/README.md
new file mode 100644
index 000000000..215503c81
--- /dev/null
+++ b/plugins/gradle/README.md
@@ -0,0 +1,23 @@
+## Gradle Plugin
+
+This plugin adds completions and aliases for [Gradle](https://gradle.org/).
+
+To use it, add `gradle` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... gradle)
+```
+
+## Usage
+
+This plugin creates an alias `gradle` which is used to determine whether the current working directory has a gradlew file. If gradlew is present it will be used otherwise `gradle` is used directly. Gradle tasks can be executed directly without regard for whether it is `gradle` or `gradlew`
+
+Examples:
+```zsh
+gradle test
+gradle build
+```
+
+## Completion
+
+The completion provided for this plugin caches the parsed tasks into a file named `.gradletasknamecache` in the current working directory, so you might want to add that to your `.gitignore` file so that it's not accidentally committed.
-- 
cgit v1.2.3-70-g09d2


From 8d3cafca3e083b9ea03ffcb096f7cf7c23bd3d56 Mon Sep 17 00:00:00 2001
From: Zach Whitten <zwhitten@gmail.com>
Date: Thu, 4 Oct 2018 08:56:43 -0400
Subject: Add Gem README

---
 plugins/gem/README.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 plugins/gem/README.md

(limited to 'plugins')

diff --git a/plugins/gem/README.md b/plugins/gem/README.md
new file mode 100644
index 000000000..b2b6038e4
--- /dev/null
+++ b/plugins/gem/README.md
@@ -0,0 +1,17 @@
+## Gem Plugin
+
+This plugin adds completions and aliases for [Gem](https://rubygems.org/). The completions include the common `gem` subcommands as well as the installed gems in the current directory.
+
+To use it, add `gem` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... gem)
+```
+## Aliases
+
+| Alias | Command               |
+|-------|-----------------------|
+| gemb  | `gem build *.gemspec` |
+| gemp  | `gem push *.gem`      |
+| gemy  | `gem yank $1 -v $2`   |
+
-- 
cgit v1.2.3-70-g09d2


From 6c721e6f95d765ea01b748f47b355febb3bb1715 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Thu, 4 Oct 2018 23:13:16 +0200
Subject: add alias descriptions

---
 plugins/gem/README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'plugins')

diff --git a/plugins/gem/README.md b/plugins/gem/README.md
index b2b6038e4..08f52c8ed 100644
--- a/plugins/gem/README.md
+++ b/plugins/gem/README.md
@@ -7,11 +7,11 @@ To use it, add `gem` to the plugins array in your zshrc file:
 ```zsh
 plugins=(... gem)
 ```
-## Aliases
 
-| Alias | Command               |
-|-------|-----------------------|
-| gemb  | `gem build *.gemspec` |
-| gemp  | `gem push *.gem`      |
-| gemy  | `gem yank $1 -v $2`   |
+## Aliases
 
+| Alias                | Command                       | Description                                |
+|----------------------|-------------------------------|--------------------------------------------|
+| gemb                 | `gem build *.gemspec`         | Build a gem from a gemspec                 |
+| gemp                 | `gem push *.gem`              | Push a gem up to the gem server            |
+| gemy [gem] [version] | `gem yank [gem] -v [version]` | Remove a pushed gem version from the index |
-- 
cgit v1.2.3-70-g09d2


From 13b87570447a4cc9411d858fa057252f6c166e86 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Thu, 4 Oct 2018 23:13:46 +0200
Subject: change title to h1

---
 plugins/gem/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/gem/README.md b/plugins/gem/README.md
index 08f52c8ed..decd87ba3 100644
--- a/plugins/gem/README.md
+++ b/plugins/gem/README.md
@@ -1,4 +1,4 @@
-## Gem Plugin
+# Gem plugin
 
 This plugin adds completions and aliases for [Gem](https://rubygems.org/). The completions include the common `gem` subcommands as well as the installed gems in the current directory.
 
-- 
cgit v1.2.3-70-g09d2


From b0274a8877436b048a49bdcd41987d3101781f28 Mon Sep 17 00:00:00 2001
From: Jayadeep K M <kmjayadeep@users.noreply.github.com>
Date: Fri, 5 Oct 2018 02:57:09 +0530
Subject: systemd: add README (#7225)

---
 plugins/systemd/README.md | 53 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 plugins/systemd/README.md

(limited to 'plugins')

diff --git a/plugins/systemd/README.md b/plugins/systemd/README.md
new file mode 100644
index 000000000..d91329290
--- /dev/null
+++ b/plugins/systemd/README.md
@@ -0,0 +1,53 @@
+# Systemd plugin
+
+The systemd plugin provides many useful aliases for systemd.
+
+To use it, add systemd to the plugins array of your zshrc file:
+```
+plugins=(... systemd)
+```
+
+## Aliases
+
+| Alias                  | Command                            | Description                                                      |
+|:-----------------------|:-----------------------------------|:-----------------------------------------------------------------|
+| `sc-list-units`        | `systemctl list-units`             | List all units systemd has in memory                             |
+| `sc-is-active`         | `systemctl is-active`              | Show whether a unit is active                                    |
+| `sc-status`            | `systemctl status`                 | Show terse runtime status information about one or more units    |
+| `sc-show`              | `systemctl show`                   | Show properties of units, jobs, or the manager itself            |
+| `sc-help`              | `systemctl help`                   | Show man page of units                                           |
+| `sc-list-unit-files`   | `systemctl list-unit-files`        | List unit files installed on the system                          |
+| `sc-is-enabled`        | `systemctl is-enabled`             | Checks whether any of the specified unit files are enabled       |
+| `sc-list-jobs`         | `systemctl list-jobs`              | List jobs that are in progress                                   |
+| `sc-show-environment`  | `systemctl show-environment`       | Dump the systemd manager environment block                       |
+| `sc-cat`               | `systemctl cat`                    | Show backing files of one or more units                          |
+| `sc-list-timers`       | `systemctl list-timers`            | List timer units currently in memory                             |
+| **Aliases with sudo**                                                                                                          |
+| `sc-start`             | `sudo systemctl start`             | Start Unit(s)                                                    |
+| `sc-stop`              | `sudo systemctl stop`              | Stop Unit(s)                                                     |
+| `sc-reload`            | `sudo systemctl reload`            | Reload Unit(s)                                                   |
+| `sc-restart`           | `sudo systemctl restart`           | Restart Unit(s)                                                  |
+| `sc-try-restart`       | `sudo systemctl try-restart`       | Restart Unit(s)                                                  |
+| `sc-isolate`           | `sudo systemctl isolate`           | Start a unit and its dependencies and stop all others            |
+| `sc-kill`              | `sudo systemctl kill`              | Kill unit(s)                                                     |
+| `sc-reset-failed`      | `sudo systemctl reset-failed`      | Reset the "failed" state of the specified units,                 |
+| `sc-enable`            | `sudo systemctl enable`            | Enable unit(s)                                                   |
+| `sc-disable`           | `sudo systemctl disable`           | Disable unit(s)                                                  |
+| `sc-reenable`          | `sudo systemctl reenable`          | Reenable unit(s)                                                 |
+| `sc-preset`            | `sudo systemctl preset`            | Reset the enable/disable status one or more unit files           |
+| `sc-mask`              | `sudo systemctl mask`              | Mask unit(s)                                                     |
+| `sc-unmask`            | `sudo systemctl unmask`            | Unmask unit(s)                                                   |
+| `sc-link`              | `sudo systemctl link`              | Link a unit file into the unit file search path                  |
+| `sc-load`              | `sudo systemctl load`              | Load unit(s)                                                     |
+| `sc-cancel`            | `sudo systemctl cancel`            | Cancel job(s)                                                    |
+| `sc-set-environment`   | `sudo systemctl set-environment`   | Set one or more systemd manager environment variables            |
+| `sc-unset-environment` | `sudo systemctl unset-environment` | Unset one or more systemd manager environment variables          |
+| `sc-edit`              | `sudo systemctl edit`              | Edit a drop-in snippet or a whole replacement file with `--full` |
+| `sc-enable-now`        | `sudo systemctl enable --now`      | Enable and start unit(s)                                         |
+| `sc-disable-now`       | `sudo systemctl disable --now`     | Disable and stop unit(s)                                         |
+| `sc-mask-now`          | `sudo systemctl mask --now`        | Mask and stop unit(s)                                            |
+
+### User aliases
+
+You can use the above aliases as `--user` by using the prefix `scu` instead of `sc`.
+For example: `scu-list-units` will be aliased to `systemctl --user list-units`.
-- 
cgit v1.2.3-70-g09d2


From 759f682088073f1df2665abc541fb8d77ff9c4db Mon Sep 17 00:00:00 2001
From: Jayadeep K M <kmjayadeep@users.noreply.github.com>
Date: Fri, 5 Oct 2018 03:05:39 +0530
Subject: docker-compose: add aliases to README (#7226)

---
 plugins/docker-compose/README.md | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/docker-compose/README.md b/plugins/docker-compose/README.md
index d3fcb29fe..07a87bc81 100644
--- a/plugins/docker-compose/README.md
+++ b/plugins/docker-compose/README.md
@@ -1,4 +1,29 @@
-# Docker-compose plugin for oh my zsh
+# Docker-compose
 
-A copy of the completion script from the [docker-compose](https://github.com/docker/compose/blob/master/contrib/completion/zsh/_docker-compose) git repo.
+This plugin provides completion for [docker-compose](https://docs.docker.com/compose/) as well as some
+aliases for frequent docker-compose commands.
 
+To use it, add docker-compose to the plugins array of your zshrc file:
+```
+plugins=(... docker-compose)
+```
+
+## Aliases
+
+| Alias     | Command                  | Description                                                      |
+|-----------|--------------------------|------------------------------------------------------------------|
+| dco       | `docker-compose`         | Docker-compose main command                                      |
+| dcb       | `docker-compose build`   | Build containers                                                 |
+| dce       | `docker-compose exec`    | Execute command inside a container                               |
+| dcps      | `docker-compose ps`      | List containers                                                  |
+| dcrestart | `docker-compose restart` | Restart container                                                |
+| dcrm      | `docker-compose rm`      | Remove container                                                 |
+| dcr       | `docker-compose run`     | Run a command in container                                       |
+| dcstop    | `docker-compose stop`    | Stop a container                                                 |
+| dcup      | `docker-compose up`      | Build, (re)create, start, and attach to containers for a service |
+| dcupd     | `docker-compose up -d`   | Same as `dcup`, but starts as daemon                             |
+| dcdn      | `docker-compose down`    | Stop and remove containers                                       |
+| dcl       | `docker-compose logs`    | Show logs of container                                           |
+| dclf      | `docker-compose logs -f` | Show logs and follow output                                      |
+| dcpull    | `docker-compose pull`    | Pull image of a service                                          |
+| dcstart   | `docker-compose start`   | Start a container                                                |
-- 
cgit v1.2.3-70-g09d2


From 2cb7bc7357ff70382bf15a775b534fd0fe559969 Mon Sep 17 00:00:00 2001
From: Aswath K <aswath.sana@gmail.com>
Date: Fri, 5 Oct 2018 03:11:34 +0530
Subject: Add READMEs to plugins: yum, mosh, themes (#7229)

---
 plugins/mosh/README.md   |  9 +++++++++
 plugins/themes/README.md | 18 ++++++++++++++++++
 plugins/yum/README.md    | 28 ++++++++++++++++++++++++++++
 3 files changed, 55 insertions(+)
 create mode 100644 plugins/mosh/README.md
 create mode 100644 plugins/themes/README.md
 create mode 100644 plugins/yum/README.md

(limited to 'plugins')

diff --git a/plugins/mosh/README.md b/plugins/mosh/README.md
new file mode 100644
index 000000000..4bbecf478
--- /dev/null
+++ b/plugins/mosh/README.md
@@ -0,0 +1,9 @@
+# Mosh Plugin
+
+This plugin allows SSH tab completion for [mosh](https://mosh.org/) hostnames.
+
+To use it, add `mosh` to the plugins array in your zshrc file:
+
+```
+plugins=(... mosh)
+```
diff --git a/plugins/themes/README.md b/plugins/themes/README.md
new file mode 100644
index 000000000..408e357e0
--- /dev/null
+++ b/plugins/themes/README.md
@@ -0,0 +1,18 @@
+# Themes Plugin
+
+This plugin allows you to change ZSH theme on the go.
+
+To use it, add `themes` to the plugins array in your zshrc file:
+
+```
+plugins=(... themes)
+```
+
+## Usage
+
+`theme <theme_name>` - Changes the ZSH theme to specified theme.
+
+`theme ` - Changes the ZSH theme to some random theme.
+
+`lstheme ` - Lists installed ZSH themes.
+
diff --git a/plugins/yum/README.md b/plugins/yum/README.md
new file mode 100644
index 000000000..5053d4d42
--- /dev/null
+++ b/plugins/yum/README.md
@@ -0,0 +1,28 @@
+# Yum plugin
+
+This plugin adds useful aliases for common [Yum](http://yum.baseurl.org/) commands.
+
+To use it, add `yum` to the plugins array in your zshrc file:
+
+```
+plugins=(... yum)
+```
+
+## Aliases
+
+| Alias | Command                           | Description                  |
+|-------|-----------------------------------|------------------------------|
+| ys    | `yum search`                      | Search package               |
+| yp    | `yum info`                        | Show package info            |
+| yl    | `yum list`                        | List packages                |
+| ygl   | `yum grouplist`                   | List package groups          |
+| yli   | `yum list installed`              | Print all installed packages |
+| ymc   | `yum makecache`                   | Rebuild the yum package list |
+| yu    | `sudo yum update`                 | Upgrade packages             |
+| yi    | `sudo yum install`                | Install package              |
+| ygi   | `sudo yum groupinstall`           | Install package group        |
+| yr    | `sudo yum remove`                 | Remove package               |
+| ygr   | `sudo yum groupremove`            | Remove pagage group          |
+| yrl   | `sudo yum remove --remove-leaves` | Remove package and leaves    |
+| yc    | `sudo yum clean all`              | Clean yum cache              |
+
-- 
cgit v1.2.3-70-g09d2


From 982e14cd3ac33951efd288c917f17ff6439951ab Mon Sep 17 00:00:00 2001
From: Griko Nibras <grikomsn@gmail.com>
Date: Fri, 5 Oct 2018 04:47:36 +0700
Subject: dircycle: improve README (#7223)

+ changed keypresses to use the <kbd> tag
+ added "rebinding keys" section
- removed line break on description
- removed line break on "rebinding keys"
---
 plugins/dircycle/README.md | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'plugins')

diff --git a/plugins/dircycle/README.md b/plugins/dircycle/README.md
index 9e1b3f644..3ac162f05 100644
--- a/plugins/dircycle/README.md
+++ b/plugins/dircycle/README.md
@@ -2,9 +2,7 @@
 
 Plugin for cycling through the directory stack
 
-This plugins enables directory navigation similar when using back and forward on browsers or common file explorers like Finder or Nautilus.
-
-This is a small zle trick that lets you cycle your directory stack left or right using Ctrl+Shift+Left/Right. This is useful when moving back and forth between directories in development environments, and can be thought of as kind of a nondestructive pushd/popd.
+This plugin enables directory navigation similar to using back and forward on browsers or common file explorers like Finder or Nautilus. It uses a small zle trick that lets you cycle through your directory stack left or right using <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Left</kbd> / <kbd>Right</kbd> . This is useful when moving back and forth between directories in development environments, and can be thought of as kind of a nondestructive pushd/popd.
 
 ## Enabling the plugin
 
@@ -68,12 +66,13 @@ Here's an asciinema cast demonstrating the example above:
 | `insert-cycledleft`  | Change `$CWD` to the previous known stack, binded on <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Left</kbd> |
 | `insert-cycledright` | Change `$CWD` to the next known stack, binded on <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Right</kbd>    |
 
-You can bind these functions to other key sequences, as long as you know the bindkey sequence:
+## Rebinding keys
 
-For example, these commands bind to Alt+Shift+Left/Right in xterm-256color:
-```
+You can bind these functions to other key sequences, as long as you know the bindkey sequence. For example, these commands bind to <kbd>Alt</kbd> + <kbd>Shift</kbd> + <kbd>Left</kbd> / <kbd>Right</kbd> in `xterm-256color`:
+
+```zsh
 bindkey '^[[1;4D' insert-cycledleft
 bindkey '^[[1;4C' insert-cycledright
 ```
 
-You can get the bindkey sequence pressing <kbd>Ctrl</kbd> + <kbd>V</kbd>, then pressing the keyboard shortcut you want to use.
+You can get the bindkey sequence by pressing <kbd>Ctrl</kbd> + <kbd>V</kbd>, then pressing the keyboard shortcut you want to use.
-- 
cgit v1.2.3-70-g09d2


From 0963a9a4cca55856582360051aaa41497388985f Mon Sep 17 00:00:00 2001
From: Niklas Gögge <n.goeggi@gmail.com>
Date: Fri, 5 Oct 2018 09:29:43 +0200
Subject: iterm2: add README (#7230)

---
 plugins/iterm2/README.md | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 plugins/iterm2/README.md

(limited to 'plugins')

diff --git a/plugins/iterm2/README.md b/plugins/iterm2/README.md
new file mode 100644
index 000000000..50cdebf5e
--- /dev/null
+++ b/plugins/iterm2/README.md
@@ -0,0 +1,29 @@
+# iTerm2 plugin
+
+This plugin adds a few functions that are useful when using [iTerm2](https://www.iterm2.com/).
+
+To use it, add _iterm2_ to the plugins array of your zshrc file:
+```
+plugins=(... iterm2)
+```
+
+## Plugin commands
+
+* `_iterm2_command <iterm2-command>`
+  executes an arbitrary iTerm2 command via an escape code sequence.
+  See https://iterm2.com/documentation-escape-codes.html for all supported commands.
+
+* `iterm2_profile <profile-name>`
+  changes the current terminal window's profile (colors, fonts, settings, etc).
+  `profile-name` is the name of another iTerm2 profile. The profile name can contain spaces.
+
+* `iterm2_tab_color <red> <green> <blue>`
+  changes the color of iTerm2's currently active tab.
+  `red`/`green`/`blue` are on the range 0-255.
+
+* `iterm2_tab_color_reset`
+  resets the color of iTerm2's current tab back to default.
+
+## Contributors
+
+- [Aviv Rosenberg](https://github.com/avivrosenberg)
-- 
cgit v1.2.3-70-g09d2


From 50cb0846a9b8216a17fa1e7161ab6562f1dff593 Mon Sep 17 00:00:00 2001
From: Griko Nibras <grikomsn@gmail.com>
Date: Fri, 5 Oct 2018 14:38:50 +0700
Subject: lol: add README (#7231)

---
 plugins/lol/README.md | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 plugins/lol/README.md

(limited to 'plugins')

diff --git a/plugins/lol/README.md b/plugins/lol/README.md
new file mode 100644
index 000000000..b0e54f575
--- /dev/null
+++ b/plugins/lol/README.md
@@ -0,0 +1,83 @@
+# lol
+
+Plugin for adding catspeak aliases, because why not
+
+## Enabling the plugin
+
+1. Open your `.zshrc` file and add `lol` in the plugins section:
+
+   ```zsh
+   plugins=(
+       # all your enabled plugins
+       lol
+   )
+   ```
+
+2. Reload the source file or restart your Terminal session:
+
+   ```console
+   $ source ~/.zshrc
+   $
+   ```
+
+## Aliases
+
+| Alias        | Command                                                          |
+| ------------ | ---------------------------------------------------------------- |
+| `:3`         | `echo`                                                           |
+| `alwayz`     | `tail -f`                                                        |
+| `bringz`     | `git pull`                                                       |
+| `btw`        | `nice`                                                           |
+| `byes`       | `exit`                                                           |
+| `chicken`    | `git add`                                                        |
+| `cya`        | `reboot`                                                         |
+| `donotwant`  | `rm`                                                             |
+| `dowant`     | `cp`                                                             |
+| `gimmeh`     | `touch`                                                          |
+| `gtfo`       | `mv`                                                             |
+| `hackzor`    | `git init`                                                       |
+| `hai`        | `cd`                                                             |
+| `icanhas`    | `mkdir`                                                          |
+| `ihasbucket` | `df -h`                                                          |
+| `iminurbase` | `finger`                                                         |
+| `inur`       | `locate`                                                         |
+| `invisible`  | `cat`                                                            |
+| `iz`         | `ls`                                                             |
+| `kthxbai`    | `halt`                                                           |
+| `letcat`     | `git checkout`                                                   |
+| `moar`       | `more`                                                           |
+| `nomnom`     | `killall`                                                        |
+| `nomz`       | `ps aux`                                                         |
+| `nowai`      | `chmod`                                                          |
+| `oanward`    | `git commit -m`                                                  |
+| `obtw`       | `nohup`                                                          |
+| `onoz`       | `cat /var/log/errors.log`                                        |
+| `ooanward`   | `git commit -am`                                                 |
+| `plz`        | `pwd`                                                            |
+| `pwned`      | `ssh`                                                            |
+| `rtfm`       | `man`                                                            |
+| `rulz`       | `git push`                                                       |
+| `tldr`       | `less`                                                           |
+| `violenz`    | `git rebase`                                                     |
+| `visible`    | `echo`                                                           |
+| `wtf`        | `dmesg`                                                          |
+| `yolo`       | `git commit -m "$(curl -s https://whatthecommit.com/index.txt)"` |
+
+## Usage Examples
+
+```sh
+# mkdir new-directory
+icanhas new-directory
+
+# killall firefox
+nomnom firefox
+
+# chmod u=r,go= some.file
+nowai u=r,go= some.file
+
+# ssh root@catserver.org
+pwned root@catserver.org
+
+# git commit -m "$(curl -s https://whatthecommit.com/index.txt)"
+yolo
+```
-- 
cgit v1.2.3-70-g09d2


From 43e5c9093a303acaac861c723b4de1914adcf99f Mon Sep 17 00:00:00 2001
From: Griko Nibras <grikomsn@gmail.com>
Date: Fri, 5 Oct 2018 14:43:45 +0700
Subject: catimg: add README (#7232)

---
 plugins/catimg/README.md | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 plugins/catimg/README.md

(limited to 'plugins')

diff --git a/plugins/catimg/README.md b/plugins/catimg/README.md
new file mode 100644
index 000000000..2fc28a1c6
--- /dev/null
+++ b/plugins/catimg/README.md
@@ -0,0 +1,35 @@
+# catimg
+
+Plugin for displaying images on the terminal using the the `catimg.sh` script provided by [posva](https://github.com/posva/catimg)
+
+## Requirements
+
+- `convert` (ImageMagick)
+
+## Enabling the plugin
+
+1. Open your `.zshrc` file and add `catimg` in the plugins section:
+
+   ```zsh
+   plugins=(
+       # all your enabled plugins
+       catimg
+   )
+   ```
+
+2. Reload the source file or restart your Terminal session:
+
+   ```console
+   $ source ~/.zshrc
+   $
+   ```
+
+## Functions
+
+| Function | Description                              |
+| -------- | ---------------------------------------- |
+| `catimg` | Displays the given image on the terminal |
+
+## Usage examples
+
+[![asciicast](https://asciinema.org/a/204702.png)](https://asciinema.org/a/204702)
-- 
cgit v1.2.3-70-g09d2


From 08f2fc12143175d011d69189679b0ed4c834b5c7 Mon Sep 17 00:00:00 2001
From: Aswath K <aswath.sana@gmail.com>
Date: Fri, 5 Oct 2018 13:43:39 +0530
Subject: themes: fix custom themes directory (#7233)

---
 plugins/themes/themes.plugin.zsh | 4 ++--
 plugins/yum/README.md            | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'plugins')

diff --git a/plugins/themes/themes.plugin.zsh b/plugins/themes/themes.plugin.zsh
index 7519b0253..487e85689 100644
--- a/plugins/themes/themes.plugin.zsh
+++ b/plugins/themes/themes.plugin.zsh
@@ -8,9 +8,9 @@ function theme
 	source "$RANDOM_THEME"
 	echo "[oh-my-zsh] Random theme '$RANDOM_THEME' loaded..."
     else
-	if [ -f "$ZSH_CUSTOM/$1.zsh-theme" ]
+	if [ -f "$ZSH_CUSTOM/themes/$1.zsh-theme" ]
 	then
-	    source "$ZSH_CUSTOM/$1.zsh-theme"
+	    source "$ZSH_CUSTOM/themes/$1.zsh-theme"
 	else
 	    source "$ZSH/themes/$1.zsh-theme"
 	fi
diff --git a/plugins/yum/README.md b/plugins/yum/README.md
index 5053d4d42..8043421d8 100644
--- a/plugins/yum/README.md
+++ b/plugins/yum/README.md
@@ -25,4 +25,3 @@ plugins=(... yum)
 | ygr   | `sudo yum groupremove`            | Remove pagage group          |
 | yrl   | `sudo yum remove --remove-leaves` | Remove package and leaves    |
 | yc    | `sudo yum clean all`              | Clean yum cache              |
-
-- 
cgit v1.2.3-70-g09d2


From ae548a99733d869f52efa36f146bd020a786a41e Mon Sep 17 00:00:00 2001
From: Rubén Durán Balda <ruduran@users.noreply.github.com>
Date: Fri, 5 Oct 2018 20:23:30 +0200
Subject: jump: add README (#7237)

---
 plugins/jump/README.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 plugins/jump/README.md

(limited to 'plugins')

diff --git a/plugins/jump/README.md b/plugins/jump/README.md
new file mode 100644
index 000000000..ed6415289
--- /dev/null
+++ b/plugins/jump/README.md
@@ -0,0 +1,19 @@
+# Jump plugin
+
+This plugin allows to easily jump around the file system by manually adding marks.
+Those marks are stored as symbolic links in the directory `$MARKPATH` (default `$HOME/.marks`)
+
+To use it, add `jump` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... jump)
+```
+
+## Commands
+
+| Command              | Description                                                                                     |
+|----------------------|-------------------------------------------------------------------------------------------------|
+| `jump <mark-name>`   | Jump to the given mark                                                                          |
+| `mark [mark-name]`   | Create a mark with the given name or with the name of the current directory if none is provided |
+| `unmark <mark-name>` | Remove the given mark                                                                           |
+| `marks`              | List the existing marks and the directories they point to                                       |
-- 
cgit v1.2.3-70-g09d2


From e09eb23158c7c75b84b7dafb514dcfa86bd06dc3 Mon Sep 17 00:00:00 2001
From: Martin Nestorov <mdinestorov@gmail.com>
Date: Fri, 5 Oct 2018 21:43:04 +0300
Subject: emacs: add README (#7235)

---
 plugins/emacs/README.md | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 plugins/emacs/README.md

(limited to 'plugins')

diff --git a/plugins/emacs/README.md b/plugins/emacs/README.md
new file mode 100644
index 000000000..c8e33b5ab
--- /dev/null
+++ b/plugins/emacs/README.md
@@ -0,0 +1,30 @@
+# Emacs plugin
+
+This plugin utilizes the Emacs daemon capability, allowing the user to quickly open frames, whether they are opened in a terminal via a ssh connection, or X frames opened on the same host. The plugin also provides some aliases for such operations.
+
+- 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.
+
+**NOTE:** requires Emacs 24 and newer.
+
+To use it, add emacs to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... emacs)
+```
+
+## Aliases
+
+The plugin uses a custom launcher (which we'll call here `$EMACS_LAUNCHER`) that is just a wrapper around [`emacsclient`](https://www.emacswiki.org/emacs/EmacsClient).
+
+| Alias  | Command                                            | Description                                                    |
+|--------|----------------------------------------------------|----------------------------------------------------------------|
+| emacs  | `$EMACS_LAUNCHER --no-wait`                        | Opens a temporary emacsclient frame                            |
+| e      | `emacs`                                            | Same as emacs alias                                            |
+| te     | `$EMACS_LAUNCHER -nw`                              | Open terminal emacsclient                                      |
+| eeval  | `$EMACS_LAUNCHER --eval`                           | Same as `M-x eval` but from outside Emacs                      |
+| eframe | `emacsclient --alternate-editor "" --create-frame` | Create new X frame                                             |
+| efile  | -                                                  | Print the path to the file open in the current buffer          |
+| ecd    | -                                                  | Print the directory of the file open in the the current buffer |
-- 
cgit v1.2.3-70-g09d2


From 9e14387408fd83be63ac5158f4671944ca9bad14 Mon Sep 17 00:00:00 2001
From: Tristan Escalada <tristan@escalada.us>
Date: Fri, 5 Oct 2018 14:56:56 -0400
Subject: terraform: disable terraform prompt in $HOME (#7227)

In the home directory there is a .terraform folder for modules but it is most likely not
an actual directory of terraform scripts. Therefore, this patch disables checking for workspace in the home directory.
---
 plugins/terraform/terraform.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'plugins')

diff --git a/plugins/terraform/terraform.plugin.zsh b/plugins/terraform/terraform.plugin.zsh
index b170f73a6..d727c1ee0 100644
--- a/plugins/terraform/terraform.plugin.zsh
+++ b/plugins/terraform/terraform.plugin.zsh
@@ -1,4 +1,6 @@
 function tf_prompt_info() {
+    # dont show 'default' workspace in home dir
+    [[ "$PWD" == ~ ]] && return
     # check if in terraform dir
     if [ -d .terraform ]; then
       workspace=$(terraform workspace show 2> /dev/null) || return
-- 
cgit v1.2.3-70-g09d2


From 9aa8af3d0ce726cddf6e0e702abc5bfd90575257 Mon Sep 17 00:00:00 2001
From: Sandra Parsick <sparsick@users.noreply.github.com>
Date: Fri, 5 Oct 2018 23:18:10 +0200
Subject: kate: add README (#7238)

---
 plugins/kate/README.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 plugins/kate/README.md

(limited to 'plugins')

diff --git a/plugins/kate/README.md b/plugins/kate/README.md
new file mode 100644
index 000000000..aa2eaa3cc
--- /dev/null
+++ b/plugins/kate/README.md
@@ -0,0 +1,20 @@
+# Kate plugin
+
+This plugin adds aliases for the [Kate editor](https://kate-editor.org).
+
+To use it, add kate to the plugins array of your zshrc file:
+```
+plugins=(... kate)
+```
+
+## Aliases
+
+| Alias | Command                | Description         |
+|-------|------------------------|---------------------|
+| kate  | `kate >/dev/null 2>&1` | Start kate silently |
+
+## Functions
+
+| Function   | Description                              |
+|------------|------------------------------------------|
+| `kt <dir>` | Change to directory and start kate there |
-- 
cgit v1.2.3-70-g09d2


From 228d7d1041e4f275e792390614b96bebc10759c0 Mon Sep 17 00:00:00 2001
From: MasterOfTheTiger <ted.jameson@pm.me>
Date: Fri, 5 Oct 2018 15:02:47 -0700
Subject: dirhistory: add README (#7239)

---
 plugins/dirhistory/README.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 plugins/dirhistory/README.md

(limited to 'plugins')

diff --git a/plugins/dirhistory/README.md b/plugins/dirhistory/README.md
new file mode 100644
index 000000000..511f2be17
--- /dev/null
+++ b/plugins/dirhistory/README.md
@@ -0,0 +1,17 @@
+# Dirhistory plugin
+
+This plugin adds keyboard shortcuts for navigating directory history and hierarchy.
+
+To use it, add `dirhistory` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... dirhistory)
+```
+## Keyboard Shortcuts
+
+| Shortcut                          | Description                                               |
+|-----------------------------------|-----------------------------------------------------------|
+| <kbd>alt</kbd> + <kbd>left</kbd>  | Go to previous directory                                  |
+| <kbd>alt</kbd> + <kbd>right</kbd> | Undo <kbd>alt</kbd> + <kbd>left</kbd>                     |
+| <kbd>alt</kbd> + <kbd>up</kbd>    | Move into the parent directory                            |
+| <kbd>alt</kbd> + <kbd>down</kbd>  | Move into the first child directory by alphabetical order |
-- 
cgit v1.2.3-70-g09d2


From f93fedb6926b967c858b259767213c3154fbbbaa Mon Sep 17 00:00:00 2001
From: Mirko Lelansky <mlelansky@mail.de>
Date: Sat, 6 Oct 2018 13:59:18 +0200
Subject: mercurial: add hga alias for "hg add" (#4969)

Add an alias for adding files in the mercurial plugin.
---
 plugins/mercurial/mercurial.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins')

diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
index 3ae59496e..58bc571a0 100644
--- a/plugins/mercurial/mercurial.plugin.zsh
+++ b/plugins/mercurial/mercurial.plugin.zsh
@@ -1,4 +1,5 @@
 # Mercurial
+alias hga='hg add'
 alias hgc='hg commit'
 alias hgb='hg branch'
 alias hgba='hg branches'
-- 
cgit v1.2.3-70-g09d2


From a0c1eb32306734085ed26e2447f1050768b95d24 Mon Sep 17 00:00:00 2001
From: Forrest Wolf <forrest.weiswolf@gmail.com>
Date: Sat, 6 Oct 2018 12:12:45 -0400
Subject: Add README.md to the gitfast plugin (#7241)

* Create gitfast readme

* Add list of gitfast aliases
---
 plugins/gitfast/README.md | 138 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 138 insertions(+)
 create mode 100644 plugins/gitfast/README.md

(limited to 'plugins')

diff --git a/plugins/gitfast/README.md b/plugins/gitfast/README.md
new file mode 100644
index 000000000..c3073709e
--- /dev/null
+++ b/plugins/gitfast/README.md
@@ -0,0 +1,138 @@
+# Gitfast plugin
+
+This plugin adds completion for Git, using the zsh completion from git.git folks, which is much faster than the official one from zsh. A lot of zsh-specific features are not supported, like descriptions for every argument, but everything the bash completion has, this one does too (as it is using it behind the scenes). Not only is it faster, it should be more robust, and updated regularly to the latest git upstream version..
+
+To use it, add `gitfast` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... gitfast)
+```
+
+## Aliases
+
+| Alias                | Command                                                                                                                                |
+| -------------------- | -------------------------------------------------------------------------------------------------------------------------------------- |
+| g                    | `git`                                                                                                                                  |
+| ga                   | `git add`                                                                                                                              |
+| gaa                  | `git add --all`                                                                                                                        |
+| gapa                 | `git add --patch`                                                                                                                      |
+| gau                  | `git add --update`                                                                                                                     |
+| gb                   | `git branch`                                                                                                                           |
+| gba                  | `git branch -a`                                                                                                                        |
+| gbd                  | `git branch -d`                                                                                                                        |
+| gbda                 | `git branch --no-color --merged | command grep -vE "^(\*|\s*(master|develop|dev)\s*$)" | command xargs -n 1 git branch -d`             |
+| gbl                  | `git blame -b -w`                                                                                                                      |
+| gbnm                 | `git branch --no-merged`                                                                                                               |
+| gbr                  | `git branch --remote`                                                                                                                  |
+| gbs                  | `git bisect`                                                                                                                           |
+| gbsb                 | `git bisect bad`                                                                                                                       |
+| gbsg                 | `git bisect good`                                                                                                                      |
+| gbsr                 | `git bisect reset`                                                                                                                     |
+| gbss                 | `git bisect start`                                                                                                                     |
+| gc                   | `git commit -v`                                                                                                                        |
+| gc!                  | `git commit -v --amend`                                                                                                                |
+| gca                  | `git commit -v -a`                                                                                                                     |
+| gca!                 | `git commit -v -a --amend`                                                                                                             |
+| gcam                 | `git commit -a -m`                                                                                                                     |
+| gcan!                | `git commit -v -a --no-edit --amend`                                                                                                   |
+| gcans!               | `git commit -v -a -s --no-edit --amend`                                                                                                |
+| gcb                  | `git checkout -b`                                                                                                                      |
+| gcd                  | `git checkout develop`                                                                                                                 |
+| gcf                  | `git config --list`                                                                                                                    |
+| gcl                  | `git clone --recursive`                                                                                                                |
+| gclean               | `git clean -fd`                                                                                                                        |
+| gcm                  | `git checkout master`                                                                                                                  |
+| gcmsg                | `git commit -m`                                                                                                                        |
+| gcn!                 | `git commit -v --no-edit --amend`                                                                                                      |
+| gco                  | `git checkout`                                                                                                                         |
+| gcount               | `git shortlog -sn`                                                                                                                     |
+| gcp                  | `git cherry-pick`                                                                                                                      |
+| gcpa                 | `git cherry-pick --abort`                                                                                                              |
+| gcpc                 | `git cherry-pick --continue`                                                                                                           |
+| gcs                  | `git commit -S`                                                                                                                        |
+| gcsm                 | `git commit -s -m`                                                                                                                     |
+| gd                   | `git diff`                                                                                                                             |
+| gdca                 | `git diff --cached`                                                                                                                    |
+| gdct                 | `` git describe --tags `git rev-list --tags --max-count=1` ``                                                                          |
+| gdt                  | `git diff-tree --no-commit-id --name-only -r`                                                                                          |
+| gdw                  | `git diff --word-diff`                                                                                                                 |
+| gf                   | `git fetch`                                                                                                                            |
+| gfa                  | `git fetch --all --prune`                                                                                                              |
+| gfo                  | `git fetch origin`                                                                                                                     |
+| gg                   | `git gui citool`                                                                                                                       |
+| gga                  | `git gui citool --amend`                                                                                                               |
+| ggpull               | `git pull origin $(git_current_branch)`                                                                                                |
+| ggpur                | `ggu`                                                                                                                                  |
+| ggpush               | `git push origin $(git_current_branch)`                                                                                                |
+| ggsup                | `git branch --set-upstream-to=origin/$(git_current_branch)`                                                                            |
+| ghh                  | `git help`                                                                                                                             |
+| gignore              | `git update-index --assume-unchanged`                                                                                                  |
+| gignored             | `git ls-files -v | grep "^[[:lower:]]"`                                                                                                |
+| git-svn-dcommit-push | `git svn dcommit && git push github master:svntrunk`                                                                                   |
+| gk                   | `\gitk --all --branches`                                                                                                               |
+| gke                  | `\gitk --all $(git log -g --pretty=%h)`                                                                                                |
+| gl                   | `git pull`                                                                                                                             |
+| glg                  | `git log --stat`                                                                                                                       |
+| glgg                 | `git log --graph`                                                                                                                      |
+| glgga                | `git log --graph --decorate --all`                                                                                                     |
+| glgm                 | `git log --graph --max-count=10`                                                                                                       |
+| glgp                 | `git log --stat -p`                                                                                                                    |
+| glo                  | `git log --oneline --decorate`                                                                                                         |
+| glog                 | `git log --oneline --decorate --graph`                                                                                                 |
+| gloga                | `git log --oneline --decorate --graph --all`                                                                                           |
+| glol                 | `git log --graph --pretty='\''%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'\'' --abbrev-commit`       |
+| glola                | `git log --graph --pretty='\''%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'\'' --abbrev-commit --all` |
+| glp                  | `_git_log_prettily`                                                                                                                    |
+| glum                 | `git pull upstream master`                                                                                                             |
+| gm                   | `git merge`                                                                                                                            |
+| gmom                 | `git merge origin/master`                                                                                                              |
+| gmt                  | `git mergetool --no-prompt`                                                                                                            |
+| gmtvim               | `git mergetool --no-prompt --tool=vimdiff`                                                                                             |
+| gmum                 | `git merge upstream/master`                                                                                                            |
+| gp                   | `git push`                                                                                                                             |
+| gpd                  | `git push --dry-run`                                                                                                                   |
+| gpoat                | `git push origin --all && git push origin --tags`                                                                                      |
+| gpristine            | `git reset --hard && git clean -dfx`                                                                                                   |
+| gpsup                | `git push --set-upstream origin $(git_current_branch)`                                                                                 |
+| gpu                  | `git push upstream`                                                                                                                    |
+| gpv                  | `git push -v`                                                                                                                          |
+| gr                   | `git remote`                                                                                                                           |
+| gra                  | `git remote add`                                                                                                                       |
+| grb                  | `git rebase`                                                                                                                           |
+| grba                 | `git rebase --abort`                                                                                                                   |
+| grbc                 | `git rebase --continue`                                                                                                                |
+| grbi                 | `git rebase -i`                                                                                                                        |
+| grbm                 | `git rebase master`                                                                                                                    |
+| grbs                 | `git rebase --skip`                                                                                                                    |
+| grh                  | `git reset HEAD`                                                                                                                       |
+| grhh                 | `git reset HEAD --hard`                                                                                                                |
+| grmv                 | `git remote rename`                                                                                                                    |
+| grrm                 | `git remote remove`                                                                                                                    |
+| grset                | `git remote set-url`                                                                                                                   |
+| grt                  | `cd $(git rev-parse --show-toplevel || echo ".")`                                                                                      |
+| gru                  | `git reset --`                                                                                                                         |
+| grup                 | `git remote update`                                                                                                                    |
+| grv                  | `git remote -v`                                                                                                                        |
+| gsb                  | `git status -sb`                                                                                                                       |
+| gsd                  | `git svn dcommit`                                                                                                                      |
+| gsi                  | `git submodule init`                                                                                                                   |
+| gsps                 | `git show --pretty=short --show-signature`                                                                                             |
+| gsr                  | `git svn rebase`                                                                                                                       |
+| gss                  | `git status -s`                                                                                                                        |
+| gst                  | `git status`                                                                                                                           |
+| gsta                 | `git stash save`                                                                                                                       |
+| gstaa                | `git stash apply`                                                                                                                      |
+| gstc                 | `git stash clear`                                                                                                                      |
+| gstd                 | `git stash drop`                                                                                                                       |
+| gstl                 | `git stash list`                                                                                                                       |
+| gstp                 | `git stash pop`                                                                                                                        |
+| gsts                 | `git stash show --text`                                                                                                                |
+| gsu                  | `git submodule update`                                                                                                                 |
+| gts                  | `git tag -s`                                                                                                                           |
+| gtv                  | `git tag | sort -V`                                                                                                                    |
+| gunignore            | `git update-index --no-assume-unchanged`                                                                                               |
+| gunwip               | `git log -n 1 | grep -q -c "\-\-wip\-\-" && git reset HEAD~1`                                                                          |
+| gup                  | `git pull --rebase`                                                                                                                    |
+| gupv                 | `git pull --rebase -v`                                                                                                                 |
+| gwch                 | `git whatchanged -p --abbrev-commit --pretty=medium`                                                                                   |
+| gwip                 | `git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify -m "--wip-- [skip ci]"`                             |
-- 
cgit v1.2.3-70-g09d2


From 5fbd8e4ee127f39f0eaf661a730be3243f210292 Mon Sep 17 00:00:00 2001
From: Lakindu Akash <Lakinduakash@gmail.com>
Date: Sun, 7 Oct 2018 21:46:02 +0530
Subject: add auto completion on ng update (#7244)

add new option update and add all the options for ng update
---
 plugins/ng/ng.plugin.zsh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/ng/ng.plugin.zsh b/plugins/ng/ng.plugin.zsh
index 2488bc230..b802bf617 100644
--- a/plugins/ng/ng.plugin.zsh
+++ b/plugins/ng/ng.plugin.zsh
@@ -1,5 +1,5 @@
 
-ng_opts='addon asset-sizes b build completion d destroy doc e2e g generate get github-pages:deploy gh-pages:deploy h help i init install lint make-this-awesome new s serve server set t test v version -h --help'
+ng_opts='addon asset-sizes b build completion d destroy doc e2e g generate get github-pages:deploy gh-pages:deploy h help i init install lint make-this-awesome new s serve server set t test update v version -h --help'
 
 _ng_completion () {
   local words cword opts
@@ -55,6 +55,10 @@ _ng_completion () {
     t | test )
       opts='--browsers --colors --config-file --environment --filter --host --launch --log-level --module --path --port --query --reporter --server --silent --test-page --test-port --watch -H -c -cf -e -f -m -r -s -tp -w'
       ;;
+      
+    update )
+      opts='--all --dryRun --force --from --migrate-only --next --registry --to -d'
+      ;;
 
     v | version )
       opts='--verbose'
-- 
cgit v1.2.3-70-g09d2


From ca5bbd7526f19d5694ed54422ba99ba22e7c56c8 Mon Sep 17 00:00:00 2001
From: Sandra Parsick <sparsick@users.noreply.github.com>
Date: Sun, 7 Oct 2018 18:16:49 +0200
Subject:  #7175 improve vagrant readme (#7247)

---
 plugins/vagrant/README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/vagrant/README.md b/plugins/vagrant/README.md
index 5978c2f53..f6ea87b0e 100644
--- a/plugins/vagrant/README.md
+++ b/plugins/vagrant/README.md
@@ -1,9 +1,10 @@
 # Vagrant plugin
 
-This plugin adds completion for [Vagrant](https://www.vagrantup.com/)
+This plugin adds autocompletion for [Vagrant](https://www.vagrantup.com/) commands, task names, box names and built-in handy documentation.
 
 To use it, add `vagrant` to the plugins array in your zshrc file:
 
 ```zsh
 plugins=(... vagrant)
 ```
+
-- 
cgit v1.2.3-70-g09d2


From ab9d92f66594f1eb20fbd3b067d4d4640cf0da1f Mon Sep 17 00:00:00 2001
From: Sebastian Müller <sbmueller@users.noreply.github.com>
Date: Sun, 7 Oct 2018 18:17:29 +0200
Subject: Add README for vundle plugin (#7245)

---
 plugins/vundle/README.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 plugins/vundle/README.md

(limited to 'plugins')

diff --git a/plugins/vundle/README.md b/plugins/vundle/README.md
new file mode 100644
index 000000000..499038562
--- /dev/null
+++ b/plugins/vundle/README.md
@@ -0,0 +1,19 @@
+# Vundle plugin
+
+This plugin adds functions to control [vundle](https://github.com/VundleVim/Vundle.vim) plug-in manager for vim.
+
+To use it, add `vundle` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... vundle)
+```
+
+## Functions
+
+| Function      | Usage           | Description                                                                |
+|---------------|-----------------|----------------------------------------------------------------------------|
+| vundle-init   | `vundle-init`   | Install vundle by cloning git repository into ~/.vim folder                |
+| vundle        | `vundle`        | Install plugins set in .vimrc (equals `:PluginInstall`)                    |
+| vundle-update | `vundle-update` | Update plugins set in .vimrc (equals `:PluginInstall!`)                    |
+| vundle-clean  | `vundle-clean`  | Delete plugins that have been removed from .vimrc (equals `:PluginClean!`) |
+
-- 
cgit v1.2.3-70-g09d2


From 3b09476376a8a487c4617e85287d0fcc7f213e5d Mon Sep 17 00:00:00 2001
From: Mark Jeromin <mjeromin@users.noreply.github.com>
Date: Sun, 7 Oct 2018 17:29:50 -0400
Subject: autopep8: add README (#7249)

---
 plugins/autopep8/README.md           | 8 ++++++++
 plugins/autopep8/autopep8.plugin.zsh | 0
 2 files changed, 8 insertions(+)
 create mode 100644 plugins/autopep8/README.md
 delete mode 100644 plugins/autopep8/autopep8.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/autopep8/README.md b/plugins/autopep8/README.md
new file mode 100644
index 000000000..02bbb9af4
--- /dev/null
+++ b/plugins/autopep8/README.md
@@ -0,0 +1,8 @@
+# autopep8 plugin
+
+This plugin adds completion for [autopep8](https://pypi.org/project/autopep8/), a tool that automatically formats Python code to conform to the [PEP 8](http://www.python.org/dev/peps/pep-0008/) style guide.
+
+To use it, add autopep8 to the plugins array of your zshrc file:
+```
+plugins=(... autopep8)
+```
diff --git a/plugins/autopep8/autopep8.plugin.zsh b/plugins/autopep8/autopep8.plugin.zsh
deleted file mode 100644
index e69de29bb..000000000
-- 
cgit v1.2.3-70-g09d2


From 6b7c0805f07a9ca3a2391b46aae80f069224fa17 Mon Sep 17 00:00:00 2001
From: Mark Jeromin <mjeromin@users.noreply.github.com>
Date: Sun, 7 Oct 2018 17:30:37 -0400
Subject: pep8: add README (#7248)

---
 plugins/pep8/README.md | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 plugins/pep8/README.md

(limited to 'plugins')

diff --git a/plugins/pep8/README.md b/plugins/pep8/README.md
new file mode 100644
index 000000000..a9a4f1cd0
--- /dev/null
+++ b/plugins/pep8/README.md
@@ -0,0 +1,8 @@
+# pep8 plugin
+
+This plugin adds completion for [pep8](https://pep8.readthedocs.io/en/release-1.7.x/#), a tool to check your Python code against some of the style conventions in [PEP 8](http://www.python.org/dev/peps/pep-0008/).
+
+To use it, add pep8 to the plugins array of your zshrc file:
+```
+plugins=(... pep8)
+```
-- 
cgit v1.2.3-70-g09d2


From 7b29684a3087c881f240ebb74bd387c69f0ffcc6 Mon Sep 17 00:00:00 2001
From: Raul Ferreira <raulmendesferreira@gmail.com>
Date: Sun, 7 Oct 2018 22:33:29 +0100
Subject: swiftpm: update swift completion script (#7243)

---
 plugins/swiftpm/_swift | 147 ++++++++++++++++++++++++++-----------------------
 1 file changed, 79 insertions(+), 68 deletions(-)

(limited to 'plugins')

diff --git a/plugins/swiftpm/_swift b/plugins/swiftpm/_swift
index 901b5d9e2..bed6e13a7 100644
--- a/plugins/swiftpm/_swift
+++ b/plugins/swiftpm/_swift
@@ -72,14 +72,16 @@ _swift_build() {
         "--build-path[Specify build/cache directory ]:Specify build/cache directory :_files"
         "(--chdir -C)"{--chdir,-C}"[]: :_files"
         "--package-path[Change working directory before any other operation]:Change working directory before any other operation:_files"
+        "--sanitize[Turn on runtime checks for erroneous behavior]: :{_values '' 'address[enable Address sanitizer]' 'thread[enable Thread sanitizer]'}"
         "--disable-prefetching[]"
+        "--skip-update[Skip updating dependencies from their remote during a resolution]"
         "--disable-sandbox[Disable using the sandbox when executing subprocesses]"
         "--version[]"
         "--destination[]: :_files"
         "(--verbose -v)"{--verbose,-v}"[Increase verbosity of informational output]"
-        "--no-static-swift-stdlib[Do not link Swift stdlib statically]"
+        "--no-static-swift-stdlib[Do not link Swift stdlib statically \[default\]]"
         "--static-swift-stdlib[Link Swift stdlib statically]"
-        "--enable-build-manifest-caching[Enable llbuild manifest caching [Experimental]]"
+        "--enable-build-manifest-caching[Enable llbuild manifest caching \[Experimental\]]"
         "--build-tests[Build both source and test targets]"
         "--product[Build the specified product]:Build the specified product: "
         "--target[Build the specified target]:Build the specified target: "
@@ -106,14 +108,16 @@ _swift_run() {
         "--build-path[Specify build/cache directory ]:Specify build/cache directory :_files"
         "(--chdir -C)"{--chdir,-C}"[]: :_files"
         "--package-path[Change working directory before any other operation]:Change working directory before any other operation:_files"
+        "--sanitize[Turn on runtime checks for erroneous behavior]: :{_values '' 'address[enable Address sanitizer]' 'thread[enable Thread sanitizer]'}"
         "--disable-prefetching[]"
+        "--skip-update[Skip updating dependencies from their remote during a resolution]"
         "--disable-sandbox[Disable using the sandbox when executing subprocesses]"
         "--version[]"
         "--destination[]: :_files"
         "(--verbose -v)"{--verbose,-v}"[Increase verbosity of informational output]"
-        "--no-static-swift-stdlib[Do not link Swift stdlib statically]"
+        "--no-static-swift-stdlib[Do not link Swift stdlib statically \[default\]]"
         "--static-swift-stdlib[Link Swift stdlib statically]"
-        "--enable-build-manifest-caching[Enable llbuild manifest caching [Experimental]]"
+        "--enable-build-manifest-caching[Enable llbuild manifest caching \[Experimental\]]"
         "--skip-build[Skip building the executable product]"
     )
     _arguments $arguments && return
@@ -136,14 +140,16 @@ _swift_package() {
         "--build-path[Specify build/cache directory ]:Specify build/cache directory :_files"
         "(--chdir -C)"{--chdir,-C}"[]: :_files"
         "--package-path[Change working directory before any other operation]:Change working directory before any other operation:_files"
+        "--sanitize[Turn on runtime checks for erroneous behavior]: :{_values '' 'address[enable Address sanitizer]' 'thread[enable Thread sanitizer]'}"
         "--disable-prefetching[]"
+        "--skip-update[Skip updating dependencies from their remote during a resolution]"
         "--disable-sandbox[Disable using the sandbox when executing subprocesses]"
         "--version[]"
         "--destination[]: :_files"
         "(--verbose -v)"{--verbose,-v}"[Increase verbosity of informational output]"
-        "--no-static-swift-stdlib[Do not link Swift stdlib statically]"
+        "--no-static-swift-stdlib[Do not link Swift stdlib statically \[default\]]"
         "--static-swift-stdlib[Link Swift stdlib statically]"
-        "--enable-build-manifest-caching[Enable llbuild manifest caching [Experimental]]"
+        "--enable-build-manifest-caching[Enable llbuild manifest caching \[Experimental\]]"
         '(-): :->command'
         '(-)*:: :->arg'
     )
@@ -152,135 +158,133 @@ _swift_package() {
         (command)
             local modes
             modes=(
+                'edit:Put a package in editable mode'
+                'clean:Delete build artifacts'
+                'init:Initialize a new package'
+                'dump-package:Print parsed Package.swift as JSON'
+                'describe:Describe the current package'
+                'unedit:Remove a package from editable mode'
                 'update:Update package dependencies'
-                'show-dependencies:Print the resolved dependency graph'
-                'resolve:Resolve package dependencies'
-                'fetch:'
                 'completion-tool:Completion tool (for shell completions)'
-                'edit:Put a package in editable mode'
                 'tools-version:Manipulate tools version of the current package'
-                'describe:Describe the current package'
-                'clean:Delete build artifacts'
                 'reset:Reset the complete cache/build directory'
-                'unedit:Remove a package from editable mode'
+                'resolve:Resolve package dependencies'
                 'generate-xcodeproj:Generates an Xcode project'
-                'init:Initialize a new package'
-                'dump-package:Print parsed Package.swift as JSON'
+                'fetch:'
+                'show-dependencies:Print the resolved dependency graph'
             )
             _describe "mode" modes
             ;;
         (arg)
             case ${words[1]} in
-                (update)
-                    _swift_package_update
+                (edit)
+                    _swift_package_edit
                     ;;
-                (show-dependencies)
-                    _swift_package_show-dependencies
+                (clean)
+                    _swift_package_clean
                     ;;
-                (resolve)
-                    _swift_package_resolve
+                (init)
+                    _swift_package_init
                     ;;
-                (fetch)
-                    _swift_package_fetch
+                (dump-package)
+                    _swift_package_dump-package
+                    ;;
+                (describe)
+                    _swift_package_describe
+                    ;;
+                (unedit)
+                    _swift_package_unedit
+                    ;;
+                (update)
+                    _swift_package_update
                     ;;
                 (completion-tool)
                     _swift_package_completion-tool
                     ;;
-                (edit)
-                    _swift_package_edit
-                    ;;
                 (tools-version)
                     _swift_package_tools-version
                     ;;
-                (describe)
-                    _swift_package_describe
-                    ;;
-                (clean)
-                    _swift_package_clean
-                    ;;
                 (reset)
                     _swift_package_reset
                     ;;
-                (unedit)
-                    _swift_package_unedit
+                (resolve)
+                    _swift_package_resolve
                     ;;
                 (generate-xcodeproj)
                     _swift_package_generate-xcodeproj
                     ;;
-                (init)
-                    _swift_package_init
+                (fetch)
+                    _swift_package_fetch
                     ;;
-                (dump-package)
-                    _swift_package_dump-package
+                (show-dependencies)
+                    _swift_package_show-dependencies
                     ;;
             esac
             ;;
     esac
 }
 
-_swift_package_update() {
+_swift_package_edit() {
     arguments=(
+        ":The name of the package to edit:_swift_dependency"
+        "--revision[The revision to edit]:The revision to edit: "
+        "--branch[The branch to create]:The branch to create: "
+        "--path[Create or use the checkout at this path]:Create or use the checkout at this path:_files"
     )
     _arguments $arguments && return
 }
 
-_swift_package_show-dependencies() {
+_swift_package_clean() {
     arguments=(
-        "--format[text|dot|json|flatlist]: :{_values '' 'text[list dependencies using text format]' 'dot[list dependencies using dot format]' 'json[list dependencies using JSON format]'}"
     )
     _arguments $arguments && return
 }
 
-_swift_package_resolve() {
+_swift_package_init() {
     arguments=(
-        ":The name of the package to resolve:_swift_dependency"
-        "--version[The version to resolve at]:The version to resolve at: "
-        "--branch[The branch to resolve at]:The branch to resolve at: "
-        "--revision[The revision to resolve at]:The revision to resolve at: "
+        "--type[empty|library|executable|system-module]: :{_values '' 'empty[generates an empty project]' 'library[generates project for a dynamic library]' 'executable[generates a project for a cli executable]' 'system-module[generates a project for a system module]'}"
     )
     _arguments $arguments && return
 }
 
-_swift_package_fetch() {
+_swift_package_dump-package() {
     arguments=(
     )
     _arguments $arguments && return
 }
 
-_swift_package_completion-tool() {
+_swift_package_describe() {
     arguments=(
-        ": :{_values '' 'generate-bash-script[generate Bash completion script]' 'generate-zsh-script[generate Bash completion script]' 'list-dependencies[list all dependencies' names]' 'list-executables[list all executables' names]'}"
+        "--type[json|text]: :{_values '' 'text[describe using text format]' 'json[describe using JSON format]'}"
     )
     _arguments $arguments && return
 }
 
-_swift_package_edit() {
+_swift_package_unedit() {
     arguments=(
-        ":The name of the package to edit:_swift_dependency"
-        "--revision[The revision to edit]:The revision to edit: "
-        "--branch[The branch to create]:The branch to create: "
-        "--path[Create or use the checkout at this path]:Create or use the checkout at this path:_files"
+        ":The name of the package to unedit:_swift_dependency"
+        "--force[Unedit the package even if it has uncommited and unpushed changes.]"
     )
     _arguments $arguments && return
 }
 
-_swift_package_tools-version() {
+_swift_package_update() {
     arguments=(
-        "--set[Set tools version of package to the given value]:Set tools version of package to the given value: "
-        "--set-current[Set tools version of package to the current tools version in use]"
     )
     _arguments $arguments && return
 }
 
-_swift_package_describe() {
+_swift_package_completion-tool() {
     arguments=(
-        "--type[json|text]: :{_values '' 'text[describe using text format]' 'json[describe using JSON format]'}"
+        ": :{_values '' 'generate-bash-script[generate Bash completion script]' 'generate-zsh-script[generate Bash completion script]' 'list-dependencies[list all dependencies' names]' 'list-executables[list all executables' names]'}"
     )
     _arguments $arguments && return
 }
 
-_swift_package_clean() {
+_swift_package_tools-version() {
     arguments=(
+        "--set[Set tools version of package to the given value]:Set tools version of package to the given value: "
+        "--set-current[Set tools version of package to the current tools version in use]"
     )
     _arguments $arguments && return
 }
@@ -291,10 +295,12 @@ _swift_package_reset() {
     _arguments $arguments && return
 }
 
-_swift_package_unedit() {
+_swift_package_resolve() {
     arguments=(
-        ":The name of the package to unedit:_swift_dependency"
-        "--force[Unedit the package even if it has uncommited and unpushed changes.]"
+        ":The name of the package to resolve:_swift_dependency"
+        "--version[The version to resolve at]:The version to resolve at: "
+        "--branch[The branch to resolve at]:The branch to resolve at: "
+        "--revision[The revision to resolve at]:The revision to resolve at: "
     )
     _arguments $arguments && return
 }
@@ -304,19 +310,21 @@ _swift_package_generate-xcodeproj() {
         "--xcconfig-overrides[Path to xcconfig file]:Path to xcconfig file:_files"
         "--enable-code-coverage[Enable code coverage in the generated project]"
         "--output[Path where the Xcode project should be generated]:Path where the Xcode project should be generated:_files"
+        "--legacy-scheme-generator[Use the legacy scheme generator]"
+        "--watch[Watch for changes to the Package manifest to regenerate the Xcode project]"
     )
     _arguments $arguments && return
 }
 
-_swift_package_init() {
+_swift_package_fetch() {
     arguments=(
-        "--type[empty|library|executable|system-module]: :{_values '' 'empty[generates an empty project]' 'library[generates project for a dynamic library]' 'executable[generates a project for a cli executable]' 'system-module[generates a project for a system module]'}"
     )
     _arguments $arguments && return
 }
 
-_swift_package_dump-package() {
+_swift_package_show-dependencies() {
     arguments=(
+        "--format[text|dot|json|flatlist]: :{_values '' 'text[list dependencies using text format]' 'dot[list dependencies using dot format]' 'json[list dependencies using JSON format]'}"
     )
     _arguments $arguments && return
 }
@@ -338,19 +346,22 @@ _swift_test() {
         "--build-path[Specify build/cache directory ]:Specify build/cache directory :_files"
         "(--chdir -C)"{--chdir,-C}"[]: :_files"
         "--package-path[Change working directory before any other operation]:Change working directory before any other operation:_files"
+        "--sanitize[Turn on runtime checks for erroneous behavior]: :{_values '' 'address[enable Address sanitizer]' 'thread[enable Thread sanitizer]'}"
         "--disable-prefetching[]"
+        "--skip-update[Skip updating dependencies from their remote during a resolution]"
         "--disable-sandbox[Disable using the sandbox when executing subprocesses]"
         "--version[]"
         "--destination[]: :_files"
         "(--verbose -v)"{--verbose,-v}"[Increase verbosity of informational output]"
-        "--no-static-swift-stdlib[Do not link Swift stdlib statically]"
+        "--no-static-swift-stdlib[Do not link Swift stdlib statically \[default\]]"
         "--static-swift-stdlib[Link Swift stdlib statically]"
-        "--enable-build-manifest-caching[Enable llbuild manifest caching [Experimental]]"
+        "--enable-build-manifest-caching[Enable llbuild manifest caching \[Experimental\]]"
         "--skip-build[Skip building the test target]"
         "(--list-tests -l)"{--list-tests,-l}"[Lists test methods in specifier format]"
         "--generate-linuxmain[Generate LinuxMain.swift entries for the package]"
         "--parallel[Run the tests in parallel.]"
         "(--specifier -s)"{--specifier,-s}"[]: : "
+        "--xunit-output[]: :_files"
         "--filter[Run test cases matching regular expression, Format: <test-target>.<test-case> or <test-target>.<test-case>/<test>]:Run test cases matching regular expression, Format: <test-target>.<test-case> or <test-target>.<test-case>/<test>: "
     )
     _arguments $arguments && return
-- 
cgit v1.2.3-70-g09d2


From 999d3ddf4cb4f263e9ea27b7ca0b5617c4ed19cb Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Mon, 8 Oct 2018 17:56:44 +0200
Subject: colorize: fix check for pygmentize (#7250)

---
 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 b97dffe43..e2af6d25e 100644
--- a/plugins/colorize/colorize.plugin.zsh
+++ b/plugins/colorize/colorize.plugin.zsh
@@ -7,9 +7,9 @@
 alias ccat='colorize_via_pygmentize'
 
 colorize_via_pygmentize() {
-    if [ ! -x "$(which pygmentize)" ]; then
-        echo "package \'Pygments\' is not installed!"
-        return -1
+    if ! (( $+commands[pygmentize] )); then
+        echo "package 'Pygments' is not installed!"
+        return 1
     fi
 
     if [ $# -eq 0 ]; then
-- 
cgit v1.2.3-70-g09d2


From d9ea2604790d0ce0f7160b77bebe06c69766c06e Mon Sep 17 00:00:00 2001
From: Aswath K <aswath.sana@gmail.com>
Date: Mon, 8 Oct 2018 21:55:20 +0530
Subject: themes: add custom themes directory support to `lstheme` (#7236)

`lstheme` command used to list only the themes listed in `$ZSH/themes/` directory. This commit adds themes in `$ZSH_CUSTOM/themes/` also to the theme listings.
---
 plugins/themes/themes.plugin.zsh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/themes/themes.plugin.zsh b/plugins/themes/themes.plugin.zsh
index 487e85689..2cd0ee327 100644
--- a/plugins/themes/themes.plugin.zsh
+++ b/plugins/themes/themes.plugin.zsh
@@ -19,6 +19,8 @@ function theme
 
 function lstheme
 {
-    cd $ZSH/themes
-    ls *zsh-theme | sed 's,\.zsh-theme$,,'
+    # Resources:
+    # http://zsh.sourceforge.net/Doc/Release/Expansion.html#Modifiers
+    # http://zsh.sourceforge.net/Doc/Release/Expansion.html#Glob-Qualifiers
+    print -l {$ZSH,$ZSH_CUSTOM}/themes/*.zsh-theme(N:t:r)
 }
-- 
cgit v1.2.3-70-g09d2


From 5f988197cbea1eb677d7957b1f007891096d618b Mon Sep 17 00:00:00 2001
From: Sergey Lysenko <soulwish.ls@gmail.com>
Date: Mon, 8 Oct 2018 19:27:21 +0300
Subject: nyan: add README and deprecation warning (#7251)

---
 plugins/nyan/README.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 plugins/nyan/README.md

(limited to 'plugins')

diff --git a/plugins/nyan/README.md b/plugins/nyan/README.md
new file mode 100644
index 000000000..592941824
--- /dev/null
+++ b/plugins/nyan/README.md
@@ -0,0 +1,5 @@
+# Nyan plugin
+
+This plugin adds a command to display [Nyan Cat](https://en.wikipedia.org/wiki/Nyan_Cat) right inside your terminal.
+
+**Plugin is deprecated**. Check [official repo](https://github.com/klange/nyancat) for more information.
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From 56d02edb4f4a9aebaa69473a7676215ab25d8678 Mon Sep 17 00:00:00 2001
From: Sergey Lysenko <soulwish.ls@gmail.com>
Date: Mon, 8 Oct 2018 19:40:06 +0300
Subject: nanoc: add README (#7252)

---
 plugins/nanoc/README.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 plugins/nanoc/README.md

(limited to 'plugins')

diff --git a/plugins/nanoc/README.md b/plugins/nanoc/README.md
new file mode 100644
index 000000000..9e21805f4
--- /dev/null
+++ b/plugins/nanoc/README.md
@@ -0,0 +1,23 @@
+# Nanoc plugin
+
+This plugin adds some aliases and autocompletion for common [Nanoc](https://nanoc.ws) commands.
+
+To use it, add `nanoc` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... nanoc)
+```
+
+## Aliases
+
+| Alias | Command               | Description                                        |
+|-------|-----------------------|----------------------------------------------------|
+| n     | `nanoc`               | Main Nanoc command                                 |
+| na    | `nanoc autocompile`   | The autocompile command has been deprecated since Nanoc 3.6. Use [guard-nanoc](https://github.com/nanoc/nanoc/tree/master/guard-nanoc) instead. |
+| nco   | `nanoc compile`       | Compile all items of the current site. |
+| nci   | `nanoc create_item`   | Command was deprecated in Nanoc v.3 and completely removed in v.4 |
+| ncl   | `nanoc create_layout` | Command was deprecated in Nanoc v.3 and completely removed in v.4 |
+| ncs   | `nanoc create_site`   | Create a new site at the given path. The site will use the filesystem data source. |
+| nd    | `nanoc deploy`        | Deploys the compiled site. The compiled site contents in the output directory will be uploaded to the destination, which is specified using the --target option. |
+| nv    | `nanoc view`          | Start the static web server. Unless specified, the web server will run on port 3000 and listen on all IP addresses. |
+| nw    | `nanoc watch`         | The watch command has been deprecated since Nanoc 3.6. Use [guard-nanoc](https://github.com/nanoc/nanoc/tree/master/guard-nanoc) instead. |
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From 27e77c33fa6b969ffe202cd2a7234bcdc82eafeb Mon Sep 17 00:00:00 2001
From: Yordan Ivanov <mail@ivanovyordan.com>
Date: Mon, 8 Oct 2018 19:41:38 +0300
Subject: autojump: add README (#7253)

---
 plugins/autoenv/README.md | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 plugins/autoenv/README.md

(limited to 'plugins')

diff --git a/plugins/autoenv/README.md b/plugins/autoenv/README.md
new file mode 100644
index 000000000..18ff793cd
--- /dev/null
+++ b/plugins/autoenv/README.md
@@ -0,0 +1,11 @@
+# Autojump plugin
+
+This plugin loads the [autojump navigation tool](https://github.com/wting/autojump).
+
+To use it, add `autojump` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... autojump)
+```
+
+More info on the usage: https://github.com/wting/autojump
-- 
cgit v1.2.3-70-g09d2


From 3320658f30e0556bae0844629a265ae71f807cc1 Mon Sep 17 00:00:00 2001
From: KeLiu <specter119@users.noreply.github.com>
Date: Tue, 9 Oct 2018 00:48:02 +0800
Subject: archlinux: add aliases for yay (#6867)

---
 plugins/archlinux/README.md            | 20 ++++++++++++++++++++
 plugins/archlinux/archlinux.plugin.zsh | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)

(limited to 'plugins')

diff --git a/plugins/archlinux/README.md b/plugins/archlinux/README.md
index 0d1fdea3a..7ebe8e53d 100644
--- a/plugins/archlinux/README.md
+++ b/plugins/archlinux/README.md
@@ -2,6 +2,26 @@
 
 ## Features
 
+#### YAY
+
+| Alias   | Command                            | Description                                                         |
+|---------|------------------------------------|---------------------------------------------------------------------|
+| yaconf  | yay -Pg                            | Print current configuration                                         |
+| yain    | yay -S                             | Install packages from the repositories                              |
+| yains   | yay -U                             | Install a package from a local file                                 |
+| yainsd  | yay -S --asdeps                    | Install packages as dependencies of another package                 |
+| yaloc   | yay -Qi                            | Display information about a package in the local database           |
+| yalocs  | yay -Qs                            | Search for packages in the local database                           |
+| yalst   | yay -Qe                            | List installed packages including from AUR (tagged as "local")      |
+| yamir   | yay -Syy                           | Force refresh of all package lists after updating mirrorlist        |
+| yaorph  | yay -Qtd                           | Remove orphans using yaourt                                         |
+| yare    | yay -R                             | Remove packages, keeping its settings and dependencies              |
+| yarem   | yay -Rns                           | Remove packages, including its settings and unneeded dependencies   |
+| yarep   | yay -Si                            | Display information about a package in the repositories             |
+| yareps  | yay -Ss                            | Search for packages in the repositories                             |
+| yaupg   | yay -Syu                           | Sync with repositories before upgrading packages                    |
+| yasu    | yay -Syu --no-confirm              | Same as `yaupg`, but without confirmation                           |
+
 #### TRIZEN
 
 | Alias   | Command                            | Description                                                         |
diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
index ae80eb9f0..e0101c7eb 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -56,6 +56,35 @@ if (( $+commands[yaourt] )); then
   fi
 fi
 
+if (( $+commands[yay] )); then
+  alias yaconf='yay -Pg'
+  alias yaupg='yay -Syu'
+  alias yasu='yay -Syu --noconfirm'
+  alias yain='yay -S'
+  alias yains='yay -U'
+  alias yare='yay -R'
+  alias yarem='yay -Rns'
+  alias yarep='yay -Si'
+  alias yareps='yay -Ss'
+  alias yaloc='yay -Qi'
+  alias yalocs='yay -Qs'
+  alias yalst='yay -Qe'
+  alias yaorph='yay -Qtd'
+  alias yainsd='yay -S --asdeps'
+  alias yamir='yay -Syy'
+
+
+  if (( $+commands[abs] && $+commands[aur] )); then
+    alias yaupd='yay -Sy && sudo abs && sudo aur'
+  elif (( $+commands[abs] )); then
+    alias yaupd='yay -Sy && sudo abs'
+  elif (( $+commands[aur] )); then
+    alias yaupd='yay -Sy && sudo aur'
+  else
+    alias yaupd='yay -Sy'
+  fi
+fi
+
 if (( $+commands[pacaur] )); then
   alias paupg='pacaur -Syu'
   alias pasu='pacaur -Syu --noconfirm'
@@ -95,6 +124,10 @@ elif (( $+commands[yaourt] )); then
   function upgrade() {
     yaourt -Syu
   }
+elif (( $+commands[yay] )); then
+  function upgrade() {
+    yay -Syu
+  }
 else
   function upgrade() {
     sudo pacman -Syu
-- 
cgit v1.2.3-70-g09d2


From 313d3c3fe293f6d073c623e7a93a8147c30e0bd1 Mon Sep 17 00:00:00 2001
From: Kayla Altepeter <kayla@kaylaaltepeter.com>
Date: Tue, 9 Oct 2018 13:31:11 -0500
Subject: kubectl: add README (#7258)

---
 plugins/kubectl/README.md          | 88 ++++++++++++++++++++++++++++++++++++++
 plugins/kubectl/kubectl.plugin.zsh |  4 +-
 2 files changed, 90 insertions(+), 2 deletions(-)
 create mode 100644 plugins/kubectl/README.md

(limited to 'plugins')

diff --git a/plugins/kubectl/README.md b/plugins/kubectl/README.md
new file mode 100644
index 000000000..a93a9339e
--- /dev/null
+++ b/plugins/kubectl/README.md
@@ -0,0 +1,88 @@
+# Kubectl plugin
+
+This plugin adds completion for the [Kubernetes cluster manager](https://kubernetes.io/docs/reference/kubectl/kubectl/),
+as well as some aliases for common kubectl commands.
+
+To use it, add `kubectl` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... kubectl)
+```
+
+## Aliases
+
+| Alias   | Command                             | Description                                                                                      |
+|:--------|:------------------------------------|:-------------------------------------------------------------------------------------------------|
+| k       | `kubectl`                           | The kubectl command                                                                              |
+| kaf     | `kubectl apply -f`                  | Apply a YML file                                                                                 |
+| keti    | `kubectl exec -ti`                  | Drop into an interactive terminal on a container                                                 |
+|         |                                     | **Manage configuration quickly to switch contexts between local, dev and staging**               |
+| kcuc    | `kubectl config use-context`        | Set the current-context in a kubeconfig file                                                     |
+| kcsc    | `kubectl config set-context`        | Set a context entry in kubeconfig                                                                |
+| kcdc    | `kubectl config delete-context`     | Delete the specified context from the kubeconfig                                                 |
+| kccc    | `kubectl config current-context`    | Display the current-context                                                                      |
+|         |                                     | **General aliases**                                                                              |
+| kdel    | `kubectl delete`                    | Delete resources by filenames, stdin, resources and names, or by resources and label selector    |
+| kdelf   | `kubectl delete -f`                 | Delete a pod using the type and name specified in -f argument                                    |
+|         |                                     | **Pod management**                                                                               |
+| kgp     | `kubectl get pods`                  | List all pods in ps output format                                                                |
+| kgpw    | `kgp --watch`                       | After listing/getting the requested object, watch for changes                                    |
+| kgpwide | `kgp -o wide`                       | Output in plain-text format with any additional information. For pods, the node name is included |
+| kep     | `kubectl edit pods`                 | Edit pods from the default editor                                                                |
+| kdp     | `kubectl describe pods`             | Describe all pods                                                                                |
+| kdelp   | `kubectl delete pods`               | Delete all pods matching passed arguments                                                        |
+| kgpl    | `kgp -l`                            | Get pod by label. Example: `kgpl "app=myapp" -n myns`                                            |
+|         |                                     | **Service management**                                                                           |
+| kgs     | `kubectl get svc`                   | List all services in ps output format                                                            |
+| kgsw    | `kgs --watch`                       | After listing all services, watch for changes                                                    |
+| kgswide | `kgs -o wide`                       | After listing all services, output in plain-text format with any additional information          |
+| kes     | `kubectl edit svc`                  | Edit services(svc) from the default editor                                                       |
+| kds     | `kubectl describe svc`              | Describe all services in detail                                                                  |
+| kdels   | `kubectl delete svc`                | Delete all services matching passed argument                                                     |
+|         |                                     | **Ingress management**                                                                           |
+| kgi     | `kubectl get ingress`               | List ingress resources in ps output format                                                       |
+| kei     | `kubectl edit ingress`              | Edit ingress resource from the default editor                                                    |
+| kdi     | `kubectl describe ingress`          | Describe ingress resource in detail                                                              |
+| kdeli   | `kubectl delete ingress`            | Delete ingress resources matching passed argument                                                |
+|         |                                     | **Namespace management**                                                                         |
+| kgns    | `kubectl get namespaces`            | List the current namespaces in a cluster                                                         |
+| kens    | `kubectl edit namespace`            | Edit namespace resource from the default editor                                                  |
+| kdns    | `kubectl describe namespace`        | Describe namespace resource in detail                                                            |
+| kdelns  | `kubectl delete namespace`          | Delete the namespace. WARNING! This deletes everything in the namespace                          |
+|         |                                     | **ConfigMap management**                                                                         |
+| kgcm    | `kubectl get configmaps`            | List the configmaps in ps output format                                                          |
+| kecm    | `kubectl edit configmap`            | Edit configmap resource from the default editor                                                  |
+| kdcm    | `kubectl describe configmap`        | Describe configmap resource in detail                                                            |
+| kdelcm  | `kubectl delete configmap`          | Delete the configmap                                                                             |
+|         |                                     | **Secret management**                                                                            |
+| kgsec   | `kubectl get secret`                | Get secret for decoding                                                                          |
+| kdsec   | `kubectl describe secret`           | Describe secret resource in detail                                                               |
+| kdelsec | `kubectl delete secret`             | Delete the secret                                                                                |
+|         |                                     | **Deployment management**                                                                        |
+| kgd     | `kubectl get deployment`            | Get the deployment                                                                               |
+| kgdw    | `kgd --watch`                       | After getting the deployment, watch for changes                                                  |
+| kgdwide | `kgd -o wide`                       | After getting the deployment, output in plain-text format with any additional information        |
+| ked     | `kubectl edit deployment`           | Edit deployment resource from the default editor                                                 |
+| kdd     | `kubectl describe deployment`       | Describe deployment resource in detail                                                           |
+| kdeld   | `kubectl delete deployment`         | Delete the deployment                                                                            |
+| ksd     | `kubectl scale deployment`          | Scale a deployment                                                                               |
+| krsd    | `kubectl rollout status deployment` | Check the rollout status of a deployment                                                         |
+|         |                                     | **Rollout management**                                                                           |
+| kgrs    | `kubectl get rs`                    | To see the ReplicaSet `rs` created by the deployment                                             |
+| krh     | `kubectl rollout history`           | Check the revisions of this deployment                                                           |
+| kru     | `kubectl rollout undo`              | Rollback to the previous revision                                                                |
+|         |                                     | **Port forwarding**                                                                              |
+| kpf     | `kubectl port-forward`              | Forward one or more local ports to a pod                                                         |
+|         |                                     | **Tools for accessing all information**                                                          |
+| kga     | `kubectl get all`                   | List all resources in ps format                                                                  |
+| kgaa    | `kubectl get all --all-namespaces`  | List the requested object(s) across all namespaces                                               |
+|         |                                     | **Logs**                                                                                         |
+| kl      | `kubectl logs`                      | Print the logs for a container or resource                                                       |
+| klf     | `kubectl logs -f`                   | Stream the logs for a container or resource (follow)                                             |
+|         |                                     | **File copy**                                                                                    |
+| kcp     | `kubectl cp`                        | Copy files and directories to and from containers                                                |
+|         |                                     | **Node management**                                                                              |
+| kgno    | `kubectl get nodes`                 | List the nodes in ps output format                                                               |
+| keno    | `kubectl edit node`                 | Edit nodes resource from the default editor                                                      |
+| kdno    | `kubectl describe node`             | Describe node resource in detail                                                                 |
+| kdelno  | `kubectl delete node`               | Delete the node                                                                                  |
diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index 59601f413..4cfe3f45b 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -38,7 +38,7 @@ alias kdp='kubectl describe pods'
 alias kdelp='kubectl delete pods'
 
 # get pod by label: kgpl "app=myapp" -n myns
-alias kgpl='function _kgpl(){ label=$1; shift; kgp -l $label $*; };_kgpl'
+alias kgpl='kgp -l'
 
 # Service management.
 alias kgs='kubectl get svc'
@@ -104,4 +104,4 @@ alias kcp='kubectl cp'
 alias kgno='kubectl get nodes'
 alias keno='kubectl edit node'
 alias kdno='kubectl describe node'
-alias kdelno='kubectl delete node'
\ No newline at end of file
+alias kdelno='kubectl delete node'
-- 
cgit v1.2.3-70-g09d2


From 3c9942c4884089b290ef750468b29419ca0de271 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 9 Oct 2018 20:34:47 +0200
Subject: autojump: move README to right place

---
 plugins/autoenv/README.md  | 11 -----------
 plugins/autojump/README.md | 11 +++++++++++
 2 files changed, 11 insertions(+), 11 deletions(-)
 delete mode 100644 plugins/autoenv/README.md
 create mode 100644 plugins/autojump/README.md

(limited to 'plugins')

diff --git a/plugins/autoenv/README.md b/plugins/autoenv/README.md
deleted file mode 100644
index 18ff793cd..000000000
--- a/plugins/autoenv/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Autojump plugin
-
-This plugin loads the [autojump navigation tool](https://github.com/wting/autojump).
-
-To use it, add `autojump` to the plugins array in your zshrc file:
-
-```zsh
-plugins=(... autojump)
-```
-
-More info on the usage: https://github.com/wting/autojump
diff --git a/plugins/autojump/README.md b/plugins/autojump/README.md
new file mode 100644
index 000000000..18ff793cd
--- /dev/null
+++ b/plugins/autojump/README.md
@@ -0,0 +1,11 @@
+# Autojump plugin
+
+This plugin loads the [autojump navigation tool](https://github.com/wting/autojump).
+
+To use it, add `autojump` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... autojump)
+```
+
+More info on the usage: https://github.com/wting/autojump
-- 
cgit v1.2.3-70-g09d2


From 6fecbf6ad5fc6e78dcfd89227cf8b12305b1f8bc Mon Sep 17 00:00:00 2001
From: Ben Wilcock <benwilcock@users.noreply.github.com>
Date: Tue, 9 Oct 2018 20:20:55 +0100
Subject: Add cloudfoundry plugin (#7047)

---
 plugins/cloudfoundry/README.md               | 58 ++++++++++++++++++++++++++++
 plugins/cloudfoundry/cloudfoundry.plugin.zsh | 34 ++++++++++++++++
 2 files changed, 92 insertions(+)
 create mode 100644 plugins/cloudfoundry/README.md
 create mode 100644 plugins/cloudfoundry/cloudfoundry.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/cloudfoundry/README.md b/plugins/cloudfoundry/README.md
new file mode 100644
index 000000000..89dd9d1ce
--- /dev/null
+++ b/plugins/cloudfoundry/README.md
@@ -0,0 +1,58 @@
+# Cloudfoundry Plugin
+
+This plugin is intended to offer a few simple aliases for regular users of the [Cloud Foundry Cli][1]. Most are just simple aliases that will save a bit of typing. Others include mini functions and or accept parameters. Take a look at the table below for details.
+
+| Alias    | Command                     | Description                                                              |
+|----------|-----------------------------|--------------------------------------------------------------------------|
+| cfl      | `cf login`                  | Login to Cloud Foundry                                                   |
+| cft      | `cf target`                 | Target the cli at a specific Org/Space in Cloud Foundry                  |
+| cfa      | `cf apps`                   | List all applications in the current Org/Space                           |
+| cfs      | `cf services`               | List all services in the current Org/Space                               |
+| cfm      | `cf marketplace`            | List the services available in the Marketplace                           |
+| cfp      | `cf push`                   | Push your application code to Cloud Foundry                              |
+| cfcs     | `cf create-service`         | Create a service based on a Marketplace offering                         |
+| cfbs     | `cf bind-service`           | Bind an application to a service you created                             |
+| cfus     | `cf unbind-service`         | Unbind a service from an application                                     |
+| cfds     | `cf delete-service`         | Delete a service you no longer have bound                                |
+| cfup     | `cf cups`                   | Create a "user-provided-service"                                         |
+| cflg     | `cf logs`                   | Tail the logs of an application (requires <APP_NAME>)                    |
+| cfr      | `cf routes`                 | List all the routes in the current Space                                 |
+| cfe      | `cf env`                    | Show the environment variables for an application (requires <APP_NAME>)  |
+| cfsh     | `cf ssh`                    | Attach to a running container (requires an <APP_NAME> etc.)              |
+| cfsc     | `cf scale`                  | Scale an application (requires an <APP_NAME> etc.)                       |
+| cfev     | `cf events`                 | Show the application events (requires <APP_NAME>)                        |
+| cfdor    | `cf delete-orphaned-routes` | Delete routes that are no longer bound to applications                   |
+| cfbpk    | `cf buildpacks`             | List the available buildpacks                                            |
+| cfdm     | `cf domains`                | List the domains associates with this Cloud Foundry foundation           |
+| cfsp     | `cf spaces`                 | List all the Spaces in the current Org                                   |
+| cfap     | `cf app`                    | Show the details of a deployed application (requires <APP_NAME>)         |
+| cfh.     | `export CF_HOME=$PWD/.cf`   | Set the current directory as CF_HOME                                     |
+| cfh~     | `export CF_HOME=~/.cf`      | Set the user's root directory as CF_HOME                                 |
+| cfhu     | `unset CF_HOME`             | Unsets CF_HOME                                                           |
+| cfpm     | `cf push -f`                | Push an application using a manifest (requires <MANIFEST_FILE> location) |
+| cflr     | `cf logs --recent`          | Show the recent logs (requires <APP_NAME>)                               |
+| cfsrt    | `cf start`                  | Start an application (requires <APP_NAME>)                               |
+| cfstp    | `cf stop`                   | Stop an application (requires <APP_NAME>)                                |
+| cfstg    | `cf restage`                | Restage an application (requires <APP_NAME>)                             |
+| cfdel    | `cf delete`                 | Delete an application (requires <APP_NAME>)                              |
+| cfsrtall | -                           | Start all apps that are currently in the "Stopped" state                 |
+| cfstpall | -                           | Stop all apps that are currently in the "Started" state                  |
+
+For help and advice on what any of the commands does, consult the built in `cf` help functions as follows:-
+
+```bash
+cf help # List the most popular and commonly used commands
+cf help -a # Complete list of all possible commands
+cf <COMMAND_NAME> --help # Help on a specific command including arguments and examples
+```
+
+Alternatively, seek out the [online documentation][3]. And don't forget, there are loads of great [community plugins for the cf-cli][4] command line tool that can greatly extend its power and usefulness.
+
+## Contributors
+
+Contributed to `oh_my_zsh` by [benwilcock][2].  
+
+[1]: https://docs.cloudfoundry.org/cf-cli/install-go-cli.html
+[2]: https://github.com/benwilcock
+[3]: https://docs.cloudfoundry.org/cf-cli/getting-started.html
+[4]: https://plugins.cloudfoundry.org/
diff --git a/plugins/cloudfoundry/cloudfoundry.plugin.zsh b/plugins/cloudfoundry/cloudfoundry.plugin.zsh
new file mode 100644
index 000000000..b6715787e
--- /dev/null
+++ b/plugins/cloudfoundry/cloudfoundry.plugin.zsh
@@ -0,0 +1,34 @@
+# Some Useful CloudFoundry Aliases & Functions
+alias cfl="cf login"
+alias cft="cf target"
+alias cfa="cf apps"
+alias cfs="cf services"
+alias cfm="cf marketplace"
+alias cfp="cf push"
+alias cfcs="cf create-service"
+alias cfbs="cf bind-service"
+alias cfus="cf unbind-service"
+alias cfds="cf delete-service"
+alias cfup="cf cups"
+alias cflg="cf logs"
+alias cfr="cf routes"
+alias cfe="cf env"
+alias cfsh="cf ssh"
+alias cfsc="cf scale"
+alias cfev="cf events"
+alias cfdor="cf delete-orphaned-routes"
+alias cfbpk="cf buildpacks"
+alias cfdm="cf domains"
+alias cfsp="cf spaces"
+function cfap() { cf app $1 }
+function cfh.() { export CF_HOME=$PWD/.cf }
+function cfh~() { export CF_HOME=~/.cf }
+function cfhu() { unset CF_HOME }
+function cfpm() { cf push -f $1 }
+function cflr() { cf logs $1 --recent }
+function cfsrt() { cf start $1 }
+function cfstp() { cf stop $1 }
+function cfstg() { cf restage $1 }
+function cfdel() { cf delete $1 }
+function cfsrtall() {cf apps | awk '/stopped/ { system("cf start " $1)}'}
+function cfstpall() {cf apps | awk '/started/ { system("cf stop " $1)}'}
-- 
cgit v1.2.3-70-g09d2


From dd3c95c61595ba28e88971ec6480145877e979ca Mon Sep 17 00:00:00 2001
From: Brian Mitchell <bman4789@gmail.com>
Date: Wed, 10 Oct 2018 23:04:01 -0500
Subject: Add README for textmate plugin

---
 plugins/textmate/README.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 plugins/textmate/README.md

(limited to 'plugins')

diff --git a/plugins/textmate/README.md b/plugins/textmate/README.md
new file mode 100644
index 000000000..8f86d35af
--- /dev/null
+++ b/plugins/textmate/README.md
@@ -0,0 +1,16 @@
+# TextMate plugin
+
+The plugin adds aliases for the [TextMate](https://macromates.com) editor.
+
+To use it, add `textmate` to the plugins array of your zshrc file:
+```
+plugins=(... textmate)
+```
+
+## Aliases
+
+| Alias           | Command     | Description   |
+|-----------------|-------------|---------------|
+| tm              | `mate .`    | Open TextMate in the current directory. |
+| tm \<directory> | `mate <directory>` `cd <directory>` | Open TextMate in the given directory and cd to it. |
+| tm <*>          | `mate "$@"` | Pass all arguments to `mate`. This allows for easy opening of multiple files. |
-- 
cgit v1.2.3-70-g09d2


From 530759d5a07a73b627aa30d2322b4a2701855bf3 Mon Sep 17 00:00:00 2001
From: Jeffrey Chandler <36927673+jeff-chandler@users.noreply.github.com>
Date: Fri, 12 Oct 2018 15:43:55 -0400
Subject: Added a README file for the man plugin

---
 plugins/man/README.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 plugins/man/README.md

(limited to 'plugins')

diff --git a/plugins/man/README.md b/plugins/man/README.md
new file mode 100644
index 000000000..0fd3fead2
--- /dev/null
+++ b/plugins/man/README.md
@@ -0,0 +1,13 @@
+# Man plugin
+
+This plugin adds a shortcut to insert man before the previous command.
+
+To use it, add `man` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... man)
+```
+# Keyboard Shortcuts
+| Shortcut                          | Description                                                            |
+|-----------------------------------|------------------------------------------------------------------------|
+| <kpd>esc</kpd> + man              | add man before the previous command to see the manual for this command |
-- 
cgit v1.2.3-70-g09d2


From b2f51a1a0a6dd2cb2baeb3e1131b5d41ee03a66d Mon Sep 17 00:00:00 2001
From: Jeffrey Chandler <36927673+jeff-chandler@users.noreply.github.com>
Date: Fri, 12 Oct 2018 15:48:08 -0400
Subject: command-not-found: add README (#7272)

---
 plugins/command-not-found/README.md | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 plugins/command-not-found/README.md

(limited to 'plugins')

diff --git a/plugins/command-not-found/README.md b/plugins/command-not-found/README.md
new file mode 100644
index 000000000..df62d1f07
--- /dev/null
+++ b/plugins/command-not-found/README.md
@@ -0,0 +1,31 @@
+# command-not-found plugin
+
+This plugin uses the command-not-found package for zsh to provide suggested packages to be installed if a command cannot be found.
+
+To use it, add `command-not-found` to the plugins array of your zshrc file:
+
+```zsh
+plugins=(... command-not-found)
+```
+
+An example of how this plugin works in Ubuntu:
+```
+$ mutt
+The program 'mutt' can be found in the following packages:
+ * mutt
+ * mutt-kz
+ * mutt-patched
+Try: sudo apt install <selected package>
+```
+
+### Supported platforms
+
+It works out of the box with the command-not-found packages for:
+
+- [Ubuntu](https://www.porcheron.info/command-not-found-for-zsh/)
+- [Debian](https://packages.debian.org/search?keywords=command-not-found)
+- [Arch Linux](https://wiki.archlinux.org/index.php/Pkgfile#Command_not_found)
+- [macOS (Homebrew)](https://github.com/Homebrew/homebrew-command-not-found)
+- [Fedora](https://fedoraproject.org/wiki/Features/PackageKitCommandNotFound)
+
+You can add support for other platforms by submitting a Pull Request.
-- 
cgit v1.2.3-70-g09d2


From 96f4a938383e558e8f800ccc052a80c6f743555d Mon Sep 17 00:00:00 2001
From: Sagar Patil <sagar010797@gmail.com>
Date: Sat, 13 Oct 2018 01:24:26 +0530
Subject: virtualenv: add README (#7273)

---
 plugins/virtualenv/README.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 plugins/virtualenv/README.md

(limited to 'plugins')

diff --git a/plugins/virtualenv/README.md b/plugins/virtualenv/README.md
new file mode 100644
index 000000000..e0b8c2c82
--- /dev/null
+++ b/plugins/virtualenv/README.md
@@ -0,0 +1,15 @@
+# virtualenv
+
+The plugin displays information of the created virtual container and allows background theming.
+
+To use it, add `virtualenv` to the plugins array of your zshrc file:
+```
+plugins=(... virtualenv)
+```
+
+The plugin creates a `virtualenv_prompt_info` function that you can use in your theme, which displays
+the basename of the current `$VIRTUAL_ENV`. It uses two variables to control how that is shown:
+
+- `ZSH_THEME_VIRTUALENV_PREFIX`: sets the prefix of the VIRTUAL_ENV. Defaults to `[`.
+
+- `ZSH_THEME_VIRTUALENV_SUFFIX`: sets the suffix of the VIRTUAL_ENV. Defaults to `]`.
-- 
cgit v1.2.3-70-g09d2


From 4a5fa087b89c5f26d93c610147db478b78efae4d Mon Sep 17 00:00:00 2001
From: Jeffrey Chandler <36927673+jeff-chandler@users.noreply.github.com>
Date: Fri, 12 Oct 2018 15:54:31 -0400
Subject: Updated keybinding syntax

---
 plugins/man/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/man/README.md b/plugins/man/README.md
index 0fd3fead2..4601252c0 100644
--- a/plugins/man/README.md
+++ b/plugins/man/README.md
@@ -10,4 +10,4 @@ plugins=(... man)
 # Keyboard Shortcuts
 | Shortcut                          | Description                                                            |
 |-----------------------------------|------------------------------------------------------------------------|
-| <kpd>esc</kpd> + man              | add man before the previous command to see the manual for this command |
+| <kbd>Esc</kbd> + man              | add man before the previous command to see the manual for this command |
-- 
cgit v1.2.3-70-g09d2


From 5df484d5054d282ba2aedff1785ad92eb7106bac Mon Sep 17 00:00:00 2001
From: Brian Mitchell <bman4789@gmail.com>
Date: Fri, 12 Oct 2018 19:08:18 -0500
Subject: Format as a list vs a table

---
 plugins/textmate/README.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'plugins')

diff --git a/plugins/textmate/README.md b/plugins/textmate/README.md
index 8f86d35af..9fd342135 100644
--- a/plugins/textmate/README.md
+++ b/plugins/textmate/README.md
@@ -1,16 +1,16 @@
 # TextMate plugin
 
-The plugin adds aliases for the [TextMate](https://macromates.com) editor.
+The plugin adds a function for the [TextMate](https://macromates.com) editor.
 
 To use it, add `textmate` to the plugins array of your zshrc file:
 ```
 plugins=(... textmate)
 ```
 
-## Aliases
+## Function
 
-| Alias           | Command     | Description   |
-|-----------------|-------------|---------------|
-| tm              | `mate .`    | Open TextMate in the current directory. |
-| tm \<directory> | `mate <directory>` `cd <directory>` | Open TextMate in the given directory and cd to it. |
-| tm <*>          | `mate "$@"` | Pass all arguments to `mate`. This allows for easy opening of multiple files. |
+The `tm` function provides the following options:
+
+- No arguments: Run `mate` in the current directory.
+- Argument that is a directory: Run `mate` in the given directory and cd to it.
+- Other arguments: Pass all arguments to `mate`. This allows for easy opening of multiple files.
-- 
cgit v1.2.3-70-g09d2


From 8db85db3cf5741fed1f03be8e7a0d5e044c175e8 Mon Sep 17 00:00:00 2001
From: Atcha  Prachayapron <40570367+atchapcyp@users.noreply.github.com>
Date: Sat, 13 Oct 2018 23:51:19 +0700
Subject: kitchen: add README (#7275)

---
 plugins/kitchen/README.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 plugins/kitchen/README.md

(limited to 'plugins')

diff --git a/plugins/kitchen/README.md b/plugins/kitchen/README.md
new file mode 100644
index 000000000..89a6d7002
--- /dev/null
+++ b/plugins/kitchen/README.md
@@ -0,0 +1,9 @@
+# kitchen plugin
+
+This plugin adds completion support for the [Test Kitchen](https://kitchen.ci).
+
+To use it, add `kitchen` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... kitchen)
+```
-- 
cgit v1.2.3-70-g09d2


From 010ecf4f931b9c8c7b3ea5b27d1b51bf7f00f30a Mon Sep 17 00:00:00 2001
From: Jeffrey Chandler <36927673+jeff-chandler@users.noreply.github.com>
Date: Sun, 14 Oct 2018 12:39:14 -0400
Subject: Added README file to the dirpersist plugin (#7274)

* Added README file to the dirpersist plugin

added additional details on how the plugin works.
---
 plugins/dirpersist/README.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 plugins/dirpersist/README.md

(limited to 'plugins')

diff --git a/plugins/dirpersist/README.md b/plugins/dirpersist/README.md
new file mode 100644
index 000000000..9880bc563
--- /dev/null
+++ b/plugins/dirpersist/README.md
@@ -0,0 +1,9 @@
+# Dirpersist plugin
+
+This plugin keeps a running tally of the previous 20 unique directories in the $HOME/.zdirs file.  When you cd to a new directory, it is prepended to the beginning of the file.
+
+To use it, add `dirpersist` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... dirpersist)
+```
-- 
cgit v1.2.3-70-g09d2


From bbe4d89c258bab32977acd19c2c55de952184649 Mon Sep 17 00:00:00 2001
From: Jeffrey Chandler <36927673+jeff-chandler@users.noreply.github.com>
Date: Sun, 14 Oct 2018 12:40:29 -0400
Subject: Added a README file for the systemadmin plugin (#7279)

* Added a README file for the systemadmin plugin

* Updated formatting of Functions table and split it into
"named" and "unnamed" functions for clarity

* Fixed issue with '|' characters in table by adding them in
<code> stateuents </code>

* Added \ escape characters in front of | characters
---
 plugins/systemadmin/README.md | 61 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 plugins/systemadmin/README.md

(limited to 'plugins')

diff --git a/plugins/systemadmin/README.md b/plugins/systemadmin/README.md
new file mode 100644
index 000000000..5b32470a0
--- /dev/null
+++ b/plugins/systemadmin/README.md
@@ -0,0 +1,61 @@
+# Systemadmin plugin
+
+This plugin adds a series of aliases and functions which make a System Administrator's life easier.
+ 
+To use it, add `systemadmin` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... systemadmin)
+```
+
+## Aliases
+
+| Alias  | Command                                                                           | Description                                                        |
+|--------|-----------------------------------------------------------------------------------|--------------------------------------------------------------------|
+| ping   | `ping -c 5`                                                                       | Sends only 5 ICMP Messages                                         |
+| clr    | `clear;echo "Currently logged in on $(tty), as $USER in directory $PWD."`         | Clears the screen and prings the current user, TTY, and directory  |
+| path   | `echo -e ${PATH//:/\\n}`                                                          | Displays PATH with each entry on a separate line                   |
+| mkdir  | `mkdir -pv`                                                                       | Automatically create parent directories and display verbose output |
+| psmem  | <code>ps -e -orss=,args= \| sort -b -k1,1n</code>                                 | Display the processes using the most memory                        |
+| psmem10| <code>ps -e -orss=,args= \| sort -b -k1,1n\| head -10</code>                      | Display the top 10 processes using the most memory                 |
+| pscpu  | <code>ps -e -o pcpu,cpu,nice,state,cputime,args\|sort -k1 -nr</code>              | Display the top processes using the most CPU                       |
+| pscpu10| <code>ps -e -o pcpu,cpu,nice,state,cputime,args\|sort -k1 -nr \| head -10</code>  | Display the top 10 processes using the most CPU                    |
+| hist10 | <code>print -l ${(o)history%% *} \| uniq -c \| sort -nr \| head -n 10</code>      | Display the top 10 most used commands in the history               |
+
+
+## Named Functions
+These are used by some of the other functions to provide flexibility
+
+| Function    |  Description                                                                                                                          |
+|-------------|---------------------------------------------------------------------------------------------------------------------------------------|
+| retval      | Returns the first argument or a '.' if no arguments are specified                                                                     |
+| retlog      | Returns the first argument or /var/log/nginx/access.log if no arguments are specified                                                 |
+
+## Unamed Functions
+These functions are closer to aliases with complex arguments simplified (in most cases) into one line
+
+| Function    |  Description                                                                                                                          |
+|-------------|---------------------------------------------------------------------------------------------------------------------------------------|
+| dls         | List only directories in the current directory                                                                                        |
+| psgrep      | List all processes that match the pattern input after the command                                                                     |
+| killit      | xargs sudo kill | Kills any process that matches a regulr expression passed to it                                                     |
+| tree        | List contents of directories in a tree-like format (if tree is installed)                                                             |
+| sortcons    | Sort connections by state                                                                                                             |
+| con80       | View all 80 Port Connections                                                                                                          |
+| sortconip   | On the connected IP sorted by the number of connections                                                                               |
+| req20       | List the top 20 requests on port 80                                                                                                   |
+| http20      | List the top 20 connections to port 80 based on tcpdump data                                                                          |
+| timewait20  | List the top 20 time_wait connections                                                                                                 |
+| syn20       | List the top 20 SYN connections                                                                                                       |
+| port_pro    | Output all processes according to the port number                                                                                     |
+| accessip10  | List the top 10 accesses to the ip address in the nginx/access.log file or another log file if specified as an argument               |
+| visitpage20 | List the top 20 most visited files or pages in the nginx/access.log file or another log file if specified as an argument              |
+| consume100  | List the top 100 of Page lists the most time-consuming (more than 60 seconds) as well as the corresponding page number of occurrences |
+| webtraffic  | List website traffic statistics in GB from tne nginx/access.log file or another log file if specified as an argument                  |
+| c404        | List statistics on 404 connections in the nginx/access.log file or another log file if specified as an argument                       |
+| httpstatus  | List statistics based on http status in the nginx/access.log file or another log file if specified as an argument                     |
+| d0          | Delete 0 byte files recursively in the directory specified (or current directory if none is specificied)                              |
+| geteip      | Gather information regarding an external IP address                                                                                   |
+| getip       | Determine the local IP Address with `ip addr` or `ifconfig`                                                                           |
+| clrz        | Clear zombie processes                                                                                                                |
+| conssec     | Display the number of concurrent connections per second in the nginix/access.log file or another log file if specified as an argument |
-- 
cgit v1.2.3-70-g09d2


From f2d4b9768d75499c772cc656f574228c61f28b66 Mon Sep 17 00:00:00 2001
From: adri242 <adri242@users.noreply.github.com>
Date: Sun, 14 Oct 2018 18:42:56 +0200
Subject: Readme for Scala plugin added (#7286)

---
 plugins/scala/README.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 plugins/scala/README.md

(limited to 'plugins')

diff --git a/plugins/scala/README.md b/plugins/scala/README.md
new file mode 100644
index 000000000..957261d9e
--- /dev/null
+++ b/plugins/scala/README.md
@@ -0,0 +1,15 @@
+## Scala plugin
+
+Completion script for [scala and scalac](https://www.scala-lang.org/) commands.
+
+To use it, add `scala` to the plugins array of your zshrc file:
+```
+plugins=(... scala)
+```
+
+## Aliases
+
+| Command          | Description                                                                     |
+|------------------|---------------------------------------------------------------------------------|
+| `scala`          | Run code in the Scala language                            |
+| `scalac`         | Compiler for the Scala language                           |
-- 
cgit v1.2.3-70-g09d2


From 9275d1fc98f61d353a900c698d7b53592036803d Mon Sep 17 00:00:00 2001
From: Sagar Patil <sagar010797@gmail.com>
Date: Sun, 14 Oct 2018 22:13:16 +0530
Subject: added README for pylint plugin (#7277)

---
 plugins/pylint/README.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 plugins/pylint/README.md

(limited to 'plugins')

diff --git a/plugins/pylint/README.md b/plugins/pylint/README.md
new file mode 100644
index 000000000..8c1de88ba
--- /dev/null
+++ b/plugins/pylint/README.md
@@ -0,0 +1,15 @@
+# pylint 
+
+This plugin adds code analysis for python through [Pylint](https://www.pylint.org/).
+
+To use it, add `pylint` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... pylint)
+```
+
+## Aliases
+
+| Alias        | Command              | Description                                                                                                              |
+| -------------| -------------------- | -------------------------------------------------------------------------------------------------------------------------|
+| pylint-quick | `pylint --reports=n` | Displays a set of reports each one focusing on a particular aspect of the project, default set `no` for multiple reports |                                         |
-- 
cgit v1.2.3-70-g09d2


From d56cec1e8df19f67f665ff790b2fe2fb9ed59b50 Mon Sep 17 00:00:00 2001
From: Sagar Patil <sagar010797@gmail.com>
Date: Mon, 15 Oct 2018 00:29:23 +0530
Subject: Composer Readme added

---
 plugins/composer/README.md | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 plugins/composer/README.md

(limited to 'plugins')

diff --git a/plugins/composer/README.md b/plugins/composer/README.md
new file mode 100644
index 000000000..b0c38cf39
--- /dev/null
+++ b/plugins/composer/README.md
@@ -0,0 +1,31 @@
+# composer
+
+This plugin provides completion for [composer](https://getcomposer.org/),
+as well as aliases for frequent composer commands.
+
+To use it add `composer` to the plugins array in your zshrc file.
+
+```zsh
+plugins=(... composer)
+```
+
+## Aliases
+
+| Alias  | Command                                       | Description                                                                                                                     |
+| ------ | --------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------- |
+| `c`    | composer                                      | Start composer, get help with composer commands                                                                                 |
+| `csu`  | composer self-update                          | Update composer to the latest version                                                                                           |
+| `cu`   | composer update                               | Update composer dependencies and `composer.lock` file                                                                           |
+| `cr`   | composer require                              | Adds new packages to the  `composer.json` file from current directory                                                           |
+| `crm`  | composer remove                               | Removes packages from the `composer.json` file from the current directory                                                       |
+| `ci`   | composer install                              | Reads the `composer.json` file from the current directory, resolves the dependencies, and installs them into `vendor`           |
+| `ccp`  | composer create-project                       | Create new project from an existing package                                                                                     |
+| `cdu`  | composer dump-autoload                        | Update the autoloader due to new classes in a classmap package without having to go through an install or update                |
+| `cdo`  | composer dump-autoload --optimize-autoloader  | Convert PSR-0/4 autoloading to classmap to get a faster autoloader. Recommended especially for production, set `no` by default  |
+| `cgu`  | composer global update                        | Allows update command to run on COMPOSER_HOME directory                                                                         |                                 
+| `cgr`  | composer global require                       | Allows require command to run on COMPOSER_HOME directory                                                                        |
+| `cgrm` | composer global remove                        | Allows remove command to run on COMPOSER_HOME directory                                                                         |
+| `cget` | `curl -s https://getcomposer.org/installer`   | Installs composer in the current directory                                                                                      |
+
+
+The plugin adds Composer's global binaries to PATH, using Composer if available.
-- 
cgit v1.2.3-70-g09d2


From ecb46c3ec743a0c081a88b1de187d62d954fd5be Mon Sep 17 00:00:00 2001
From: Josh Parnham <joshparnham@gmail.com>
Date: Thu, 18 Oct 2018 03:53:51 +1100
Subject: osx: fix typo in README (#7283)

---
 plugins/osx/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/osx/README.md b/plugins/osx/README.md
index 7c75c65f5..3559dee02 100644
--- a/plugins/osx/README.md
+++ b/plugins/osx/README.md
@@ -56,6 +56,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 | `man-preview`   | Open a specified man page in Preview app            |
 | `showfiles`     | Show hidden files                                   |
 | `hidefiles`     | Hide the hidden files                               |
-| `itunes`        | Control iTunes. User `itunes -h` for usage details  |
+| `itunes`        | Control iTunes. Use `itunes -h` for usage details   |
 | `spotify`       | Control Spotify and search by artist, album, track… |
 | `rmdsstore`     | Remove .DS\_Store files recursively in a directory  |
-- 
cgit v1.2.3-70-g09d2


From 0871594f58301df6dc08a365b2582c850638af2f Mon Sep 17 00:00:00 2001
From: DBX12 <dbx12@web.de>
Date: Wed, 17 Oct 2018 19:40:20 +0200
Subject: systemadmin: refactor plugin and fix README (#7295)

---
 plugins/systemadmin/README.md              | 88 +++++++++++++-----------------
 plugins/systemadmin/systemadmin.plugin.zsh | 28 ++++------
 2 files changed, 49 insertions(+), 67 deletions(-)

(limited to 'plugins')

diff --git a/plugins/systemadmin/README.md b/plugins/systemadmin/README.md
index 5b32470a0..edca4d87d 100644
--- a/plugins/systemadmin/README.md
+++ b/plugins/systemadmin/README.md
@@ -10,52 +10,42 @@ plugins=(... systemadmin)
 
 ## Aliases
 
-| Alias  | Command                                                                           | Description                                                        |
-|--------|-----------------------------------------------------------------------------------|--------------------------------------------------------------------|
-| ping   | `ping -c 5`                                                                       | Sends only 5 ICMP Messages                                         |
-| clr    | `clear;echo "Currently logged in on $(tty), as $USER in directory $PWD."`         | Clears the screen and prings the current user, TTY, and directory  |
-| path   | `echo -e ${PATH//:/\\n}`                                                          | Displays PATH with each entry on a separate line                   |
-| mkdir  | `mkdir -pv`                                                                       | Automatically create parent directories and display verbose output |
-| psmem  | <code>ps -e -orss=,args= \| sort -b -k1,1n</code>                                 | Display the processes using the most memory                        |
-| psmem10| <code>ps -e -orss=,args= \| sort -b -k1,1n\| head -10</code>                      | Display the top 10 processes using the most memory                 |
-| pscpu  | <code>ps -e -o pcpu,cpu,nice,state,cputime,args\|sort -k1 -nr</code>              | Display the top processes using the most CPU                       |
-| pscpu10| <code>ps -e -o pcpu,cpu,nice,state,cputime,args\|sort -k1 -nr \| head -10</code>  | Display the top 10 processes using the most CPU                    |
-| hist10 | <code>print -l ${(o)history%% *} \| uniq -c \| sort -nr \| head -n 10</code>      | Display the top 10 most used commands in the history               |
-
-
-## Named Functions
-These are used by some of the other functions to provide flexibility
-
-| Function    |  Description                                                                                                                          |
-|-------------|---------------------------------------------------------------------------------------------------------------------------------------|
-| retval      | Returns the first argument or a '.' if no arguments are specified                                                                     |
-| retlog      | Returns the first argument or /var/log/nginx/access.log if no arguments are specified                                                 |
-
-## Unamed Functions
-These functions are closer to aliases with complex arguments simplified (in most cases) into one line
-
-| Function    |  Description                                                                                                                          |
-|-------------|---------------------------------------------------------------------------------------------------------------------------------------|
-| dls         | List only directories in the current directory                                                                                        |
-| psgrep      | List all processes that match the pattern input after the command                                                                     |
-| killit      | xargs sudo kill | Kills any process that matches a regulr expression passed to it                                                     |
-| tree        | List contents of directories in a tree-like format (if tree is installed)                                                             |
-| sortcons    | Sort connections by state                                                                                                             |
-| con80       | View all 80 Port Connections                                                                                                          |
-| sortconip   | On the connected IP sorted by the number of connections                                                                               |
-| req20       | List the top 20 requests on port 80                                                                                                   |
-| http20      | List the top 20 connections to port 80 based on tcpdump data                                                                          |
-| timewait20  | List the top 20 time_wait connections                                                                                                 |
-| syn20       | List the top 20 SYN connections                                                                                                       |
-| port_pro    | Output all processes according to the port number                                                                                     |
-| accessip10  | List the top 10 accesses to the ip address in the nginx/access.log file or another log file if specified as an argument               |
-| visitpage20 | List the top 20 most visited files or pages in the nginx/access.log file or another log file if specified as an argument              |
-| consume100  | List the top 100 of Page lists the most time-consuming (more than 60 seconds) as well as the corresponding page number of occurrences |
-| webtraffic  | List website traffic statistics in GB from tne nginx/access.log file or another log file if specified as an argument                  |
-| c404        | List statistics on 404 connections in the nginx/access.log file or another log file if specified as an argument                       |
-| httpstatus  | List statistics based on http status in the nginx/access.log file or another log file if specified as an argument                     |
-| d0          | Delete 0 byte files recursively in the directory specified (or current directory if none is specificied)                              |
-| geteip      | Gather information regarding an external IP address                                                                                   |
-| getip       | Determine the local IP Address with `ip addr` or `ifconfig`                                                                           |
-| clrz        | Clear zombie processes                                                                                                                |
-| conssec     | Display the number of concurrent connections per second in the nginix/access.log file or another log file if specified as an argument |
+| Alias   | Command                                                                | Description                                                        |
+|---------|------------------------------------------------------------------------|--------------------------------------------------------------------|
+| ping    | `ping -c 5`                                                            | Sends only 5 ICMP Messages                                         |
+| clr     | `clear; echo Currently logged in on $TTY, as $USER in directory $PWD.` | Clears the screen and prints the current user, TTY, and directory  |
+| path    | `print -l $path`                                                       | Displays PATH with each entry on a separate line                   |
+| mkdir   | `mkdir -pv`                                                            | Automatically create parent directories and display verbose output |
+| psmem   | `ps -e -orss=,args= \| sort -b -k1,1n`                                 | Display the processes using the most memory                        |
+| psmem10 | `ps -e -orss=,args= \| sort -b -k1,1n \| head -10`                     | Display the top 10 processes using the most memory                 |
+| pscpu   | `ps -e -o pcpu,cpu,nice,state,cputime,args \|sort -k1 -nr`             | Display the top processes using the most CPU                       |
+| pscpu10 | `ps -e -o pcpu,cpu,nice,state,cputime,args \|sort -k1 -nr \| head -10` | Display the top 10 processes using the most CPU                    |
+| hist10  | `print -l ${(o)history%% *} \| uniq -c \| sort -nr \| head -n 10`      | Display the top 10 most used commands in the history               |
+
+## Functions
+
+| Function    |  Description                                                                                                          |
+|-------------|-----------------------------------------------------------------------------------------------------------------------|
+| dls         | List only directories in the current directory                                                                        |
+| psgrep      | List all processes that match the pattern input after the command                                                     |
+| killit      | Kills any process that matches a regular expression passed to it                                                      |
+| tree        | List contents of directories in a tree-like format (if tree isn't installed)                                          |
+| sortcons    | Sort connections by state                                                                                             |
+| con80       | View all 80 Port Connections                                                                                          |
+| sortconip   | On the connected IP sorted by the number of connections                                                               |
+| req20       | List the top 20 requests on port 80                                                                                   |
+| http20      | List the top 20 connections to port 80 based on tcpdump data                                                          |
+| timewait20  | List the top 20 time_wait connections                                                                                 |
+| syn20       | List the top 20 SYN connections                                                                                       |
+| port_pro    | Output all processes according to the port number                                                                     |
+| accessip10  | List the top 10 accesses to the ip address in the nginx/access.log file or another log file if specified              |
+| visitpage20 | List the top 20 most visited files or pages in the nginx/access.log file or another log file if specified             |
+| consume100  | List the 100 most time-consuming Page lists (more than 60 seconds) as well as the corresponding number of occurrences |
+| webtraffic  | List website traffic statistics in GB from tne nginx/access.log file or another log file if specified                 |
+| c404        | List statistics on 404 connections in the nginx/access.log file or another log file if specified                      |
+| httpstatus  | List statistics based on http status in the nginx/access.log file or another log file if specified                    |
+| d0          | Delete 0 byte files recursively in the current directory or another if specified                                      |
+| geteip      | Gather information regarding an external IP address using [icanhazip.com](https://icanhazip.com)                      |
+| getip       | Determine the local IP Address with `ip addr` or `ifconfig`                                                           |
+| clrz        | Clear zombie processes                                                                                                |
+| conssec     | Show number of concurrent connections per second based on ngnix/access.log file or another log file if specified      |
diff --git a/plugins/systemadmin/systemadmin.plugin.zsh b/plugins/systemadmin/systemadmin.plugin.zsh
index a74f818dd..5cc7b7397 100644
--- a/plugins/systemadmin/systemadmin.plugin.zsh
+++ b/plugins/systemadmin/systemadmin.plugin.zsh
@@ -12,14 +12,6 @@
 #
 # ------------------------------------------------------------------------------
 
-function retval() {
-    if [[ -z $1 ]];then
-        echo '.'
-    else
-        echo $1
-    fi
-}
-
 function retlog() {
     if [[ -z $1 ]];then
         echo '/var/log/nginx/access.log'
@@ -29,8 +21,8 @@ function retlog() {
 }
 
 alias ping='ping -c 5'
-alias clr='clear;echo "Currently logged in on $(tty), as $USER in directory $PWD."'
-alias path='echo -e ${PATH//:/\\n}'
+alias clr='clear; echo Currently logged in on $TTY, as $USER in directory $PWD.'
+alias path='print -l $path'
 alias mkdir='mkdir -pv'
 # get top process eating memory
 alias psmem='ps -e -orss=,args= | sort -b -k1,1n'
@@ -43,10 +35,10 @@ 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 "/"
+    print -l *(/)
 }
 psgrep() {
-    ps aux | grep "$(retval $1)" | grep -v grep
+    ps aux | grep "${1:-.}" | grep -v grep
 }
 # Kills any process that matches a regexp passed to it
 killit() {
@@ -54,10 +46,10 @@ killit() {
 }
 
 # list contents of directories in a tree-like format
-if [ -z "\${which tree}" ]; then
-  tree () {
-      find $@ -print | sed -e 's;[^/]*/;|____;g;s;____|; |;g'
-  }
+if ! (( $+commands[tree] )); then
+    tree () {
+        find $@ -print | sed -e 's;[^/]*/;|____;g;s;____|; |;g'
+    }
 fi
 
 # Sort connection state
@@ -97,7 +89,7 @@ syn20() {
 
 # Printing process according to the port number
 port_pro() {
-    netstat -ntlp | grep "$(retval $1)" | awk '{print $7}' | cut -d/ -f1
+    netstat -ntlp | grep "${1:-.}" | awk '{print $7}' | cut -d/ -f1
 }
 
 # top10 of gain access to the ip address
@@ -134,7 +126,7 @@ httpstatus() {
 
 # Delete 0 byte file
 d0() {
-    find "$(retval $1)" -type f -size 0 -exec rm -rf {} \;
+    find "${1:-.}" -type f -size 0 -exec rm -rf {} \;
 }
 
 # gather external ip address
-- 
cgit v1.2.3-70-g09d2


From b834af66bd0650300740144b1dc277746c7ca6e0 Mon Sep 17 00:00:00 2001
From: Marco Zühlke <mzuehlke@gmail.com>
Date: Wed, 17 Oct 2018 19:42:57 +0200
Subject: sbt: add README (#7294)

---
 plugins/sbt/README.md | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 plugins/sbt/README.md

(limited to 'plugins')

diff --git a/plugins/sbt/README.md b/plugins/sbt/README.md
new file mode 100644
index 000000000..f1a5753b9
--- /dev/null
+++ b/plugins/sbt/README.md
@@ -0,0 +1,32 @@
+# sbt plugin
+
+This plugin adds completion for the [sbt, the interactive build tool](https://scala-sbt.org/),
+as well as some aliases for common sbt commands.
+
+To use it, add `sbt` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... sbt)
+```
+
+## Aliases
+
+| Alias | Command               | Description                                                  |
+|-------|-----------------------|--------------------------------------------------------------|
+| sbc   | `sbt compile`         | Compiles the main sources                                    |
+| sbcln | `sbt clean`           | Deletes all generated files                                  |
+| sbcc  | `sbt clean compile`   | Deletes generated files, compiles the main sources           |
+| sbco  | `sbt console`         | Starts Scala with the compiled sources and all dependencies  |
+| sbcq  | `sbt console-quick`   | Starts Scala with all dependencies                           |
+| sbcp  | `sbt console-project` | Starts Scala with sbt and the build definitions              |
+| sbd   | `sbt doc`             | Generates API documentation for Scala source files           |
+| sbdc  | `sbt dist:clean`      | Deletes the distribution packages                            |
+| sbdi  | `sbt dist`            | Creates the distribution packages                            |
+| sbgi  | `sbt gen-idea`        | Create Idea project files                                    |
+| sbp   | `sbt publish`         | Publishes artifacts to the repository                        |
+| sbpl  | `sbt publish-local`   | Publishes artifacts to the local Ivy repository              |
+| sbr   | `sbt run`             | Runs the main class for the project                          |
+| sbrm  | `sbt run-main`        | Runs the specified main class for the project                |
+| sbu   | `sbt update`          | Resolves and retrieves external dependencies                 |
+| sbx   | `sbt test`            | Compiles and runs all tests                                  |
+| sba   | `sbt assembly`        | Create a fat JAR with all dependencies                       |
-- 
cgit v1.2.3-70-g09d2


From 1abf04cb01e8c5a987632a5bddaa3e10fb5fe035 Mon Sep 17 00:00:00 2001
From: Sagar Patil <sagar010797@gmail.com>
Date: Wed, 17 Oct 2018 23:27:34 +0530
Subject: tmux: add README (#7293)

---
 plugins/tmux/README.md | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 plugins/tmux/README.md

(limited to 'plugins')

diff --git a/plugins/tmux/README.md b/plugins/tmux/README.md
new file mode 100644
index 000000000..427119d3d
--- /dev/null
+++ b/plugins/tmux/README.md
@@ -0,0 +1,39 @@
+# tmux
+
+This plugin provides aliases for [tmux](http://tmux.github.io/), the terminal multiplexer.
+To use it add `tmux` to the plugins array in your zshrc file.
+
+```zsh
+plugins=(... tmux)
+```
+
+The plugin also supports the following - 
+- determines if tmux is installed or not, if not, prompts user to install tmux
+- determines if the terminal supports the 256 colors or not, sets the appropriate configuration variable
+- sets the correct local config file to use
+
+## Aliases
+
+| Alias  | Command                | Description                                               |
+| ------ | -----------------------|---------------------------------------------------------- |
+| `ta`   | tmux attach -t         | Attach new tmux session to already running named session  |
+| `tad`  | tmux attach -d -t      | Detach named tmux session                                 |
+| `ts`   | tmux new-session -s    | Create a new named tmux session                           |
+| `tl`   | tmux list-sessions     | Displays a list of running tmux sessions                  |
+| `tksv` | tmux kill-server       | Terminate all running tmux sessions                       |
+| `tkss` | tmux kill-session -t   | Terminate named running tmux session                      |
+| `tmux` | `_zsh_tmux_plugin_run` | Start a new tmux session                                  |
+
+
+## Configuration Variables
+
+| Variable                            | Description                                                                   |
+|-------------------------------------|-------------------------------------------------------------------------------|
+| `ZSH_TMUX_AUTOSTART`                | Automatically starts tmux (default: `false`)                                  |
+| `ZSH_TMUX_AUTOSTART_ONCE`           | Autostart only if tmux hasn't been started previously (default: `true`)       |
+| `ZSH_TMUX_AUTOCONNECT`              | Automatically connect to a previous session if it exits (default: `true`)     |
+| `ZSH_TMUX_AUTOQUIT`                 | Automatically closes terminal once tmux exits (default: `ZSH_TMUX_AUTOSTART`) |
+| `ZSH_TMUX_FIXTERM`                  | Sets `$TERM` to 256-color term or not based on current terminal support       |
+| `ZSH_TMUX_ITERM2`                   | Sets the `-CC` option for iTerm2 tmux integration (default: `false`)          |
+| `ZSH_TMUX_FIXTERM_WITHOUT_256COLOR` | `$TERM` to use for non 256-color terminals (default: `screen`)                |
+| `ZSH_TMUX_FIXTERM_WITH_256COLOR`    | `$TERM` to use for 256-color terminals (default: `screen-256color`            |
-- 
cgit v1.2.3-70-g09d2


From f8ca1464b9d1792b2a6bc227c152197538b5ae9d Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Wed, 17 Oct 2018 20:34:58 +0200
Subject: reword

---
 plugins/composer/README.md | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

(limited to 'plugins')

diff --git a/plugins/composer/README.md b/plugins/composer/README.md
index b0c38cf39..2b4bae579 100644
--- a/plugins/composer/README.md
+++ b/plugins/composer/README.md
@@ -1,7 +1,8 @@
 # composer
 
-This plugin provides completion for [composer](https://getcomposer.org/),
-as well as aliases for frequent composer commands.
+This plugin provides completion for [composer](https://getcomposer.org/), as well as aliases
+for frequent composer commands. It also adds Composer's global binaries to the PATH, using
+Composer if available.
 
 To use it add `composer` to the plugins array in your zshrc file.
 
@@ -11,21 +12,18 @@ plugins=(... composer)
 
 ## Aliases
 
-| Alias  | Command                                       | Description                                                                                                                     |
-| ------ | --------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------- |
-| `c`    | composer                                      | Start composer, get help with composer commands                                                                                 |
-| `csu`  | composer self-update                          | Update composer to the latest version                                                                                           |
-| `cu`   | composer update                               | Update composer dependencies and `composer.lock` file                                                                           |
-| `cr`   | composer require                              | Adds new packages to the  `composer.json` file from current directory                                                           |
-| `crm`  | composer remove                               | Removes packages from the `composer.json` file from the current directory                                                       |
-| `ci`   | composer install                              | Reads the `composer.json` file from the current directory, resolves the dependencies, and installs them into `vendor`           |
-| `ccp`  | composer create-project                       | Create new project from an existing package                                                                                     |
-| `cdu`  | composer dump-autoload                        | Update the autoloader due to new classes in a classmap package without having to go through an install or update                |
-| `cdo`  | composer dump-autoload --optimize-autoloader  | Convert PSR-0/4 autoloading to classmap to get a faster autoloader. Recommended especially for production, set `no` by default  |
-| `cgu`  | composer global update                        | Allows update command to run on COMPOSER_HOME directory                                                                         |                                 
-| `cgr`  | composer global require                       | Allows require command to run on COMPOSER_HOME directory                                                                        |
-| `cgrm` | composer global remove                        | Allows remove command to run on COMPOSER_HOME directory                                                                         |
-| `cget` | `curl -s https://getcomposer.org/installer`   | Installs composer in the current directory                                                                                      |
-
-
-The plugin adds Composer's global binaries to PATH, using Composer if available.
+| Alias  | Command                                      | Description                                                                            |
+| ------ | -------------------------------------------- | -------------------------------------------------------------------------------------- |
+| `c`    | composer                                     | Starts composer                                                                        |
+| `csu`  | composer self-update                         | Updates composer to the latest version                                                 |
+| `cu`   | composer update                              | Updates composer dependencies and `composer.lock` file                                 |
+| `cr`   | composer require                             | Adds new packages to `composer.json`                                                   |
+| `crm`  | composer remove                              | Removes packages from `composer.json`                                                  |
+| `ci`   | composer install                             | Resolves and installs dependencies from `composer.json`                                |
+| `ccp`  | composer create-project                      | Create new project from an existing package                                            |
+| `cdu`  | composer dump-autoload                       | Updates the autoloader                                                                 |
+| `cdo`  | composer dump-autoload --optimize-autoloader | Converts PSR-0/4 autoloading to classmap for a faster autoloader (good for production) |
+| `cgu`  | composer global update                       | Allows update command to run on COMPOSER_HOME directory                                |
+| `cgr`  | composer global require                      | Allows require command to run on COMPOSER_HOME directory                               |
+| `cgrm` | composer global remove                       | Allows remove command to run on COMPOSER_HOME directory                                |
+| `cget` | `curl -s https://getcomposer.org/installer`  | Installs composer in the current directory                                             |
-- 
cgit v1.2.3-70-g09d2


From a2dab42c35cfcd7e5f7e7d5ecc58bbd8699028ce Mon Sep 17 00:00:00 2001
From: Josh Parnham <joshparnham@gmail.com>
Date: Thu, 18 Oct 2018 06:26:48 +1100
Subject: nanoc: update to latest version (#7282)

* nanoc: update command aliases

- remove deprecated commands
- update `create-site`
- add `prune`

* nanoc: update README

* nanoc: update autompletion

- update commands
- add flag options to subcommands
---
 plugins/nanoc/README.md        | 19 +++++-------
 plugins/nanoc/_nanoc           | 68 +++++++++++++++++++++++++++++++++++-------
 plugins/nanoc/nanoc.plugin.zsh |  7 ++---
 3 files changed, 68 insertions(+), 26 deletions(-)

(limited to 'plugins')

diff --git a/plugins/nanoc/README.md b/plugins/nanoc/README.md
index 9e21805f4..d5d437d8a 100644
--- a/plugins/nanoc/README.md
+++ b/plugins/nanoc/README.md
@@ -10,14 +10,11 @@ plugins=(... nanoc)
 
 ## Aliases
 
-| Alias | Command               | Description                                        |
-|-------|-----------------------|----------------------------------------------------|
-| n     | `nanoc`               | Main Nanoc command                                 |
-| na    | `nanoc autocompile`   | The autocompile command has been deprecated since Nanoc 3.6. Use [guard-nanoc](https://github.com/nanoc/nanoc/tree/master/guard-nanoc) instead. |
-| nco   | `nanoc compile`       | Compile all items of the current site. |
-| nci   | `nanoc create_item`   | Command was deprecated in Nanoc v.3 and completely removed in v.4 |
-| ncl   | `nanoc create_layout` | Command was deprecated in Nanoc v.3 and completely removed in v.4 |
-| ncs   | `nanoc create_site`   | Create a new site at the given path. The site will use the filesystem data source. |
-| nd    | `nanoc deploy`        | Deploys the compiled site. The compiled site contents in the output directory will be uploaded to the destination, which is specified using the --target option. |
-| nv    | `nanoc view`          | Start the static web server. Unless specified, the web server will run on port 3000 and listen on all IP addresses. |
-| nw    | `nanoc watch`         | The watch command has been deprecated since Nanoc 3.6. Use [guard-nanoc](https://github.com/nanoc/nanoc/tree/master/guard-nanoc) instead. |
\ No newline at end of file
+| Alias | Command               | Description                                                                       |
+|-------|-----------------------|-----------------------------------------------------------------------------------|
+| n     | `nanoc`               | Main Nanoc command                                                                |
+| nco   | `nanoc compile`       | Compile all items of the current site                                             |
+| ncs   | `nanoc create-site`   | Create a new site at the given path. The site will use the filesystem data source |
+| nd    | `nanoc deploy`        | Deploy the compiled site to the destination (specified with `--target`)           |
+| np    | `nanoc prune`         | Remove files not managed by Nanoc from the output directory                       |
+| nv    | `nanoc view`          | Start the static web server (on port 3000 and all IP addresses, unless specified) |
diff --git a/plugins/nanoc/_nanoc b/plugins/nanoc/_nanoc
index fde07c3fc..a6a4792ad 100644
--- a/plugins/nanoc/_nanoc
+++ b/plugins/nanoc/_nanoc
@@ -1,28 +1,21 @@
 #compdef nanoc
 #autoload
 
-# nanoc zsh completion - based on the homebrew zsh completion
 # requires the 'nanoc' gem to be installed
 
 local -a _1st_arguments
 _1st_arguments=(
-  'autocompile:start the autocompiler'
+  'check:run issue checks'
   'compile:compile items of this site'
-  'create-item:create an item'
-  'create-layout:create a layout'
   'create-site:create a site'
   'deploy:deploy the compiled site'
   'help:show help'
   'prune:remove files not managed by nanoc from the output directory'
+  'shell:open a shell on the Nanoc environment'
   'show-data:show data in this site'
   'show-plugins:show all available plugins'
   'show-rules:describe the rules for each item'
-  'update:update the data stored by the data source to a newer version'
-  'validate-css:validate the site’s CSS'
-  'validate-html:validate the site’s HTML'
-  'validate-links:validate links in site'
   'view:start the web server that serves static files'
-  'watch:start the watcher'
 )
 
 local expl
@@ -31,13 +24,68 @@ local -a pkgs installed_pkgs
 _arguments \
   '(--color)--color[enable color]' \
   '(--debug)--debug[enable debugging]' \
+  '(--env)--env[set environment]' \
   '(--help)--help[show the help message and quit]' \
   '(--no-color)--no-color[disable color]' \
-  '(--verbose)--verbose[make nanoc output more detailed]' \
+  '(--verbose)--verbose[make output more detailed]' \
   '(--version)--version[show version information and quit]' \
   '(--warn)--warn[enable warnings]' \
   '*:: :->subcmds' && return 0
 
+case "$state" in
+  subcmds)
+    case $words[1] in
+      check)
+        _arguments \
+          '(--preprocess)--preprocess[run preprocessor]'
+      ;;
+
+      compile)
+        _arguments \
+          '(--diff)--diff[generate diff]'
+      ;;
+
+      compile)
+        _arguments \
+          '(--diff)--diff[generate diff]'
+      ;;
+
+      create-site)
+        _arguments \
+          '(--force)--force[force creation of new site]'
+      ;;
+
+      deploy)
+        _arguments \
+          '(--target)--target[specify the location to deploy to (default: `default`)]' \
+          '(--no-check)--no-check[do not run the issue checks marked for deployment]' \
+          '(--list)--list[list available locations to deploy to]' \
+          '(--list-deployers)--list-deployers[list available deployers]' \
+          '(--dry-run)--dry-run[show what would be deployed]'
+      ;;
+
+      prune)
+        _arguments \
+          '(--yes)--yes[confirm deletion]' \
+          '(--dry-run)--dry-run[print files to be deleted instead of actually deleting them]'
+      ;;
+
+      shell)
+        _arguments \
+          '(--preprocess)--preprocess[run preprocessor]'
+      ;;
+
+      view)
+        _arguments \
+          '(--handler)--handler[specify the handler to use (webrick/mongrel/...)]' \
+          '(--host)--host[specify the host to listen on (default: 127.0.0.1)]' \
+          '(--port)--port[specify the port to listen on (default: 3000]' \
+          '(--live-reload)--live-reload[reload on changes]'
+      ;;
+    esac
+  ;;
+esac
+
 if (( CURRENT == 1 )); then
   _describe -t commands "nanoc subcommand" _1st_arguments
   return
diff --git a/plugins/nanoc/nanoc.plugin.zsh b/plugins/nanoc/nanoc.plugin.zsh
index 5a5064613..05272ed66 100644
--- a/plugins/nanoc/nanoc.plugin.zsh
+++ b/plugins/nanoc/nanoc.plugin.zsh
@@ -1,9 +1,6 @@
 alias n='nanoc'
-alias na='nanoc autocompile'
 alias nco='nanoc compile'
-alias nci='nanoc create_item'
-alias ncl='nanoc create_layout'
-alias ncs='nanoc create_site'
+alias ncs='nanoc create-site'
 alias nd='nanoc deploy'
+alias np='nanoc prune'
 alias nv='nanoc view'
-alias nw='nanoc watch'
-- 
cgit v1.2.3-70-g09d2


From 54603333634d057c5d2e1b2eb826eec5ce8fd706 Mon Sep 17 00:00:00 2001
From: mhennecke <m.hennecke@web.de>
Date: Wed, 17 Oct 2018 21:28:48 +0200
Subject: sublime: fix typo in cygwin path logic (#7304)

Bug introduced in cea941ce42b5d550489367608dd1ac4401151c97
---
 plugins/sublime/sublime.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index f5bb070ab..485028d9f 100644
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -42,8 +42,8 @@ elif  [[ "$OSTYPE" = darwin* ]]; then
         fi
     done
 elif [[ "$OSTYPE" = 'cygwin' ]]; then
-    local sublime_cygwin_paths
-    sublime_cygwin_paths=(
+    local _sublime_cygwin_paths
+    _sublime_cygwin_paths=(
         "$(cygpath $ProgramW6432/Sublime\ Text\ 2)/sublime_text.exe"
         "$(cygpath $ProgramW6432/Sublime\ Text\ 3)/sublime_text.exe"
     )
-- 
cgit v1.2.3-70-g09d2


From 3a8b93727fd58ef99dd70b7899f71efa1e1d217f Mon Sep 17 00:00:00 2001
From: John Oerter <john@johnoerter.me>
Date: Thu, 18 Oct 2018 13:58:14 -0500
Subject: battery: add README (#7309)

---
 plugins/battery/README.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 plugins/battery/README.md

(limited to 'plugins')

diff --git a/plugins/battery/README.md b/plugins/battery/README.md
new file mode 100644
index 000000000..b7a13a7ec
--- /dev/null
+++ b/plugins/battery/README.md
@@ -0,0 +1,13 @@
+# Battery Plugin
+
+This plugin adds some functions you can use to display battery information in your custom theme.
+
+To use, add `battery` to the list of plugins in your `.zshrc` file:
+
+`plugins=(... battery)`
+
+Then, add the `battery_pct_prompt` function to your custom theme. For example:
+
+```
+RPROMPT='$(battery_pct_prompt)'
+```
-- 
cgit v1.2.3-70-g09d2


From d7ba91a875c26a4243b5ad553e14e2446d3b48d5 Mon Sep 17 00:00:00 2001
From: Stephan Salzmann <kaffdaddy@insomniaonline.de>
Date: Fri, 19 Oct 2018 15:22:09 +0200
Subject: Adding gitignore plugin README

---
 plugins/gitignore/README.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 plugins/gitignore/README.md

(limited to 'plugins')

diff --git a/plugins/gitignore/README.md b/plugins/gitignore/README.md
new file mode 100644
index 000000000..12cf07bca
--- /dev/null
+++ b/plugins/gitignore/README.md
@@ -0,0 +1,14 @@
+# gitignore
+
+This plugin enables you the use of gitignore.io from the command line. You need an active internet connection.
+
+To use it, add `gitignore` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... gitignore)
+```
+
+## Plugin commands
+* `gi list` List displays a list of all of the currently support gitignore.io templates.
+* `gi [TEMPLATENAME]` Show output on the command line, e.g. `gi java` to exclude class and package files.
+* `gi [TEMPLATENAME] >> .gitignore` Appending programming language settings to your projects .gitignore.
-- 
cgit v1.2.3-70-g09d2


From eb87529b98abf5764c584a663a6665fce35e4fbf Mon Sep 17 00:00:00 2001
From: Stephan Salzmann <kaffdaddy@insomniaonline.de>
Date: Fri, 19 Oct 2018 16:36:51 +0200
Subject: Adding gpg-agent plugin README

---
 plugins/gpg-agent/README.md | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 plugins/gpg-agent/README.md

(limited to 'plugins')

diff --git a/plugins/gpg-agent/README.md b/plugins/gpg-agent/README.md
new file mode 100644
index 000000000..f5fe77102
--- /dev/null
+++ b/plugins/gpg-agent/README.md
@@ -0,0 +1,8 @@
+# gpg-agent
+
+Enable gpg-agent if it is not running.
+
+To use it, add gpg-agent to the plugins array of your zshrc file:
+```
+plugins=(... gpg-agent)
+```
-- 
cgit v1.2.3-70-g09d2


From 6a536f88aad20b4157e7693fa9544c7add3c3320 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Fri, 19 Oct 2018 18:46:29 +0200
Subject: reword and fix formatting

---
 plugins/gitignore/README.md | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'plugins')

diff --git a/plugins/gitignore/README.md b/plugins/gitignore/README.md
index 12cf07bca..753dd31fd 100644
--- a/plugins/gitignore/README.md
+++ b/plugins/gitignore/README.md
@@ -1,6 +1,6 @@
 # gitignore
 
-This plugin enables you the use of gitignore.io from the command line. You need an active internet connection.
+This plugin enables you the use of [gitignore.io](https://www.gitignore.io/) from the command line. You need an active internet connection.
 
 To use it, add `gitignore` to the plugins array in your zshrc file:
 
@@ -9,6 +9,9 @@ plugins=(... gitignore)
 ```
 
 ## Plugin commands
-* `gi list` List displays a list of all of the currently support gitignore.io templates.
-* `gi [TEMPLATENAME]` Show output on the command line, e.g. `gi java` to exclude class and package files.
-* `gi [TEMPLATENAME] >> .gitignore` Appending programming language settings to your projects .gitignore.
+
+* `gi list`: List all the currently supported gitignore.io templates.
+
+* `gi [TEMPLATENAME]`: Show git-ignore output on the command line, e.g. `gi java` to exclude class and package files.
+
+* `gi [TEMPLATENAME] >> .gitignore`: Appending programming language settings to your projects .gitignore.
-- 
cgit v1.2.3-70-g09d2


From ca50dfda9f02836910bf5bc956d7d786bc997f92 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Fri, 19 Oct 2018 18:54:26 +0200
Subject: add link to documentation

---
 plugins/gpg-agent/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/gpg-agent/README.md b/plugins/gpg-agent/README.md
index f5fe77102..a9711f923 100644
--- a/plugins/gpg-agent/README.md
+++ b/plugins/gpg-agent/README.md
@@ -1,6 +1,6 @@
 # gpg-agent
 
-Enable gpg-agent if it is not running.
+Enables [GPG's gpg-agent](https://www.gnupg.org/documentation/manuals/gnupg/) if it is not running.
 
 To use it, add gpg-agent to the plugins array of your zshrc file:
 ```
-- 
cgit v1.2.3-70-g09d2


From 576ada138fc5eed3f58a4aff8141e483310c90fb Mon Sep 17 00:00:00 2001
From: Stephan Salzmann <kaffdaddy@insomniaonline.de>
Date: Fri, 19 Oct 2018 19:27:49 +0200
Subject: colorize: add README and refactor plugin (#7314)

---
 plugins/colorize/README.md           | 18 ++++++++++++++++++
 plugins/colorize/colorize.plugin.zsh | 21 ++++++++++-----------
 2 files changed, 28 insertions(+), 11 deletions(-)
 create mode 100644 plugins/colorize/README.md

(limited to 'plugins')

diff --git a/plugins/colorize/README.md b/plugins/colorize/README.md
new file mode 100644
index 000000000..c006071f9
--- /dev/null
+++ b/plugins/colorize/README.md
@@ -0,0 +1,18 @@
+# colorize
+
+With this plugin you can syntax-highlight file contents of over 300 supported languages and other text formats.
+
+To use it, add colorize to the plugins array of your zshrc file:
+```
+plugins=(... colorize)
+```
+
+## Usage
+
+* `ccat <file> [files]`: colorize the contents of the file (or files, if more than one are provided). If no arguments are passed it will colorize the standard input or stdin.
+
+Colorize will highlight the content based on the filename extension. If it can't find a syntax-highlighting method for a given extension, it will try to find one by looking at the file contents. If no highlight method is found it will just cat the file normally, without syntax highlighting.
+
+## Requirements
+
+You have to install Pygments first: [pygments.org](http://pygments.org/download/)
diff --git a/plugins/colorize/colorize.plugin.zsh b/plugins/colorize/colorize.plugin.zsh
index e2af6d25e..8eede9a94 100644
--- a/plugins/colorize/colorize.plugin.zsh
+++ b/plugins/colorize/colorize.plugin.zsh
@@ -1,9 +1,4 @@
-# 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.
-
-#easier alias to use plugin
+# easier alias to use the plugin
 alias ccat='colorize_via_pygmentize'
 
 colorize_via_pygmentize() {
@@ -12,16 +7,20 @@ colorize_via_pygmentize() {
         return 1
     fi
 
+    # pygmentize stdin if no arguments passed
     if [ $# -eq 0 ]; then
-        pygmentize -g $@
+        pygmentize -g
+        return $?
     fi
 
+    # guess lexer from file extension, or
+    # guess it from file contents if unsuccessful
+    local FNAME lexer
     for FNAME in $@
     do
-        filename=$(basename "$FNAME")
-        lexer=`pygmentize -N \"$filename\"`
-        if [ "Z$lexer" != "Ztext" ]; then
-            pygmentize -l $lexer "$FNAME"
+        lexer=$(pygmentize -N "$FNAME")
+        if [[ $lexer != text ]]; then
+            pygmentize -l "$lexer" "$FNAME"
         else
             pygmentize -g "$FNAME"
         fi
-- 
cgit v1.2.3-70-g09d2


From 1a4052b0451121556fceca63ee96255cca0ca94c Mon Sep 17 00:00:00 2001
From: Pasan <pasan.super@gmail.com>
Date: Sat, 20 Oct 2018 08:55:19 +0530
Subject: Added README.md to lighthouse plugin

---
 plugins/lighthouse/README.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 plugins/lighthouse/README.md

(limited to 'plugins')

diff --git a/plugins/lighthouse/README.md b/plugins/lighthouse/README.md
new file mode 100644
index 000000000..0dd0003f1
--- /dev/null
+++ b/plugins/lighthouse/README.md
@@ -0,0 +1,15 @@
+# Lighthouse plugin
+
+This plugin issue lighthouse tickets.
+
+To use it, add `lighthouse` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... lighthouse)
+```
+
+## Aliases
+
+| Alias | Command                                | Description                                          |
+|-------|----------------------------------------|------------------------------------------------------|
+| lho   | `open_lighthouse_ticket`               | Opening lighthouse ticket                            |
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From 4365792985f6bbaf65c847400fa47ce7c0d1cb79 Mon Sep 17 00:00:00 2001
From: Erwan ROUSSEL <erwan.roussel51@gmail.com>
Date: Tue, 23 Oct 2018 14:43:44 +0200
Subject: Create README.md

Add README.md to Symfony2 plugin
---
 plugins/symfony2/README.md | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 plugins/symfony2/README.md

(limited to 'plugins')

diff --git a/plugins/symfony2/README.md b/plugins/symfony2/README.md
new file mode 100644
index 000000000..d5d9c1880
--- /dev/null
+++ b/plugins/symfony2/README.md
@@ -0,0 +1,25 @@
+# Symfony2
+
+This plugin provides completion for [symfony2](https://symfony.com/), as well as aliases for frequent composer commands.
+
+To use it add composer to the plugins array in your zshrc file.
+
+```bash
+plugins=(... symfony2)
+```
+
+## Aliases
+
+| Alias         | Command                      | Description                   |
+|---------------|------------------------------|-------------------------------|
+| `sf`          | php app/console              | Start the symfony console     |
+| `sfcl`        | sf cache:clear               | Clear the cache               |
+| `sfsr`        | sf server:run                | Run the dev server            |
+| `sfcw`        | sf cache:warmup              | Use the Bundles warmer        |
+| `sfroute`     | sf debug:router              | Show the different routes     |
+| `sfcontainer` | sf debug:contaner            | List the different services   |
+| `sfgb`        | sf generate:bundle           | Generate a bundle             |
+| `sfge`        | sf doctrine:generate:entity  | Generate an entity            |
+| `sfsu`        | sf doctrine:schema:update    | Update the schema in Database |
+| `sfdev`       | sf --env=dev                 | Update environment to `dev`   |
+| `sfprod`      | sf --env=prod                | Update environment to `prod`  |
-- 
cgit v1.2.3-70-g09d2


From 550781561bf6871fcf5036e0beb707e116de9d3b Mon Sep 17 00:00:00 2001
From: Andreas Häber <andy@andyandy.info>
Date: Wed, 24 Oct 2018 15:56:51 +0200
Subject: helm: add README (#7325)

---
 plugins/helm/README.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 plugins/helm/README.md

(limited to 'plugins')

diff --git a/plugins/helm/README.md b/plugins/helm/README.md
new file mode 100644
index 000000000..49844c78f
--- /dev/null
+++ b/plugins/helm/README.md
@@ -0,0 +1,9 @@
+# Helm plugin
+
+This plugin adds completion for [Helm](https://helm.sh/), the Kubernetes package manager.
+
+To use it, add `helm` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... helm)
+```
-- 
cgit v1.2.3-70-g09d2


From 50208f5c427fb6af076e24ac3a1eab714b4511b9 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Wed, 24 Oct 2018 16:01:42 +0200
Subject: fix copy errors

---
 plugins/symfony2/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/symfony2/README.md b/plugins/symfony2/README.md
index d5d9c1880..562641dfb 100644
--- a/plugins/symfony2/README.md
+++ b/plugins/symfony2/README.md
@@ -1,8 +1,8 @@
 # Symfony2
 
-This plugin provides completion for [symfony2](https://symfony.com/), as well as aliases for frequent composer commands.
+This plugin provides completion for [Symfony 2](https://symfony.com/), as well as aliases for frequent Symfony commands.
 
-To use it add composer to the plugins array in your zshrc file.
+To use it add symfony2 to the plugins array in your zshrc file.
 
 ```bash
 plugins=(... symfony2)
-- 
cgit v1.2.3-70-g09d2


From 745b6550a6a8415e2c6df0006aad40549c3bc56a Mon Sep 17 00:00:00 2001
From: "Paul N. Baker" <paul-nelson-baker@users.noreply.github.com>
Date: Wed, 24 Oct 2018 09:41:05 -0600
Subject: mvn: run mvnw only if executable (#7326)

The problem that can occur is ocassionally mvnw will not be executable. This can happen if mvnw is included from an archetype, as unix permissions aren't preserved within the jar they're stored in. Only using mvnw if it exists AND is executable
---
 plugins/mvn/mvn.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index 74583c6dc..f367fecce 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -20,9 +20,9 @@ BACKGROUND_CYAN=$(tput setab 6)
 BACKGROUND_WHITE=$(tput setab 7)
 RESET_FORMATTING=$(tput sgr0)
 
-# if found a ./mvnw file execute it otherwise execute orignal mvn
+# if found an executable ./mvnw file execute it otherwise execute orignal mvn
 mvn-or-mvnw() {
-	if [ -f ./mvnw ] ; then
+	if [ -x ./mvnw ] ; then
 		echo "executing mvnw instead of mvn"		
 		./mvnw "$@";
 	else
-- 
cgit v1.2.3-70-g09d2


From ad41fe50f9ac8b44b2171fea8b0b990aa9542699 Mon Sep 17 00:00:00 2001
From: Erwan ROUSSEL <erwan.roussel51@gmail.com>
Date: Thu, 25 Oct 2018 13:12:02 +0200
Subject: symfony: add README (#7337)

---
 plugins/symfony/README.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 plugins/symfony/README.md

(limited to 'plugins')

diff --git a/plugins/symfony/README.md b/plugins/symfony/README.md
new file mode 100644
index 000000000..c58f64fdd
--- /dev/null
+++ b/plugins/symfony/README.md
@@ -0,0 +1,9 @@
+# Symfony
+
+This plugin provides completion for [Symfony](https://symfony.com/).
+
+To use it add symfony to the plugins array in your zshrc file.
+
+```bash
+plugins=(... symfony)
+```
-- 
cgit v1.2.3-70-g09d2


From ad9a8f2d434deb698702ba136d935d9d0910a4ae Mon Sep 17 00:00:00 2001
From: Patrick Artounian <partounian@users.noreply.github.com>
Date: Thu, 25 Oct 2018 04:26:22 -0700
Subject: systemadmin: fix getip output with ifconfig (#7306)

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

(limited to 'plugins')

diff --git a/plugins/systemadmin/systemadmin.plugin.zsh b/plugins/systemadmin/systemadmin.plugin.zsh
index 5cc7b7397..bdc2219fa 100644
--- a/plugins/systemadmin/systemadmin.plugin.zsh
+++ b/plugins/systemadmin/systemadmin.plugin.zsh
@@ -134,12 +134,12 @@ geteip() {
     curl -s -S https://icanhazip.com
 }
 
-# determine local IP address
+# determine local IP address(es)
 getip() {
     if (( ${+commands[ip]} )); then
-        ip addr | grep "inet " | grep -v '127.0.0.1' | awk '{print $2}'
+        ip addr | awk '/inet /{print $2}' | command grep -v 127.0.0.1
     else
-        ifconfig  | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1}'
+        ifconfig | awk '/inet /{print $2}' | command grep -v 127.0.0.1
     fi
 }
 
-- 
cgit v1.2.3-70-g09d2


From 4c8dd9c26da5b6cb85c5b82dab5b31b9d216834e Mon Sep 17 00:00:00 2001
From: Erwan ROUSSEL <erwan.roussel51@gmail.com>
Date: Fri, 26 Oct 2018 14:52:54 +0200
Subject: heroku: add README (#7342)

---
 plugins/heroku/README.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 plugins/heroku/README.md

(limited to 'plugins')

diff --git a/plugins/heroku/README.md b/plugins/heroku/README.md
new file mode 100644
index 000000000..2bf92c9de
--- /dev/null
+++ b/plugins/heroku/README.md
@@ -0,0 +1,9 @@
+# Heroku
+
+This plugin provides completion for the [Heroku CLI](https://devcenter.heroku.com/articles/heroku-cli).
+
+To use it add heroku to the plugins array in your zshrc file:
+
+```bash
+plugins=(... heroku)
+```
-- 
cgit v1.2.3-70-g09d2


From c6b68707f95faabb31fcaabf55f5d78abc64fb19 Mon Sep 17 00:00:00 2001
From: Erwan ROUSSEL <erwan.roussel51@gmail.com>
Date: Fri, 26 Oct 2018 17:05:50 +0200
Subject: doctl: add README (#7346)

---
 plugins/doctl/README.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 plugins/doctl/README.md

(limited to 'plugins')

diff --git a/plugins/doctl/README.md b/plugins/doctl/README.md
new file mode 100644
index 000000000..a81e90b0a
--- /dev/null
+++ b/plugins/doctl/README.md
@@ -0,0 +1,9 @@
+# Doctl
+
+This plugin provides completion for [Doctl](https://github.com/digitalocean/doctl).
+
+To use it add doctl to the plugins array in your zshrc file.
+
+```bash
+plugins=(... doctl)
+```
-- 
cgit v1.2.3-70-g09d2


From b3483109f54dbb0481fb0d6a491f2bf89f0f4cf8 Mon Sep 17 00:00:00 2001
From: Erwan ROUSSEL <erwan.roussel51@gmail.com>
Date: Fri, 26 Oct 2018 17:06:45 +0200
Subject: celery: add README (#7345)

---
 plugins/celery/README.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 plugins/celery/README.md

(limited to 'plugins')

diff --git a/plugins/celery/README.md b/plugins/celery/README.md
new file mode 100644
index 000000000..d2597f702
--- /dev/null
+++ b/plugins/celery/README.md
@@ -0,0 +1,9 @@
+# Celery
+
+This plugin provides completion for [Celery](http://www.celeryproject.org/).
+
+To use it add celery to the plugins array in your zshrc file.
+
+```bash
+plugins=(... celery)
+```
-- 
cgit v1.2.3-70-g09d2


From fcbfd75827e52cb11e40246735d2a8f43f861d1a Mon Sep 17 00:00:00 2001
From: Erwan ROUSSEL <erwan.roussel51@gmail.com>
Date: Fri, 26 Oct 2018 17:08:27 +0200
Subject: homestead: add README (#7343)

---
 plugins/homestead/README.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 plugins/homestead/README.md

(limited to 'plugins')

diff --git a/plugins/homestead/README.md b/plugins/homestead/README.md
new file mode 100644
index 000000000..476302371
--- /dev/null
+++ b/plugins/homestead/README.md
@@ -0,0 +1,9 @@
+# Homestead
+
+This plugin provides completion for [Homestead](https://laravel.com/docs/homestead).
+
+To use it add homestead to the plugins array in your zshrc file.
+
+```bash
+plugins=(... homestead)
+```
-- 
cgit v1.2.3-70-g09d2


From f31ef2024dacc4c3a35e8486173fe9de3fcd67be Mon Sep 17 00:00:00 2001
From: Erwan ROUSSEL <erwan.roussel51@gmail.com>
Date: Fri, 26 Oct 2018 17:10:50 +0200
Subject: jake-node: add README (#7344)

---
 plugins/jake-node/README.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 plugins/jake-node/README.md

(limited to 'plugins')

diff --git a/plugins/jake-node/README.md b/plugins/jake-node/README.md
new file mode 100644
index 000000000..78ca8d85f
--- /dev/null
+++ b/plugins/jake-node/README.md
@@ -0,0 +1,9 @@
+# Jake
+
+This plugin provides completion for [Jake](http://jakejs.com/).
+
+To use it add jake-node to the plugins array in your zshrc file.
+
+```bash
+plugins=(... jake-node)
+```
-- 
cgit v1.2.3-70-g09d2


From 5da824526a0184087c8aa0eae2255ea547385e81 Mon Sep 17 00:00:00 2001
From: Jorge Vargas <yorch.veintemil+github@gmail.com>
Date: Sat, 27 Oct 2018 16:32:13 -0700
Subject: kops: add README.md

---
 plugins/kops/README.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 plugins/kops/README.md

(limited to 'plugins')

diff --git a/plugins/kops/README.md b/plugins/kops/README.md
new file mode 100644
index 000000000..1983afab4
--- /dev/null
+++ b/plugins/kops/README.md
@@ -0,0 +1,9 @@
+# kops
+
+This plugin provides completion for [kops](https://github.com/kubernetes/kops).
+
+To use it, add `kops` to the plugins array in your zshrc file.
+
+```
+plugins=(... kops)
+```
-- 
cgit v1.2.3-70-g09d2


From c4bdb83f07e8efee940292a42dd286a6263848ca Mon Sep 17 00:00:00 2001
From: Marco Zühlke <mzuehlke@gmail.com>
Date: Sun, 28 Oct 2018 11:36:54 +0100
Subject: add readme fot git-flow-avh

---
 plugins/git-flow-avh/README.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 plugins/git-flow-avh/README.md

(limited to 'plugins')

diff --git a/plugins/git-flow-avh/README.md b/plugins/git-flow-avh/README.md
new file mode 100644
index 000000000..340ed80d1
--- /dev/null
+++ b/plugins/git-flow-avh/README.md
@@ -0,0 +1,12 @@
+# git-flow (AVH Edition) plugin
+
+This plugin adds completion for the [git-flow (AVH Edition)](https://github.com/petervanderdoes/gitflow-avh).
+The AVH Edition of the git extensions that provides high-level repository operations for [Vincent Driessen's branching model](https://nvie.com/posts/a-successful-git-branching-model/).
+
+The git-flow tool has to be [installed](https://github.com/petervanderdoes/gitflow-avh#installing-git-flow) separately.
+
+To use it, add `git-flow-avh` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... git-flow-avh)
+```
-- 
cgit v1.2.3-70-g09d2


From ac2ccb753521c279fc17ae26e33359f7dec9d527 Mon Sep 17 00:00:00 2001
From: Marco Zühlke <mzuehlke@gmail.com>
Date: Sun, 28 Oct 2018 12:21:29 +0100
Subject: add readme for grails plugin

---
 plugins/grails/README.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 plugins/grails/README.md

(limited to 'plugins')

diff --git a/plugins/grails/README.md b/plugins/grails/README.md
new file mode 100644
index 000000000..1b0eda1dd
--- /dev/null
+++ b/plugins/grails/README.md
@@ -0,0 +1,15 @@
+# Grails plugin
+
+Adds tab-completion of Grails script names to the command line use of grails.
+Looks for scripts in the following paths:
+
+- `$GRAILS_HOME/scripts`
+- `~/.grails/scripts`
+- `./scripts`
+- `./plugins/*/scripts`
+
+To use it, add `grails` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... grails)
+```
-- 
cgit v1.2.3-70-g09d2


From abcac3e8a1819c0ad2a5bab84e4c57512a5d745e Mon Sep 17 00:00:00 2001
From: Erwan ROUSSEL <erwan.roussel51@gmail.com>
Date: Sun, 28 Oct 2018 12:28:28 +0100
Subject: Create README.md

Create stack's plugin README.md
---
 plugins/stack/README.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 plugins/stack/README.md

(limited to 'plugins')

diff --git a/plugins/stack/README.md b/plugins/stack/README.md
new file mode 100644
index 000000000..da73444ad
--- /dev/null
+++ b/plugins/stack/README.md
@@ -0,0 +1,9 @@
+# Stack
+
+This plugin provides completion for [Stack](https://haskellstack.org).
+
+To use it add stack to the plugins array in your zshrc file.
+
+```bash
+plugins=(... stack)
+```
-- 
cgit v1.2.3-70-g09d2


From 684feffc355df95c804a6a32196248bacfefebe7 Mon Sep 17 00:00:00 2001
From: Jorge Luis Vargas Aguilar <yorch.veintemil+github@gmail.com>
Date: Sun, 28 Oct 2018 05:17:41 -0700
Subject: aws: add README (#7357)

---
 plugins/aws/README.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 plugins/aws/README.md

(limited to 'plugins')

diff --git a/plugins/aws/README.md b/plugins/aws/README.md
new file mode 100644
index 000000000..8a45199b8
--- /dev/null
+++ b/plugins/aws/README.md
@@ -0,0 +1,20 @@
+# aws
+
+This plugin provides completion support for [awscli](https://docs.aws.amazon.com/cli/latest/reference/index.html)
+and a few utilities to manage AWS profiles: a function to change profiles with autocompletion support
+and a function to get the current AWS profile. The current AWS profile is also displayed in `RPROMPT`.
+
+To use it, add `aws` to the plugins array in your zshrc file.
+
+```zsh
+plugins=(... aws)
+```
+
+## Plugin commands
+
+* `asp <profile>`: Sets `AWS_PROFILE` and `AWS_DEFAULT_PROFILE` (legacy) to `<profile>`.
+It also adds it to your RPROMPT.
+
+* `agp`: Gets the current value of `AWS_PROFILE`.
+
+* `aws_profiles`: Lists the available profiles in the file referenced in `AWS_CONFIG_FILE` (default: ~/.aws/config). Used to provide completion for the `asp` function.
-- 
cgit v1.2.3-70-g09d2


From 3752700a5a12136e0b6b80d3fd07a271c868d616 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sun, 28 Oct 2018 13:21:58 +0100
Subject: add description and author

---
 plugins/kops/README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/kops/README.md b/plugins/kops/README.md
index 1983afab4..5d9b5f8d6 100644
--- a/plugins/kops/README.md
+++ b/plugins/kops/README.md
@@ -1,9 +1,12 @@
 # kops
 
-This plugin provides completion for [kops](https://github.com/kubernetes/kops).
+This plugin provides completion for [kops](https://github.com/kubernetes/kops) (Kubernetes Operations),
+the command line interface to get a production grade Kubernetes cluster up and running.
 
 To use it, add `kops` to the plugins array in your zshrc file.
 
 ```
 plugins=(... kops)
 ```
+
+**Author:** [@nmrony](https://github.com/nmrony)
-- 
cgit v1.2.3-70-g09d2


From a58dc3232332db61f0e8244bcf0416aaef5d6fe0 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sun, 28 Oct 2018 13:22:26 +0100
Subject: delete duplicate documentation

---
 plugins/kops/kops.plugin.zsh | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'plugins')

diff --git a/plugins/kops/kops.plugin.zsh b/plugins/kops/kops.plugin.zsh
index f707f3aff..0c38ce2df 100644
--- a/plugins/kops/kops.plugin.zsh
+++ b/plugins/kops/kops.plugin.zsh
@@ -1,9 +1,3 @@
-# Autocompletion for kops (Kubernetes Operations),
-# the command line interface to get a production grade
-# Kubernetes cluster up and running
-
-# Author: https://github.com/nmrony
-
 if [ $commands[kops] ]; then
   source <(kops completion zsh)
 fi
-- 
cgit v1.2.3-70-g09d2


From 70246da9cbc96b33256496e501618b9963ac73ee Mon Sep 17 00:00:00 2001
From: Jorge Luis Vargas Aguilar <yorch.veintemil+github@gmail.com>
Date: Sun, 28 Oct 2018 05:24:17 -0700
Subject: minikube: add README (#7359)

---
 plugins/minikube/README.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 plugins/minikube/README.md

(limited to 'plugins')

diff --git a/plugins/minikube/README.md b/plugins/minikube/README.md
new file mode 100644
index 000000000..eb2dd9b46
--- /dev/null
+++ b/plugins/minikube/README.md
@@ -0,0 +1,9 @@
+# minikube
+
+This plugin provides completion for [minikube](https://github.com/kubernetes/minikube).
+
+To use it, add `minikube` to the plugins array in your zshrc file.
+
+```
+plugins=(... minikube)
+```
-- 
cgit v1.2.3-70-g09d2


From 8f777f30bbb97f27b855bad5585619da499ea7e1 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sun, 28 Oct 2018 13:37:55 +0100
Subject: add git completion requirements notice

---
 plugins/git-flow-avh/README.md | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/git-flow-avh/README.md b/plugins/git-flow-avh/README.md
index 340ed80d1..0768d93ea 100644
--- a/plugins/git-flow-avh/README.md
+++ b/plugins/git-flow-avh/README.md
@@ -3,10 +3,17 @@
 This plugin adds completion for the [git-flow (AVH Edition)](https://github.com/petervanderdoes/gitflow-avh).
 The AVH Edition of the git extensions that provides high-level repository operations for [Vincent Driessen's branching model](https://nvie.com/posts/a-successful-git-branching-model/).
 
-The git-flow tool has to be [installed](https://github.com/petervanderdoes/gitflow-avh#installing-git-flow) separately.
-
 To use it, add `git-flow-avh` to the plugins array in your zshrc file:
 
 ```zsh
 plugins=(... git-flow-avh)
 ```
+
+## Requirements
+
+1. The git-flow tool has to be [installed](https://github.com/petervanderdoes/gitflow-avh#installing-git-flow)
+   separately.
+
+2. You have to use zsh's git completion instead of the git project's git completion. This is typically
+   done by default so you don't need to do anything else. If you installed git with Homebrew you
+   might have to uninstall the git completion it's bundled with.
-- 
cgit v1.2.3-70-g09d2


From b6f629dc1c63c354d1e635f36a0f016554354a86 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sun, 28 Oct 2018 13:39:26 +0100
Subject: delete not applicable comments

---
 plugins/git-flow-avh/git-flow-avh.plugin.zsh | 22 ----------------------
 1 file changed, 22 deletions(-)

(limited to 'plugins')

diff --git a/plugins/git-flow-avh/git-flow-avh.plugin.zsh b/plugins/git-flow-avh/git-flow-avh.plugin.zsh
index db8b5ff89..860ca55c5 100644
--- a/plugins/git-flow-avh/git-flow-avh.plugin.zsh
+++ b/plugins/git-flow-avh/git-flow-avh.plugin.zsh
@@ -1,25 +1,3 @@
-#!zsh
-#
-# Installation
-# ------------
-#
-# To achieve git-flow completion nirvana:
-#
-#  0. Update your zsh's git-completion module to the newest version.
-#     From here: https://github.com/zsh-users/zsh/blob/master/Completion/Unix/Command/_git
-#
-#  1. Install this file. Either:
-#
-#     a. Place it in your .zshrc:
-#
-#     b. Or, copy it somewhere (e.g. ~/.git-flow-completion.zsh) and put the following line in
-#        your .zshrc:
-#
-#            source ~/.git-flow-completion.zsh
-#
-#     c. Or, use this file as a oh-my-zsh plugin.
-#
-
 _git-flow ()
 {
     local curcontext="$curcontext" state line
-- 
cgit v1.2.3-70-g09d2


From f1250cfbce4dc08b1b4d147ff533fad0ca64d5e0 Mon Sep 17 00:00:00 2001
From: Marco Zühlke <mzuehlke@gmail.com>
Date: Sun, 28 Oct 2018 13:46:08 +0100
Subject: git-hubflow: add README (#7361)

---
 plugins/git-hubflow/README.md              | 24 ++++++++++++++++++++++++
 plugins/git-hubflow/git-hubflow.plugin.zsh | 22 ----------------------
 2 files changed, 24 insertions(+), 22 deletions(-)
 create mode 100644 plugins/git-hubflow/README.md

(limited to 'plugins')

diff --git a/plugins/git-hubflow/README.md b/plugins/git-hubflow/README.md
new file mode 100644
index 000000000..dada60d78
--- /dev/null
+++ b/plugins/git-hubflow/README.md
@@ -0,0 +1,24 @@
+# git-hubflow plugin
+
+This plugin adds completion for [HubFlow](https://datasift.github.io/gitflow/) (GitFlow for GitHub), as well as some
+aliases for common commands. HubFlow is a git extension to make it easy to use GitFlow with GitHub. Based on the
+original gitflow extension for git.
+
+The hubflow tool has to be [installed](https://github.com/datasift/gitflow#installation) separately.
+
+To use it, add `git-hubflow` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... git-hubflow)
+```
+
+## Aliases
+
+| Alias | Command          | Description                                                      |
+|-------|------------------|------------------------------------------------------------------|
+| ghf   | `git hf`         | Print command overview                                           |
+| ghff  | `git hf feature` | Manage your feature branches                                     |
+| ghfr  | `git hf release` | Manage your release branches                                     |
+| ghfh  | `git hf hotfix`  | Manage your hotfix branches                                      |
+| ghfs  | `git hf support` | Manage your support branches                                     |
+| ghfu  | `git hf update`  | Pull upstream changes down into your master and develop branches |
diff --git a/plugins/git-hubflow/git-hubflow.plugin.zsh b/plugins/git-hubflow/git-hubflow.plugin.zsh
index 8d968229f..05479f7e6 100644
--- a/plugins/git-hubflow/git-hubflow.plugin.zsh
+++ b/plugins/git-hubflow/git-hubflow.plugin.zsh
@@ -1,25 +1,3 @@
-#!zsh
-#
-# Installation
-# ------------
-#
-# To achieve git-hubflow completion nirvana:
-#
-#  0. Update your zsh's git-completion module to the newest version.
-#     From here: https://github.com/zsh-users/zsh/blob/master/Completion/Unix/Command/_git
-#
-#  1. Install this file. Either:
-#
-#     a. Place it in your .zshrc:
-#
-#     b. Or, copy it somewhere (e.g. ~/.git-hubflow-completion.zsh) and put the following line in
-#        your .zshrc:
-#
-#            source ~/.git-hubflow-completion.zsh
-#
-#     c. Or, use this file as an oh-my-zsh plugin.
-#
-
 alias ghf='git hf'
 alias ghff='git hf feature'
 alias ghfr='git hf release'
-- 
cgit v1.2.3-70-g09d2


From 4e59ba755cb75793582566eacc6f042cb8f2461b Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sun, 28 Oct 2018 13:50:34 +0100
Subject: move path section after plugin-enabling section

---
 plugins/grails/README.md | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'plugins')

diff --git a/plugins/grails/README.md b/plugins/grails/README.md
index 1b0eda1dd..9d69b161e 100644
--- a/plugins/grails/README.md
+++ b/plugins/grails/README.md
@@ -1,15 +1,16 @@
 # Grails plugin
 
 Adds tab-completion of Grails script names to the command line use of grails.
-Looks for scripts in the following paths:
-
-- `$GRAILS_HOME/scripts`
-- `~/.grails/scripts`
-- `./scripts`
-- `./plugins/*/scripts`
 
 To use it, add `grails` to the plugins array in your zshrc file:
 
 ```zsh
 plugins=(... grails)
 ```
+
+It looks for scripts in the following paths:
+
+- `$GRAILS_HOME/scripts`
+- `~/.grails/scripts`
+- `./scripts`
+- `./plugins/*/scripts`
-- 
cgit v1.2.3-70-g09d2


From c87eea8bdb19aa3d3324158e83518140bf1c2b28 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sun, 28 Oct 2018 13:51:26 +0100
Subject: add link

---
 plugins/grails/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/grails/README.md b/plugins/grails/README.md
index 9d69b161e..6bf2ac1e6 100644
--- a/plugins/grails/README.md
+++ b/plugins/grails/README.md
@@ -1,6 +1,6 @@
 # Grails plugin
 
-Adds tab-completion of Grails script names to the command line use of grails.
+Adds tab-completion of [Grails](https://grails.org/) script names to the command line use of grails.
 
 To use it, add `grails` to the plugins array in your zshrc file:
 
-- 
cgit v1.2.3-70-g09d2


From e4946ef9f94360dd4767c2e58274cd62057822a5 Mon Sep 17 00:00:00 2001
From: "Vargas, Jorge L" <jorge.vargas@thermofisher.com>
Date: Sat, 27 Oct 2018 15:21:18 -0700
Subject: aws: change AWS_DEFAULT_PROFILE to AWS_PROFILE

The environment variable name used to be AWS_DEFAULT_PROFILE but the
CLI documentation now only mentions AWS_PROFILE.

https://docs.aws.amazon.com/cli/latest/userguide/cli-environment.html

It seems like the CLI was the only tool using AWS_DEFAULT_PROFILE, and
all the AWS SDKs used AWS_PROFILE, so they standardized on it.

https://onetechnical.wordpress.com/2016/10/07/the-curious-case-of-aws_default_profile/

Note: still left AWS_DEFAULT_PROFILE on the method to set the profile to
maintain backwards compatibility.

Close #7354
---
 plugins/aws/aws.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index 183b0f226..252c0d9c1 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -24,7 +24,7 @@ _awscli-homebrew-installed() {
 export AWS_HOME=~/.aws
 
 function agp {
-  echo $AWS_DEFAULT_PROFILE
+  echo $AWS_PROFILE
 }
 
 function asp {
@@ -33,7 +33,7 @@ function asp {
   export AWS_DEFAULT_PROFILE=$1
   export AWS_PROFILE=$1
 
-  export RPROMPT="<aws:$AWS_DEFAULT_PROFILE>$rprompt"
+  export RPROMPT="<aws:$AWS_PROFILE>$rprompt"
 }
 
 function aws_profiles {
-- 
cgit v1.2.3-70-g09d2


From 543044efe3940b623069996cf6b2f5127635815f Mon Sep 17 00:00:00 2001
From: Jorge Vargas <yorch.veintemil+github@gmail.com>
Date: Sat, 27 Oct 2018 15:59:03 -0700
Subject: aws: use AWS_CONFIG_FILE to complete profiles

Stop exporting AWS_HOME and use the standard AWS_CONFIG_FILE environment
variable, with a fallback to ~/.aws/config (default location) if not
defined.

Close #7356
---
 plugins/aws/aws.plugin.zsh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'plugins')

diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index 252c0d9c1..f78e96ce3 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -21,8 +21,6 @@ _awscli-homebrew-installed() {
   [ -r $_brew_prefix/libexec/bin/aws_zsh_completer.sh ] &> /dev/null
 }
 
-export AWS_HOME=~/.aws
-
 function agp {
   echo $AWS_PROFILE
 }
@@ -37,7 +35,7 @@ function asp {
 }
 
 function aws_profiles {
-  reply=($(grep profile $AWS_HOME/config|sed -e 's/.*profile \([a-zA-Z0-9_\.-]*\).*/\1/'))
+  reply=($(grep profile "${AWS_CONFIG_FILE:-$HOME/.aws/config}"|sed -e 's/.*profile \([a-zA-Z0-9_\.-]*\).*/\1/'))
 }
 compctl -K aws_profiles asp
 
-- 
cgit v1.2.3-70-g09d2


From 2d74c1bf2beaef4bd6ee6b9448d170450c45b172 Mon Sep 17 00:00:00 2001
From: Mike Truso <mike@agileorbit.com>
Date: Sun, 28 Oct 2018 13:26:08 -0500
Subject: grails readme (#7365)

---
 plugins/grails/README.md | 57 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 56 insertions(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/grails/README.md b/plugins/grails/README.md
index 6bf2ac1e6..64b4a9f07 100644
--- a/plugins/grails/README.md
+++ b/plugins/grails/README.md
@@ -1,6 +1,6 @@
 # Grails plugin
 
-Adds tab-completion of [Grails](https://grails.org/) script names to the command line use of grails.
+This plugin adds completion for the [Grails 2 CLI](https://grails.github.io/grails2-doc/2.5.x/guide/commandLine.html)
 
 To use it, add `grails` to the plugins array in your zshrc file:
 
@@ -14,3 +14,58 @@ It looks for scripts in the following paths:
 - `~/.grails/scripts`
 - `./scripts`
 - `./plugins/*/scripts`
+
+## Grails Commands
+- `add-proxy`
+- `alias`
+- `bootstrap`
+- `bug-report`
+- `clean`
+- `clean-all`
+- `clear-proxy`
+- `compile`
+- `console`
+- `create-app`
+- `create-controller`
+- `create-domain-class`
+- `create-filters`
+- `create-integration-test`
+- `create-multi-project-build`
+- `create-plugin`
+- `create-pom`
+- `create-script`
+- `create-service`
+- `create-tag-lib`
+- `create-unit-test`
+- `dependency-report`
+- `doc`
+- `help`
+- `init`
+- `install-app-templates`
+- `install-dependency`
+- `install-plugin`
+- `install-templates`
+- `integrate-with`
+- `interactive`
+- `list-plugin-updates`
+- `list-plugins`
+- `migrate-docs`
+- `package`
+- `package-plugin`
+- `plugin-info`
+- `refresh-dependencies`
+- `remove-proxy`
+- `run-app`
+- `run-script`
+- `run-war`
+- `set-grails-version`
+- `set-proxy`
+- `set-version`
+- `shell`
+- `stats`
+- `stop-app`
+- `test-app`
+- `uninstall-plugin`
+- `url-mappings-report`
+- `war`
+- `wrapper`
-- 
cgit v1.2.3-70-g09d2


From fa2dc41c233ac2f6a1fea81b6363cd97bb1d199b Mon Sep 17 00:00:00 2001
From: Michy Amrane <marseillaisanonymous@gmail.com>
Date: Sun, 28 Oct 2018 19:27:34 +0100
Subject: [yarn] more aliases ^^ (#7310)

* more aliases ^^
---
 plugins/yarn/README.md       | 6 ++++++
 plugins/yarn/yarn.plugin.zsh | 6 ++++++
 2 files changed, 12 insertions(+)

(limited to 'plugins')

diff --git a/plugins/yarn/README.md b/plugins/yarn/README.md
index c4e6d6da5..671a272d9 100644
--- a/plugins/yarn/README.md
+++ b/plugins/yarn/README.md
@@ -19,13 +19,19 @@ plugins=(... yarn)
 | yap   | `yarn add --peer`                         | Install a package in peerDependencies (`package.json`)      |
 | yb    | `yarn build`                              | Run the build script defined in `package.json`              |
 | ycc   | `yarn cache clean`                        | Clean yarn's global cache of packages                       |
+| yga   | `yarn global add`                         | Install packages globally on your operating system          |
+| ygls  | `yarn global list`                        | Lists global installed packages                             |
+| ygrm  | `yarn global remove`                      | Remove global installed packages from your OS               |
 | ygu   | `yarn global upgrade`                     | Upgrade packages installed globally to their latest version |
 | yh    | `yarn help`                               | Show help for a yarn command                                |
+| yi    | `yarn init`                               | Interactively creates or updates a package.json file        |
 | yin   | `yarn install`                            | Install dependencies defined in `package.json`              |
 | yls   | `yarn list`                               | List installed packages                                     |
 | yout  | `yarn outdated`                           | Check for outdated package dependencies                     |
+| yp    | `yarn pack`                               | Create a compressed gzip archive of package dependencies    |
 | yrm   | `yarn remove`                             | Remove installed packages                                   |
 | yrun  | `yarn run`                                | Run a defined package script                                |
+| ys    | `yarn serve`                              | Start the dev server                                        |
 | yst   | `yarn start`                              | Run the start script defined in `package.json`              |
 | yt    | `yarn test`                               | Run the test script defined in `package.json`               |
 | yuc   | `yarn global upgrade && yarn cache clean` | Upgrade global packages and clean yarn's global cache       |
diff --git a/plugins/yarn/yarn.plugin.zsh b/plugins/yarn/yarn.plugin.zsh
index fe752357f..9ed8322cd 100644
--- a/plugins/yarn/yarn.plugin.zsh
+++ b/plugins/yarn/yarn.plugin.zsh
@@ -4,13 +4,19 @@ alias yad="yarn add --dev"
 alias yap="yarn add --peer"
 alias yb="yarn build"
 alias ycc="yarn cache clean"
+alias yga="yarn global add"
+alias ygls="yarn global list"
+alias ygrm="yarn global remove"
 alias ygu="yarn global upgrade"
 alias yh="yarn help"
+alias yi="yarn init"
 alias yin="yarn install"
 alias yls="yarn list"
 alias yout="yarn outdated"
+alias yp="yarn pack"
 alias yrm="yarn remove"
 alias yrun="yarn run"
+alias ys="yarn serve"
 alias yst="yarn start"
 alias yt="yarn test"
 alias yuc="yarn global upgrade && yarn cache clean"
-- 
cgit v1.2.3-70-g09d2


From dc3a605ec1cd7fb2476074ce47f74b0b5093ab46 Mon Sep 17 00:00:00 2001
From: Erwan ROUSSEL <erwan.roussel51@gmail.com>
Date: Sun, 28 Oct 2018 19:28:15 +0100
Subject: Add symfony2 aliases (#7338)

* Documentation for Npm plugin added

* Fix style and add alias descriptions

* Add Generate Command alias

* Add Create Database alias

* Add Generate Controller alias
---
 plugins/symfony2/README.md           | 3 +++
 plugins/symfony2/symfony2.plugin.zsh | 3 +++
 2 files changed, 6 insertions(+)

(limited to 'plugins')

diff --git a/plugins/symfony2/README.md b/plugins/symfony2/README.md
index 562641dfb..2946d0937 100644
--- a/plugins/symfony2/README.md
+++ b/plugins/symfony2/README.md
@@ -19,7 +19,10 @@ plugins=(... symfony2)
 | `sfroute`     | sf debug:router              | Show the different routes     |
 | `sfcontainer` | sf debug:contaner            | List the different services   |
 | `sfgb`        | sf generate:bundle           | Generate a bundle             |
+| `sfgc`        | sf generate:controller       | Generate a controller         |
+| `sfgcom`      | sf generate:command          | Generate a command            |
 | `sfge`        | sf doctrine:generate:entity  | Generate an entity            |
 | `sfsu`        | sf doctrine:schema:update    | Update the schema in Database |
+| `sfdc`        | sf doctrine:database:create  | Create the Database           |
 | `sfdev`       | sf --env=dev                 | Update environment to `dev`   |
 | `sfprod`      | sf --env=prod                | Update environment to `prod`  |
diff --git a/plugins/symfony2/symfony2.plugin.zsh b/plugins/symfony2/symfony2.plugin.zsh
index 0b608fe2a..1498e8d02 100644
--- a/plugins/symfony2/symfony2.plugin.zsh
+++ b/plugins/symfony2/symfony2.plugin.zsh
@@ -25,7 +25,10 @@ alias sfcw='sf cache:warmup'
 alias sfroute='sf debug:router'
 alias sfcontainer='sf debug:container'
 alias sfgb='sf generate:bundle'
+alias sfgc='sf generate:controller'
+alias sfgcom='sf generate:command'
 alias sfge='sf doctrine:generate:entity'
 alias sfsu='sf doctrine:schema:update'
+alias sfdc='sf doctrine:database:create'
 alias sfdev='sf --env=dev'
 alias sfprod='sf --env=prod'
-- 
cgit v1.2.3-70-g09d2


From e83a4c81845885f378843cb0e9726592d964aafe Mon Sep 17 00:00:00 2001
From: Akash Krishnan <akashfoss@users.noreply.github.com>
Date: Tue, 30 Oct 2018 02:41:02 +0530
Subject: cabal: add README (#7367)

---
 plugins/cabal/README.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 plugins/cabal/README.md

(limited to 'plugins')

diff --git a/plugins/cabal/README.md b/plugins/cabal/README.md
new file mode 100644
index 000000000..b1106c40f
--- /dev/null
+++ b/plugins/cabal/README.md
@@ -0,0 +1,9 @@
+# Cabal
+
+This plugin provides completion for [Cabal](https://www.haskell.org/cabal/), a build tool for Haskell. It
+also provides a function `cabal_sandbox_info` that prints whether the current working directory is in a sandbox.
+
+To use it, add cabal to the plugins array of your zshrc file:
+```
+plugins=(... cabal)
+```
-- 
cgit v1.2.3-70-g09d2


From 30125e10a60134e08f9ce411f2b2ebdd67face35 Mon Sep 17 00:00:00 2001
From: Erwan ROUSSEL <erwan.roussel51@gmail.com>
Date: Tue, 30 Oct 2018 15:55:35 +0100
Subject: bwana: add README (#7369)

---
 plugins/bwana/README.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 plugins/bwana/README.md

(limited to 'plugins')

diff --git a/plugins/bwana/README.md b/plugins/bwana/README.md
new file mode 100644
index 000000000..8cbeaa32e
--- /dev/null
+++ b/plugins/bwana/README.md
@@ -0,0 +1,9 @@
+# Bwana
+
+This plugin provides a function to open `man` pages directly with [Bwana](https://www.bruji.com/bwana/).
+
+To use it add bwana to the plugins array in your zshrc file.
+
+```bash
+plugins=(... bwana)
+```
-- 
cgit v1.2.3-70-g09d2


From 78935f7cf74e5092002dc66df875879aea502c86 Mon Sep 17 00:00:00 2001
From: Erwan ROUSSEL <erwan.roussel51@gmail.com>
Date: Thu, 1 Nov 2018 15:17:25 +0100
Subject: ant: add README (#7375)

---
 plugins/ant/README.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 plugins/ant/README.md

(limited to 'plugins')

diff --git a/plugins/ant/README.md b/plugins/ant/README.md
new file mode 100644
index 000000000..5f88984ac
--- /dev/null
+++ b/plugins/ant/README.md
@@ -0,0 +1,12 @@
+# Ant
+
+This plugin provides completion for [Ant](https://ant.apache.org/).
+
+To use it add ant to the plugins array in your zshrc file.
+
+```bash
+plugins=(... ant)
+```
+
+It caches ant targets in a file named `.ant_targets`, you might want to add that to
+your `.gitignore` file.
-- 
cgit v1.2.3-70-g09d2


From 5c91cfcb061aafbffe7b60f22c23a3ed580fdf2a Mon Sep 17 00:00:00 2001
From: Erwan ROUSSEL <erwan.roussel51@gmail.com>
Date: Thu, 1 Nov 2018 15:29:05 +0100
Subject: capistrano: add README (#7376)

---
 plugins/capistrano/README.md             | 14 ++++++++++++++
 plugins/capistrano/capistrano.plugin.zsh |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 plugins/capistrano/README.md

(limited to 'plugins')

diff --git a/plugins/capistrano/README.md b/plugins/capistrano/README.md
new file mode 100644
index 000000000..335b794fa
--- /dev/null
+++ b/plugins/capistrano/README.md
@@ -0,0 +1,14 @@
+# Capistrano
+
+This plugin provides completion for [Capistrano](https://capistranorb.com/).
+
+To use it add capistrano to the plugins array in your zshrc file.
+
+```bash
+plugins=(... capistrano)
+```
+
+For a working completion use the `capit` command instead of `cap`, because cap is a
+[reserved word in zsh](http://zsh.sourceforge.net/Doc/Release/Zsh-Modules.html#The-zsh_002fcap-Module).
+
+`capit` automatically runs cap with bundler if a Gemfile is found.
diff --git a/plugins/capistrano/capistrano.plugin.zsh b/plugins/capistrano/capistrano.plugin.zsh
index 0b5559791..819572825 100644
--- a/plugins/capistrano/capistrano.plugin.zsh
+++ b/plugins/capistrano/capistrano.plugin.zsh
@@ -1,7 +1,7 @@
-# Added `shipit` because `cap` is a reserved word. `cap` completion doesn't work.
+# Added `capit` because `cap` is a reserved word. `cap` completion doesn't work.
 # http://zsh.sourceforge.net/Doc/Release/Zsh-Modules.html#The-zsh_002fcap-Module
 
-func capit() {
+function capit() {
   if [ -f Gemfile ]
   then
     bundle exec cap $*
-- 
cgit v1.2.3-70-g09d2


From 545446a3db0c7e7a2a7e44985b9d0459c347dc49 Mon Sep 17 00:00:00 2001
From: Erwan ROUSSEL <erwan.roussel51@gmail.com>
Date: Thu, 1 Nov 2018 15:42:18 +0100
Subject: cpanm: add README (#7377)

---
 plugins/cpanm/README.md | 9 +++++++++
 plugins/cpanm/_cpanm    | 3 ---
 2 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 plugins/cpanm/README.md

(limited to 'plugins')

diff --git a/plugins/cpanm/README.md b/plugins/cpanm/README.md
new file mode 100644
index 000000000..3803e3e00
--- /dev/null
+++ b/plugins/cpanm/README.md
@@ -0,0 +1,9 @@
+# Cpanm
+
+This plugin provides completion for [Cpanm](https://github.com/miyagawa/cpanminus) ([docs](https://metacpan.org/pod/App::cpanminus)).
+ 
+To use it add cpanm to the plugins array in your zshrc file.
+ 
+ ```bash
+plugins=(... cpanm)
+```
diff --git a/plugins/cpanm/_cpanm b/plugins/cpanm/_cpanm
index 58451d35a..ff9ae1c15 100644
--- a/plugins/cpanm/_cpanm
+++ b/plugins/cpanm/_cpanm
@@ -6,9 +6,6 @@
 #
 # Current supported cpanm version: 1.4000 (Tue Mar  8 01:00:49 PST 2011)
 #
-# The latest code is always located at:
-#   https://github.com/rshhh/cpanminus/blob/master/etc/_cpanm
-#
 
 local arguments curcontext="$curcontext"
 typeset -A opt_args
-- 
cgit v1.2.3-70-g09d2


From fa9d93008b2c9d42f26320c92752f4f019c47404 Mon Sep 17 00:00:00 2001
From: Erwan ROUSSEL <erwan.roussel51@gmail.com>
Date: Thu, 1 Nov 2018 16:40:31 +0100
Subject: fabric: add README (#7378)

---
 plugins/fabric/README.md         |  9 ++++++
 plugins/fabric/_fab              | 60 ----------------------------------------
 plugins/fabric/_fabric           | 60 ++++++++++++++++++++++++++++++++++++++++
 plugins/fabric/fabric.plugin.zsh |  1 -
 4 files changed, 69 insertions(+), 61 deletions(-)
 create mode 100644 plugins/fabric/README.md
 delete mode 100644 plugins/fabric/_fab
 create mode 100644 plugins/fabric/_fabric
 delete mode 100644 plugins/fabric/fabric.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/fabric/README.md b/plugins/fabric/README.md
new file mode 100644
index 000000000..cf0fa81f4
--- /dev/null
+++ b/plugins/fabric/README.md
@@ -0,0 +1,9 @@
+# Fabric
+
+This plugin provides completion for [Fabric](https://www.fabfile.org/).
+
+To use it add fabric to the plugins array in your zshrc file.
+
+```bash
+plugins=(... fabric)
+```
diff --git a/plugins/fabric/_fab b/plugins/fabric/_fab
deleted file mode 100644
index 9628e1224..000000000
--- a/plugins/fabric/_fab
+++ /dev/null
@@ -1,60 +0,0 @@
-#compdef fab
-#autoload
-
-local curcontext=$curcontext state line
-declare -A opt_args
-
-declare target_list
-target_list=(`fab --shortlist 2>/dev/null`)
-
-_targets() {
-    _describe -t commands "fabric targets" target_list
-}
-
-output_levels=(
-    'status: Status messages, i.e. noting when Fabric is done running, if the user used a keyboard interrupt, or when servers are disconnected from. These messages are almost always relevant and rarely verbose.'
-    'aborts: Abort messages. Like status messages, these should really only be turned off when using Fabric as a library, and possibly not even then. Note that even if this output group is turned off, aborts will still occur – there just won’t be any output about why Fabric aborted!'
-    'warnings: Warning messages. These are often turned off when one expects a given operation to fail, such as when using grep to test existence of text in a file. If paired with setting env.warn_only to True, this can result in fully silent warnings when remote programs fail. As with aborts, this setting does not control actual warning behavior, only whether warning messages are printed or hidden.'
-    'running: Printouts of commands being executed or files transferred, e.g. [myserver] run: ls /var/www. Also controls printing of tasks being run, e.g. [myserver] Executing task ''foo''.'
-    'stdout: Local, or remote, stdout, i.e. non-error output from commands.'
-    'stderr: Local, or remote, stderr, i.e. error-related output from commands.'
-    'user: User-generated output, i.e. local output printed by fabfile code via use of the fastprint or puts functions.'
-)
-
-_arguments -w -S -C \
-  '(-)'{-h,--help}'[show this help message and exit]: :->noargs' \
-  '(-)'{-V,--version}'[show program''s version number and exit]: :->noargs' \
-  '(-)--list[print list of possible commands and exit]: :->noargs' \
-  '(-)--shortlist[print non-verbose list of possible commands and exit]: :->noargs' \
-  '(--reject-unknown-hosts)--reject-unknown-hosts[reject unknown hosts]' \
-  '(--no-pty)--no-pty[do not use pseudo-terminal in run/sudo]' \
-  "(-d+ --display=-)"{-d+,--display=-}"[print detailed info about a given command]: :_targets" \
-  '(-D --disable-known-hosts)'{-D,--disable-known-hosts}'[do not load user known_hosts file]' \
-  '(-r --reject-unknown-hosts)'{-r,--reject-unknown-hosts}'[reject unknown hosts]' \
-  '(-u+ --user=-)'{-u+,--user=-}'[username to use when connecting to remote hosts]: :' \
-  '(-p+ --password=-)'{-p+,--password=-}'[password for use with authentication and/or sudo]: :' \
-  '(-H+ --hosts=-)'{-H+,--hosts=-}'[comma separated list of hosts to operate on]: :' \
-  '(-R+ --roles=-)'{-R+,--roles=-}'[comma separated list of roles to operate on]: :' \
-  '(-a --no-agent)'{-a,--no-agent}'[don''t use the running SSH agent]' \
-  '(-k --no-keys)'{-k,--no-keys}'[don''t load private key files from ~/.ssh/]' \
-  '(-w --warn-only)'{-w,--warn-only}'[warn instead of abort, when commands fail]' \
-  '-i+[path to SSH private key file. May be repeated]: :_files' \
-  "(-f+ --fabfile=)"{-f+,--fabfile=}"[Python module file to import]: :_files -g *.py" \
-  '(-c+ --config=-)'{-c+,--config=-}'[specify location of config file to use]: :_files' \
-  '(-s+ --shell=-)'{-s+,--shell=-}'[specify a new shell, defaults to ''/bin/bash -l -c'']: :' \
-  '(--hide=-)--hide=-[comma-separated list of output levels to hide]: :->levels' \
-  '(--show=-)--show=-[comma-separated list of output levels to show]: :->levels' \
-  '*::: :->subcmds' && return 0
-
-if [[ CURRENT -ge 1 ]]; then
-    case $state in
-        noargs)
-             _message "nothing to complete";;
-        levels)
-            _describe -t commands "output levels" output_levels;;
-        *)
-            _targets;;
-    esac
-
-    return
-fi
diff --git a/plugins/fabric/_fabric b/plugins/fabric/_fabric
new file mode 100644
index 000000000..9628e1224
--- /dev/null
+++ b/plugins/fabric/_fabric
@@ -0,0 +1,60 @@
+#compdef fab
+#autoload
+
+local curcontext=$curcontext state line
+declare -A opt_args
+
+declare target_list
+target_list=(`fab --shortlist 2>/dev/null`)
+
+_targets() {
+    _describe -t commands "fabric targets" target_list
+}
+
+output_levels=(
+    'status: Status messages, i.e. noting when Fabric is done running, if the user used a keyboard interrupt, or when servers are disconnected from. These messages are almost always relevant and rarely verbose.'
+    'aborts: Abort messages. Like status messages, these should really only be turned off when using Fabric as a library, and possibly not even then. Note that even if this output group is turned off, aborts will still occur – there just won’t be any output about why Fabric aborted!'
+    'warnings: Warning messages. These are often turned off when one expects a given operation to fail, such as when using grep to test existence of text in a file. If paired with setting env.warn_only to True, this can result in fully silent warnings when remote programs fail. As with aborts, this setting does not control actual warning behavior, only whether warning messages are printed or hidden.'
+    'running: Printouts of commands being executed or files transferred, e.g. [myserver] run: ls /var/www. Also controls printing of tasks being run, e.g. [myserver] Executing task ''foo''.'
+    'stdout: Local, or remote, stdout, i.e. non-error output from commands.'
+    'stderr: Local, or remote, stderr, i.e. error-related output from commands.'
+    'user: User-generated output, i.e. local output printed by fabfile code via use of the fastprint or puts functions.'
+)
+
+_arguments -w -S -C \
+  '(-)'{-h,--help}'[show this help message and exit]: :->noargs' \
+  '(-)'{-V,--version}'[show program''s version number and exit]: :->noargs' \
+  '(-)--list[print list of possible commands and exit]: :->noargs' \
+  '(-)--shortlist[print non-verbose list of possible commands and exit]: :->noargs' \
+  '(--reject-unknown-hosts)--reject-unknown-hosts[reject unknown hosts]' \
+  '(--no-pty)--no-pty[do not use pseudo-terminal in run/sudo]' \
+  "(-d+ --display=-)"{-d+,--display=-}"[print detailed info about a given command]: :_targets" \
+  '(-D --disable-known-hosts)'{-D,--disable-known-hosts}'[do not load user known_hosts file]' \
+  '(-r --reject-unknown-hosts)'{-r,--reject-unknown-hosts}'[reject unknown hosts]' \
+  '(-u+ --user=-)'{-u+,--user=-}'[username to use when connecting to remote hosts]: :' \
+  '(-p+ --password=-)'{-p+,--password=-}'[password for use with authentication and/or sudo]: :' \
+  '(-H+ --hosts=-)'{-H+,--hosts=-}'[comma separated list of hosts to operate on]: :' \
+  '(-R+ --roles=-)'{-R+,--roles=-}'[comma separated list of roles to operate on]: :' \
+  '(-a --no-agent)'{-a,--no-agent}'[don''t use the running SSH agent]' \
+  '(-k --no-keys)'{-k,--no-keys}'[don''t load private key files from ~/.ssh/]' \
+  '(-w --warn-only)'{-w,--warn-only}'[warn instead of abort, when commands fail]' \
+  '-i+[path to SSH private key file. May be repeated]: :_files' \
+  "(-f+ --fabfile=)"{-f+,--fabfile=}"[Python module file to import]: :_files -g *.py" \
+  '(-c+ --config=-)'{-c+,--config=-}'[specify location of config file to use]: :_files' \
+  '(-s+ --shell=-)'{-s+,--shell=-}'[specify a new shell, defaults to ''/bin/bash -l -c'']: :' \
+  '(--hide=-)--hide=-[comma-separated list of output levels to hide]: :->levels' \
+  '(--show=-)--show=-[comma-separated list of output levels to show]: :->levels' \
+  '*::: :->subcmds' && return 0
+
+if [[ CURRENT -ge 1 ]]; then
+    case $state in
+        noargs)
+             _message "nothing to complete";;
+        levels)
+            _describe -t commands "output levels" output_levels;;
+        *)
+            _targets;;
+    esac
+
+    return
+fi
diff --git a/plugins/fabric/fabric.plugin.zsh b/plugins/fabric/fabric.plugin.zsh
deleted file mode 100644
index aca411329..000000000
--- a/plugins/fabric/fabric.plugin.zsh
+++ /dev/null
@@ -1 +0,0 @@
-# DECLARION: This plugin was created by vhbit. What I did is just making a portal from https://github.com/vhbit/fabric-zsh-autocomplete.
-- 
cgit v1.2.3-70-g09d2


From 95a3b2768033627d9ba3e347f368dffae92906b7 Mon Sep 17 00:00:00 2001
From: Joseph Benden <joe@benden.us>
Date: Thu, 1 Nov 2018 15:07:58 -0700
Subject: Add keychain plugin

This plugin integrates the Keychain tool[1] in to the project.

[1] [keychain](https://www.funtoo.org/Keychain)
---
 plugins/keychain/README.md           | 45 ++++++++++++++++++++++++++++++++++++
 plugins/keychain/keychain.plugin.zsh | 32 +++++++++++++++++++++++++
 2 files changed, 77 insertions(+)
 create mode 100644 plugins/keychain/README.md
 create mode 100644 plugins/keychain/keychain.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/keychain/README.md b/plugins/keychain/README.md
new file mode 100644
index 000000000..c603f6790
--- /dev/null
+++ b/plugins/keychain/README.md
@@ -0,0 +1,45 @@
+# keychain plugin
+
+This plugin starts automatically [`keychain`](https://www.funtoo.org/Keychain)
+to set up and load whichever credentials you want for both gpg and ssh
+connections.
+
+To enable it, add `keychain` to your plugins:
+
+```zsh
+plugins=(... keychain)
+```
+
+**NOTE**: It is HIGHLY recommended to also enable the `gpg-agent` plugin.
+
+## Instructions
+
+**IMPORTANT: put these settings _before_ the line that sources oh-my-zsh**
+
+**To adjust the agents** that keychain manages, use the `agents` style as
+shown below. By default, only the `gpg` agent is managed.
+
+```zsh
+zstyle :omz:plugins:keychain agents gpg,ssh
+```
+
+To **load multiple identities** use the `identities` style, For example:
+
+```zsh
+zstyle :omz:plugins:keychain identities id_ed25519 id_github 2C5879C2
+```
+
+**To pass additional options** to the `keychain` program, use the
+`options` style; for example:
+
+```zsh
+zstyle :omz:plugins:keychain options --quiet
+```
+
+## Credits
+
+Based on code from the `ssh-agent` plugin.
+
+## References
+
+- [Keychain](https://www.funtoo.org/Keychain)
diff --git a/plugins/keychain/keychain.plugin.zsh b/plugins/keychain/keychain.plugin.zsh
new file mode 100644
index 000000000..af34793e7
--- /dev/null
+++ b/plugins/keychain/keychain.plugin.zsh
@@ -0,0 +1,32 @@
+function _start_agent() {
+	local agents
+	local -a identities
+	local -a options
+	local _keychain_env_sh
+	local _keychain_env_sh_gpg
+
+	# load agents to start.
+	zstyle -s :omz:plugins:keychain agents agents
+
+	# load identities to manage.
+	zstyle -a :omz:plugins:keychain identities identities
+
+	# load additional options
+	zstyle -a :omz:plugins:keychain options options
+
+	# start keychain...
+	keychain ${^options:-} --agents ${agents:-gpg} ${^identities}
+
+	# Get the filenames to store/lookup the environment from
+	_keychain_env_sh="$HOME/.keychain/$SHORT_HOST-sh"
+	_keychain_env_sh_gpg="$HOME/.keychain/$SHORT_HOST-sh-gpg"
+
+	# Source environment settings.
+	[ -f "$_keychain_env_sh" ]     && . "$_keychain_env_sh"
+	[ -f "$_keychain_env_sh_gpg" ] && . "$_keychain_env_sh_gpg"
+}
+
+_start_agent
+
+# tidy up after ourselves
+unfunction _start_agent
-- 
cgit v1.2.3-70-g09d2


From 05b617066ba5a37ef0c533385efd6e232a387b8f Mon Sep 17 00:00:00 2001
From: Arvindraj <arvindultimate7352@gmail.com>
Date: Fri, 2 Nov 2018 22:10:13 +0530
Subject: transfer: add deprecation notice (#7372)

Fixes #7371

Signed-off-by: Arvindraj <arvindultimate7352@gmail.com>
Co-authored-by: Stephen Ward <stephen@whilenotzero.com>
---
 plugins/transfer/README.md           |  4 ++++
 plugins/transfer/transfer.plugin.zsh | 10 +++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/transfer/README.md b/plugins/transfer/README.md
index 5fa064445..37c7ca2f7 100644
--- a/plugins/transfer/README.md
+++ b/plugins/transfer/README.md
@@ -1,5 +1,9 @@
 # `transfer` plugin
 
+**NOTICE: The `transfer` plugin is deprecated and will be removed soon, since the [transfer.sh](https://transfer.sh) service will be shutdown on 30th November 30th, 2018. Please move your files to an alternative file sharing service provider.**
+
+----
+
 [`transfer.sh`](https://transfer.sh) is an easy to use file sharing service from the command line
 
 ## Usage
diff --git a/plugins/transfer/transfer.plugin.zsh b/plugins/transfer/transfer.plugin.zsh
index 7a7cd85ec..8fd09ef04 100644
--- a/plugins/transfer/transfer.plugin.zsh
+++ b/plugins/transfer/transfer.plugin.zsh
@@ -12,6 +12,14 @@
 #   Modified to use tar command instead of zip
 #
 
+echo -ne '\e[1;33m'
+cat <<-EOF
+        [oh-my-zsh] WARNING: The 'transfer' plugin is deprecated and will be removed after
+        [oh-my-zsh] transfer.sh shuts down on November 30th. We suggest you stop using the
+        [oh-my-zsh] plugin and find an alternative file hosting service.
+EOF
+echo -ne '\e[0m'
+
 curl --version 2>&1 > /dev/null
 if [ $? -ne 0 ]; then
   echo "Could not find curl."
@@ -64,4 +72,4 @@ transfer() {
 
     # cleanup
     rm -f $tmpfile
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3-70-g09d2


From 209f1aa8d669622fa37fb48ecccefe2eea97813d Mon Sep 17 00:00:00 2001
From: Deepankumar <deepan0433@gmail.com>
Date: Sat, 3 Nov 2018 17:34:04 +0530
Subject: ansible plugin added

---
 plugins/ansible/README.md          | 35 +++++++++++++++++++++++++++++++++++
 plugins/ansible/ansible.plugin.zsh | 29 +++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 plugins/ansible/README.md
 create mode 100644 plugins/ansible/ansible.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/ansible/README.md b/plugins/ansible/README.md
new file mode 100644
index 000000000..38bc13775
--- /dev/null
+++ b/plugins/ansible/README.md
@@ -0,0 +1,35 @@
+# ansible plugin
+
+## Introduction
+
+The `ansible plugin` adds several aliases for useful [ansible](https://docs.ansible.com/ansible/latest/index.html) commands and [aliases](#aliases).
+
+To use it, add `ansible` to the plugins array of your zshrc file:
+
+```
+plugins=(... ansible)
+```
+
+## Aliases
+
+| Command                                    | Description                                                         |
+|:-------------------------------------------|:--------------------------------------------------------------------|
+| `ansible-version` / `aver`                 | Show the version on ansible installed in this host                  |
+| `ansible-role-init <role name>` / `arinit` | Creates the Ansible Role as per Ansible Galaxy standard             |
+| `a`                                        | command `ansible`                                                   |
+| `aconf`                                    | command `ansible-config`                                            |
+| `acon`                                     | command `ansible-console`                                           |
+| `aconn`                                    | command `ansible-connection`                                        |
+| `ainv`                                     | command `ansible-inventory`                                         |
+| `aplay`                                    | command `ansible-playbook`                                          |
+| `ainv`                                     | command `ansible-inventory`                                         |
+| `adoc`                                     | command `ansible-doc`                                               |
+| `agal`                                     | command `ansible-galaxy`                                            |
+| `apull`                                    | command `ansible-pull`                                              |
+| `aval`                                     | command `ansible-vault`                                             |
+
+## Maintainer
+
+### [Deepankumar](https://github.com/deepan10) 
+
+[https://github.com/deepan10/oh-my-zsh/tree/features/ansible-plugin](https://github.com/deepan10/oh-my-zsh/tree/features/ansible-plugin)
diff --git a/plugins/ansible/ansible.plugin.zsh b/plugins/ansible/ansible.plugin.zsh
new file mode 100644
index 000000000..0e7aff528
--- /dev/null
+++ b/plugins/ansible/ansible.plugin.zsh
@@ -0,0 +1,29 @@
+# Functions
+function ansible-version(){
+    ansible --version
+}
+
+function ansible-role-init(){
+    if ! [ -z $1] ; then
+        echo "Ansible Role : $1 Creating...."
+        ansible-galaxy init $1
+        tree $1
+    else
+        echo "Usage : ansible-role-init <role name>"
+        echo "Example : ansible-role-init role1"
+    fi
+}
+
+# Alias
+alias a='ansible '
+alias aconf='ansible-config '
+alias acon='ansible-console '
+alias aconn='ansible-connection '
+alias aver='ansible-version'
+alias arinit='ansible-role-init'
+alias aplay='ansible-playbook '
+alias ainv='ansible-inventory '
+alias adoc='ansible-doc '
+alias agal='ansible-galaxy '
+alias apull='ansible-pull '
+alias aval='ansible-vault'
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From 3d8f2bda599c8c6d160dc448e5ab28aaf2d5e90d Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 13 Nov 2018 10:54:33 +0100
Subject: Revert "transfer: add deprecation notice (#7372)" (#7402)

This reverts commit 05b617066ba5a37ef0c533385efd6e232a387b8f.
---
 plugins/transfer/README.md           |  4 ----
 plugins/transfer/transfer.plugin.zsh | 10 +---------
 2 files changed, 1 insertion(+), 13 deletions(-)

(limited to 'plugins')

diff --git a/plugins/transfer/README.md b/plugins/transfer/README.md
index 37c7ca2f7..5fa064445 100644
--- a/plugins/transfer/README.md
+++ b/plugins/transfer/README.md
@@ -1,9 +1,5 @@
 # `transfer` plugin
 
-**NOTICE: The `transfer` plugin is deprecated and will be removed soon, since the [transfer.sh](https://transfer.sh) service will be shutdown on 30th November 30th, 2018. Please move your files to an alternative file sharing service provider.**
-
-----
-
 [`transfer.sh`](https://transfer.sh) is an easy to use file sharing service from the command line
 
 ## Usage
diff --git a/plugins/transfer/transfer.plugin.zsh b/plugins/transfer/transfer.plugin.zsh
index 8fd09ef04..7a7cd85ec 100644
--- a/plugins/transfer/transfer.plugin.zsh
+++ b/plugins/transfer/transfer.plugin.zsh
@@ -12,14 +12,6 @@
 #   Modified to use tar command instead of zip
 #
 
-echo -ne '\e[1;33m'
-cat <<-EOF
-        [oh-my-zsh] WARNING: The 'transfer' plugin is deprecated and will be removed after
-        [oh-my-zsh] transfer.sh shuts down on November 30th. We suggest you stop using the
-        [oh-my-zsh] plugin and find an alternative file hosting service.
-EOF
-echo -ne '\e[0m'
-
 curl --version 2>&1 > /dev/null
 if [ $? -ne 0 ]; then
   echo "Could not find curl."
@@ -72,4 +64,4 @@ transfer() {
 
     # cleanup
     rm -f $tmpfile
-}
+}
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From b1424e289375439eef04254f3817dc3fa4b18a8f Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Fri, 16 Nov 2018 19:40:06 +0100
Subject: tmux: use echoti instead of tput for FreeBSD compatibility

Fixes #7407

FreeBSD's tput needs termcap codes instead of terminfo capnames, so using `tput colors`
has the wrong effect. See #7407
---
 plugins/tmux/tmux.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
index 7ddf42099..64687641c 100644
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -36,7 +36,7 @@ alias tkss='tmux kill-session -t'
 : ${ZSH_TMUX_FIXTERM_WITH_256COLOR:=screen-256color}
 
 # Determine if the terminal supports 256 colors
-if [[ $(tput colors) == 256 ]]; then
+if [[ $(echoti colors) == 256 ]]; then
   export ZSH_TMUX_TERM=$ZSH_TMUX_FIXTERM_WITH_256COLOR
 else
   export ZSH_TMUX_TERM=$ZSH_TMUX_FIXTERM_WITHOUT_256COLOR
-- 
cgit v1.2.3-70-g09d2


From ad69c7a82f25857343f3d57a77466da790f0e65e Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Fri, 16 Nov 2018 18:55:07 +0000
Subject: fabric: rename completion back to _fab

Fixes #7405
---
 plugins/fabric/_fab              | 60 ++++++++++++++++++++++++++++++++++++++++
 plugins/fabric/_fabric           | 60 ----------------------------------------
 plugins/fabric/fabric.plugin.zsh |  0
 3 files changed, 60 insertions(+), 60 deletions(-)
 create mode 100644 plugins/fabric/_fab
 delete mode 100644 plugins/fabric/_fabric
 create mode 100644 plugins/fabric/fabric.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/fabric/_fab b/plugins/fabric/_fab
new file mode 100644
index 000000000..9628e1224
--- /dev/null
+++ b/plugins/fabric/_fab
@@ -0,0 +1,60 @@
+#compdef fab
+#autoload
+
+local curcontext=$curcontext state line
+declare -A opt_args
+
+declare target_list
+target_list=(`fab --shortlist 2>/dev/null`)
+
+_targets() {
+    _describe -t commands "fabric targets" target_list
+}
+
+output_levels=(
+    'status: Status messages, i.e. noting when Fabric is done running, if the user used a keyboard interrupt, or when servers are disconnected from. These messages are almost always relevant and rarely verbose.'
+    'aborts: Abort messages. Like status messages, these should really only be turned off when using Fabric as a library, and possibly not even then. Note that even if this output group is turned off, aborts will still occur – there just won’t be any output about why Fabric aborted!'
+    'warnings: Warning messages. These are often turned off when one expects a given operation to fail, such as when using grep to test existence of text in a file. If paired with setting env.warn_only to True, this can result in fully silent warnings when remote programs fail. As with aborts, this setting does not control actual warning behavior, only whether warning messages are printed or hidden.'
+    'running: Printouts of commands being executed or files transferred, e.g. [myserver] run: ls /var/www. Also controls printing of tasks being run, e.g. [myserver] Executing task ''foo''.'
+    'stdout: Local, or remote, stdout, i.e. non-error output from commands.'
+    'stderr: Local, or remote, stderr, i.e. error-related output from commands.'
+    'user: User-generated output, i.e. local output printed by fabfile code via use of the fastprint or puts functions.'
+)
+
+_arguments -w -S -C \
+  '(-)'{-h,--help}'[show this help message and exit]: :->noargs' \
+  '(-)'{-V,--version}'[show program''s version number and exit]: :->noargs' \
+  '(-)--list[print list of possible commands and exit]: :->noargs' \
+  '(-)--shortlist[print non-verbose list of possible commands and exit]: :->noargs' \
+  '(--reject-unknown-hosts)--reject-unknown-hosts[reject unknown hosts]' \
+  '(--no-pty)--no-pty[do not use pseudo-terminal in run/sudo]' \
+  "(-d+ --display=-)"{-d+,--display=-}"[print detailed info about a given command]: :_targets" \
+  '(-D --disable-known-hosts)'{-D,--disable-known-hosts}'[do not load user known_hosts file]' \
+  '(-r --reject-unknown-hosts)'{-r,--reject-unknown-hosts}'[reject unknown hosts]' \
+  '(-u+ --user=-)'{-u+,--user=-}'[username to use when connecting to remote hosts]: :' \
+  '(-p+ --password=-)'{-p+,--password=-}'[password for use with authentication and/or sudo]: :' \
+  '(-H+ --hosts=-)'{-H+,--hosts=-}'[comma separated list of hosts to operate on]: :' \
+  '(-R+ --roles=-)'{-R+,--roles=-}'[comma separated list of roles to operate on]: :' \
+  '(-a --no-agent)'{-a,--no-agent}'[don''t use the running SSH agent]' \
+  '(-k --no-keys)'{-k,--no-keys}'[don''t load private key files from ~/.ssh/]' \
+  '(-w --warn-only)'{-w,--warn-only}'[warn instead of abort, when commands fail]' \
+  '-i+[path to SSH private key file. May be repeated]: :_files' \
+  "(-f+ --fabfile=)"{-f+,--fabfile=}"[Python module file to import]: :_files -g *.py" \
+  '(-c+ --config=-)'{-c+,--config=-}'[specify location of config file to use]: :_files' \
+  '(-s+ --shell=-)'{-s+,--shell=-}'[specify a new shell, defaults to ''/bin/bash -l -c'']: :' \
+  '(--hide=-)--hide=-[comma-separated list of output levels to hide]: :->levels' \
+  '(--show=-)--show=-[comma-separated list of output levels to show]: :->levels' \
+  '*::: :->subcmds' && return 0
+
+if [[ CURRENT -ge 1 ]]; then
+    case $state in
+        noargs)
+             _message "nothing to complete";;
+        levels)
+            _describe -t commands "output levels" output_levels;;
+        *)
+            _targets;;
+    esac
+
+    return
+fi
diff --git a/plugins/fabric/_fabric b/plugins/fabric/_fabric
deleted file mode 100644
index 9628e1224..000000000
--- a/plugins/fabric/_fabric
+++ /dev/null
@@ -1,60 +0,0 @@
-#compdef fab
-#autoload
-
-local curcontext=$curcontext state line
-declare -A opt_args
-
-declare target_list
-target_list=(`fab --shortlist 2>/dev/null`)
-
-_targets() {
-    _describe -t commands "fabric targets" target_list
-}
-
-output_levels=(
-    'status: Status messages, i.e. noting when Fabric is done running, if the user used a keyboard interrupt, or when servers are disconnected from. These messages are almost always relevant and rarely verbose.'
-    'aborts: Abort messages. Like status messages, these should really only be turned off when using Fabric as a library, and possibly not even then. Note that even if this output group is turned off, aborts will still occur – there just won’t be any output about why Fabric aborted!'
-    'warnings: Warning messages. These are often turned off when one expects a given operation to fail, such as when using grep to test existence of text in a file. If paired with setting env.warn_only to True, this can result in fully silent warnings when remote programs fail. As with aborts, this setting does not control actual warning behavior, only whether warning messages are printed or hidden.'
-    'running: Printouts of commands being executed or files transferred, e.g. [myserver] run: ls /var/www. Also controls printing of tasks being run, e.g. [myserver] Executing task ''foo''.'
-    'stdout: Local, or remote, stdout, i.e. non-error output from commands.'
-    'stderr: Local, or remote, stderr, i.e. error-related output from commands.'
-    'user: User-generated output, i.e. local output printed by fabfile code via use of the fastprint or puts functions.'
-)
-
-_arguments -w -S -C \
-  '(-)'{-h,--help}'[show this help message and exit]: :->noargs' \
-  '(-)'{-V,--version}'[show program''s version number and exit]: :->noargs' \
-  '(-)--list[print list of possible commands and exit]: :->noargs' \
-  '(-)--shortlist[print non-verbose list of possible commands and exit]: :->noargs' \
-  '(--reject-unknown-hosts)--reject-unknown-hosts[reject unknown hosts]' \
-  '(--no-pty)--no-pty[do not use pseudo-terminal in run/sudo]' \
-  "(-d+ --display=-)"{-d+,--display=-}"[print detailed info about a given command]: :_targets" \
-  '(-D --disable-known-hosts)'{-D,--disable-known-hosts}'[do not load user known_hosts file]' \
-  '(-r --reject-unknown-hosts)'{-r,--reject-unknown-hosts}'[reject unknown hosts]' \
-  '(-u+ --user=-)'{-u+,--user=-}'[username to use when connecting to remote hosts]: :' \
-  '(-p+ --password=-)'{-p+,--password=-}'[password for use with authentication and/or sudo]: :' \
-  '(-H+ --hosts=-)'{-H+,--hosts=-}'[comma separated list of hosts to operate on]: :' \
-  '(-R+ --roles=-)'{-R+,--roles=-}'[comma separated list of roles to operate on]: :' \
-  '(-a --no-agent)'{-a,--no-agent}'[don''t use the running SSH agent]' \
-  '(-k --no-keys)'{-k,--no-keys}'[don''t load private key files from ~/.ssh/]' \
-  '(-w --warn-only)'{-w,--warn-only}'[warn instead of abort, when commands fail]' \
-  '-i+[path to SSH private key file. May be repeated]: :_files' \
-  "(-f+ --fabfile=)"{-f+,--fabfile=}"[Python module file to import]: :_files -g *.py" \
-  '(-c+ --config=-)'{-c+,--config=-}'[specify location of config file to use]: :_files' \
-  '(-s+ --shell=-)'{-s+,--shell=-}'[specify a new shell, defaults to ''/bin/bash -l -c'']: :' \
-  '(--hide=-)--hide=-[comma-separated list of output levels to hide]: :->levels' \
-  '(--show=-)--show=-[comma-separated list of output levels to show]: :->levels' \
-  '*::: :->subcmds' && return 0
-
-if [[ CURRENT -ge 1 ]]; then
-    case $state in
-        noargs)
-             _message "nothing to complete";;
-        levels)
-            _describe -t commands "output levels" output_levels;;
-        *)
-            _targets;;
-    esac
-
-    return
-fi
diff --git a/plugins/fabric/fabric.plugin.zsh b/plugins/fabric/fabric.plugin.zsh
new file mode 100644
index 000000000..e69de29bb
-- 
cgit v1.2.3-70-g09d2


From e8aba1bf5912f89f408eaebd1bc74c25ba32a62c Mon Sep 17 00:00:00 2001
From: Ricardo Seriani <ricardo.seriani@gmail.com>
Date: Fri, 16 Nov 2018 18:53:29 -0300
Subject: golang: support "go help environment" in autocompletion (#7404)

Signed-off-by: Ricardo Seriani <ricardo.seriani@gmail.com>
---
 plugins/golang/golang.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins')

diff --git a/plugins/golang/golang.plugin.zsh b/plugins/golang/golang.plugin.zsh
index 919c98629..8284ab83c 100644
--- a/plugins/golang/golang.plugin.zsh
+++ b/plugins/golang/golang.plugin.zsh
@@ -126,6 +126,7 @@ __go_tool_complete() {
       ;;
   help)
       _values "${commands[@]}" \
+        'environment[show Go environment variables available]' \
         'gopath[GOPATH environment variable]' \
         'packages[description of package lists]' \
         'remote[remote import path syntax]' \
-- 
cgit v1.2.3-70-g09d2


From e780209c33883d0ecab39dd50663e2e1424250c9 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Mon, 26 Nov 2018 19:57:52 +0100
Subject: tmux: use $terminfo to avoid echoti errors

See https://github.com/robbyrussell/oh-my-zsh/issues/7407#issuecomment-441665143
---
 plugins/tmux/tmux.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
index 64687641c..2f3c3e79d 100644
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -36,7 +36,7 @@ alias tkss='tmux kill-session -t'
 : ${ZSH_TMUX_FIXTERM_WITH_256COLOR:=screen-256color}
 
 # Determine if the terminal supports 256 colors
-if [[ $(echoti colors) == 256 ]]; then
+if [[ $terminfo[colors] == 256 ]]; then
   export ZSH_TMUX_TERM=$ZSH_TMUX_FIXTERM_WITH_256COLOR
 else
   export ZSH_TMUX_TERM=$ZSH_TMUX_FIXTERM_WITHOUT_256COLOR
-- 
cgit v1.2.3-70-g09d2


From 0a59baf4c526b95fe6137397be6b1b8b63d1daba Mon Sep 17 00:00:00 2001
From: Sagar Patil <sagar010797@gmail.com>
Date: Wed, 28 Nov 2018 03:27:07 +0530
Subject: debian: add README (#7438)

---
 plugins/debian/README.md | 75 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 plugins/debian/README.md

(limited to 'plugins')

diff --git a/plugins/debian/README.md b/plugins/debian/README.md
new file mode 100644
index 000000000..a676674dc
--- /dev/null
+++ b/plugins/debian/README.md
@@ -0,0 +1,75 @@
+# debian
+
+This plugin provides debian related zsh aliases.
+To use it add `debian` to the plugins array in your zshrc file.
+
+```zsh
+plugins=(... debian)
+```
+
+## Common Aliases
+
+| Alias    | Command                                                                       | Description                                                                |
+| -------- | ------------------------------------------------------------------------------|--------------------------------------------------------------------------- |
+| `age`    | apt-get                                                                       | Command line tool for handling packages                                    |
+| `api`    | aptitude                                                                      | Same functionality as `apt-get`, provides extra options while installation |
+| `acs`    | apt-cache search                                                              | Command line tool for searching apt software package cache                 |
+| `aps`    | aptitude search                                                               | Searches installed packages using aptitude                                 |
+| `as`     | aptitude -F \"* %p -> %d \n(%v/%V)\" \ -no-gui --disable-columns search       | -                                                                          |
+| `afs`    | apt-file search --regexp                                                      | Search file in packages                                                    |
+| `asrc`   | apt-get source                                                                | Fetch source packages through `apt-get`                                    |
+| `app`    | apt-cache policy                                                              | Displays priority of package sources                                       |
+
+## Superuser Operations Aliases
+
+| Alias    | Command                                                                                          | Description                                                                                 |
+| -------- | -------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------- |
+| `aac`    | sudo $apt_pref autoclean                                                                         | Clears out the local repository of retrieved package files                                  |
+| `abd`    | sudo $apt_pref build-dep                                                                         | Installs all dependencies for building packages                                             |
+| `ac`     | sudo $apt_pref clean                                                                             | Clears out the local repository of retrieved package files except lock files                |
+| `ad`     | sudo $apt_pref update                                                                            | Updates the package lists for upgrades for packages                                         | 
+| `adg`    | sudo $apt_pref update && sudo $apt_pref $apt_upgr                                                | Update and upgrade packages                                                                 |
+| `adu`    | sudo $apt_pref update && sudo $apt_pref dist-upgrade                                             | Smart upgrade that handles dependencies                                                     |
+| `afu`    | sudo apt-file update                                                                             | Update the files in packages                                                                |
+| `au`     | sudo $apt_pref $apt_upgr                                                                         | -                                                                                           |
+| `ai`     | sudo $apt_pref install                                                                           | Command-line tool to install package                                                        |
+| `ail`    | sed -e 's/  */ /g' -e 's/ *//' &#124; cut -s -d ' ' -f 1 &#124; "' xargs sudo $apt_pref install  | Install all packages given on the command line while using only the first word of each line |
+| `ap`     | sudo $apt_pref purge                                                                             | Removes packages along with configuration files                                             |
+| `ar`     | sudo $apt_pref remove                                                                            | Removes packages, keeps the configuration files                                             |
+| `ads`    | sudo apt-get dselect-upgrade                                                                     | Installs packages from list and removes all not in the list                                 |
+| `dia`    | sudo dpkg -i ./*.deb                                                                             | Install all .deb files in the current directory                                             |
+| `di`     | sudo dpkg -i                                                                                     | Install all .deb files in the current directory                                             |
+| `kclean` | sudo aptitude remove -P ?and(~i~nlinux-(ima&#124;hea) ?not(~n`uname -r`))                        | Remove ALL kernel images and headers EXCEPT the one in use                                  |
+
+- `$apt_pref` - Use apt or aptitude if installed, fallback is apt-get.
+- `$apt_upgr` - Use upgrade.
+
+## Aliases - Commands using `su`
+
+| Alias    | Command                                                                       |
+| -------- | ------------------------------------------------------------------------------|
+| `aac`    | su -ls \'$apt_pref autoclean\' root                                           |
+| `ac`     | su -ls \'$apt_pref clean\' root                                               |
+| `ad`     | su -lc \'$apt_pref update\' root                                              |
+| `adg`    | su -lc \'$apt_pref update && aptitude $apt_upgr\' root                        |
+| `adu`    | su -lc \'$apt_pref update && aptitude dist-upgrade\' root                     |
+| `afu`    | su -lc "apt-file update                                                       |
+| `ag`     | su -lc \'$apt_pref $apt_upgr\' root                                           |
+| `dia`    | su -lc "dpkg -i ./*.deb" root                                                 |
+
+## Miscellaneous Aliases
+
+| Alias    | Command                                          | Description                             |
+| -------- | -------------------------------------------------|---------------------------------------- |
+| `allpkgs`| aptitude search -F "%p" --disable-columns ~i     | Display all installed packages          |  
+| `mydeb`  | time dpkg-buildpackage -rfakeroot -us -uc        | Create a basic .deb package             |
+
+## Functions
+
+| Fucntion              | Description                                                                   |
+|-----------------------|-------------------------------------------------------------------------------|
+| `apt-copy`            | Create a simple script that can be used to 'duplicate' a system               |
+| `apt-history`         | Displays apt history for a command                                            | 
+| `kerndeb`             | Builds kernel packages                                                        |
+| `apt-list-packages`   | List packages by size                                                         |
+
-- 
cgit v1.2.3-70-g09d2


From 2614b7ecdfe8b8f0cbeafffefb5925196f4011d4 Mon Sep 17 00:00:00 2001
From: Igor Kapkov <igasgeek@me.com>
Date: Wed, 28 Nov 2018 08:58:36 +1100
Subject: osx: fix rmdsstore function definition (#7443)

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

(limited to 'plugins')

diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index 6a4b6eec4..a1c73a184 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -284,6 +284,6 @@ alias showfiles="defaults write com.apple.finder AppleShowAllFiles -bool true &&
 alias hidefiles="defaults write com.apple.finder AppleShowAllFiles -bool false && killall Finder"
 
 # Remove .DS_Store files recursively in a directory, default .
-rmdsstore() {
+function rmdsstore() {
 	find "${@:-.}" -type f -name .DS_Store -delete
 }
-- 
cgit v1.2.3-70-g09d2


From cf07fe2c6f0ea1561e21189feb12592a21d10306 Mon Sep 17 00:00:00 2001
From: Frederick Zhang <frederick888@tsundere.moe>
Date: Wed, 28 Nov 2018 14:50:45 +1100
Subject: -r is not available for bsd sed

---
 plugins/cargo/_cargo | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/cargo/_cargo b/plugins/cargo/_cargo
index 7d7d9b2d8..a8c58ecc5 100644
--- a/plugins/cargo/_cargo
+++ b/plugins/cargo/_cargo
@@ -421,7 +421,7 @@ local -a commands;commands=(
 'verify-project:check Cargo.toml'
 'version:show version information'
 'yank:remove pushed file from index'
-$( cargo --list | sed -n '1!p' | tr -s ' ' | cut -d ' ' -f 2 | egrep -v "^bench$|^build$|^clean$|^doc$|^fetch$|^generate-lockfile$|^git-checkout$|^help$|^init$|^install$|^locate-project$|^login$|^metadata$|^new$|^owner$|^package$|^pkgid$|^publish$|^read-manifest$|^run$|^rustc$|^rustdoc$|^search$|^test$|^uninstall$|^update$|^verify-project$|^version$|^yank$" | sed -r "s/(.*)/echo \"\1:$\(cargo help \1 2>\&1 | head -n 1\)\"/" | sh )
+$( cargo --list | sed -n '1!p' | tr -s ' ' | cut -d ' ' -f 2 | egrep -v "^bench$|^build$|^clean$|^doc$|^fetch$|^generate-lockfile$|^git-checkout$|^help$|^init$|^install$|^locate-project$|^login$|^metadata$|^new$|^owner$|^package$|^pkgid$|^publish$|^read-manifest$|^run$|^rustc$|^rustdoc$|^search$|^test$|^uninstall$|^update$|^verify-project$|^version$|^yank$" | sed "s/\(.*\)/echo \"\1:$\(cargo help \1 2>\&1 | head -n 1\)\"/" | sh )
 )
 _describe 'command' commands
 
-- 
cgit v1.2.3-70-g09d2


From a244d47131e1a638cdb5d0142004200de6872be8 Mon Sep 17 00:00:00 2001
From: Antu Acharjee <iam.antu93@gmail.com>
Date: Thu, 20 Dec 2018 10:25:36 +0600
Subject: Added stackoverflow in /plugins/web-search/-web-search

---
 plugins/web-search/.web-search.plugin.zsh.swp | Bin 0 -> 12288 bytes
 plugins/web-search/web-search.plugin.zsh      |   2 ++
 2 files changed, 2 insertions(+)
 create mode 100644 plugins/web-search/.web-search.plugin.zsh.swp

(limited to 'plugins')

diff --git a/plugins/web-search/.web-search.plugin.zsh.swp b/plugins/web-search/.web-search.plugin.zsh.swp
new file mode 100644
index 000000000..b8352f9ec
Binary files /dev/null and b/plugins/web-search/.web-search.plugin.zsh.swp differ
diff --git a/plugins/web-search/web-search.plugin.zsh b/plugins/web-search/web-search.plugin.zsh
index 863384223..b0755f091 100644
--- a/plugins/web-search/web-search.plugin.zsh
+++ b/plugins/web-search/web-search.plugin.zsh
@@ -17,6 +17,7 @@ function web_search() {
     ecosia      "https://www.ecosia.org/search?q="
     goodreads   "https://www.goodreads.com/search?q="
     qwant       "https://www.qwant.com/?q="
+    stackoverflow 'https://stackoverflow.com/search?q="
   )
 
   # check whether the search engine is supported
@@ -51,6 +52,7 @@ alias baidu='web_search baidu'
 alias ecosia='web_search ecosia'
 alias goodreads='web_search goodreads'
 alias qwant='web_search qwant'
+alias stack='web_search stackoverflow'
 
 #add your own !bang searches here
 alias wiki='web_search duckduckgo \!w'
-- 
cgit v1.2.3-70-g09d2


From 722af459fd07a5cda6718428f0e44178a963922f Mon Sep 17 00:00:00 2001
From: Antu Acharjee <iam.antu93@gmail.com>
Date: Thu, 20 Dec 2018 10:41:33 +0600
Subject: Added stackoverflow in /plugins/web-search/-web-search

---
 plugins/web-search/.web-search.plugin.zsh.swp | Bin 12288 -> 0 bytes
 plugins/web-search/web-search.plugin.zsh      |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 plugins/web-search/.web-search.plugin.zsh.swp

(limited to 'plugins')

diff --git a/plugins/web-search/.web-search.plugin.zsh.swp b/plugins/web-search/.web-search.plugin.zsh.swp
deleted file mode 100644
index b8352f9ec..000000000
Binary files a/plugins/web-search/.web-search.plugin.zsh.swp and /dev/null differ
diff --git a/plugins/web-search/web-search.plugin.zsh b/plugins/web-search/web-search.plugin.zsh
index b0755f091..18cc0614a 100644
--- a/plugins/web-search/web-search.plugin.zsh
+++ b/plugins/web-search/web-search.plugin.zsh
@@ -17,7 +17,7 @@ function web_search() {
     ecosia      "https://www.ecosia.org/search?q="
     goodreads   "https://www.goodreads.com/search?q="
     qwant       "https://www.qwant.com/?q="
-    stackoverflow 'https://stackoverflow.com/search?q="
+    stackoverflow  "https://stackoverflow.com/search?q="
   )
 
   # check whether the search engine is supported
-- 
cgit v1.2.3-70-g09d2


From 990104730c442fa7813e0d2e2cfef79f6c5723fb Mon Sep 17 00:00:00 2001
From: Patrick Artounian <partounian@users.noreply.github.com>
Date: Mon, 31 Dec 2018 11:12:34 -0800
Subject: Update docker plugin from upstream docker/cli (#7470)

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

(limited to 'plugins')

diff --git a/plugins/docker/_docker b/plugins/docker/_docker
index 31b83c777..54b5e59c5 100644
--- a/plugins/docker/_docker
+++ b/plugins/docker/_docker
@@ -1,6 +1,6 @@
 #compdef docker dockerd
 #
-# zsh completion for docker (https://docker.com)
+# zsh completion for docker (http://docker.com)
 #
 # version:  0.3.0
 # github:   https://github.com/felixr/docker-zsh-completion
@@ -617,6 +617,7 @@ __docker_container_subcommand() {
         "($help)*--dns=[Custom DNS servers]:DNS server: "
         "($help)*--dns-option=[Custom DNS options]:DNS option: "
         "($help)*--dns-search=[Custom DNS search domains]:DNS domains: "
+        "($help)*--domainname=[Container NIS domain name]:domainname:_hosts"
         "($help)*"{-e=,--env=}"[Environment variables]:environment variable: "
         "($help)--entrypoint=[Overwrite the default entrypoint of the image]:entry point: "
         "($help)*--env-file=[Read environment variables from a file]:environment file:_files"
@@ -2214,7 +2215,7 @@ __docker_stack_subcommand() {
             _arguments $(__docker_arguments) \
                 $opts_help \
                 "($help)--bundle-file=[Path to a Distributed Application Bundle file]:dab:_files -g \"*.dab\"" \
-                "($help -c --compose-file)"{-c=,--compose-file=}"[Path to a Compose file]:compose file:_files -g \"*.(yml|yaml)\"" \
+                "($help -c --compose-file)"{-c=,--compose-file=}"[Path to a Compose file, or '-' to read from stdin]:compose file:_files -g \"*.(yml|yaml)\"" \
                 "($help)--with-registry-auth[Send registry authentication details to Swarm agents]" \
                 "($help -):stack:__docker_complete_stacks" && ret=0
             ;;
@@ -2285,6 +2286,9 @@ __docker_swarm_subcommand() {
                 $opts_help \
                 "($help)--advertise-addr=[Advertised address]:ip\:port: " \
                 "($help)--data-path-addr=[Data path IP or interface]:ip " \
+                "($help)--data-path-port=[Data Path Port]:port " \
+                "($help)--default-addr-pool=[Default address pool]" \
+                "($help)--default-addr-pool-mask-length=[Default address pool subnet mask length]" \
                 "($help)--autolock[Enable manager autolocking]" \
                 "($help)--availability=[Availability of the node]:availability:(active drain pause)" \
                 "($help)--cert-expiry=[Validity period for node certificates]:duration: " \
-- 
cgit v1.2.3-70-g09d2


From 64976138b643b6adc1f46d9529d1d5fb2aa587e1 Mon Sep 17 00:00:00 2001
From: Andrew Imeson <andrewimeson@gmail.com>
Date: Mon, 31 Dec 2018 14:13:31 -0500
Subject: Add new vagrant commands (#7455)

* vagrant: Add `cloud` subcommand to completion

* vagrant: Add `port` subcommand to completion

* vagrant: Add `validate` subcommand to completion
---
 plugins/vagrant/_vagrant | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/vagrant/_vagrant b/plugins/vagrant/_vagrant
index a99a8f0e7..2efb4473d 100644
--- a/plugins/vagrant/_vagrant
+++ b/plugins/vagrant/_vagrant
@@ -6,6 +6,7 @@
 local -a _1st_arguments
 _1st_arguments=(
     'box:Box commands'
+    'cloud:Manages everything related to Vagrant Cloud'
     'connect:Connects to a remotely shared Vagrant environment'
     'destroy:Destroys the vagrant environment'
     'docker-logs:Outputs the logs from the Docker container'
@@ -18,6 +19,7 @@ _1st_arguments=(
     'login:Authenticates against a Vagrant Cloud server to access protected boxes'
     'package:Packages a vagrant environment for distribution'
     'plugin:Plugin commands'
+    'port:Displays information about guest port mappings'
     'provision:Run the provisioner'
     'push:Deploys code in this environment to a configured destination'
     'rdp:Connects to machine via RDP'
@@ -33,6 +35,7 @@ _1st_arguments=(
     'suspend:Suspends the currently running vagrant environment'
     'snapshot:Used to manage snapshots with the guest machine'
     'up:Creates the vagrant environment'
+    'validate:Validates the Vagrantfile'
     'version:Prints current and latest Vagrant version'
     '--help:[TASK] Describe available tasks or one specific task'
     '--version:Prints the Vagrant version information'
@@ -54,7 +57,7 @@ __task_list ()
     local expl
     declare -a tasks
 
-    tasks=(box destroy halt init package provision reload resume ssh ssh_config status suspend up version)
+    tasks=(box destroy halt init package port provision reload resume ssh ssh_config status suspend up version)
 
     _wanted tasks expl 'help' compadd $tasks
 }
@@ -123,7 +126,7 @@ case $state in
       (box)
           __vagrant-box
       ;;
-      (up|provision|package|destroy|reload|ssh|ssh-config|halt|resume|status)
+      (up|provision|port|package|destroy|reload|ssh|ssh-config|halt|resume|status)
       _arguments ':feature:__vm_list'
     esac
   ;;
-- 
cgit v1.2.3-70-g09d2


From d0c06d9ec840739623bbc2e1ae0b1f473187d7f2 Mon Sep 17 00:00:00 2001
From: Ben Davies <eggs.benjamin@gmail.com>
Date: Mon, 31 Dec 2018 19:14:22 +0000
Subject: added svcat plugin (#7452)

Including a Kubernetes Service Catalog plugin
---
 plugins/svcat/README.md        | 9 +++++++++
 plugins/svcat/svcat.plugin.zsh | 6 ++++++
 2 files changed, 15 insertions(+)
 create mode 100644 plugins/svcat/README.md
 create mode 100644 plugins/svcat/svcat.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/svcat/README.md b/plugins/svcat/README.md
new file mode 100644
index 000000000..0bc60b117
--- /dev/null
+++ b/plugins/svcat/README.md
@@ -0,0 +1,9 @@
+# svcat
+
+This plugin provides completion for the [Kubernetes service catalog cli](https://github.com/kubernetes-incubator/service-catalog).
+
+To use it, add `svcat` to the plugins array in your zshrc file.
+
+```
+plugins=(... svcat)
+```
diff --git a/plugins/svcat/svcat.plugin.zsh b/plugins/svcat/svcat.plugin.zsh
new file mode 100644
index 000000000..f90e7d8d6
--- /dev/null
+++ b/plugins/svcat/svcat.plugin.zsh
@@ -0,0 +1,6 @@
+# Autocompletion for svcat.
+#
+
+if [ $commands[svcat] ]; then
+  source <(svcat completion zsh)
+fi
-- 
cgit v1.2.3-70-g09d2


From 3c3766fdf5f64daa4a4e96bee56487314ebcd642 Mon Sep 17 00:00:00 2001
From: Alexander Huynh <ahrex@users.noreply.github.com>
Date: Mon, 31 Dec 2018 14:15:14 -0500
Subject: Provide even spacing between marks (#7456)

Before, when typing the `marks` command, longer mark keys would cause
the tabs to spill over to the next tab stop, like so:

    rc      -> /home/ahlex/.rc
    repos   -> /home/ahlex/repos
    a-longer-string         -> /tmp

Implement better key display by running through all of the marks twice,
once to get the longest key length, and the second time to format
everything according to that length:

                 rc -> /home/ahlex/.rc
              repos -> /home/ahlex/repos
    a-longer-string -> /tmp
---
 plugins/jump/jump.plugin.zsh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/jump/jump.plugin.zsh b/plugins/jump/jump.plugin.zsh
index a19a86022..d161a6da0 100644
--- a/plugins/jump/jump.plugin.zsh
+++ b/plugins/jump/jump.plugin.zsh
@@ -28,11 +28,18 @@ unmark() {
 }
 
 marks() {
+	local max=0
+	for link in $MARKPATH/*(@); do
+		if [[ ${#link:t} -gt $max ]]; then
+			max=${#link:t}
+		fi
+	done
+	local printf_markname_template="$(printf -- "%%%us " "$max")"
 	for link in $MARKPATH/*(@); do
 		local markname="$fg[cyan]${link:t}$reset_color"
 		local markpath="$fg[blue]$(readlink $link)$reset_color"
-		printf "%s\t" $markname
-		printf -- "-> %s \t\n" $markpath
+		printf -- "$printf_markname_template" "$markname"
+		printf -- "-> %s\n" "$markpath"
 	done
 }
 
-- 
cgit v1.2.3-70-g09d2


From 0cc1266c17204b84255f924f099152c9e4f0383f Mon Sep 17 00:00:00 2001
From: Anton Stamenov <lidow@users.noreply.github.com>
Date: Mon, 31 Dec 2018 21:15:56 +0200
Subject: aws_porfiles regex is catching more lines than profiles, thus
 breaking completion (#7469)

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

(limited to 'plugins')

diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index f78e96ce3..af27e669a 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -35,7 +35,7 @@ function asp {
 }
 
 function aws_profiles {
-  reply=($(grep profile "${AWS_CONFIG_FILE:-$HOME/.aws/config}"|sed -e 's/.*profile \([a-zA-Z0-9_\.-]*\).*/\1/'))
+  reply=($(grep '\[profile' "${AWS_CONFIG_FILE:-$HOME/.aws/config}"|sed -e 's/.*profile \([a-zA-Z0-9_\.-]*\).*/\1/'))
 }
 compctl -K aws_profiles asp
 
-- 
cgit v1.2.3-70-g09d2


From 22e00b02efe63d3ee19a55dadbdea0bea1785942 Mon Sep 17 00:00:00 2001
From: Caleb Williams <br0p0p@users.noreply.github.com>
Date: Wed, 2 Jan 2019 14:12:13 -0600
Subject: Add Yarn Workspace command aliases

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

(limited to 'plugins')

diff --git a/plugins/yarn/yarn.plugin.zsh b/plugins/yarn/yarn.plugin.zsh
index 9ed8322cd..7bdfdb48a 100644
--- a/plugins/yarn/yarn.plugin.zsh
+++ b/plugins/yarn/yarn.plugin.zsh
@@ -22,3 +22,5 @@ alias yt="yarn test"
 alias yuc="yarn global upgrade && yarn cache clean"
 alias yui="yarn upgrade-interactive"
 alias yup="yarn upgrade"
+alias yw="yarn workspace"
+alias yws="yarn workspaces"
-- 
cgit v1.2.3-70-g09d2


From 2596aef866e67425d450f8fc006ec0e216e01c93 Mon Sep 17 00:00:00 2001
From: Yusuf Kocaman <yusuf.kocaman@enuygun.com>
Date: Mon, 7 Jan 2019 17:24:44 +0300
Subject: added change namespace and rolling restart functions for kubectl

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

(limited to 'plugins')

diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index 4cfe3f45b..fa74df164 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -59,6 +59,7 @@ alias kgns='kubectl get namespaces'
 alias kens='kubectl edit namespace'
 alias kdns='kubectl describe namespace'
 alias kdelns='kubectl delete namespace'
+alias kcn='kubectl config set-context $(kubectl config current-context) --namespace' #change namespace
 
 # ConfigMap management
 alias kgcm='kubectl get configmaps'
@@ -80,6 +81,10 @@ alias kdd='kubectl describe deployment'
 alias kdeld='kubectl delete deployment'
 alias ksd='kubectl scale deployment'
 alias krsd='kubectl rollout status deployment'
+# Recreate all pods in deployment with zero-downtime
+kres(){
+    kubectl set env $@ REFRESHED_AT=$(date +%Y%m%d%H%M%S)
+}
 
 # Rollout management.
 alias kgrs='kubectl get rs'
-- 
cgit v1.2.3-70-g09d2


From d8c71bbce128aaf9f774bf38b6dc573d1a29380d Mon Sep 17 00:00:00 2001
From: Yusuf Kocaman <yusuf.kocaman@enuygun.com>
Date: Mon, 7 Jan 2019 17:35:39 +0300
Subject: added details about kcn and kres

---
 plugins/kubectl/README.md          | 2 ++
 plugins/kubectl/kubectl.plugin.zsh | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/kubectl/README.md b/plugins/kubectl/README.md
index a93a9339e..b30f90548 100644
--- a/plugins/kubectl/README.md
+++ b/plugins/kubectl/README.md
@@ -46,6 +46,7 @@ plugins=(... kubectl)
 | kdeli   | `kubectl delete ingress`            | Delete ingress resources matching passed argument                                                |
 |         |                                     | **Namespace management**                                                                         |
 | kgns    | `kubectl get namespaces`            | List the current namespaces in a cluster                                                         |
+| kcn     | `kubectl config set-context ...`    | Change current namespace |
 | kens    | `kubectl edit namespace`            | Edit namespace resource from the default editor                                                  |
 | kdns    | `kubectl describe namespace`        | Describe namespace resource in detail                                                            |
 | kdelns  | `kubectl delete namespace`          | Delete the namespace. WARNING! This deletes everything in the namespace                          |
@@ -67,6 +68,7 @@ plugins=(... kubectl)
 | kdeld   | `kubectl delete deployment`         | Delete the deployment                                                                            |
 | ksd     | `kubectl scale deployment`          | Scale a deployment                                                                               |
 | krsd    | `kubectl rollout status deployment` | Check the rollout status of a deployment                                                         |
+| kres    | `kubectl set env $@ REFRESHED_AT=...` | Recreate all pods in deployment with zero-downtime                                                         |
 |         |                                     | **Rollout management**                                                                           |
 | kgrs    | `kubectl get rs`                    | To see the ReplicaSet `rs` created by the deployment                                             |
 | krh     | `kubectl rollout history`           | Check the revisions of this deployment                                                           |
diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index fa74df164..d388d6543 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -59,7 +59,7 @@ alias kgns='kubectl get namespaces'
 alias kens='kubectl edit namespace'
 alias kdns='kubectl describe namespace'
 alias kdelns='kubectl delete namespace'
-alias kcn='kubectl config set-context $(kubectl config current-context) --namespace' #change namespace
+alias kcn='kubectl config set-context $(kubectl config current-context) --namespace'
 
 # ConfigMap management
 alias kgcm='kubectl get configmaps'
@@ -81,7 +81,6 @@ alias kdd='kubectl describe deployment'
 alias kdeld='kubectl delete deployment'
 alias ksd='kubectl scale deployment'
 alias krsd='kubectl rollout status deployment'
-# Recreate all pods in deployment with zero-downtime
 kres(){
     kubectl set env $@ REFRESHED_AT=$(date +%Y%m%d%H%M%S)
 }
-- 
cgit v1.2.3-70-g09d2


From fabee55948776e2e4c210e9dcd75e7bc38c02bec Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Wed, 9 Jan 2019 21:19:52 +0100
Subject: ssh-agent: autoload identities not already loaded (#7174)

With this PR the ssh-agent plugin checks the `ssh-add -l` output for the
identities added, and adds all those specified by the user that haven't been
added yet.

We also decouple the logic of starting ssh-agent from the logic of adding
identities, meaning that even if ssh-agent has been started by some other means
(like launchd) we can still ssh-add the user's identities.

Fixes #3019
Fixes #6979
---
 plugins/ssh-agent/ssh-agent.plugin.zsh | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

(limited to 'plugins')

diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index fe4946c6d..a688855d0 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -2,20 +2,27 @@ typeset _agent_forwarding _ssh_env_cache
 
 function _start_agent() {
 	local lifetime
-	local -a identities
-
-	# start ssh-agent and setup environment
 	zstyle -s :omz:plugins:ssh-agent lifetime lifetime
 
+	# start ssh-agent and setup environment
+	echo starting ssh-agent...
 	ssh-agent -s ${lifetime:+-t} ${lifetime} | sed 's/^echo/#echo/' >! $_ssh_env_cache
 	chmod 600 $_ssh_env_cache
 	. $_ssh_env_cache > /dev/null
+}
 
-	# load identies
+function _add_identities() {
+	local id line
+	local -a identities ids
 	zstyle -a :omz:plugins:ssh-agent identities identities
 
-	echo starting ssh-agent...
-	ssh-add $HOME/.ssh/${^identities}
+	# get list of loaded identities
+	for line in ${(f)"$(ssh-add -l)"}; do ids+=${${(z)line}[3]}; done
+
+	# add identities if not already loaded
+	for id in ${^identities}; do
+		[[ ${ids[(I)$HOME/.ssh/$id]} -le 0 ]] && ssh-add $HOME/.ssh/$id
+	done
 }
 
 # Get the filename to store/lookup the environment from
@@ -42,6 +49,8 @@ else
 	_start_agent
 fi
 
+_add_identities
+
 # tidy up after ourselves
 unset _agent_forwarding _ssh_env_cache
-unfunction _start_agent
+unfunction _start_agent _add_identities
-- 
cgit v1.2.3-70-g09d2


From 2a603856598eafc3c8a0bde80f8a885d2a81dfee Mon Sep 17 00:00:00 2001
From: François Scala <github@arcenik.net>
Date: Mon, 14 Jan 2019 16:38:45 +0100
Subject: ssh-agent: use key signatures to check loaded ids (#7504)

Use fingerprint of ssh key instead of file name to control if the key is already loaded.

Also check for .ssh folder presence (#5128)
---
 plugins/ssh-agent/ssh-agent.plugin.zsh | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

(limited to 'plugins')

diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index a688855d0..2a860f3aa 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -12,16 +12,28 @@ function _start_agent() {
 }
 
 function _add_identities() {
-	local id line
-	local -a identities ids
+	local id line sig
+	local -a identities loaded signatures
 	zstyle -a :omz:plugins:ssh-agent identities identities
 
-	# get list of loaded identities
-	for line in ${(f)"$(ssh-add -l)"}; do ids+=${${(z)line}[3]}; done
+	# check for .ssh folder presence
+	if [[ ! -d $HOME/.ssh ]]; then
+		return
+	fi
+
+	# get list of loaded identities' signatures
+	for line in ${(f)"$(ssh-add -l)"}; do loaded+=${${(z)line}[2]}; done
+
+	# get signatures of private keys
+	for id in $identities; do
+		signatures+="$(ssh-keygen -lf "$HOME/.ssh/$id" | awk '{print $2}')	$id"
+	done
 
 	# add identities if not already loaded
-	for id in ${^identities}; do
-		[[ ${ids[(I)$HOME/.ssh/$id]} -le 0 ]] && ssh-add $HOME/.ssh/$id
+	for sig in $signatures; do
+		id="$(cut -f2 <<< $sig)"
+		sig="$(cut -f1 <<< $sig)"
+		[[ ${loaded[(I)$sig]} -le 0 ]] && ssh-add $HOME/.ssh/$id
 	done
 }
 
-- 
cgit v1.2.3-70-g09d2


From 9329efd2522b3eaba5f6d9d53e41c090eb6b3c92 Mon Sep 17 00:00:00 2001
From: Andreas <andreas@galauner.de>
Date: Mon, 14 Jan 2019 16:42:14 +0100
Subject: ssh-agent: autoload identities in one go (#7507)

With this PR the ssh-agent plugin loads all identities which are not yet
loaded in a single call to ssh-add. If a passphrase is shared between
loaded identities it only needs to be entered once.

Fixes #7506
---
 plugins/ssh-agent/ssh-agent.plugin.zsh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index 2a860f3aa..1cc5630e1 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -13,7 +13,7 @@ function _start_agent() {
 
 function _add_identities() {
 	local id line sig
-	local -a identities loaded signatures
+	local -a identities loaded not_loaded signatures
 	zstyle -a :omz:plugins:ssh-agent identities identities
 
 	# check for .ssh folder presence
@@ -33,8 +33,10 @@ function _add_identities() {
 	for sig in $signatures; do
 		id="$(cut -f2 <<< $sig)"
 		sig="$(cut -f1 <<< $sig)"
-		[[ ${loaded[(I)$sig]} -le 0 ]] && ssh-add $HOME/.ssh/$id
+		[[ ${loaded[(I)$sig]} -le 0 ]] && not_loaded+="$HOME/.ssh/$id"
 	done
+
+	if [[ -n "$not_loaded" ]] && ssh-add ${^not_loaded}
 }
 
 # Get the filename to store/lookup the environment from
-- 
cgit v1.2.3-70-g09d2


From 586ca16902d9dae4d95d5256a824572f60219c83 Mon Sep 17 00:00:00 2001
From: "Ing. Jan Kaláb" <jan+github@kalabovi.org>
Date: Tue, 15 Jan 2019 19:03:07 +0100
Subject: extract: add AAR Android archive support (#7511)

---
 plugins/extract/README.md          | 1 +
 plugins/extract/_extract           | 2 +-
 plugins/extract/extract.plugin.zsh | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/extract/README.md b/plugins/extract/README.md
index c6bdd36dd..83b878c32 100644
--- a/plugins/extract/README.md
+++ b/plugins/extract/README.md
@@ -19,6 +19,7 @@ plugins=(... extract)
 | `7z`              | 7zip file                            |
 | `Z`               | Z archive (LZW)                      |
 | `apk`             | Android app file                     |
+| `aar`             | Android library file                 |
 | `bz2`             | Bzip2 file                           |
 | `deb`             | Debian package                       |
 | `gz`              | Gzip file                            |
diff --git a/plugins/extract/_extract b/plugins/extract/_extract
index 3baefa339..33d49fcc5 100644
--- a/plugins/extract/_extract
+++ b/plugins/extract/_extract
@@ -3,5 +3,5 @@
 
 _arguments \
   '(-r --remove)'{-r,--remove}'[Remove archive.]' \
-  "*::archive file:_files -g '(#i)*.(7z|Z|apk|bz2|deb|gz|ipsw|jar|lzma|rar|sublime-package|tar|tar.bz2|tar.gz|tar.xz|tar.zma|tbz|tbz2|tgz|tlz|txz|war|whl|xpi|xz|zip)(-.)'" \
+  "*::archive file:_files -g '(#i)*.(7z|Z|apk|aar|bz2|deb|gz|ipsw|jar|lzma|rar|sublime-package|tar|tar.bz2|tar.gz|tar.xz|tar.zma|tbz|tbz2|tgz|tlz|txz|war|whl|xpi|xz|zip)(-.)'" \
     && return 0
diff --git a/plugins/extract/extract.plugin.zsh b/plugins/extract/extract.plugin.zsh
index 4c72ce870..5e9b9ff24 100644
--- a/plugins/extract/extract.plugin.zsh
+++ b/plugins/extract/extract.plugin.zsh
@@ -46,7 +46,7 @@ extract() {
 			(*.xz) unxz "$1" ;;
 			(*.lzma) unlzma "$1" ;;
 			(*.z) uncompress "$1" ;;
-			(*.zip|*.war|*.jar|*.sublime-package|*.ipsw|*.xpi|*.apk|*.whl) unzip "$1" -d $extract_dir ;;
+			(*.zip|*.war|*.jar|*.sublime-package|*.ipsw|*.xpi|*.apk|*.aar|*.whl) unzip "$1" -d $extract_dir ;;
 			(*.rar) unrar x -ad "$1" ;;
 			(*.7z) 7za x "$1" ;;
 			(*.deb)
-- 
cgit v1.2.3-70-g09d2


From 9d1dd24e3568ebbcce093bb351ea776a0bf2c0ff Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sat, 19 Jan 2019 18:00:04 +0100
Subject: ssh-agent: add default keys if no zstyle identities were set (#7520)

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

(limited to 'plugins')

diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index 1cc5630e1..0a204309e 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -21,6 +21,16 @@ function _add_identities() {
 		return
 	fi
 
+	# add default keys if no identities were set up via zstyle
+	# this is to mimic the call to ssh-add with no identities
+	if [[ ${#identities} -eq 0 ]]; then
+		# key list found on `ssh-add` man page's DESCRIPTION section
+		for id in id_rsa id_dsa id_ecdsa id_ed25519 identity; do
+			# check if file exists
+			[[ -f "$HOME/.ssh/$id" ]] && identities+=$id
+		done
+	fi
+
 	# get list of loaded identities' signatures
 	for line in ${(f)"$(ssh-add -l)"}; do loaded+=${${(z)line}[2]}; done
 
@@ -36,7 +46,7 @@ function _add_identities() {
 		[[ ${loaded[(I)$sig]} -le 0 ]] && not_loaded+="$HOME/.ssh/$id"
 	done
 
-	if [[ -n "$not_loaded" ]] && ssh-add ${^not_loaded}
+	[[ -n "$not_loaded" ]] && ssh-add ${^not_loaded}
 }
 
 # Get the filename to store/lookup the environment from
-- 
cgit v1.2.3-70-g09d2


From 7dab4f07e614ad2ebeabb4f3de0bbacb67317540 Mon Sep 17 00:00:00 2001
From: pahakalle <pahakalle@protonmail.ch>
Date: Sun, 20 Jan 2019 04:24:52 +0200
Subject: Added brew cask update

---
 plugins/brew/README.md       | 2 ++
 plugins/brew/brew.plugin.zsh | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'plugins')

diff --git a/plugins/brew/README.md b/plugins/brew/README.md
index aab55ea39..c129a7652 100644
--- a/plugins/brew/README.md
+++ b/plugins/brew/README.md
@@ -17,3 +17,5 @@ plugins=(... brew)
 | bubo   | `brew update && brew outdated` | Fetch the newest version of Homebrew and all formulae, then list outdated formulae. |
 | bubc   | `brew upgrade && brew cleanup` | Upgrade outdated, unpinned brews (with existing install options), then removes stale lock files and outdated downloads for formulae and casks, and removes old versions of installed formulae. |
 | bubu   | `bubo && bubc`       | Updates Homebrew, lists outdated formulae, upgrades oudated and unpinned formulae, and removes stale and outdated downloads and versions. |
+| bcubo  | `brew update && brew cask outdated` | Fetch the newest version of Homebrew and all formulae, then list outdated casks. |
+| bcubc  | `brew cask reinstall $(brew cask outdated) && brew cleanup` | Updates outdated casks, then runs cleanup. |
\ No newline at end of file
diff --git a/plugins/brew/brew.plugin.zsh b/plugins/brew/brew.plugin.zsh
index 60b81f8ec..cfbaa3480 100644
--- a/plugins/brew/brew.plugin.zsh
+++ b/plugins/brew/brew.plugin.zsh
@@ -4,6 +4,8 @@ alias brewsp='brew list --pinned'
 alias bubo='brew update && brew outdated'
 alias bubc='brew upgrade && brew cleanup'
 alias bubu='bubo && bubc'
+alias bcubo='brew update && brew cask outdated'
+alias bcubc='brew cask reinstall $(brew cask outdated) && brew cleanup'
 
 if command mkdir "$ZSH_CACHE_DIR/.brew-completion-message" 2>/dev/null; then
 	print -P '%F{yellow}'Oh My Zsh brew plugin:
-- 
cgit v1.2.3-70-g09d2


From 3c16466a14516eb3c177e7eb0553adbe16f39890 Mon Sep 17 00:00:00 2001
From: neeasade <neeasade@users.noreply.github.com>
Date: Sun, 20 Jan 2019 13:19:07 -0600
Subject: git: quote branch name in ggpull and ggpush (#7472)

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

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 45a706173..2251bae2e 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -155,10 +155,10 @@ compdef _git ggu=git-checkout
 alias ggpur='ggu'
 compdef _git ggpur=git-checkout
 
-alias ggpull='git pull origin $(git_current_branch)'
+alias ggpull='git pull origin "$(git_current_branch)"'
 compdef _git ggpull=git-checkout
 
-alias ggpush='git push origin $(git_current_branch)'
+alias ggpush='git push origin "$(git_current_branch)"'
 compdef _git ggpush=git-checkout
 
 alias ggsup='git branch --set-upstream-to=origin/$(git_current_branch)'
-- 
cgit v1.2.3-70-g09d2


From fcf1fe72c0057b5eccecd7ae9bfc2fe199cc9b3d Mon Sep 17 00:00:00 2001
From: "Z.Shang" <shangzhanlin@gmail.com>
Date: Tue, 22 Jan 2019 04:49:21 +1100
Subject: init ros plugin

---
 plugins/ros/README.mkd | 10 ++++++++
 plugins/ros/_ros       | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+)
 create mode 100644 plugins/ros/README.mkd
 create mode 100644 plugins/ros/_ros

(limited to 'plugins')

diff --git a/plugins/ros/README.mkd b/plugins/ros/README.mkd
new file mode 100644
index 000000000..83573e499
--- /dev/null
+++ b/plugins/ros/README.mkd
@@ -0,0 +1,10 @@
+# Roswell Plugin
+
+This plugin adds completions and aliases for [Roswell](https://github.com/roswell/roswell/).
+
+To use it, add `ros` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... ros)
+```
+
diff --git a/plugins/ros/_ros b/plugins/ros/_ros
new file mode 100644
index 000000000..6a04d3c8f
--- /dev/null
+++ b/plugins/ros/_ros
@@ -0,0 +1,64 @@
+#compdef ros
+#autoload
+
+# roswell zsh completion, based on gem completion
+
+local -a _1st_arguments
+_1st_arguments=(
+'run: Run repl'
+'install:Install a given implementation or a system for roswell environment'
+'update:Update installed systems.'
+'build:Make executable from script.'
+'use:Change default implementation.'
+'init:a new ros script, optionally based on a template.'
+'fmt:Indent lisp source.'
+'list:Information'
+'template:[WIP] Manage templates'
+'delete:Delete installed implementations'
+'config:Get and set options'
+'version:Show the roswell version information'
+"help:Use \"ros help [command]\" for more information about a command."$'\n\t\t'"Use \"ros help [topic]\" for more information about the topic."
+) 
+
+#local expl
+
+_arguments \
+  '(--version)'--version'[Print version information and quit]' \
+  '(-w --wrap)'{-w,--wrap}'[\[CODE\] Run roswell with a shell wrapper CODE]' \
+  '(-m --image)'{-m,--image}'[\[IMAGE\] continue from Lisp image IMAGE]' \
+  '(-M --module)'{-M,--module}'[\[NAME\] Execute ros script found in ROSWELLPATH. (pythons -m)]' \
+  '(-L --lisp)'{-L,--lisp}'[\[NAME\] Run roswell with a lisp impl NAME\[/VERSION\].]' \
+  '(-l --load)'{-l,--load}'[\[FILE\] load lisp FILE while building]' \
+  '(-S --source-registry)'{-S,--source-registry}'[\[X\] override source registry of asdf systems]' \
+  '(-s --system --load-system)'{-s,--system,--load-system}'[\[SYSTEM\] load asdf SYSTEM while building]' \
+  '(-p --package)'{-p,--package}'[\[PACKAGE\] change current package to \[PACKAGE\]]' \
+  '(-sp --system-package)'{-sp,--system-package}'[\[SP\] combination of -s \[SP\] and -p \[SP\]]' \
+  '(-e --eval)'{-e,--eval}'[\[FORM\] evaluate \[FORM\] while building]' \
+  '--require'--require'[\[MODULE\] require \[MODULE\] while building]' \
+  '(-q --quit)'{-q,--quit}'[quit lisp here]' \
+  '(-r --restart)'{-r,--restart}'[\[FUNC\] restart from build by calling (\[FUNC\])]' \
+  '(-E --entry)'{-E,--entry}'[\[FUNC\] restart from build by calling (\[FUNC\] argv)]' \
+  '(-i --init)'{-i,--init}'[\[FORM\] evaluate \[FORM\] after restart]' \
+  '(-ip --print)'{-ip,--print}'[\[FORM\] evaluate and princ \[FORM\] after restart]' \
+  '(-iw --write)'{-iw,--write}'[\[FORM\] evaluate and write \[FORM\] after restart]' \
+  '(-F --final)'{-F,--final}'[\[FORM\] evaluate \[FORM\] before dumping IMAGE]' \
+  '(\+R --no-rc)'{\+R,--no-rc}'[skip /etc/rosrc, ~/.roswell/init.lisp]' \
+  '(-A --asdf)'{-A,--asdf}'[use new asdf]' \
+  '(\+Q --no-quicklisp)'{\+Q,--no-quicklisp}'[do not use quicklisp]' \
+  '(-v --verbose)'{-v,--verbose}'[be quite noisy while building]' \
+  '--quiet'--quiet'[be quite quiet while building default]' \
+  '--test'--test'[for test purpose]' \
+  '*:: :->subcmds'  && return 0
+
+
+if (( CURRENT == 1 )); then
+  _describe -t commands "ros subcommand" _1st_arguments
+  return
+fi
+
+# _files
+case "$words[1]" in
+  -l|--load)
+    _files
+    ;;
+esac
-- 
cgit v1.2.3-70-g09d2


From c4948696328eab3b954932eb940ec8ec97b12906 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Mon, 21 Jan 2019 20:31:30 +0100
Subject: ssh-agent: check for loaded id filenames first (#7521)

This change makes the plugin check if an identity is loaded by looking
first at the key filename reported by `ssh-add -l`. This fixes the use
case where ssh-keygen is not able to output the fingerprint of a key,
such as the one reported on #7516.

Now, for an identity to be passed onto ssh-add, it has to fail the
match for a loaded identity, both filename and signature.
---
 plugins/ssh-agent/ssh-agent.plugin.zsh | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'plugins')

diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index 0a204309e..a7a4ee33a 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -13,7 +13,7 @@ function _start_agent() {
 
 function _add_identities() {
 	local id line sig
-	local -a identities loaded not_loaded signatures
+	local -a identities loaded_sigs loaded_ids not_loaded
 	zstyle -a :omz:plugins:ssh-agent identities identities
 
 	# check for .ssh folder presence
@@ -31,19 +31,19 @@ function _add_identities() {
 		done
 	fi
 
-	# get list of loaded identities' signatures
-	for line in ${(f)"$(ssh-add -l)"}; do loaded+=${${(z)line}[2]}; done
-
-	# get signatures of private keys
-	for id in $identities; do
-		signatures+="$(ssh-keygen -lf "$HOME/.ssh/$id" | awk '{print $2}')	$id"
+	# get list of loaded identities' signatures and filenames
+	for line in ${(f)"$(ssh-add -l)"}; do
+		loaded_sigs+=${${(z)line}[2]}
+		loaded_ids+=${${(z)line}[3]}
 	done
 
 	# add identities if not already loaded
-	for sig in $signatures; do
-		id="$(cut -f2 <<< $sig)"
-		sig="$(cut -f1 <<< $sig)"
-		[[ ${loaded[(I)$sig]} -le 0 ]] && not_loaded+="$HOME/.ssh/$id"
+	for id in $identities; do
+		# check for filename match, otherwise try for signature match
+		if [[ ${loaded_ids[(I)$HOME/.ssh/$id]} -le 0 ]]; then
+			sig="$(ssh-keygen -lf "$HOME/.ssh/$id" | awk '{print $2}')"
+			[[ ${loaded_sigs[(I)$sig]} -le 0 ]] && not_loaded+="$HOME/.ssh/$id"
+		fi
 	done
 
 	[[ -n "$not_loaded" ]] && ssh-add ${^not_loaded}
-- 
cgit v1.2.3-70-g09d2


From 12c516822c7017355e264540b236405e1ab49a84 Mon Sep 17 00:00:00 2001
From: Jesse Farinacci <jesse.farinacci@gmail.com>
Date: Tue, 22 Jan 2019 10:09:07 -0500
Subject: add brew install path to search

recent `brew install jenv` installs to `/usr/local/bin/jenv`, auto-discover it for recent brew installs to avoid secondary, slower search
---
 plugins/jenv/jenv.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/jenv/jenv.plugin.zsh b/plugins/jenv/jenv.plugin.zsh
index 14c586be9..2eda8037b 100644
--- a/plugins/jenv/jenv.plugin.zsh
+++ b/plugins/jenv/jenv.plugin.zsh
@@ -1,4 +1,4 @@
-jenvdirs=("$HOME/.jenv" "/usr/local/jenv" "/opt/jenv")
+jenvdirs=("$HOME/.jenv" "/usr/local" "/usr/local/jenv" "/opt/jenv")
 
 FOUND_JENV=0
 for jenvdir in $jenvdirs; do
-- 
cgit v1.2.3-70-g09d2


From ea6ec09b9c7752ee0e074659ca0689d0af053e5a Mon Sep 17 00:00:00 2001
From: Erwan ROUSSEL <erwan.roussel51@gmail.com>
Date: Fri, 25 Jan 2019 12:16:20 +0100
Subject: cake: add README (#7473)

---
 plugins/cake/README.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 plugins/cake/README.md

(limited to 'plugins')

diff --git a/plugins/cake/README.md b/plugins/cake/README.md
new file mode 100644
index 000000000..aad92a3ec
--- /dev/null
+++ b/plugins/cake/README.md
@@ -0,0 +1,15 @@
+# Cake
+
+This plugin provides completion for [CakePHP](https://cakephp.org/).
+
+To use it add cake to the plugins array in your zshrc file.
+
+```bash
+plugins=(... cake)
+```
+
+## Note
+
+This plugin generates a cache file of the cake tasks found, named `.cake_task_cache`, in the current working directory. 
+It is regenerated when the Cakefile is newer than the cache file. It is advised that you add the cake file to your
+`.gitignore` files.
-- 
cgit v1.2.3-70-g09d2


From 308b046875f745abb87b3ef9f0382029fe37b452 Mon Sep 17 00:00:00 2001
From: Gianluca Recchia <gianluca.recchia97@gmail.com>
Date: Sun, 30 Dec 2018 03:10:49 +0100
Subject: Use stash 'push' or 'save' depending on Git version

A utility function now parses the output of git --version and set the
alias for git stash to 'git stash push' iff the current version of Git
is greater than 2.13; it falls back to 'git stash save' otherwise.
---
 plugins/git/git.plugin.zsh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 2251bae2e..17e4d4b9d 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -33,6 +33,11 @@ function work_in_progress() {
   fi
 }
 
+function _omz_git_stash_command() {
+  [[ `git --version 2>/dev/null` =~ '^git version ([[:digit:]]+.[[:digit:]]+)' && "$match[1]" >= '2.13' ]] \
+  && echo push || echo save
+}
+
 #
 # Aliases
 # (sorted alphabetically)
@@ -238,7 +243,7 @@ alias gsps='git show --pretty=short --show-signature'
 alias gsr='git svn rebase'
 alias gss='git status -s'
 alias gst='git status'
-alias gsta='git stash save'
+alias gsta="git stash $(_omz_git_stash_command)"
 alias gstaa='git stash apply'
 alias gstc='git stash clear'
 alias gstd='git stash drop'
-- 
cgit v1.2.3-70-g09d2


From 932d611c90b979078f4cdd37a20e2bf12e400a84 Mon Sep 17 00:00:00 2001
From: Bartlomiej Tartanus <bartektartanus@gmail.com>
Date: Wed, 30 Jan 2019 16:22:14 +0100
Subject: git: properly indent ggfl function (#7556)

Fixes (probably MacOS) issue:
> ggfl
zsh: command not found: ggfl
---
 plugins/git/git.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 2251bae2e..12400ede4 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -112,8 +112,8 @@ ggf() {
   git push --force origin "${b:=$1}"
 }
 ggfl() {
-[[ "$#" != 1 ]] && local b="$(git_current_branch)"
-git push --force-with-lease origin "${b:=$1}"
+  [[ "$#" != 1 ]] && local b="$(git_current_branch)"
+  git push --force-with-lease origin "${b:=$1}"
 }
 compdef _git ggf=git-checkout
 
-- 
cgit v1.2.3-70-g09d2


From 83ce8d05dfefacf1d4a7fdc957f38b3bd6cba6b4 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Wed, 30 Jan 2019 16:35:16 +0100
Subject: transfer: add newline after showing the link

Fixes #7562
---
 plugins/transfer/transfer.plugin.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/transfer/transfer.plugin.zsh b/plugins/transfer/transfer.plugin.zsh
index 7a7cd85ec..db744b0cd 100644
--- a/plugins/transfer/transfer.plugin.zsh
+++ b/plugins/transfer/transfer.plugin.zsh
@@ -61,7 +61,9 @@ transfer() {
    
     # cat output link
     cat $tmpfile
+    # add newline
+    echo
 
     # cleanup
     rm -f $tmpfile
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3-70-g09d2


From e634730e35450b408efa6acc9273d3c1eff12d8c Mon Sep 17 00:00:00 2001
From: genevera <genevera@users.noreply.github.com>
Date: Tue, 5 Feb 2019 05:20:25 -0500
Subject: update spotify to newest version

---
 plugins/osx/spotify | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'plugins')

diff --git a/plugins/osx/spotify b/plugins/osx/spotify
index 2ab98d3a0..b4215dbe7 100644
--- a/plugins/osx/spotify
+++ b/plugins/osx/spotify
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 function spotify() {
-# Copyright (c) 2012--2017 Harish Narayanan <mail@harishnarayanan.org>
+# Copyright (c) 2012--2018 Harish Narayanan <mail@harishnarayanan.org>
 #
 # Contains numerous helpful contributions from Jorge Colindres, Thomas
 # Pritchard, iLan Epstein, Gabriele Bonetti, Sean Heller, Eric Martin
@@ -134,8 +134,13 @@ showStatus () {
 if [ $# = 0 ]; then
     showHelp;
 else
+	if [ ! -d /Applications/Spotify.app ] && [ ! -d $HOME/Applications/Spotify.app ]; then
+		echo "The Spotify application must be installed."
+		exit 1
+	fi
+
     if [ $(osascript -e 'application "Spotify" is running') = "false" ]; then
-        osascript -e 'tell application "Spotify" to activate'
+        osascript -e 'tell application "Spotify" to activate' || exit 1
         sleep 2
     fi
 fi
@@ -160,7 +165,7 @@ while [ $# -gt 0 ]; do
                     showAPIHelp;
                     exit 1;
                 fi
-                SHPOTIFY_CREDENTIALS=$(printf "${CLIENT_ID}:${CLIENT_SECRET}" | base64 | tr -d "\n");
+                SHPOTIFY_CREDENTIALS=$(printf "${CLIENT_ID}:${CLIENT_SECRET}" | base64 | tr -d "\n"|tr -d '\r');
                 SPOTIFY_PLAY_URI="";
 
                 getAccessToken() {
-- 
cgit v1.2.3-70-g09d2


From 052493b1ba71fe7e13554e57571fe4c793d53c3c Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Wed, 6 Feb 2019 11:55:38 +0100
Subject: z: refresh $RANDOM's value outside subshell

This change references `$RANDOM` outside the subshell to refresh it for the
next subshell invocation. Otherwise, subsequent runs of the function get the
same value and, if run simultaneously, they may clobber each others' temp .z
files.

This is due to how zsh distributes RANDOM values when running inside a
subshell:

  subshells that reference RANDOM will result in identical pseudo-random
  values unless the value of RANDOM is referenced or seeded in the parent
  shell in between subshell invocations

See: http://zsh.sourceforge.net/Doc/Release/Parameters.html#index-RANDOM
---
 plugins/z/z.sh | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'plugins')

diff --git a/plugins/z/z.sh b/plugins/z/z.sh
index 4fc75dc6a..5fe6d5266 100644
--- a/plugins/z/z.sh
+++ b/plugins/z/z.sh
@@ -222,10 +222,16 @@ if type compctl >/dev/null 2>&1; then
         if [ "$_Z_NO_RESOLVE_SYMLINKS" ]; then
             _z_precmd() {
                 (_z --add "${PWD:a}" &)
+                # Reference $RANDOM to refresh its value inside the subshell
+                # Otherwise, multiple runs get the same value
+                : $RANDOM
             }
         else
             _z_precmd() {
                 (_z --add "${PWD:A}" &)
+                # Reference $RANDOM to refresh its value inside the subshell
+                # Otherwise, multiple runs get the same value
+                : $RANDOM
             }
         fi
         [[ -n "${precmd_functions[(r)_z_precmd]}" ]] || {
-- 
cgit v1.2.3-70-g09d2


From 86ea319536a8012b9e8f508d3d257029014bdafe Mon Sep 17 00:00:00 2001
From: eric-christian <298704+eric-christian@users.noreply.github.com>
Date: Fri, 8 Feb 2019 15:14:09 +0100
Subject: asdf: fix homebrew installation path (#7582)

* The check for the asdf installation directory is more precise:

    The existence of the directory `$HOME/.asdf` does not mean that it is the installation
    directory of `asdf`. It will also be created after installing at least one asdf plugin.

* Completions, while installed with homebrew, are now expected on an alternative location.
---
 plugins/asdf/asdf.plugin.zsh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'plugins')

diff --git a/plugins/asdf/asdf.plugin.zsh b/plugins/asdf/asdf.plugin.zsh
index 75395c718..38b225538 100644
--- a/plugins/asdf/asdf.plugin.zsh
+++ b/plugins/asdf/asdf.plugin.zsh
@@ -1,9 +1,11 @@
 # Find where asdf should be installed
 ASDF_DIR="${ASDF_DIR:-$HOME/.asdf}"
+ASDF_COMPLETIONS="$ASDF_DIR/completions"
 
 # If not found, check for Homebrew package
-if [[ ! -d $ASDF_DIR ]] && (( $+commands[brew] )); then
+if [[ ! -f "$ASDF_DIR/asdf.sh" ]] && (( $+commands[brew] )); then
    ASDF_DIR="$(brew --prefix asdf)"
+   ASDF_COMPLETIONS="$ASDF_DIR/etc/bash_completion.d"
 fi
 
 # Load command
@@ -11,7 +13,7 @@ if [[ -f "$ASDF_DIR/asdf.sh" ]]; then
     . "$ASDF_DIR/asdf.sh"
 
     # Load completions
-    if [[ -f "$ASDF_DIR/completions/asdf.bash" ]]; then
-        . "$ASDF_DIR/completions/asdf.bash"
+    if [[ -f "$ASDF_COMPLETIONS/asdf.bash" ]]; then
+        . "$ASDF_COMPLETIONS/asdf.bash"
     fi
 fi
-- 
cgit v1.2.3-70-g09d2


From df002539f8c12cab9a4ca236be56fa19982fd6cb Mon Sep 17 00:00:00 2001
From: nslqqq <nslqqq@gmail.com>
Date: Mon, 9 Sep 2013 07:35:57 -0700
Subject: mvn: enable completion for maven colorizer

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

(limited to 'plugins')

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index f367fecce..4f3d40ec9 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -288,5 +288,6 @@ function listMavenCompletions {
 }
 
 compctl -K listMavenCompletions mvn
+compctl -K listMavenCompletions mvn-color
 compctl -K listMavenCompletions mvn-or-mvnw
 
-- 
cgit v1.2.3-70-g09d2


From e056aee79447bb0f61e33a8901f3a9bfef2d06b9 Mon Sep 17 00:00:00 2001
From: Neil Green <neil@meles.io>
Date: Mon, 13 Feb 2017 12:17:06 +0000
Subject: mvn: enable completion for mvnw

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

(limited to 'plugins')

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index 4f3d40ec9..d846508d3 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -287,7 +287,7 @@ function listMavenCompletions {
     ); 
 }
 
-compctl -K listMavenCompletions mvn
+compctl -K listMavenCompletions mvn mvnw
 compctl -K listMavenCompletions mvn-color
 compctl -K listMavenCompletions mvn-or-mvnw
 
-- 
cgit v1.2.3-70-g09d2


From 35539fd6e4519eaa9110f160aae7a403478263d2 Mon Sep 17 00:00:00 2001
From: Wajdi Al-Hawari <walhawari@iweb.com>
Date: Thu, 17 Sep 2015 13:46:28 -0400
Subject: mvn: add initialize support in mvn completion

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

(limited to 'plugins')

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index d846508d3..ad0ae0ca0 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -53,6 +53,7 @@ mvn-color() {
 alias mvn="mvn-or-mvnw"
 
 # aliases
+alias mvncini='mvn clean initialize'
 alias mvncie='mvn clean install eclipse:eclipse'
 alias mvnci='mvn clean install'
 alias mvncist='mvn clean install -DskipTests'
@@ -81,7 +82,7 @@ alias mvndocs='mvn dependency:resolve -Dclassifier=javadoc'
 function listMavenCompletions { 
     reply=(
         # common lifecycle
-        clean process-resources compile process-test-resources test-compile test integration-test package verify install deploy site
+        clean initialize process-resources compile process-test-resources test-compile test integration-test package verify install deploy site
 
         # common plugins
         deploy failsafe install site surefire checkstyle javadoc jxr pmd ant antrun archetype assembly dependency enforcer gpg help release repository source eclipse idea jetty cargo jboss tomcat tomcat6 tomcat7 exec versions war ear ejb android scm buildnumber nexus repository sonar license hibernate3 liquibase flyway gwt
-- 
cgit v1.2.3-70-g09d2


From 4d4a2fac584e199cc9f15f0431173f376cb674bd Mon Sep 17 00:00:00 2001
From: Alexey Merezhin <amerezhin@e3ag.ch>
Date: Fri, 22 Sep 2017 16:19:59 +0200
Subject: mvn: add mvncp alias to 'mvn clean package'

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

(limited to 'plugins')

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index ad0ae0ca0..53136db9c 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -56,6 +56,7 @@ alias mvn="mvn-or-mvnw"
 alias mvncini='mvn clean initialize'
 alias mvncie='mvn clean install eclipse:eclipse'
 alias mvnci='mvn clean install'
+alias mvncp='mvn clean package'
 alias mvncist='mvn clean install -DskipTests'
 alias mvncisto='mvn clean install -DskipTests --offline'
 alias mvne='mvn eclipse:eclipse'
-- 
cgit v1.2.3-70-g09d2


From 0dbe7ecedc7631668fdad8ca23d9f19e91b4d0d2 Mon Sep 17 00:00:00 2001
From: sparsick <sparsick@web.de>
Date: Tue, 31 Jan 2017 10:10:53 +0100
Subject: mvn: add alias to 'mvn clean deploy'

---
 plugins/mvn/README.md      | 1 +
 plugins/mvn/mvn.plugin.zsh | 1 +
 2 files changed, 2 insertions(+)

(limited to 'plugins')

diff --git a/plugins/mvn/README.md b/plugins/mvn/README.md
index 986ac84a4..be6bd6db3 100644
--- a/plugins/mvn/README.md
+++ b/plugins/mvn/README.md
@@ -19,6 +19,7 @@ plugins=(... mvn)
 | `mvne`               | `mvn eclipse:eclipse`                           |
 | `mvncv`              | `mvn clean verify`                              |
 | `mvnd`               | `mvn deploy`                                    |
+| `mvncd`              | `mvn clean deploy`                              |
 | `mvnp`               | `mvn package`                                   |
 | `mvnc`               | `mvn clean`                                     |
 | `mvncom`             | `mvn compile`                                   |
diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index 53136db9c..9baf66464 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -63,6 +63,7 @@ alias mvne='mvn eclipse:eclipse'
 alias mvnce='mvn clean eclipse:clean eclipse:eclipse'
 alias mvncv='mvn clean verify'
 alias mvnd='mvn deploy'
+alias mvncd='mvn clean deploy'
 alias mvnp='mvn package'
 alias mvnc='mvn clean'
 alias mvncom='mvn compile'
-- 
cgit v1.2.3-70-g09d2


From 7ebd80fc7df544e112480cb9a7ea9d564cbdc160 Mon Sep 17 00:00:00 2001
From: Laurent Vaills <laurent.vaills@forgerock.com>
Date: Thu, 15 Oct 2015 09:04:32 +0200
Subject: mvn: add mvncvst alias

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

(limited to 'plugins')

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index 9baf66464..edcd10a17 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -62,6 +62,7 @@ alias mvncisto='mvn clean install -DskipTests --offline'
 alias mvne='mvn eclipse:eclipse'
 alias mvnce='mvn clean eclipse:clean eclipse:eclipse'
 alias mvncv='mvn clean verify'
+alias mvncvst='mvn clean verify -DskipTests'
 alias mvnd='mvn deploy'
 alias mvncd='mvn clean deploy'
 alias mvnp='mvn package'
-- 
cgit v1.2.3-70-g09d2


From 283dcab64ffac23e40c80f7fa8bb2e8d06548c50 Mon Sep 17 00:00:00 2001
From: Bryan Banz <bryan.banz@firemon.com>
Date: Wed, 22 Oct 2014 12:07:31 -0500
Subject: mvn: colorize [DEBUG] statements in mvn-color

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

(limited to 'plugins')

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index edcd10a17..f4c46bfa1 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -35,7 +35,9 @@ mvn-color() {
   (
   # Filter mvn output using sed. Before filtering set the locale to C, so invalid characters won't break some sed implementations
   unset LANG
-  LC_CTYPE=C mvn "$@" | sed -e "s/\(\[INFO\]\)\(.*\)/${TEXT_BLUE}${BOLD}\1${RESET_FORMATTING}\2/g" \
+  LC_CTYPE=C mvn "$@" | sed \
+               -e "s/\(\[INFO\]\)\(.*\)/${TEXT_BLUE}${BOLD}\1${RESET_FORMATTING}\2/g" \
+               -e "s/\(\[DEBUG\]\)\(.*\)/${TEXT_RED}${BOLD}\1${RESET_FORMATTING}\2/g" \
                -e "s/\(\[INFO\]\ BUILD SUCCESSFUL\)/${BOLD}${TEXT_GREEN}\1${RESET_FORMATTING}/g" \
                -e "s/\(\[WARNING\]\)\(.*\)/${BOLD}${TEXT_YELLOW}\1${RESET_FORMATTING}\2/g" \
                -e "s/\(\[ERROR\]\)\(.*\)/${BOLD}${TEXT_RED}\1${RESET_FORMATTING}\2/g" \
-- 
cgit v1.2.3-70-g09d2


From 0a5e69b87eef354e96d8995b786082de7f67c082 Mon Sep 17 00:00:00 2001
From: Bryan Banz <bryan.banz@firemon.com>
Date: Wed, 22 Oct 2014 12:09:53 -0500
Subject: mvn: add alias to run maven from a project's subdirectory

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

(limited to 'plugins')

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index f4c46bfa1..7dd3c98dd 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -54,6 +54,9 @@ mvn-color() {
 # either use orignal mvn oder the mvn wrapper
 alias mvn="mvn-or-mvnw"
 
+# Run mvn against the pom found in a project's root directory (assumes a git repo)
+alias 'mvn!'='mvn -f $(git rev-parse --show-toplevel 2>/dev/null || echo ".")/pom.xml'
+
 # aliases
 alias mvncini='mvn clean initialize'
 alias mvncie='mvn clean install eclipse:eclipse'
-- 
cgit v1.2.3-70-g09d2


From 9afaa0c40625a8fa03531efeac6e364d15810e95 Mon Sep 17 00:00:00 2001
From: Bryan Banz <bryan.banz@firemon.com>
Date: Wed, 22 Oct 2014 12:15:29 -0500
Subject: mvn: add integration-test options to mvn autocomplete

---
 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 7dd3c98dd..28d49d73b 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -90,7 +90,10 @@ alias mvndocs='mvn dependency:resolve -Dclassifier=javadoc'
 function listMavenCompletions { 
     reply=(
         # common lifecycle
-        clean initialize process-resources compile process-test-resources test-compile test integration-test package verify install deploy site
+        clean initialize process-resources compile process-test-resources test-compile test package verify install deploy site
+
+        # integration testing
+        pre-integration-test integration-test
 
         # common plugins
         deploy failsafe install site surefire checkstyle javadoc jxr pmd ant antrun archetype assembly dependency enforcer gpg help release repository source eclipse idea jetty cargo jboss tomcat tomcat6 tomcat7 exec versions war ear ejb android scm buildnumber nexus repository sonar license hibernate3 liquibase flyway gwt
-- 
cgit v1.2.3-70-g09d2


From 5b569149f33a2eadd29f303a3e2f09d9e3c67c2e Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sun, 17 Feb 2019 17:34:31 +0100
Subject: mvn: fix formatting

---
 plugins/mvn/mvn.plugin.zsh | 440 ++++++++++++++++++++++-----------------------
 1 file changed, 218 insertions(+), 222 deletions(-)

(limited to 'plugins')

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index 28d49d73b..a6cd4edd1 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -22,34 +22,31 @@ RESET_FORMATTING=$(tput sgr0)
 
 # if found an executable ./mvnw file execute it otherwise execute orignal mvn
 mvn-or-mvnw() {
-	if [ -x ./mvnw ] ; then
-		echo "executing mvnw instead of mvn"		
-		./mvnw "$@";
+	if [ -x ./mvnw ]; then
+		echo "executing mvnw instead of mvn"
+		./mvnw "$@"
 	else
-		mvn "$@";
+		mvn "$@"
 	fi
 }
 
 # Wrapper function for Maven's mvn command.
 mvn-color() {
-  (
-  # Filter mvn output using sed. Before filtering set the locale to C, so invalid characters won't break some sed implementations
-  unset LANG
-  LC_CTYPE=C mvn "$@" | sed \
-               -e "s/\(\[INFO\]\)\(.*\)/${TEXT_BLUE}${BOLD}\1${RESET_FORMATTING}\2/g" \
-               -e "s/\(\[DEBUG\]\)\(.*\)/${TEXT_RED}${BOLD}\1${RESET_FORMATTING}\2/g" \
-               -e "s/\(\[INFO\]\ BUILD SUCCESSFUL\)/${BOLD}${TEXT_GREEN}\1${RESET_FORMATTING}/g" \
-               -e "s/\(\[WARNING\]\)\(.*\)/${BOLD}${TEXT_YELLOW}\1${RESET_FORMATTING}\2/g" \
-               -e "s/\(\[ERROR\]\)\(.*\)/${BOLD}${TEXT_RED}\1${RESET_FORMATTING}\2/g" \
-               -e "s/Tests run: \([^,]*\), Failures: \([^,]*\), Errors: \([^,]*\), Skipped: \([^,]*\)/${BOLD}${TEXT_GREEN}Tests run: \1${RESET_FORMATTING}, Failures: ${BOLD}${TEXT_RED}\2${RESET_FORMATTING}, Errors: ${BOLD}${TEXT_RED}\3${RESET_FORMATTING}, Skipped: ${BOLD}${TEXT_YELLOW}\4${RESET_FORMATTING}/g"
- 
-  # Make sure formatting is reset
-  echo -ne "${RESET_FORMATTING}"
-    )
-}
+	(
+	# Filter mvn output using sed. Before filtering set the locale to C, so invalid characters won't break some sed implementations
+	unset LANG
+	LC_CTYPE=C mvn "$@" | sed \
+		-e "s/\(\[INFO\]\)\(.*\)/${TEXT_BLUE}${BOLD}\1${RESET_FORMATTING}\2/g" \
+		-e "s/\(\[DEBUG\]\)\(.*\)/${TEXT_RED}${BOLD}\1${RESET_FORMATTING}\2/g" \
+		-e "s/\(\[INFO\]\ BUILD SUCCESSFUL\)/${BOLD}${TEXT_GREEN}\1${RESET_FORMATTING}/g" \
+		-e "s/\(\[WARNING\]\)\(.*\)/${BOLD}${TEXT_YELLOW}\1${RESET_FORMATTING}\2/g" \
+		-e "s/\(\[ERROR\]\)\(.*\)/${BOLD}${TEXT_RED}\1${RESET_FORMATTING}\2/g" \
+		-e "s/Tests run: \([^,]*\), Failures: \([^,]*\), Errors: \([^,]*\), Skipped: \([^,]*\)/${BOLD}${TEXT_GREEN}Tests run: \1${RESET_FORMATTING}, Failures: ${BOLD}${TEXT_RED}\2${RESET_FORMATTING}, Errors: ${BOLD}${TEXT_RED}\3${RESET_FORMATTING}, Skipped: ${BOLD}${TEXT_YELLOW}\4${RESET_FORMATTING}/g"
 
-# Override the mvn command with the colorized one.
-#alias mvn="mvn-color"
+	# Make sure formatting is reset
+	echo -ne "${RESET_FORMATTING}"
+	)
+}
 
 # either use orignal mvn oder the mvn wrapper
 alias mvn="mvn-or-mvnw"
@@ -77,7 +74,7 @@ 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 mvntc7='mvn tomcat7:run'
 alias mvntc='mvn tomcat:run'
 alias mvnjetty='mvn jetty:run'
 alias mvnboot='mvn spring-boot:run'
@@ -87,219 +84,218 @@ alias mvnsrc='mvn dependency:sources'
 alias mvndocs='mvn dependency:resolve -Dclassifier=javadoc'
 
 
-function listMavenCompletions { 
-    reply=(
-        # common lifecycle
-        clean initialize process-resources compile process-test-resources test-compile test package verify install deploy site
+function listMavenCompletions {
+	reply=(
+		# common lifecycle
+		clean initialize process-resources compile process-test-resources test-compile test package verify install deploy site
 
-        # integration testing
-        pre-integration-test integration-test
+		# integration testing
+		pre-integration-test integration-test
 
-        # common plugins
-        deploy failsafe install site surefire checkstyle javadoc jxr pmd ant antrun archetype assembly dependency enforcer gpg help release repository source eclipse idea jetty cargo jboss tomcat tomcat6 tomcat7 exec versions war ear ejb android scm buildnumber nexus repository sonar license hibernate3 liquibase flyway gwt
+		# common plugins
+		deploy failsafe install site surefire checkstyle javadoc jxr pmd ant antrun archetype assembly dependency enforcer gpg help release repository source eclipse idea jetty cargo jboss tomcat tomcat6 tomcat7 exec versions war ear ejb android scm buildnumber nexus repository sonar license hibernate3 liquibase flyway gwt
 
-        # deploy
-        deploy:deploy-file
-        # failsafe
-        failsafe:integration-test failsafe:verify
-        # install
-        install:install-file install:help
-        # site
-        site:site site:deploy site:run site:stage site:stage-deploy site:attach-descriptor site:jar site:effective-site
-        # surefire
-        surefire:test
+		# deploy
+		deploy:deploy-file
+		# failsafe
+		failsafe:integration-test failsafe:verify
+		# install
+		install:install-file install:help
+		# site
+		site:site site:deploy site:run site:stage site:stage-deploy site:attach-descriptor site:jar site:effective-site
+		# surefire
+		surefire:test
 
-        # checkstyle
-        checkstyle:checkstyle checkstyle:check checkstyle:checkstyle-aggregate
-        # javadoc
-        javadoc:javadoc javadoc:test-javadoc javadoc:javadoc-no-fork javadoc:test-javadoc-no-fork javadoc:aggregate javadoc:test-aggregate javadoc:jar javadoc:test-jar javadoc:aggregate-jar javadoc:test-aggregate-jar javadoc:fix javadoc:test-fix javadoc:resource-bundle javadoc:test-resource-bundle
-        # jxr
-        jxr:jxr jxr:aggregate jxr:test-jxr jxr:test-aggregate
-        # pmd
-        pmd:pmd pmd:cpd pmd:check pmd:cpd-check
+		# checkstyle
+		checkstyle:checkstyle checkstyle:check checkstyle:checkstyle-aggregate
+		# javadoc
+		javadoc:javadoc javadoc:test-javadoc javadoc:javadoc-no-fork javadoc:test-javadoc-no-fork javadoc:aggregate javadoc:test-aggregate javadoc:jar javadoc:test-jar javadoc:aggregate-jar javadoc:test-aggregate-jar javadoc:fix javadoc:test-fix javadoc:resource-bundle javadoc:test-resource-bundle
+		# jxr
+		jxr:jxr jxr:aggregate jxr:test-jxr jxr:test-aggregate
+		# pmd
+		pmd:pmd pmd:cpd pmd:check pmd:cpd-check
 
-        # ant
-        ant:ant ant:clean
-        # antrun
-        antrun:run
-        # archetype
-        archetype:generate archetype:create-from-project archetype:crawl
-        # assembly
-        assembly:single assembly:assembly
-        # dependency
-        dependency:analyze dependency:analyze-dep-mgt dependency:analyze-only dependency:analyze-report dependency:analyze-duplicate dependency:build-classpath dependency:copy dependency:copy-dependencies dependency:display-ancestors dependency:get dependency:go-offline dependency:list dependency:list-repositories dependency:properties dependency:purge-local-repository dependency:resolve dependency:resolve-plugins dependency:sources dependency:tree dependency:unpack dependency:unpack-dependencies
-        # enforcer
-        enforcer:enforce enforcer:display-info
-        # gpg
-        gpg:sign gpg:sign-and-deploy-file
-        # help
-        help:active-profiles help:all-profiles help:describe help:effective-pom help:effective-settings help:evaluate help:expressions help:system
-        # release
-        release:clean release:prepare release:prepare-with-pom release:rollback release:perform release:stage release:branch release:update-versions
-        # jgitflow
-        jgitflow:feature-start jgitflow:feature-finish jgitflow:release-start jgitflow:release-finish jgitflow:hotfix-start jgitflow:hotfix-finish jgitflow:build-number
-        # repository
-        repository:bundle-create repository:bundle-pack
-        # source
-        source:aggregate source:jar source:jar-no-fork source:test-jar source:test-jar-no-fork
+		# ant
+		ant:ant ant:clean
+		# antrun
+		antrun:run
+		# archetype
+		archetype:generate archetype:create-from-project archetype:crawl
+		# assembly
+		assembly:single assembly:assembly
+		# dependency
+		dependency:analyze dependency:analyze-dep-mgt dependency:analyze-only dependency:analyze-report dependency:analyze-duplicate dependency:build-classpath dependency:copy dependency:copy-dependencies dependency:display-ancestors dependency:get dependency:go-offline dependency:list dependency:list-repositories dependency:properties dependency:purge-local-repository dependency:resolve dependency:resolve-plugins dependency:sources dependency:tree dependency:unpack dependency:unpack-dependencies
+		# enforcer
+		enforcer:enforce enforcer:display-info
+		# gpg
+		gpg:sign gpg:sign-and-deploy-file
+		# help
+		help:active-profiles help:all-profiles help:describe help:effective-pom help:effective-settings help:evaluate help:expressions help:system
+		# release
+		release:clean release:prepare release:prepare-with-pom release:rollback release:perform release:stage release:branch release:update-versions
+		# jgitflow
+		jgitflow:feature-start jgitflow:feature-finish jgitflow:release-start jgitflow:release-finish jgitflow:hotfix-start jgitflow:hotfix-finish jgitflow:build-number
+		# repository
+		repository:bundle-create repository:bundle-pack
+		# source
+		source:aggregate source:jar source:jar-no-fork source:test-jar source:test-jar-no-fork
 
-        # eclipse
-        eclipse:clean eclipse:eclipse
-        # idea
-        idea:clean idea:idea
+		# eclipse
+		eclipse:clean eclipse:eclipse
+		# idea
+		idea:clean idea:idea
 
-        # jetty
-        jetty:run jetty:run-exploded
-        # cargo
-        cargo:start cargo:run cargo:stop cargo:deploy cargo:undeploy cargo:help
-        # jboss
-        jboss:start jboss:stop jboss:deploy jboss:undeploy jboss:redeploy
-        # tomcat
-        tomcat:start tomcat:stop tomcat:deploy tomcat:undeploy tomcat:redeploy
-        # tomcat6
-        tomcat6:run tomcat6:run-war tomcat6:run-war-only tomcat6:stop tomcat6:deploy tomcat6:undeploy
-        # tomcat7
-        tomcat7:run tomcat7:run-war tomcat7:run-war-only tomcat7:deploy
-        # tomee
-        tomee:run tomee:run-war tomee:run-war-only tomee:stop tomee:deploy tomee:undeploy	
-        # spring-boot
-        spring-boot:run spring-boot:repackage
-        # exec
-        exec:exec exec:java
-        # versions
-        versions:display-dependency-updates versions:display-plugin-updates versions:display-property-updates versions:update-parent versions:update-properties versions:update-child-modules versions:lock-snapshots versions:unlock-snapshots versions:resolve-ranges versions:set versions:use-releases versions:use-next-releases versions:use-latest-releases versions:use-next-snapshots versions:use-latest-snapshots versions:use-next-versions versions:use-latest-versions versions:commit versions:revert
-        # scm
-        scm:add scm:bootstrap scm:branch scm:changelog scm:check-local-modification scm:checkin scm:checkout scm:diff scm:edit scm:export scm:list scm:remove scm:status scm:tag scm:unedit scm:update scm:update-subprojects scm:validate
-        # buildnumber
-        buildnumber:create buildnumber:create-timestamp buildnumber:help buildnumber:hgchangeset
+		# jetty
+		jetty:run jetty:run-exploded
+		# cargo
+		cargo:start cargo:run cargo:stop cargo:deploy cargo:undeploy cargo:help
+		# jboss
+		jboss:start jboss:stop jboss:deploy jboss:undeploy jboss:redeploy
+		# tomcat
+		tomcat:start tomcat:stop tomcat:deploy tomcat:undeploy tomcat:redeploy
+		# tomcat6
+		tomcat6:run tomcat6:run-war tomcat6:run-war-only tomcat6:stop tomcat6:deploy tomcat6:undeploy
+		# tomcat7
+		tomcat7:run tomcat7:run-war tomcat7:run-war-only tomcat7:deploy
+		# tomee
+		tomee:run tomee:run-war tomee:run-war-only tomee:stop tomee:deploy tomee:undeploy
+		# spring-boot
+		spring-boot:run spring-boot:repackage
+		# exec
+		exec:exec exec:java
+		# versions
+		versions:display-dependency-updates versions:display-plugin-updates versions:display-property-updates versions:update-parent versions:update-properties versions:update-child-modules versions:lock-snapshots versions:unlock-snapshots versions:resolve-ranges versions:set versions:use-releases versions:use-next-releases versions:use-latest-releases versions:use-next-snapshots versions:use-latest-snapshots versions:use-next-versions versions:use-latest-versions versions:commit versions:revert
+		# scm
+		scm:add scm:bootstrap scm:branch scm:changelog scm:check-local-modification scm:checkin scm:checkout scm:diff scm:edit scm:export scm:list scm:remove scm:status scm:tag scm:unedit scm:update scm:update-subprojects scm:validate
+		# buildnumber
+		buildnumber:create buildnumber:create-timestamp buildnumber:help buildnumber:hgchangeset
 
-        # war
-        war:war war:exploded war:inplace war:manifest
-        # ear
-        ear:ear ear:generate-application-xml
-        # ejb
-        ejb:ejb
-        # android
-        android:apk android:apklib android:deploy android:deploy-dependencies android:dex android:emulator-start android:emulator-stop android:emulator-stop-all android:generate-sources android:help android:instrument android:manifest-update android:pull android:push android:redeploy android:run android:undeploy android:unpack android:version-update android:zipalign android:devices
-        # nexus
-        nexus:staging-list nexus:staging-close nexus:staging-drop nexus:staging-release nexus:staging-build-promotion nexus:staging-profiles-list nexus:settings-download
-        # repository
-        repository:bundle-create repository:bundle-pack repository:help
+		# war
+		war:war war:exploded war:inplace war:manifest
+		# ear
+		ear:ear ear:generate-application-xml
+		# ejb
+		ejb:ejb
+		# android
+		android:apk android:apklib android:deploy android:deploy-dependencies android:dex android:emulator-start android:emulator-stop android:emulator-stop-all android:generate-sources android:help android:instrument android:manifest-update android:pull android:push android:redeploy android:run android:undeploy android:unpack android:version-update android:zipalign android:devices
+		# nexus
+		nexus:staging-list nexus:staging-close nexus:staging-drop nexus:staging-release nexus:staging-build-promotion nexus:staging-profiles-list nexus:settings-download
+		# repository
+		repository:bundle-create repository:bundle-pack repository:help
 
-        # sonar
-        sonar:sonar
-        # license
-        license:format license:check
-        # hibernate3
-        hibernate3:hbm2ddl hibernate3:help
-        # liquibase
-        liquibase:changelogSync liquibase:changelogSyncSQL liquibase:clearCheckSums liquibase:dbDoc liquibase:diff liquibase:dropAll liquibase:help liquibase:migrate liquibase:listLocks liquibase:migrateSQL liquibase:releaseLocks liquibase:rollback liquibase:rollbackSQL liquibase:status liquibase:tag liquibase:update liquibase:updateSQL liquibase:updateTestingRollback
-        # flyway
-        flyway:clean flyway:history flyway:init flyway:migrate flyway:status flyway:validate
-        # gwt
-        gwt:browser gwt:clean gwt:compile gwt:compile-report gwt:css gwt:debug gwt:eclipse gwt:eclipseTest gwt:generateAsync gwt:help gwt:i18n gwt:mergewebxml gwt:resources gwt:run gwt:sdkInstall gwt:source-jar gwt:soyc gwt:test
-        # asciidoctor
-        asciidoctor:process-asciidoc asciidoctor:auto-refresh asciidoctor:http asciidoctor:zip
-        # compiler
-        compiler:compile compiler:testCompile
-        # resources
-        resources:resources resources:testResources resources:copy-resources
-        # verifier
-        verifier:verify
-        # jar
-        jar:jar jar:test-jar
-        # rar
-        rar:rar
-        # acr
-        acr:acr
-        # shade
-        shade:shade
-        # changelog
-        changelog:changelog changelog:dev-activity changelog:file-activity
-        # changes
-        changes:announcement-mail changes:announcement-generate changes:changes-check changes:changes-validate changes:changes-report changes:jira-report changes:trac-report changes:github-report
-        # doap
-        doap:generate
-        # docck
-        docck:check
-        # jdeps
-        jdeps:jdkinternals jdeps:test-jdkinternals
-        # linkcheck
-        linkcheck:linkcheck
-        # project-info-reports
-        project-info-reports:cim project-info-reports:dependencies project-info-reports:dependency-convergence project-info-reports:dependency-info project-info-reports:dependency-management project-info-reports:distribution-management project-info-reports:help project-info-reports:index project-info-reports:issue-tracking project-info-reports:license project-info-reports:mailing-list project-info-reports:modules project-info-reports:plugin-management project-info-reports:plugins project-info-reports:project-team project-info-reports:scm project-info-reports:summary
-        # surefire-report
-        surefire-report:failsafe-report-only surefire-report:report surefire-report:report-only
-        # invoker
-        invoker:install invoker:integration-test invoker:verify invoker:run
-        # jarsigner
-        jarsigner:sign jarsigner:verify
-        # patch
-        patch:apply
-        # pdf
-        pdf:pdf
-        # plugin
-        plugin:descriptor plugin:report plugin:updateRegistry plugin:addPluginArtifactMetadata plugin:helpmojo
-        # remote-resources
-        remote-resources:bundle remote-resources:process
-        # scm-publish
-        scm-publish:help scm-publish:publish-scm scm-publish:scmpublish
-        # stage
-        stage:copy
-        # toolchain
-        toolchain:toolchain
-        
-        # options
-        "-Dmaven.test.skip=true" -DskipTests -DskipITs -Dmaven.surefire.debug -DenableCiProfile "-Dpmd.skip=true" "-Dcheckstyle.skip=true" "-Dtycho.mode=maven" "-Dmaven.test.failure.ignore=true" "-DgroupId=" "-DartifactId=" "-Dversion=" "-Dpackaging=jar" "-Dfile="
+		# sonar
+		sonar:sonar
+		# license
+		license:format license:check
+		# hibernate3
+		hibernate3:hbm2ddl hibernate3:help
+		# liquibase
+		liquibase:changelogSync liquibase:changelogSyncSQL liquibase:clearCheckSums liquibase:dbDoc liquibase:diff liquibase:dropAll liquibase:help liquibase:migrate liquibase:listLocks liquibase:migrateSQL liquibase:releaseLocks liquibase:rollback liquibase:rollbackSQL liquibase:status liquibase:tag liquibase:update liquibase:updateSQL liquibase:updateTestingRollback
+		# flyway
+		flyway:clean flyway:history flyway:init flyway:migrate flyway:status flyway:validate
+		# gwt
+		gwt:browser gwt:clean gwt:compile gwt:compile-report gwt:css gwt:debug gwt:eclipse gwt:eclipseTest gwt:generateAsync gwt:help gwt:i18n gwt:mergewebxml gwt:resources gwt:run gwt:sdkInstall gwt:source-jar gwt:soyc gwt:test
+		# asciidoctor
+		asciidoctor:process-asciidoc asciidoctor:auto-refresh asciidoctor:http asciidoctor:zip
+		# compiler
+		compiler:compile compiler:testCompile
+		# resources
+		resources:resources resources:testResources resources:copy-resources
+		# verifier
+		verifier:verify
+		# jar
+		jar:jar jar:test-jar
+		# rar
+		rar:rar
+		# acr
+		acr:acr
+		# shade
+		shade:shade
+		# changelog
+		changelog:changelog changelog:dev-activity changelog:file-activity
+		# changes
+		changes:announcement-mail changes:announcement-generate changes:changes-check changes:changes-validate changes:changes-report changes:jira-report changes:trac-report changes:github-report
+		# doap
+		doap:generate
+		# docck
+		docck:check
+		# jdeps
+		jdeps:jdkinternals jdeps:test-jdkinternals
+		# linkcheck
+		linkcheck:linkcheck
+		# project-info-reports
+		project-info-reports:cim project-info-reports:dependencies project-info-reports:dependency-convergence project-info-reports:dependency-info project-info-reports:dependency-management project-info-reports:distribution-management project-info-reports:help project-info-reports:index project-info-reports:issue-tracking project-info-reports:license project-info-reports:mailing-list project-info-reports:modules project-info-reports:plugin-management project-info-reports:plugins project-info-reports:project-team project-info-reports:scm project-info-reports:summary
+		# surefire-report
+		surefire-report:failsafe-report-only surefire-report:report surefire-report:report-only
+		# invoker
+		invoker:install invoker:integration-test invoker:verify invoker:run
+		# jarsigner
+		jarsigner:sign jarsigner:verify
+		# patch
+		patch:apply
+		# pdf
+		pdf:pdf
+		# plugin
+		plugin:descriptor plugin:report plugin:updateRegistry plugin:addPluginArtifactMetadata plugin:helpmojo
+		# remote-resources
+		remote-resources:bundle remote-resources:process
+		# scm-publish
+		scm-publish:help scm-publish:publish-scm scm-publish:scmpublish
+		# stage
+		stage:copy
+		# toolchain
+		toolchain:toolchain
 
-        # arguments
-        -am --also-make
-        -amd --also-make-dependents-am
-        -B --batch-mode
-        -b --builder
-        -C --strict-checksums
-        -c --lax-checksums
-        -cpu --check-plugin-updates
-        -D --define
-        -e --errors
-        -emp --encrypt-master-password
-        -ep --encrypt-password
-        -f --file
-        -fae --fail-at-end
-        -ff --fail-fast
-        -fn --fail-never
-        -gs --global-settings
-        -gt --global-toolchains
-        -h --help
-        -l --log-file
-        -llr --legacy-local-repository
-        -N --non-recursive
-        -npr --no-plugin-registry
-        -npu --no-plugin-updates
-        -nsu --no-snapshot-updates
-        -o --offline
-        -P --activate-profiles
-        -pl --projects
-        -q --quiet
-        -rf --resume-from
-        -s --settings
-        -t --toolchains
-        -T --threads
-        -U --update-snapshots
-        -up --update-plugins
-        -v --version
-        -V --show-version
-        -X --debug
+		# options
+		"-Dmaven.test.skip=true" -DskipTests -DskipITs -Dmaven.surefire.debug -DenableCiProfile "-Dpmd.skip=true" "-Dcheckstyle.skip=true" "-Dtycho.mode=maven" "-Dmaven.test.failure.ignore=true" "-DgroupId=" "-DartifactId=" "-Dversion=" "-Dpackaging=jar" "-Dfile="
 
-        cli:execute cli:execute-phase 
-        archetype:generate generate-sources 
-        cobertura:cobertura
-        -Dtest=$(if [ -d ./src/test/java ] ; then find ./src/test/java -type f -name '*.java' | grep -v svn | sed 's?.*/\([^/]*\)\..*?-Dtest=\1?' ; fi)
-        -Dit.test=$(if [ -d ./src/test/java ] ; then find ./src/test/java -type f -name '*.java' | grep -v svn | sed 's?.*/\([^/]*\)\..*?-Dit.test=\1?' ; fi)
-    ); 
+		# arguments
+		-am --also-make
+		-amd --also-make-dependents-am
+		-B --batch-mode
+		-b --builder
+		-C --strict-checksums
+		-c --lax-checksums
+		-cpu --check-plugin-updates
+		-D --define
+		-e --errors
+		-emp --encrypt-master-password
+		-ep --encrypt-password
+		-f --file
+		-fae --fail-at-end
+		-ff --fail-fast
+		-fn --fail-never
+		-gs --global-settings
+		-gt --global-toolchains
+		-h --help
+		-l --log-file
+		-llr --legacy-local-repository
+		-N --non-recursive
+		-npr --no-plugin-registry
+		-npu --no-plugin-updates
+		-nsu --no-snapshot-updates
+		-o --offline
+		-P --activate-profiles
+		-pl --projects
+		-q --quiet
+		-rf --resume-from
+		-s --settings
+		-t --toolchains
+		-T --threads
+		-U --update-snapshots
+		-up --update-plugins
+		-v --version
+		-V --show-version
+		-X --debug
+
+		cli:execute cli:execute-phase
+		archetype:generate generate-sources
+		cobertura:cobertura
+		-Dtest=$(if [ -d ./src/test/java ] ; then find ./src/test/java -type f -name '*.java' | grep -v svn | sed 's?.*/\([^/]*\)\..*?-Dtest=\1?' ; fi)
+		-Dit.test=$(if [ -d ./src/test/java ] ; then find ./src/test/java -type f -name '*.java' | grep -v svn | sed 's?.*/\([^/]*\)\..*?-Dit.test=\1?' ; fi)
+	)
 }
 
 compctl -K listMavenCompletions mvn mvnw
 compctl -K listMavenCompletions mvn-color
 compctl -K listMavenCompletions mvn-or-mvnw
-
-- 
cgit v1.2.3-70-g09d2


From b767976586a4be87a8e57bbe7feddab9fda097b6 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sun, 17 Feb 2019 17:35:57 +0100
Subject: mvn: use echoti instead of tput

Avoids forking to tput and some systems don't have tput
---
 plugins/mvn/mvn.plugin.zsh | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'plugins')

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index a6cd4edd1..b557c23e8 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -1,24 +1,24 @@
 # mvn-color based on https://gist.github.com/1027800
-BOLD=$(tput bold)
-UNDERLINE_ON=$(tput smul)
-UNDERLINE_OFF=$(tput rmul)
-TEXT_BLACK=$(tput setaf 0)
-TEXT_RED=$(tput setaf 1)
-TEXT_GREEN=$(tput setaf 2)
-TEXT_YELLOW=$(tput setaf 3)
-TEXT_BLUE=$(tput setaf 4)
-TEXT_MAGENTA=$(tput setaf 5)
-TEXT_CYAN=$(tput setaf 6)
-TEXT_WHITE=$(tput setaf 7)
-BACKGROUND_BLACK=$(tput setab 0)
-BACKGROUND_RED=$(tput setab 1)
-BACKGROUND_GREEN=$(tput setab 2)
-BACKGROUND_YELLOW=$(tput setab 3)
-BACKGROUND_BLUE=$(tput setab 4)
-BACKGROUND_MAGENTA=$(tput setab 5)
-BACKGROUND_CYAN=$(tput setab 6)
-BACKGROUND_WHITE=$(tput setab 7)
-RESET_FORMATTING=$(tput sgr0)
+BOLD=$(echoti bold)
+UNDERLINE_ON=$(echoti smul)
+UNDERLINE_OFF=$(echoti rmul)
+TEXT_BLACK=$(echoti setaf 0)
+TEXT_RED=$(echoti setaf 1)
+TEXT_GREEN=$(echoti setaf 2)
+TEXT_YELLOW=$(echoti setaf 3)
+TEXT_BLUE=$(echoti setaf 4)
+TEXT_MAGENTA=$(echoti setaf 5)
+TEXT_CYAN=$(echoti setaf 6)
+TEXT_WHITE=$(echoti setaf 7)
+BACKGROUND_BLACK=$(echoti setab 0)
+BACKGROUND_RED=$(echoti setab 1)
+BACKGROUND_GREEN=$(echoti setab 2)
+BACKGROUND_YELLOW=$(echoti setab 3)
+BACKGROUND_BLUE=$(echoti setab 4)
+BACKGROUND_MAGENTA=$(echoti setab 5)
+BACKGROUND_CYAN=$(echoti setab 6)
+BACKGROUND_WHITE=$(echoti setab 7)
+RESET_FORMATTING=$(echoti sgr0)
 
 # if found an executable ./mvnw file execute it otherwise execute orignal mvn
 mvn-or-mvnw() {
-- 
cgit v1.2.3-70-g09d2


From c636e0933a63c85b3c6cef251e1c91d4a8bdb83d Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sun, 17 Feb 2019 18:28:24 +0100
Subject: mvn: avoid mvn-or-mvnw function calling itself when mvn is aliased to
 it

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

(limited to 'plugins')

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index b557c23e8..1bc678b74 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -26,7 +26,7 @@ mvn-or-mvnw() {
 		echo "executing mvnw instead of mvn"
 		./mvnw "$@"
 	else
-		mvn "$@"
+		command mvn "$@"
 	fi
 }
 
-- 
cgit v1.2.3-70-g09d2


From 006b88209872f5f26c57fbb8c0e5d17d5e1ddd9d Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sun, 17 Feb 2019 18:30:38 +0100
Subject: mvn: clean up mvn-color function

---
 plugins/mvn/mvn.plugin.zsh | 32 +++++++++-----------------------
 1 file changed, 9 insertions(+), 23 deletions(-)

(limited to 'plugins')

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index 1bc678b74..7e31da46a 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -1,25 +1,3 @@
-# mvn-color based on https://gist.github.com/1027800
-BOLD=$(echoti bold)
-UNDERLINE_ON=$(echoti smul)
-UNDERLINE_OFF=$(echoti rmul)
-TEXT_BLACK=$(echoti setaf 0)
-TEXT_RED=$(echoti setaf 1)
-TEXT_GREEN=$(echoti setaf 2)
-TEXT_YELLOW=$(echoti setaf 3)
-TEXT_BLUE=$(echoti setaf 4)
-TEXT_MAGENTA=$(echoti setaf 5)
-TEXT_CYAN=$(echoti setaf 6)
-TEXT_WHITE=$(echoti setaf 7)
-BACKGROUND_BLACK=$(echoti setab 0)
-BACKGROUND_RED=$(echoti setab 1)
-BACKGROUND_GREEN=$(echoti setab 2)
-BACKGROUND_YELLOW=$(echoti setab 3)
-BACKGROUND_BLUE=$(echoti setab 4)
-BACKGROUND_MAGENTA=$(echoti setab 5)
-BACKGROUND_CYAN=$(echoti setab 6)
-BACKGROUND_WHITE=$(echoti setab 7)
-RESET_FORMATTING=$(echoti sgr0)
-
 # if found an executable ./mvnw file execute it otherwise execute orignal mvn
 mvn-or-mvnw() {
 	if [ -x ./mvnw ]; then
@@ -31,13 +9,21 @@ mvn-or-mvnw() {
 }
 
 # Wrapper function for Maven's mvn command.
+# based on https://gist.github.com/1027800
 mvn-color() {
+	local BOLD=$(echoti bold)
+	local TEXT_RED=$(echoti setaf 1)
+	local TEXT_GREEN=$(echoti setaf 2)
+	local TEXT_YELLOW=$(echoti setaf 3)
+	local TEXT_BLUE=$(echoti setaf 4)
+	local TEXT_WHITE=$(echoti setaf 7)
+	local RESET_FORMATTING=$(echoti sgr0)
 	(
 	# Filter mvn output using sed. Before filtering set the locale to C, so invalid characters won't break some sed implementations
 	unset LANG
 	LC_CTYPE=C mvn "$@" | sed \
 		-e "s/\(\[INFO\]\)\(.*\)/${TEXT_BLUE}${BOLD}\1${RESET_FORMATTING}\2/g" \
-		-e "s/\(\[DEBUG\]\)\(.*\)/${TEXT_RED}${BOLD}\1${RESET_FORMATTING}\2/g" \
+		-e "s/\(\[DEBUG\]\)\(.*\)/${TEXT_WHITE}${BOLD}\1${RESET_FORMATTING}\2/g" \
 		-e "s/\(\[INFO\]\ BUILD SUCCESSFUL\)/${BOLD}${TEXT_GREEN}\1${RESET_FORMATTING}/g" \
 		-e "s/\(\[WARNING\]\)\(.*\)/${BOLD}${TEXT_YELLOW}\1${RESET_FORMATTING}\2/g" \
 		-e "s/\(\[ERROR\]\)\(.*\)/${BOLD}${TEXT_RED}\1${RESET_FORMATTING}\2/g" \
-- 
cgit v1.2.3-70-g09d2


From d0a0421e10e222f76c30cdaa04fed2f4911a5272 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sun, 17 Feb 2019 18:50:46 +0100
Subject: mvn: sort aliases and improve comments and README

---
 plugins/mvn/README.md      | 45 ++++++++++++++++++++++++++++++++-------------
 plugins/mvn/mvn.plugin.zsh | 43 +++++++++++++++++++++----------------------
 2 files changed, 53 insertions(+), 35 deletions(-)

(limited to 'plugins')

diff --git a/plugins/mvn/README.md b/plugins/mvn/README.md
index be6bd6db3..3f08c56d8 100644
--- a/plugins/mvn/README.md
+++ b/plugins/mvn/README.md
@@ -10,26 +10,45 @@ plugins=(... mvn)
 
 ## Aliases
 
+The plugin aliases mvn to a either calls `mvnw` ([Maven Wrapper](https://github.com/takari/maven-wrapper))
+if it's found, or the mvn command otherwise.
+
 | Alias                | Command                                         |
 |:---------------------|:------------------------------------------------|
-| `mvncie`             | `mvn clean install eclipse:eclipse`             |
+| `mvn!`               | `mvn -f <root>/pom.xml`                         |
+| `mvnag`              | `mvn archetype:generate`                        |
+| `mvnboot`            | `mvn spring-boot:run`                           |
+| `mvnc`               | `mvn clean`                                     |
+| `mvncd`              | `mvn clean deploy`                              |
+| `mvnce`              | `mvn clean eclipse:clean eclipse:eclipse`       |
 | `mvnci`              | `mvn clean install`                             |
+| `mvncie`             | `mvn clean install eclipse:eclipse`             |
+| `mvncini`            | `mvn clean initialize`                          |
 | `mvncist`            | `mvn clean install -DskipTests`                 |
 | `mvncisto`           | `mvn clean install -DskipTests --offline`       |
-| `mvne`               | `mvn eclipse:eclipse`                           |
-| `mvncv`              | `mvn clean verify`                              |
-| `mvnd`               | `mvn deploy`                                    |
-| `mvncd`              | `mvn clean deploy`                              |
-| `mvnp`               | `mvn package`                                   |
-| `mvnc`               | `mvn clean`                                     |
 | `mvncom`             | `mvn compile`                                   |
+| `mvncp`              | `mvn clean package`                             |
 | `mvnct`              | `mvn clean test`                                |
-| `mvnt`               | `mvn test`                                      |
-| `mvnag`              | `mvn archetype:generate`                        |
-| `mvn-updates`        | `mvn versions:display-dependency-updates`       |
-| `mvntc7`             | `mvn tomcat7:run`                               |
-| `mvnjetty`           | `mvn jetty:run`                                 |
+| `mvncv`              | `mvn clean verify`                              |
+| `mvncvst`            | `mvn clean verify -DskipTests`                  |
+| `mvnd`               | `mvn deploy`                                    |
+| `mvndocs`            | `mvn dependency:resolve -Dclassifier=javadoc`   |
 | `mvndt`              | `mvn dependency:tree`                           |
+| `mvne`               | `mvn eclipse:eclipse`                           |
+| `mvnjetty`           | `mvn jetty:run`                                 |
+| `mvnp`               | `mvn package`                                   |
 | `mvns`               | `mvn site`                                      |
 | `mvnsrc`             | `mvn dependency:sources`                        |
-| `mvndocs`            | `mvn dependency:resolve -Dclassifier=javadoc`   |
+| `mvnt`               | `mvn test`                                      |
+| `mvntc`              | `mvn tomcat:run`                                |
+| `mvntc7`             | `mvn tomcat7:run`                               |
+| `mvn-updates`        | `mvn versions:display-dependency-updates`       |
+
+## mvn-color
+
+It's a function that wraps the mvn command to colorize it's output. Since Maven 3.5.0
+the mvn command adds colored output, so this function will be soon removed from the
+plugin.
+
+It also has a bug where it won't print when mvn prompts for user input, _e.g._ when
+using `archetype:generate`. See [#5052](https://github.com/robbyrussell/oh-my-zsh/issues/5052).
diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index 7e31da46a..66ea548ad 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -1,4 +1,4 @@
-# if found an executable ./mvnw file execute it otherwise execute orignal mvn
+# Calls ./mvnw if found, otherwise execute the original mvn
 mvn-or-mvnw() {
 	if [ -x ./mvnw ]; then
 		echo "executing mvnw instead of mvn"
@@ -8,8 +8,7 @@ mvn-or-mvnw() {
 	fi
 }
 
-# Wrapper function for Maven's mvn command.
-# based on https://gist.github.com/1027800
+# Wrapper function for Maven's mvn command. Based on https://gist.github.com/1027800
 mvn-color() {
 	local BOLD=$(echoti bold)
 	local TEXT_RED=$(echoti setaf 1)
@@ -34,40 +33,40 @@ mvn-color() {
 	)
 }
 
-# either use orignal mvn oder the mvn wrapper
+# either use orignal mvn or the mvn wrapper
 alias mvn="mvn-or-mvnw"
 
 # Run mvn against the pom found in a project's root directory (assumes a git repo)
 alias 'mvn!'='mvn -f $(git rev-parse --show-toplevel 2>/dev/null || echo ".")/pom.xml'
 
 # aliases
-alias mvncini='mvn clean initialize'
-alias mvncie='mvn clean install eclipse:eclipse'
+alias mvnag='mvn archetype:generate'
+alias mvnboot='mvn spring-boot:run'
+alias mvnc='mvn clean'
+alias mvncd='mvn clean deploy'
+alias mvnce='mvn clean eclipse:clean eclipse:eclipse'
 alias mvnci='mvn clean install'
-alias mvncp='mvn clean package'
+alias mvncie='mvn clean install eclipse:eclipse'
+alias mvncini='mvn clean initialize'
 alias mvncist='mvn clean install -DskipTests'
 alias mvncisto='mvn clean install -DskipTests --offline'
-alias mvne='mvn eclipse:eclipse'
-alias mvnce='mvn clean eclipse:clean eclipse:eclipse'
+alias mvncom='mvn compile'
+alias mvncp='mvn clean package'
+alias mvnct='mvn clean test'
 alias mvncv='mvn clean verify'
 alias mvncvst='mvn clean verify -DskipTests'
 alias mvnd='mvn deploy'
-alias mvncd='mvn clean 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 mvnboot='mvn spring-boot:run'
+alias mvndocs='mvn dependency:resolve -Dclassifier=javadoc'
 alias mvndt='mvn dependency:tree'
+alias mvne='mvn eclipse:eclipse'
+alias mvnjetty='mvn jetty:run'
+alias mvnp='mvn package'
 alias mvns='mvn site'
 alias mvnsrc='mvn dependency:sources'
-alias mvndocs='mvn dependency:resolve -Dclassifier=javadoc'
+alias mvnt='mvn test'
+alias mvntc='mvn tomcat:run'
+alias mvntc7='mvn tomcat7:run'
+alias mvn-updates='mvn versions:display-dependency-updates'
 
 
 function listMavenCompletions {
-- 
cgit v1.2.3-70-g09d2


From fff756069f678ceda0b7c760b843c09bbc2bc72d Mon Sep 17 00:00:00 2001
From: kubamarchwicki <kuba@marchwicki.pl>
Date: Sun, 1 Jun 2014 21:01:01 +0200
Subject: mvn: add dynamic profile support to mvn completion

* Maven profiles for current pom.xml file
* Maven profiles for pom hierarchy
* Ommiting comments in profiles
---
 plugins/mvn/mvn.plugin.zsh | 63 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)

(limited to 'plugins')

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index 66ea548ad..71bba454c 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -68,8 +68,66 @@ alias mvntc='mvn tomcat:run'
 alias mvntc7='mvn tomcat7:run'
 alias mvn-updates='mvn versions:display-dependency-updates'
 
+#realpath replacement for iOS - not always present
+function _realpath {
+	if [[ -f "$1" ]]
+	then
+		# file *must* exist
+		if cd "$(echo "${1%/*}")" &>/dev/null
+		then
+			# file *may* not be local
+			# exception is ./file.ext
+			# try 'cd .; cd -;' *works!*
+			local tmppwd="$PWD"
+			cd - &>/dev/null
+		else
+			# file *must* be local
+			local tmppwd="$PWD"
+		fi
+	else
+		# file *cannot* exist
+		return 1 # failure
+	fi
+
+	# reassemble realpath
+	echo "$tmppwd"/"${1##*/}"
+	return 1 #success
+}
+
+function __pom_hierarchy {
+	local file=`_realpath "pom.xml"`
+	POM_HIERARCHY+=("~/.m2/settings.xml")
+	POM_HIERARCHY+=("$file")
+	while [ -n "$file" ] && grep -q "<parent>" $file; do
+		##look for a new relativePath for parent pom.xml
+		local new_file=`grep -e "<relativePath>.*</relativePath>" $file | sed 's/.*<relativePath>//' | sed 's/<\/relativePath>.*//g'`
+
+		## <parent> is present but not defined. Asume ../pom.xml
+		if [ -z "$new_file" ]; then
+			new_file="../pom.xml"
+		fi
+
+		## if file exists continue else break
+		new_pom=`_realpath "${file%/*}/$new_file"`
+		if [ -n "$new_pom" ]; then
+			file=$new_pom
+		else
+			break
+		fi
+		POM_HIERARCHY+=("$file")
+	done
+}
 
 function listMavenCompletions {
+	POM_HIERARCHY=()
+	__pom_hierarchy
+
+	profiles=()
+	#current pom profiles
+	for item in ${POM_HIERARCHY[*]}; do
+		profiles=($profiles `[ -e $item ] && cat $item | sed 's/<!--.*-->//' | sed '/<!--/,/-->/d' | grep -e "<profile>" -A 1 | grep -e "<id>.*</id>" | sed 's?.*<id>\(.*\)<\/id>.*?-P\1?'`)
+	done
+
 	reply=(
 		# common lifecycle
 		clean initialize process-resources compile process-test-resources test-compile test package verify install deploy site
@@ -278,7 +336,12 @@ function listMavenCompletions {
 		cobertura:cobertura
 		-Dtest=$(if [ -d ./src/test/java ] ; then find ./src/test/java -type f -name '*.java' | grep -v svn | sed 's?.*/\([^/]*\)\..*?-Dtest=\1?' ; fi)
 		-Dit.test=$(if [ -d ./src/test/java ] ; then find ./src/test/java -type f -name '*.java' | grep -v svn | sed 's?.*/\([^/]*\)\..*?-Dit.test=\1?' ; fi)
+
+		$profiles
 	)
+
+	unset POM_HIERARCHY
+	unset profiles
 }
 
 compctl -K listMavenCompletions mvn mvnw
-- 
cgit v1.2.3-70-g09d2


From f4b2e460c77b79f99831cd048eb0004059c96370 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sun, 17 Feb 2019 20:28:32 +0100
Subject: mvn: fix and cleanup dynamic profiles logic

---
 plugins/mvn/mvn.plugin.zsh | 78 ++++++++++++++++------------------------------
 1 file changed, 27 insertions(+), 51 deletions(-)

(limited to 'plugins')

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index 71bba454c..01aef814d 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -68,64 +68,43 @@ alias mvntc='mvn tomcat:run'
 alias mvntc7='mvn tomcat7:run'
 alias mvn-updates='mvn versions:display-dependency-updates'
 
-#realpath replacement for iOS - not always present
-function _realpath {
-	if [[ -f "$1" ]]
-	then
-		# file *must* exist
-		if cd "$(echo "${1%/*}")" &>/dev/null
-		then
-			# file *may* not be local
-			# exception is ./file.ext
-			# try 'cd .; cd -;' *works!*
-			local tmppwd="$PWD"
-			cd - &>/dev/null
-		else
-			# file *must* be local
-			local tmppwd="$PWD"
-		fi
-	else
-		# file *cannot* exist
-		return 1 # failure
-	fi
 
-	# reassemble realpath
-	echo "$tmppwd"/"${1##*/}"
-	return 1 #success
-}
+function listMavenCompletions {
+	local file new_file
+	local -a profiles POM_FILES
+
+	# Root POM
+	POM_FILES=(~/.m2/settings.xml)
 
-function __pom_hierarchy {
-	local file=`_realpath "pom.xml"`
-	POM_HIERARCHY+=("~/.m2/settings.xml")
-	POM_HIERARCHY+=("$file")
-	while [ -n "$file" ] && grep -q "<parent>" $file; do
-		##look for a new relativePath for parent pom.xml
-		local new_file=`grep -e "<relativePath>.*</relativePath>" $file | sed 's/.*<relativePath>//' | sed 's/<\/relativePath>.*//g'`
+	# POM in the current directory
+	if [[ -f pom.xml ]]; then
+		local file=pom.xml
+		POM_FILES+=("${file:A}")
+	fi
 
-		## <parent> is present but not defined. Asume ../pom.xml
-		if [ -z "$new_file" ]; then
+	# Look for POM files in parent directories
+	while [[ -n "$file" ]] && grep -q "<parent>" "$file"; do
+		# look for a new relativePath for parent pom.xml
+		new_file=$(grep -e "<relativePath>.*</relativePath>" "$file" | sed -e 's/.*<relativePath>\(.*\)<\/relativePath>.*/\1/')
+
+		# if <parent> is present but not defined, assume ../pom.xml
+		if [[ -z "$new_file" ]]; then
 			new_file="../pom.xml"
 		fi
 
-		## if file exists continue else break
-		new_pom=`_realpath "${file%/*}/$new_file"`
-		if [ -n "$new_pom" ]; then
-			file=$new_pom
-		else
+		# if file doesn't exist break
+		file="${file:h}/${new_file}"
+		if ! [[ -e "$file" ]]; then
 			break
 		fi
-		POM_HIERARCHY+=("$file")
-	done
-}
 
-function listMavenCompletions {
-	POM_HIERARCHY=()
-	__pom_hierarchy
+		POM_FILES+=("${file:A}")
+	done
 
-	profiles=()
-	#current pom profiles
-	for item in ${POM_HIERARCHY[*]}; do
-		profiles=($profiles `[ -e $item ] && cat $item | sed 's/<!--.*-->//' | sed '/<!--/,/-->/d' | grep -e "<profile>" -A 1 | grep -e "<id>.*</id>" | sed 's?.*<id>\(.*\)<\/id>.*?-P\1?'`)
+	# Get profiles from found files
+	for file in $POM_FILES; do
+		[[ -e $file ]] || continue
+		profiles+=($(sed 's/<!--.*-->//' "$file" | sed '/<!--/,/-->/d' | grep -e "<profile>" -A 1 | grep -e "<id>.*</id>" | sed 's?.*<id>\(.*\)<\/id>.*?-P\1?'))
 	done
 
 	reply=(
@@ -339,9 +318,6 @@ function listMavenCompletions {
 
 		$profiles
 	)
-
-	unset POM_HIERARCHY
-	unset profiles
 }
 
 compctl -K listMavenCompletions mvn mvnw
-- 
cgit v1.2.3-70-g09d2


From 0e647904ffdd19c697e1c6ab602f65377cb186fe Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sun, 17 Feb 2019 20:48:13 +0100
Subject: mvn: update documentation

---
 plugins/mvn/README.md | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'plugins')

diff --git a/plugins/mvn/README.md b/plugins/mvn/README.md
index 3f08c56d8..88f5be8ba 100644
--- a/plugins/mvn/README.md
+++ b/plugins/mvn/README.md
@@ -1,7 +1,7 @@
-## Introduction
+# mvn plugin
 
-The [mvn plugin](https://github.com/robbyrussell/oh-my-zsh/tree/master/plugins/mvn) provides many
-[useful aliases](#aliases) as well as completion for the `mvn` command.
+The mvn plugin provides many [useful aliases](#aliases) as well as completion for
+the [Apache Maven](https://maven.apache.org/) command (`mvn`).
 
 Enable it by adding `mvn` to the plugins array in your zshrc file:
 ```zsh
@@ -10,7 +10,7 @@ plugins=(... mvn)
 
 ## Aliases
 
-The plugin aliases mvn to a either calls `mvnw` ([Maven Wrapper](https://github.com/takari/maven-wrapper))
+The plugin aliases mvn to a function that calls `mvnw` (the [Maven Wrapper](https://github.com/takari/maven-wrapper))
 if it's found, or the mvn command otherwise.
 
 | Alias                | Command                                         |
@@ -46,9 +46,13 @@ if it's found, or the mvn command otherwise.
 
 ## mvn-color
 
-It's a function that wraps the mvn command to colorize it's output. Since Maven 3.5.0
-the mvn command adds colored output, so this function will be soon removed from the
-plugin.
+It's a function that wraps the mvn command to colorize it's output. You can use it in place
+of the `mvn` command. For example: instead of `mvn test`, use `mvn-color test`.
 
-It also has a bug where it won't print when mvn prompts for user input, _e.g._ when
-using `archetype:generate`. See [#5052](https://github.com/robbyrussell/oh-my-zsh/issues/5052).
+Since [Maven 3.5.0](https://maven.apache.org/docs/3.5.0/release-notes.html) the mvn command
+has colored output, so this function will be soon removed from the plugin.
+
+### Known bugs
+
+It has a bug where it will swallow mvn prompts for user input, _e.g._ when using
+`archetype:generate`. See [#5052](https://github.com/robbyrussell/oh-my-zsh/issues/5052).
-- 
cgit v1.2.3-70-g09d2


From dfd1b4f8dfe977016bfe0ecd0fc360a526252827 Mon Sep 17 00:00:00 2001
From: Muhannad Fakhouri <mohand1993@hotmail.com>
Date: Sun, 17 Feb 2019 23:10:17 +0100
Subject: adb: improve `adb -s` completion to show helpful info (#7532)

Currently it shows for example the following:

  DEVICE_ID  -- transport_id:2

which doesn't really ease device selection. I've adapted the awk script to print
device name with it's model name, see the example below:

  DEVICE_ID  -- Pixel_3(blueline)
---
 plugins/adb/_adb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/adb/_adb b/plugins/adb/_adb
index e3c20d751..78c457746 100644
--- a/plugins/adb/_adb
+++ b/plugins/adb/_adb
@@ -49,7 +49,12 @@ _arguments \
 case "$state" in
 	specify_device)
 	_values -C 'devices' ${$(adb devices -l|awk 'NR>1&& $1 \
-		{sub(/ +/," ",$0);gsub(":","\\:",$1); printf "%s[%s] ",$1, $NF}'):-""}
+		{sub(/ +/," ",$0); \
+		gsub(":","\\:",$1); \
+		for(i=1;i<=NF;i++) {
+			if($i ~ /model:/) { split($i,m,":") } \
+			else if($i ~ /product:/) { split($i,p,":") } } \
+		printf "%s[%s(%s)] ",$1, p[2], m[2]}'):-""}
 	return
 	;;
 esac
@@ -59,4 +64,4 @@ if (( CURRENT == 1 )); then
 	return
 fi
 
-_files
\ No newline at end of file
+_files
-- 
cgit v1.2.3-70-g09d2


From ca1123a044e7e09dd8376868b372c541aedcd82d Mon Sep 17 00:00:00 2001
From: Thomas Hutterer <thutterer@suse.de>
Date: Wed, 20 Feb 2019 16:59:57 +0100
Subject: Fix "hurt sme" typo

Just found this typo while browsing through the `plugins` folder ... and it "hurt sme" :hurtrealbad:
---
 plugins/fancy-ctrl-z/README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'plugins')

diff --git a/plugins/fancy-ctrl-z/README.md b/plugins/fancy-ctrl-z/README.md
index a7670fa2c..f1b1dfa5c 100644
--- a/plugins/fancy-ctrl-z/README.md
+++ b/plugins/fancy-ctrl-z/README.md
@@ -1,10 +1,10 @@
 # Use Ctrl-Z to switch back to Vim
 
-I frequently need to execute random command in my shell. To achieve it I pause 
+I frequently need to execute random commands in my shell. To achieve it I pause 
 Vim by pressing Ctrl-z, type command and press fg<Enter> to switch back to Vim.
-The fg part really hurt sme. I just wanted to hit Ctrl-z once again to get back 
+The fg part really hurts me. I just wanted to hit Ctrl-z once again to get back 
 to Vim. I could not find a solution, so I developed one on my own that 
-works wonderfully with ZSH
+works wonderfully with ZSH.
 
 Source: http://sheerun.net/2014/03/21/how-to-boost-your-vim-productivity/
 
-- 
cgit v1.2.3-70-g09d2


From 243c46b7cd85c3578bbba8501fae62befc25f378 Mon Sep 17 00:00:00 2001
From: Deepankumar <deepan0433@gmail.com>
Date: Sat, 23 Feb 2019 09:00:05 +0100
Subject: fixed aplay conflict

---
 plugins/ansible/README.md          | 3 +--
 plugins/ansible/ansible.plugin.zsh | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'plugins')

diff --git a/plugins/ansible/README.md b/plugins/ansible/README.md
index 38bc13775..e0e6a19bb 100644
--- a/plugins/ansible/README.md
+++ b/plugins/ansible/README.md
@@ -19,9 +19,8 @@ plugins=(... ansible)
 | `a`                                        | command `ansible`                                                   |
 | `aconf`                                    | command `ansible-config`                                            |
 | `acon`                                     | command `ansible-console`                                           |
-| `aconn`                                    | command `ansible-connection`                                        |
 | `ainv`                                     | command `ansible-inventory`                                         |
-| `aplay`                                    | command `ansible-playbook`                                          |
+| `aplaybook`                                | command `ansible-playbook`                                          |
 | `ainv`                                     | command `ansible-inventory`                                         |
 | `adoc`                                     | command `ansible-doc`                                               |
 | `agal`                                     | command `ansible-galaxy`                                            |
diff --git a/plugins/ansible/ansible.plugin.zsh b/plugins/ansible/ansible.plugin.zsh
index 0e7aff528..f68ff23a5 100644
--- a/plugins/ansible/ansible.plugin.zsh
+++ b/plugins/ansible/ansible.plugin.zsh
@@ -18,10 +18,9 @@ function ansible-role-init(){
 alias a='ansible '
 alias aconf='ansible-config '
 alias acon='ansible-console '
-alias aconn='ansible-connection '
 alias aver='ansible-version'
 alias arinit='ansible-role-init'
-alias aplay='ansible-playbook '
+alias aplaybook='ansible-playbook '
 alias ainv='ansible-inventory '
 alias adoc='ansible-doc '
 alias agal='ansible-galaxy '
-- 
cgit v1.2.3-70-g09d2


From 25d0a10cda82edfa6cf5e1611e018a714ecbfb3e Mon Sep 17 00:00:00 2001
From: akinnane <akinnane@yahoo.co.uk>
Date: Mon, 25 Feb 2019 13:37:41 +0000
Subject: Revert "Fix emacs client terminal" (#7597)

Reverts robbyrussell/oh-my-zsh#5714
---
 plugins/emacs/emacs.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/emacs/emacs.plugin.zsh b/plugins/emacs/emacs.plugin.zsh
index 934c8d673..db0ab13af 100644
--- a/plugins/emacs/emacs.plugin.zsh
+++ b/plugins/emacs/emacs.plugin.zsh
@@ -16,7 +16,7 @@ if "$ZSH/tools/require_tool.sh" emacsclient 24 2>/dev/null ; then
     # set EDITOR if not already defined.
     export EDITOR="${EDITOR:-${EMACS_PLUGIN_LAUNCHER}}"
 
-    alias emacs="$EMACS_PLUGIN_LAUNCHER -t"
+    alias emacs="$EMACS_PLUGIN_LAUNCHER --no-wait"
     alias e=emacs
     # open terminal emacsclient
     alias te="$EMACS_PLUGIN_LAUNCHER -nw"
-- 
cgit v1.2.3-70-g09d2


From 52afbf77f63844abd719e565a15af2c34075de7f Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sun, 3 Mar 2019 20:32:59 +0100
Subject: per-directory-history: update to latest version (0e090e8)

---
 plugins/per-directory-history/per-directory-history.zsh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'plugins')

diff --git a/plugins/per-directory-history/per-directory-history.zsh b/plugins/per-directory-history/per-directory-history.zsh
index 53ad963e7..41de2f91d 100644
--- a/plugins/per-directory-history/per-directory-history.zsh
+++ b/plugins/per-directory-history/per-directory-history.zsh
@@ -26,7 +26,7 @@
 #
 # [1]: http://www.compbiome.com/2010/07/bash-per-directory-bash-history.html
 # [2]: http://dieter.plaetinck.be/per_directory_bash
-# [3]: https://www.zsh.org/mla/users/1997/msg00226.html
+# [3]: http://www.zsh.org/mla/users/1997/msg00226.html
 #
 ################################################################################
 #
@@ -109,8 +109,13 @@ function _per-directory-history-change-directory() {
 }
 
 function _per-directory-history-addhistory() {
-  print -Sr -- "${1%%$'\n'}"
-  fc -p $_per_directory_history_directory
+  # respect hist_ignore_space
+  if [[ -o hist_ignore_space ]] && [[ "$1" == \ * ]]; then
+      true
+  else
+      print -Sr -- "${1%%$'\n'}"
+      fc -p $_per_directory_history_directory
+  fi
 }
 
 
-- 
cgit v1.2.3-70-g09d2


From e3e0dd599ea4ed3e4d89ed4cadbe049a25013700 Mon Sep 17 00:00:00 2001
From: Rahil Wazir <rahilwazirali@gmail.com>
Date: Sun, 10 Mar 2019 21:36:21 +0500
Subject: fix typo (#7643)

Extra t in `wp theme updatet`
---
 plugins/wp-cli/wp-cli.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/wp-cli/wp-cli.plugin.zsh b/plugins/wp-cli/wp-cli.plugin.zsh
index 45fac0761..97bed406e 100644
--- a/plugins/wp-cli/wp-cli.plugin.zsh
+++ b/plugins/wp-cli/wp-cli.plugin.zsh
@@ -109,7 +109,7 @@ alias wptm='wp theme mod'
 alias wptp='wp theme path'
 alias wpts='wp theme search'
 alias wptst='wp theme status'
-alias wptu='wp theme updatet'
+alias wptu='wp theme update'
 
 # Transient
 
-- 
cgit v1.2.3-70-g09d2


From 275e5b13498e04173f703538bff32fc2c801b4d3 Mon Sep 17 00:00:00 2001
From: Ulrich Schreiner <ulrich.schreiner@gmail.com>
Date: Sun, 10 Mar 2019 17:36:51 +0100
Subject: allow kubectl commands against all namespaces (#7637)

* allow kubectl commands against all namespaces

* enhance the readme too
---
 plugins/kubectl/README.md          | 1 +
 plugins/kubectl/kubectl.plugin.zsh | 3 +++
 2 files changed, 4 insertions(+)

(limited to 'plugins')

diff --git a/plugins/kubectl/README.md b/plugins/kubectl/README.md
index b30f90548..3343f0195 100644
--- a/plugins/kubectl/README.md
+++ b/plugins/kubectl/README.md
@@ -14,6 +14,7 @@ plugins=(... kubectl)
 | Alias   | Command                             | Description                                                                                      |
 |:--------|:------------------------------------|:-------------------------------------------------------------------------------------------------|
 | k       | `kubectl`                           | The kubectl command                                                                              |
+| kca     | `kubectl --all-namespaces`          | The kubectl command targeting all namespaces                                                     |
 | kaf     | `kubectl apply -f`                  | Apply a YML file                                                                                 |
 | keti    | `kubectl exec -ti`                  | Drop into an interactive terminal on a container                                                 |
 |         |                                     | **Manage configuration quickly to switch contexts between local, dev and staging**               |
diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index d388d6543..ab7a1a0a4 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -13,6 +13,9 @@ fi
 # This command is used a LOT both below and in daily life
 alias k=kubectl
 
+# Execute a kubectl command against all namespaces
+alias kca='f(){ kubectl "$@" --all-namespaces;  unset -f f; }; f'
+
 # Apply a YML file
 alias kaf='kubectl apply -f'
 
-- 
cgit v1.2.3-70-g09d2


From 9509fd6a9193e32e5c2d460786253ba0e98fd741 Mon Sep 17 00:00:00 2001
From: Tieme van Veen <tiemevanveen@hotmail.com>
Date: Sun, 10 Mar 2019 17:38:06 +0100
Subject: Add git reset to origin alias to git plugin (#7630)

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

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 12400ede4..4277ac664 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -220,6 +220,7 @@ alias grbm='git rebase master'
 alias grbs='git rebase --skip'
 alias grh='git reset'
 alias grhh='git reset --hard'
+alias groh='git reset origin/$(git_current_branch) --hard'
 alias grm='git rm'
 alias grmc='git rm --cached'
 alias grmv='git remote rename'
-- 
cgit v1.2.3-70-g09d2


From 2b68600d50f2e75ab22583e8cb49fc8ee9a9675f Mon Sep 17 00:00:00 2001
From: Kevin Ottens <ervin@ipsquad.net>
Date: Fri, 22 Mar 2019 20:32:29 +0100
Subject: suse: remove sudo from some zypper aliases (#7678)

Closes #5564
---
 plugins/suse/README.md       | 40 ++++++++++++++++++++--------------------
 plugins/suse/suse.plugin.zsh | 40 ++++++++++++++++++++--------------------
 2 files changed, 40 insertions(+), 40 deletions(-)

(limited to 'plugins')

diff --git a/plugins/suse/README.md b/plugins/suse/README.md
index 0e8a7f7ba..b9b069574 100644
--- a/plugins/suse/README.md
+++ b/plugins/suse/README.md
@@ -15,14 +15,14 @@ plugins=(... suse)
 | Alias            | Commands                      | Description                                                    |
 | ---------------- | ----------------------------- | -------------------------------------------------------------- |
 | z                | `sudo zypper`                 | call zypper                                                    |
-| zh               | `sudo zypper -h`              | print help                                                     |
-| zhse             | `sudo zypper -h se`           | print help for the search command                              |
-| zlicenses        | `sudo zypper licenses`        | prints a report about licenses and EULAs of installed packages |
+| zh               | `zypper -h`                   | print help                                                     |
+| zhse             | `zypper -h se`                | print help for the search command                              |
+| zlicenses        | `zypper licenses`             | prints a report about licenses and EULAs of installed packages |
 | zps              | `sudo zypper ps`              | list process using deleted files                               |
 | zshell           | `sudo zypper shell`           | open a zypper shell session                                    |
 | zsource-download | `sudo zypper source-download` | download source rpms for all installed packages                |
-| ztos             | `sudo zypper tos`             | shows  the  ID string of the target operating system           |
-| zvcmp            | `sudo zypper vcmp`            | tell whether version1 is older or newer than version2          |
+| ztos             | `zypper tos`                  | shows the ID string of the target operating system             |
+| zvcmp            | `zypper vcmp`                 | tell whether version1 is older or newer than version2          |
 
 ## Packages commands
 
@@ -39,8 +39,8 @@ plugins=(... suse)
 | Alias  | Commands            | Description            |
 | ------ | ------------------- | ---------------------- |
 | zdup   | `sudo zypper dup`   | upgrade packages       |
-| zlp    | `sudo zypper lp`    | list necessary patches |
-| zlu    | `sudo zypper lu`    | list updates           |
+| zlp    | `zypper lp`         | list necessary patches |
+| zlu    | `zypper lu`         | list updates           |
 | zpchk  | `sudo zypper pchk`  | check for patches      |
 | zup    | `sudo zypper up`    | update packages        |
 | zpatch | `sudo zypper patch` | install patches        |
@@ -49,16 +49,16 @@ plugins=(... suse)
 
 | Alias         | Commands                   | Description                                          |
 | ------------- | -------------------------- | ---------------------------------------------------- |
-| zif           | `sudo zypper if`           | display info about packages                          |
-| zpa           | `sudo zypper pa`           | list packages                                        |
-| zpatch-info   | `sudo zypper patch-info`   | display info about patches                           |
-| zpattern-info | `sudo zypper pattern-info` | display info about patterns                          |
-| zproduct-info | `sudo zypper product-info` | display info about products                          |
-| zpch          | `sudo zypper pch`          | list all patches                                     |
-| zpd           | `sudo zypper pd`           | list products                                        |
-| zpt           | `sudo zypper pt`           | list patterns                                        |
-| zse           | `sudo zypper se`           | search for packages                                  |
-| zwp           | `sudo zypper wp`           | list all packages providing the specified capability |
+| zif           | `zypper if`                | display info about packages                          |
+| zpa           | `zypper pa`                | list packages                                        |
+| zpatch-info   | `zypper patch-info`        | display info about patches                           |
+| zpattern-info | `zypper pattern-info`      | display info about patterns                          |
+| zproduct-info | `zypper product-info`      | display info about products                          |
+| zpch          | `zypper pch`               | list all patches                                     |
+| zpd           | `zypper pd`                | list products                                        |
+| zpt           | `zypper pt`                | list patterns                                        |
+| zse           | `zypper se`                | search for packages                                  |
+| zwp           | `zypper wp`                | list all packages providing the specified capability |
 
 ## Repositories commands
 
@@ -66,7 +66,7 @@ plugins=(... suse)
 | ----- | ------------------- | ---------------------------------------- |
 | zar   | `sudo zypper ar`    | add a repository                         |
 | zcl   | `sudo zypper clean` | clean cache                              |
-| zlr   | `sudo zypper lr`    | list repositories                        |
+| zlr   | `zypper lr`         | list repositories                        |
 | zmr   | `sudo zypper mr`    | modify repositories                      |
 | znr   | `sudo zypper nr`    | rename repositories (for the alias only) |
 | zref  | `sudo zypper ref`   | refresh repositories                     |
@@ -79,12 +79,12 @@ plugins=(... suse)
 | zms   | `sudo zypper ms`   | modify properties of specified services                        |
 | zrefs | `sudo zypper refs` | refreshing a service mean executing the service's special task |
 | zrs   | `sudo zypper rs`   | remove specified repository index service from the system      |
-| zls   | `sudo zypper ls`   | list services defined on the system                            |
+| zls   | `zypper ls`        | list services defined on the system                            |
 
 ## Package Locks Management commands
 | Alias | Commands         | Description                         |
 | ----- | ---------------- | ----------------------------------- |
 | zal   | `sudo zypper al` | add a package lock                  |
 | zcl   | `sudo zypper cl` | remove unused locks                 |
-| zll   | `sudo zypper ll` | list currently active package locks |
+| zll   | `zypper ll`      | list currently active package locks |
 | zrl   | `sudo zypper rl` | remove specified package lock       |
diff --git a/plugins/suse/suse.plugin.zsh b/plugins/suse/suse.plugin.zsh
index 60f7042eb..dcfeccb03 100644
--- a/plugins/suse/suse.plugin.zsh
+++ b/plugins/suse/suse.plugin.zsh
@@ -1,13 +1,13 @@
 #Main commands
 alias z='sudo zypper'
-alias zh='sudo zypper -h'
-alias zhse='sudo zypper -h se'
-alias zlicenses='sudo zypper licenses'
+alias zh='zypper -h'
+alias zhse='zypper -h se'
+alias zlicenses='zypper licenses'
 alias zps='sudo zypper ps'
 alias zshell='sudo zypper shell'
 alias zsource-download='sudo zypper source-download'
-alias ztos='sudo zypper tos'
-alias zvcmp='sudo zypper vcmp'
+alias ztos='zypper tos'
+alias zvcmp='zypper vcmp'
 
 #Packages commands
 alias zin='sudo zypper in'
@@ -18,28 +18,28 @@ alias zve='sudo zypper ve'
 
 #Updates commands
 alias zdup='sudo zypper dup'
-alias zlp='sudo zypper lp'
-alias zlu='sudo zypper lu'
+alias zlp='zypper lp'
+alias zlu='zypper lu'
 alias zpchk='sudo zypper pchk'
 alias zup='sudo zypper up'
 alias zpatch='sudo zypper patch'
 
 #Request commands
-alias zif='sudo zypper if'
-alias zpa='sudo zypper pa'
-alias zpatch-info='sudo zypper patch-info'
-alias zpattern-info='sudo zypper pattern-info'
-alias zproduct-info='sudo zypper product-info'
-alias zpch='sudo zypper pch'
-alias zpd='sudo zypper pd'
-alias zpt='sudo zypper pt'
-alias zse='sudo zypper se'
-alias zwp='sudo zypper wp'
+alias zif='zypper if'
+alias zpa='zypper pa'
+alias zpatch-info='zypper patch-info'
+alias zpattern-info='zypper pattern-info'
+alias zproduct-info='zypper product-info'
+alias zpch='zypper pch'
+alias zpd='zypper pd'
+alias zpt='zypper pt'
+alias zse='zypper se'
+alias zwp='zypper wp'
 
 #Repositories commands
 alias zar='sudo zypper ar'
 alias zcl='sudo zypper clean'
-alias zlr='sudo zypper lr'
+alias zlr='zypper lr'
 alias zmr='sudo zypper mr'
 alias znr='sudo zypper nr'
 alias zref='sudo zypper ref'
@@ -50,10 +50,10 @@ alias zas='sudo zypper as'
 alias zms='sudo zypper ms'
 alias zrefs='sudo zypper refs'
 alias zrs='sudo zypper rs'
-alias zls='sudo zypper ls'
+alias zls='zypper ls'
 
 #Package Locks Management commands
 alias zal='sudo zypper al'
 alias zcl='sudo zypper cl'
-alias zll='sudo zypper ll'
+alias zll='zypper ll'
 alias zrl='sudo zypper rl'
-- 
cgit v1.2.3-70-g09d2


From 6fe4ac024a0373a847b3a4c1b59e9509d5832c25 Mon Sep 17 00:00:00 2001
From: Zixu Wang <LaytonW@users.noreply.github.com>
Date: Sat, 23 Mar 2019 08:57:46 -0700
Subject: web-search: update alias for stackoverflow (#7660)

Changed from `stack` because it conflicts with Haskell Tool Stack

Fixes #7659
---
 plugins/web-search/README.md             | 1 +
 plugins/web-search/web-search.plugin.zsh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/web-search/README.md b/plugins/web-search/README.md
index d790d944d..5b09b8980 100644
--- a/plugins/web-search/README.md
+++ b/plugins/web-search/README.md
@@ -37,6 +37,7 @@ Available search contexts are:
 | `ecosia`              | `https://www.ecosia.org/search?q=`       |
 | `goodreads`           | `https://www.goodreads.com/search?q=`    |
 | `qwant`               | `https://www.qwant.com/?q=`              |
+| `stackoverflow`       | `https://stackoverflow.com/search?q=`    |
 
 Also there are aliases for bang-searching DuckDuckGo:
 
diff --git a/plugins/web-search/web-search.plugin.zsh b/plugins/web-search/web-search.plugin.zsh
index 18cc0614a..9a70d7bc6 100644
--- a/plugins/web-search/web-search.plugin.zsh
+++ b/plugins/web-search/web-search.plugin.zsh
@@ -52,7 +52,7 @@ alias baidu='web_search baidu'
 alias ecosia='web_search ecosia'
 alias goodreads='web_search goodreads'
 alias qwant='web_search qwant'
-alias stack='web_search stackoverflow'
+alias stackoverflow='web_search stackoverflow'
 
 #add your own !bang searches here
 alias wiki='web_search duckduckgo \!w'
-- 
cgit v1.2.3-70-g09d2


From 9975b16297e3c5619bdb88cc8f029a90ee80bb27 Mon Sep 17 00:00:00 2001
From: Peter Theill <peter@theill.com>
Date: Sat, 23 Mar 2019 17:03:45 +0100
Subject: web-search: add Givero (supports good causes) as search engine
 (#7581)

Adds "givero" as a keyword for searching Givero, a relative new search engine donating revenue to good causes around the world.
---
 plugins/web-search/README.md             | 1 +
 plugins/web-search/web-search.plugin.zsh | 2 ++
 2 files changed, 3 insertions(+)

(limited to 'plugins')

diff --git a/plugins/web-search/README.md b/plugins/web-search/README.md
index 5b09b8980..d04042506 100644
--- a/plugins/web-search/README.md
+++ b/plugins/web-search/README.md
@@ -37,6 +37,7 @@ Available search contexts are:
 | `ecosia`              | `https://www.ecosia.org/search?q=`       |
 | `goodreads`           | `https://www.goodreads.com/search?q=`    |
 | `qwant`               | `https://www.qwant.com/?q=`              |
+| `givero`              | `https://www.givero.com/search?q=`       |
 | `stackoverflow`       | `https://stackoverflow.com/search?q=`    |
 
 Also there are aliases for bang-searching DuckDuckGo:
diff --git a/plugins/web-search/web-search.plugin.zsh b/plugins/web-search/web-search.plugin.zsh
index 9a70d7bc6..5b76eeae2 100644
--- a/plugins/web-search/web-search.plugin.zsh
+++ b/plugins/web-search/web-search.plugin.zsh
@@ -17,6 +17,7 @@ function web_search() {
     ecosia      "https://www.ecosia.org/search?q="
     goodreads   "https://www.goodreads.com/search?q="
     qwant       "https://www.qwant.com/?q="
+    givero      "https://www.givero.com/search?q="
     stackoverflow  "https://stackoverflow.com/search?q="
   )
 
@@ -52,6 +53,7 @@ alias baidu='web_search baidu'
 alias ecosia='web_search ecosia'
 alias goodreads='web_search goodreads'
 alias qwant='web_search qwant'
+alias givero='web_search givero'
 alias stackoverflow='web_search stackoverflow'
 
 #add your own !bang searches here
-- 
cgit v1.2.3-70-g09d2


From f03aa42cbb2ef401f723557bbd2be5c72b1cba21 Mon Sep 17 00:00:00 2001
From: Erik <ethorelli@gmail.com>
Date: Sat, 23 Mar 2019 12:49:15 -0400
Subject: react-native: add iPad and Apple TV simulator aliases (#7603)

---
 plugins/react-native/README.md               | 67 +++++++++++++++++-----------
 plugins/react-native/react-native.plugin.zsh | 17 +++++++
 2 files changed, 59 insertions(+), 25 deletions(-)

(limited to 'plugins')

diff --git a/plugins/react-native/README.md b/plugins/react-native/README.md
index d1fce0fc2..0cfaa36b4 100644
--- a/plugins/react-native/README.md
+++ b/plugins/react-native/README.md
@@ -11,28 +11,45 @@ plugins=(... react-native)
 
 ## Aliases
 
-| Alias         | React Native command                               |
-| :------------ | :------------------------------------------------- |
-| **rn**        | `react-native`                                     |
-| **rns**       | `react-native start`                               |
-| **rnlink**    | `react-native link`                                |
-| _App testing_ |
-| **rnand**     | `react-native run-android`                         |
-| **rnios**     | `react-native run-ios`                             |
-| **rnios4s**   | `react-native run-ios --simulator "iPhone 4s"`     |
-| **rnios5**    | `react-native run-ios --simulator "iPhone 5"`      |
-| **rnios5s**   | `react-native run-ios --simulator "iPhone 5s"`     |
-| **rnios6**    | `react-native run-ios --simulator "iPhone 6"`      |
-| **rnios6s**   | `react-native run-ios --simulator "iPhone 6s"`     |
-| **rnios7**    | `react-native run-ios --simulator "iPhone7"`       |
-| **rnios7p**   | `react-native run-ios --simulator "iPhone 7 Plus"` |
-| **rnios8**    | `react-native run-ios --simulator "iPhone 8"`      |
-| **rnios8p**   | `react-native run-ios --simulator "iPhone 8 Plus"` |
-| **rniosse**   | `react-native run-ios --simulator "iPhone SE"`     |
-| **rniosx**    | `react-native run-ios --simulator "iPhone X"`      |
-| **rniosxs**   | `react-native run-ios --simulator "iPhone XS"`     |
-| **rniosxsm**  | `react-native run-ios --simulator "iPhone XS Max"` |
-| **rniosxr**   | `react-native run-ios --simulator "iPhone XR"`     |
-| _Logging_     |
-| **rnland**    | `react-native log-android`                         |
-| **rnlios**    | `react-native log-ios`                             |
+| Alias          | React Native command                                                         |
+| :------------  | :-------------------------------------------------                           |
+| **rn**         | `react-native`                                                               |
+| **rns**        | `react-native start`                                                         |
+| **rnlink**     | `react-native link`                                                          |
+| _App testing_  |
+| **rnand**      | `react-native run-android`                                                   |
+| **rnios**      | `react-native run-ios`                                                       |
+| **rnios4s**    | `react-native run-ios --simulator "iPhone 4s"`                               |
+| **rnios5**     | `react-native run-ios --simulator "iPhone 5"`                                |
+| **rnios5s**    | `react-native run-ios --simulator "iPhone 5s"`                               |
+| **rnios6**     | `react-native run-ios --simulator "iPhone 6"`                                |
+| **rnios6s**    | `react-native run-ios --simulator "iPhone 6s"`                               |
+| **rnios7**     | `react-native run-ios --simulator "iPhone7"`                                 |
+| **rnios7p**    | `react-native run-ios --simulator "iPhone 7 Plus"`                           |
+| **rnios8**     | `react-native run-ios --simulator "iPhone 8"`                                |
+| **rnios8p**    | `react-native run-ios --simulator "iPhone 8 Plus"`                           |
+| **rniosse**    | `react-native run-ios --simulator "iPhone SE"`                               |
+| **rniosx**     | `react-native run-ios --simulator "iPhone X"`                                |
+| **rniosxs**    | `react-native run-ios --simulator "iPhone XS"`                               |
+| **rniosxsm**   | `react-native run-ios --simulator "iPhone XS Max"`                           |
+| **rniosxr**    | `react-native run-ios --simulator "iPhone XR"`                               |
+| _iPads_        |                                                                              |
+| **rnipad2**    | `react-native run-ios --simulator "iPad 2"`                                  |
+| **rnipadr**    | `react-native run-ios --simulator "iPad Retina"`                             |
+| **rnipada**    | 'react-native run-ios --simulator "iPad Air"'                                |
+| **rnipada2**   | 'react-native run-ios --simulator "iPad Air 2"'                              |
+| **rnipad5**    | 'react-native run-ios --simulator "iPad (5th generation)"'                   |
+| **rnipad9**    | 'react-native run-ios --simulator "iPad Pro (9.7-inch)"'                     |
+| **rnipad12**   | 'react-native run-ios --simulator "iPad Pro (12.9-inch)"'                    |
+| **rnipad122**  | 'react-native run-ios --simulator "iPad Pro (12.9-inch) (2nd generation)"'   |
+| **rnipad10**   | 'react-native run-ios --simulator "iPad Pro (10.5-inch)"'                    |
+| **rnipad6**    | 'react-native run-ios --simulator "iPad Pro (6th generation)"'               |
+| **rnipad11**   | 'react-native run-ios --simulator "iPad Pro (11-inch)"'                      |
+| **rnipad123**  | 'react-native run-ios --simulator "iPad Pro (12.9-inch) (3rd generation)"'   |
+| _Apple TVs_    |                                                                              |
+| **rnatv**      | `react-native run-ios --simulator "Apple TV"`                                |
+| **rnatv4k**    | `react-native run-ios --simulator "Apple TV 4K"`                             |
+| **rnatv4k1080**| `react-native run-ios --simulator "Apple TV 4K (at 1080p)"`                  |
+| _Logging_      |
+| **rnland**     | `react-native log-android`                                                   |
+| **rnlios**     | `react-native log-ios`                                                       |
diff --git a/plugins/react-native/react-native.plugin.zsh b/plugins/react-native/react-native.plugin.zsh
index 220aa2dce..a4092a694 100644
--- a/plugins/react-native/react-native.plugin.zsh
+++ b/plugins/react-native/react-native.plugin.zsh
@@ -19,5 +19,22 @@ alias rniosxs='react-native run-ios --simulator "iPhone XS"'
 alias rniosxsm='react-native run-ios --simulator "iPhone XS Max"'
 alias rniosxr='react-native run-ios --simulator "iPhone XR"'
 
+alias rnipad2='react-native run-ios --simulator "iPad 2"'
+alias rnipadr='react-native run-ios --simulator "iPad Retina"'
+alias rnipada='react-native run-ios --simulator "iPad Air"'
+alias rnipada2='react-native run-ios --simulator "iPad Air 2"'
+alias rnipad5='react-native run-ios --simulator "iPad (5th generation)"'
+alias rnipad9='react-native run-ios --simulator "iPad Pro (9.7-inch)"'
+alias rnipad12='react-native run-ios --simulator "iPad Pro (12.9-inch)"'
+alias rnipad122='react-native run-ios --simulator "iPad Pro (12.9-inch) (2nd generation)"'
+alias rnipad10='react-native run-ios --simulator "iPad Pro (10.5-inch)"'
+alias rnipad6='react-native run-ios --simulator "iPad Pro (6th generation)"'
+alias rnipad11='react-native run-ios --simulator "iPad Pro (11-inch)"'
+alias rnipad123='react-native run-ios --simulator "iPad Pro (12.9-inch) (3rd generation)"'
+
+alias rnatv='react-native run-ios --simulator "Apple TV"'
+alias rnatv4k='react-native run-ios --simulator "Apple TV 4K"'
+alias rnatv4k1080='react-native run-ios --simulator "Apple TV 4K (at 1080p)"'
+
 alias rnland='react-native log-android'
 alias rnlios='react-native log-ios'
-- 
cgit v1.2.3-70-g09d2


From 1a2d930bca7966c44f1551ea2f0b8d7aecc80e56 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sat, 23 Mar 2019 19:52:31 +0100
Subject: aws: refactor completion sourcing logic (#7364)

* Clean up Homebrew detection and add comments. Also changed some if flags.
* Detect aws cli completion file from RPM
---
 plugins/aws/aws.plugin.zsh | 56 ++++++++++++++++++++++------------------------
 1 file changed, 27 insertions(+), 29 deletions(-)

(limited to 'plugins')

diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index af27e669a..9cb69dd09 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -1,32 +1,9 @@
-_homebrew-installed() {
-  type brew &> /dev/null
-  _xit=$?
-  if [ $_xit -eq 0 ];then
-        # ok , we have brew installed
-        # speculatively we check default brew prefix
-        if [ -h  /usr/local/opt/awscli ];then
-                _brew_prefix="/usr/local/opt/awscli"
-        else
-                # ok , it is not default prefix
-                # this call to brew is expensive ( about 400 ms ), so at least let's make it only once
-                _brew_prefix=$(brew --prefix awscli)
-        fi
-        return 0
-   else
-        return $_xit
-   fi
-}
-
-_awscli-homebrew-installed() {
-  [ -r $_brew_prefix/libexec/bin/aws_zsh_completer.sh ] &> /dev/null
-}
-
 function agp {
   echo $AWS_PROFILE
 }
 
 function asp {
-  local rprompt=${RPROMPT/<aws:$(agp)>/}
+  local rprompt=${RPROMPT/<aws:$AWS_PROFILE>/}
 
   export AWS_DEFAULT_PROFILE=$1
   export AWS_PROFILE=$1
@@ -39,11 +16,32 @@ function aws_profiles {
 }
 compctl -K aws_profiles asp
 
-if which aws_zsh_completer.sh &>/dev/null; then
-  _aws_zsh_completer_path=$(which aws_zsh_completer.sh 2>/dev/null)
-elif _homebrew-installed && _awscli-homebrew-installed; then
+
+# Load awscli completions
+
+_awscli-homebrew-installed() {
+  # check if Homebrew is installed
+  (( $+commands[brew] )) || return 1
+
+  # speculatively check default brew prefix
+  if [ -h /usr/local/opt/awscli ]; then
+    _brew_prefix=/usr/local/opt/awscli
+  else
+    # ok, it is not in the default prefix
+    # this call to brew is expensive (about 400 ms), so at least let's make it only once
+    _brew_prefix=$(brew --prefix awscli)
+  fi
+}
+
+# get aws_zsh_completer.sh location from $PATH
+_aws_zsh_completer_path="$commands[aws_zsh_completer.sh]"
+
+# otherwise check if installed via Homebrew
+if [[ -z $_aws_zsh_completer_path ]] && _awscli-homebrew-installed; then
   _aws_zsh_completer_path=$_brew_prefix/libexec/bin/aws_zsh_completer.sh
+else
+  _aws_zsh_completer_path=/usr/share/zsh/site-functions/aws_zsh_completer.sh
 fi
 
-[ -n "$_aws_zsh_completer_path" ] && [ -x $_aws_zsh_completer_path ] && source $_aws_zsh_completer_path
-unset _aws_zsh_completer_path
+[[ -r $_aws_zsh_completer_path ]] && source $_aws_zsh_completer_path
+unset _aws_zsh_completer_path _brew_prefix
-- 
cgit v1.2.3-70-g09d2


From 729c2f796d4945dfa2bcff144fea84afe5c4b0cb Mon Sep 17 00:00:00 2001
From: "Cristian Măgherușan-Stanciu @magheru_san"
 <cristim@users.noreply.github.com>
Date: Sat, 23 Mar 2019 22:08:35 +0100
Subject: otp: added a plugin for oathtool one-time passwords (#3862)

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

(limited to 'plugins')

diff --git a/plugins/otp/otp.plugin.zsh b/plugins/otp/otp.plugin.zsh
new file mode 100644
index 000000000..4bce34fd3
--- /dev/null
+++ b/plugins/otp/otp.plugin.zsh
@@ -0,0 +1,54 @@
+export OTP_HOME=~/.otp
+mkdir -p $OTP_HOME
+
+function ot () {
+  if ! command -v oathtool > /dev/null 2>&1; then
+    echo "Note: you need to install oathtool or oath-toolkit, depending on your OS or distribution."
+    return 1
+  fi
+
+  if ! command -v gpg > /dev/null 2>&1; then
+    echo "Note: you need to install gpg and create an ID using 'gpg --gen-key', unless you have one already."
+    return 1
+  fi
+
+  if [[ `uname` == 'Darwin' ]] then # MacOS X
+    export COPY_CMD='pbcopy'
+  elif command -v xsel > /dev/null 2>&1; then # Any Unix with xsel installed
+    export COPY_CMD='xsel --clipboard --input'
+  else
+    COPY_CMD='true'
+  fi
+
+  if [[ "x$1" == "x" ]]; then
+    echo "usage: otpw <profile.name>"
+    return 1
+  elif [ ! -f $OTP_HOME/$1.otp.asc ]; then
+    echo "missing profile $1, you might need to create it first using otp_add_device"
+    return 1
+  else
+    totpkey=$(gpg --decrypt $OTP_HOME/$1.otp.asc)
+    oathtool --totp --b $totpkey | tee /dev/stderr | `echo $COPY_CMD`
+    if [[ $COPY_CMD == 'true' ]] then
+      echo "Note: you might consider installing xsel for clipboard integration"
+    fi
+  fi
+}
+
+function otp_add_device () {
+  if [[ "x$1" == "x" ]] then
+    echo "usage: otp_add <profile.name>"
+    return 1
+  else
+    echo "Enter an email address attached to your GPG private key, then paste the secret configuration key followed by ^D"
+
+    rm -f $OTP_HOME/$1.otp.asc
+    gpg --armor --encrypt --output $OTP_HOME/$1.otp.asc /dev/stdin
+  fi
+}
+
+function otp_devices () {
+  reply=($(find $OTP_HOME -name \*.otp.asc | xargs basename -s .otp.asc))
+}
+
+compctl -K otp_devices ot
-- 
cgit v1.2.3-70-g09d2


From a055930cf862c74159218d0acfd09b64f1e09ed5 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sun, 24 Mar 2019 11:27:25 +0100
Subject: Fix README

---
 plugins/lighthouse/README.md | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

(limited to 'plugins')

diff --git a/plugins/lighthouse/README.md b/plugins/lighthouse/README.md
index 0dd0003f1..0db29b4e5 100644
--- a/plugins/lighthouse/README.md
+++ b/plugins/lighthouse/README.md
@@ -1,6 +1,6 @@
 # Lighthouse plugin
 
-This plugin issue lighthouse tickets.
+This plugin adds commands to manage [Lighthouse](https://lighthouseapp.com/).
 
 To use it, add `lighthouse` to the plugins array in your zshrc file:
 
@@ -8,8 +8,19 @@ To use it, add `lighthouse` to the plugins array in your zshrc file:
 plugins=(... lighthouse)
 ```
 
-## Aliases
+## Commands
 
-| Alias | Command                                | Description                                          |
-|-------|----------------------------------------|------------------------------------------------------|
-| lho   | `open_lighthouse_ticket`               | Opening lighthouse ticket                            |
\ No newline at end of file
+* `open_lighthouse_ticket <issue>` (alias: `lho`):
+
+  Opens the URL to the issue passed as an argument. To use it, add a `.lighthouse-url`
+  file in your directory with the URL to the individual project.
+
+  Example:
+  ```zsh
+  $ cat .lighthouse-url
+  https://rails.lighthouseapp.com/projects/8994
+
+  $ lho 23
+  Opening ticket #23
+  # The browser goes to https://rails.lighthouseapp.com/projects/8994/tickets/23
+  ```
-- 
cgit v1.2.3-70-g09d2


From e4189b9a963a323b5e4e2a5a440e69a01f18479f Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sun, 24 Mar 2019 11:29:35 +0100
Subject: Clean up lighthouse plugin

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

(limited to 'plugins')

diff --git a/plugins/lighthouse/lighthouse.plugin.zsh b/plugins/lighthouse/lighthouse.plugin.zsh
index 4a47b6010..3fca2bf4f 100644
--- a/plugins/lighthouse/lighthouse.plugin.zsh
+++ b/plugins/lighthouse/lighthouse.plugin.zsh
@@ -1,16 +1,12 @@
-# To use: add a .lighthouse file into your directory with the URL to the
-# individual project. For example:
-# https://rails.lighthouseapp.com/projects/8994
-# Example usage: https://screencast.com/t/ZDgwNDUwNT
 open_lighthouse_ticket () {
   if [ ! -f .lighthouse-url ]; then
     echo "There is no .lighthouse-url file in the current directory..."
-    return 0;
-  else
-    lighthouse_url=$(cat .lighthouse-url);
-    echo "Opening ticket #$1";
-    open_command "$lighthouse_url/tickets/$1";
+    return 0
   fi
+
+  lighthouse_url=$(cat .lighthouse-url)
+  echo "Opening ticket #$1"
+  open_command "$lighthouse_url/tickets/$1"
 }
 
 alias lho='open_lighthouse_ticket'
-- 
cgit v1.2.3-70-g09d2


From 532a784b806375370022605d8be17c1116553572 Mon Sep 17 00:00:00 2001
From: David Kane <dkanejs@gmail.com>
Date: Sun, 24 Mar 2019 18:37:07 +0000
Subject: aws: refactor AWS plugin (#7615)

* Update the AWS plugin to support disabling RPROMT display:
  Use a $SHOW_AWS_PROMPT option.

* Refactoring aws plugin:
  Exposing customizable aws_prompt_info function to be used in themes.

* Set aws prompt prefix and suffix to original values and fix README

Co-authored-by: "Vassilis S. Moustakas" <vsmoustakas@gmail.com>
---
 plugins/aws/README.md      | 25 +++++++++++++++++++------
 plugins/aws/aws.plugin.zsh | 20 +++++++++++++++++---
 2 files changed, 36 insertions(+), 9 deletions(-)

(limited to 'plugins')

diff --git a/plugins/aws/README.md b/plugins/aws/README.md
index 8a45199b8..57ab1e5ac 100644
--- a/plugins/aws/README.md
+++ b/plugins/aws/README.md
@@ -1,8 +1,7 @@
 # aws
 
 This plugin provides completion support for [awscli](https://docs.aws.amazon.com/cli/latest/reference/index.html)
-and a few utilities to manage AWS profiles: a function to change profiles with autocompletion support
-and a function to get the current AWS profile. The current AWS profile is also displayed in `RPROMPT`.
+and a few utilities to manage AWS profiles and display them in the prompt.
 
 To use it, add `aws` to the plugins array in your zshrc file.
 
@@ -12,9 +11,23 @@ plugins=(... aws)
 
 ## Plugin commands
 
-* `asp <profile>`: Sets `AWS_PROFILE` and `AWS_DEFAULT_PROFILE` (legacy) to `<profile>`.
-It also adds it to your RPROMPT.
+* `asp [<profile>]`: Sets `$AWS_PROFILE` and `$AWS_DEFAULT_PROFILE` (legacy) to `<profile>`.
+  Run `asp` without arguments to clear the profile.
 
-* `agp`: Gets the current value of `AWS_PROFILE`.
+* `agp`: Gets the current value of `$AWS_PROFILE`.
 
-* `aws_profiles`: Lists the available profiles in the file referenced in `AWS_CONFIG_FILE` (default: ~/.aws/config). Used to provide completion for the `asp` function.
+* `aws_profiles`: Lists the available profiles in the  `$AWS_CONFIG_FILE` (default: `~/.aws/config`).
+  Used to provide completion for the `asp` function.
+
+## Plugin options
+
+* Set `SHOW_AWS_PROMPT=false` in your zshrc file if you want to prevent the plugin from modifying your RPROMPT.
+
+## Theme
+
+The plugin creates an `aws_prompt_info` function that you can use in your theme, which displays
+the current `$AWS_PROFILE`. It uses two variables to control how that is shown:
+
+- ZSH_THEME_AWS_PREFIX: sets the prefix of the AWS_PROFILE. Defaults to `<aws:`.
+
+- ZSH_THEME_AWS_SUFFIX: sets the suffix of the AWS_PROFILE. Defaults to `>`.
diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index 9cb69dd09..2fb351812 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -1,14 +1,16 @@
+# AWS profile selection
+
 function agp {
   echo $AWS_PROFILE
 }
 
 function asp {
-  local rprompt=${RPROMPT/<aws:$AWS_PROFILE>/}
-
   export AWS_DEFAULT_PROFILE=$1
   export AWS_PROFILE=$1
 
-  export RPROMPT="<aws:$AWS_PROFILE>$rprompt"
+  if [[ -z "$1" ]]; then
+    echo AWS profile cleared.
+  fi
 }
 
 function aws_profiles {
@@ -17,6 +19,18 @@ function aws_profiles {
 compctl -K aws_profiles asp
 
 
+# AWS prompt
+
+function aws_prompt_info() {
+  [[ -z $AWS_PROFILE ]] && return
+  echo "${ZSH_THEME_AWS_PREFIX:=<aws:}${AWS_PROFILE}${ZSH_THEME_AWS_SUFFIX:=>}"
+}
+
+if [ "$SHOW_AWS_PROMPT" != false ]; then
+  export RPROMPT='$(aws_prompt_info)'"$RPROMPT"
+fi
+
+
 # Load awscli completions
 
 _awscli-homebrew-installed() {
-- 
cgit v1.2.3-70-g09d2


From 8cbdd79517d710e5bab6ce7aca0754b37462f2ee Mon Sep 17 00:00:00 2001
From: Logan Lindquist <logan@llbbl.com>
Date: Sun, 24 Mar 2019 13:46:27 -0500
Subject: aws: set AWS_EB_PROFILE for the EB CLI (#7388)

Added AWS_EB_PROFILE environment variable to the AWS Plugin. The EB CLI uses this
variable instead of the primary AWS_PROFILE variable to keep track of what profile
it is using.

https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/eb-cli3-configuration.html
---
 plugins/aws/README.md      | 1 +
 plugins/aws/aws.plugin.zsh | 1 +
 2 files changed, 2 insertions(+)

(limited to 'plugins')

diff --git a/plugins/aws/README.md b/plugins/aws/README.md
index 57ab1e5ac..45e6de937 100644
--- a/plugins/aws/README.md
+++ b/plugins/aws/README.md
@@ -12,6 +12,7 @@ plugins=(... aws)
 ## Plugin commands
 
 * `asp [<profile>]`: Sets `$AWS_PROFILE` and `$AWS_DEFAULT_PROFILE` (legacy) to `<profile>`.
+  It also sets `$AWS_EB_PROFILE` to `<profile>` for the Elastic Beanstalk CLI.
   Run `asp` without arguments to clear the profile.
 
 * `agp`: Gets the current value of `$AWS_PROFILE`.
diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index 2fb351812..944557e14 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -7,6 +7,7 @@ function agp {
 function asp {
   export AWS_DEFAULT_PROFILE=$1
   export AWS_PROFILE=$1
+  export AWS_EB_PROFILE=$1
 
   if [[ -z "$1" ]]; then
     echo AWS profile cleared.
-- 
cgit v1.2.3-70-g09d2


From 4f4985fddc632a1d9745aec94ce95bea10006f97 Mon Sep 17 00:00:00 2001
From: Cristian Măgherușan-Stanciu <cristian.magherusan-stanciu@here.com>
Date: Wed, 30 Jul 2014 14:59:00 +0200
Subject: aws: added an alias for changing the AWS access key set on a profile

---
 plugins/aws/aws.plugin.zsh | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index 944557e14..7005af2d6 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -14,10 +14,25 @@ function asp {
   fi
 }
 
+function aws_change_access_key {
+  if [[ "x$1" == "x" ]] then
+    echo "usage: $0 <profile.name>"
+    return 1
+  else
+    echo "Insert the credentials when asked."
+    asp $1
+    aws iam create-access-key
+    aws configure --profile $1
+    echo "You can now safely delete the old access key running 'aws iam delete-access-key --access-key-id ID'"
+    echo "Your current keys are:"
+    aws iam list-access-keys
+  fi
+}
+
 function aws_profiles {
   reply=($(grep '\[profile' "${AWS_CONFIG_FILE:-$HOME/.aws/config}"|sed -e 's/.*profile \([a-zA-Z0-9_\.-]*\).*/\1/'))
 }
-compctl -K aws_profiles asp
+compctl -K aws_profiles asp aws_change_access_key
 
 
 # AWS prompt
-- 
cgit v1.2.3-70-g09d2


From 5f893dcd209fdad920a1450355acbd4c10faabf2 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sat, 23 Mar 2019 20:56:55 +0100
Subject: aws: clean up aws_change_access_key function

---
 plugins/aws/aws.plugin.zsh | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'plugins')

diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index 7005af2d6..6de329bb8 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -15,18 +15,19 @@ function asp {
 }
 
 function aws_change_access_key {
-  if [[ "x$1" == "x" ]] then
-    echo "usage: $0 <profile.name>"
+  if [[ -z "$1" ]] then
+    echo "usage: $0 <profile>"
     return 1
-  else
-    echo "Insert the credentials when asked."
-    asp $1
-    aws iam create-access-key
-    aws configure --profile $1
-    echo "You can now safely delete the old access key running 'aws iam delete-access-key --access-key-id ID'"
-    echo "Your current keys are:"
-    aws iam list-access-keys
   fi
+
+  echo Insert the credentials when asked.
+  asp "$1"
+  aws iam create-access-key
+  aws configure --profile "$1"
+
+  echo You can now safely delete the old access key running \`aws iam delete-access-key --access-key-id ID\`
+  echo Your current keys are:
+  aws iam list-access-keys
 }
 
 function aws_profiles {
-- 
cgit v1.2.3-70-g09d2


From 6d143d42ea2e16610855e5b1e912b2962d44d9ab Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sun, 24 Mar 2019 19:54:56 +0100
Subject: aws: document aws_change_access_key and fix README

---
 plugins/aws/README.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'plugins')

diff --git a/plugins/aws/README.md b/plugins/aws/README.md
index 45e6de937..a52024128 100644
--- a/plugins/aws/README.md
+++ b/plugins/aws/README.md
@@ -11,13 +11,15 @@ plugins=(... aws)
 
 ## Plugin commands
 
-* `asp [<profile>]`: Sets `$AWS_PROFILE` and `$AWS_DEFAULT_PROFILE` (legacy) to `<profile>`.
+* `asp [<profile>]`: sets `$AWS_PROFILE` and `$AWS_DEFAULT_PROFILE` (legacy) to `<profile>`.
   It also sets `$AWS_EB_PROFILE` to `<profile>` for the Elastic Beanstalk CLI.
   Run `asp` without arguments to clear the profile.
 
-* `agp`: Gets the current value of `$AWS_PROFILE`.
+* `agp`: gets the current value of `$AWS_PROFILE`.
 
-* `aws_profiles`: Lists the available profiles in the  `$AWS_CONFIG_FILE` (default: `~/.aws/config`).
+* `aws_change_access_key`: changes the AWS access key of a profile.
+
+* `aws_profiles`: lists the available profiles in the  `$AWS_CONFIG_FILE` (default: `~/.aws/config`).
   Used to provide completion for the `asp` function.
 
 ## Plugin options
-- 
cgit v1.2.3-70-g09d2


From c56fa996e7cb1500dca97723d525e4c97af33c75 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Mon, 25 Mar 2019 10:12:43 +0100
Subject: rake-fast: remove brackets from completion entries

Fixes #5653
---
 plugins/rake-fast/rake-fast.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/rake-fast/rake-fast.plugin.zsh b/plugins/rake-fast/rake-fast.plugin.zsh
index ca80d86e1..19dab154b 100644
--- a/plugins/rake-fast/rake-fast.plugin.zsh
+++ b/plugins/rake-fast/rake-fast.plugin.zsh
@@ -20,7 +20,7 @@ _tasks_changed () {
 }
 
 _rake_generate () {
-  rake --silent --tasks | cut -d " " -f 2 > .rake_tasks
+  rake --silent --tasks | cut -d " " -f 2 | sed 's/\[.*\]//g' > .rake_tasks
 }
 
 _rake () {
-- 
cgit v1.2.3-70-g09d2


From f6a9a0a49855666f3311a2db040b9b27969da2bc Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Mon, 25 Mar 2019 18:46:18 +0100
Subject: git: fix grt on path with spaces

Fixes #7682
---
 plugins/git/git.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 4277ac664..6fc9b078b 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -226,7 +226,7 @@ alias grmc='git rm --cached'
 alias grmv='git remote rename'
 alias grrm='git remote remove'
 alias grset='git remote set-url'
-alias grt='cd $(git rev-parse --show-toplevel || echo ".")'
+alias grt='cd "$(git rev-parse --show-toplevel || echo .)"'
 alias gru='git reset --'
 alias grup='git remote update'
 alias grv='git remote -v'
-- 
cgit v1.2.3-70-g09d2


From 647537f15bb31f8a50699db239e9a98343d5d280 Mon Sep 17 00:00:00 2001
From: Jonathan <jonathan.klimt@rwth-aachen.de>
Date: Thu, 27 Sep 2018 18:26:48 +0200
Subject: Added a new plugin which adds completion for fd (fd-find)

Based on the existing "cargo" plugin.
---
 plugins/fd/README.md | 13 ++++++++
 plugins/fd/_fd       | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 96 insertions(+)
 create mode 100644 plugins/fd/README.md
 create mode 100644 plugins/fd/_fd

(limited to 'plugins')

diff --git a/plugins/fd/README.md b/plugins/fd/README.md
new file mode 100644
index 000000000..aabd624b8
--- /dev/null
+++ b/plugins/fd/README.md
@@ -0,0 +1,13 @@
+# fd
+
+This plugin adds completion for the file search tool [`fd`](https://github.com/sharkdp/fd), also known as `fd-find`.
+
+To use it, add `fd` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... fd)
+```
+
+Completion is taken from the fd release [`7.3.0`](https://github.com/sharkdp/fd/releases/tag/v7.3.0).
+
+Updated on Febrary 13th, 2019.
diff --git a/plugins/fd/_fd b/plugins/fd/_fd
new file mode 100644
index 000000000..7d65c7856
--- /dev/null
+++ b/plugins/fd/_fd
@@ -0,0 +1,83 @@
+#compdef fd
+
+autoload -U is-at-least
+
+_fd() {
+    typeset -A opt_args
+    typeset -a _arguments_options
+    local ret=1
+
+    if is-at-least 5.2; then
+        _arguments_options=(-s -S -C)
+    else
+        _arguments_options=(-s -C)
+    fi
+
+    local context curcontext="$curcontext" state line
+    _arguments "${_arguments_options[@]}" \
+'-d+[Set maximum search depth (default: none)]' \
+'--max-depth=[Set maximum search depth (default: none)]' \
+'--maxdepth=[See --max-depth]' \
+'*-t+[Filter by type: file (f), directory (d), symlink (l),
+executable (x), empty (e)]: :(f file d directory l symlink x executable e empty)' \
+'*--type=[Filter by type: file (f), directory (d), symlink (l),
+executable (x), empty (e)]: :(f file d directory l symlink x executable e empty)' \
+'*-e+[Filter by file extension]' \
+'*--extension=[Filter by file extension]' \
+'-x+[Execute a command for each search result]' \
+'--exec=[Execute a command for each search result]' \
+'(-x --exec)-X+[Execute a command with all search results at once]' \
+'(-x --exec)--exec-batch=[Execute a command with all search results at once]' \
+'*-E+[Exclude entries that match the given glob pattern]' \
+'*--exclude=[Exclude entries that match the given glob pattern]' \
+'*--ignore-file=[Add a custom ignore-file in .gitignore format]' \
+'-c+[When to use colors: never, *auto*, always]: :(never auto always)' \
+'--color=[When to use colors: never, *auto*, always]: :(never auto always)' \
+'-j+[Set number of threads to use for searching & executing]' \
+'--threads=[Set number of threads to use for searching & executing]' \
+'*-S+[Limit results based on the size of files.]' \
+'*--size=[Limit results based on the size of files.]' \
+'--max-buffer-time=[the time (in ms) to buffer, before streaming to the console]' \
+'--changed-within=[Filter by file modification time (newer than)]' \
+'--changed-before=[Filter by file modification time (older than)]' \
+'*--search-path=[(hidden)]' \
+'-H[Search hidden files and directories]' \
+'--hidden[Search hidden files and directories]' \
+'-I[Do not respect .(git|fd)ignore files]' \
+'--no-ignore[Do not respect .(git|fd)ignore files]' \
+'--no-ignore-vcs[Do not respect .gitignore files]' \
+'*-u[Alias for no-ignore and/or hidden]' \
+'-s[Case-sensitive search (default: smart case)]' \
+'--case-sensitive[Case-sensitive search (default: smart case)]' \
+'-i[Case-insensitive search (default: smart case)]' \
+'--ignore-case[Case-insensitive search (default: smart case)]' \
+'-F[Treat the pattern as a literal string]' \
+'--fixed-strings[Treat the pattern as a literal string]' \
+'-a[Show absolute instead of relative paths]' \
+'--absolute-path[Show absolute instead of relative paths]' \
+'-L[Follow symbolic links]' \
+'--follow[Follow symbolic links]' \
+'-p[Search full path (default: file-/dirname only)]' \
+'--full-path[Search full path (default: file-/dirname only)]' \
+'-0[Separate results by the null character]' \
+'--print0[Separate results by the null character]' \
+'--show-errors[Enable display of filesystem errors]' \
+'-h[Prints help information]' \
+'--help[Prints help information]' \
+'-V[Prints version information]' \
+'--version[Prints version information]' \
+'::pattern -- the search pattern, a regular expression (optional):_files' \
+'::path -- the root directory for the filesystem search (optional):_files' \
+&& ret=0
+
+}
+
+(( $+functions[_fd_commands] )) ||
+_fd_commands() {
+    local commands; commands=(
+
+    )
+    _describe -t commands 'fd commands' commands "$@"
+}
+
+_fd "$@"
-- 
cgit v1.2.3-70-g09d2


From 9538eae3d732f6c1e59136f0fb2dce7f98a129a1 Mon Sep 17 00:00:00 2001
From: Jonathan <jonathan.klimt@rwth-aachen.de>
Date: Thu, 27 Sep 2018 18:27:51 +0200
Subject: Added a new plugin which adds completion for ripgrep (rg)

Based on the existing "cargo" plugin.
---
 plugins/ripgrep/README.md |  13 ++
 plugins/ripgrep/_ripgrep  | 433 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 446 insertions(+)
 create mode 100644 plugins/ripgrep/README.md
 create mode 100644 plugins/ripgrep/_ripgrep

(limited to 'plugins')

diff --git a/plugins/ripgrep/README.md b/plugins/ripgrep/README.md
new file mode 100644
index 000000000..794b105ee
--- /dev/null
+++ b/plugins/ripgrep/README.md
@@ -0,0 +1,13 @@
+# ripgrep
+
+This plugin adds completion for the text search tool [`ripgrep`](https://github.com/BurntSushi/ripgrep), also known as `rg`.
+
+To use it, add `ripgrep` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... ripgrep)
+```
+
+Completion is taken from the ripgrep release [`0.10.0`](https://github.com/BurntSushi/ripgrep/releases/tag/0.10.0).
+
+Updated on September 27th, 2018.
diff --git a/plugins/ripgrep/_ripgrep b/plugins/ripgrep/_ripgrep
new file mode 100644
index 000000000..53f135dde
--- /dev/null
+++ b/plugins/ripgrep/_ripgrep
@@ -0,0 +1,433 @@
+#compdef rg
+
+##
+# zsh completion function for ripgrep
+#
+# Originally based on code from the zsh-users project — see copyright notice
+# below.
+
+_rg() {
+  local curcontext=$curcontext no='!' descr ret=1
+  local -a context line state state_descr args tmp suf
+  local -A opt_args
+
+  # ripgrep has many options which negate the effect of a more common one — for
+  # example, `--no-column` to negate `--column`, and `--messages` to negate
+  # `--no-messages`. There are so many of these, and they're so infrequently
+  # used, that some users will probably find it irritating if they're completed
+  # indiscriminately, so let's not do that unless either the current prefix
+  # matches one of those negation options or the user has the `complete-all`
+  # style set. Note that this prefix check has to be updated manually to account
+  # for all of the potential negation options listed below!
+  if
+    # We also want to list all of these options during testing
+    [[ $_RG_COMPLETE_LIST_ARGS == (1|t*|y*) ]] ||
+    # (--[imnp]* => --ignore*, --messages, --no-*, --pcre2-unicode)
+    [[ $PREFIX$SUFFIX == --[imnp]* ]] ||
+    zstyle -t ":complete:$curcontext:*" complete-all
+  then
+    no=
+  fi
+
+  # We make heavy use of argument groups here to prevent the option specs from
+  # growing unwieldy. These aren't supported in zsh <5.4, though, so we'll strip
+  # them out below if necessary. This makes the exclusions inaccurate on those
+  # older versions, but oh well — it's not that big a deal
+  args=(
+    + '(exclusive)' # Misc. fully exclusive options
+    '(: * -)'{-h,--help}'[display help information]'
+    '(: * -)'{-V,--version}'[display version information]'
+
+    + '(buffered)' # buffering options
+    '--line-buffered[force line buffering]'
+    $no"--no-line-buffered[don't force line buffering]"
+    '--block-buffered[force block buffering]'
+    $no"--no-block-buffered[don't force block buffering]"
+
+    + '(case)' # Case-sensitivity options
+    {-i,--ignore-case}'[search case-insensitively]'
+    {-s,--case-sensitive}'[search case-sensitively]'
+    {-S,--smart-case}'[search case-insensitively if pattern is all lowercase]'
+
+    + '(context-a)' # Context (after) options
+    '(context-c)'{-A+,--after-context=}'[specify lines to show after each match]:number of lines'
+
+    + '(context-b)' # Context (before) options
+    '(context-c)'{-B+,--before-context=}'[specify lines to show before each match]:number of lines'
+
+    + '(context-c)' # Context (combined) options
+    '(context-a context-b)'{-C+,--context=}'[specify lines to show before and after each match]:number of lines'
+
+    + '(column)' # Column options
+    '--column[show column numbers for matches]'
+    $no"--no-column[don't show column numbers for matches]"
+
+    + '(count)' # Counting options
+    {-c,--count}'[only show count of matching lines for each file]'
+    '--count-matches[only show count of individual matches for each file]'
+
+    + '(encoding)' # Encoding options
+    {-E+,--encoding=}'[specify text encoding of files to search]: :_rg_encodings'
+    $no'--no-encoding[use default text encoding]'
+
+    + file # File-input options
+    '(1)*'{-f+,--file=}'[specify file containing patterns to search for]: :_files'
+
+    + '(file-match)' # Files with/without match options
+    '(stats)'{-l,--files-with-matches}'[only show names of files with matches]'
+    '(stats)--files-without-match[only show names of files without matches]'
+
+    + '(file-name)' # File-name options
+    {-H,--with-filename}'[show file name for matches]'
+    "--no-filename[don't show file name for matches]"
+
+    + '(file-system)' # File system options
+    "--one-file-system[don't descend into directories on other file systems]"
+    $no'--no-one-file-system[descend into directories on other file systems]'
+
+    + '(fixed)' # Fixed-string options
+    {-F,--fixed-strings}'[treat pattern as literal string instead of regular expression]'
+    $no"--no-fixed-strings[don't treat pattern as literal string]"
+
+    + '(follow)' # Symlink-following options
+    {-L,--follow}'[follow symlinks]'
+    $no"--no-follow[don't follow symlinks]"
+
+    + glob # File-glob options
+    '*'{-g+,--glob=}'[include/exclude files matching specified glob]:glob'
+    '*--iglob=[include/exclude files matching specified case-insensitive glob]:glob'
+
+    + '(heading)' # Heading options
+    '(pretty-vimgrep)--heading[show matches grouped by file name]'
+    "(pretty-vimgrep)--no-heading[don't show matches grouped by file name]"
+
+    + '(hidden)' # Hidden-file options
+    '--hidden[search hidden files and directories]'
+    $no"--no-hidden[don't search hidden files and directories]"
+
+    + '(ignore)' # Ignore-file options
+    "(--no-ignore-global --no-ignore-parent --no-ignore-vcs)--no-ignore[don't respect ignore files]"
+    $no'(--ignore-global --ignore-parent --ignore-vcs)--ignore[respect ignore files]'
+
+    + '(ignore-global)' # Global ignore-file options
+    "--no-ignore-global[don't respect global ignore files]"
+    $no'--ignore-global[respect global ignore files]'
+
+    + '(ignore-parent)' # Parent ignore-file options
+    "--no-ignore-parent[don't respect ignore files in parent directories]"
+    $no'--ignore-parent[respect ignore files in parent directories]'
+
+    + '(ignore-vcs)' # VCS ignore-file options
+    "--no-ignore-vcs[don't respect version control ignore files]"
+    $no'--ignore-vcs[respect version control ignore files]'
+
+    + '(json)' # JSON options
+    '--json[output results in JSON Lines format]'
+    $no"--no-json[don't output results in JSON Lines format]"
+
+    + '(line-number)' # Line-number options
+    {-n,--line-number}'[show line numbers for matches]'
+    {-N,--no-line-number}"[don't show line numbers for matches]"
+
+    + '(line-terminator)' # Line-terminator options
+    '--crlf[use CRLF as line terminator]'
+    $no"--no-crlf[don't use CRLF as line terminator]"
+    '(text)--null-data[use NUL as line terminator]'
+
+    + '(max-depth)' # Directory-depth options
+    '--max-depth=[specify max number of directories to descend]:number of directories'
+    '!--maxdepth=:number of directories'
+
+    + '(messages)' # Error-message options
+    '(--no-ignore-messages)--no-messages[suppress some error messages]'
+    $no"--messages[don't suppress error messages affected by --no-messages]"
+
+    + '(messages-ignore)' # Ignore-error message options
+    "--no-ignore-messages[don't show ignore-file parse error messages]"
+    $no'--ignore-messages[show ignore-file parse error messages]'
+
+    + '(mmap)' # mmap options
+    '--mmap[search using memory maps when possible]'
+    "--no-mmap[don't search using memory maps]"
+
+    + '(multiline)' # Multiline options
+    {-U,--multiline}'[permit matching across multiple lines]'
+    $no'(multiline-dotall)--no-multiline[restrict matches to at most one line each]'
+
+    + '(multiline-dotall)' # Multiline DOTALL options
+    '(--no-multiline)--multiline-dotall[allow "." to match newline (with -U)]'
+    $no"(--no-multiline)--no-multiline-dotall[don't allow \".\" to match newline (with -U)]"
+
+    + '(only)' # Only-match options
+    {-o,--only-matching}'[show only matching part of each line]'
+
+    + '(passthru)' # Pass-through options
+    '(--vimgrep)--passthru[show both matching and non-matching lines]'
+    '!(--vimgrep)--passthrough'
+
+    + '(pcre2)' # PCRE2 options
+    {-P,--pcre2}'[enable matching with PCRE2]'
+    $no'(pcre2-unicode)--no-pcre2[disable matching with PCRE2]'
+
+    + '(pcre2-unicode)' # PCRE2 Unicode options
+    $no'(--no-pcre2 --no-pcre2-unicode)--pcre2-unicode[enable PCRE2 Unicode mode (with -P)]'
+    '(--no-pcre2 --pcre2-unicode)--no-pcre2-unicode[disable PCRE2 Unicode mode (with -P)]'
+
+    + '(pre)' # Preprocessing options
+    '(-z --search-zip)--pre=[specify preprocessor utility]:preprocessor utility:_command_names -e'
+    $no'--no-pre[disable preprocessor utility]'
+
+    + pre-glob # Preprocessing glob options
+    '*--pre-glob[include/exclude files for preprocessing with --pre]'
+
+    + '(pretty-vimgrep)' # Pretty/vimgrep display options
+    '(heading)'{-p,--pretty}'[alias for --color=always --heading -n]'
+    '(heading passthru)--vimgrep[show results in vim-compatible format]'
+
+    + regexp # Explicit pattern options
+    '(1 file)*'{-e+,--regexp=}'[specify pattern]:pattern'
+
+    + '(replace)' # Replacement options
+    {-r+,--replace=}'[specify string used to replace matches]:replace string'
+
+    + '(sort)' # File-sorting options
+    '(threads)--sort=[sort results in ascending order (disables parallelism)]:sort method:((
+      none\:"no sorting"
+      path\:"sort by file path"
+      modified\:"sort by last modified time"
+      accessed\:"sort by last accessed time"
+      created\:"sort by creation time"
+    ))'
+    '(threads)--sortr=[sort results in descending order (disables parallelism)]:sort method:((
+      none\:"no sorting"
+      path\:"sort by file path"
+      modified\:"sort by last modified time"
+      accessed\:"sort by last accessed time"
+      created\:"sort by creation time"
+    ))'
+    '!(threads)--sort-files[sort results by file path (disables parallelism)]'
+
+    + '(stats)' # Statistics options
+    '(--files file-match)--stats[show search statistics]'
+    $no"--no-stats[don't show search statistics]"
+
+    + '(text)' # Binary-search options
+    {-a,--text}'[search binary files as if they were text]'
+    $no"(--null-data)--no-text[don't search binary files as if they were text]"
+
+    + '(threads)' # Thread-count options
+    '(sort)'{-j+,--threads=}'[specify approximate number of threads to use]:number of threads'
+
+    + '(trim)' # Trim options
+    '--trim[trim any ASCII whitespace prefix from each line]'
+    $no"--no-trim[don't trim ASCII whitespace prefix from each line]"
+
+    + type # Type options
+    '*'{-t+,--type=}'[only search files matching specified type]: :_rg_types'
+    '*--type-add=[add new glob for specified file type]: :->typespec'
+    '*--type-clear=[clear globs previously defined for specified file type]: :_rg_types'
+    # This should actually be exclusive with everything but other type options
+    '(: *)--type-list[show all supported file types and their associated globs]'
+    '*'{-T+,--type-not=}"[don't search files matching specified file type]: :_rg_types"
+
+    + '(word-line)' # Whole-word/line match options
+    {-w,--word-regexp}'[only show matches surrounded by word boundaries]'
+    {-x,--line-regexp}'[only show matches surrounded by line boundaries]'
+
+    + '(zip)' # Compression options
+    '(--pre)'{-z,--search-zip}'[search in compressed files]'
+    $no"--no-search-zip[don't search in compressed files]"
+
+    + misc # Other options — no need to separate these at the moment
+    '(-b --byte-offset)'{-b,--byte-offset}'[show 0-based byte offset for each matching line]'
+    '--color=[specify when to use colors in output]:when:((
+      never\:"never use colors"
+      auto\:"use colors or not based on stdout, TERM, etc."
+      always\:"always use colors"
+      ansi\:"always use ANSI colors (even on Windows)"
+    ))'
+    '*--colors=[specify color and style settings]: :->colorspec'
+    '--context-separator=[specify string used to separate non-continuous context lines in output]:separator'
+    '--debug[show debug messages]'
+    '--dfa-size-limit=[specify upper size limit of generated DFA]:DFA size (bytes)'
+    "(1 stats)--files[show each file that would be searched (but don't search)]"
+    '*--ignore-file=[specify additional ignore file]:ignore file:_files'
+    '(-v --invert-match)'{-v,--invert-match}'[invert matching]'
+    '(-M --max-columns)'{-M+,--max-columns=}'[specify max length of lines to print]:number of bytes'
+    '(-m --max-count)'{-m+,--max-count=}'[specify max number of matches per file]:number of matches'
+    '--max-filesize=[specify size above which files should be ignored]:file size (bytes)'
+    "--no-config[don't load configuration files]"
+    '(-0 --null)'{-0,--null}'[print NUL byte after file names]'
+    '--path-separator=[specify path separator to use when printing file names]:separator'
+    '(-q --quiet)'{-q,--quiet}'[suppress normal output]'
+    '--regex-size-limit=[specify upper size limit of compiled regex]:regex size (bytes)'
+    '*'{-u,--unrestricted}'[reduce level of "smart" searching]'
+
+    + operand # Operands
+    '(--files --type-list file regexp)1: :_guard "^-*" pattern'
+    '(--type-list)*: :_files'
+  )
+
+  # This is used with test_complete.sh to verify that there are no options
+  # listed in the help output that aren't also defined here
+  [[ $_RG_COMPLETE_LIST_ARGS == (1|t*|y*) ]] && {
+    print -rl - $args
+    return 0
+  }
+
+  # Strip out argument groups where unsupported (see above)
+  [[ $ZSH_VERSION == (4|5.<0-3>)(.*)# ]] &&
+  args=( ${(@)args:#(#i)(+|[a-z0-9][a-z0-9_-]#|\([a-z0-9][a-z0-9_-]#\))} )
+
+  _arguments -C -s -S : $args && ret=0
+
+  case $state in
+    colorspec)
+      if [[ ${IPREFIX#--*=}$PREFIX == [^:]# ]]; then
+        suf=( -qS: )
+        tmp=(
+          'column:specify coloring for column numbers'
+          'line:specify coloring for line numbers'
+          'match:specify coloring for match text'
+          'path:specify coloring for file names'
+        )
+        descr='color/style type'
+      elif [[ ${IPREFIX#--*=}$PREFIX == (column|line|match|path):[^:]# ]]; then
+        suf=( -qS: )
+        tmp=(
+          'none:clear color/style for type'
+          'bg:specify background color'
+          'fg:specify foreground color'
+          'style:specify text style'
+        )
+        descr='color/style attribute'
+      elif [[ ${IPREFIX#--*=}$PREFIX == [^:]##:(bg|fg):[^:]# ]]; then
+        tmp=( black blue green red cyan magenta yellow white )
+        descr='color name or r,g,b'
+      elif [[ ${IPREFIX#--*=}$PREFIX == [^:]##:style:[^:]# ]]; then
+        tmp=( {,no}bold {,no}intense {,no}underline )
+        descr='style name'
+      else
+        _message -e colorspec 'no more arguments'
+      fi
+
+      (( $#tmp )) && {
+        compset -P '*:'
+        _describe -t colorspec $descr tmp $suf && ret=0
+      }
+      ;;
+
+    typespec)
+      if compset -P '[^:]##:include:'; then
+        _sequence -s , _rg_types && ret=0
+      # @todo This bit in particular could be better, but it's a little
+      # complex, and attempting to solve it seems to run us up against a crash
+      # bug — zsh # 40362
+      elif compset -P '[^:]##:'; then
+        _message 'glob or include directive' && ret=1
+      elif [[ ! -prefix *:* ]]; then
+        _rg_types -qS : && ret=0
+      fi
+      ;;
+  esac
+
+  return ret
+}
+
+# Complete encodings
+_rg_encodings() {
+  local -a expl
+  local -aU _encodings
+
+  # This is impossible to read, but these encodings rarely if ever change, so it
+  # probably doesn't matter. They are derived from the list given here:
+  # https://encoding.spec.whatwg.org/#concept-encoding-get
+  _encodings=(
+    {{,us-}ascii,arabic,chinese,cyrillic,greek{,8},hebrew,korean}
+    logical visual mac {,cs}macintosh x-mac-{cyrillic,roman,ukrainian}
+    866 ibm{819,866} csibm866
+    big5{,-hkscs} {cn-,cs}big5 x-x-big5
+    cp{819,866,125{0..8}} x-cp125{0..8}
+    csiso2022{jp,kr} csiso8859{6,8}{e,i}
+    csisolatin{{1..6},9} csisolatin{arabic,cyrillic,greek,hebrew}
+    ecma-{114,118} asmo-708 elot_928 sun_eu_greek
+    euc-{jp,kr} x-euc-jp cseuckr cseucpkdfmtjapanese
+    {,x-}gbk csiso58gb231280 gb18030 {,cs}gb2312 gb_2312{,-80} hz-gb-2312
+    iso-2022-{cn,cn-ext,jp,kr}
+    iso8859{,-}{{1..11},13,14,15}
+    iso-8859-{{1..11},{6,8}-{e,i},13,14,15,16} iso_8859-{{1..9},15}
+    iso_8859-{1,2,6,7}:1987 iso_8859-{3,4,5,8}:1988 iso_8859-9:1989
+    iso-ir-{58,100,101,109,110,126,127,138,144,148,149,157}
+    koi{,8,8-r,8-ru,8-u,8_r} cskoi8r
+    ks_c_5601-{1987,1989} ksc{,_}5691 csksc56011987
+    latin{1..6} l{{1..6},9}
+    shift{-,_}jis csshiftjis {,x-}sjis ms_kanji ms932
+    utf{,-}8 utf-16{,be,le} unicode-1-1-utf-8
+    windows-{31j,874,949,125{0..8}} dos-874 tis-620 ansi_x3.4-1968
+    x-user-defined auto
+  )
+
+  _wanted encodings expl encoding compadd -a "$@" - _encodings
+}
+
+# Complete file types
+_rg_types() {
+  local -a expl
+  local -aU _types
+
+  _types=( ${(@)${(f)"$( _call_program types rg --type-list )"}%%:*} )
+
+  _wanted types expl 'file type' compadd -a "$@" - _types
+}
+
+_rg "$@"
+
+
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#     * Redistributions of source code must retain the above copyright
+#       notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#     * Neither the name of the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL ZSH-USERS BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for ripgrep
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * arcizan <ghostrevery@gmail.com>
+#  * MaskRay <i@maskray.me>
+#
+# ------------------------------------------------------------------------------
+
+# Local Variables:
+# mode: shell-script
+# coding: utf-8-unix
+# indent-tabs-mode: nil
+# sh-indentation: 2
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
-- 
cgit v1.2.3-70-g09d2


From d79415b17d1c730b87bcbf76e691e344c9cb4694 Mon Sep 17 00:00:00 2001
From: SomeDer <48731521+SomeDer@users.noreply.github.com>
Date: Mon, 25 Mar 2019 21:19:46 +0000
Subject: command-not-found: add support for NixOS (#7701)

---
 plugins/command-not-found/README.md                    | 1 +
 plugins/command-not-found/command-not-found.plugin.zsh | 7 +++++++
 2 files changed, 8 insertions(+)

(limited to 'plugins')

diff --git a/plugins/command-not-found/README.md b/plugins/command-not-found/README.md
index df62d1f07..1cf4ba66e 100644
--- a/plugins/command-not-found/README.md
+++ b/plugins/command-not-found/README.md
@@ -27,5 +27,6 @@ It works out of the box with the command-not-found packages for:
 - [Arch Linux](https://wiki.archlinux.org/index.php/Pkgfile#Command_not_found)
 - [macOS (Homebrew)](https://github.com/Homebrew/homebrew-command-not-found)
 - [Fedora](https://fedoraproject.org/wiki/Features/PackageKitCommandNotFound)
+- [NixOS](https://github.com/NixOS/nixpkgs/tree/master/nixos/modules/programs/command-not-found)
 
 You can add support for other platforms by submitting a Pull Request.
diff --git a/plugins/command-not-found/command-not-found.plugin.zsh b/plugins/command-not-found/command-not-found.plugin.zsh
index ba1262de6..dd1186e44 100644
--- a/plugins/command-not-found/command-not-found.plugin.zsh
+++ b/plugins/command-not-found/command-not-found.plugin.zsh
@@ -31,3 +31,10 @@ if type brew &> /dev/null; then
     eval "$(brew command-not-found-init)";
   fi
 fi
+
+# NixOS command-not-found support
+if [ -x /run/current-system/sw/bin/command-not-found ]; then
+    command_not_found_handler () {
+        /run/current-system/sw/bin/command-not-found $@
+    }
+fi
-- 
cgit v1.2.3-70-g09d2


From ae7d0bcdb9d22a2de4150f2f00a5c0a26b857c48 Mon Sep 17 00:00:00 2001
From: Andrey Skurlatov <a.skurlatov@gmail.com>
Date: Tue, 26 Mar 2019 00:36:46 +0300
Subject: golang: mod and list commands completion (#7665)

Also, add `gom` alias to `go mod`.
---
 plugins/golang/golang.plugin.zsh | 79 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 78 insertions(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/golang/golang.plugin.zsh b/plugins/golang/golang.plugin.zsh
index 8284ab83c..47b10988e 100644
--- a/plugins/golang/golang.plugin.zsh
+++ b/plugins/golang/golang.plugin.zsh
@@ -28,6 +28,7 @@ __go_tool_complete() {
     'help[display help]'
     'install[compile and install packages and dependencies]'
     'list[list packages]'
+    'mod[modules maintenance]'
     'run[compile and run Go program]'
     'test[test packages]'
     'tool[run specified go tool]'
@@ -83,7 +84,7 @@ __go_tool_complete() {
       "-x[print remove commands as it executes them]" \
       "*:importpaths:__go_packages"
       ;;
-  fix|fmt|list|vet)
+  fix|fmt|vet)
       _alternative ':importpaths:__go_packages' ':files:_path_files -g "*.go"'
       ;;
   install)
@@ -124,6 +125,81 @@ __go_tool_complete() {
         "-memprofilerate[set heap profiling rate]:number" \
         "*:args:{ _alternative ':importpaths:__go_packages' ':files:_path_files -g \"*.go\"' }"
       ;;
+  list)
+      _arguments -s -w : \
+        "-f[alternative format for the list]:format" \
+        "-json[print data in json format]" \
+        "-compiled[set CompiledGoFiles to the Go source files presented to the compiler]" \
+        "-deps[iterate over not just the named packages but also all their dependencies]" \
+        "-e[change the handling of erroneous packages]" \
+        "-export[set the Export field to the name of a file containing up-to-date export information for the given package]" \
+        "-find[identify the named packages but not resolve their dependencies]" \
+        "-test[report not only the named packages but also their test binaries]" \
+        "-m[list modules instead of packages]" \
+        "-u[adds information about available upgrades]" \
+        "-versions[set the Module's Versions field to a list of all known versions of that module]:number" \
+        "*:importpaths:__go_packages"
+      ;;
+  mod)
+      typeset -a mod_commands
+      mod_commands+=(
+        'download[download modules to local cache]'
+        'edit[edit go.mod from tools or scripts]'
+        'graph[print module requirement graph]'
+        'init[initialize new module in current directory]'
+        'tidy[add missing and remove unused modules]'
+        'vendor[make vendored copy of dependencies]'
+        'verify[verify dependencies have expected content]'
+        'why[explain why packages or modules are needed]'
+      )
+      if (( CURRENT == 3 )); then
+          _values 'go mod commands' ${mod_commands[@]} "help[display help]"
+          return
+      fi
+      case ${words[3]} in
+      help)
+        _values 'go mod commands' ${mod_commands[@]}
+        ;;
+      download)
+        _arguments -s -w : \
+          "-json[print a sequence of JSON objects standard output]" \
+          "*:flags"
+        ;;
+      edit)
+        _arguments -s -w : \
+          "-fmt[reformat the go.mod file]" \
+          "-module[change the module's path]" \
+          "-replace[=old{@v}=new{@v} add a replacement of the given module path and version pair]:name" \
+          "-dropreplace[=old{@v}=new{@v} drop a replacement of the given module path and version pair]:name" \
+          "-go[={version} set the expected Go language version]:number" \
+          "-print[print the final go.mod in its text format]" \
+          "-json[print the final go.mod file in JSON format]" \
+          "*:flags"
+        ;;
+      graph)
+        ;;
+      init)   
+        ;;
+      tidy)
+        _arguments -s -w : \
+          "-v[print information about removed modules]" \
+          "*:flags"
+        ;;
+      vendor)
+        _arguments -s -w : \
+          "-v[print the names of vendored]" \
+          "*:flags"
+        ;;
+      verify)
+        ;;
+      why)
+        _arguments -s -w : \
+          "-m[treats the arguments as a list of modules and finds a path to any package in each of the modules]" \
+          "-vendor[exclude tests of dependencies]" \
+          "*:importpaths:__go_packages"
+        ;;
+      esac
+      ;;
   help)
       _values "${commands[@]}" \
         'environment[show Go environment variables available]' \
@@ -189,6 +265,7 @@ alias gofa='go fmt ./...'
 alias gog='go get'
 alias goi='go install'
 alias gol='go list'
+alias gom='go mod'
 alias gop='cd $GOPATH'
 alias gopb='cd $GOPATH/bin'
 alias gops='cd $GOPATH/src'
-- 
cgit v1.2.3-70-g09d2


From a441f64d090d30856a1f56a10820b219ffc10e18 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Mon, 25 Mar 2019 22:40:50 +0100
Subject: Update _cargo completion to 0.34.0 version

---
 plugins/cargo/_cargo | 193 ++++++++++++++++++++++++++-------------------------
 1 file changed, 99 insertions(+), 94 deletions(-)

(limited to 'plugins')

diff --git a/plugins/cargo/_cargo b/plugins/cargo/_cargo
index a8c58ecc5..395c517cd 100644
--- a/plugins/cargo/_cargo
+++ b/plugins/cargo/_cargo
@@ -1,23 +1,37 @@
 #compdef cargo
 
-typeset -A opt_args
 autoload -U regexp-replace
 
+zstyle -T ':completion:*:*:cargo:*' tag-order && \
+  zstyle ':completion:*:*:cargo:*' tag-order 'common-commands'
+
 _cargo() {
+local context state state_descr line
+typeset -A opt_args
 
+# leading items in parentheses are an exclusion list for the arguments following that arg
+# See: http://zsh.sourceforge.net/Doc/Release/Completion-System.html#Completion-Functions
+#   - => exclude all other options
+#   1 => exclude positional arg 1
+#   * => exclude all other args
+#   +blah => exclude +blah
 _arguments \
     '(- 1 *)'{-h,--help}'[show help message]' \
+    '(- 1 *)--list[list installed commands]' \
     '(- 1 *)'{-V,--version}'[show version information]' \
-    '(- 1 *)'--list'[list installed commands]' \
-    '(- 1 *)'--explain'[Run `rustc --explain CODE`]' \
-    '(- 1 *)'{-v,--verbose}'[use verbose output]' \
-    '(- 1 *)'--color'[colorization option]' \
-    '(- 1 *)'--frozen'[Require Cargo.lock and cache are up to date]' \
-    '(- 1 *)'--locked'[Require Cargo.lock is up to date]' \
-    '1: :_cargo_cmds' \
+    {-v,--verbose}'[use verbose output]' \
+    --color'[colorization option]' \
+    '(+beta +nightly)+stable[use the stable toolchain]' \
+    '(+stable +nightly)+beta[use the beta toolchain]' \
+    '(+stable +beta)+nightly[use the nightly toolchain]' \
+    '1: :->command' \
     '*:: :->args'
 
 case $state in
+    command)
+      _alternative 'common-commands:common:_cargo_cmds' 'all-commands:all:_cargo_all_cmds'
+      ;;
+
     args)
         case $words[1] in
             bench)
@@ -31,11 +45,10 @@ case $state in
                     '--no-default-features[do not build the default features]' \
                     '--no-run[compile but do not run]' \
                     '(-p,--package)'{-p=,--package=}'[package to run benchmarks for]:packages:_get_package_names' \
-                    '--target=[target triple]: :_get_targets' \
+                    '--target=[target triple]' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
                     '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
-                    '--message-format=[error format]:format option:(human json)' \
-                    '--color=[coloring]:colorization option:(auto always never)' \
+                    '--color=:colorization option:(auto always never)' \
                     ;;
 
             build)
@@ -49,11 +62,27 @@ case $state in
                     '--no-default-features[do not build the default features]' \
                     '(-p,--package)'{-p=,--package=}'[package to build]:packages:_get_package_names' \
                     '--release=[build in release mode]' \
-                    '--target=[target triple]: :_get_targets' \
+                    '--target=[target triple]' \
+                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
+                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
+                    '--color=:colorization option:(auto always never)' \
+                    ;;
+
+            check)
+                _arguments \
+                    '--features=[space separated feature list]' \
+                    '--all-features[enable all available features]' \
+                    '(-h, --help)'{-h,--help}'[show help message]' \
+                    '(-j, --jobs)'{-j,--jobs}'[number of parallel jobs, defaults to # of CPUs]' \
+                    "${command_scope_spec[@]}" \
+                    '--manifest-path=[path to manifest]: :_files -/' \
+                    '--no-default-features[do not check the default features]' \
+                    '(-p,--package)'{-p=,--package=}'[package to check]:packages:_get_package_names' \
+                    '--release=[check in release mode]' \
+                    '--target=[target triple]' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
                     '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
-                    '--message-format=[error format]:format option:(human json)' \
-                    '--color=[coloring]:colorization option:(auto always never)' \
+                    '--color=:colorization option:(auto always never)' \
                     ;;
 
             clean)
@@ -63,9 +92,9 @@ case $state in
                     '(-p,--package)'{-p=,--package=}'[package to clean]:packages:_get_package_names' \
                     '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
                     '--release[whether or not to clean release artifacts]' \
-                    '--target=[target triple(default:all)]: :_get_targets' \
+                    '--target=[target triple(default:all)]' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=[coloring]:colorization option:(auto always never)' \
+                    '--color=:colorization option:(auto always never)' \
                     ;;
 
             doc)
@@ -81,9 +110,9 @@ case $state in
                     '(-p, --package)'{-p,--package}'=[package to document]' \
                     '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
                     '--release[build artifacts in release mode, with optimizations]' \
-                    '--target=[build for the target triple]: :_get_targets' \
+                    '--target=[build for the target triple]' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=[coloring]:colorization option:(auto always never)' \
+                    '--color=:colorization option:(auto always never)' \
                     ;;
 
             fetch)
@@ -92,7 +121,7 @@ case $state in
                     '--manifest-path=[path to manifest]: :_files -/' \
                     '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=[coloring]:colorization option:(auto always never)' \
+                    '--color=:colorization option:(auto always never)' \
                     ;;
 
             generate-lockfile)
@@ -101,17 +130,17 @@ case $state in
                     '--manifest-path=[path to manifest]: :_files -/' \
                     '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=[coloring]:colorization option:(auto always never)' \
+                    '--color=:colorization option:(auto always never)' \
                     ;;
 
             git-checkout)
                 _arguments \
                     '(-h, --help)'{-h,--help}'[show help message]' \
-                    'q(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
+                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
                     '--reference=[REF]' \
                     '--url=[URL]' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=[coloring]:colorization option:(auto always never)' \
+                    '--color=:colorization option:(auto always never)' \
                     ;;
 
             help)
@@ -128,14 +157,14 @@ case $state in
                     '--name=[set the resulting package name]' \
                     '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=[coloring]:colorization option:(auto always never)' \
+                    '--color=:colorization option:(auto always never)' \
                     ;;
 
             install)
                 _arguments \
                     '--bin=[only install the specified binary]' \
                     '--branch=[branch to use when installing from git]' \
-                    '--color=[coloring]:colorization option:(auto always never)' \
+                    '--color=:colorization option:(auto always never)' \
                     '--debug[build in debug mode instead of release mode]' \
                     '--example[install the specified example instead of binaries]' \
                     '--features=[space separated feature list]' \
@@ -144,10 +173,10 @@ case $state in
                     '(-h, --help)'{-h,--help}'[show help message]' \
                     '(-j, --jobs)'{-j,--jobs}'[number of parallel jobs, defaults to # of CPUs]' \
                     '--no-default-features[do not build the default features]' \
-                    '--path=[local filesystem path to crate to install]' \
+                    '--path=[local filesystem path to crate to install]: :_files -/' \
                     '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
                     '--rev=[specific commit to use when installing from git]' \
-                    '--root=[directory to install packages into]' \
+                    '--root=[directory to install packages into]: :_files -/' \
                     '--tag=[tag to use when installing from git]' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
                     '--vers=[version to install from crates.io]' \
@@ -165,7 +194,7 @@ case $state in
                     '--host=[Host to set the token for]' \
                     '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=[coloring]:colorization option:(auto always never)' \
+                    '--color=:colorization option:(auto always never)' \
                     ;;
 
             metadata)
@@ -179,7 +208,7 @@ case $state in
                     '--features=[space separated feature list]' \
                     '--all-features[enable all available features]' \
                     '--format-version=[format version(default: 1)]' \
-                    '--color=[coloring]:colorization option:(auto always never)' \
+                    '--color=:colorization option:(auto always never)' \
                     ;;
 
             new)
@@ -190,7 +219,7 @@ case $state in
                     '--name=[set the resulting package name]' \
                     '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=[coloring]:colorization option:(auto always never)' \
+                    '--color=:colorization option:(auto always never)' \
                     ;;
 
             owner)
@@ -203,7 +232,7 @@ case $state in
                     '(-r, --remove)'{-r,--remove}'[remove owner LOGIN]' \
                     '--token[API token to use when authenticating]' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=[coloring]:colorization option:(auto always never)' \
+                    '--color=:colorization option:(auto always never)' \
                     ;;
 
             package)
@@ -215,7 +244,7 @@ case $state in
                     '--no-verify[do not build to verify contents]' \
                     '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=[coloring]:colorization option:(auto always never)' \
+                    '--color=:colorization option:(auto always never)' \
                     ;;
 
             pkgid)
@@ -224,7 +253,7 @@ case $state in
                     '--manifest-path=[path to manifest]: :_files -/' \
                     '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=[coloring]:colorization option:(auto always never)' \
+                    '--color=:colorization option:(auto always never)' \
                     ;;
 
             publish)
@@ -236,7 +265,7 @@ case $state in
                     '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
                     '--token[token to use when uploading]' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=[coloring]:colorization option:(auto always never)' \
+                    '--color=:colorization option:(auto always never)' \
                     ;;
 
             read-manifest)
@@ -244,7 +273,7 @@ case $state in
                     '(-h, --help)'{-h,--help}'[show help message]' \
                     '--manifest-path=[path to manifest]: :_files -/' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=[coloring]:colorization option:(auto always never)' \
+                    '--color=:colorization option:(auto always never)' \
                     ;;
 
             run)
@@ -261,52 +290,49 @@ case $state in
                     '--release=[build in release mode]' \
                     '--target=[target triple]' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--message-format=[error format]:format option:(human json)' \
-                    '--color=[coloring]:colorization option:(auto always never)' \
+                    '--color=:colorization option:(auto always never)' \
                     '*: :_normal' \
                     ;;
 
             rustc)
                 _arguments \
-                    '--message-format=[error format]:format option:(human json)' \
-                    '--color=[coloring]:colorization option:(auto always never)' \
+                    '--color=:colorization option:(auto always never)' \
                     '--features=[features to compile for the package]' \
                     '--all-features[enable all available features]' \
                     '(-h, --help)'{-h,--help}'[show help message]' \
                     '(-j, --jobs)'{-j,--jobs}'=[number of parallel jobs, defaults to # of CPUs]' \
-                    '--manifest-path=[path to the manifest to fetch dependencies for]' \
+                    '--manifest-path=[path to the manifest to fetch dependencies for]: :_files -/' \
                     '--no-default-features[do not compile default features for the package]' \
                     '(-p, --package)'{-p,--package}'=[profile to compile for]' \
                     '--profile=[profile to build the selected target for]' \
                     '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
                     '--release[build artifacts in release mode, with optimizations]' \
-                    '--target=[target triple which compiles will be for]: :_get_targets' \
+                    '--target=[target triple which compiles will be for]' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
                     "${command_scope_spec[@]}" \
                     ;;
 
             rustdoc)
                 _arguments \
-                    '--message-format=[error format]:format option:(human json)' \
-                    '--color=[coloring]:colorization option:(auto always never)' \
+                    '--color=:colorization option:(auto always never)' \
                     '--features=[space-separated list of features to also build]' \
                     '--all-features[enable all available features]' \
                     '(-h, --help)'{-h,--help}'[show help message]' \
                     '(-j, --jobs)'{-j,--jobs}'=[number of parallel jobs, defaults to # of CPUs]' \
-                    '--manifest-path=[path to the manifest to document]' \
+                    '--manifest-path=[path to the manifest to document]: :_files -/' \
                     '--no-default-features[do not build the `default` feature]' \
                     '--open[open the docs in a browser after the operation]' \
                     '(-p, --package)'{-p,--package}'=[package to document]' \
                     '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
                     '--release[build artifacts in release mode, with optimizations]' \
-                    '--target=[build for the target triple]: :_get_targets' \
+                    '--target=[build for the target triple]' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
                     "${command_scope_spec[@]}" \
                     ;;
 
             search)
                 _arguments \
-                    '--color=[coloring]:colorization option:(auto always never)' \
+                    '--color=:colorization option:(auto always never)' \
                     '(-h, --help)'{-h,--help}'[show help message]' \
                     '--host=[host of a registry to search in]' \
                     '--limit=[limit the number of results]' \
@@ -328,20 +354,28 @@ case $state in
                     '(-p,--package)'{-p=,--package=}'[package to run tests for]:packages:_get_package_names' \
                     '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
                     '--release[build artifacts in release mode, with optimizations]' \
-                    '--target=[target triple]: :_get_targets' \
+                    '--target=[target triple]' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--message-format=[error format]:format option:(human json)' \
-                    '--color=[coloring]:colorization option:(auto always never)' \
+                    '--color=:colorization option:(auto always never)' \
                     '1: :_test_names' \
+                    '(--doc --bin --example --test --bench)--lib[only test library]' \
+                    '(--lib --bin --example --test --bench)--doc[only test documentation]' \
+                    '(--lib --doc --example --test --bench)--bin=[binary name]' \
+                    '(--lib --doc --bin --test --bench)--example=[example name]' \
+                    '(--lib --doc --bin --example --bench)--test=[test name]' \
+                    '(--lib --doc --bin --example --test)--bench=[benchmark name]' \
+                    '--message-format:error format:(human json short)' \
+                    '--frozen[require lock and cache up to date]' \
+                    '--locked[require lock up to date]'
                     ;;
 
             uninstall)
                 _arguments \
                     '--bin=[only uninstall the binary NAME]' \
-                    '--color=[coloring]:colorization option:(auto always never)' \
+                    '--color=:colorization option:(auto always never)' \
                     '(-h, --help)'{-h,--help}'[show help message]' \
                     '(-q, --quiet)'{-q,--quiet}'[less output printed to stdout]' \
-                    '--root=[directory to uninstall packages from]' \
+                    '--root=[directory to uninstall packages from]: :_files -/' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
                     ;;
 
@@ -354,7 +388,7 @@ case $state in
                     '--precise=[update single dependency to PRECISE]: :' \
                     '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=[coloring]:colorization option:(auto always never)' \
+                    '--color=:colorization option:(auto always never)' \
                     ;;
 
             verify-project)
@@ -363,14 +397,14 @@ case $state in
                     '--manifest-path=[path to manifest]: :_files -/' \
                     '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=[coloring]:colorization option:(auto always never)' \
+                    '--color=:colorization option:(auto always never)' \
                     ;;
 
             version)
                 _arguments \
                     '(-h, --help)'{-h,--help}'[show help message]' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=[coloring]:colorization option:(auto always never)' \
+                    '--color=:colorization option:(auto always never)' \
                     ;;
 
             yank)
@@ -381,7 +415,7 @@ case $state in
                     '--token[API token to use when authenticating]' \
                     '--undo[undo a yank, putting a version back into the index]' \
                     '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=[coloring]:colorization option:(auto always never)' \
+                    '--color=:colorization option:(auto always never)' \
                     '--vers[yank version]' \
                     ;;
         esac
@@ -390,22 +424,22 @@ esac
 }
 
 _cargo_cmds(){
-local IFS=$'\n'
 local -a commands;commands=(
 'bench:execute all benchmarks of a local package'
-'build:compile the current project'
+'build:compile the current package'
+'check:check the current package without compiling'
 'clean:remove generated artifacts'
 'doc:build package documentation'
 'fetch:fetch package dependencies'
 'generate-lockfile:create lockfile'
 'git-checkout:git checkout'
 'help:get help for commands'
-'init:create new project in current directory'
+'init:create new package in current directory'
 'install:install a Rust binary'
 'locate-project:print "Cargo.toml" location'
 'login:login to remote server'
-'metadata:the metadata for a project in json'
-'new:create a new project'
+'metadata:the metadata for a package in json'
+'new:create a new package'
 'owner:manage the owners of a crate on the registry'
 'package:assemble local package into a distributable tarball'
 'pkgid:print a fully qualified package specification'
@@ -421,10 +455,13 @@ local -a commands;commands=(
 'verify-project:check Cargo.toml'
 'version:show version information'
 'yank:remove pushed file from index'
-$( cargo --list | sed -n '1!p' | tr -s ' ' | cut -d ' ' -f 2 | egrep -v "^bench$|^build$|^clean$|^doc$|^fetch$|^generate-lockfile$|^git-checkout$|^help$|^init$|^install$|^locate-project$|^login$|^metadata$|^new$|^owner$|^package$|^pkgid$|^publish$|^read-manifest$|^run$|^rustc$|^rustdoc$|^search$|^test$|^uninstall$|^update$|^verify-project$|^version$|^yank$" | sed "s/\(.*\)/echo \"\1:$\(cargo help \1 2>\&1 | head -n 1\)\"/" | sh )
 )
-_describe 'command' commands
+_describe -t common-commands 'common commands' commands
+}
 
+_cargo_all_cmds(){
+local -a commands;commands=($(cargo --list))
+_describe -t all-commands 'all commands' commands
 }
 
 
@@ -492,38 +529,7 @@ _benchmark_names()
     _get_names_from_array "bench"
 }
 
-#Gets the target names from config files
-_get_targets()
-{
-    local CURRENT_PATH
-    if [[ $(uname -o) = "Cygwin" && -f "$PWD"/Cargo.toml ]]; then
-            CURRENT_PATH=$PWD
-    else
-            CURRENT_PATH=$(_locate_manifest)
-    fi
-    if [[ -z "$CURRENT_PATH" ]]; then
-            return 1
-    fi
-    local -a TARGETS
-    local -a FIND_PATHS=( "/" )
-    local -a FLINES
-    local FIND_PATH FLINE
-    while [[ "$CURRENT_PATH" != "/" ]]; do
-        FIND_PATHS+=( "$CURRENT_PATH" )
-        CURRENT_PATH=$(dirname $CURRENT_PATH)
-    done
-    for FIND_PATH in ${FIND_PATHS[@]}; do
-        if [[ -f "$FIND_PATH"/.cargo/config ]]; then
-            FLINES=( `grep "$FIND_PATH"/.cargo/config -e "^\[target\."` )
-            for FLINE in ${FLINES[@]}; do
-                TARGETS+=(`sed 's/^\[target\.\(.*\)\]$/\1/' <<< $FLINE`)
-            done
-        fi
-    done
-    _describe 'target' TARGETS
-}
-
-# These flags are mutally exclusive specifiers for the scope of a command; as
+# These flags are mutually exclusive specifiers for the scope of a command; as
 # they are used in multiple places without change, they are expanded into the
 # appropriate command's `_arguments` where appropriate.
 set command_scope_spec
@@ -535,5 +541,4 @@ command_scope_spec=(
     '(--bench --bin --example --lib)--test=[test name]'
 )
 
-
 _cargo
-- 
cgit v1.2.3-70-g09d2


From 61a7bc2d4aa1012ca46d4a4bc8d0e7c20af675b7 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Mon, 25 Mar 2019 22:42:38 +0100
Subject: Update README

---
 plugins/cargo/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/cargo/README.md b/plugins/cargo/README.md
index 5fa688d21..31bae4efe 100644
--- a/plugins/cargo/README.md
+++ b/plugins/cargo/README.md
@@ -1,6 +1,6 @@
 # cargo
 
-This plugin adds completion for the Rust build tool [`cargo`](https://github.com/rust-lang/cargo).
+This plugin adds completion for the Rust build tool [`Cargo`](https://github.com/rust-lang/cargo).
 
 To use it, add `cargo` to the plugins array in your zshrc file:
 
@@ -8,4 +8,4 @@ To use it, add `cargo` to the plugins array in your zshrc file:
 plugins=(... cargo)
 ```
 
-Updated on October 4th, 2016.
+Updated on March 3rd, 2019, from [Cargo 0.34.0](https://github.com/rust-lang/cargo/releases/tag/0.34.0).
-- 
cgit v1.2.3-70-g09d2


From b7b40b0b68c791d57d91c7f4e17ed681d01d5c75 Mon Sep 17 00:00:00 2001
From: Jakub Łuczyński <doubleloop@users.noreply.github.com>
Date: Tue, 26 Mar 2019 14:44:58 +0100
Subject: fd: fix fd-find completions for debian (#7704)

In debian package, fd executable is renamed to fdfind.
---
 plugins/fd/_fd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/fd/_fd b/plugins/fd/_fd
index 7d65c7856..7a4c38753 100644
--- a/plugins/fd/_fd
+++ b/plugins/fd/_fd
@@ -1,4 +1,4 @@
-#compdef fd
+#compdef fd fdfind
 
 autoload -U is-at-least
 
-- 
cgit v1.2.3-70-g09d2


From 7fe353ccb64017abb4de43b7e947115b8ec58871 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Mon, 25 Mar 2019 16:55:28 +0100
Subject: ubuntu: clean up plugin and README

---
 plugins/ubuntu/README.md         | 68 ++++++++++++++++-------------
 plugins/ubuntu/ubuntu.plugin.zsh | 93 +++++++++++++---------------------------
 2 files changed, 68 insertions(+), 93 deletions(-)

(limited to 'plugins')

diff --git a/plugins/ubuntu/README.md b/plugins/ubuntu/README.md
index caa6a90b4..fd03f6afe 100644
--- a/plugins/ubuntu/README.md
+++ b/plugins/ubuntu/README.md
@@ -2,7 +2,7 @@
 
 This plugin adds completions and aliases for [Ubuntu](https://www.ubuntu.com/).
 
-To use it, add `ubuntu` to the plugins array in your zshrc file: 
+To use it, add `ubuntu` to the plugins array in your zshrc file:
 
 ```zsh
 plugins=(... ubuntu)
@@ -10,34 +10,34 @@ plugins=(... ubuntu)
 
 ## Aliases
 
-Commands that use `$APT` will use apt if installed or defer to apt-get otherwise. 
-
-| Alias   | Command                                                                | Description                                                                                       |
-|---------|------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------|
-| acs     | `apt-cache search`                                                     | Search the apt-cache with the specified criteria                                                  |
-| acp     | `apt-cache policy`                                                     | Display the package source priorities                                                             | 
-| afs     | `apt-file search --regexp`                                             | Perform a regular expression apt-file search                                                      |
-| afu     | `sudo apt-file update`                                                 | Generates or updates the apt-file package database                                                | 
-| ag      | `sudo $APT`                                                            | Run apt-get with sudo                                                                             | 
-| aga     | `sudo $APT autoclean`                                                  | Clears out the local reposityory of retrieved package files that can no longer be downloaded      | 
-| agb     | `sudo $APT build-dep <source_pkg>`                                     | Installs/Removes packages to satisfy the dependencies of a specified build pkg                    | 
-| agc     | `sudo $APT clean`                                                      | Clears out the local repository of retrieved package files leaving everything from the lock files | 
-| agd     | `sudo $APT dselect-upgrade`                                            | Follows dselect choices for package installation                                                  | 
-| agi     | `sudo $APT install <pkg>`                                              | Install the specified package                                                                     | 
-| agli    | `apt list --installed`                                                 | List the installed packages                                                                       | 
-| aglu    | `sudo apt-get -u upgrade --assume-no`                                  | Run an apt-get upgrade assuming no to all prompts                                                 | 
-| agp     | `sudo $APT purge <pkg>`                                                | Remove a package including any configuration files                                                | 
-| agr     | `sudo $APT remove <pkg>`                                               | Remove a package                                                                                  | 
-| ags     | `$APT source <pkg>`                                                    | Fetch the source for the specified package                                                        | 
-| agu     | `sudo $APT update`                                                     | Update package list                                                                               | 
-| agud    | `sudo $APT update && sudo $APT dist-upgrade`                           | Update packages list and perform a distribution upgrade                                           | 
-| agug    | `sudo $APT upgrade`                                                    | Upgrade available packages                                                                        | 
-| agar    | `sudo $APT autoremove`                                                 | Remove automatically installed packages no longer needed                                          | 
-| aguu    | `sudo $APT update && sudo $APT upgrade`                                | Update packages list and upgrade available packages                                               | 
-| allpkgs | `dpkg --get-selections \| grep -v deinstall`                           | Print all installed packages                                                                      | 
-| kclean  | `sudo aptitude remove -P ?and(~i~nlinux-(ima\|hea) ?not(~n$(uname -r)))`  |Remove ALL kernel images and headers EXCEPT the one in use                                         |
-| mydeb   | `time dpkg-buildpackage -rfakeroot -us -uc`                            | Create a basic .deb package                                                                       |
-| ppap    | `sudo ppa-purge <ppa>`                                                 | Remove the specified PPA                                                                          | 
+Commands that use `$APT` will use `apt` if installed or defer to `apt-get` otherwise.
+
+| Alias   | Command                                                                  | Description                                                                                       |
+|---------|--------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------|
+| acs     | `apt-cache search`                                                       | Search the apt-cache with the specified criteria                                                  |
+| acp     | `apt-cache policy`                                                       | Display the package source priorities                                                             |
+| afs     | `apt-file search --regexp`                                               | Perform a regular expression apt-file search                                                      |
+| afu     | `sudo apt-file update`                                                   | Generates or updates the apt-file package database                                                |
+| ag      | `sudo $APT`                                                              | Run apt-get with sudo                                                                             |
+| aga     | `sudo $APT autoclean`                                                    | Clears out the local reposityory of retrieved package files that can no longer be downloaded      |
+| agb     | `sudo $APT build-dep <source_pkg>`                                       | Installs/Removes packages to satisfy the dependencies of a specified build pkg                    |
+| agc     | `sudo $APT clean`                                                        | Clears out the local repository of retrieved package files leaving everything from the lock files |
+| agd     | `sudo $APT dselect-upgrade`                                              | Follows dselect choices for package installation                                                  |
+| agi     | `sudo $APT install <pkg>`                                                | Install the specified package                                                                     |
+| agli    | `apt list --installed`                                                   | List the installed packages                                                                       |
+| aglu    | `sudo apt-get -u upgrade --assume-no`                                    | Run an apt-get upgrade assuming no to all prompts                                                 |
+| agp     | `sudo $APT purge <pkg>`                                                  | Remove a package including any configuration files                                                |
+| agr     | `sudo $APT remove <pkg>`                                                 | Remove a package                                                                                  |
+| ags     | `$APT source <pkg>`                                                      | Fetch the source for the specified package                                                        |
+| agu     | `sudo $APT update`                                                       | Update package list                                                                               |
+| agud    | `sudo $APT update && sudo $APT dist-upgrade`                             | Update packages list and perform a distribution upgrade                                           |
+| agug    | `sudo $APT upgrade`                                                      | Upgrade available packages                                                                        |
+| agar    | `sudo $APT autoremove`                                                   | Remove automatically installed packages no longer needed                                          |
+| aguu    | `sudo $APT update && sudo $APT upgrade`                                  | Update packages list and upgrade available packages                                               |
+| allpkgs | `dpkg --get-selections \| grep -v deinstall`                             | Print all installed packages                                                                      |
+| kclean  | `sudo aptitude remove -P ?and(~i~nlinux-(ima\|hea) ?not(~n$(uname -r)))` |Remove ALL kernel images and headers EXCEPT the one in use                                         |
+| mydeb   | `time dpkg-buildpackage -rfakeroot -us -uc`                              | Create a basic .deb package                                                                       |
+| ppap    | `sudo ppa-purge <ppa>`                                                   | Remove the specified PPA                                                                          |
 
 
 ## Functions
@@ -47,6 +47,14 @@ Commands that use `$APT` will use apt if installed or defer to apt-get otherwise
 | aar               | `aar ppa:xxxxxx/xxxxxx [packagename]` | apt-add-repository with automatic install/upgrade of the desired package |
 | apt-history       | `apt-history <action>`                | Prints the Apt history of the specified action                           |
 | apt-list-packages | `apt-list-packages`                   | List packages by size                                                    |
-| kerndeb           | `kerndeb`                             | Kernel-package building shortcut                                         | 
+| kerndeb           | `kerndeb`                             | Kernel-package building shortcut                                         |
 
+## Authors:
 
+- [@AlexBio](https://github.com/AlexBio)
+- [@dbb](https://github.com/dbb)
+- [@Mappleconfusers](https://github.com/Mappleconfusers)
+- [@trinaldi](https://github.com/trinaldi)
+- [Nicolas Jonas](https://nextgenthemes.com)
+- [@loctauxphilippe](https://github.com/loctauxphilippe)
+- [@HaraldNordgren](https://github.com/HaraldNordgren)
diff --git a/plugins/ubuntu/ubuntu.plugin.zsh b/plugins/ubuntu/ubuntu.plugin.zsh
index 198f06743..6481fa371 100644
--- a/plugins/ubuntu/ubuntu.plugin.zsh
+++ b/plugins/ubuntu/ubuntu.plugin.zsh
@@ -1,76 +1,43 @@
-# Authors:
-# https://github.com/AlexBio
-# https://github.com/dbb
-# https://github.com/Mappleconfusers
-# https://github.com/trinaldi
-# Nicolas Jonas nextgenthemes.com
-# https://github.com/loctauxphilippe
-# https://github.com/HaraldNordgren
-#
-# Debian, Ubuntu and friends related zsh aliases and functions for zsh
-
 (( $+commands[apt] )) && APT=apt || APT=apt-get
 
 alias acs='apt-cache search'
-compdef _acs acs='apt-cache search'
 
 alias afs='apt-file search --regexp'
-compdef _afs afs='apt-file search --regexp'
 
 # These are apt/apt-get only
-alias ags="$APT source"   # asrc
-compdef _ags ags="$APT source"
+alias ags="$APT source"
 
-alias acp='apt-cache policy' # app
-compdef _acp acp='apt-cache policy'
+alias acp='apt-cache policy'
 
 #List all installed packages
 alias agli='apt list --installed'
-compdef _agli agli='apt list --installed'
 
 # superuser operations ######################################################
 
 # List available updates only
 alias aglu='sudo apt-get -u upgrade --assume-no'
-compdef _aglu aglu='sudo apt-get -u upgrade --assume-no'
 
 alias afu='sudo apt-file update'
-compdef _afu afu='sudo apt-file update'
 
 alias ppap='sudo ppa-purge'
-compdef _ppap ppap='sudo ppa-purge'
-
-alias ag="sudo $APT"               # age - but without sudo
-alias aga="sudo $APT autoclean"    # aac
-alias agb="sudo $APT build-dep"    # abd
-alias agc="sudo $APT clean"        # adc
-alias agd="sudo $APT dselect-upgrade" # ads
-alias agi="sudo $APT install"      # ai
-alias agp="sudo $APT purge"        # ap
-alias agr="sudo $APT remove"       # ar
-alias agu="sudo $APT update"       # ad
-alias agud="sudo $APT update && sudo $APT dist-upgrade" #adu
-alias agug="sudo $APT upgrade"     # ag
-alias aguu="sudo $APT update && sudo $APT upgrade"      #adg
+
+alias ag="sudo $APT"
+alias aga="sudo $APT autoclean"
+alias agb="sudo $APT build-dep"
+alias agc="sudo $APT clean"
+alias agd="sudo $APT dselect-upgrade"
+alias agi="sudo $APT install"
+alias agp="sudo $APT purge"
+alias agr="sudo $APT remove"
+alias agu="sudo $APT update"
+alias agud="sudo $APT update && sudo $APT dist-upgrade"
+alias agug="sudo $APT upgrade"
+alias aguu="sudo $APT update && sudo $APT upgrade"
 alias agar="sudo $APT autoremove"
 
-compdef _ag ag="sudo $APT"
-compdef _aga aga="sudo $APT autoclean"
-compdef _agb agb="sudo $APT build-dep"
-compdef _agc agc="sudo $APT clean"
-compdef _agd agd="sudo $APT dselect-upgrade"
-compdef _agi agi="sudo $APT install"
-compdef _agp agp="sudo $APT purge"
-compdef _agr agr="sudo $APT remove"
-compdef _agu agu="sudo $APT update"
-compdef _agud agud="sudo $APT update && sudo $APT dist-upgrade"
-compdef _agug agug="sudo $APT upgrade"
-compdef _aguu aguu="sudo $APT update && sudo $APT upgrade"
-compdef _agar agar="sudo $APT autoremove"
 
 # Remove ALL kernel images and headers EXCEPT the one in use
-alias kclean='sudo aptitude remove -P ?and(~i~nlinux-(ima|hea) \
-	?not(~n`uname -r`))'
+alias kclean='sudo aptitude remove -P ?and(~i~nlinux-(ima|hea) ?not(~n`uname -r`))'
 
 # Misc. #####################################################################
 # print all installed packages
@@ -89,11 +56,11 @@ aar() {
 	else
 		read "PACKAGE?Type in the package name to install/upgrade with this ppa [${1##*/}]: "
 	fi
-	
+
 	if [ -z "$PACKAGE" ]; then
 		PACKAGE=${1##*/}
 	fi
-	
+
 	sudo apt-add-repository $1 && sudo $APT update
 	sudo $APT install $PACKAGE
 }
@@ -136,22 +103,22 @@ apt-history () {
 
 # Kernel-package building shortcut
 kerndeb () {
-    # temporarily unset MAKEFLAGS ( '-j3' will fail )
-    MAKEFLAGS=$( print - $MAKEFLAGS | perl -pe 's/-j\s*[\d]+//g' )
-    print '$MAKEFLAGS set to '"'$MAKEFLAGS'"
-	appendage='-custom' # this shows up in $ (uname -r )
-    revision=$(date +"%Y%m%d") # this shows up in the .deb file name
+  # temporarily unset MAKEFLAGS ( '-j3' will fail )
+  MAKEFLAGS=$( print - $MAKEFLAGS | perl -pe 's/-j\s*[\d]+//g' )
+  print '$MAKEFLAGS set to '"'$MAKEFLAGS'"
+  appendage='-custom' # this shows up in $(uname -r)
+  revision=$(date +"%Y%m%d") # this shows up in the .deb file name
 
-    make-kpkg clean
+  make-kpkg clean
 
-    time fakeroot make-kpkg --append-to-version "$appendage" --revision \
-        "$revision" kernel_image kernel_headers
+  time fakeroot make-kpkg --append-to-version "$appendage" --revision \
+      "$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}'
+  dpkg-query -W --showformat='${Installed-Size} ${Package} ${Status}\n' | \
+  grep -v deinstall | \
+  sort -n | \
+  awk '{print $1" "$2}'
 }
-- 
cgit v1.2.3-70-g09d2


From 7d27843e892e0906e70b7392c20ddde149636553 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Mon, 25 Mar 2019 16:56:52 +0100
Subject: ubuntu: rename ag to age to avoid conflict with The Silver Searcher

Fixes #3866
---
 plugins/ubuntu/README.md         | 2 +-
 plugins/ubuntu/ubuntu.plugin.zsh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/ubuntu/README.md b/plugins/ubuntu/README.md
index fd03f6afe..f72182f5c 100644
--- a/plugins/ubuntu/README.md
+++ b/plugins/ubuntu/README.md
@@ -14,11 +14,11 @@ Commands that use `$APT` will use `apt` if installed or defer to `apt-get` other
 
 | Alias   | Command                                                                  | Description                                                                                       |
 |---------|--------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------|
+| age     | `sudo $APT`                                                              | Run apt-get with sudo                                                                             |
 | acs     | `apt-cache search`                                                       | Search the apt-cache with the specified criteria                                                  |
 | acp     | `apt-cache policy`                                                       | Display the package source priorities                                                             |
 | afs     | `apt-file search --regexp`                                               | Perform a regular expression apt-file search                                                      |
 | afu     | `sudo apt-file update`                                                   | Generates or updates the apt-file package database                                                |
-| ag      | `sudo $APT`                                                              | Run apt-get with sudo                                                                             |
 | aga     | `sudo $APT autoclean`                                                    | Clears out the local reposityory of retrieved package files that can no longer be downloaded      |
 | agb     | `sudo $APT build-dep <source_pkg>`                                       | Installs/Removes packages to satisfy the dependencies of a specified build pkg                    |
 | agc     | `sudo $APT clean`                                                        | Clears out the local repository of retrieved package files leaving everything from the lock files |
diff --git a/plugins/ubuntu/ubuntu.plugin.zsh b/plugins/ubuntu/ubuntu.plugin.zsh
index 6481fa371..d589096c3 100644
--- a/plugins/ubuntu/ubuntu.plugin.zsh
+++ b/plugins/ubuntu/ubuntu.plugin.zsh
@@ -21,7 +21,7 @@ alias afu='sudo apt-file update'
 
 alias ppap='sudo ppa-purge'
 
-alias ag="sudo $APT"
+alias age="sudo $APT"
 alias aga="sudo $APT autoclean"
 alias agb="sudo $APT build-dep"
 alias agc="sudo $APT clean"
-- 
cgit v1.2.3-70-g09d2


From 15f29aacc2b6d30a767e72e7b751fa39f929a0ae Mon Sep 17 00:00:00 2001
From: Janek <27jf@web.de>
Date: Fri, 29 Mar 2019 22:16:29 +0100
Subject: gradle: also support settings files (#7014)

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

(limited to 'plugins')

diff --git a/plugins/gradle/gradle.plugin.zsh b/plugins/gradle/gradle.plugin.zsh
index 8df62c2e2..8d578e27b 100644
--- a/plugins/gradle/gradle.plugin.zsh
+++ b/plugins/gradle/gradle.plugin.zsh
@@ -156,7 +156,7 @@ _gradle_parse_and_extract_tasks () {
 # Discover the gradle tasks by running "gradle tasks --all"
 ############################################################################
 _gradle_tasks () {
-  if [[ -f build.gradle || -f build.gradle.kts ]]; then
+  if [[ -f build.gradle || -f build.gradle.kts || -f settings.gradle || -f settings.gradle.kts ]]; then
     _gradle_arguments
     if _gradle_does_task_list_need_generating; then
       _gradle_parse_and_extract_tasks "$(gradle tasks --all)" > .gradletasknamecache
@@ -166,7 +166,7 @@ _gradle_tasks () {
 }
 
 _gradlew_tasks () {
-  if [[ -f build.gradle || -f build.gradle.kts ]]; then
+  if [[ -f build.gradle || -f build.gradle.kts || -f settings.gradle || -f settings.gradle.kts ]]; then
     _gradle_arguments
     if _gradle_does_task_list_need_generating; then
       _gradle_parse_and_extract_tasks "$(./gradlew tasks --all)" > .gradletasknamecache
-- 
cgit v1.2.3-70-g09d2


From a43cef34043dae63d73cd40b7e887a43e7b93680 Mon Sep 17 00:00:00 2001
From: Oleg Smelov <OlegSmelov@users.noreply.github.com>
Date: Fri, 29 Mar 2019 23:17:19 +0200
Subject: pyenv: detect pyenv from Homebrew faster (#7670)

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

(limited to 'plugins')

diff --git a/plugins/pyenv/pyenv.plugin.zsh b/plugins/pyenv/pyenv.plugin.zsh
index dbc7da472..4e92b8017 100644
--- a/plugins/pyenv/pyenv.plugin.zsh
+++ b/plugins/pyenv/pyenv.plugin.zsh
@@ -4,7 +4,7 @@
 FOUND_PYENV=$+commands[pyenv]
 
 if [[ $FOUND_PYENV -ne 1 ]]; then
-    pyenvdirs=("$HOME/.pyenv" "/usr/local/pyenv" "/opt/pyenv")
+    pyenvdirs=("$HOME/.pyenv" "/usr/local/pyenv" "/opt/pyenv" "/usr/local/opt/pyenv")
     for dir in $pyenvdirs; do
         if [[ -d $dir/bin ]]; then
             export PATH="$PATH:$dir/bin"
-- 
cgit v1.2.3-70-g09d2


From f1799de0c92357cfafd501c3f74375d197a1708c Mon Sep 17 00:00:00 2001
From: "Lucas A. Rodrigues" <lucas.ar.rodrigues@gmail.com>
Date: Fri, 29 Mar 2019 18:39:52 -0300
Subject: Add drush plugin (#4490)

---
 plugins/drush/README.md         |  83 ++++++++++++++++++++++++++++++++
 plugins/drush/drush.complete.sh |  50 +++++++++++++++++++
 plugins/drush/drush.plugin.zsh  | 104 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 237 insertions(+)
 create mode 100644 plugins/drush/README.md
 create mode 100644 plugins/drush/drush.complete.sh
 create mode 100644 plugins/drush/drush.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/drush/README.md b/plugins/drush/README.md
new file mode 100644
index 000000000..df7b82bdd
--- /dev/null
+++ b/plugins/drush/README.md
@@ -0,0 +1,83 @@
+# Drush
+
+## Description
+This plugin offers aliases and functions to make the work with drush easier and more productive.
+
+To enable it, add the `drush` to your `plugins` array in `~/.zshrc`:
+
+```
+plugins=(... drush)
+```
+
+## Aliases
+| Alias | Description                                                           | Command                     |
+|-------|-----------------------------------------------------------------------|-----------------------------|
+| dr    | Display drush help                                                    | drush                       |
+| drca  | Clear all drupal caches.                                              | drush cc all                |
+| drcb  | Clear block cache.                                                    | drush cc block              |
+| drcg  | Clear registry cache.                                                 | drush cc registry           |
+| drcj  | Clear css-js cache.                                                   | drush cc css-js             |
+| drcm  | Clear menu cache.                                                     | drush cc menu               |
+| drcml | Clear module-list cache.                                              | drush cc module-list        |
+| drcr  | Run all cron hooks in all active modules for specified site.          | drush core-cron             |
+| drct  | Clear theme-registry cache.                                           | drush cc theme-registry     |
+| drcv  | Clear views cache. (Make sure that the views module is enabled)       | drush cc views              |
+| drdmp | Backup database in a new dump.sql file                                | drush drush sql-dump --ordered-dump --result-file=dump.sql|
+| drf   | Display features status                                               | drush features              |
+| drfr  | Revert a feature module on your site.                                 | drush features-revert -y    |
+| drfu  | Update a feature module on your site.                                 | drush features-update -y    |
+| drfra | Revert all enabled feature module on your site.                       | drush features-revert-all   |
+| drif  | Flush all derived images.                                             | drush image-flush --all     |
+| drpm  | Show a list of available modules.                                     | drush pm-list --type=module |
+| drst  | Provides a birds-eye view of the current Drupal installation, if any. | drush core-status           |
+| drup  | Apply any database updates required (as with running update.php).     | drush updatedb              |
+| drups | List any pending database updates.                                    | drush updatedb-status       |
+| drv   | Show drush version.                                                   | drush version               |
+| drvd	| Delete a variable.																										| drush variable-del					|
+| drvg	| Get a list of some or all site variables and values.									| drush variable-get					|
+| drvs	| Set a variable.																												| drush variable-set					|
+
+## Functions
+
+### dren
+Download and enable one or more extensions (modules or themes).
+Must be invoked with one or more parameters. e.g.:
+`dren devel` or `dren devel module_filter views`
+
+### drf
+Edit drushrc, site alias, and Drupal settings.php files.
+Can be invoked with one or without parameters. e.g.:
+`drf 1`
+
+### dris
+Disable one or more extensions (modules or themes)
+Must be invoked with one or more parameters. e.g.:
+`dris devel` or `dris devel module_filter views`
+
+### drpu
+Uninstall one or more modules.
+Must be invoked with one or more parameters. e.g.:
+`drpu devel` or `drpu devel module_filter views`
+
+### drnew
+Creates a brand new drupal website.
+Note: As soon as the installation is complete, drush will print a username and a random password into the terminal:
+```
+Installation complete.  User name: admin  User password: cf7t8yqNEm
+```
+
+## Additional features
+
+### Autocomplete
+The [completion script for drush](https://github.com/drush-ops/drush/blob/8.0.1/drush.complete.sh) comes enabled with this plugin.
+So, it is possible to type a command:
+```
+drush sql
+```
+
+And as soon as the tab key is pressed, the script will display the available commands:
+```
+drush sql
+sqlc           sql-conf       sql-create     sql-dump       sql-query      sql-sanitize                
+sql-cli        sql-connect    sql-drop       sqlq           sqlsan         sql-sync
+```
diff --git a/plugins/drush/drush.complete.sh b/plugins/drush/drush.complete.sh
new file mode 100644
index 000000000..38b882ec3
--- /dev/null
+++ b/plugins/drush/drush.complete.sh
@@ -0,0 +1,50 @@
+# BASH completion script for Drush.
+#
+# Place this in your /etc/bash_completion.d/ directory or source it from your
+# ~/.bash_completion or ~/.bash_profile files.  Alternatively, source
+# examples/example.bashrc instead, as it will automatically find and source
+# this file.
+#
+# If you're using ZSH instead of BASH, add the following to your ~/.zshrc file
+# and source it.
+#
+#   autoload bashcompinit
+#   bashcompinit
+#   source /path/to/your/drush.complete.sh
+
+# Ensure drush is available.
+which drush > /dev/null || alias drush &> /dev/null || return
+
+__drush_ps1() {
+  f="${TMPDIR:-/tmp/}/drush-env-${USER}/drush-drupal-site-$$"
+  if [ -f $f ]
+  then
+    __DRUPAL_SITE=$(cat "$f")
+  else
+    __DRUPAL_SITE="$DRUPAL_SITE"
+  fi
+
+  # Set DRUSH_PS1_SHOWCOLORHINTS to a non-empty value and define a
+  # __drush_ps1_colorize_alias() function for color hints in your Drush PS1
+  # prompt. See example.prompt.sh for an example implementation.
+  if [ -n "${__DRUPAL_SITE-}" ] && [ -n "${DRUSH_PS1_SHOWCOLORHINTS-}" ]; then
+    __drush_ps1_colorize_alias
+  fi
+
+  [[ -n "$__DRUPAL_SITE" ]] && printf "${1:- (%s)}" "$__DRUPAL_SITE"
+}
+
+# Completion function, uses the "drush complete" command to retrieve
+# completions for a specific command line COMP_WORDS.
+_drush_completion() {
+  # Set IFS to newline (locally), since we only use newline separators, and
+  # need to retain spaces (or not) after completions.
+  local IFS=$'\n'
+  # The '< /dev/null' is a work around for a bug in php libedit stdin handling.
+  # Note that libedit in place of libreadline in some distributions. See:
+  # https://bugs.launchpad.net/ubuntu/+source/php5/+bug/322214
+  COMPREPLY=( $(drush --early=includes/complete.inc "${COMP_WORDS[@]}" < /dev/null 2> /dev/null) )
+}
+
+# Register our completion function. We include common short aliases for Drush.
+complete -o bashdefault -o default -o nospace -F _drush_completion d dr drush drush5 drush6 drush7 drush8 drush.php
diff --git a/plugins/drush/drush.plugin.zsh b/plugins/drush/drush.plugin.zsh
new file mode 100644
index 000000000..8a20d79f2
--- /dev/null
+++ b/plugins/drush/drush.plugin.zsh
@@ -0,0 +1,104 @@
+# Drush support.
+
+function dren() {
+  drush en $@ -y
+}
+
+function dris() {
+  drush pm-disable $@ -y
+}
+
+function drpu() {
+  drush pm-uninstall $@ -y
+}
+
+function drf() {
+  if [[ $1 == "" ]] then
+    drush core-config
+  else
+    drush core-config --choice=$1
+  fi
+}
+
+function drfi() {
+  if [[ $1 == "fields" ]]; then
+    drush field-info fields
+  elif [[ $1 == "types" ]]; then
+    drush field-info types
+  else
+    drush field-info
+  fi
+}
+
+function drnew() {
+
+  cd ~
+  echo "Website's name: "
+  read WEBSITE_NAME
+
+  HOST=http://$(hostname -i)/
+
+  if [[ $WEBSITE_NAME == "" ]] then
+    MINUTES=$(date +%M:%S)
+    WEBSITE_NAME="Drupal-$MINUTES"
+    echo "Your website will be named: $WEBSITE_NAME"
+  fi
+
+  drush dl drupal --drupal-project-rename=$WEBSITE_NAME
+
+  echo "Type your localhost directory: (Leave empty for /var/www/html/)"
+  read DIRECTORY
+
+  if [[ $DIRECTORY == "" ]] then
+    DIRECTORY="/var/www/html/"
+  fi
+
+  echo "Moving to $DIRECTORY$WEBSITE_NAME"
+  sudo mv $WEBSITE_NAME $DIRECTORY
+  cd $DIRECTORY$WEBSITE_NAME
+
+  echo "Database's user: "
+  read DATABASE_USR
+  echo "Database's password: "
+  read -s DATABASE_PWD
+  echo "Database's name for your project: "
+  read DATABASE
+
+  DB_URL="mysql://$DATABASE_USR:$DATABASE_PWD@localhost/$DATABASE"
+  drush site-install standard --db-url=$DB_URL --site-name=$WEBSITE_NAME
+
+  open_command $HOST$WEBSITE_NAME
+  echo "Done"
+
+}
+
+# Aliases, sorted alphabetically.
+alias dr="drush"
+alias drca="drush cc all" # Deprecated for Drush 8
+alias drcb="drush cc block" # Deprecated for Drush 8
+alias drcg="drush cc registry" # Deprecated for Drush 8
+alias drcj="drush cc css-js"
+alias drcm="drush cc menu"
+alias drcml="drush cc module-list"
+alias drcr="drush core-cron"
+alias drct="drush cc theme-registry"
+alias drcv="drush cc views"
+alias drdmp="drush sql-dump --ordered-dump --result-file=dump.sql"
+alias drf="drush features"
+alias drfr="drush features-revert -y"
+alias drfu="drush features-update -y"
+alias drfra="drush features-revert-all"
+alias drif="drush image-flush --all"
+alias drpm="drush pm-list --type=module"
+alias drst="drush core-status"
+alias drup="drush updatedb"
+alias drups="drush updatedb-status"
+alias drv="drush version"
+alias drvd="drush variable-del"
+alias drvg="drush variable-get"
+alias drvs="drush variable-set"
+
+# Enable drush autocomplete support
+autoload bashcompinit
+bashcompinit
+source $(dirname $0)/drush.complete.sh
-- 
cgit v1.2.3-70-g09d2


From 0e0789fb7aedd1afd8ae07dfc9609f6a7f2e407f Mon Sep 17 00:00:00 2001
From: Jakub Chábek <jakub@chabek.cz>
Date: Fri, 29 Mar 2019 22:56:59 +0100
Subject: git: delete branches in `gbda` only if there are any (#6079)

It doesn't make sense to run `git branch -d $BRANCH` if the `$BRANCH` is empty.
---
 plugins/git/git.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 6fc9b078b..8eccc9cee 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -50,7 +50,7 @@ alias gap='git apply'
 alias gb='git branch'
 alias gba='git branch -a'
 alias gbd='git branch -d'
-alias gbda='git branch --no-color --merged | command grep -vE "^(\*|\s*(master|develop|dev)\s*$)" | command xargs -n 1 git branch -d'
+alias gbda='git branch --no-color --merged | command grep -vE "^(\*|\s*(master|develop|dev)\s*$)" | command xargs -r -n 1 git branch -d'
 alias gbD='git branch -D'
 alias gbl='git blame -b -w'
 alias gbnm='git branch --no-merged'
-- 
cgit v1.2.3-70-g09d2


From 4b82b8606442c5ff0235ea95d0fc11f151638dc3 Mon Sep 17 00:00:00 2001
From: Simen Bekkhus <sbekkhus91@gmail.com>
Date: Fri, 29 Mar 2019 22:59:37 +0100
Subject: git: add `--no-gpg-sign` to gwip (#6031)

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

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 8eccc9cee..302377153 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -261,4 +261,4 @@ alias gupav='git pull --rebase --autostash -v'
 alias glum='git pull upstream master'
 
 alias gwch='git whatchanged -p --abbrev-commit --pretty=medium'
-alias gwip='git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify -m "--wip-- [skip ci]"'
+alias gwip='git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign -m "--wip-- [skip ci]"'
-- 
cgit v1.2.3-70-g09d2


From 93cbc1614c9900f310a48de69447e035df84e1cb Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sun, 31 Mar 2019 15:56:35 +0200
Subject: git: use interactive mode in gclean

Fixes #7716
---
 plugins/git/git.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 302377153..8482c4d54 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -73,7 +73,7 @@ alias gcsm='git commit -s -m'
 alias gcb='git checkout -b'
 alias gcf='git config --list'
 alias gcl='git clone --recurse-submodules'
-alias gclean='git clean -fd'
+alias gclean='git clean -id'
 alias gpristine='git reset --hard && git clean -dfx'
 alias gcm='git checkout master'
 alias gcd='git checkout develop'
-- 
cgit v1.2.3-70-g09d2


From 831fba4ee4bc28d1d0a3a3f94d5b4dcdfce04588 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 2 Apr 2019 19:05:52 +0200
Subject: Revert "git: delete branches in `gbda` only if there are any (#6079)"
 (#7724)

This reverts commit 0e0789fb7aedd1afd8ae07dfc9609f6a7f2e407f.
---
 plugins/git/git.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 8482c4d54..5bef95bd5 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -50,7 +50,7 @@ alias gap='git apply'
 alias gb='git branch'
 alias gba='git branch -a'
 alias gbd='git branch -d'
-alias gbda='git branch --no-color --merged | command grep -vE "^(\*|\s*(master|develop|dev)\s*$)" | command xargs -r -n 1 git branch -d'
+alias gbda='git branch --no-color --merged | command grep -vE "^(\*|\s*(master|develop|dev)\s*$)" | command xargs -n 1 git branch -d'
 alias gbD='git branch -D'
 alias gbl='git blame -b -w'
 alias gbnm='git branch --no-merged'
-- 
cgit v1.2.3-70-g09d2


From 046d49f7827c994916a55d1531e70564682307af Mon Sep 17 00:00:00 2001
From: Asatur Meltonyan <asaturmeltonyan@gmail.com>
Date: Sun, 7 Apr 2019 16:17:22 +0400
Subject: git: add 'gtl' alias to list tags matching a pattern (#7629)

1. List the tags that match the pattern(s) passed through the argument.
2. Displays the first line of the annotation message along with the tag, or the line of the first commit message if the tag is not annotated.
3. Sorts and displays tags in descending order.
---
 plugins/git/git.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 5bef95bd5..a4b6eb977 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -251,6 +251,7 @@ alias gsu='git submodule update'
 
 alias gts='git tag -s'
 alias gtv='git tag | sort -V'
+alias gtl='gtl(){ git tag --sort=-v:refname -n -l ${1}* }; noglob gtl'
 
 alias gunignore='git update-index --no-assume-unchanged'
 alias gunwip='git log -n 1 | grep -q -c "\-\-wip\-\-" && git reset HEAD~1'
-- 
cgit v1.2.3-70-g09d2


From 3cfcf5e0aa71bddcf7ab45d3880f142654f22266 Mon Sep 17 00:00:00 2001
From: sheveko <28670374+sheveko@users.noreply.github.com>
Date: Sun, 7 Apr 2019 20:21:54 +0200
Subject: git-prompt: run git status with LANG=C (#6087)

As described in #6086 there will be an error when one set another
language than English.
---
 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 a4d07cde6..5243af23c 100644
--- a/plugins/git-prompt/gitstatus.py
+++ b/plugins/git-prompt/gitstatus.py
@@ -30,7 +30,7 @@ def get_tagname_or_hash():
 
 # `git status --porcelain --branch` can collect all information
 # branch, remote_branch, untracked, staged, changed, conflicts, ahead, behind
-po = Popen(['git', 'status', '--porcelain', '--branch'], stdout=PIPE, stderr=PIPE)
+po = Popen(['git', 'status', '--porcelain', '--branch'], env={"LANG": "C"}, stdout=PIPE, stderr=PIPE)
 stdout, sterr = po.communicate()
 if po.returncode != 0:
     sys.exit(0)  # Not a git repository
-- 
cgit v1.2.3-70-g09d2


From 651856d4a3b37467cd26a5c5d8de52bd76a9be7f Mon Sep 17 00:00:00 2001
From: Roman Dzieciol <roman.dzieciol@gmail.com>
Date: Sun, 7 Apr 2019 23:26:43 +0100
Subject: Update the swiftpm plugin autocompletion for Swift 5.0

---
 plugins/swiftpm/README.md |  19 ++++
 plugins/swiftpm/_swift    | 235 ++++++++++++++++++++++++++++++++--------------
 2 files changed, 183 insertions(+), 71 deletions(-)

(limited to 'plugins')

diff --git a/plugins/swiftpm/README.md b/plugins/swiftpm/README.md
index 07ca25651..d9462fb7f 100644
--- a/plugins/swiftpm/README.md
+++ b/plugins/swiftpm/README.md
@@ -20,3 +20,22 @@ plugins=(... swiftpm)
 | `spx` | Generates an Xcode project          | `swift package generate-xcodeproj` |
 | `sps` | Print the resolved dependency graph | `swift package show-dependencies`  |
 | `spd` | Print parsed Package.swift as JSON  | `swift package dump-package`       |
+
+## Autocompletion
+
+The `_swift` file enables autocompletion for Swift Package Manager. Current version supports Swift 5.0
+
+
+### Updating the autocompletion for new version of Swift
+
+To update autocompletion to the Swift version present on your system:
+```
+swift package completion-tool generate-zsh-script > ~/.oh-my-zsh/plugins/swiftpm/_swift
+```
+
+### Known issues
+
+If `swiftpm` is not added to your zsh plugins list, autocompletion will still be triggered but will result in errors:
+```
+_values:compvalues:10: not enough arguments
+```
diff --git a/plugins/swiftpm/_swift b/plugins/swiftpm/_swift
index bed6e13a7..1366b4d9c 100644
--- a/plugins/swiftpm/_swift
+++ b/plugins/swiftpm/_swift
@@ -72,16 +72,23 @@ _swift_build() {
         "--build-path[Specify build/cache directory ]:Specify build/cache directory :_files"
         "(--chdir -C)"{--chdir,-C}"[]: :_files"
         "--package-path[Change working directory before any other operation]:Change working directory before any other operation:_files"
-        "--sanitize[Turn on runtime checks for erroneous behavior]: :{_values '' 'address[enable Address sanitizer]' 'thread[enable Thread sanitizer]'}"
+        "--sanitize[Turn on runtime checks for erroneous behavior]: :{_values '' 'address[enable Address sanitizer]' 'thread[enable Thread sanitizer]' 'undefined[enable Undefined Behavior sanitizer]'}"
         "--disable-prefetching[]"
         "--skip-update[Skip updating dependencies from their remote during a resolution]"
         "--disable-sandbox[Disable using the sandbox when executing subprocesses]"
+        "--disable-package-manifest-caching[Disable caching Package.swift manifests]"
         "--version[]"
         "--destination[]: :_files"
         "(--verbose -v)"{--verbose,-v}"[Increase verbosity of informational output]"
         "--no-static-swift-stdlib[Do not link Swift stdlib statically \[default\]]"
         "--static-swift-stdlib[Link Swift stdlib statically]"
-        "--enable-build-manifest-caching[Enable llbuild manifest caching \[Experimental\]]"
+        "--enable-llbuild-library[Enable building with the llbuild library]"
+        "--force-resolved-versions[]"
+        "--disable-automatic-resolution[Disable automatic resolution if Package.resolved file is out-of-date]"
+        "--enable-index-store[Enable indexing-while-building feature]"
+        "--disable-index-store[Disable indexing-while-building feature]"
+        "--enable-pubgrub-resolver[\[Experimental\] Enable the new Pubgrub dependency resolver]"
+        "--enable-parseable-module-interfaces[]"
         "--build-tests[Build both source and test targets]"
         "--product[Build the specified product]:Build the specified product: "
         "--target[Build the specified target]:Build the specified target: "
@@ -108,17 +115,26 @@ _swift_run() {
         "--build-path[Specify build/cache directory ]:Specify build/cache directory :_files"
         "(--chdir -C)"{--chdir,-C}"[]: :_files"
         "--package-path[Change working directory before any other operation]:Change working directory before any other operation:_files"
-        "--sanitize[Turn on runtime checks for erroneous behavior]: :{_values '' 'address[enable Address sanitizer]' 'thread[enable Thread sanitizer]'}"
+        "--sanitize[Turn on runtime checks for erroneous behavior]: :{_values '' 'address[enable Address sanitizer]' 'thread[enable Thread sanitizer]' 'undefined[enable Undefined Behavior sanitizer]'}"
         "--disable-prefetching[]"
         "--skip-update[Skip updating dependencies from their remote during a resolution]"
         "--disable-sandbox[Disable using the sandbox when executing subprocesses]"
+        "--disable-package-manifest-caching[Disable caching Package.swift manifests]"
         "--version[]"
         "--destination[]: :_files"
         "(--verbose -v)"{--verbose,-v}"[Increase verbosity of informational output]"
         "--no-static-swift-stdlib[Do not link Swift stdlib statically \[default\]]"
         "--static-swift-stdlib[Link Swift stdlib statically]"
-        "--enable-build-manifest-caching[Enable llbuild manifest caching \[Experimental\]]"
+        "--enable-llbuild-library[Enable building with the llbuild library]"
+        "--force-resolved-versions[]"
+        "--disable-automatic-resolution[Disable automatic resolution if Package.resolved file is out-of-date]"
+        "--enable-index-store[Enable indexing-while-building feature]"
+        "--disable-index-store[Disable indexing-while-building feature]"
+        "--enable-pubgrub-resolver[\[Experimental\] Enable the new Pubgrub dependency resolver]"
+        "--enable-parseable-module-interfaces[]"
         "--skip-build[Skip building the executable product]"
+        "--build-tests[Build both source and test targets]"
+        "--repl[Launch Swift REPL for the package]"
     )
     _arguments $arguments && return
 }
@@ -140,16 +156,23 @@ _swift_package() {
         "--build-path[Specify build/cache directory ]:Specify build/cache directory :_files"
         "(--chdir -C)"{--chdir,-C}"[]: :_files"
         "--package-path[Change working directory before any other operation]:Change working directory before any other operation:_files"
-        "--sanitize[Turn on runtime checks for erroneous behavior]: :{_values '' 'address[enable Address sanitizer]' 'thread[enable Thread sanitizer]'}"
+        "--sanitize[Turn on runtime checks for erroneous behavior]: :{_values '' 'address[enable Address sanitizer]' 'thread[enable Thread sanitizer]' 'undefined[enable Undefined Behavior sanitizer]'}"
         "--disable-prefetching[]"
         "--skip-update[Skip updating dependencies from their remote during a resolution]"
         "--disable-sandbox[Disable using the sandbox when executing subprocesses]"
+        "--disable-package-manifest-caching[Disable caching Package.swift manifests]"
         "--version[]"
         "--destination[]: :_files"
         "(--verbose -v)"{--verbose,-v}"[Increase verbosity of informational output]"
         "--no-static-swift-stdlib[Do not link Swift stdlib statically \[default\]]"
         "--static-swift-stdlib[Link Swift stdlib statically]"
-        "--enable-build-manifest-caching[Enable llbuild manifest caching \[Experimental\]]"
+        "--enable-llbuild-library[Enable building with the llbuild library]"
+        "--force-resolved-versions[]"
+        "--disable-automatic-resolution[Disable automatic resolution if Package.resolved file is out-of-date]"
+        "--enable-index-store[Enable indexing-while-building feature]"
+        "--disable-index-store[Disable indexing-while-building feature]"
+        "--enable-pubgrub-resolver[\[Experimental\] Enable the new Pubgrub dependency resolver]"
+        "--enable-parseable-module-interfaces[]"
         '(-): :->command'
         '(-)*:: :->arg'
     )
@@ -158,91 +181,124 @@ _swift_package() {
         (command)
             local modes
             modes=(
-                'edit:Put a package in editable mode'
-                'clean:Delete build artifacts'
-                'init:Initialize a new package'
-                'dump-package:Print parsed Package.swift as JSON'
+                'update:Update package dependencies'
                 'describe:Describe the current package'
+                'resolve:Resolve package dependencies'
+                'tools-version:Manipulate tools version of the current package'
                 'unedit:Remove a package from editable mode'
-                'update:Update package dependencies'
+                'show-dependencies:Print the resolved dependency graph'
+                'fetch:'
+                'dump-package:Print parsed Package.swift as JSON'
+                'edit:Put a package in editable mode'
+                'config:Manipulate configuration of the package'
                 'completion-tool:Completion tool (for shell completions)'
-                'tools-version:Manipulate tools version of the current package'
-                'reset:Reset the complete cache/build directory'
-                'resolve:Resolve package dependencies'
+                'clean:Delete build artifacts'
                 'generate-xcodeproj:Generates an Xcode project'
-                'fetch:'
-                'show-dependencies:Print the resolved dependency graph'
+                'reset:Reset the complete cache/build directory'
+                'init:Initialize a new package'
             )
             _describe "mode" modes
             ;;
         (arg)
             case ${words[1]} in
-                (edit)
-                    _swift_package_edit
-                    ;;
-                (clean)
-                    _swift_package_clean
-                    ;;
-                (init)
-                    _swift_package_init
-                    ;;
-                (dump-package)
-                    _swift_package_dump-package
+                (update)
+                    _swift_package_update
                     ;;
                 (describe)
                     _swift_package_describe
                     ;;
+                (resolve)
+                    _swift_package_resolve
+                    ;;
+                (tools-version)
+                    _swift_package_tools-version
+                    ;;
                 (unedit)
                     _swift_package_unedit
                     ;;
-                (update)
-                    _swift_package_update
+                (show-dependencies)
+                    _swift_package_show-dependencies
                     ;;
-                (completion-tool)
-                    _swift_package_completion-tool
+                (fetch)
+                    _swift_package_fetch
                     ;;
-                (tools-version)
-                    _swift_package_tools-version
+                (dump-package)
+                    _swift_package_dump-package
                     ;;
-                (reset)
-                    _swift_package_reset
+                (edit)
+                    _swift_package_edit
                     ;;
-                (resolve)
-                    _swift_package_resolve
+                (config)
+                    _swift_package_config
+                    ;;
+                (completion-tool)
+                    _swift_package_completion-tool
+                    ;;
+                (clean)
+                    _swift_package_clean
                     ;;
                 (generate-xcodeproj)
                     _swift_package_generate-xcodeproj
                     ;;
-                (fetch)
-                    _swift_package_fetch
+                (reset)
+                    _swift_package_reset
                     ;;
-                (show-dependencies)
-                    _swift_package_show-dependencies
+                (init)
+                    _swift_package_init
                     ;;
             esac
             ;;
     esac
 }
 
-_swift_package_edit() {
+_swift_package_update() {
     arguments=(
-        ":The name of the package to edit:_swift_dependency"
-        "--revision[The revision to edit]:The revision to edit: "
-        "--branch[The branch to create]:The branch to create: "
-        "--path[Create or use the checkout at this path]:Create or use the checkout at this path:_files"
     )
     _arguments $arguments && return
 }
 
-_swift_package_clean() {
+_swift_package_describe() {
     arguments=(
+        "--type[json|text]: :{_values '' 'text[describe using text format]' 'json[describe using JSON format]'}"
     )
     _arguments $arguments && return
 }
 
-_swift_package_init() {
+_swift_package_resolve() {
+    arguments=(
+        ":The name of the package to resolve:_swift_dependency"
+        "--version[The version to resolve at]:The version to resolve at: "
+        "--branch[The branch to resolve at]:The branch to resolve at: "
+        "--revision[The revision to resolve at]:The revision to resolve at: "
+    )
+    _arguments $arguments && return
+}
+
+_swift_package_tools-version() {
+    arguments=(
+        "--set[Set tools version of package to the given value]:Set tools version of package to the given value: "
+        "--set-current[Set tools version of package to the current tools version in use]"
+    )
+    _arguments $arguments && return
+}
+
+_swift_package_unedit() {
+    arguments=(
+        ":The name of the package to unedit:_swift_dependency"
+        "--force[Unedit the package even if it has uncommited and unpushed changes.]"
+    )
+    _arguments $arguments && return
+}
+
+_swift_package_show-dependencies() {
+    arguments=(
+        "--format[text|dot|json|flatlist]: :{_values '' 'text[list dependencies using text format]' 'dot[list dependencies using dot format]' 'json[list dependencies using JSON format]'}"
+    )
+    _arguments $arguments && return
+}
+
+_swift_package_fetch() {
     arguments=(
-        "--type[empty|library|executable|system-module]: :{_values '' 'empty[generates an empty project]' 'library[generates project for a dynamic library]' 'executable[generates a project for a cli executable]' 'system-module[generates a project for a system module]'}"
     )
     _arguments $arguments && return
 }
@@ -253,54 +309,80 @@ _swift_package_dump-package() {
     _arguments $arguments && return
 }
 
-_swift_package_describe() {
+_swift_package_edit() {
     arguments=(
-        "--type[json|text]: :{_values '' 'text[describe using text format]' 'json[describe using JSON format]'}"
+        ":The name of the package to edit:_swift_dependency"
+        "--revision[The revision to edit]:The revision to edit: "
+        "--branch[The branch to create]:The branch to create: "
+        "--path[Create or use the checkout at this path]:Create or use the checkout at this path:_files"
     )
     _arguments $arguments && return
 }
 
-_swift_package_unedit() {
+_swift_package_config() {
     arguments=(
-        ":The name of the package to unedit:_swift_dependency"
-        "--force[Unedit the package even if it has uncommited and unpushed changes.]"
+        '(-): :->command'
+        '(-)*:: :->arg'
     )
     _arguments $arguments && return
+    case $state in
+        (command)
+            local modes
+            modes=(
+                'unset-mirror:Remove an existing mirror'
+                'set-mirror:Set a mirror for a dependency'
+                'get-mirror:Print mirror configuration for the given package dependency'
+            )
+            _describe "mode" modes
+            ;;
+        (arg)
+            case ${words[1]} in
+                (unset-mirror)
+                    _swift_package_config_unset-mirror
+                    ;;
+                (set-mirror)
+                    _swift_package_config_set-mirror
+                    ;;
+                (get-mirror)
+                    _swift_package_config_get-mirror
+                    ;;
+            esac
+            ;;
+    esac
 }
 
-_swift_package_update() {
+_swift_package_config_unset-mirror() {
     arguments=(
+        "--package-url[The package dependency url]:The package dependency url: "
+        "--mirror-url[The mirror url]:The mirror url: "
     )
     _arguments $arguments && return
 }
 
-_swift_package_completion-tool() {
+_swift_package_config_set-mirror() {
     arguments=(
-        ": :{_values '' 'generate-bash-script[generate Bash completion script]' 'generate-zsh-script[generate Bash completion script]' 'list-dependencies[list all dependencies' names]' 'list-executables[list all executables' names]'}"
+        "--package-url[The package dependency url]:The package dependency url: "
+        "--mirror-url[The mirror url]:The mirror url: "
     )
     _arguments $arguments && return
 }
 
-_swift_package_tools-version() {
+_swift_package_config_get-mirror() {
     arguments=(
-        "--set[Set tools version of package to the given value]:Set tools version of package to the given value: "
-        "--set-current[Set tools version of package to the current tools version in use]"
+        "--package-url[The package dependency url]:The package dependency url: "
     )
     _arguments $arguments && return
 }
 
-_swift_package_reset() {
+_swift_package_completion-tool() {
     arguments=(
+        ": :{_values '' 'generate-bash-script[generate Bash completion script]' 'generate-zsh-script[generate Bash completion script]' 'list-dependencies[list all dependencies' names]' 'list-executables[list all executables' names]'}"
     )
     _arguments $arguments && return
 }
 
-_swift_package_resolve() {
+_swift_package_clean() {
     arguments=(
-        ":The name of the package to resolve:_swift_dependency"
-        "--version[The version to resolve at]:The version to resolve at: "
-        "--branch[The branch to resolve at]:The branch to resolve at: "
-        "--revision[The revision to resolve at]:The revision to resolve at: "
     )
     _arguments $arguments && return
 }
@@ -312,19 +394,21 @@ _swift_package_generate-xcodeproj() {
         "--output[Path where the Xcode project should be generated]:Path where the Xcode project should be generated:_files"
         "--legacy-scheme-generator[Use the legacy scheme generator]"
         "--watch[Watch for changes to the Package manifest to regenerate the Xcode project]"
+        "--skip-extra-files[Do not add file references for extra files to the generated Xcode project]"
     )
     _arguments $arguments && return
 }
 
-_swift_package_fetch() {
+_swift_package_reset() {
     arguments=(
     )
     _arguments $arguments && return
 }
 
-_swift_package_show-dependencies() {
+_swift_package_init() {
     arguments=(
-        "--format[text|dot|json|flatlist]: :{_values '' 'text[list dependencies using text format]' 'dot[list dependencies using dot format]' 'json[list dependencies using JSON format]'}"
+        "--type[empty|library|executable|system-module]: :{_values '' 'empty[generates an empty project]' 'library[generates project for a dynamic library]' 'executable[generates a project for a cli executable]' 'system-module[generates a project for a system module]'}"
+        "--name[Provide custom package name]:Provide custom package name: "
     )
     _arguments $arguments && return
 }
@@ -346,23 +430,32 @@ _swift_test() {
         "--build-path[Specify build/cache directory ]:Specify build/cache directory :_files"
         "(--chdir -C)"{--chdir,-C}"[]: :_files"
         "--package-path[Change working directory before any other operation]:Change working directory before any other operation:_files"
-        "--sanitize[Turn on runtime checks for erroneous behavior]: :{_values '' 'address[enable Address sanitizer]' 'thread[enable Thread sanitizer]'}"
+        "--sanitize[Turn on runtime checks for erroneous behavior]: :{_values '' 'address[enable Address sanitizer]' 'thread[enable Thread sanitizer]' 'undefined[enable Undefined Behavior sanitizer]'}"
         "--disable-prefetching[]"
         "--skip-update[Skip updating dependencies from their remote during a resolution]"
         "--disable-sandbox[Disable using the sandbox when executing subprocesses]"
+        "--disable-package-manifest-caching[Disable caching Package.swift manifests]"
         "--version[]"
         "--destination[]: :_files"
         "(--verbose -v)"{--verbose,-v}"[Increase verbosity of informational output]"
         "--no-static-swift-stdlib[Do not link Swift stdlib statically \[default\]]"
         "--static-swift-stdlib[Link Swift stdlib statically]"
-        "--enable-build-manifest-caching[Enable llbuild manifest caching \[Experimental\]]"
+        "--enable-llbuild-library[Enable building with the llbuild library]"
+        "--force-resolved-versions[]"
+        "--disable-automatic-resolution[Disable automatic resolution if Package.resolved file is out-of-date]"
+        "--enable-index-store[Enable indexing-while-building feature]"
+        "--disable-index-store[Disable indexing-while-building feature]"
+        "--enable-pubgrub-resolver[\[Experimental\] Enable the new Pubgrub dependency resolver]"
+        "--enable-parseable-module-interfaces[]"
         "--skip-build[Skip building the test target]"
         "(--list-tests -l)"{--list-tests,-l}"[Lists test methods in specifier format]"
         "--generate-linuxmain[Generate LinuxMain.swift entries for the package]"
         "--parallel[Run the tests in parallel.]"
+        "--num-workers[Number of tests to execute in parallel.]:Number of tests to execute in parallel.: "
         "(--specifier -s)"{--specifier,-s}"[]: : "
         "--xunit-output[]: :_files"
         "--filter[Run test cases matching regular expression, Format: <test-target>.<test-case> or <test-target>.<test-case>/<test>]:Run test cases matching regular expression, Format: <test-target>.<test-case> or <test-target>.<test-case>/<test>: "
+        "--enable-code-coverage[Test with code coverage enabled]"
     )
     _arguments $arguments && return
 }
-- 
cgit v1.2.3-70-g09d2


From 728c8e717435b31cb7db90168e1e7bd27b95e3f5 Mon Sep 17 00:00:00 2001
From: Sascha Bratton <sascha@brattonbratton.com>
Date: Mon, 8 Apr 2019 11:58:27 -0400
Subject: nvm: load nvm script only if command doesn't already exist (#5454)

Fixes #5453.
---
 plugins/nvm/nvm.plugin.zsh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/nvm/nvm.plugin.zsh b/plugins/nvm/nvm.plugin.zsh
index 9dde3a266..4bab8e9d7 100644
--- a/plugins/nvm/nvm.plugin.zsh
+++ b/plugins/nvm/nvm.plugin.zsh
@@ -1,5 +1,8 @@
 # Set NVM_DIR if it isn't already defined
 [[ -z "$NVM_DIR" ]] && export NVM_DIR="$HOME/.nvm"
 
-# Load nvm if it exists
-[[ -f "$NVM_DIR/nvm.sh" ]] && source "$NVM_DIR/nvm.sh"
+# Try to load nvm only if command not already available
+if ! type "nvm" &> /dev/null; then
+    # Load nvm if it exists
+    [[ -f "$NVM_DIR/nvm.sh" ]] && source "$NVM_DIR/nvm.sh"
+fi
-- 
cgit v1.2.3-70-g09d2


From 8c95c2b6cb339379dda5e39a0eef795cab1dae7a Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Mon, 8 Apr 2019 20:06:17 +0200
Subject: gitfast: update plugin (#7152)

* Stop loading git plugin
* Update completion and git-prompt to v2.10
* Update completion to v2.14
---
 plugins/gitfast/_git                |  11 +-
 plugins/gitfast/git-completion.bash | 913 ++++++++++++++++++++++++++++--------
 plugins/gitfast/git-prompt.sh       |   9 +-
 plugins/gitfast/gitfast.plugin.zsh  |   7 +-
 4 files changed, 747 insertions(+), 193 deletions(-)

(limited to 'plugins')

diff --git a/plugins/gitfast/_git b/plugins/gitfast/_git
index 6d1b4ecc7..78a6dbb3d 100644
--- a/plugins/gitfast/_git
+++ b/plugins/gitfast/_git
@@ -9,7 +9,7 @@
 #
 # If your script is somewhere else, you can configure it on your ~/.zshrc:
 #
-#  zstyle ':completion:*:*:git:*' script ~/.git-completion.sh
+#  zstyle ':completion:*:*:git:*' script ~/.git-completion.zsh
 #
 # The recommended way to install this script is to copy to '~/.zsh/_git', and
 # then add the following to your ~/.zshrc file:
@@ -67,6 +67,15 @@ __gitcomp ()
 	esac
 }
 
+__gitcomp_direct ()
+{
+	emulate -L zsh
+
+	local IFS=$'\n'
+	compset -P '*[=:]'
+	compadd -Q -- ${=1} && _ret=0
+}
+
 __gitcomp_nl ()
 {
 	emulate -L zsh
diff --git a/plugins/gitfast/git-completion.bash b/plugins/gitfast/git-completion.bash
index 8ce6b5c5f..d93441747 100644
--- a/plugins/gitfast/git-completion.bash
+++ b/plugins/gitfast/git-completion.bash
@@ -28,27 +28,55 @@
 # completion style.  For example '!f() { : git commit ; ... }; f' will
 # tell the completion to use commit completion.  This also works with aliases
 # of form "!sh -c '...'".  For example, "!sh -c ': git commit ; ... '".
+#
+# You can set the following environment variables to influence the behavior of
+# the completion routines:
+#
+#   GIT_COMPLETION_CHECKOUT_NO_GUESS
+#
+#     When set to "1", do not include "DWIM" suggestions in git-checkout
+#     completion (e.g., completing "foo" when "origin/foo" exists).
 
 case "$COMP_WORDBREAKS" in
 *:*) : great ;;
 *)   COMP_WORDBREAKS="$COMP_WORDBREAKS:"
 esac
 
+# Discovers the path to the git repository taking any '--git-dir=<path>' and
+# '-C <path>' options into account and stores it in the $__git_repo_path
+# variable.
+__git_find_repo_path ()
+{
+	if [ -n "$__git_repo_path" ]; then
+		# we already know where it is
+		return
+	fi
+
+	if [ -n "${__git_C_args-}" ]; then
+		__git_repo_path="$(git "${__git_C_args[@]}" \
+			${__git_dir:+--git-dir="$__git_dir"} \
+			rev-parse --absolute-git-dir 2>/dev/null)"
+	elif [ -n "${__git_dir-}" ]; then
+		test -d "$__git_dir" &&
+		__git_repo_path="$__git_dir"
+	elif [ -n "${GIT_DIR-}" ]; then
+		test -d "${GIT_DIR-}" &&
+		__git_repo_path="$GIT_DIR"
+	elif [ -d .git ]; then
+		__git_repo_path=.git
+	else
+		__git_repo_path="$(git rev-parse --git-dir 2>/dev/null)"
+	fi
+}
+
+# Deprecated: use __git_find_repo_path() and $__git_repo_path instead
 # __gitdir accepts 0 or 1 arguments (i.e., location)
 # returns location of .git repo
 __gitdir ()
 {
 	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
+		__git_find_repo_path || return 1
+		echo "$__git_repo_path"
 	elif [ -d "$1/.git" ]; then
 		echo "$1/.git"
 	else
@@ -56,6 +84,14 @@ __gitdir ()
 	fi
 }
 
+# Runs git with all the options given as argument, respecting any
+# '--git-dir=<path>' and '-C <path>' options present on the command line
+__git ()
+{
+	git ${__git_C_args:+"${__git_C_args[@]}"} \
+		${__git_dir:+--git-dir="$__git_dir"} "$@" 2>/dev/null
+}
+
 # The following function is based on code from:
 #
 #   bash_completion - programmable completion functions for bash 3.2+
@@ -185,6 +221,20 @@ _get_comp_words_by_ref ()
 }
 fi
 
+# Fills the COMPREPLY array with prefiltered words without any additional
+# processing.
+# Callers must take care of providing only words that match the current word
+# to be completed and adding any prefix and/or suffix (trailing space!), if
+# necessary.
+# 1: List of newline-separated matching completion words, complete with
+#    prefix and suffix.
+__gitcomp_direct ()
+{
+	local IFS=$'\n'
+
+	COMPREPLY=($1)
+}
+
 __gitcompappend ()
 {
 	local x i=${#COMPREPLY[@]}
@@ -283,11 +333,11 @@ __gitcomp_file ()
 __git_ls_files_helper ()
 {
 	if [ "$2" == "--committable" ]; then
-		git -C "$1" diff-index --name-only --relative HEAD
+		__git -C "$1" diff-index --name-only --relative HEAD
 	else
 		# NOTE: $2 is not quoted in order to support multiple options
-		git -C "$1" ls-files --exclude-standard $2
-	fi 2>/dev/null
+		__git -C "$1" ls-files --exclude-standard $2
+	fi
 }
 
 
@@ -299,99 +349,195 @@ __git_ls_files_helper ()
 #    slash.
 __git_index_files ()
 {
-	local dir="$(__gitdir)" root="${2-.}" file
+	local root="${2-.}" file
 
-	if [ -d "$dir" ]; then
-		__git_ls_files_helper "$root" "$1" |
-		while read -r file; do
-			case "$file" in
-			?*/*) echo "${file%%/*}" ;;
-			*) echo "$file" ;;
-			esac
-		done | sort | uniq
-	fi
+	__git_ls_files_helper "$root" "$1" |
+	while read -r file; do
+		case "$file" in
+		?*/*) echo "${file%%/*}" ;;
+		*) echo "$file" ;;
+		esac
+	done | sort | uniq
 }
 
+# Lists branches from the local repository.
+# 1: A prefix to be added to each listed branch (optional).
+# 2: List only branches matching this word (optional; list all branches if
+#    unset or empty).
+# 3: A suffix to be appended to each listed branch (optional).
 __git_heads ()
 {
-	local dir="$(__gitdir)"
-	if [ -d "$dir" ]; then
-		git --git-dir="$dir" for-each-ref --format='%(refname:short)' \
-			refs/heads
-		return
-	fi
+	local pfx="${1-}" cur_="${2-}" sfx="${3-}"
+
+	__git for-each-ref --format="${pfx//\%/%%}%(refname:strip=2)$sfx" \
+			"refs/heads/$cur_*" "refs/heads/$cur_*/**"
 }
 
+# Lists tags from the local repository.
+# Accepts the same positional parameters as __git_heads() above.
 __git_tags ()
 {
-	local dir="$(__gitdir)"
-	if [ -d "$dir" ]; then
-		git --git-dir="$dir" for-each-ref --format='%(refname:short)' \
-			refs/tags
-		return
-	fi
+	local pfx="${1-}" cur_="${2-}" sfx="${3-}"
+
+	__git for-each-ref --format="${pfx//\%/%%}%(refname:strip=2)$sfx" \
+			"refs/tags/$cur_*" "refs/tags/$cur_*/**"
 }
 
-# __git_refs accepts 0, 1 (to pass to __gitdir), or 2 arguments
-# presence of 2nd argument means use the guess heuristic employed
-# by checkout for tracking branches
+# Lists refs from the local (by default) or from a remote repository.
+# It accepts 0, 1 or 2 arguments:
+# 1: The remote to list refs from (optional; ignored, if set but empty).
+#    Can be the name of a configured remote, a path, or a URL.
+# 2: In addition to local refs, list unique branches from refs/remotes/ for
+#    'git checkout's tracking DWIMery (optional; ignored, if set but empty).
+# 3: A prefix to be added to each listed ref (optional).
+# 4: List only refs matching this word (optional; list all refs if unset or
+#    empty).
+# 5: A suffix to be appended to each listed ref (optional; ignored, if set
+#    but empty).
+#
+# Use __git_complete_refs() instead.
 __git_refs ()
 {
-	local i hash dir="$(__gitdir "${1-}")" track="${2-}"
+	local i hash dir track="${2-}"
+	local list_refs_from=path remote="${1-}"
 	local format refs
-	if [ -d "$dir" ]; then
-		case "$cur" in
+	local pfx="${3-}" cur_="${4-$cur}" sfx="${5-}"
+	local match="${4-}"
+	local fer_pfx="${pfx//\%/%%}" # "escape" for-each-ref format specifiers
+
+	__git_find_repo_path
+	dir="$__git_repo_path"
+
+	if [ -z "$remote" ]; then
+		if [ -z "$dir" ]; then
+			return
+		fi
+	else
+		if __git_is_configured_remote "$remote"; then
+			# configured remote takes precedence over a
+			# local directory with the same name
+			list_refs_from=remote
+		elif [ -d "$remote/.git" ]; then
+			dir="$remote/.git"
+		elif [ -d "$remote" ]; then
+			dir="$remote"
+		else
+			list_refs_from=url
+		fi
+	fi
+
+	if [ "$list_refs_from" = path ]; then
+		if [[ "$cur_" == ^* ]]; then
+			pfx="$pfx^"
+			fer_pfx="$fer_pfx^"
+			cur_=${cur_#^}
+			match=${match#^}
+		fi
+		case "$cur_" in
 		refs|refs/*)
 			format="refname"
-			refs="${cur%/*}"
+			refs=("$match*" "$match*/**")
 			track=""
 			;;
 		*)
 			for i in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD; do
-				if [ -e "$dir/$i" ]; then echo $i; fi
+				case "$i" in
+				$match*)
+					if [ -e "$dir/$i" ]; then
+						echo "$pfx$i$sfx"
+					fi
+					;;
+				esac
 			done
-			format="refname:short"
-			refs="refs/tags refs/heads refs/remotes"
+			format="refname:strip=2"
+			refs=("refs/tags/$match*" "refs/tags/$match*/**"
+				"refs/heads/$match*" "refs/heads/$match*/**"
+				"refs/remotes/$match*" "refs/remotes/$match*/**")
 			;;
 		esac
-		git --git-dir="$dir" for-each-ref --format="%($format)" \
-			$refs
+		__git_dir="$dir" __git for-each-ref --format="$fer_pfx%($format)$sfx" \
+			"${refs[@]}"
 		if [ -n "$track" ]; then
 			# employ the heuristic used by git checkout
 			# Try to find a remote branch that matches the completion word
 			# but only output if the branch name is unique
-			local ref entry
-			git --git-dir="$dir" for-each-ref --shell --format="ref=%(refname:short)" \
-				"refs/remotes/" | \
-			while read -r entry; do
-				eval "$entry"
-				ref="${ref#*/}"
-				if [[ "$ref" == "$cur"* ]]; then
-					echo "$ref"
-				fi
-			done | sort | uniq -u
+			__git for-each-ref --format="$fer_pfx%(refname:strip=3)$sfx" \
+				--sort="refname:strip=3" \
+				"refs/remotes/*/$match*" "refs/remotes/*/$match*/**" | \
+			uniq -u
 		fi
 		return
 	fi
-	case "$cur" in
+	case "$cur_" in
 	refs|refs/*)
-		git ls-remote "$dir" "$cur*" 2>/dev/null | \
+		__git ls-remote "$remote" "$match*" | \
 		while read -r hash i; do
 			case "$i" in
 			*^{}) ;;
-			*) echo "$i" ;;
+			*) echo "$pfx$i$sfx" ;;
 			esac
 		done
 		;;
 	*)
-		echo "HEAD"
-		git for-each-ref --format="%(refname:short)" -- \
-			"refs/remotes/$dir/" 2>/dev/null | sed -e "s#^$dir/##"
+		if [ "$list_refs_from" = remote ]; then
+			case "HEAD" in
+			$match*)	echo "${pfx}HEAD$sfx" ;;
+			esac
+			__git for-each-ref --format="$fer_pfx%(refname:strip=3)$sfx" \
+				"refs/remotes/$remote/$match*" \
+				"refs/remotes/$remote/$match*/**"
+		else
+			local query_symref
+			case "HEAD" in
+			$match*)	query_symref="HEAD" ;;
+			esac
+			__git ls-remote "$remote" $query_symref \
+				"refs/tags/$match*" "refs/heads/$match*" \
+				"refs/remotes/$match*" |
+			while read -r hash i; do
+				case "$i" in
+				*^{})	;;
+				refs/*)	echo "$pfx${i#refs/*/}$sfx" ;;
+				*)	echo "$pfx$i$sfx" ;;  # symbolic refs
+				esac
+			done
+		fi
 		;;
 	esac
 }
 
+# Completes refs, short and long, local and remote, symbolic and pseudo.
+#
+# Usage: __git_complete_refs [<option>]...
+# --remote=<remote>: The remote to list refs from, can be the name of a
+#                    configured remote, a path, or a URL.
+# --track: List unique remote branches for 'git checkout's tracking DWIMery.
+# --pfx=<prefix>: A prefix to be added to each ref.
+# --cur=<word>: The current ref to be completed.  Defaults to the current
+#               word to be completed.
+# --sfx=<suffix>: A suffix to be appended to each ref instead of the default
+#                 space.
+__git_complete_refs ()
+{
+	local remote track pfx cur_="$cur" sfx=" "
+
+	while test $# != 0; do
+		case "$1" in
+		--remote=*)	remote="${1##--remote=}" ;;
+		--track)	track="yes" ;;
+		--pfx=*)	pfx="${1##--pfx=}" ;;
+		--cur=*)	cur_="${1##--cur=}" ;;
+		--sfx=*)	sfx="${1##--sfx=}" ;;
+		*)		return 1 ;;
+		esac
+		shift
+	done
+
+	__gitcomp_direct "$(__git_refs "$remote" "$track" "$pfx" "$cur_" "$sfx")"
+}
+
 # __git_refs2 requires 1 argument (to pass to __git_refs)
+# Deprecated: use __git_complete_fetch_refspecs() instead.
 __git_refs2 ()
 {
 	local i
@@ -400,11 +546,29 @@ __git_refs2 ()
 	done
 }
 
+# Completes refspecs for fetching from a remote repository.
+# 1: The remote repository.
+# 2: A prefix to be added to each listed refspec (optional).
+# 3: The ref to be completed as a refspec instead of the current word to be
+#    completed (optional)
+# 4: A suffix to be appended to each listed refspec instead of the default
+#    space (optional).
+__git_complete_fetch_refspecs ()
+{
+	local i remote="$1" pfx="${2-}" cur_="${3-$cur}" sfx="${4- }"
+
+	__gitcomp_direct "$(
+		for i in $(__git_refs "$remote" "" "" "$cur_") ; do
+			echo "$pfx$i:$i$sfx"
+		done
+		)"
+}
+
 # __git_refs_remotes requires 1 argument (to pass to ls-remote)
 __git_refs_remotes ()
 {
 	local i hash
-	git ls-remote "$1" 'refs/heads/*' 2>/dev/null | \
+	__git ls-remote "$1" 'refs/heads/*' | \
 	while read -r hash i; do
 		echo "$i:refs/remotes/$1/${i#refs/heads/}"
 	done
@@ -412,9 +576,21 @@ __git_refs_remotes ()
 
 __git_remotes ()
 {
-	local d="$(__gitdir)"
-	test -d "$d/remotes" && ls -1 "$d/remotes"
-	git --git-dir="$d" remote
+	__git_find_repo_path
+	test -d "$__git_repo_path/remotes" && ls -1 "$__git_repo_path/remotes"
+	__git remote
+}
+
+# Returns true if $1 matches the name of a configured remote, false otherwise.
+__git_is_configured_remote ()
+{
+	local remote
+	for remote in $(__git_remotes); do
+		if [ "$remote" = "$1" ]; then
+			return 0
+		fi
+	done
+	return 1
 }
 
 __git_list_merge_strategies ()
@@ -468,7 +644,7 @@ __git_complete_revlist_file ()
 		*)   pfx="$ref:$pfx" ;;
 		esac
 
-		__gitcomp_nl "$(git --git-dir="$(__gitdir)" ls-tree "$ls" 2>/dev/null \
+		__gitcomp_nl "$(__git ls-tree "$ls" \
 				| sed '/^100... blob /{
 				           s,^.*	,,
 				           s,$, ,
@@ -487,15 +663,15 @@ __git_complete_revlist_file ()
 	*...*)
 		pfx="${cur_%...*}..."
 		cur_="${cur_#*...}"
-		__gitcomp_nl "$(__git_refs)" "$pfx" "$cur_"
+		__git_complete_refs --pfx="$pfx" --cur="$cur_"
 		;;
 	*..*)
 		pfx="${cur_%..*}.."
 		cur_="${cur_#*..}"
-		__gitcomp_nl "$(__git_refs)" "$pfx" "$cur_"
+		__git_complete_refs --pfx="$pfx" --cur="$cur_"
 		;;
 	*)
-		__gitcomp_nl "$(__git_refs)"
+		__git_complete_refs
 		;;
 	esac
 }
@@ -541,6 +717,7 @@ __git_complete_remote_or_refspec ()
 		i="${words[c]}"
 		case "$i" in
 		--mirror) [ "$cmd" = "push" ] && no_complete_refspec=1 ;;
+		-d|--delete) [ "$cmd" = "push" ] && lhs=0 ;;
 		--all)
 			case "$cmd" in
 			push) no_complete_refspec=1 ;;
@@ -580,23 +757,23 @@ __git_complete_remote_or_refspec ()
 	case "$cmd" in
 	fetch)
 		if [ $lhs = 1 ]; then
-			__gitcomp_nl "$(__git_refs2 "$remote")" "$pfx" "$cur_"
+			__git_complete_fetch_refspecs "$remote" "$pfx" "$cur_"
 		else
-			__gitcomp_nl "$(__git_refs)" "$pfx" "$cur_"
+			__git_complete_refs --pfx="$pfx" --cur="$cur_"
 		fi
 		;;
 	pull|remote)
 		if [ $lhs = 1 ]; then
-			__gitcomp_nl "$(__git_refs "$remote")" "$pfx" "$cur_"
+			__git_complete_refs --remote="$remote" --pfx="$pfx" --cur="$cur_"
 		else
-			__gitcomp_nl "$(__git_refs)" "$pfx" "$cur_"
+			__git_complete_refs --pfx="$pfx" --cur="$cur_"
 		fi
 		;;
 	push)
 		if [ $lhs = 1 ]; then
-			__gitcomp_nl "$(__git_refs)" "$pfx" "$cur_"
+			__git_complete_refs --pfx="$pfx" --cur="$cur_"
 		else
-			__gitcomp_nl "$(__git_refs "$remote")" "$pfx" "$cur_"
+			__git_complete_refs --remote="$remote" --pfx="$pfx" --cur="$cur_"
 		fi
 		;;
 	esac
@@ -746,7 +923,7 @@ __git_compute_porcelain_commands ()
 __git_get_config_variables ()
 {
 	local section="$1" i IFS=$'\n'
-	for i in $(git --git-dir="$(__gitdir)" config --name-only --get-regexp "^$section\..*" 2>/dev/null); do
+	for i in $(__git config --name-only --get-regexp "^$section\..*"); do
 		echo "${i#$section.}"
 	done
 }
@@ -764,8 +941,7 @@ __git_aliases ()
 # __git_aliased_command requires 1 argument
 __git_aliased_command ()
 {
-	local word cmdline=$(git --git-dir="$(__gitdir)" \
-		config --get "alias.$1")
+	local word cmdline=$(__git config --get "alias.$1")
 	for word in $cmdline; do
 		case "$word" in
 		\!gitk|gitk)
@@ -803,6 +979,50 @@ __git_find_on_cmdline ()
 	done
 }
 
+# Echo the value of an option set on the command line or config
+#
+# $1: short option name
+# $2: long option name including =
+# $3: list of possible values
+# $4: config string (optional)
+#
+# example:
+# result="$(__git_get_option_value "-d" "--do-something=" \
+#     "yes no" "core.doSomething")"
+#
+# result is then either empty (no option set) or "yes" or "no"
+#
+# __git_get_option_value requires 3 arguments
+__git_get_option_value ()
+{
+	local c short_opt long_opt val
+	local result= values config_key word
+
+	short_opt="$1"
+	long_opt="$2"
+	values="$3"
+	config_key="$4"
+
+	((c = $cword - 1))
+	while [ $c -ge 0 ]; do
+		word="${words[c]}"
+		for val in $values; do
+			if [ "$short_opt$val" = "$word" ] ||
+			   [ "$long_opt$val"  = "$word" ]; then
+				result="$val"
+				break 2
+			fi
+		done
+		((c--))
+	done
+
+	if [ -n "$config_key" ] && [ -z "$result" ]; then
+		result="$(__git config "$config_key")"
+	fi
+
+	echo "$result"
+}
+
 __git_has_doubledash ()
 {
 	local c=1
@@ -856,8 +1076,8 @@ __git_whitespacelist="nowarn warn error error-all fix"
 
 _git_am ()
 {
-	local dir="$(__gitdir)"
-	if [ -d "$dir"/rebase-apply ]; then
+	__git_find_repo_path
+	if [ -d "$__git_repo_path"/rebase-apply ]; then
 		__gitcomp "--skip --continue --resolved --abort"
 		return
 	fi
@@ -891,6 +1111,7 @@ _git_apply ()
 			--apply --no-add --exclude=
 			--ignore-whitespace --ignore-space-change
 			--whitespace= --inaccurate-eof --verbose
+			--recount --directory=
 			"
 		return
 	esac
@@ -902,13 +1123,17 @@ _git_add ()
 	--*)
 		__gitcomp "
 			--interactive --refresh --patch --update --dry-run
-			--ignore-errors --intent-to-add
+			--ignore-errors --intent-to-add --force --edit --chmod=
 			"
 		return
 	esac
 
-	# XXX should we check for --update and --all options ?
-	__git_complete_index_file "--others --modified --directory --no-empty-directory"
+	local complete_opt="--others --modified --directory --no-empty-directory"
+	if test -n "$(__git_find_on_cmdline "-u --update")"
+	then
+		complete_opt="--modified"
+	fi
+	__git_complete_index_file "$complete_opt"
 }
 
 _git_archive ()
@@ -925,7 +1150,7 @@ _git_archive ()
 	--*)
 		__gitcomp "
 			--format= --list --verbose
-			--prefix= --remote= --exec=
+			--prefix= --remote= --exec= --output
 			"
 		return
 		;;
@@ -940,7 +1165,8 @@ _git_bisect ()
 	local subcommands="start bad good skip reset visualize replay log run"
 	local subcommand="$(__git_find_on_cmdline "$subcommands")"
 	if [ -z "$subcommand" ]; then
-		if [ -f "$(__gitdir)"/BISECT_START ]; then
+		__git_find_repo_path
+		if [ -f "$__git_repo_path"/BISECT_START ]; then
 			__gitcomp "$subcommands"
 		else
 			__gitcomp "replay start"
@@ -950,7 +1176,7 @@ _git_bisect ()
 
 	case "$subcommand" in
 	bad|good|reset|skip|start)
-		__gitcomp_nl "$(__git_refs)"
+		__git_complete_refs
 		;;
 	*)
 		;;
@@ -964,29 +1190,30 @@ _git_branch ()
 	while [ $c -lt $cword ]; do
 		i="${words[c]}"
 		case "$i" in
-		-d|-m)	only_local_ref="y" ;;
-		-r)	has_r="y" ;;
+		-d|--delete|-m|--move)	only_local_ref="y" ;;
+		-r|--remotes)		has_r="y" ;;
 		esac
 		((c++))
 	done
 
 	case "$cur" in
 	--set-upstream-to=*)
-		__gitcomp_nl "$(__git_refs)" "" "${cur##--set-upstream-to=}"
+		__git_complete_refs --cur="${cur##--set-upstream-to=}"
 		;;
 	--*)
 		__gitcomp "
 			--color --no-color --verbose --abbrev= --no-abbrev
-			--track --no-track --contains --merged --no-merged
+			--track --no-track --contains --no-contains --merged --no-merged
 			--set-upstream-to= --edit-description --list
-			--unset-upstream
+			--unset-upstream --delete --move --remotes
+			--column --no-column --sort= --points-at
 			"
 		;;
 	*)
 		if [ $only_local_ref = "y" -a $has_r = "n" ]; then
-			__gitcomp_nl "$(__git_heads)"
+			__gitcomp_direct "$(__git_heads "" "$cur" " ")"
 		else
-			__gitcomp_nl "$(__git_refs)"
+			__git_complete_refs
 		fi
 		;;
 	esac
@@ -1029,24 +1256,25 @@ _git_checkout ()
 	*)
 		# check if --track, --no-track, or --no-guess was specified
 		# if so, disable DWIM mode
-		local flags="--track --no-track --no-guess" track=1
-		if [ -n "$(__git_find_on_cmdline "$flags")" ]; then
-			track=''
+		local flags="--track --no-track --no-guess" track_opt="--track"
+		if [ "$GIT_COMPLETION_CHECKOUT_NO_GUESS" = "1" ] ||
+		   [ -n "$(__git_find_on_cmdline "$flags")" ]; then
+			track_opt=''
 		fi
-		__gitcomp_nl "$(__git_refs '' $track)"
+		__git_complete_refs $track_opt
 		;;
 	esac
 }
 
 _git_cherry ()
 {
-	__gitcomp_nl "$(__git_refs)"
+	__git_complete_refs
 }
 
 _git_cherry_pick ()
 {
-	local dir="$(__gitdir)"
-	if [ -f "$dir"/CHERRY_PICK_HEAD ]; then
+	__git_find_repo_path
+	if [ -f "$__git_repo_path"/CHERRY_PICK_HEAD ]; then
 		__gitcomp "--continue --quit --abort"
 		return
 	fi
@@ -1055,7 +1283,7 @@ _git_cherry_pick ()
 		__gitcomp "--edit --no-commit --signoff --strategy= --mainline"
 		;;
 	*)
-		__gitcomp_nl "$(__git_refs)"
+		__git_complete_refs
 		;;
 	esac
 }
@@ -1091,18 +1319,24 @@ _git_clone ()
 			--template=
 			--depth
 			--single-branch
+			--no-tags
 			--branch
+			--recurse-submodules
+			--no-single-branch
+			--shallow-submodules
 			"
 		return
 		;;
 	esac
 }
 
+__git_untracked_file_modes="all no normal"
+
 _git_commit ()
 {
 	case "$prev" in
 	-c|-C)
-		__gitcomp_nl "$(__git_refs)" "" "${cur}"
+		__git_complete_refs
 		return
 		;;
 	esac
@@ -1115,11 +1349,11 @@ _git_commit ()
 		;;
 	--reuse-message=*|--reedit-message=*|\
 	--fixup=*|--squash=*)
-		__gitcomp_nl "$(__git_refs)" "" "${cur#*=}"
+		__git_complete_refs --cur="${cur#*=}"
 		return
 		;;
 	--untracked-files=*)
-		__gitcomp "all no normal" "" "${cur##--untracked-files=}"
+		__gitcomp "$__git_untracked_file_modes" "" "${cur##--untracked-files=}"
 		return
 		;;
 	--*)
@@ -1131,11 +1365,12 @@ _git_commit ()
 			--reset-author --file= --message= --template=
 			--cleanup= --untracked-files --untracked-files=
 			--verbose --quiet --fixup= --squash=
+			--patch --short --date --allow-empty
 			"
 		return
 	esac
 
-	if git rev-parse --verify --quiet HEAD >/dev/null; then
+	if __git rev-parse --verify --quiet HEAD >/dev/null; then
 		__git_complete_index_file "--committable"
 	else
 		# This is the first commit
@@ -1149,15 +1384,18 @@ _git_describe ()
 	--*)
 		__gitcomp "
 			--all --tags --contains --abbrev= --candidates=
-			--exact-match --debug --long --match --always
+			--exact-match --debug --long --match --always --first-parent
+			--exclude
 			"
 		return
 	esac
-	__gitcomp_nl "$(__git_refs)"
+	__git_complete_refs
 }
 
 __git_diff_algorithms="myers minimal patience histogram"
 
+__git_diff_submodule_formats="diff log short"
+
 __git_diff_common_options="--stat --numstat --shortstat --summary
 			--patch-with-stat --name-only --name-status --color
 			--no-color --color-words --no-renames --check
@@ -1173,6 +1411,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
 			--dirstat --dirstat= --dirstat-by-file
 			--dirstat-by-file= --cumulative
 			--diff-algorithm=
+			--submodule --submodule=
 "
 
 _git_diff ()
@@ -1184,6 +1423,10 @@ _git_diff ()
 		__gitcomp "$__git_diff_algorithms" "" "${cur##--diff-algorithm=}"
 		return
 		;;
+	--submodule=*)
+		__gitcomp "$__git_diff_submodule_formats" "" "${cur##--submodule=}"
+		return
+		;;
 	--*)
 		__gitcomp "--cached --staged --pickaxe-all --pickaxe-regex
 			--base --ours --theirs --no-index
@@ -1225,6 +1468,7 @@ __git_fetch_recurse_submodules="yes on-demand no"
 __git_fetch_options="
 	--quiet --verbose --append --upload-pack --force --keep --depth=
 	--tags --no-tags --all --prune --dry-run --recurse-submodules=
+	--unshallow --update-shallow
 "
 
 _git_fetch ()
@@ -1274,7 +1518,7 @@ _git_fsck ()
 	--*)
 		__gitcomp "
 			--tags --root --unreachable --cache --no-reflogs --full
-			--strict --verbose --lost-found
+			--strict --verbose --lost-found --name-objects
 			"
 		return
 		;;
@@ -1296,8 +1540,43 @@ _git_gitk ()
 	_gitk
 }
 
-__git_match_ctag() {
-	awk "/^${1//\//\\/}/ { print \$1 }" "$2"
+# Lists matching symbol names from a tag (as in ctags) file.
+# 1: List symbol names matching this word.
+# 2: The tag file to list symbol names from.
+# 3: A prefix to be added to each listed symbol name (optional).
+# 4: A suffix to be appended to each listed symbol name (optional).
+__git_match_ctag () {
+	awk -v pfx="${3-}" -v sfx="${4-}" "
+		/^${1//\//\\/}/ { print pfx \$1 sfx }
+		" "$2"
+}
+
+# Complete symbol names from a tag file.
+# Usage: __git_complete_symbol [<option>]...
+# --tags=<file>: The tag file to list symbol names from instead of the
+#                default "tags".
+# --pfx=<prefix>: A prefix to be added to each symbol name.
+# --cur=<word>: The current symbol name to be completed.  Defaults to
+#               the current word to be completed.
+# --sfx=<suffix>: A suffix to be appended to each symbol name instead
+#                 of the default space.
+__git_complete_symbol () {
+	local tags=tags pfx="" cur_="${cur-}" sfx=" "
+
+	while test $# != 0; do
+		case "$1" in
+		--tags=*)	tags="${1##--tags=}" ;;
+		--pfx=*)	pfx="${1##--pfx=}" ;;
+		--cur=*)	cur_="${1##--cur=}" ;;
+		--sfx=*)	sfx="${1##--sfx=}" ;;
+		*)		return 1 ;;
+		esac
+		shift
+	done
+
+	if test -r "$tags"; then
+		__gitcomp_direct "$(__git_match_ctag "$cur_" "$tags" "$pfx" "$sfx")"
+	fi
 }
 
 _git_grep ()
@@ -1318,6 +1597,8 @@ _git_grep ()
 			--max-depth
 			--count
 			--and --or --not --all-match
+			--break --heading --show-function --function-context
+			--untracked --no-index
 			"
 		return
 		;;
@@ -1325,29 +1606,26 @@ _git_grep ()
 
 	case "$cword,$prev" in
 	2,*|*,-*)
-		if test -r tags; then
-			__gitcomp_nl "$(__git_match_ctag "$cur" tags)"
-			return
-		fi
+		__git_complete_symbol && return
 		;;
 	esac
 
-	__gitcomp_nl "$(__git_refs)"
+	__git_complete_refs
 }
 
 _git_help ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "--all --info --man --web"
+		__gitcomp "--all --guides --info --man --web"
 		return
 		;;
 	esac
 	__git_compute_all_commands
 	__gitcomp "$__git_all_commands $(__git_aliases)
 		attributes cli core-tutorial cvs-migration
-		diffcore gitk glossary hooks ignore modules
-		namespaces repository-layout tutorial tutorial-2
+		diffcore everyday gitk glossary hooks ignore modules
+		namespaces repository-layout revisions tutorial tutorial-2
 		workflows
 		"
 }
@@ -1390,6 +1668,12 @@ _git_ls_files ()
 
 _git_ls_remote ()
 {
+	case "$cur" in
+	--*)
+		__gitcomp "--heads --tags --refs --get-url --symref"
+		return
+		;;
+	esac
 	__gitcomp_nl "$(__git_remotes)"
 }
 
@@ -1427,12 +1711,25 @@ __git_log_date_formats="relative iso8601 rfc2822 short local default raw"
 _git_log ()
 {
 	__git_has_doubledash && return
+	__git_find_repo_path
 
-	local g="$(git rev-parse --git-dir 2>/dev/null)"
 	local merge=""
-	if [ -f "$g/MERGE_HEAD" ]; then
+	if [ -f "$__git_repo_path/MERGE_HEAD" ]; then
 		merge="--merge"
 	fi
+	case "$prev,$cur" in
+	-L,:*:*)
+		return	# fall back to Bash filename completion
+		;;
+	-L,:*)
+		__git_complete_symbol --cur="${cur#:}" --sfx=":"
+		return
+		;;
+	-G,*|-S,*)
+		__git_complete_symbol
+		return
+		;;
+	esac
 	case "$cur" in
 	--pretty=*|--format=*)
 		__gitcomp "$__git_log_pretty_formats $(__git_pretty_aliases)
@@ -1447,6 +1744,14 @@ _git_log ()
 		__gitcomp "full short no" "" "${cur##--decorate=}"
 		return
 		;;
+	--diff-algorithm=*)
+		__gitcomp "$__git_diff_algorithms" "" "${cur##--diff-algorithm=}"
+		return
+		;;
+	--submodule=*)
+		__gitcomp "$__git_diff_submodule_formats" "" "${cur##--submodule=}"
+		return
+		;;
 	--*)
 		__gitcomp "
 			$__git_log_common_options
@@ -1458,6 +1763,7 @@ _git_log ()
 			--relative-date --date=
 			--pretty= --format= --oneline
 			--show-signature
+			--cherry-mark
 			--cherry-pick
 			--graph
 			--decorate --decorate=
@@ -1469,6 +1775,21 @@ _git_log ()
 			"
 		return
 		;;
+	-L:*:*)
+		return	# fall back to Bash filename completion
+		;;
+	-L:*)
+		__git_complete_symbol --cur="${cur#-L:}" --sfx=":"
+		return
+		;;
+	-G*)
+		__git_complete_symbol --pfx="-G" --cur="${cur#-G}"
+		return
+		;;
+	-S*)
+		__git_complete_symbol --pfx="-S" --cur="${cur#-S}"
+		return
+		;;
 	esac
 	__git_complete_revlist
 }
@@ -1488,10 +1809,10 @@ _git_merge ()
 	case "$cur" in
 	--*)
 		__gitcomp "$__git_merge_options
-			--rerere-autoupdate --no-rerere-autoupdate --abort"
+			--rerere-autoupdate --no-rerere-autoupdate --abort --continue"
 		return
 	esac
-	__gitcomp_nl "$(__git_refs)"
+	__git_complete_refs
 }
 
 _git_mergetool ()
@@ -1502,7 +1823,7 @@ _git_mergetool ()
 		return
 		;;
 	--*)
-		__gitcomp "--tool="
+		__gitcomp "--tool= --prompt --no-prompt"
 		return
 		;;
 	esac
@@ -1516,7 +1837,7 @@ _git_merge_base ()
 		return
 		;;
 	esac
-	__gitcomp_nl "$(__git_refs)"
+	__git_complete_refs
 }
 
 _git_mv ()
@@ -1554,7 +1875,7 @@ _git_notes ()
 	,*)
 		case "$prev" in
 		--ref)
-			__gitcomp_nl "$(__git_refs)"
+			__git_complete_refs
 			;;
 		*)
 			__gitcomp "$subcommands --ref"
@@ -1563,7 +1884,7 @@ _git_notes ()
 		;;
 	add,--reuse-message=*|append,--reuse-message=*|\
 	add,--reedit-message=*|append,--reedit-message=*)
-		__gitcomp_nl "$(__git_refs)" "" "${cur#*=}"
+		__git_complete_refs --cur="${cur#*=}"
 		;;
 	add,--*|append,--*)
 		__gitcomp '--file= --message= --reedit-message=
@@ -1582,7 +1903,7 @@ _git_notes ()
 		-m|-F)
 			;;
 		*)
-			__gitcomp_nl "$(__git_refs)"
+			__git_complete_refs
 			;;
 		esac
 		;;
@@ -1610,7 +1931,7 @@ _git_pull ()
 	__git_complete_remote_or_refspec
 }
 
-__git_push_recurse_submodules="check on-demand"
+__git_push_recurse_submodules="check on-demand only"
 
 __git_complete_force_with_lease ()
 {
@@ -1620,10 +1941,10 @@ __git_complete_force_with_lease ()
 	--*=)
 		;;
 	*:*)
-		__gitcomp_nl "$(__git_refs)" "" "${cur_#*:}"
+		__git_complete_refs --cur="${cur_#*:}"
 		;;
 	*)
-		__gitcomp_nl "$(__git_refs)" "" "$cur_"
+		__git_complete_refs --cur="$cur_"
 		;;
 	esac
 }
@@ -1668,12 +1989,13 @@ _git_push ()
 
 _git_rebase ()
 {
-	local dir="$(__gitdir)"
-	if [ -f "$dir"/rebase-merge/interactive ]; then
-		__gitcomp "--continue --skip --abort --edit-todo"
+	__git_find_repo_path
+	if [ -f "$__git_repo_path"/rebase-merge/interactive ]; then
+		__gitcomp "--continue --skip --abort --quit --edit-todo"
 		return
-	elif [ -d "$dir"/rebase-apply ] || [ -d "$dir"/rebase-merge ]; then
-		__gitcomp "--continue --skip --abort"
+	elif [ -d "$__git_repo_path"/rebase-apply ] || \
+	     [ -d "$__git_repo_path"/rebase-merge ]; then
+		__gitcomp "--continue --skip --abort --quit"
 		return
 	fi
 	__git_complete_strategy && return
@@ -1698,7 +2020,7 @@ _git_rebase ()
 
 		return
 	esac
-	__gitcomp_nl "$(__git_refs)"
+	__git_complete_refs
 }
 
 _git_reflog ()
@@ -1709,7 +2031,7 @@ _git_reflog ()
 	if [ -z "$subcommand" ]; then
 		__gitcomp "$subcommands"
 	else
-		__gitcomp_nl "$(__git_refs)"
+		__git_complete_refs
 	fi
 }
 
@@ -1720,9 +2042,7 @@ _git_send_email ()
 {
 	case "$prev" in
 	--to|--cc|--bcc|--from)
-		__gitcomp "
-		$(git --git-dir="$(__gitdir)" send-email --dump-aliases 2>/dev/null)
-		"
+		__gitcomp "$(__git send-email --dump-aliases)"
 		return
 		;;
 	esac
@@ -1752,9 +2072,7 @@ _git_send_email ()
 		return
 		;;
 	--to=*|--cc=*|--bcc=*|--from=*)
-		__gitcomp "
-		$(git --git-dir="$(__gitdir)" send-email --dump-aliases 2>/dev/null)
-		" "" "${cur#--*=}"
+		__gitcomp "$(__git send-email --dump-aliases)" "" "${cur#--*=}"
 		return
 		;;
 	--*)
@@ -1779,6 +2097,56 @@ _git_stage ()
 	_git_add
 }
 
+_git_status ()
+{
+	local complete_opt
+	local untracked_state
+
+	case "$cur" in
+	--ignore-submodules=*)
+		__gitcomp "none untracked dirty all" "" "${cur##--ignore-submodules=}"
+		return
+		;;
+	--untracked-files=*)
+		__gitcomp "$__git_untracked_file_modes" "" "${cur##--untracked-files=}"
+		return
+		;;
+	--column=*)
+		__gitcomp "
+			always never auto column row plain dense nodense
+			" "" "${cur##--column=}"
+		return
+		;;
+	--*)
+		__gitcomp "
+			--short --branch --porcelain --long --verbose
+			--untracked-files= --ignore-submodules= --ignored
+			--column= --no-column
+			"
+		return
+		;;
+	esac
+
+	untracked_state="$(__git_get_option_value "-u" "--untracked-files=" \
+		"$__git_untracked_file_modes" "status.showUntrackedFiles")"
+
+	case "$untracked_state" in
+	no)
+		# --ignored option does not matter
+		complete_opt=
+		;;
+	all|normal|*)
+		complete_opt="--cached --directory --no-empty-directory --others"
+
+		if [ -n "$(__git_find_on_cmdline "--ignored")" ]; then
+			complete_opt="$complete_opt --ignored --exclude=*"
+		fi
+		;;
+	esac
+
+	__git_complete_index_file "$complete_opt"
+}
+
 __git_config_get_set_variables ()
 {
 	local prevword word config_file= c=$cword
@@ -1798,7 +2166,7 @@ __git_config_get_set_variables ()
 		c=$((--c))
 	done
 
-	git --git-dir="$(__gitdir)" config $config_file --name-only --list 2>/dev/null
+	__git config $config_file --name-only --list
 }
 
 _git_config ()
@@ -1809,7 +2177,7 @@ _git_config ()
 		return
 		;;
 	branch.*.merge)
-		__gitcomp_nl "$(__git_refs)"
+		__git_complete_refs
 		return
 		;;
 	branch.*.rebase)
@@ -1833,9 +2201,8 @@ _git_config ()
 	remote.*.push)
 		local remote="${prev#remote.}"
 		remote="${remote%.push}"
-		__gitcomp_nl "$(git --git-dir="$(__gitdir)" \
-			for-each-ref --format='%(refname):%(refname)' \
-			refs/heads)"
+		__gitcomp_nl "$(__git for-each-ref \
+			--format='%(refname):%(refname)' refs/heads)"
 		return
 		;;
 	pull.twohead|pull.octopus)
@@ -1914,7 +2281,7 @@ _git_config ()
 		;;
 	branch.*)
 		local pfx="${cur%.*}." cur_="${cur#*.}"
-		__gitcomp_nl "$(__git_heads)" "$pfx" "$cur_" "."
+		__gitcomp_direct "$(__git_heads "$pfx" "$cur_" ".")"
 		__gitcomp_nl_append $'autosetupmerge\nautosetuprebase\n' "$pfx" "$cur_"
 		return
 		;;
@@ -1969,14 +2336,23 @@ _git_config ()
 	esac
 	__gitcomp "
 		add.ignoreErrors
+		advice.amWorkDir
 		advice.commitBeforeMerge
 		advice.detachedHead
 		advice.implicitIdentity
-		advice.pushNonFastForward
+		advice.pushAlreadyExists
+		advice.pushFetchFirst
+		advice.pushNeedsForce
+		advice.pushNonFFCurrent
+		advice.pushNonFFMatching
+		advice.pushUpdateRejected
 		advice.resolveConflict
+		advice.rmHints
 		advice.statusHints
+		advice.statusUoption
 		alias.
 		am.keepcr
+		am.threeWay
 		apply.ignorewhitespace
 		apply.whitespace
 		branch.autosetupmerge
@@ -2021,19 +2397,26 @@ _git_config ()
 		color.status.added
 		color.status.changed
 		color.status.header
+		color.status.localBranch
 		color.status.nobranch
+		color.status.remoteBranch
 		color.status.unmerged
 		color.status.untracked
 		color.status.updated
 		color.ui
+		commit.cleanup
+		commit.gpgSign
 		commit.status
 		commit.template
+		commit.verbose
 		core.abbrev
 		core.askpass
 		core.attributesfile
 		core.autocrlf
 		core.bare
 		core.bigFileThreshold
+		core.checkStat
+		core.commentChar
 		core.compression
 		core.createObject
 		core.deltaBaseCacheLimit
@@ -2043,6 +2426,8 @@ _git_config ()
 		core.fileMode
 		core.fsyncobjectfiles
 		core.gitProxy
+		core.hideDotFiles
+		core.hooksPath
 		core.ignoreStat
 		core.ignorecase
 		core.logAllRefUpdates
@@ -2050,20 +2435,30 @@ _git_config ()
 		core.notesRef
 		core.packedGitLimit
 		core.packedGitWindowSize
+		core.packedRefsTimeout
 		core.pager
+		core.precomposeUnicode
 		core.preferSymlinkRefs
 		core.preloadindex
+		core.protectHFS
+		core.protectNTFS
 		core.quotepath
 		core.repositoryFormatVersion
 		core.safecrlf
 		core.sharedRepository
 		core.sparseCheckout
+		core.splitIndex
+		core.sshCommand
 		core.symlinks
 		core.trustctime
 		core.untrackedCache
 		core.warnAmbiguousRefs
 		core.whitespace
 		core.worktree
+		credential.helper
+		credential.useHttpPath
+		credential.username
+		credentialCache.ignoreSIGHUP
 		diff.autorefreshindex
 		diff.external
 		diff.ignoreSubmodules
@@ -2084,6 +2479,7 @@ _git_config ()
 		format.attach
 		format.cc
 		format.coverLetter
+		format.from
 		format.headers
 		format.numbered
 		format.pretty
@@ -2094,15 +2490,19 @@ _git_config ()
 		format.thread
 		format.to
 		gc.
+		gc.aggressiveDepth
 		gc.aggressiveWindow
 		gc.auto
+		gc.autoDetach
 		gc.autopacklimit
+		gc.logExpiry
 		gc.packrefs
 		gc.pruneexpire
 		gc.reflogexpire
 		gc.reflogexpireunreachable
 		gc.rerereresolved
 		gc.rerereunresolved
+		gc.worktreePruneExpire
 		gitcvs.allbinary
 		gitcvs.commitmsgannotation
 		gitcvs.dbTableNamePrefix
@@ -2241,6 +2641,8 @@ _git_config ()
 		sendemail.thread
 		sendemail.to
 		sendemail.validate
+		sendemail.smtpbatchsize
+		sendemail.smtprelogindelay
 		showbranch.default
 		status.relativePaths
 		status.showUntrackedFiles
@@ -2259,31 +2661,79 @@ _git_config ()
 
 _git_remote ()
 {
-	local subcommands="add rename remove set-head set-branches set-url show prune update"
+	local subcommands="
+		add rename remove set-head set-branches
+		get-url set-url show prune update
+		"
 	local subcommand="$(__git_find_on_cmdline "$subcommands")"
 	if [ -z "$subcommand" ]; then
-		__gitcomp "$subcommands"
+		case "$cur" in
+		--*)
+			__gitcomp "--verbose"
+			;;
+		*)
+			__gitcomp "$subcommands"
+			;;
+		esac
 		return
 	fi
 
-	case "$subcommand" in
-	rename|remove|set-url|show|prune)
-		__gitcomp_nl "$(__git_remotes)"
+	case "$subcommand,$cur" in
+	add,--*)
+		__gitcomp "--track --master --fetch --tags --no-tags --mirror="
+		;;
+	add,*)
+		;;
+	set-head,--*)
+		__gitcomp "--auto --delete"
+		;;
+	set-branches,--*)
+		__gitcomp "--add"
 		;;
-	set-head|set-branches)
+	set-head,*|set-branches,*)
 		__git_complete_remote_or_refspec
 		;;
-	update)
+	update,--*)
+		__gitcomp "--prune"
+		;;
+	update,*)
 		__gitcomp "$(__git_get_config_variables "remotes")"
 		;;
+	set-url,--*)
+		__gitcomp "--push --add --delete"
+		;;
+	get-url,--*)
+		__gitcomp "--push --all"
+		;;
+	prune,--*)
+		__gitcomp "--dry-run"
+		;;
 	*)
+		__gitcomp_nl "$(__git_remotes)"
 		;;
 	esac
 }
 
 _git_replace ()
 {
-	__gitcomp_nl "$(__git_refs)"
+	case "$cur" in
+	--*)
+		__gitcomp "--edit --graft --format= --list --delete"
+		return
+		;;
+	esac
+	__git_complete_refs
+}
+
+_git_rerere ()
+{
+	local subcommands="clear forget diff remaining status gc"
+	local subcommand="$(__git_find_on_cmdline "$subcommands")"
+	if test -z "$subcommand"
+	then
+		__gitcomp "$subcommands"
+		return
+	fi
 }
 
 _git_reset ()
@@ -2292,27 +2742,30 @@ _git_reset ()
 
 	case "$cur" in
 	--*)
-		__gitcomp "--merge --mixed --hard --soft --patch"
+		__gitcomp "--merge --mixed --hard --soft --patch --keep"
 		return
 		;;
 	esac
-	__gitcomp_nl "$(__git_refs)"
+	__git_complete_refs
 }
 
 _git_revert ()
 {
-	local dir="$(__gitdir)"
-	if [ -f "$dir"/REVERT_HEAD ]; then
+	__git_find_repo_path
+	if [ -f "$__git_repo_path"/REVERT_HEAD ]; then
 		__gitcomp "--continue --quit --abort"
 		return
 	fi
 	case "$cur" in
 	--*)
-		__gitcomp "--edit --mainline --no-edit --no-commit --signoff"
+		__gitcomp "
+			--edit --mainline --no-edit --no-commit --signoff
+			--strategy= --strategy-option=
+			"
 		return
 		;;
 	esac
-	__gitcomp_nl "$(__git_refs)"
+	__git_complete_refs
 }
 
 _git_rm ()
@@ -2336,7 +2789,7 @@ _git_shortlog ()
 		__gitcomp "
 			$__git_log_common_options
 			$__git_log_shortlog_options
-			--numbered --summary
+			--numbered --summary --email
 			"
 		return
 		;;
@@ -2358,6 +2811,10 @@ _git_show ()
 		__gitcomp "$__git_diff_algorithms" "" "${cur##--diff-algorithm=}"
 		return
 		;;
+	--submodule=*)
+		__gitcomp "$__git_diff_submodule_formats" "" "${cur##--submodule=}"
+		return
+		;;
 	--*)
 		__gitcomp "--pretty= --format= --abbrev-commit --oneline
 			--show-signature
@@ -2388,7 +2845,7 @@ _git_show_branch ()
 _git_stash ()
 {
 	local save_opts='--all --keep-index --no-keep-index --quiet --patch --include-untracked'
-	local subcommands='save list show apply clear drop pop create branch'
+	local subcommands='push save list show apply clear drop pop create branch'
 	local subcommand="$(__git_find_on_cmdline "$subcommands")"
 	if [ -z "$subcommand" ]; then
 		case "$cur" in
@@ -2403,6 +2860,9 @@ _git_stash ()
 		esac
 	else
 		case "$subcommand,$cur" in
+		push,--*)
+			__gitcomp "$save_opts --message"
+			;;
 		save,--*)
 			__gitcomp "$save_opts"
 			;;
@@ -2416,14 +2876,14 @@ _git_stash ()
 			;;
 		branch,*)
 			if [ $cword -eq 3 ]; then
-				__gitcomp_nl "$(__git_refs)";
+				__git_complete_refs
 			else
-				__gitcomp_nl "$(git --git-dir="$(__gitdir)" stash list \
+				__gitcomp_nl "$(__git stash list \
 						| sed -n -e 's/:.*//p')"
 			fi
 			;;
 		show,*|apply,*|drop,*|pop,*)
-			__gitcomp_nl "$(git --git-dir="$(__gitdir)" stash list \
+			__gitcomp_nl "$(__git stash list \
 					| sed -n -e 's/:.*//p')"
 			;;
 		*)
@@ -2437,10 +2897,11 @@ _git_submodule ()
 	__git_has_doubledash && return
 
 	local subcommands="add status init deinit update summary foreach sync"
-	if [ -z "$(__git_find_on_cmdline "$subcommands")" ]; then
+	local subcommand="$(__git_find_on_cmdline "$subcommands")"
+	if [ -z "$subcommand" ]; then
 		case "$cur" in
 		--*)
-			__gitcomp "--quiet --cached"
+			__gitcomp "--quiet"
 			;;
 		*)
 			__gitcomp "$subcommands"
@@ -2448,6 +2909,33 @@ _git_submodule ()
 		esac
 		return
 	fi
+
+	case "$subcommand,$cur" in
+	add,--*)
+		__gitcomp "--branch --force --name --reference --depth"
+		;;
+	status,--*)
+		__gitcomp "--cached --recursive"
+		;;
+	deinit,--*)
+		__gitcomp "--force --all"
+		;;
+	update,--*)
+		__gitcomp "
+			--init --remote --no-fetch
+			--recommend-shallow --no-recommend-shallow
+			--force --rebase --merge --reference --depth --recursive --jobs
+		"
+		;;
+	summary,--*)
+		__gitcomp "--cached --files --summary-limit"
+		;;
+	foreach,--*|sync,--*)
+		__gitcomp "--recursive"
+		;;
+	*)
+		;;
+	esac
 }
 
 _git_svn ()
@@ -2468,14 +2956,14 @@ _git_svn ()
 			--no-metadata --use-svm-props --use-svnsync-props
 			--log-window-size= --no-checkout --quiet
 			--repack-flags --use-log-author --localtime
+			--add-author-from
 			--ignore-paths= --include-paths= $remote_opts
 			"
 		local init_opts="
 			--template= --shared= --trunk= --tags=
 			--branches= --stdlayout --minimize-url
 			--no-metadata --use-svm-props --use-svnsync-props
-			--rewrite-root= --prefix= --use-log-author
-			--add-author-from $remote_opts
+			--rewrite-root= --prefix= $remote_opts
 			"
 		local cmt_opts="
 			--edit --rmdir --find-copies-harder --copy-similarity=
@@ -2555,7 +3043,7 @@ _git_tag ()
 		i="${words[c]}"
 		case "$i" in
 		-d|-v)
-			__gitcomp_nl "$(__git_tags)"
+			__gitcomp_direct "$(__git_tags "" "$cur" " ")"
 			return
 			;;
 		-f)
@@ -2570,11 +3058,11 @@ _git_tag ()
 		;;
 	-*|tag)
 		if [ $f = 1 ]; then
-			__gitcomp_nl "$(__git_tags)"
+			__gitcomp_direct "$(__git_tags "" "$cur" " ")"
 		fi
 		;;
 	*)
-		__gitcomp_nl "$(__git_refs)"
+		__git_complete_refs
 		;;
 	esac
 
@@ -2582,8 +3070,8 @@ _git_tag ()
 	--*)
 		__gitcomp "
 			--list --delete --verify --annotate --message --file
-			--sign --cleanup --local-user --force --column --sort
-			--contains --points-at
+			--sign --cleanup --local-user --force --column --sort=
+			--contains --no-contains --points-at --merged --no-merged --create-reflog
 			"
 		;;
 	esac
@@ -2594,9 +3082,36 @@ _git_whatchanged ()
 	_git_log
 }
 
+_git_worktree ()
+{
+	local subcommands="add list lock prune unlock"
+	local subcommand="$(__git_find_on_cmdline "$subcommands")"
+	if [ -z "$subcommand" ]; then
+		__gitcomp "$subcommands"
+	else
+		case "$subcommand,$cur" in
+		add,--*)
+			__gitcomp "--detach"
+			;;
+		list,--*)
+			__gitcomp "--porcelain"
+			;;
+		lock,--*)
+			__gitcomp "--reason"
+			;;
+		prune,--*)
+			__gitcomp "--dry-run --expire --verbose"
+			;;
+		*)
+			;;
+		esac
+	fi
+}
+
 __git_main ()
 {
-	local i c=1 command __git_dir
+	local i c=1 command __git_dir __git_repo_path
+	local __git_C_args C_args_count=0
 
 	while [ $c -lt $cword ]; do
 		i="${words[c]}"
@@ -2606,6 +3121,10 @@ __git_main ()
 		--bare)      __git_dir="." ;;
 		--help) command="help"; break ;;
 		-c|--work-tree|--namespace) ((c++)) ;;
+		-C)	__git_C_args[C_args_count++]=-C
+			((c++))
+			__git_C_args[C_args_count++]="${words[c]}"
+			;;
 		-*) ;;
 		*) command="$i"; break ;;
 		esac
@@ -2613,6 +3132,17 @@ __git_main ()
 	done
 
 	if [ -z "$command" ]; then
+		case "$prev" in
+		--git-dir|-C|--work-tree)
+			# these need a path argument, let's fall back to
+			# Bash filename completion
+			return
+			;;
+		-c|--namespace)
+			# we don't support completing these options' arguments
+			return
+			;;
+		esac
 		case "$cur" in
 		--*)   __gitcomp "
 			--paginate
@@ -2638,13 +3168,13 @@ __git_main ()
 	fi
 
 	local completion_func="_git_${command//-/_}"
-	declare -f $completion_func >/dev/null && $completion_func && return
+	declare -f $completion_func >/dev/null 2>/dev/null && $completion_func && return
 
 	local expansion=$(__git_aliased_command "$command")
 	if [ -n "$expansion" ]; then
 		words[1]=$expansion
 		completion_func="_git_${expansion//-/_}"
-		declare -f $completion_func >/dev/null && $completion_func
+		declare -f $completion_func >/dev/null 2>/dev/null && $completion_func
 	fi
 }
 
@@ -2652,9 +3182,11 @@ __gitk_main ()
 {
 	__git_has_doubledash && return
 
-	local g="$(__gitdir)"
+	local __git_repo_path
+	__git_find_repo_path
+
 	local merge=""
-	if [ -f "$g/MERGE_HEAD" ]; then
+	if [ -f "$__git_repo_path/MERGE_HEAD" ]; then
 		merge="--merge"
 	fi
 	case "$cur" in
@@ -2701,6 +3233,15 @@ if [[ -n ${ZSH_VERSION-} ]]; then
 		esac
 	}
 
+	__gitcomp_direct ()
+	{
+		emulate -L zsh
+
+		local IFS=$'\n'
+		compset -P '*[=:]'
+		compadd -Q -- ${=1} && _ret=0
+	}
+
 	__gitcomp_nl ()
 	{
 		emulate -L zsh
@@ -2771,6 +3312,6 @@ __git_complete gitk __gitk_main
 # when the user has tab-completed the executable name and consequently
 # included the '.exe' suffix.
 #
-if [[ "$OSTYPE" = cygwin* ]]; then
+if [ Cygwin = "$(uname -o 2>/dev/null)" ]; then
 __git_complete git.exe __git_main
 fi
diff --git a/plugins/gitfast/git-prompt.sh b/plugins/gitfast/git-prompt.sh
index 0da14eee9..cd905759e 100644
--- a/plugins/gitfast/git-prompt.sh
+++ b/plugins/gitfast/git-prompt.sh
@@ -82,6 +82,7 @@
 #     contains      relative to newer annotated tag (v1.6.3.2~35)
 #     branch        relative to newer tag or branch (master~4)
 #     describe      relative to older annotated tag (v1.6.3.1-13-gdd42c2f)
+#     tag           relative to any older tag (v1.6.3.1-13-gdd42c2f)
 #     default       exactly matching tag
 #
 # If you would like a colored hint about the current dirty state, set
@@ -355,8 +356,8 @@ __git_ps1 ()
 	# incorrect.)
 	#
 	local ps1_expanded=yes
-	[ -z "$ZSH_VERSION" ] || [[ -o PROMPT_SUBST ]] || ps1_expanded=no
-	[ -z "$BASH_VERSION" ] || shopt -q promptvars || ps1_expanded=no
+	[ -z "${ZSH_VERSION-}" ] || [[ -o PROMPT_SUBST ]] || ps1_expanded=no
+	[ -z "${BASH_VERSION-}" ] || shopt -q promptvars || ps1_expanded=no
 
 	local repo_info rev_parse_exit_code
 	repo_info="$(git rev-parse --git-dir --is-inside-git-dir \
@@ -368,7 +369,7 @@ __git_ps1 ()
 		return $exit
 	fi
 
-	local short_sha
+	local short_sha=""
 	if [ "$rev_parse_exit_code" = "0" ]; then
 		short_sha="${repo_info##*$'\n'}"
 		repo_info="${repo_info%$'\n'*}"
@@ -443,6 +444,8 @@ __git_ps1 ()
 					git describe --contains HEAD ;;
 				(branch)
 					git describe --contains --all HEAD ;;
+				(tag)
+					git describe --tags HEAD ;;
 				(describe)
 					git describe HEAD ;;
 				(* | default)
diff --git a/plugins/gitfast/gitfast.plugin.zsh b/plugins/gitfast/gitfast.plugin.zsh
index dba1b1315..8c2aea497 100644
--- a/plugins/gitfast/gitfast.plugin.zsh
+++ b/plugins/gitfast/gitfast.plugin.zsh
@@ -1,8 +1,9 @@
-dir=$(dirname $0)
-source $dir/../git/git.plugin.zsh
-source $dir/git-prompt.sh
+dir="${0:A:h}"
+source "$dir/git-prompt.sh"
 
 function git_prompt_info() {
   dirty="$(parse_git_dirty)"
   __git_ps1 "${ZSH_THEME_GIT_PROMPT_PREFIX//\%/%%}%s${dirty//\%/%%}${ZSH_THEME_GIT_PROMPT_SUFFIX//\%/%%}"
 }
+
+unset dir
-- 
cgit v1.2.3-70-g09d2


From 482587ccc16da0a399f3f91ef4d29def8d22a441 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Mon, 8 Apr 2019 20:39:21 +0200
Subject: vault: deprecate and update README

Fixes #6805
---
 plugins/vault/README.md | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'plugins')

diff --git a/plugins/vault/README.md b/plugins/vault/README.md
index 5cdbb16f0..69051d2b2 100644
--- a/plugins/vault/README.md
+++ b/plugins/vault/README.md
@@ -1,18 +1,15 @@
-## Vault (https://www.vaultproject.io) autocomplete plugin
+# Vault plugin
 
-- Adds autocomplete options for all vault commands.
+Note: this plugin is deprecated. Use the [official autocompletion](https://www.vaultproject.io/docs/commands/index.html#autocompletion) instead.
 
-####Show help for all commands
-![General Help](https://i.imgur.com/yv5Db1r.png "Help for all commands")
+-------
 
+Adds autocomplete options for all [vault](https://www.vaultproject.io) commands.
 
-####Create new Vault token
-![Create token](https://i.imgur.com/xMegNgh.png "Create token")
-
-
-####Enable audit backends
-![Audit backends](https://i.imgur.com/fKLeiSF.png "Audit backends")
-
+To use it, add `vault` to the plugins array in your zshrc file:
 
+```zsh
+plugins=(... vault)
+```
 
 Crafted with <3 by Valentin Bud ([@valentinbud](https://twitter.com/valentinbud))
-- 
cgit v1.2.3-70-g09d2


From 53d6a692d14a035d03765e72c7c9425bba1b3972 Mon Sep 17 00:00:00 2001
From: programmer04 <jakub.warczarek@gmail.com>
Date: Mon, 8 Apr 2019 22:08:37 +0200
Subject: Fix showing aws prompt for theme fishy (append RPROMPT instead of
 overwrite)

---
 plugins/aws/README.md  | 2 +-
 themes/fishy.zsh-theme | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/aws/README.md b/plugins/aws/README.md
index a52024128..d83c3fafe 100644
--- a/plugins/aws/README.md
+++ b/plugins/aws/README.md
@@ -24,7 +24,7 @@ plugins=(... aws)
 
 ## Plugin options
 
-* Set `SHOW_AWS_PROMPT=false` in your zshrc file if you want to prevent the plugin from modifying your RPROMPT.
+* Set `SHOW_AWS_PROMPT=false` in your zshrc file if you want to prevent the plugin from modifying your RPROMPT. Some plugins overwrite the value of RPROMPT instead of appending to it, so they need to be fixed to see a default aws plugin RPROMPT message (for example theme fishy is fixed).
 
 ## Theme
 
diff --git a/themes/fishy.zsh-theme b/themes/fishy.zsh-theme
index 83bd455b5..00a60f45b 100644
--- a/themes/fishy.zsh-theme
+++ b/themes/fishy.zsh-theme
@@ -14,7 +14,7 @@ PROMPT='%n@%m %{$fg[$user_color]%}$(_fishy_collapsed_wd)%{$reset_color%}%(!.#.>)
 PROMPT2='%{$fg[red]%}\ %{$reset_color%}'
 
 local return_status="%{$fg_bold[red]%}%(?..%?)%{$reset_color%}"
-RPROMPT='${return_status}$(git_prompt_info)$(git_prompt_status)%{$reset_color%}'
+RPROMPT="${RPROMPT}"'${return_status}$(git_prompt_info)$(git_prompt_status)%{$reset_color%}'
 
 ZSH_THEME_GIT_PROMPT_PREFIX=" "
 ZSH_THEME_GIT_PROMPT_SUFFIX=""
-- 
cgit v1.2.3-70-g09d2


From 0c000af72162a5bd5147e8eedd25e810619f6c6f Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Mon, 8 Apr 2019 22:19:25 +0200
Subject: cloudapp: fix permissions of credentials file

Fixes #4151
---
 plugins/cloudapp/cloudapp.plugin.zsh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/cloudapp/cloudapp.plugin.zsh b/plugins/cloudapp/cloudapp.plugin.zsh
index 99252f690..3b363c81b 100644
--- a/plugins/cloudapp/cloudapp.plugin.zsh
+++ b/plugins/cloudapp/cloudapp.plugin.zsh
@@ -1,2 +1,6 @@
-#!/bin/zsh
-alias cloudapp=$ZSH/plugins/cloudapp/cloudapp.rb
+alias cloudapp="${0:a:h}/cloudapp.rb"
+
+# Ensure only the owner can access the credentials file
+if [[ -f ~/.cloudapp ]]; then
+  chmod 600 ~/.cloudapp
+fi
-- 
cgit v1.2.3-70-g09d2


From e83b70f28b974d8f7bf6a1e29392743952329cf2 Mon Sep 17 00:00:00 2001
From: Fabricio Biazzotto <sliphacker@yahoo.com.br>
Date: Mon, 8 Apr 2019 17:39:54 -0300
Subject: pip: fix indexes URL (#6986)

Fixes #6981.
---
 plugins/pip/pip.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/pip/pip.plugin.zsh b/plugins/pip/pip.plugin.zsh
index d7236b02a..5539187e1 100644
--- a/plugins/pip/pip.plugin.zsh
+++ b/plugins/pip/pip.plugin.zsh
@@ -10,7 +10,7 @@
 # "zsh-pip-clear-cache".
 
 ZSH_PIP_CACHE_FILE=~/.pip/zsh-cache
-ZSH_PIP_INDEXES=(https://pypi.python.org/simple/)
+ZSH_PIP_INDEXES=(https://pypi.org/simple/)
 
 zsh-pip-clear-cache() {
   rm $ZSH_PIP_CACHE_FILE
@@ -31,7 +31,7 @@ zsh-pip-cache-packages() {
       tmp_cache=/tmp/zsh_tmp_cache
       for index in $ZSH_PIP_INDEXES ; do
           # well... I've already got two problems
-          curl $index 2>/dev/null | \
+          curl -L $index 2>/dev/null | \
               zsh-pip-clean-packages \
                >> $tmp_cache
       done
-- 
cgit v1.2.3-70-g09d2


From 170575379eacf8048b66fb91531e2bd305228665 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Mon, 8 Apr 2019 23:14:00 +0200
Subject: gulp: fix completion function name

Fixes #6620
---
 plugins/gulp/gulp.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/gulp/gulp.plugin.zsh b/plugins/gulp/gulp.plugin.zsh
index 2b3105135..ec597421d 100644
--- a/plugins/gulp/gulp.plugin.zsh
+++ b/plugins/gulp/gulp.plugin.zsh
@@ -19,11 +19,11 @@
 # Grabs all available tasks from the `gulpfile.js`
 # in the current directory.
 #
-function $$gulp_completion {
+function _gulp_completion {
     compls=$(gulp --tasks-simple 2>/dev/null)
 
     completions=(${=compls})
     compadd -- $completions
 }
 
-compdef $$gulp_completion gulp
+compdef _gulp_completion gulp
-- 
cgit v1.2.3-70-g09d2


From 2ec868dde4adaca55bfa3fdac3585cd92f2a34c1 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Mon, 8 Apr 2019 23:22:15 +0200
Subject: swiftpm: improve README

---
 plugins/swiftpm/README.md | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

(limited to 'plugins')

diff --git a/plugins/swiftpm/README.md b/plugins/swiftpm/README.md
index d9462fb7f..291458511 100644
--- a/plugins/swiftpm/README.md
+++ b/plugins/swiftpm/README.md
@@ -2,7 +2,7 @@
 
 ## Description
 
-This plugin provides a few utilities that make you faster on your daily work with the [Swift Package Manager](https://github.com/apple/swift-package-manager).
+This plugin provides a few utilities that make you faster on your daily work with the [Swift Package Manager](https://github.com/apple/swift-package-manager), as well as autocompletion for Swift 5.0.
 
 To start using it, add the `swiftpm` plugin to your `plugins` array in `~/.zshrc`:
 
@@ -20,22 +20,3 @@ plugins=(... swiftpm)
 | `spx` | Generates an Xcode project          | `swift package generate-xcodeproj` |
 | `sps` | Print the resolved dependency graph | `swift package show-dependencies`  |
 | `spd` | Print parsed Package.swift as JSON  | `swift package dump-package`       |
-
-## Autocompletion
-
-The `_swift` file enables autocompletion for Swift Package Manager. Current version supports Swift 5.0
-
-
-### Updating the autocompletion for new version of Swift
-
-To update autocompletion to the Swift version present on your system:
-```
-swift package completion-tool generate-zsh-script > ~/.oh-my-zsh/plugins/swiftpm/_swift
-```
-
-### Known issues
-
-If `swiftpm` is not added to your zsh plugins list, autocompletion will still be triggered but will result in errors:
-```
-_values:compvalues:10: not enough arguments
-```
-- 
cgit v1.2.3-70-g09d2


From 7b06d01f8f619d9c2cbf3182f5ddbe10fb49816d Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 9 Apr 2019 11:28:35 +0200
Subject: gitfast: document deprecated git plugin dependency

---
 plugins/gitfast/README.md | 129 ++--------------------------------------------
 1 file changed, 3 insertions(+), 126 deletions(-)

(limited to 'plugins')

diff --git a/plugins/gitfast/README.md b/plugins/gitfast/README.md
index c3073709e..84e35d77c 100644
--- a/plugins/gitfast/README.md
+++ b/plugins/gitfast/README.md
@@ -10,129 +10,6 @@ plugins=(... gitfast)
 
 ## Aliases
 
-| Alias                | Command                                                                                                                                |
-| -------------------- | -------------------------------------------------------------------------------------------------------------------------------------- |
-| g                    | `git`                                                                                                                                  |
-| ga                   | `git add`                                                                                                                              |
-| gaa                  | `git add --all`                                                                                                                        |
-| gapa                 | `git add --patch`                                                                                                                      |
-| gau                  | `git add --update`                                                                                                                     |
-| gb                   | `git branch`                                                                                                                           |
-| gba                  | `git branch -a`                                                                                                                        |
-| gbd                  | `git branch -d`                                                                                                                        |
-| gbda                 | `git branch --no-color --merged | command grep -vE "^(\*|\s*(master|develop|dev)\s*$)" | command xargs -n 1 git branch -d`             |
-| gbl                  | `git blame -b -w`                                                                                                                      |
-| gbnm                 | `git branch --no-merged`                                                                                                               |
-| gbr                  | `git branch --remote`                                                                                                                  |
-| gbs                  | `git bisect`                                                                                                                           |
-| gbsb                 | `git bisect bad`                                                                                                                       |
-| gbsg                 | `git bisect good`                                                                                                                      |
-| gbsr                 | `git bisect reset`                                                                                                                     |
-| gbss                 | `git bisect start`                                                                                                                     |
-| gc                   | `git commit -v`                                                                                                                        |
-| gc!                  | `git commit -v --amend`                                                                                                                |
-| gca                  | `git commit -v -a`                                                                                                                     |
-| gca!                 | `git commit -v -a --amend`                                                                                                             |
-| gcam                 | `git commit -a -m`                                                                                                                     |
-| gcan!                | `git commit -v -a --no-edit --amend`                                                                                                   |
-| gcans!               | `git commit -v -a -s --no-edit --amend`                                                                                                |
-| gcb                  | `git checkout -b`                                                                                                                      |
-| gcd                  | `git checkout develop`                                                                                                                 |
-| gcf                  | `git config --list`                                                                                                                    |
-| gcl                  | `git clone --recursive`                                                                                                                |
-| gclean               | `git clean -fd`                                                                                                                        |
-| gcm                  | `git checkout master`                                                                                                                  |
-| gcmsg                | `git commit -m`                                                                                                                        |
-| gcn!                 | `git commit -v --no-edit --amend`                                                                                                      |
-| gco                  | `git checkout`                                                                                                                         |
-| gcount               | `git shortlog -sn`                                                                                                                     |
-| gcp                  | `git cherry-pick`                                                                                                                      |
-| gcpa                 | `git cherry-pick --abort`                                                                                                              |
-| gcpc                 | `git cherry-pick --continue`                                                                                                           |
-| gcs                  | `git commit -S`                                                                                                                        |
-| gcsm                 | `git commit -s -m`                                                                                                                     |
-| gd                   | `git diff`                                                                                                                             |
-| gdca                 | `git diff --cached`                                                                                                                    |
-| gdct                 | `` git describe --tags `git rev-list --tags --max-count=1` ``                                                                          |
-| gdt                  | `git diff-tree --no-commit-id --name-only -r`                                                                                          |
-| gdw                  | `git diff --word-diff`                                                                                                                 |
-| gf                   | `git fetch`                                                                                                                            |
-| gfa                  | `git fetch --all --prune`                                                                                                              |
-| gfo                  | `git fetch origin`                                                                                                                     |
-| gg                   | `git gui citool`                                                                                                                       |
-| gga                  | `git gui citool --amend`                                                                                                               |
-| ggpull               | `git pull origin $(git_current_branch)`                                                                                                |
-| ggpur                | `ggu`                                                                                                                                  |
-| ggpush               | `git push origin $(git_current_branch)`                                                                                                |
-| ggsup                | `git branch --set-upstream-to=origin/$(git_current_branch)`                                                                            |
-| ghh                  | `git help`                                                                                                                             |
-| gignore              | `git update-index --assume-unchanged`                                                                                                  |
-| gignored             | `git ls-files -v | grep "^[[:lower:]]"`                                                                                                |
-| git-svn-dcommit-push | `git svn dcommit && git push github master:svntrunk`                                                                                   |
-| gk                   | `\gitk --all --branches`                                                                                                               |
-| gke                  | `\gitk --all $(git log -g --pretty=%h)`                                                                                                |
-| gl                   | `git pull`                                                                                                                             |
-| glg                  | `git log --stat`                                                                                                                       |
-| glgg                 | `git log --graph`                                                                                                                      |
-| glgga                | `git log --graph --decorate --all`                                                                                                     |
-| glgm                 | `git log --graph --max-count=10`                                                                                                       |
-| glgp                 | `git log --stat -p`                                                                                                                    |
-| glo                  | `git log --oneline --decorate`                                                                                                         |
-| glog                 | `git log --oneline --decorate --graph`                                                                                                 |
-| gloga                | `git log --oneline --decorate --graph --all`                                                                                           |
-| glol                 | `git log --graph --pretty='\''%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'\'' --abbrev-commit`       |
-| glola                | `git log --graph --pretty='\''%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'\'' --abbrev-commit --all` |
-| glp                  | `_git_log_prettily`                                                                                                                    |
-| glum                 | `git pull upstream master`                                                                                                             |
-| gm                   | `git merge`                                                                                                                            |
-| gmom                 | `git merge origin/master`                                                                                                              |
-| gmt                  | `git mergetool --no-prompt`                                                                                                            |
-| gmtvim               | `git mergetool --no-prompt --tool=vimdiff`                                                                                             |
-| gmum                 | `git merge upstream/master`                                                                                                            |
-| gp                   | `git push`                                                                                                                             |
-| gpd                  | `git push --dry-run`                                                                                                                   |
-| gpoat                | `git push origin --all && git push origin --tags`                                                                                      |
-| gpristine            | `git reset --hard && git clean -dfx`                                                                                                   |
-| gpsup                | `git push --set-upstream origin $(git_current_branch)`                                                                                 |
-| gpu                  | `git push upstream`                                                                                                                    |
-| gpv                  | `git push -v`                                                                                                                          |
-| gr                   | `git remote`                                                                                                                           |
-| gra                  | `git remote add`                                                                                                                       |
-| grb                  | `git rebase`                                                                                                                           |
-| grba                 | `git rebase --abort`                                                                                                                   |
-| grbc                 | `git rebase --continue`                                                                                                                |
-| grbi                 | `git rebase -i`                                                                                                                        |
-| grbm                 | `git rebase master`                                                                                                                    |
-| grbs                 | `git rebase --skip`                                                                                                                    |
-| grh                  | `git reset HEAD`                                                                                                                       |
-| grhh                 | `git reset HEAD --hard`                                                                                                                |
-| grmv                 | `git remote rename`                                                                                                                    |
-| grrm                 | `git remote remove`                                                                                                                    |
-| grset                | `git remote set-url`                                                                                                                   |
-| grt                  | `cd $(git rev-parse --show-toplevel || echo ".")`                                                                                      |
-| gru                  | `git reset --`                                                                                                                         |
-| grup                 | `git remote update`                                                                                                                    |
-| grv                  | `git remote -v`                                                                                                                        |
-| gsb                  | `git status -sb`                                                                                                                       |
-| gsd                  | `git svn dcommit`                                                                                                                      |
-| gsi                  | `git submodule init`                                                                                                                   |
-| gsps                 | `git show --pretty=short --show-signature`                                                                                             |
-| gsr                  | `git svn rebase`                                                                                                                       |
-| gss                  | `git status -s`                                                                                                                        |
-| gst                  | `git status`                                                                                                                           |
-| gsta                 | `git stash save`                                                                                                                       |
-| gstaa                | `git stash apply`                                                                                                                      |
-| gstc                 | `git stash clear`                                                                                                                      |
-| gstd                 | `git stash drop`                                                                                                                       |
-| gstl                 | `git stash list`                                                                                                                       |
-| gstp                 | `git stash pop`                                                                                                                        |
-| gsts                 | `git stash show --text`                                                                                                                |
-| gsu                  | `git submodule update`                                                                                                                 |
-| gts                  | `git tag -s`                                                                                                                           |
-| gtv                  | `git tag | sort -V`                                                                                                                    |
-| gunignore            | `git update-index --no-assume-unchanged`                                                                                               |
-| gunwip               | `git log -n 1 | grep -q -c "\-\-wip\-\-" && git reset HEAD~1`                                                                          |
-| gup                  | `git pull --rebase`                                                                                                                    |
-| gupv                 | `git pull --rebase -v`                                                                                                                 |
-| gwch                 | `git whatchanged -p --abbrev-commit --pretty=medium`                                                                                   |
-| gwip                 | `git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify -m "--wip-- [skip ci]"`                             |
+An earlier version of the plugin also loaded the git plugin. If you want to keep those
+aliases enable the [git plugin](https://github.com/robbyrussell/oh-my-zsh/tree/master/plugins/git)
+as well.
-- 
cgit v1.2.3-70-g09d2


From 680755bbe61b3a6226638b0cb0f982019b1cb387 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 9 Apr 2019 12:03:28 +0200
Subject: iwhois: remove iwhois plugin

The whois.geek.nz resolver is now dead.

Fixes #7297
---
 plugins/iwhois/README.md         | 24 ------------------------
 plugins/iwhois/iwhois.plugin.zsh |  5 -----
 2 files changed, 29 deletions(-)
 delete mode 100644 plugins/iwhois/README.md
 delete mode 100644 plugins/iwhois/iwhois.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/iwhois/README.md b/plugins/iwhois/README.md
deleted file mode 100644
index 1626b8524..000000000
--- a/plugins/iwhois/README.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# iwhois
-
-Provides a whois command with a more accurate and up-to-date list of whois servers
-using CNAMES, via [whois.geek.nz](https://github.com/iwantmyname/whois.geek.nz).
-
-To use it, add iwhois to the plugins array of your zshrc file:
-```
-plugins=(... iwhois)
-```
-
-### Usage
-
-The plugin defines the function `iwhois` that takes a domain name as an argument:
-
-```
-$ iwhois github.com
-   Domain Name: GITHUB.COM
-   Registry Domain ID: 1264983250_DOMAIN_COM-VRSN
-   Registrar WHOIS Server: whois.markmonitor.com
-   Registrar URL: http://www.markmonitor.com
-   Updated Date: 2017-06-26T16:02:39Z
-   Creation Date: 2007-10-09T18:20:50Z
-   ...
-```
diff --git a/plugins/iwhois/iwhois.plugin.zsh b/plugins/iwhois/iwhois.plugin.zsh
deleted file mode 100644
index 22a75eec1..000000000
--- a/plugins/iwhois/iwhois.plugin.zsh
+++ /dev/null
@@ -1,5 +0,0 @@
-function iwhois() {
-    resolver="whois.geek.nz"
-    tld=`echo ${@: -1} | awk -F "." '{print $NF}'`
-    whois -h ${tld}.${resolver} "$@" ;
-}
-- 
cgit v1.2.3-70-g09d2


From 351fa06574556a3edca12c5def51a2bf5deed68b Mon Sep 17 00:00:00 2001
From: Umberto Lentini <umberto.lentini@gmail.com>
Date: Tue, 9 Apr 2019 14:05:53 +0200
Subject: osx: added support for Hyper terminal (#7494)

---
 plugins/osx/osx.plugin.zsh | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

(limited to 'plugins')

diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index a1c73a184..7deed0ba6 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -51,6 +51,17 @@ EOF
           end tell
         end tell
 EOF
+  elif [[ "$the_app" == 'Hyper' ]]; then
+    osascript >/dev/null <<EOF
+          tell application "System Events"
+            tell process "Hyper" to keystroke "t" using command down
+          end tell
+          delay 1
+          tell application "System Events"
+              keystroke "${command}"
+              key code 36  #(presses enter)
+            end tell
+EOF
 
   else
     echo "tab: unsupported terminal app: $the_app"
@@ -91,6 +102,19 @@ EOF
           end tell
         end tell
 EOF
+  
+  elif [[ "$the_app" == 'Hyper' ]]; then
+      osascript >/dev/null <<EOF
+      tell application "System Events"
+        tell process "Hyper"
+          tell menu item "Split Vertically" of menu "Shell" of menu bar 1
+            click
+          end tell
+        end tell
+        delay 1
+        keystroke "${command} \n"
+      end tell
+EOF
 
   else
     echo "$0: unsupported terminal app: $the_app" >&2
@@ -132,6 +156,19 @@ EOF
         end tell
 EOF
 
+  elif [[ "$the_app" == 'Hyper' ]]; then
+      osascript >/dev/null <<EOF
+      tell application "System Events"
+        tell process "Hyper"
+          tell menu item "Split Horizontally" of menu "Shell" of menu bar 1
+            click
+          end tell
+        end tell
+        delay 1
+        keystroke "${command} \n"
+      end tell
+EOF
+
   else
     echo "$0: unsupported terminal app: $the_app" >&2
     false
-- 
cgit v1.2.3-70-g09d2


From 069df888b0ec4db1ab06cfebd3e96f74c0413762 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 9 Apr 2019 13:45:43 +0200
Subject: docker-compose: update completion (1f97a57, 2019-03-02)

Fixes #7480
---
 plugins/docker-compose/_docker-compose | 168 ++++++++++++---------------------
 1 file changed, 58 insertions(+), 110 deletions(-)

(limited to 'plugins')

diff --git a/plugins/docker-compose/_docker-compose b/plugins/docker-compose/_docker-compose
index c0a54cced..808b068a3 100644
--- a/plugins/docker-compose/_docker-compose
+++ b/plugins/docker-compose/_docker-compose
@@ -23,7 +23,7 @@ __docker-compose_all_services_in_compose_file() {
     local already_selected
     local -a services
     already_selected=$(echo $words | tr " " "|")
-    __docker-compose_q config --services \
+    __docker-compose_q ps --services "$@" \
         | grep -Ev "^(${already_selected})$"
 }
 
@@ -31,125 +31,42 @@ __docker-compose_all_services_in_compose_file() {
 __docker-compose_services_all() {
     [[ $PREFIX = -* ]] && return 1
     integer ret=1
-    services=$(__docker-compose_all_services_in_compose_file)
+    services=$(__docker-compose_all_services_in_compose_file "$@")
     _alternative "args:services:($services)" && ret=0
 
     return ret
 }
 
-# All services that have an entry with the given key in their docker-compose.yml section
-__docker-compose_services_with_key() {
-    local already_selected
-    local -a buildable
-    already_selected=$(echo $words | tr " " "|")
-    # flatten sections to one line, then filter lines containing the key and return section name.
-    __docker-compose_q config \
-        | sed -n -e '/^services:/,/^[^ ]/p' \
-        | sed -n 's/^  //p' \
-        | awk '/^[a-zA-Z0-9]/{printf "\n"};{printf $0;next;}' \
-        | grep " \+$1:" \
-        | cut -d: -f1 \
-        | grep -Ev "^(${already_selected})$"
-}
-
 # All services that are defined by a Dockerfile reference
 __docker-compose_services_from_build() {
     [[ $PREFIX = -* ]] && return 1
-    integer ret=1
-    buildable=$(__docker-compose_services_with_key build)
-    _alternative "args:buildable services:($buildable)" && ret=0
-
-   return ret
+    __docker-compose_services_all --filter source=build
 }
 
 # All services that are defined by an image
 __docker-compose_services_from_image() {
     [[ $PREFIX = -* ]] && return 1
-    integer ret=1
-    pullable=$(__docker-compose_services_with_key image)
-    _alternative "args:pullable services:($pullable)" && ret=0
-
-    return ret
-}
-
-__docker-compose_get_services() {
-    [[ $PREFIX = -* ]] && return 1
-    integer ret=1
-    local kind
-    declare -a running paused stopped lines args services
-
-    docker_status=$(docker ps > /dev/null 2>&1)
-    if [ $? -ne 0 ]; then
-        _message "Error! Docker is not running."
-        return 1
-    fi
-
-    kind=$1
-    shift
-    [[ $kind =~ (stopped|all) ]] && args=($args -a)
-
-    lines=(${(f)"$(_call_program commands docker $docker_options ps $args)"})
-    services=(${(f)"$(_call_program commands docker-compose 2>/dev/null $compose_options ps -q)"})
-
-    # Parse header line to find columns
-    local i=1 j=1 k header=${lines[1]}
-    declare -A begin end
-    while (( j < ${#header} - 1 )); do
-        i=$(( j + ${${header[$j,-1]}[(i)[^ ]]} - 1 ))
-        j=$(( i + ${${header[$i,-1]}[(i)  ]} - 1 ))
-        k=$(( j + ${${header[$j,-1]}[(i)[^ ]]} - 2 ))
-        begin[${header[$i,$((j-1))]}]=$i
-        end[${header[$i,$((j-1))]}]=$k
-    done
-    lines=(${lines[2,-1]})
-
-    # Container ID
-    local line s name
-    local -a names
-    for line in $lines; do
-        if [[ ${services[@]} == *"${line[${begin[CONTAINER ID]},${end[CONTAINER ID]}]%% ##}"* ]]; then
-            names=(${(ps:,:)${${line[${begin[NAMES]},-1]}%% *}})
-            for name in $names; do
-                s="${${name%_*}#*_}:${(l:15:: :::)${${line[${begin[CREATED]},${end[CREATED]}]/ ago/}%% ##}}"
-                s="$s, ${line[${begin[CONTAINER ID]},${end[CONTAINER ID]}]%% ##}"
-                s="$s, ${${${line[${begin[IMAGE]},${end[IMAGE]}]}/:/\\:}%% ##}"
-                if [[ ${line[${begin[STATUS]},${end[STATUS]}]} = Exit* ]]; then
-                    stopped=($stopped $s)
-                else
-                    if [[  ${line[${begin[STATUS]},${end[STATUS]}]} = *\(Paused\)* ]]; then
-                        paused=($paused $s)
-                    fi
-                    running=($running $s)
-                fi
-            done
-        fi
-    done
-
-    [[ $kind =~ (running|all) ]] && _describe -t services-running "running services" running "$@" && ret=0
-    [[ $kind =~ (paused|all) ]] && _describe -t services-paused "paused services" paused "$@" && ret=0
-    [[ $kind =~ (stopped|all) ]] && _describe -t services-stopped "stopped services" stopped "$@" && ret=0
-
-    return ret
+    __docker-compose_services_all --filter source=image
 }
 
 __docker-compose_pausedservices() {
     [[ $PREFIX = -* ]] && return 1
-    __docker-compose_get_services paused "$@"
+    __docker-compose_services_all --filter status=paused
 }
 
 __docker-compose_stoppedservices() {
     [[ $PREFIX = -* ]] && return 1
-    __docker-compose_get_services stopped "$@"
+    __docker-compose_services_all --filter status=stopped
 }
 
 __docker-compose_runningservices() {
     [[ $PREFIX = -* ]] && return 1
-    __docker-compose_get_services running "$@"
+    __docker-compose_services_all --filter status=running
 }
 
 __docker-compose_services() {
     [[ $PREFIX = -* ]] && return 1
-    __docker-compose_get_services all "$@"
+    __docker-compose_services_all
 }
 
 __docker-compose_caching_policy() {
@@ -196,9 +113,12 @@ __docker-compose_subcommand() {
                 $opts_help \
                 "*--build-arg=[Set build-time variables for one service.]:<varname>=<value>: " \
                 '--force-rm[Always remove intermediate containers.]' \
-                '--memory[Memory limit for the build container.]' \
+                '(--quiet -q)'{--quiet,-q}'[Curb build output]' \
+                '(--memory -m)'{--memory,-m}'[Memory limit for the build container.]' \
                 '--no-cache[Do not use cache when building the image.]' \
                 '--pull[Always attempt to pull a newer version of the image.]' \
+                '--compress[Compress the build context using gzip.]' \
+                '--parallel[Build images in parallel.]' \
                 '*:services:__docker-compose_services_from_build' && ret=0
             ;;
         (bundle)
@@ -213,7 +133,8 @@ __docker-compose_subcommand() {
                 '(--quiet -q)'{--quiet,-q}"[Only validate the configuration, don't print anything.]" \
                 '--resolve-image-digests[Pin image tags to digests.]' \
                 '--services[Print the service names, one per line.]' \
-                '--volumes[Print the volume names, one per line.]' && ret=0
+                '--volumes[Print the volume names, one per line.]' \
+                '--hash[Print the service config hash, one per line. Set "service1,service2" for a list of specified services.]' \ && ret=0
             ;;
         (create)
             _arguments \
@@ -222,11 +143,12 @@ __docker-compose_subcommand() {
                 $opts_no_recreate \
                 $opts_no_build \
                 "(--no-build)--build[Build images before creating containers.]" \
-                '*:services:__docker-compose_services_all' && ret=0
+                '*:services:__docker-compose_services' && ret=0
             ;;
         (down)
             _arguments \
                 $opts_help \
+                $opts_timeout \
                 "--rmi[Remove images. Type must be one of: 'all': Remove all images used by any service. 'local': Remove only images that don't have a custom tag set by the \`image\` field.]:type:(all local)" \
                 '(-v --volumes)'{-v,--volumes}"[Remove named volumes declared in the \`volumes\` section of the Compose file and anonymous volumes attached to containers.]" \
                 $opts_remove_orphans && ret=0
@@ -235,16 +157,18 @@ __docker-compose_subcommand() {
             _arguments \
                 $opts_help \
                 '--json[Output events as a stream of json objects]' \
-                '*:services:__docker-compose_services_all' && ret=0
+                '*:services:__docker-compose_services' && ret=0
             ;;
         (exec)
             _arguments \
                 $opts_help \
                 '-d[Detached mode: Run command in the background.]' \
                 '--privileged[Give extended privileges to the process.]' \
-		'(-u --user)'{-u,--user=}'[Run the command as this user.]:username:_users' \
+                '(-u --user)'{-u,--user=}'[Run the command as this user.]:username:_users' \
                 '-T[Disable pseudo-tty allocation. By default `docker-compose exec` allocates a TTY.]' \
                 '--index=[Index of the container if there are multiple instances of a service \[default: 1\]]:index: ' \
+                '*'{-e,--env}'[KEY=VAL Set an environment variable (can be used multiple times)]:environment variable KEY=VAL: ' \
+                '(-w --workdir)'{-w,--workdir=}'[Working directory inside the container]:workdir: ' \
                 '(-):running services:__docker-compose_runningservices' \
                 '(-):command: _command_names -e' \
                 '*::arguments: _normal' && ret=0
@@ -252,12 +176,12 @@ __docker-compose_subcommand() {
         (help)
             _arguments ':subcommand:__docker-compose_commands' && ret=0
             ;;
-	(images)
-	    _arguments \
-		$opts_help \
-		'-q[Only display IDs]' \
-		'*:services:__docker-compose_services_all' && ret=0
-	    ;;
+    (images)
+        _arguments \
+        $opts_help \
+        '-q[Only display IDs]' \
+        '*:services:__docker-compose_services' && ret=0
+        ;;
         (kill)
             _arguments \
                 $opts_help \
@@ -271,7 +195,7 @@ __docker-compose_subcommand() {
                 $opts_no_color \
                 '--tail=[Number of lines to show from the end of the logs for each container.]:number of lines: ' \
                 '(-t --timestamps)'{-t,--timestamps}'[Show timestamps]' \
-                '*:services:__docker-compose_services_all' && ret=0
+                '*:services:__docker-compose_services' && ret=0
             ;;
         (pause)
             _arguments \
@@ -290,12 +214,16 @@ __docker-compose_subcommand() {
             _arguments \
                 $opts_help \
                 '-q[Only display IDs]' \
-                '*:services:__docker-compose_services_all' && ret=0
+                '--filter KEY=VAL[Filter services by a property]:<filtername>=<value>:' \
+                '*:services:__docker-compose_services' && ret=0
             ;;
         (pull)
             _arguments \
                 $opts_help \
                 '--ignore-pull-failures[Pull what it can and ignores images with pull failures.]' \
+                '--no-parallel[Disable parallel pulling]' \
+                '(-q --quiet)'{-q,--quiet}'[Pull without printing progress information]' \
+                '--include-deps[Also pull services declared as dependencies]' \
                 '*:services:__docker-compose_services_from_image' && ret=0
             ;;
         (push)
@@ -317,6 +245,7 @@ __docker-compose_subcommand() {
                 $opts_no_deps \
                 '-d[Detached mode: Run container in the background, print new container name.]' \
                 '*-e[KEY=VAL Set an environment variable (can be used multiple times)]:environment variable KEY=VAL: ' \
+                '*'{-l,--label}'[KEY=VAL Add or override a label (can be used multiple times)]:label KEY=VAL: ' \
                 '--entrypoint[Overwrite the entrypoint of the image.]:entry point: ' \
                 '--name=[Assign a name to the container]:name: ' \
                 '(-p --publish)'{-p,--publish=}"[Publish a container's port(s) to the host]" \
@@ -326,6 +255,7 @@ __docker-compose_subcommand() {
                 '(-u --user)'{-u,--user=}'[Run as specified username or uid]:username or uid:_users' \
                 '(-v --volume)*'{-v,--volume=}'[Bind mount a volume]:volume: ' \
                 '(-w --workdir)'{-w,--workdir=}'[Working directory inside the container]:workdir: ' \
+                "--use-aliases[Use the services network aliases in the network(s) the container connects to]" \
                 '(-):services:__docker-compose_services' \
                 '(-):command: _command_names -e' \
                 '*::arguments: _normal' && ret=0
@@ -369,8 +299,10 @@ __docker-compose_subcommand() {
                 "(--no-build)--build[Build images before starting containers.]" \
                 "(-d)--abort-on-container-exit[Stops all containers if any container was stopped. Incompatible with -d.]" \
                 '(-t --timeout)'{-t,--timeout}"[Use this timeout in seconds for container shutdown when attached or when containers are already running. (default: 10)]:seconds: " \
+                '--scale[SERVICE=NUM Scale SERVICE to NUM instances. Overrides the `scale` setting in the Compose file if present.]:service scale SERVICE=NUM: ' \
+                '--exit-code-from=[Return the exit code of the selected service container. Implies --abort-on-container-exit]:service:__docker-compose_services' \
                 $opts_remove_orphans \
-                '*:services:__docker-compose_services_all' && ret=0
+                '*:services:__docker-compose_services' && ret=0
             ;;
         (version)
             _arguments \
@@ -409,8 +341,11 @@ _docker-compose() {
         '(- :)'{-h,--help}'[Get help]' \
         '*'{-f,--file}"[${file_description}]:file:_files -g '*.yml'" \
         '(-p --project-name)'{-p,--project-name}'[Specify an alternate project name (default: directory name)]:project name:' \
-        '--verbose[Show more output]' \
+        "--compatibility[If set, Compose will attempt to convert keys in v3 files to their non-Swarm equivalent]" \
         '(- :)'{-v,--version}'[Print version and exit]' \
+        '--verbose[Show more output]' \
+        '--log-level=[Set log level]:level:(DEBUG INFO WARNING ERROR CRITICAL)' \
+        '--no-ansi[Do not print ANSI control characters]' \
         '(-H --host)'{-H,--host}'[Daemon socket to connect to]:host:' \
         '--tls[Use TLS; implied by --tlsverify]' \
         '--tlscacert=[Trust certs signed only by this CA]:ca path:' \
@@ -421,7 +356,7 @@ _docker-compose() {
         '(-): :->command' \
         '(-)*:: :->option-or-argument' && ret=0
 
-    local -a relevant_compose_flags relevant_docker_flags compose_options docker_options
+    local -a relevant_compose_flags relevant_compose_repeatable_flags relevant_docker_flags compose_options docker_options
 
     relevant_compose_flags=(
         "--file" "-f"
@@ -435,6 +370,10 @@ _docker-compose() {
         "--skip-hostname-check"
     )
 
+    relevant_compose_repeatable_flags=(
+        "--file" "-f"
+    )
+
     relevant_docker_flags=(
         "--host" "-H"
         "--tls"
@@ -452,9 +391,18 @@ _docker-compose() {
             fi
         fi
         if [[ -n "${relevant_compose_flags[(r)$k]}" ]]; then
-            compose_options+=$k
-            if [[ -n "$opt_args[$k]" ]]; then
-                compose_options+=$opt_args[$k]
+            if [[ -n "${relevant_compose_repeatable_flags[(r)$k]}"  ]]; then
+                values=("${(@s/:/)opt_args[$k]}")
+                for value in $values
+                do
+                    compose_options+=$k
+                    compose_options+=$value
+                done
+            else
+                compose_options+=$k
+                if [[ -n "$opt_args[$k]" ]]; then
+                    compose_options+=$opt_args[$k]
+                fi
             fi
         fi
     done
-- 
cgit v1.2.3-70-g09d2


From ab140683689a38006854533a40e0fe54427d9181 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 9 Apr 2019 15:30:11 +0200
Subject: httpie: bundle zsh-completions completion (e5bd16f, 2016-12-18)

Source: https://github.com/zsh-users/zsh-completions/blob/master/src/_httpie

Related: #7308
---
 plugins/httpie/README.md         |  17 +++-
 plugins/httpie/_httpie           | 181 +++++++++++++++++++++++++++++++++++++++
 plugins/httpie/httpie.plugin.zsh |  33 -------
 3 files changed, 194 insertions(+), 37 deletions(-)
 create mode 100644 plugins/httpie/_httpie
 delete mode 100644 plugins/httpie/httpie.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/httpie/README.md b/plugins/httpie/README.md
index 56aa6a8ca..f22d3a64e 100644
--- a/plugins/httpie/README.md
+++ b/plugins/httpie/README.md
@@ -1,6 +1,15 @@
-## HTTPie
-**Maintainer:** [lululau](https://github.com/lululau)
+# HTTPie plugin
+
+This plugin adds completion for [HTTPie](https://httpie.org), a command line HTTP
+client, a friendlier cURL replacement.
+
+To use it, add `httpie` to the plugins array in your zshrc file:
 
-This plugin adds completion for HTTPie, which is a command line HTTP client, a user-friendly cURL replacement.
+```zsh
+plugins=(... httpie)
+```
 
-[HTTPie Homepage](https://httpie.org)
+It uses completion from [zsh-completions](https://github.com/zsh-users/zsh-completions).
+
+
+**Maintainer:** [lululau](https://github.com/lululau)
diff --git a/plugins/httpie/_httpie b/plugins/httpie/_httpie
new file mode 100644
index 000000000..4d702ef60
--- /dev/null
+++ b/plugins/httpie/_httpie
@@ -0,0 +1,181 @@
+#compdef http
+# ------------------------------------------------------------------------------
+# Copyright (c) 2015 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#     * Redistributions of source code must retain the above copyright
+#       notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#     * Neither the name of the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL ZSH-USERS BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for httpie 0.7.2  (http://httpie.org)
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Akira Maeda <https://github.com/glidenote>
+#  * Valodim <https://github.com/Valodim>
+#  * Claus Klingberg <https://github.com/cjk>
+#
+# ------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# ------------------------------------------------------------------------------
+
+_httpie_params () {
+
+    local ret=1 expl
+
+    # or a url
+    if (( CURRENT <= NORMARG+1 )) && [[ $words[NORMARG] != *:* ]] ; then
+        _httpie_urls && ret=0
+
+    # regular param, if we already have a url
+    elif (( CURRENT > NORMARG )); then
+
+        # if the suffix is precisely : this is shorthand for a header
+        if [[ -prefix ':' ]]; then
+            PREFIX=
+            SUFFIX=:
+        fi
+
+        # if we are in front of a : (possibly due to the PREFIX move before)
+        if [[ -suffix ':' ]]; then
+
+            # this is rather buggy with normal tab behavior :\
+            compstate[insert]=menu
+            _wanted http_header expl 'HTTP Header' \
+                compadd -s ':' -S '' -- Content-Type Cookie && return 0
+        fi
+
+        # ignore all prefix stuff
+        compset -P '(#b)([^:@=]#)'
+        local name=$match[1]
+
+        if compset -P '='; then
+            _message "$name data field value"
+        elif compset -P '@'; then
+            _files
+        elif compset -P ':=@'; then
+            _files
+        elif compset -P ':='; then
+            _message "$name raw json data"
+        elif compset -P '=='; then
+            _message "$name url parameter value"
+        elif compset -P ':'; then
+            _message "$name header content"
+        else
+            typeset -a ops
+            ops=(
+                '=:data field'
+                '\::header'
+                '==:request parameter'
+                '@:data file field'
+                '\:=:raw json field'
+                '\:=@:raw json field file path'
+            )
+            _describe -t httpparams "parameter types" ops -Q -S ''
+        fi
+
+        ret=0
+
+    fi
+
+    # first arg may be a request method
+    (( CURRENT == NORMARG )) &&
+        _wanted http_method expl 'Request Method' \
+            compadd GET POST PUT DELETE HEAD OPTIONS TRACE CONNECT PATCH LINK UNLINK && ret=0
+
+    return $ret
+
+}
+
+_httpie_urls() {
+
+  local ret=1
+
+  if ! [[ -prefix [-+.a-z0-9]#:// ]]; then
+    local expl
+    compset -S '[^:/]*' && compstate[to_end]=''
+    _wanted url-schemas expl 'URL schema' compadd -S '' http:// https:// && ret=0
+  else
+    _urls && ret=0
+  fi
+
+  return $ret
+
+}
+
+_httpie_printflags () {
+
+    local ret=1
+
+    # not sure why this is necessary, but it will complete "-pH" style without it
+    [[ $IPREFIX == "-p" ]] && IPREFIX+=" "
+
+    compset -P '(#b)([a-zA-Z]#)'
+
+    local -a flags
+    [[ $match[1] != *H* ]] && flags+=( "H:request headers" )
+    [[ $match[1] != *B* ]] && flags+=( "B:request body" )
+    [[ $match[1] != *h* ]] && flags+=( "h:response headers" )
+    [[ $match[1] != *b* ]] && flags+=( "b:response body" )
+
+    _describe -t printflags "print flags" flags -S '' && ret=0
+
+    return $ret
+
+}
+
+integer NORMARG
+
+_arguments -n -C -s \
+  '(-j --json -f)'{-j,--json}'[Data items from the command line are serialized as a JSON object.]' \
+  '(-f --form -j)'{-f,--form}'[Data items from the command line are serialized as form fields.]' \
+  '--pretty=[Controls output processing.]:output format:(all colors format none)' \
+  '(-s --style)'{-s,--style}'=[Output coloring style]:STYLE:(autumn borland bw colorful default emacs friendly fruity manni monokai murphy native pastie perldoc ttr solarized tango trac vim vs)' \
+  '(-p --print)'{-p,--print}'=[String specifying what the output should contain]:print flags:_httpie_printflags' \
+  '(-v --verbose)'{-v,--verbose}'[Print the whole request as well as the response.]' \
+  '(-p -h --headers)'{-h,--headers}'[Print only the response headers.]' \
+  '(-p -b --body)'{-b,--body}'[Print only the response body.]' \
+  '(-S --stream)'{-S,--stream}'[Always stream the output by line, i.e., behave like `tail -f`.]' \
+  '(-o --output)'{-o,--output}'=[Save output to FILE.]:output file:_files' \
+  '(-d --download)'{-d,--download}'=[Do not print the response body to stdout.]' \
+  '(-c --continue)'{-c,--continue}'[Resume an interrupted download.]' \
+  '(--session-read-only)--session=[Create, or reuse and update a session.]:session name (or path)' \
+  '(--session)--session-read-only=[Create or read a session without updating it form the request/response exchange.]:session name (or path)' \
+  '(-a --auth)'{-a,--auth}'=[If only the username is provided (-a username)]:USER\:PASS' \
+  '--auth-type=[The authentication mechanism to be used. Defaults to "basic".]:AUTH-TYPE:(basic digest)' \
+  '--proxy=[String mapping protocol to the URL of the proxy.]:PROXY' \
+  '--follow[Allow full redirects.]' \
+  "--verify=[Enable or disable verification of ssl certificates.]:verify certificate:(yes no)" \
+  '--allow-redirects[Set this flag if full redirects are allowed (e.g. re-POST-ing of data at new ``Location``)]' \
+  '--timeout=[Float describes the timeout of the request (Use socket.setdefaulttimeout() as fallback).]:timeout (seconds)' \
+  '--check-status[This flag instructs HTTPie to also check the HTTP status code and exit with an error if the status indicates one.]' \
+  '--ignore-stdin[Do not attempt to read stdin.]' \
+  '(- *)--help[show help message.]' \
+  "(- *)--version[show program's version number and exit.]" \
+  '--traceback[Prints exception traceback should one occur.]' \
+  '--debug[Prints exception traceback should one occur and other information useful for debugging HTTPie itself.]' \
+  '*:args:_httpie_params' && return 0
diff --git a/plugins/httpie/httpie.plugin.zsh b/plugins/httpie/httpie.plugin.zsh
deleted file mode 100644
index 68ead6c67..000000000
--- a/plugins/httpie/httpie.plugin.zsh
+++ /dev/null
@@ -1,33 +0,0 @@
-function _httpie_completion() {
-  _arguments -C \
-    '(- 1 *)--version[display version information]' \
-    '(-j|--json)'{-j,--json}'[(default) Data items from the command line are serialized as a JSON object]' \
-    '(-f|--form)'{-f,--form}'[Data items from the command line are serialized as form fields]' \
-    '(--pretty)--pretty[<all,colors,format,none> Controls output processing]:options' \
-    '(-s|--style)'{-s,--style}'[Output coloring style]' \
-    '(-p|--print)'{-p,--print}'[String specifying what the output should contain: H(request headers), B(request body), h(response headers), b(response body)]' \
-    '(-v|--verbose)'{-v,--verbose}'[Print the whole request as well as the response. Shortcut for --print=HBbh.]' \
-    '(-h|--headers)'{-h,--headers}'[Print only the response headers. Shortcut for --print=h]' \
-    '(-b|--body)'{-b,--body}'[Print only the response body. Shortcut for --print=b]' \
-    '(-S|--stream)'{-S,--stream}'[Always stream the output by line, i.e., behave like `tail -f'"'"']' \
-    '(-o|--output)'{-o,--output}'[Save output to FILE]:file:_files' \
-    '(-d|--download)'{-d,--download}'[Do not print the response body to stdout. Rather, download it and store it in a file. The filename is guessed unless specified with --output filename. This action is similar to the default behaviour of wget.]' \
-    '(-c|--continue)'{-c,--continue}'[Resume an interrupted download. Note that the --output option needs to be specified as well.]' \
-    '(--session)--session[Create, or reuse and update a session. Within a session, custom headers, auth credential, as well as any cookies sent by the server persist between requests]:file:_files' \
-    '(--session-read-only)--session-read-only[Create or read a session without updating it form the request/response exchange]:file:_files' \
-    '(-a|--auth)'{-a,--auth}'[<USER:PASS> If only the username is provided (-a username), HTTPie will prompt for the password]' \
-    '(--auth-type)--auth-type[<basic, digest> The authentication mechanism to be used. Defaults to "basic".]' \
-    '(--proxy)--proxy[<PROTOCOL:PROXY_URL> String mapping protocol to the URL of the proxy]' \
-    '(--follow)--follow[Set this flag if full redirects are allowed (e.g. re-POST-ing of data at new Location).]' \
-    '(--verify)--verify[<VERIFY> Set to "no" to skip checking the host'"'"'s SSL certificate. You can also pass the path to a CA_BUNDLE file for private certs. You can also set the REQUESTS_CA_BUNDLE  environment variable. Defaults to "yes".]' \
-    '(--timeout)--timeout[<SECONDS> The connection timeout of the request in seconds. The default value is 30 seconds]' \
-    '(--check-status)--check-status[By default, HTTPie exits with 0 when no network or other fatal errors occur. This flag instructs HTTPie to also check the HTTP status code and exit with an error if the status indicates one.]' \
-    '(--ignore-stdin)--ignore-stdin[Do not attempt to read stdin]' \
-    '(--help)--help[Show this help message and exit]' \
-    '(--traceback)--traceback[Prints exception traceback should one occur]' \
-    '(--debug)--debug[Prints exception traceback should one occur, and also other information that is useful for debugging HTTPie itself and for reporting bugs]' \
-    '1: :->cmds' \
-    '*: :->args' && ret=0
-}
-
-compdef _httpie_completion http
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From d0efa0071c37b86512a2569aeff89f9faaeb4309 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 9 Apr 2019 15:37:24 +0200
Subject: tmuxinator: fix completion file header

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

(limited to 'plugins')

diff --git a/plugins/tmuxinator/_tmuxinator b/plugins/tmuxinator/_tmuxinator
index 37032f8d8..9ae25ac38 100644
--- a/plugins/tmuxinator/_tmuxinator
+++ b/plugins/tmuxinator/_tmuxinator
@@ -1,3 +1,6 @@
+#compdef tmuxinator mux
+#autoload
+
 _tmuxinator() {
   local commands projects
   commands=(${(f)"$(tmuxinator commands zsh)"})
@@ -17,5 +20,4 @@ _tmuxinator() {
   return
 }
 
-compdef _tmuxinator tmuxinator mux
-alias mux="tmuxinator"
+compdef _tmuxinator tmuxinator
-- 
cgit v1.2.3-70-g09d2


From a628b552c47be4e571dcba751ac12d0bf1d14133 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 9 Apr 2019 16:48:56 +0200
Subject: vi-mode: add CTRL+S to search history forward

Fixes #6999
---
 plugins/vi-mode/vi-mode.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh
index 93964594b..c1cdd2851 100644
--- a/plugins/vi-mode/vi-mode.plugin.zsh
+++ b/plugins/vi-mode/vi-mode.plugin.zsh
@@ -28,8 +28,9 @@ bindkey '^?' backward-delete-char
 bindkey '^h' backward-delete-char
 bindkey '^w' backward-kill-word
 
-# allow ctrl-r to perform backward search in history
+# allow ctrl-r and ctrl-s to search the history
 bindkey '^r' history-incremental-search-backward
+bindkey '^s' history-incremental-search-forward
 
 # allow ctrl-a and ctrl-e to move to beginning/end of line
 bindkey '^a' beginning-of-line
-- 
cgit v1.2.3-70-g09d2


From 4aa545abedb430df2fa1ae2cc7cc502a5be1a80b Mon Sep 17 00:00:00 2001
From: 黄璞 <awsomekde@gmail.com>
Date: Tue, 9 Apr 2019 23:24:31 +0800
Subject: archlinux: fix minor typo (#7752)

yaourt -> yay
---
 plugins/archlinux/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/archlinux/README.md b/plugins/archlinux/README.md
index 7ebe8e53d..ff2b6a4c4 100644
--- a/plugins/archlinux/README.md
+++ b/plugins/archlinux/README.md
@@ -14,7 +14,7 @@
 | yalocs  | yay -Qs                            | Search for packages in the local database                           |
 | yalst   | yay -Qe                            | List installed packages including from AUR (tagged as "local")      |
 | yamir   | yay -Syy                           | Force refresh of all package lists after updating mirrorlist        |
-| yaorph  | yay -Qtd                           | Remove orphans using yaourt                                         |
+| yaorph  | yay -Qtd                           | Remove orphans using yay                                            |
 | yare    | yay -R                             | Remove packages, keeping its settings and dependencies              |
 | yarem   | yay -Rns                           | Remove packages, including its settings and unneeded dependencies   |
 | yarep   | yay -Si                            | Display information about a package in the repositories             |
-- 
cgit v1.2.3-70-g09d2


From 63291f4fcc07de3014362ef5101132d91ad3d497 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 9 Apr 2019 18:24:04 +0200
Subject: Reword and fix formatting

---
 plugins/aws/README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/aws/README.md b/plugins/aws/README.md
index d83c3fafe..57c3b54ac 100644
--- a/plugins/aws/README.md
+++ b/plugins/aws/README.md
@@ -24,7 +24,9 @@ plugins=(... aws)
 
 ## Plugin options
 
-* Set `SHOW_AWS_PROMPT=false` in your zshrc file if you want to prevent the plugin from modifying your RPROMPT. Some plugins overwrite the value of RPROMPT instead of appending to it, so they need to be fixed to see a default aws plugin RPROMPT message (for example theme fishy is fixed).
+* Set `SHOW_AWS_PROMPT=false` in your zshrc file if you want to prevent the plugin from modifying your RPROMPT.
+  Some themes might overwrite the value of RPROMPT instead of appending to it, so they'll need to be fixed to
+  see the AWS profile prompt.
 
 ## Theme
 
-- 
cgit v1.2.3-70-g09d2


From 1bd72f588cb2e4950ea513aa4315ce77c792e43b Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 9 Apr 2019 18:29:18 +0200
Subject: Update to inline conditional syntax

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

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 17e4d4b9d..fa2487a2c 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -33,11 +33,6 @@ function work_in_progress() {
   fi
 }
 
-function _omz_git_stash_command() {
-  [[ `git --version 2>/dev/null` =~ '^git version ([[:digit:]]+.[[:digit:]]+)' && "$match[1]" >= '2.13' ]] \
-  && echo push || echo save
-}
-
 #
 # Aliases
 # (sorted alphabetically)
@@ -243,7 +238,12 @@ alias gsps='git show --pretty=short --show-signature'
 alias gsr='git svn rebase'
 alias gss='git status -s'
 alias gst='git status'
-alias gsta="git stash $(_omz_git_stash_command)"
+
+# use the default stash push on git 2.13 and newer
+[[ "$(git --version 2>/dev/null)" =~ '^git version ([0-9]+.[0-9]+)' && "$match" -ge '2.13' ]] \
+  && alias gsta='git stash push'
+  || alias gsta='git stash save'
+
 alias gstaa='git stash apply'
 alias gstc='git stash clear'
 alias gstd='git stash drop'
-- 
cgit v1.2.3-70-g09d2


From b31106b3414f8b62589f25c25f6de6f921ee2efe Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 9 Apr 2019 18:35:09 +0200
Subject: git: minor syntax fix

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

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 344419f1e..ef4697906 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -242,7 +242,7 @@ alias gst='git status'
 
 # use the default stash push on git 2.13 and newer
 [[ "$(git --version 2>/dev/null)" =~ '^git version ([0-9]+.[0-9]+)' && "$match" -ge '2.13' ]] \
-  && alias gsta='git stash push'
+  && alias gsta='git stash push' \
   || alias gsta='git stash save'
 
 alias gstaa='git stash apply'
-- 
cgit v1.2.3-70-g09d2


From cab1ac6e682038b2ceca9d16f8c458c0e79149ca Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 9 Apr 2019 19:01:10 +0200
Subject: emacs: use open frame if there is one present

Fixes #5779
Fixes #5405
---
 plugins/emacs/emacsclient.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/emacs/emacsclient.sh b/plugins/emacs/emacsclient.sh
index 26b28d495..b4f49e12b 100755
--- a/plugins/emacs/emacsclient.sh
+++ b/plugins/emacs/emacsclient.sh
@@ -5,7 +5,7 @@ _emacsfun()
     # get list of emacs frames.
     frameslist=`emacsclient --alternate-editor '' --eval '(frame-list)' 2>/dev/null | egrep -o '(frame)+'`
 
-    if [ "$(echo "$frameslist" | sed -n '$=')" -ge 2 ] ;then
+    if [ "$(echo "$frameslist" | sed -n '$=')" -ge 1 ] ;then
         # prevent creating another X frame if there is at least one present.
         emacsclient --alternate-editor "" "$@"
     else
-- 
cgit v1.2.3-70-g09d2


From 481a649f90008e8c45e650fb7127c9c7df0028e8 Mon Sep 17 00:00:00 2001
From: Maximilian Güntner <code@maschinenpsychologe.de>
Date: Wed, 15 Jun 2016 12:27:25 +0200
Subject: NixOS: Use autojump.sh to figure out location of autojump.zsh
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maximilian Güntner <code@maschinenpsychologe.de>
---
 plugins/autojump/autojump.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh
index c0af67631..3946106b0 100644
--- a/plugins/autojump/autojump.plugin.zsh
+++ b/plugins/autojump/autojump.plugin.zsh
@@ -3,8 +3,8 @@ if [ $commands[autojump] ]; then # check if autojump is installed
     . $HOME/.autojump/etc/profile.d/autojump.zsh
   elif [ -f $HOME/.autojump/share/autojump/autojump.zsh ]; then # another manual user-local installation
     . $HOME/.autojump/share/autojump/autojump.zsh
-  elif [ -f $HOME/.nix-profile/etc/profile.d/autojump.zsh ]; then # nix installation
-    . $HOME/.nix-profile/etc/profile.d/autojump.zsh
+  elif [ -f $HOME/.nix-profile/etc/profile.d/autojump.sh ]; then # nix installation
+    . $HOME/.nix-profile/etc/profile.d/autojump.sh
   elif [ -f /run/current-system/sw/share/autojump/autojump.zsh ]; then # nixos installation
     . /run/current-system/sw/share/autojump/autojump.zsh
   elif [ -f /usr/share/autojump/autojump.zsh ]; then # debian and ubuntu package
-- 
cgit v1.2.3-70-g09d2


From 5e9ee67f2b7e53c9e4bb5a0220276a97a22ca0e6 Mon Sep 17 00:00:00 2001
From: Alex Parker <misterparker@gmail.com>
Date: Fri, 23 Oct 2015 13:00:12 -0600
Subject: Update autojump.plugin.zsh

I was adding autojump on a new machine and annoyingly forgot that autojump
was to be installed on its own. This may be helpful.
---
 plugins/autojump/autojump.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'plugins')

diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh
index 3946106b0..c7da73b23 100644
--- a/plugins/autojump/autojump.plugin.zsh
+++ b/plugins/autojump/autojump.plugin.zsh
@@ -20,4 +20,6 @@ if [ $commands[autojump] ]; then # check if autojump is installed
   elif [ $commands[brew] -a -f `brew --prefix`/etc/autojump.sh ]; then # mac os x with brew
     . `brew --prefix`/etc/autojump.sh
   fi
+else
+  echo 'Please install autojump to enable the plugin (https://github.com/wting/autojump)'
 fi
-- 
cgit v1.2.3-70-g09d2


From ab63d240dadc964eee4fcdf14c0c46689f879ac8 Mon Sep 17 00:00:00 2001
From: rl1k <38787215+rl1k@users.noreply.github.com>
Date: Mon, 28 May 2018 21:57:49 +0200
Subject: Use source instead of dot to load autojump

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

(limited to 'plugins')

diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh
index c7da73b23..17f01a9cf 100644
--- a/plugins/autojump/autojump.plugin.zsh
+++ b/plugins/autojump/autojump.plugin.zsh
@@ -1,24 +1,24 @@
 if [ $commands[autojump] ]; then # check if autojump is installed
   if [ -f $HOME/.autojump/etc/profile.d/autojump.zsh ]; then # manual user-local installation
-    . $HOME/.autojump/etc/profile.d/autojump.zsh
+    source $HOME/.autojump/etc/profile.d/autojump.zsh
   elif [ -f $HOME/.autojump/share/autojump/autojump.zsh ]; then # another manual user-local installation
-    . $HOME/.autojump/share/autojump/autojump.zsh
+    source $HOME/.autojump/share/autojump/autojump.zsh
   elif [ -f $HOME/.nix-profile/etc/profile.d/autojump.sh ]; then # nix installation
-    . $HOME/.nix-profile/etc/profile.d/autojump.sh
+    source $HOME/.nix-profile/etc/profile.d/autojump.sh
   elif [ -f /run/current-system/sw/share/autojump/autojump.zsh ]; then # nixos installation
-    . /run/current-system/sw/share/autojump/autojump.zsh
+    source /run/current-system/sw/share/autojump/autojump.zsh
   elif [ -f /usr/share/autojump/autojump.zsh ]; then # debian and ubuntu package
-    . /usr/share/autojump/autojump.zsh
+    source /usr/share/autojump/autojump.zsh
   elif [ -f /etc/profile.d/autojump.zsh ]; then # manual installation
-    . /etc/profile.d/autojump.zsh
+    source /etc/profile.d/autojump.zsh
   elif [ -f /etc/profile.d/autojump.sh ]; then # gentoo installation
-    . /etc/profile.d/autojump.sh
+    source /etc/profile.d/autojump.sh
   elif [ -f /usr/local/share/autojump/autojump.zsh ]; then # freebsd installation
-    . /usr/local/share/autojump/autojump.zsh
+    source /usr/local/share/autojump/autojump.zsh
   elif [ -f /opt/local/etc/profile.d/autojump.sh ]; then # mac os x with ports
-    . /opt/local/etc/profile.d/autojump.sh
+    source /opt/local/etc/profile.d/autojump.sh
   elif [ $commands[brew] -a -f `brew --prefix`/etc/autojump.sh ]; then # mac os x with brew
-    . `brew --prefix`/etc/autojump.sh
+    source `brew --prefix`/etc/autojump.sh
   fi
 else
   echo 'Please install autojump to enable the plugin (https://github.com/wting/autojump)'
-- 
cgit v1.2.3-70-g09d2


From 4ef29c9f1883acecb638a64ddb1eff8618312cdc Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 9 Apr 2019 19:21:05 +0200
Subject: Fix homebrew path location

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

(limited to 'plugins')

diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh
index 17f01a9cf..3434fb37b 100644
--- a/plugins/autojump/autojump.plugin.zsh
+++ b/plugins/autojump/autojump.plugin.zsh
@@ -17,8 +17,8 @@ if [ $commands[autojump] ]; then # check if autojump is installed
     source /usr/local/share/autojump/autojump.zsh
   elif [ -f /opt/local/etc/profile.d/autojump.sh ]; then # mac os x with ports
     source /opt/local/etc/profile.d/autojump.sh
-  elif [ $commands[brew] -a -f `brew --prefix`/etc/autojump.sh ]; then # mac os x with brew
-    source `brew --prefix`/etc/autojump.sh
+  elif [ $commands[brew] -a -f $(brew --prefix)/etc/profile.d/autojump.sh ]; then # mac os x with brew
+    source $(brew --prefix)/etc/profile.d/autojump.sh
   fi
 else
   echo 'Please install autojump to enable the plugin (https://github.com/wting/autojump)'
-- 
cgit v1.2.3-70-g09d2


From 5a424fc12fc62512400887236ef20ea2268bba94 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 9 Apr 2019 19:22:51 +0200
Subject: Check first default Homebrew prefix

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

(limited to 'plugins')

diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh
index 3434fb37b..81664e1ae 100644
--- a/plugins/autojump/autojump.plugin.zsh
+++ b/plugins/autojump/autojump.plugin.zsh
@@ -17,6 +17,8 @@ if [ $commands[autojump] ]; then # check if autojump is installed
     source /usr/local/share/autojump/autojump.zsh
   elif [ -f /opt/local/etc/profile.d/autojump.sh ]; then # mac os x with ports
     source /opt/local/etc/profile.d/autojump.sh
+  elif [ -f /usr/local/etc/profile.d/autojump.sh ]; then # mac os x with brew
+    source /usr/local/etc/profile.d/autojump.sh
   elif [ $commands[brew] -a -f $(brew --prefix)/etc/profile.d/autojump.sh ]; then # mac os x with brew
     source $(brew --prefix)/etc/profile.d/autojump.sh
   fi
-- 
cgit v1.2.3-70-g09d2


From fd105b6e528127c2c6f5cf59d0e32d761c206971 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 9 Apr 2019 19:38:34 +0200
Subject: Refactor and clean up autojump plugin

---
 plugins/autojump/autojump.plugin.zsh | 57 ++++++++++++++++++++----------------
 1 file changed, 32 insertions(+), 25 deletions(-)

(limited to 'plugins')

diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh
index 81664e1ae..7ccd09303 100644
--- a/plugins/autojump/autojump.plugin.zsh
+++ b/plugins/autojump/autojump.plugin.zsh
@@ -1,27 +1,34 @@
-if [ $commands[autojump] ]; then # check if autojump is installed
-  if [ -f $HOME/.autojump/etc/profile.d/autojump.zsh ]; then # manual user-local installation
-    source $HOME/.autojump/etc/profile.d/autojump.zsh
-  elif [ -f $HOME/.autojump/share/autojump/autojump.zsh ]; then # another manual user-local installation
-    source $HOME/.autojump/share/autojump/autojump.zsh
-  elif [ -f $HOME/.nix-profile/etc/profile.d/autojump.sh ]; then # nix installation
-    source $HOME/.nix-profile/etc/profile.d/autojump.sh
-  elif [ -f /run/current-system/sw/share/autojump/autojump.zsh ]; then # nixos installation
-    source /run/current-system/sw/share/autojump/autojump.zsh
-  elif [ -f /usr/share/autojump/autojump.zsh ]; then # debian and ubuntu package
-    source /usr/share/autojump/autojump.zsh
-  elif [ -f /etc/profile.d/autojump.zsh ]; then # manual installation
-    source /etc/profile.d/autojump.zsh
-  elif [ -f /etc/profile.d/autojump.sh ]; then # gentoo installation
-    source /etc/profile.d/autojump.sh
-  elif [ -f /usr/local/share/autojump/autojump.zsh ]; then # freebsd installation
-    source /usr/local/share/autojump/autojump.zsh
-  elif [ -f /opt/local/etc/profile.d/autojump.sh ]; then # mac os x with ports
-    source /opt/local/etc/profile.d/autojump.sh
-  elif [ -f /usr/local/etc/profile.d/autojump.sh ]; then # mac os x with brew
-    source /usr/local/etc/profile.d/autojump.sh
-  elif [ $commands[brew] -a -f $(brew --prefix)/etc/profile.d/autojump.sh ]; then # mac os x with brew
-    source $(brew --prefix)/etc/profile.d/autojump.sh
+(( $+commands[autojump] )) || {
+  echo '[oh-my-zsh] Please install autojump first (https://github.com/wting/autojump)'
+  return
+}
+
+declare -a autojump_paths
+autojump_paths=(
+  $HOME/.autojump/etc/profile.d/autojump.zsh         # manual installation
+  $HOME/.autojump/share/autojump/autojump.zsh        # manual installation
+  $HOME/.nix-profile/etc/profile.d/autojump.sh       # NixOS installation
+  /run/current-system/sw/share/autojump/autojump.zsh # NixOS installation
+  /usr/share/autojump/autojump.zsh                   # Debian and Ubuntu package
+  /etc/profile.d/autojump.zsh                        # manual installation
+  /etc/profile.d/autojump.sh                         # Gentoo installation
+  /usr/local/share/autojump/autojump.zsh             # FreeBSD installation
+  /opt/local/etc/profile.d/autojump.sh               # macOS with MacPorts
+  /usr/local/etc/profile.d/autojump.sh               # macOS with Homebrew (default)
+)
+
+for file in $autojump_paths; do
+  if [[ -f "$file" ]]; then
+    source "$file"
+    found=1
+    break
   fi
-else
-  echo 'Please install autojump to enable the plugin (https://github.com/wting/autojump)'
+done
+
+# if no path found, try Homebrew
+if (( ! found && $+commands[brew] )); then
+  file=$(brew --prefix)/etc/profile.d/autojump.sh
+  [[ -f "$file" ]] && source "$file"
 fi
+
+unset autojump_paths file found
-- 
cgit v1.2.3-70-g09d2


From b4c06f2b50e499fbd6b827c1b287276d9cacd3e6 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 9 Apr 2019 19:41:59 +0200
Subject: Complain when no autojump script was found

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

(limited to 'plugins')

diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh
index 7ccd09303..13c1d00ed 100644
--- a/plugins/autojump/autojump.plugin.zsh
+++ b/plugins/autojump/autojump.plugin.zsh
@@ -28,7 +28,12 @@ done
 # if no path found, try Homebrew
 if (( ! found && $+commands[brew] )); then
   file=$(brew --prefix)/etc/profile.d/autojump.sh
-  [[ -f "$file" ]] && source "$file"
+  if [[ -f "$file" ]]; then
+    source "$file"
+    found=1
+  fi
 fi
 
+(( ! found )) && echo '[oh-my-zsh] autojump script not found'
+
 unset autojump_paths file found
-- 
cgit v1.2.3-70-g09d2


From 5f9cc016d7fb19004529ea935d6a386846ad46e2 Mon Sep 17 00:00:00 2001
From: programmer04 <jakub.warczarek@gmail.com>
Date: Tue, 9 Apr 2019 21:07:42 +0200
Subject: Fix redundant export of RPROMPT in aws plugin

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

(limited to 'plugins')

diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index 6de329bb8..0895cfb3a 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -44,7 +44,7 @@ function aws_prompt_info() {
 }
 
 if [ "$SHOW_AWS_PROMPT" != false ]; then
-  export RPROMPT='$(aws_prompt_info)'"$RPROMPT"
+  RPROMPT='$(aws_prompt_info)'"$RPROMPT"
 fi
 
 
-- 
cgit v1.2.3-70-g09d2


From afb28d337df91be52eb7f66fb0badc513243825a Mon Sep 17 00:00:00 2001
From: Jayden Thrasher <31779665+jaythras@users.noreply.github.com>
Date: Tue, 9 Apr 2019 15:21:26 -0400
Subject: git-prompt: add README (#7554)

---
 plugins/git-prompt/README.md             | 61 ++++++++++++++++++++++++++++++++
 plugins/git-prompt/git-prompt.plugin.zsh |  3 --
 2 files changed, 61 insertions(+), 3 deletions(-)
 create mode 100644 plugins/git-prompt/README.md

(limited to 'plugins')

diff --git a/plugins/git-prompt/README.md b/plugins/git-prompt/README.md
new file mode 100644
index 000000000..e3b2d623a
--- /dev/null
+++ b/plugins/git-prompt/README.md
@@ -0,0 +1,61 @@
+# git-prompt plugin
+
+A `zsh` prompt that displays information about the current git repository. In particular:
+the branch name, difference with remote branch, number of files staged or changed, etc.
+
+To use it, add `git-prompt` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... git-prompt)
+```
+
+See the [original repository](https://github.com/olivierverdier/zsh-git-prompt).
+
+## Examples
+
+The prompt may look like the following:
+
+- `(master↑3|✚1)`: on branch `master`, ahead of remote by 3 commits, 1 file changed but not staged
+- `(status|●2)`: on branch `status`, 2 files staged
+- `(master|✚7…)`: on branch `master`, 7 files changed, some files untracked
+- `(master|✖2✚3)`: on branch `master`, 2 conflicts, 3 files changed
+- `(experimental↓2↑3|✔)`: on branch `experimental`; your branch has diverged by 3 commits, remote by 2 commits; the repository is otherwise clean
+- `(:70c2952|✔)`: not on any branch; parent commit has hash `70c2952`; the repository is otherwise clean
+
+## Prompt Structure
+
+By default, the general appearance of the prompt is:
+
+```
+(<branch><branch tracking>|<local status>)
+```
+
+The symbols are as follows:
+
+### Local Status Symbols
+
+| Symbol | Meaning                        |
+|--------|--------------------------------|
+| ✔      | repository clean               |
+| ●n     | there are `n` staged files     |
+| ✖n     | there are `n` unmerged files   |
+| ✚n     | there are `n` unstaged files   |
+| …      | there are some untracked files |
+
+### Branch Tracking Symbols
+
+| Symbol | Meaning                                                       |
+|--------|---------------------------------------------------------------|
+| ↑n     | ahead of remote by `n` commits                                |
+| ↓n     | behind remote by `n` commits                                  |
+| ↓m↑n   | branches diverged: other by `m` commits, yours by `n` commits |
+
+## Customisation
+
+- Set the variable `ZSH_THEME_GIT_PROMPT_CACHE` to any value in order to enable caching.
+- You may also change a number of variables (whose name start with `ZSH_THEME_GIT_PROMPT_`) 
+  to change the appearance of the prompt. Take a look at the bottom of the [plugin file](git-prompt.plugin.zsh)`
+  to see what variables are available.
+
+
+**Enjoy!**
diff --git a/plugins/git-prompt/git-prompt.plugin.zsh b/plugins/git-prompt/git-prompt.plugin.zsh
index 2776f297f..76ac2e62b 100644
--- a/plugins/git-prompt/git-prompt.plugin.zsh
+++ b/plugins/git-prompt/git-prompt.plugin.zsh
@@ -1,6 +1,3 @@
-# ZSH Git Prompt Plugin from:
-# https://github.com/olivierverdier/zsh-git-prompt
-
 __GIT_PROMPT_DIR="${0:A:h}"
 
 ## Hook function definitions
-- 
cgit v1.2.3-70-g09d2


From d36c1b8d227d49c460e6664118bd42f522b361ca Mon Sep 17 00:00:00 2001
From: Pmoranga <pmoranga@users.noreply.github.com>
Date: Tue, 9 Apr 2019 22:41:36 +0200
Subject: kube_ps1: customize colors and dynamically toggle prompt (#7269)

changes:
- easily customize the colors via variables
- command to switch on/off the custom prompt
- Improved documentation with example on how to append on the prompt.

Fixes #7261
---
 plugins/kube-ps1/README.md           | 28 +++++++++++++++++++++++++---
 plugins/kube-ps1/kube-ps1.plugin.zsh | 28 ++++++++++++++++++++--------
 2 files changed, 45 insertions(+), 11 deletions(-)

(limited to 'plugins')

diff --git a/plugins/kube-ps1/README.md b/plugins/kube-ps1/README.md
index fcb73cd2d..19dac42e9 100644
--- a/plugins/kube-ps1/README.md
+++ b/plugins/kube-ps1/README.md
@@ -45,20 +45,37 @@ want to load.
 vim $HOME/.zshrc
 ```
 
-Add kube-ps1 to the list of enabled plugins:
+Add kube-ps1 to the list of enabled plugins and enable it on the prompt:
 
 ```shell
 plugins=(
   git
   kube-ps1
 )
+
+PROMPT=$PROMPT'$(kube_ps1) '
+```
+
+Note: the `PROMPT` example above was tested with the theme `robbyrussell`
+
+## Enabling / Disabling on the current shell
+
+Sometimes the kubernetes information can be anoying, you can easily 
+switch it on and off with the following commands:
+
+```shell
+kubeon
+```
+
+```shell
+kubeoff
 ```
 
 ## Colors
 
 Blue was used as the prefix to match the Kubernetes color as closely as
 possible. Red was chosen as the cluster name to stand out, and cyan
-for the namespace.  These can of course be changed.
+for the namespace. Check the customization section for changing them.
 
 ## Customization
 
@@ -75,7 +92,12 @@ The default settings can be overridden in ~/.zshrc
 | `KUBE_PS1_SEPERATOR` | `\|` | Separator between symbol and cluster name |
 | `KUBE_PS1_DIVIDER` | `:` | Separator between cluster and namespace |
 | `KUBE_PS1_SUFFIX` | `)` | Prompt closing character |
+| `KUBE_PS1_COLOR_SYMBOL` | `"%F{blue}"` | Custom color for the symbol |
+| `KUBE_PS1_COLOR_CONTEXT` | `"%F{red}"` | Custom color for the context |
+| `KUBE_PS1_COLOR_NS` | `"%F{cyan}"` | Custom color for the namespace |
+| `KUBE_PS1_ENABLED` | `true` | Set to false to start disabled on any new shell, `kubeon`/`kubeoff` will flip this value on the current shell |
 
 ## Contributors
 
-Jared Yanovich
+- Jared Yanovich
+- Pedro Moranga
\ No newline at end of file
diff --git a/plugins/kube-ps1/kube-ps1.plugin.zsh b/plugins/kube-ps1/kube-ps1.plugin.zsh
index df7277a26..8a751bda8 100644
--- a/plugins/kube-ps1/kube-ps1.plugin.zsh
+++ b/plugins/kube-ps1/kube-ps1.plugin.zsh
@@ -39,6 +39,11 @@ KUBE_PS1_DIVIDER="${KUBE_PS1_DIVIDER-:}"
 KUBE_PS1_PREFIX="${KUBE_PS1_PREFIX-(}"
 KUBE_PS1_SUFFIX="${KUBE_PS1_SUFFIX-)}"
 KUBE_PS1_LAST_TIME=0
+KUBE_PS1_ENABLED=true
+
+KUBE_PS1_COLOR_SYMBOL="%F{blue}"
+KUBE_PS1_COLOR_CONTEXT="%F{red}"
+KUBE_PS1_COLOR_NS="%F{cyan}"
 
 _kube_ps1_binary_check() {
   command -v "$1" >/dev/null
@@ -127,21 +132,28 @@ _kube_ps1_get_context_ns() {
   fi
 }
 
+# function to disable the prompt on the current shell
+kubeon(){
+  KUBE_PS1_ENABLED=true
+}
+
+# function to disable the prompt on the current shell
+kubeoff(){
+  KUBE_PS1_ENABLED=false
+}
+
 # Build our prompt
 kube_ps1 () {
-  local reset_color="%f"
-  local blue="%F{blue}"
-  local red="%F{red}"
-  local cyan="%F{cyan}"
+  local reset_color="%{$reset_color%}"
+  [[ ${KUBE_PS1_ENABLED} != 'true' ]] && return
 
   KUBE_PS1="${reset_color}$KUBE_PS1_PREFIX"
-  KUBE_PS1+="${blue}$(_kube_ps1_symbol)"
+  KUBE_PS1+="${KUBE_PS1_COLOR_SYMBOL}$(_kube_ps1_symbol)"
   KUBE_PS1+="${reset_color}$KUBE_PS1_SEPERATOR"
-  KUBE_PS1+="${red}$KUBE_PS1_CONTEXT${reset_color}"
+  KUBE_PS1+="${KUBE_PS1_COLOR_CONTEXT}$KUBE_PS1_CONTEXT${reset_color}"
   KUBE_PS1+="$KUBE_PS1_DIVIDER"
-  KUBE_PS1+="${cyan}$KUBE_PS1_NAMESPACE${reset_color}"
+  KUBE_PS1+="${KUBE_PS1_COLOR_NS}$KUBE_PS1_NAMESPACE${reset_color}"
   KUBE_PS1+="$KUBE_PS1_SUFFIX"
 
   echo "${KUBE_PS1}"
-
 }
-- 
cgit v1.2.3-70-g09d2


From 8d7ce18e121b4fd2768906840cd5d38e5ecc148c Mon Sep 17 00:00:00 2001
From: Roman Perepelitsa <roman.perepelitsa@gmail.com>
Date: Tue, 9 Apr 2019 23:10:13 +0200
Subject: vi-mode: remove TRAPWINCH from plugin (#7753)

* Remove TRAPWINCH; it's unrelated to vi-mode

* Update prompt with ad hoc KEYMAP variable
  Fixes mode indicator when the terminal window is resized
---
 plugins/vi-mode/vi-mode.plugin.zsh | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'plugins')

diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh
index c1cdd2851..a82e41439 100644
--- a/plugins/vi-mode/vi-mode.plugin.zsh
+++ b/plugins/vi-mode/vi-mode.plugin.zsh
@@ -1,14 +1,12 @@
 # Updates editor information when the keymap changes.
 function zle-keymap-select() {
+  # update keymap variable for the prompt
+  VI_KEYMAP=$KEYMAP
+
   zle reset-prompt
   zle -R
 }
 
-# Ensure that the prompt is redrawn when the terminal size changes.
-TRAPWINCH() {
-  zle && { zle -R; zle reset-prompt }
-}
-
 zle -N zle-keymap-select
 zle -N edit-command-line
 
@@ -42,7 +40,7 @@ if [[ "$MODE_INDICATOR" == "" ]]; then
 fi
 
 function vi_mode_prompt_info() {
-  echo "${${KEYMAP/vicmd/$MODE_INDICATOR}/(main|viins)/}"
+  echo "${${VI_KEYMAP/vicmd/$MODE_INDICATOR}/(main|viins)/}"
 }
 
 # define right prompt, if it wasn't defined by a theme
-- 
cgit v1.2.3-70-g09d2


From 7824dc637db296aebc88263d9f5a3ea36fd50bb5 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Wed, 10 Apr 2019 11:47:29 +0200
Subject: git: use is-at-least to test for git version

Fixes #7754
---
 plugins/git/git.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index ef4697906..b82d49b5e 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -241,7 +241,8 @@ alias gss='git status -s'
 alias gst='git status'
 
 # use the default stash push on git 2.13 and newer
-[[ "$(git --version 2>/dev/null)" =~ '^git version ([0-9]+.[0-9]+)' && "$match" -ge '2.13' ]] \
+autoload -Uz is-at-least
+is-at-least 2.13 "$(git --version 2>/dev/null | awk '{print $3}')" \
   && alias gsta='git stash push' \
   || alias gsta='git stash save'
 
-- 
cgit v1.2.3-70-g09d2


From 3c8f73c312d1639826a3a5cc499197f423508833 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Wed, 10 Apr 2019 20:30:30 +0200
Subject: git-prompt: fix LANG override for git status call

The previous version modified the whole environment leading to
problems (see #7757). This version *adds* LANG=C to the current
env, without overriding it completely.

Fixes #7757.
---
 plugins/git-prompt/gitstatus.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/git-prompt/gitstatus.py b/plugins/git-prompt/gitstatus.py
index 5243af23c..390a50a6f 100644
--- a/plugins/git-prompt/gitstatus.py
+++ b/plugins/git-prompt/gitstatus.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 from __future__ import print_function
 
+import os
 import sys
 import re
 import shlex
@@ -30,7 +31,7 @@ def get_tagname_or_hash():
 
 # `git status --porcelain --branch` can collect all information
 # branch, remote_branch, untracked, staged, changed, conflicts, ahead, behind
-po = Popen(['git', 'status', '--porcelain', '--branch'], env={"LANG": "C"}, stdout=PIPE, stderr=PIPE)
+po = Popen(['git', 'status', '--porcelain', '--branch'], env=dict(os.environ, LANG="C"), stdout=PIPE, stderr=PIPE)
 stdout, sterr = po.communicate()
 if po.returncode != 0:
     sys.exit(0)  # Not a git repository
-- 
cgit v1.2.3-70-g09d2


From 08da19e3fd27acf5085e207ee7da411e6a5eb96a Mon Sep 17 00:00:00 2001
From: akinnane <akinnane@yahoo.co.uk>
Date: Sun, 14 Apr 2019 11:31:52 +0100
Subject: emacs: revert cab1ac6e682038b2ceca9d16f8c458c0e79149ca (#7765)

Revert cab1ac6e682038b2ceca9d16f8c458c0e79149ca

The change from the above commit breaks opening a new emacs frame if
there isn't a existing frame open.

When emacs is running in daemon mode, there will always be a frame
associated with the daemon, even if there are no visible frames.

The lisp function `frame-list`, will always return 1 frame.
```
emacsclient --eval '(frame-list)'
(#<frame F1 0xa3c680>)
```

When an real frame is open, two frames are reported by the `frame-list`
function.
```
emacsclient --eval '(frame-list)'
(#<frame F1 0xa3c680> #<frame emacs Prelude - ~/oh-my-zsh/plugins/emacs/emacsclient.sh 0xf50e10>)
```

See:
https://emacs.stackexchange.com/questions/44537/extra-frame-in-visible-frame-list-when-started-in-daemon-mode-is-causing-prob
https://emacs.stackexchange.com/questions/18859/dont-let-the-daemon-frame-make-a-file-visible
---
 plugins/emacs/emacsclient.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/emacs/emacsclient.sh b/plugins/emacs/emacsclient.sh
index b4f49e12b..26b28d495 100755
--- a/plugins/emacs/emacsclient.sh
+++ b/plugins/emacs/emacsclient.sh
@@ -5,7 +5,7 @@ _emacsfun()
     # get list of emacs frames.
     frameslist=`emacsclient --alternate-editor '' --eval '(frame-list)' 2>/dev/null | egrep -o '(frame)+'`
 
-    if [ "$(echo "$frameslist" | sed -n '$=')" -ge 1 ] ;then
+    if [ "$(echo "$frameslist" | sed -n '$=')" -ge 2 ] ;then
         # prevent creating another X frame if there is at least one present.
         emacsclient --alternate-editor "" "$@"
     else
-- 
cgit v1.2.3-70-g09d2


From ecc1c6db8ce7d7def978d606365cd38a5f43c2d8 Mon Sep 17 00:00:00 2001
From: Dante Calderon <dantehemerson@gmail.com>
Date: Mon, 15 Apr 2019 08:47:14 -0500
Subject: [bwana plugin] Change function name

Fix #5732
Change name function from `man` to `bwana`.
---
 plugins/bwana/README.md        | 6 ++++++
 plugins/bwana/bwana.plugin.zsh | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/bwana/README.md b/plugins/bwana/README.md
index 8cbeaa32e..454a2a0d3 100644
--- a/plugins/bwana/README.md
+++ b/plugins/bwana/README.md
@@ -7,3 +7,9 @@ To use it add bwana to the plugins array in your zshrc file.
 ```bash
 plugins=(... bwana)
 ```
+
+## Functions
+
+| Function | Description                              |
+| -------- | ---------------------------------------- |
+| `bwana`  | Works just like `man` |
diff --git a/plugins/bwana/bwana.plugin.zsh b/plugins/bwana/bwana.plugin.zsh
index b9a04793f..71c9eb18d 100644
--- a/plugins/bwana/bwana.plugin.zsh
+++ b/plugins/bwana/bwana.plugin.zsh
@@ -4,10 +4,10 @@
 if [[ -e /Applications/Bwana.app ]] ||
     ( system_profiler -detailLevel mini SPApplicationsDataType | grep -q Bwana )
 then
-  function man() {
+  function bwana() {
     open "man:$1"
   }
 else
-  echo "Bwana lets you read man files in Safari through a man: URI scheme" 
+  echo "Bwana lets you read man files in Safari through a man: URI scheme"
   echo "To use it within Zsh, install it from https://www.bruji.com/bwana/"
 fi
-- 
cgit v1.2.3-70-g09d2


From 4456536a78e2bbcf4cace5a54bb1b61a77c8b0cd Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Mon, 15 Apr 2019 16:46:58 +0200
Subject: Simplify explanation of bwana function

---
 plugins/bwana/README.md | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'plugins')

diff --git a/plugins/bwana/README.md b/plugins/bwana/README.md
index 454a2a0d3..dd4fe9f9c 100644
--- a/plugins/bwana/README.md
+++ b/plugins/bwana/README.md
@@ -8,8 +8,5 @@ To use it add bwana to the plugins array in your zshrc file.
 plugins=(... bwana)
 ```
 
-## Functions
-
-| Function | Description                              |
-| -------- | ---------------------------------------- |
-| `bwana`  | Works just like `man` |
+The `bwana` function opens the man page of the passed argument in the Bwana app.
+For example: `bwana ln` opens the man page for `ln` in Bwana.
-- 
cgit v1.2.3-70-g09d2


From fc9e427ef947d945cfbd436e2320562d194a0dd8 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Mon, 15 Apr 2019 16:55:18 +0200
Subject: sublime: refactor plugin and fix documentation (#7715)

* convert to 2-space indentation
* standardize sublime function name (subl)
* simplify subl function definition into a single loop
* convert functions into aliases
* simplify alias creation
* search for Sublime Text command only if not found
* reorganize and clean up plugin
* fix README
* simplify cygwin path lookup
* support path lookup for msys (Windows)
* support path lookup for WSL (Windows)
* fix for spaces in sublime path alias
---
 plugins/sublime/README.md          |  38 +++++---
 plugins/sublime/sublime.plugin.zsh | 189 ++++++++++++++++++-------------------
 2 files changed, 118 insertions(+), 109 deletions(-)

(limited to 'plugins')

diff --git a/plugins/sublime/README.md b/plugins/sublime/README.md
index 2ad629fad..22999241f 100644
--- a/plugins/sublime/README.md
+++ b/plugins/sublime/README.md
@@ -1,25 +1,37 @@
-## sublime
+# sublime
 
-Plugin for Sublime Text, a cross platform text and code editor, available for Linux, Mac OS X, and Windows.
+Plugin for [Sublime Text](https://www.sublimetext.com/), a cross platform text and code editor,
+available for Linux, macOS, and Windows.
 
-### Requirements
+To use the plugin, add `sublime` to the plugins array of your zshrc file:
 
- * [Sublime Text](https://www.sublimetext.com/)
+```zsh
+plugins=(... sublime)
+```
 
-### Usage
+Sublime Text has to be installed to use the plugin.
 
- * If `st` command is called without an argument, launch Sublime Text
+## Usage
 
- * If `st` is passed a directory, `cd` to it and open it in Sublime Text
+The plugin defines several aliases, such as:
 
- * If `st` is passed a file, open it in Sublime Text
+- `st`: opens Sublime Text. If passed a file or directory, Sublime Text will open it.
 
- * If `stt` command is called, it is equivalent to `st .`, opening the current folder in Sublime Text
+- `stt`: open Sublime Text on the current directory.
 
- * If `sst` command is called, it is like `sudo st`, opening the file or folder in Sublime Text. Useful for editing system protected files.
+- `sst`: if `sudo` is available, `sst` will open Sublime Text with root permissions, so that
+  you can modify any file or directory that you pass it. Useful to edit system files.
 
- * If `stp` command is called, it find a `.sublime-project` file by traversing up the directory structure. If there is no `.sublime-project` file, but if the current folder is a Git repo, opens up the root directory of the repo. If the current folder is not a Git repo, then opens up the current directory.
+There are also a few functions available:
 
- * If `stn` command is called without an argument, create a stub `.sublime-project` file in the current working directory if one does not already exist
+- `find_project` (or `stp` alias): if called, the function will search for a `.sublime-project` file
+  on the current directory or its parents, until it finds none.
 
- * If `stn` is passed a directory, create a stub `.sublime-project` file in it
+  If there is no `.sublime-project` file but the current folder is in a Git repository, it will open
+  Sublime Text on the root directory of the repository.
+
+  If there is no Git repository, it will then open Sublime Text on the current directory.
+
+- `create_project` (or `stn` alias): if called without an argument, create a stub `.sublime-project`
+  file in the current working directory, if one does not already exist. If passed a directory, create
+  a stub `.sublime-project` file in it.
diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index 485028d9f..3a82d6c7f 100644
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -1,121 +1,118 @@
-# Sublime Text Aliases
+# Sublime Text aliases
 
-() {
+alias st=subl
+alias stt='subl .'
 
-if [[ "$OSTYPE" == linux* ]]; then
-    local _sublime_linux_paths
-    _sublime_linux_paths=(
+# Define sst only if sudo exists
+(( $+commands[sudo] )) && alias sst='sudo subl'
+
+alias stp=find_project
+alias stn=create_project
+
+
+# Search for the Sublime Text command if not found
+(( $+commands[subl] )) || {
+  declare -a _sublime_paths
+
+  if [[ "$OSTYPE" == linux* ]]; then
+    if [[ "$(uname -r)" = *Microsoft* ]]; then
+      _sublime_paths=(
+        "$(wslpath -u 'C:\Program Files\Sublime Text 3\subl.exe')"
+        "$(wslpath -u 'C:\Program Files\Sublime Text 2\subl.exe')"
+      )
+    else
+      _sublime_paths=(
         "$HOME/bin/sublime_text"
         "/opt/sublime_text/sublime_text"
         "/opt/sublime_text_3/sublime_text"
         "/usr/bin/sublime_text"
         "/usr/local/bin/sublime_text"
         "/usr/bin/subl"
-        "/opt/sublime_text_3/sublime_text"
         "/usr/bin/subl3"
+      )
+    fi
+  elif [[ "$OSTYPE" = darwin* ]]; then
+    _sublime_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_linux_paths; do
-        if [[ -a $_sublime_path ]]; then
-            st_run() { $_sublime_path $@ >/dev/null 2>&1 &| }
-            st_run_sudo() {sudo $_sublime_path $@ >/dev/null 2>&1}
-            alias sst=st_run_sudo
-            alias st=st_run
-            break
-        fi
-    done
-elif  [[ "$OSTYPE" = darwin* ]]; then
-    local _sublime_darwin_paths
-    _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"
+  elif [[ "$OSTYPE" = cygwin ]]; then
+    _sublime_paths=(
+      "$(cygpath "$ProgramW6432/Sublime Text 2")/subl.exe"
+      "$(cygpath "$ProgramW6432/Sublime Text 3")/subl.exe"
     )
-    for _sublime_path in $_sublime_darwin_paths; do
-        if [[ -a $_sublime_path ]]; then
-            subl () { "$_sublime_path" $* }
-            alias st=subl
-            break
-        fi
-    done
-elif [[ "$OSTYPE" = 'cygwin' ]]; then
-    local _sublime_cygwin_paths
-    _sublime_cygwin_paths=(
-        "$(cygpath $ProgramW6432/Sublime\ Text\ 2)/sublime_text.exe"
-        "$(cygpath $ProgramW6432/Sublime\ Text\ 3)/sublime_text.exe"
+  elif [[ "$OSTYPE" = msys ]]; then
+    _sublime_paths=(
+      "/c/Program Files/Sublime Text 2/subl.exe"
+      "/c/Program Files/Sublime Text 3/subl.exe"
     )
-    for _sublime_path in $_sublime_cygwin_paths; do
-        if [[ -a $_sublime_path ]]; then
-            subl () { "$_sublime_path" $* }
-            alias st=subl
-            break
-        fi
-    done
-fi
+  fi
 
-}
+  for _sublime_path in $_sublime_paths; do
+    if [[ -a $_sublime_path ]]; then
+      alias subl="'$_sublime_path'"
+      (( $+commands[sudo] )) && alias sst="sudo '$_sublime_path'"
+      break
+    fi
+  done
 
-alias stt='st .'
+  unset _sublime_paths _sublime_path
+}
 
-find_project()
-{
-    local PROJECT_ROOT="${PWD}"
-    local FINAL_DEST="."
+function find_project() {
+  local PROJECT_ROOT="${PWD}"
+  local FINAL_DEST="."
 
-    while [[ $PROJECT_ROOT != "/" && ! -d "$PROJECT_ROOT/.git" ]]; do
-        PROJECT_ROOT=$(dirname $PROJECT_ROOT)
-    done
+  while [[ $PROJECT_ROOT != "/" && ! -d "$PROJECT_ROOT/.git" ]]; do
+    PROJECT_ROOT=$(dirname $PROJECT_ROOT)
+  done
 
-    if [[ $PROJECT_ROOT != "/" ]]; then
-        local PROJECT_NAME="${PROJECT_ROOT##*/}"
+  if [[ $PROJECT_ROOT != "/" ]]; then
+    local PROJECT_NAME="${PROJECT_ROOT##*/}"
 
-        local SUBL_DIR=$PROJECT_ROOT
-        while [[ $SUBL_DIR != "/" && ! -f "$SUBL_DIR/$PROJECT_NAME.sublime-project" ]]; do
-            SUBL_DIR=$(dirname $SUBL_DIR)
-        done
+    local SUBL_DIR=$PROJECT_ROOT
+    while [[ $SUBL_DIR != "/" && ! -f "$SUBL_DIR/$PROJECT_NAME.sublime-project" ]]; do
+      SUBL_DIR=$(dirname $SUBL_DIR)
+    done
 
-        if [[ $SUBL_DIR != "/" ]]; then
-            FINAL_DEST="$SUBL_DIR/$PROJECT_NAME.sublime-project"
-        else
-            FINAL_DEST=$PROJECT_ROOT
-        fi
+    if [[ $SUBL_DIR != "/" ]]; then
+      FINAL_DEST="$SUBL_DIR/$PROJECT_NAME.sublime-project"
+    else
+      FINAL_DEST=$PROJECT_ROOT
     fi
+  fi
 
-    st $FINAL_DEST
+  subl $FINAL_DEST
 }
 
 function create_project() {
-
-    local _target=$1
-
-    if [[ "${_target}" == "" ]]; then
-        _target=$(pwd);
-    elif [[ ! -d ${_target} ]]; then
-        echo "${_target} is not a valid directory"
-        return 1
-    fi
-
-    local _sublime_project_file=$_target/$(basename $_target).sublime-project
-
-    if [[ ! -f $_sublime_project_file ]]; then
-        
-        touch $_sublime_project_file
-
-        echo -e "{"                         >> $_sublime_project_file
-        echo -e "\t\"folders\":"            >> $_sublime_project_file
-        echo -e "\t\t[{"                    >> $_sublime_project_file
-        echo -e "\t\t\t\"path\": \".\","    >> $_sublime_project_file
-        echo -e "\t\t\t\"file_exclude_patterns\": []" >> $_sublime_project_file
-        echo -e "\t\t}]"                    >> $_sublime_project_file
-        echo -e "}"                         >> $_sublime_project_file
-
-        echo -e "New Sublime Text project created:\n\t${_sublime_project_file}"
-
-    fi
+  local _target=$1
+
+  if [[ "${_target}" == "" ]]; then
+    _target=$(pwd);
+  elif [[ ! -d ${_target} ]]; then
+    echo "${_target} is not a valid directory"
+    return 1
+  fi
+
+  local _sublime_project_file=$_target/$(basename $_target).sublime-project
+
+  if [[ ! -f $_sublime_project_file ]]; then
+    touch $_sublime_project_file
+
+    echo -e "{"                         >> $_sublime_project_file
+    echo -e "\t\"folders\":"            >> $_sublime_project_file
+    echo -e "\t\t[{"                    >> $_sublime_project_file
+    echo -e "\t\t\t\"path\": \".\","    >> $_sublime_project_file
+    echo -e "\t\t\t\"file_exclude_patterns\": []" >> $_sublime_project_file
+    echo -e "\t\t}]"                    >> $_sublime_project_file
+    echo -e "}"                         >> $_sublime_project_file
+
+    echo -e "New Sublime Text project created:\n\t${_sublime_project_file}"
+  fi
 }
-
-alias stp=find_project
-alias stn=create_project
-- 
cgit v1.2.3-70-g09d2


From 8d95f76050b3e936f83f23d244f226b01693f73c Mon Sep 17 00:00:00 2001
From: Ivan Polchenko <ipzent@gmail.com>
Date: Mon, 15 Apr 2019 10:29:49 -0700
Subject: rails: create README (#5841)

---
 plugins/rails/README.md | 83 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 plugins/rails/README.md

(limited to 'plugins')

diff --git a/plugins/rails/README.md b/plugins/rails/README.md
new file mode 100644
index 000000000..7a3db3d64
--- /dev/null
+++ b/plugins/rails/README.md
@@ -0,0 +1,83 @@
+# Rails
+
+This plugin adds completion for [Ruby On Rails Framework](https://rubyonrails.org/) and [Rake](https://ruby.github.io/rake/) commands, as well as some aliases for logs and environment variables.
+
+To use it, add `rails` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... rails)
+```
+
+## List of Aliases
+
+### Rails aliases
+
+| Alias | Command                    | Description                                        |
+|-------|----------------------------|----------------------------------------------------|
+| `rc`  | `rails console`            | Interact with your Rails app from the CLI          |
+| `rcs` | `rails console --sandbox`  | Test code in a sandbox, without changing any data  |
+| `rd`  | `rails destroy`            | Undo a generate operation                          |
+| `rdb` | `rails dbconsole`          | Interact with your db from the console             |
+| `rg`  | `rails generate`           | Generate boilerplate code                          |
+| `rgm` | `rails generate migration` | Generate a db migration                            |
+| `rp`  | `rails plugin`             | Run a Rails plugin command                         |
+| `ru`  | `rails runner`             | Run Ruby code in the context of Rails              |
+| `rs`  | `rails server`             | Launch a web server                                |
+| `rsd` | `rails server --debugger`  | Launch a web server with debugger                  |
+| `rsp` | `rails server --port`      | Launch a web server and specify the listening port |
+
+### Rake aliases
+
+| Alias   | Command                         | Description                                            |
+|---------|---------------------------------|--------------------------------------------------------|
+| `rdm`   | `rake db:migrate`               | Run pending db migrations                              |
+| `rdms`  | `rake db:migrate:status`        | Show current db migration status                       |
+| `rdmtc` | `rake db:migrate db:test:clone` | Run pending migrations and clone db into test database |
+| `rdr`   | `rake db:rollback`              | Roll back the last migration                           |
+| `rdc`   | `rake db:create`                | Create the database                                    |
+| `rds`   | `rake db:seed`                  | Seed the database                                      |
+| `rdd`   | `rake db:drop`                  | Delete the database                                    |
+| `rdrs`  | `rake db:reset`                 | Delete the database and set it up again                |
+| `rdtc`  | `rake db:test:clone`            | Clone the database into the test database              |
+| `rdtp`  | `rake db:test:prepare`          | Duplicate the db schema into your test database        |
+| `rdsl`  | `rake db:schema:load`           | Load the database schema                               |
+| `rlc`   | `rake log:clear`                | Clear Rails logs                                       |
+| `rn`    | `rake notes`                    | Search for notes (`FIXME`, `TODO`) in code comments    |
+| `rr`    | `rake routes`                   | List all defined routes                                |
+| `rrg`   | `rake routes | grep`            | List and filter the defined routes                     |
+| `rt`    | `rake test`                     | Run Rails tests                                        |
+| `rmd`   | `rake middleware`               | Interact with Rails middlewares                        |
+| `rsts`  | `rake stats`                    | Print code statistics                                  |
+
+### Utility aliases
+
+| Alias     | Command                       | Description                                    |
+|-----------|-------------------------------|------------------------------------------------|
+| `devlog`  | `tail -f log/development.log` | Show and follow changes to the development log |
+| `prodlog` | `tail -f log/production.log`  | Show and follow changes to the production log  |
+| `testlog` | `tail -f log/test.log`        | Show and follow changes to the test log        |
+
+### Environment settings
+
+| Alias | Command                 | Description                     |
+|-------|-------------------------|---------------------------------|
+| `RED` | `RAILS_ENV=development` | Sets `RAILS_ENV` to development |
+| `REP` | `RAILS_ENV=production`  | Sets `RAILS_ENV` to production  |
+| `RET` | `RAILS_ENV=test`        | Sets `RAILS_ENV` to test        |
+
+These are global aliases. Use in combination with a command or just run them
+separately. For example: `RED rake db:migrate` will migrate the production db.
+
+### Legacy stuff
+
+| Alias   | Command                            |
+|---------|------------------------------------|
+| `sstat` | `thin --stats "/thin/stats" start` |
+| `sg`    | `ruby script/generate`             |
+| `sd`    | `ruby script/destroy`              |
+| `sp`    | `ruby script/plugin`               |
+| `sr`    | `ruby script/runner`               |
+| `ssp`   | `ruby script/spec`                 |
+| `sc`    | `ruby script/console`              |
+| `sd`    | `ruby script/server --debugger`    |
+
-- 
cgit v1.2.3-70-g09d2


From 2c1880cf5070640b04f46303d35b68a107be3e2a Mon Sep 17 00:00:00 2001
From: Wade Wegner <wade.wegner@gmail.com>
Date: Tue, 16 Apr 2019 13:08:32 -0700
Subject: sfdx: add plugin and completion for sfdx (#6540)

---
 plugins/sfdx/README.md |   11 +
 plugins/sfdx/_sfdx     | 1110 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 1121 insertions(+)
 create mode 100644 plugins/sfdx/README.md
 create mode 100644 plugins/sfdx/_sfdx

(limited to 'plugins')

diff --git a/plugins/sfdx/README.md b/plugins/sfdx/README.md
new file mode 100644
index 000000000..259c17fbe
--- /dev/null
+++ b/plugins/sfdx/README.md
@@ -0,0 +1,11 @@
+# sfdx plugin
+
+This plugin provides autocompletion for the [Salesforce DX](https://developer.salesforce.com/tools/sfdxcli) CLI.
+
+To use it, add `sfdx` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... sfdx)
+```
+
+Original repository: https://github.com/wadewegner/salesforce-cli-zsh-completion
diff --git a/plugins/sfdx/_sfdx b/plugins/sfdx/_sfdx
new file mode 100644
index 000000000..42ee55970
--- /dev/null
+++ b/plugins/sfdx/_sfdx
@@ -0,0 +1,1110 @@
+#compdef sfdx
+
+# DESCRIPTION: Zsh completion script for the Salesforce CLI
+# AUTHOR: Wade Wegner (@WadeWegner)
+# REPO: https://github.com/wadewegner/salesforce-cli-zsh-completion
+# LICENSE: https://github.com/wadewegner/salesforce-cli-zsh-completion/blob/master/LICENSE
+
+local -a _1st_arguments
+
+_1st_arguments=(
+	"force\:alias\:list":"list username aliases for the Salesforce CLI"
+	"force\:alias\:set":"set username aliases for the Salesforce CLI"
+	"force\:apex\:class\:create":"create an Apex class"
+	"force\:apex\:execute":"execute anonymous Apex code"
+	"force\:apex\:log\:get":"fetch a debug log"
+	"force\:apex\:log\:list":"list debug logs"
+	"force\:apex\:log\:tail":"start debug logging and display logs"
+	"force\:apex\:test\:report":"display test results"
+	"force\:apex\:test\:run":"invoke Apex tests"
+	"force\:apex\:trigger\:create":"create an Apex trigger"
+	"force\:auth\:jwt\:grant":"authorize an org using the JWT flow"
+	"force\:auth\:logout":"log out from authorized orgs"
+	"force\:auth\:sfdxurl\:store":"authorize an org using an SFDX auth URL"
+	"force\:auth\:web\:login":"authorize an org using the web login flow"
+	"force\:config\:get":"get config var values for given names"
+	"force\:config\:list":"list config vars for the Salesforce CLI"
+	"force\:config\:set":"set config vars for the Salesforce CLI"
+	"force\:data\:bulk\:delete":"bulk delete records from a csv file"
+	"force\:data\:bulk\:status":"view the status of a bulk data load job or batch"
+	"force\:data\:bulk\:upsert":"bulk upsert records from a CSV file"
+	"force\:data\:record\:create":"create a record"
+	"force\:data\:record\:delete":"delete a record"
+	"force\:data\:record\:get":"view a record"
+	"force\:data\:record\:update":"update a record"
+	"force\:data\:soql\:query":"execute a SOQL query"
+	"force\:data\:tree\:export":"export data from an org into sObject tree format for force:data:tree:import consumption"
+	"force\:data\:tree\:import":"import data into an org using SObject Tree Save API"
+	"force\:doc\:commands\:display":"display help for force commands"
+	"force\:doc\:commands\:list":"list the force commands"
+	"force\:lightning\:app\:create":"create a Lightning app"
+	"force\:lightning\:component\:create":"create a bundle for an Aura component or a Lightning web component"
+	"force\:lightning\:event\:create":"create a Lightning event"
+	"force\:lightning\:interface\:create":"create a Lightning interface"
+	"force\:lightning\:lint":"analyse (lint) Lightning component code"
+	"force\:lightning\:test\:create":"create a Lightning test"
+	"force\:lightning\:test\:install":"install Lightning Testing Service unmanaged package in your org"
+	"force\:lightning\:test\:run":"invoke Aura component tests"
+	"force\:limits\:api\:display":"display current org’s limits"
+	"force\:mdapi\:convert":"convert metadata from the Metadata API format into the source format"
+	"force\:mdapi\:deploy":"deploy metadata to an org using Metadata API"
+	"force\:mdapi\:deploy\:cancel":"cancel a metadata deployment"
+	"force\:mdapi\:deploy\:report":"check the status of a metadata deployment"
+	"force\:mdapi\:retrieve":"retrieve metadata from an org using Metadata API"
+	"force\:mdapi\:retrieve\:report":"check the status of a metadata retrieval"
+	"force\:org\:create":"create a scratch org"
+	"force\:org\:delete":"mark a scratch org for deletion"
+	"force\:org\:display":"get org description"
+	"force\:org\:list":"list all orgs you’ve created or authenticated to"
+	"force\:org\:open":"open an org in your browser"
+	"force\:org\:shape\:create":"create a snapshot of org edition, features, and licenses"
+	"force\:org\:shape\:delete":"delete all org shapes for a target org"
+	"force\:org\:shape\:list":"list all org shapes you’ve created"
+	"force\:org\:snapshot\:create":"snapshot a scratch org"
+	"force\:org\:snapshot\:delete":"delete a scratch org snapshot"
+	"force\:org\:snapshot\:get":"get details about a scratch org snapshot"
+	"force\:org\:snapshot\:list":"list scratch org snapshots"
+	"force\:package1\:version\:create":"create a first-generation package version in the release org"
+	"force\:package1\:version\:create\:get":"retrieve the status of a package version creation request"
+	"force\:package1\:version\:display":"display details about a first-generation package version"
+	"force\:package1\:version\:list":"list package versions for the specified first-generation package or for the org"
+	"force\:package\:create":"create a package"
+	"force\:package\:hammertest\:list":"list the statuses of running and completed hammer tests"
+	"force\:package\:hammertest\:report":"display the status or results of a hammer test"
+	"force\:package\:hammertest\:run":"run ISV Hammer"
+	"force\:package\:install":"install a package in the target org"
+	"force\:package\:install\:report":"retrieve the status of a package installation request"
+	"force\:package\:installed\:list":"list the org’s installed packages"
+	"force\:package\:list":"list all packages in the Dev Hub org"
+	"force\:package\:uninstall":"uninstall a second-generation package from the target org"
+	"force\:package\:uninstall\:report":"retrieve status of package uninstall request"
+	"force\:package\:update":"update package details"
+	"force\:package\:version\:create":"create a package version"
+	"force\:package\:version\:create\:list":"list package version creation requests"
+	"force\:package\:version\:create\:report":"retrieve details about a package version creation request"
+	"force\:package\:version\:list":"list all package versions in the Dev Hub org"
+	"force\:package\:version\:promote":"promote a package version to released"
+	"force\:package\:version\:report":"retrieve details about a package version in the Dev Hub org"
+	"force\:package\:version\:update":"update a package version"
+	"force\:project\:create":"create a new SFDX project"
+	"force\:project\:upgrade":"update project config files to the latest format"
+	"force\:schema\:sobject\:describe":"describe an object"
+	"force\:schema\:sobject\:list":"list all objects of a specified category"
+	"force\:source\:convert":"convert source into Metadata API format"
+	"force\:source\:delete":"delete source from your project and from a non-source-tracked org"
+	"force\:source\:deploy":"deploy source to a non-source-tracked org"
+	"force\:source\:open":"edit a Lightning Page with Lightning App Builder"
+	"force\:source\:pull":"pull source from the scratch org to the project"
+	"force\:source\:push":"push source to a scratch org from the project"
+	"force\:source\:retrieve":"retrieve source from a non-source-tracked org"
+	"force\:source\:status":"list local changes and/or changes in a scratch org"
+	"force\:user\:create":"create a user for a scratch org"
+	"force\:user\:display":"displays information about a user of a scratch org"
+	"force\:user\:list":"lists all users of a scratch org"
+	"force\:user\:password\:generate":"generate a password for scratch org users"
+	"force\:user\:permset\:assign":"assign a permission set to one or more users of an org"
+	"force\:visualforce\:component\:create":"create a Visualforce component"
+	"force\:visualforce\:page\:create":"create a Visualforce page"
+)
+
+_arguments '*:: :->command'
+
+if (( CURRENT == 1 )); then
+ _describe -t commands "sfdx command" _1st_arguments
+ return
+fi
+
+local -a _command_args
+case "$words[1]" in
+ force:limits:api:display)
+ _command_args=(
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:lightning:app:create)
+ _command_args=(
+ '(-n|--appname)'{-n,--appname}'[name of the generated Lightning app]' \
+ '(-t|--template)'{-t,--template}'[template to use for file creation (DefaultLightningApp*)]' \
+ '(-d|--outputdir)'{-d,--outputdir}'[folder for saving the created files]' \
+ '(-r|--reflect)'{-r,--reflect}'[switch to return flag detailed information]' \
+ '(-a|--apiversion)'{-a,--apiversion}'[API version number (45.0*,44.0)]' \
+ '(--json)--json[JSON output]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:data:bulk:delete)
+ _command_args=(
+ '(-s|--sobjecttype)'{-s,--sobjecttype}'[the sObject type of the records you’re deleting]' \
+ '(-f|--csvfile)'{-f,--csvfile}'[the path to the CSV file containing the ids of the records to delete]:file:_files' \
+ '(-w|--wait)'{-w,--wait}'[the number of minutes to wait for the command to complete before displaying the results]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:data:bulk:status)
+ _command_args=(
+ '(-i|--jobid)'{-i,--jobid}'[the ID of the job you want to view or of the job whose batch you want to view]' \
+ '(-b|--batchid)'{-b,--batchid}'[the ID of the batch whose status you want to view]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:data:bulk:upsert)
+ _command_args=(
+ '(-s|--sobjecttype)'{-s,--sobjecttype}'[the sObject type of the records you want to upsert]' \
+ '(-f|--csvfile)'{-f,--csvfile}'[the path to the CSV file that defines the records to upsert]:file:_files' \
+ '(-i|--externalid)'{-i,--externalid}'[the column name of the external ID]' \
+ '(-w|--wait)'{-w,--wait}'[the number of minutes to wait for the command to complete before displaying the results]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:apex:class:create)
+ _command_args=(
+ '(-n|--classname)'{-n,--classname}'[name of the generated Apex class]' \
+ '(-t|--template)'{-t,--template}'[template to use for file creation (DefaultApexClass*,ApexException,ApexUnitTest,InboundEmailService)]' \
+ '(-d|--outputdir)'{-d,--outputdir}'[folder for saving the created files]' \
+ '(-r|--reflect)'{-r,--reflect}'[switch to return flag detailed information]' \
+ '(-a|--apiversion)'{-a,--apiversion}'[API version number (45.0*,44.0)]' \
+ '(--json)--json[JSON output]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:doc:commands:display)
+ _command_args=(
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:doc:commands:list)
+ _command_args=(
+ '(-u|--usage)'{-u,--usage}'[list only docopt usage strings]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:visualforce:component:create)
+ _command_args=(
+ '(-t|--template)'{-t,--template}'[template to use for file creation (DefaultVFComponent*)]' \
+ '(-d|--outputdir)'{-d,--outputdir}'[folder for saving the created files]' \
+ '(-r|--reflect)'{-r,--reflect}'[switch to return flag detailed information]' \
+ '(-n|--componentname)'{-n,--componentname}'[name of the generated Visualforce component]' \
+ '(-a|--apiversion)'{-a,--apiversion}'[API version number (45.0*,44.0)]' \
+ '(-l|--label)'{-l,--label}'[Visualforce component label]' \
+ '(--json)--json[JSON output]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:lightning:component:create)
+ _command_args=(
+ '(-n|--componentname)'{-n,--componentname}'[name of the generated Lightning component]' \
+ '(-t|--template)'{-t,--template}'[template to use for file creation (DefaultLightningCmp*)]' \
+ '(-d|--outputdir)'{-d,--outputdir}'[folder for saving the created files]' \
+ '(-r|--reflect)'{-r,--reflect}'[switch to return flag detailed information]' \
+ '(-a|--apiversion)'{-a,--apiversion}'[API version number (45.0*,44.0)]' \
+ '(--type)--type[type of the Lightning component (aura*,lwc)]' \
+ '(--json)--json[JSON output]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:mdapi:convert)
+ _command_args=(
+ '(-r|--rootdir)'{-r,--rootdir}'[the root directory containing the Metadata API–formatted metadata]:file:_files' \
+ '(-d|--outputdir)'{-d,--outputdir}'[the output directory to store the source–formatted files]:file:_files' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:source:convert)
+ _command_args=(
+ '(-r|--rootdir)'{-r,--rootdir}'[a source directory other than the default package to convert]:file:_files' \
+ '(-d|--outputdir)'{-d,--outputdir}'[output directory to store the Metadata API–formatted files in]:file:_files' \
+ '(-n|--packagename)'{-n,--packagename}'[name of the package to associate with the metadata-formatted files]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:org:create)
+ _command_args=(
+ '(-f|--definitionfile)'{-f,--definitionfile}'[path to a scratch org definition file]:file:_files' \
+ '(-j|--definitionjson)'{-j,--definitionjson}'[scratch org definition in json format ]' \
+ '(-n|--nonamespace)'{-n,--nonamespace}'[creates the scratch org with no namespace]' \
+ '(-c|--noancestors)'{-c,--noancestors}'[do not include second-generation package ancestors in the scratch org]' \
+ '(-i|--clientid)'{-i,--clientid}'[connected app consumer key]' \
+ '(-s|--setdefaultusername)'{-s,--setdefaultusername}'[set the created org as the default username]' \
+ '(-a|--setalias)'{-a,--setalias}'[set an alias for for the created scratch org]' \
+ '(-e|--env)'{-e,--env}'[environment where the scratch org is created: \[sandbox*,virtual,prototype\] (sandbox*,virtual,prototype)]' \
+ '(-w|--wait)'{-w,--wait}'[the streaming client socket timeout (in minutes) (default:6, min:2)]' \
+ '(-d|--durationdays)'{-d,--durationdays}'[duration of the scratch org (in days) (default:7, min:1, max:30)]' \
+ '(-v|--targetdevhubusername)'{-v,--targetdevhubusername}'[username or alias for the dev hub org; overrides default dev hub org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:package:create)
+ _command_args=(
+ '(-n|--name)'{-n,--name}'[package name]' \
+ '(-t|--packagetype)'{-t,--packagetype}'[package type (Managed,Unlocked)]' \
+ '(-d|--description)'{-d,--description}'[package description]' \
+ '(-e|--nonamespace)'{-e,--nonamespace}'[creates the package with no namespace; available only for unlocked packages.]' \
+ '(-r|--path)'{-r,--path}'[path to directory that contains the contents of the package]:file:_files' \
+ '(-v|--targetdevhubusername)'{-v,--targetdevhubusername}'[username or alias for the dev hub org; overrides default dev hub org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:user:create)
+ _command_args=(
+ '(-f|--definitionfile)'{-f,--definitionfile}'[file path to a user definition]:file:_files' \
+ '(-a|--setalias)'{-a,--setalias}'[set an alias for the created username to reference within the CLI]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(-v|--targetdevhubusername)'{-v,--targetdevhubusername}'[username or alias for the dev hub org; overrides default dev hub org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:project:create)
+ _command_args=(
+ '(-n|--projectname)'{-n,--projectname}'[name of the generated project]' \
+ '(-t|--template)'{-t,--template}'[template to use for file creation (Defaultsfdx-project.json*)]' \
+ '(-d|--outputdir)'{-d,--outputdir}'[folder for saving the created files]' \
+ '(-r|--reflect)'{-r,--reflect}'[switch to return flag detailed information]' \
+ '(-l|--loginurl)'{-l,--loginurl}'[Salesforce instance login URL (https://login.salesforce.com*)]' \
+ '(--sourceapiversion)--sourceapiversion[source API version number (45.0*)]' \
+ '(-s|--namespace)'{-s,--namespace}'[project associated namespace]' \
+ '(-p|--defaultpackagedir)'{-p,--defaultpackagedir}'[default package directory name (force-app*)]' \
+ '(-x|--manifest)'{-x,--manifest}'[generate a manifest (package.xml) for change-set-based development]' \
+ '(--json)--json[JSON output]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:org:delete)
+ _command_args=(
+ '(-p|--noprompt)'{-p,--noprompt}'[no prompt to confirm deletion]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org]' \
+ '(-v|--targetdevhubusername)'{-v,--targetdevhubusername}'[username or alias for the dev hub org; overrides default dev hub org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:source:delete)
+ _command_args=(
+ '(-r|--noprompt)'{-r,--noprompt}'[do not prompt for delete confirmation]' \
+ '(-w|--wait)'{-w,--wait}'[wait time for command to finish in minutes (default: 33) (default:33, min:1)]' \
+ '(-p|--sourcepath)'{-p,--sourcepath}'[comma-separated list of paths to the local metadata to delete]:file:_files' \
+ '(-m|--metadata)'{-m,--metadata}'[comma-separated list of names of metadata components to delete]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:mdapi:deploy)
+ _command_args=(
+ '(-c|--checkonly)'{-c,--checkonly}'[validate deploy but don’t save to the org (default:false)]' \
+ '(-d|--deploydir)'{-d,--deploydir}'[root of directory tree of files to deploy]:file:_files' \
+ '(-w|--wait)'{-w,--wait}'[wait time for command to finish in minutes (default: 0)]' \
+ '(-i|--jobid)'{-i,--jobid}'[(deprecated) job ID of the deployment you want to check; defaults to your most recent CLI deployment if not specified]' \
+ '(-l|--testlevel)'{-l,--testlevel}'[deployment testing level (NoTestRun,RunSpecifiedTests,RunLocalTests,RunAllTestsInOrg)]' \
+ '(-r|--runtests)'{-r,--runtests}'[tests to run if --testlevel RunSpecifiedTests]' \
+ '(-e|--rollbackonerror)'{-e,--rollbackonerror}'[(deprecated) roll back deployment for any failure (default:true)]' \
+ '(-o|--ignoreerrors)'{-o,--ignoreerrors}'[ignore any errors and do not roll back deployment (default:false)]' \
+ '(-g|--ignorewarnings)'{-g,--ignorewarnings}'[whether a warning will allow a deployment to complete successfully (default:false)]' \
+ '(-q|--validateddeployrequestid)'{-q,--validateddeployrequestid}'[request ID of the validated deployment to run a Quick Deploy]' \
+ '(-f|--zipfile)'{-f,--zipfile}'[path to .zip file of metadata to deploy]:file:_files' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ '(--verbose)--verbose[verbose output of deploy results]' \
+ )
+ ;;
+ force:source:deploy)
+ _command_args=(
+ '(-w|--wait)'{-w,--wait}'[wait time for command to finish in minutes (default: 33) (default:33, min:1)]' \
+ '(-m|--metadata)'{-m,--metadata}'[comma-separated list of metadata component names]' \
+ '(-p|--sourcepath)'{-p,--sourcepath}'[comma-separated list of paths to the local source files to deploy]:file:_files' \
+ '(-x|--manifest)'{-x,--manifest}'[file path for manifest (package.xml) of components to deploy]:file:_files' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:mdapi:deploy:cancel)
+ _command_args=(
+ '(-w|--wait)'{-w,--wait}'[wait time for command to finish in minutes (default: 33) (default:33, min:1)]' \
+ '(-i|--jobid)'{-i,--jobid}'[job ID of the deployment you want to cancel; defaults to your most recent CLI deployment if not specified]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:mdapi:deploy:report)
+ _command_args=(
+ '(-w|--wait)'{-w,--wait}'[wait time for command to finish in minutes (default: 0)]' \
+ '(-i|--jobid)'{-i,--jobid}'[job ID of the deployment you want to check; defaults to your most recent CLI deployment if not specified]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ '(--verbose)--verbose[verbose output of deploy results]' \
+ )
+ ;;
+ force:org:display)
+ _command_args=(
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ '(--verbose)--verbose[emit additional command output to stdout]' \
+ )
+ ;;
+ force:user:display)
+ _command_args=(
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(-v|--targetdevhubusername)'{-v,--targetdevhubusername}'[username or alias for the dev hub org; overrides default dev hub org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:lightning:event:create)
+ _command_args=(
+ '(-n|--eventname)'{-n,--eventname}'[name of the generated Lightning event]' \
+ '(-t|--template)'{-t,--template}'[template to use for file creation (DefaultLightningEvt*)]' \
+ '(-d|--outputdir)'{-d,--outputdir}'[folder for saving the created files]' \
+ '(-r|--reflect)'{-r,--reflect}'[switch to return flag detailed information]' \
+ '(-a|--apiversion)'{-a,--apiversion}'[API version number (45.0*,44.0)]' \
+ '(--json)--json[JSON output]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:apex:execute)
+ _command_args=(
+ '(-f|--apexcodefile)'{-f,--apexcodefile}'[path to a local file containing Apex code]:file:_files' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:config:get)
+ _command_args=(
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ '(--verbose)--verbose[emit additional command output to stdout]' \
+ )
+ ;;
+ force:package:hammertest:list)
+ _command_args=(
+ '(-i|--packageversionid)'{-i,--packageversionid}'[ID of the package version to list results for]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:package:hammertest:report)
+ _command_args=(
+ '(-i|--requestid)'{-i,--requestid}'[ID of the hammer request to report on]' \
+ '(-s|--summary)'{-s,--summary}'[report only a results summary (hide Apex test failures)]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:package:hammertest:run)
+ _command_args=(
+ '(-i|--packageversionid)'{-i,--packageversionid}'[ID of the package version to test]' \
+ '(-s|--subscriberorg)'{-s,--subscriberorg}'[comma-separated list of subscriber orgs IDs]' \
+ '(-f|--subscriberfile)'{-f,--subscriberfile}'[file with list of subscriber orgs IDs, one per line]' \
+ '(-d|--scheduledrundatetime)'{-d,--scheduledrundatetime}'[earliest date/time to run the test]' \
+ '(-p|--preview)'{-p,--preview}'[run the package hammer test in the Salesforce preview version]' \
+ '(-t|--apextests)'{-t,--apextests}'[run the apex tests in the subscriber org]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:package:install)
+ _command_args=(
+ '(-w|--wait)'{-w,--wait}'[number of minutes to wait for installation status]' \
+ '(-k|--installationkey)'{-k,--installationkey}'[installation key for key-protected package (default: null)]' \
+ '(-b|--publishwait)'{-b,--publishwait}'[number of minutes to wait for subscriber package version ID to become available in the target org ]' \
+ '(-r|--noprompt)'{-r,--noprompt}'[allow Remote Site Settings and Content Security Policy websites to send or receive data without confirmation]' \
+ '(-p|--package)'{-p,--package}'[ID (starts with 04t) or alias of the package version to install]' \
+ '(-s|--securitytype)'{-s,--securitytype}'[security access type for the installed package (AllUsers,AdminsOnly)]' \
+ '(-t|--upgradetype)'{-t,--upgradetype}'[the upgrade type for the package installation (Mixed*,DeprecateOnly)]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:package:install:report)
+ _command_args=(
+ '(-i|--requestid)'{-i,--requestid}'[ID of the package install request you want to check]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:package:installed:list)
+ _command_args=(
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:lightning:interface:create)
+ _command_args=(
+ '(-n|--interfacename)'{-n,--interfacename}'[name of the generated Lightning interface]' \
+ '(-t|--template)'{-t,--template}'[template to use for file creation (DefaultLightningIntf*)]' \
+ '(-d|--outputdir)'{-d,--outputdir}'[folder for saving the created files]' \
+ '(-r|--reflect)'{-r,--reflect}'[switch to return flag detailed information]' \
+ '(-a|--apiversion)'{-a,--apiversion}'[API version number (45.0*,44.0)]' \
+ '(--json)--json[JSON output]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:auth:jwt:grant)
+ _command_args=(
+ '(-u|--username)'{-u,--username}'[authentication username]' \
+ '(-f|--jwtkeyfile)'{-f,--jwtkeyfile}'[path to a file containing the private key]:file:_files' \
+ '(-i|--clientid)'{-i,--clientid}'[OAuth client ID (sometimes called the consumer key)]' \
+ '(-r|--instanceurl)'{-r,--instanceurl}'[the login URL of the instance the org lives on]' \
+ '(-d|--setdefaultdevhubusername)'{-d,--setdefaultdevhubusername}'[set the authenticated org as the default dev hub org for scratch org creation]' \
+ '(-s|--setdefaultusername)'{-s,--setdefaultusername}'[set the authenticated org as the default username that all commands run against]' \
+ '(-a|--setalias)'{-a,--setalias}'[set an alias for the authenticated org]' \
+ '(-p|--noprompt)'{-p,--noprompt}'[do not prompt for auth confirmation in demo mode]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:lightning:lint)
+ _command_args=(
+ '(--ignore)--ignore[pattern used to ignore some folders]' \
+ '(--files)--files[pattern used to include specific files]' \
+ '(--json)--json[format output as JSON]' \
+ '(--config)--config[path to a custom ESLint configuration file]' \
+ '(--verbose)--verbose[report warnings in addition to errors]' \
+ '(--exit)--exit[exit with error code 1 if there are lint issues]' \
+ )
+ ;;
+ force:alias:list)
+ _command_args=(
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:config:list)
+ _command_args=(
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:org:list)
+ _command_args=(
+ '(--all)--all[include expired, deleted, and unknown-status scratch orgs]' \
+ '(--clean)--clean[remove all local org authorizations for non-active orgs]' \
+ '(-p|--noprompt)'{-p,--noprompt}'[do not prompt for confirmation]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ '(--verbose)--verbose[list more information about each org]' \
+ )
+ ;;
+ force:package:list)
+ _command_args=(
+ '(-v|--targetdevhubusername)'{-v,--targetdevhubusername}'[username or alias for the dev hub org; overrides default dev hub org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ '(--verbose)--verbose[display extended package detail]' \
+ )
+ ;;
+ force:user:list)
+ _command_args=(
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(-v|--targetdevhubusername)'{-v,--targetdevhubusername}'[username or alias for the dev hub org; overrides default dev hub org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:apex:log:get)
+ _command_args=(
+ '(-c|--color)'{-c,--color}'[colorize noteworthy log lines]' \
+ '(-i|--logid)'{-i,--logid}'[ID of the log to display]' \
+ '(-n|--number)'{-n,--number}'[number of most recent logs to display (min:1, max:25)]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:apex:log:list)
+ _command_args=(
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:apex:log:tail)
+ _command_args=(
+ '(-c|--color)'{-c,--color}'[colorize noteworthy log lines]' \
+ '(-d|--debuglevel)'{-d,--debuglevel}'[debug level for trace flag]' \
+ '(-s|--skiptraceflag)'{-s,--skiptraceflag}'[skip trace flag setup]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:auth:logout)
+ _command_args=(
+ '(-a|--all)'{-a,--all}'[include all authenticated orgs]' \
+ '(-p|--noprompt)'{-p,--noprompt}'[do not prompt for confirmation]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:org:open)
+ _command_args=(
+ '(-p|--path)'{-p,--path}'[navigation URL path]' \
+ '(-r|--urlonly)'{-r,--urlonly}'[display navigation URL, but don’t launch browser]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:source:open)
+ _command_args=(
+ '(-f|--sourcefile)'{-f,--sourcefile}'[file to edit]:file:_files' \
+ '(-r|--urlonly)'{-r,--urlonly}'[generate a navigation URL; don’t launch the editor]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:visualforce:page:create)
+ _command_args=(
+ '(-t|--template)'{-t,--template}'[template to use for file creation (DefaultVFPage*)]' \
+ '(-d|--outputdir)'{-d,--outputdir}'[folder for saving the created files]' \
+ '(-r|--reflect)'{-r,--reflect}'[switch to return flag detailed information]' \
+ '(-n|--pagename)'{-n,--pagename}'[name of the generated Visualforce page]' \
+ '(-a|--apiversion)'{-a,--apiversion}'[API version number (45.0*,44.0)]' \
+ '(-l|--label)'{-l,--label}'[Visualforce page label]' \
+ '(--json)--json[JSON output]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:user:password:generate)
+ _command_args=(
+ '(-o|--onbehalfof)'{-o,--onbehalfof}'[comma-separated list of usernames for which to generate passwords]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(-v|--targetdevhubusername)'{-v,--targetdevhubusername}'[username or alias for the dev hub org; overrides default dev hub org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:user:permset:assign)
+ _command_args=(
+ '(-n|--permsetname)'{-n,--permsetname}'[the name of the permission set to assign]' \
+ '(-o|--onbehalfof)'{-o,--onbehalfof}'[comma-separated list of usernames or aliases to assign the permission set to]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:source:pull)
+ _command_args=(
+ '(-w|--wait)'{-w,--wait}'[wait time for command to finish in minutes (default: 33) (default:33, min:1)]' \
+ '(-f|--forceoverwrite)'{-f,--forceoverwrite}'[ignore conflict warnings and overwrite changes to the project]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:source:push)
+ _command_args=(
+ '(-f|--forceoverwrite)'{-f,--forceoverwrite}'[ignore conflict warnings and overwrite changes to scratch org]' \
+ '(-g|--ignorewarnings)'{-g,--ignorewarnings}'[deploy changes even if warnings are generated]' \
+ '(-r|--replacetokens)'{-r,--replacetokens}'[replace tokens in source files prior to deployment]' \
+ '(-w|--wait)'{-w,--wait}'[wait time for command to finish in minutes (default: 33) (default:33, min:1)]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:data:record:create)
+ _command_args=(
+ '(-s|--sobjecttype)'{-s,--sobjecttype}'[the type of the record you’re creating]' \
+ '(-v|--values)'{-v,--values}'[the <fieldName>=<value> pairs you’re creating]' \
+ '(-t|--usetoolingapi)'{-t,--usetoolingapi}'[create the record with tooling api]' \
+ '(--perflog)--perflog[get API performance data.]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:data:record:delete)
+ _command_args=(
+ '(-s|--sobjecttype)'{-s,--sobjecttype}'[the type of the record you’re deleting]' \
+ '(-i|--sobjectid)'{-i,--sobjectid}'[the ID of the record you’re deleting]' \
+ '(-w|--where)'{-w,--where}'[a list of <fieldName>=<value> pairs to search for]' \
+ '(-t|--usetoolingapi)'{-t,--usetoolingapi}'[delete the record with Tooling API]' \
+ '(--perflog)--perflog[get API performance data.]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:data:record:get)
+ _command_args=(
+ '(-s|--sobjecttype)'{-s,--sobjecttype}'[the type of the record you’re retrieving]' \
+ '(-i|--sobjectid)'{-i,--sobjectid}'[the ID of the record you’re retrieving]' \
+ '(-w|--where)'{-w,--where}'[a list of <fieldName>=<value> pairs to search for]' \
+ '(-t|--usetoolingapi)'{-t,--usetoolingapi}'[retrieve the record with Tooling API]' \
+ '(--perflog)--perflog[get API performance data.]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:data:record:update)
+ _command_args=(
+ '(-s|--sobjecttype)'{-s,--sobjecttype}'[the type of the record you’re updating]' \
+ '(-i|--sobjectid)'{-i,--sobjectid}'[the ID of the record you’re updating]' \
+ '(-w|--where)'{-w,--where}'[a list of <fieldName>=<value> pairs to search for]' \
+ '(-v|--values)'{-v,--values}'[the <fieldName>=<value> pairs you’re updating]' \
+ '(-t|--usetoolingapi)'{-t,--usetoolingapi}'[update the record with Tooling API]' \
+ '(--perflog)--perflog[get API performance data.]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:mdapi:retrieve)
+ _command_args=(
+ '(-a|--apiversion)'{-a,--apiversion}'[target API version for the retrieve (default 45.0)]' \
+ '(-w|--wait)'{-w,--wait}'[wait time for command to finish in minutes (default: -1 (no limit))]' \
+ '(-r|--retrievetargetdir)'{-r,--retrievetargetdir}'[directory root for the retrieved files]:file:_files' \
+ '(-k|--unpackaged)'{-k,--unpackaged}'[file path of manifest of components to retrieve]:file:_files' \
+ '(-d|--sourcedir)'{-d,--sourcedir}'[source dir to use instead of default manifest sfdx-project.xml]:file:_files' \
+ '(-p|--packagenames)'{-p,--packagenames}'[a comma-separated list of packages to retrieve]' \
+ '(-s|--singlepackage)'{-s,--singlepackage}'[a single-package retrieve (default: false)]' \
+ '(-i|--jobid)'{-i,--jobid}'[(deprecated) job ID of the retrieve you want to check; defaults to your most recent CLI retrieval if not specified]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ '(--verbose)--verbose[verbose output of retrieve result]' \
+ )
+ ;;
+ force:source:retrieve)
+ _command_args=(
+ '(-w|--wait)'{-w,--wait}'[wait time for command to finish in minutes (default: 33) (default:33, min:1)]' \
+ '(-x|--manifest)'{-x,--manifest}'[file path for manifest (package.xml) of components to retrieve]:file:_files' \
+ '(-m|--metadata)'{-m,--metadata}'[comma-separated list of metadata component names]' \
+ '(-p|--sourcepath)'{-p,--sourcepath}'[comma-separated list of source file paths to retrieve]:file:_files' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:mdapi:retrieve:report)
+ _command_args=(
+ '(-w|--wait)'{-w,--wait}'[wait time for command to finish in minutes (default: -1 (no limit))]' \
+ '(-r|--retrievetargetdir)'{-r,--retrievetargetdir}'[directory root for the retrieved files]:file:_files' \
+ '(-i|--jobid)'{-i,--jobid}'[job ID of the retrieve you want to check; defaults to your most recent CLI retrieval if not specified]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ '(--verbose)--verbose[verbose output of retrieve result]' \
+ )
+ ;;
+ force:alias:set)
+ _command_args=(
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:config:set)
+ _command_args=(
+ '(-g|--global)'{-g,--global}'[set config var globally (to be used from any directory)]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:auth:sfdxurl:store)
+ _command_args=(
+ '(-f|--sfdxurlfile)'{-f,--sfdxurlfile}'[path to a file containing the sfdx url]:file:_files' \
+ '(-d|--setdefaultdevhubusername)'{-d,--setdefaultdevhubusername}'[set the authenticated org as the default dev hub org for scratch org creation]' \
+ '(-s|--setdefaultusername)'{-s,--setdefaultusername}'[set the authenticated org as the default username that all commands run against]' \
+ '(-a|--setalias)'{-a,--setalias}'[set an alias for the authenticated org]' \
+ '(-p|--noprompt)'{-p,--noprompt}'[do not prompt for auth confirmation in demo mode]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:org:shape:create)
+ _command_args=(
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:org:shape:delete)
+ _command_args=(
+ '(-p|--noprompt)'{-p,--noprompt}'[do not prompt for confirmation]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username for the target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:org:shape:list)
+ _command_args=(
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ '(--verbose)--verbose[list more information about each org shape]' \
+ )
+ ;;
+ force:org:snapshot:create)
+ _command_args=(
+ '(-o|--sourceorg)'{-o,--sourceorg}'[ID or locally authenticated username or alias of scratch org to snapshot]' \
+ '(-n|--snapshotname)'{-n,--snapshotname}'[unique name of snapshot]' \
+ '(-d|--description)'{-d,--description}'[description of snapshot]' \
+ '(-v|--targetdevhubusername)'{-v,--targetdevhubusername}'[username or alias for the dev hub org; overrides default dev hub org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:org:snapshot:delete)
+ _command_args=(
+ '(-s|--snapshot)'{-s,--snapshot}'[name or ID of snapshot to delete]' \
+ '(-v|--targetdevhubusername)'{-v,--targetdevhubusername}'[username or alias for the dev hub org; overrides default dev hub org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:org:snapshot:get)
+ _command_args=(
+ '(-s|--snapshot)'{-s,--snapshot}'[name or ID of snapshot to retrieve]' \
+ '(-v|--targetdevhubusername)'{-v,--targetdevhubusername}'[username or alias for the dev hub org; overrides default dev hub org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:org:snapshot:list)
+ _command_args=(
+ '(-v|--targetdevhubusername)'{-v,--targetdevhubusername}'[username or alias for the dev hub org; overrides default dev hub org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:schema:sobject:describe)
+ _command_args=(
+ '(-s|--sobjecttype)'{-s,--sobjecttype}'[the API name of the object to describe]' \
+ '(-t|--usetoolingapi)'{-t,--usetoolingapi}'[execute with Tooling API]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:schema:sobject:list)
+ _command_args=(
+ '(-c|--sobjecttypecategory)'{-c,--sobjecttypecategory}'[the type of objects to list (all|custom|standard)]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:data:soql:query)
+ _command_args=(
+ '(-q|--query)'{-q,--query}'[SOQL query to execute]' \
+ '(-t|--usetoolingapi)'{-t,--usetoolingapi}'[execute query with Tooling API]' \
+ '(-r|--resultformat)'{-r,--resultformat}'[query result format emitted to stdout; --json flag overrides this parameter (human*,csv,json)]' \
+ '(--perflog)--perflog[get API performance data.]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:source:status)
+ _command_args=(
+ '(-a|--all)'{-a,--all}'[list all the changes that have been made]' \
+ '(-l|--local)'{-l,--local}'[list the changes that have been made locally]' \
+ '(-r|--remote)'{-r,--remote}'[list the changes that have been made in the scratch org]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:lightning:test:create)
+ _command_args=(
+ '(-n|--testname)'{-n,--testname}'[name of the generated Lightning test]' \
+ '(-t|--template)'{-t,--template}'[template to use for file creation (DefaultLightningTest*)]' \
+ '(-d|--outputdir)'{-d,--outputdir}'[folder for saving the created files]' \
+ '(-r|--reflect)'{-r,--reflect}'[switch to return flag detailed information]' \
+ '(--json)--json[JSON output]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:lightning:test:install)
+ _command_args=(
+ '(-w|--wait)'{-w,--wait}'[number of minutes to wait for installation status (default:2)]' \
+ '(-r|--releaseversion)'{-r,--releaseversion}'[release version of Lightning Testing Service (default:latest)]' \
+ '(-t|--packagetype)'{-t,--packagetype}'[type of unmanaged package. 'full' option contains both jasmine and mocha, plus examples (full*,jasmine,mocha)]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:apex:test:report)
+ _command_args=(
+ '(-i|--testrunid)'{-i,--testrunid}'[ID of test run]' \
+ '(-c|--codecoverage)'{-c,--codecoverage}'[retrieve code coverage results]' \
+ '(-d|--outputdir)'{-d,--outputdir}'[directory to store test run files]:file:_files' \
+ '(-r|--resultformat)'{-r,--resultformat}'[test result format emitted to stdout; --json flag overrides this parameter (human*,tap,junit,json)]' \
+ '(-w|--wait)'{-w,--wait}'[the streaming client socket timeout (in minutes) (default:6, min:2)]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ '(--verbose)--verbose[display Apex test processing details]' \
+ )
+ ;;
+ force:apex:test:run)
+ _command_args=(
+ '(-n|--classnames)'{-n,--classnames}'[comma-separated list of Apex test class names to run]' \
+ '(-s|--suitenames)'{-s,--suitenames}'[comma-separated list of Apex test suite names to run]' \
+ '(-t|--tests)'{-t,--tests}'[comma-separated list of Apex test class names or IDs and, if applicable, test methods to run]' \
+ '(-c|--codecoverage)'{-c,--codecoverage}'[retrieve code coverage results]' \
+ '(-d|--outputdir)'{-d,--outputdir}'[directory to store test run files]:file:_files' \
+ '(-l|--testlevel)'{-l,--testlevel}'[testlevel enum value (RunLocalTests,RunAllTestsInOrg,RunSpecifiedTests)]' \
+ '(-r|--resultformat)'{-r,--resultformat}'[test result format emitted to stdout; --json flag overrides this parameter (human*,tap,junit,json)]' \
+ '(-w|--wait)'{-w,--wait}'[the streaming client socket timeout (in minutes) (default:6, min:2)]' \
+ '(--precompilewait)--precompilewait[how long to wait (in minutes) for Apex pre-compilation (default:3, min:3)]' \
+ '(-y|--synchronous)'{-y,--synchronous}'[run tests from a single class synchronously]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ '(--verbose)--verbose[display Apex test processing details]' \
+ )
+ ;;
+ force:lightning:test:run)
+ _command_args=(
+ '(-a|--appname)'{-a,--appname}'[name of your Lightning test application]' \
+ '(-d|--outputdir)'{-d,--outputdir}'[directory path to store test run artifacts: for example, log files and test results]:file:_files' \
+ '(-r|--resultformat)'{-r,--resultformat}'[test result format emitted to stdout; --json flag overrides this parameter (human*,tap,junit,json)]' \
+ '(-f|--configfile)'{-f,--configfile}'[path to config file for the test]:file:_files' \
+ '(-o|--leavebrowseropen)'{-o,--leavebrowseropen}'[leave browser open]' \
+ '(-t|--timeout)'{-t,--timeout}'[time (ms) to wait for results element in dom (default:60000)]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:data:tree:export)
+ _command_args=(
+ '(-q|--query)'{-q,--query}'[soql query, or filepath of file containing a soql query, to retrieve records]' \
+ '(-p|--plan)'{-p,--plan}'[generate mulitple sobject tree files and a plan definition file for aggregated import]' \
+ '(-x|--prefix)'{-x,--prefix}'[prefix of generated files]' \
+ '(-d|--outputdir)'{-d,--outputdir}'[directory to store files]:file:_files' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:data:tree:import)
+ _command_args=(
+ '(-f|--sobjecttreefiles)'{-f,--sobjecttreefiles}'[comma-delimited, ordered paths of json files containing collection of record trees to insert]:file:_files' \
+ '(-p|--plan)'{-p,--plan}'[path to plan to insert multiple data files that have master-detail relationships]:file:_files' \
+ '(-c|--contenttype)'{-c,--contenttype}'[if data file extension is not .json, provide content type (applies to all files)]' \
+ '(--confighelp)--confighelp[display schema information for the --plan configuration file to stdout; if you use this option, all other options except --json are ignored]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:apex:trigger:create)
+ _command_args=(
+ '(-n|--triggername)'{-n,--triggername}'[name of the generated Apex trigger]' \
+ '(-t|--template)'{-t,--template}'[template to use for file creation (ApexTrigger*)]' \
+ '(-d|--outputdir)'{-d,--outputdir}'[folder for saving the created files]' \
+ '(-r|--reflect)'{-r,--reflect}'[switch to return flag detailed information]' \
+ '(-a|--apiversion)'{-a,--apiversion}'[API version number (45.0*,44.0)]' \
+ '(-s|--sobject)'{-s,--sobject}'[sObject to create a trigger on (SOBJECT*)]' \
+ '(-e|--triggerevents)'{-e,--triggerevents}'[events that fire the trigger (before insert*,before update,before delete,after insert,after update,after delete,after undelete)]' \
+ '(--json)--json[JSON output]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:package:uninstall)
+ _command_args=(
+ '(-w|--wait)'{-w,--wait}'[number of minutes to wait for uninstall status]' \
+ '(-p|--package)'{-p,--package}'[ID (starts with 04t) or alias of the package version to uninstall]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:package:uninstall:report)
+ _command_args=(
+ '(-i|--requestid)'{-i,--requestid}'[ID of the package uninstall request you want to check]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:package:update)
+ _command_args=(
+ '(-p|--package)'{-p,--package}'[ID (starts with 0Ho) or alias of the package to update]' \
+ '(-n|--name)'{-n,--name}'[new package name]' \
+ '(-d|--description)'{-d,--description}'[new package description]' \
+ '(-v|--targetdevhubusername)'{-v,--targetdevhubusername}'[username or alias for the dev hub org; overrides default dev hub org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:project:upgrade)
+ _command_args=(
+ '(-f|--forceupgrade)'{-f,--forceupgrade}'[run all upgrades even if project has already been upgraded]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:package:version:create)
+ _command_args=(
+ '(-p|--package)'{-p,--package}'[ID (starts with 0Ho) or alias of the package to create a version of]' \
+ '(-d|--path)'{-d,--path}'[path to directory that contains the contents of the package]:file:_files' \
+ '(-f|--definitionfile)'{-f,--definitionfile}'[path to a definition file similar to scratch org definition file that contains the list of features and org preferences that the metadata of the package version depends on]:file:_files' \
+ '(-b|--branch)'{-b,--branch}'[the package version’s branch]' \
+ '(-t|--tag)'{-t,--tag}'[the package version’s tag]' \
+ '(-k|--installationkey)'{-k,--installationkey}'[installation key for key-protected package (either --installationkey or --installationkeybypass is required)]' \
+ '(-x|--installationkeybypass)'{-x,--installationkeybypass}'[bypass the installation key requirement (either --installationkey or --installationkeybypass is required)]' \
+ '(-r|--preserve)'{-r,--preserve}'[temp files are preserved that would otherwise be deleted]' \
+ '(-j|--validateschema)'{-j,--validateschema}'[sfdx-project.json is validated against JSON schema]' \
+ '(-w|--wait)'{-w,--wait}'[minutes to wait for the package version to be created (default:0)]' \
+ '(-s|--buildinstance)'{-s,--buildinstance}'[the instance where the package version will be created——for example, NA50]' \
+ '(-o|--sourceorg)'{-o,--sourceorg}'[the source org ID used to copy the org shape for the build org]' \
+ '(-a|--versionname)'{-a,--versionname}'[the name of the package version to be created]' \
+ '(-n|--versionnumber)'{-n,--versionnumber}'[the version number of the package version to be created]' \
+ '(-e|--versiondescription)'{-e,--versiondescription}'[the description of the package version to be created]' \
+ '(-v|--targetdevhubusername)'{-v,--targetdevhubusername}'[username or alias for the dev hub org; overrides default dev hub org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:package1:version:create)
+ _command_args=(
+ '(-i|--packageid)'{-i,--packageid}'[ID of the metadata package (starts with 033) of which you’re creating a new version]' \
+ '(-n|--name)'{-n,--name}'[package version name]' \
+ '(-d|--description)'{-d,--description}'[package version description]' \
+ '(-v|--version)'{-v,--version}'[package version in major.minor format, for example, 3.2]' \
+ '(-m|--managedreleased)'{-m,--managedreleased}'[create a managed package version]' \
+ '(-r|--releasenotesurl)'{-r,--releasenotesurl}'[release notes URL]' \
+ '(-p|--postinstallurl)'{-p,--postinstallurl}'[post install URL]' \
+ '(-k|--installationkey)'{-k,--installationkey}'[installation key for key-protected package (default: null)]' \
+ '(-w|--wait)'{-w,--wait}'[minutes to wait for the package version to be created (default: 2 minutes)]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:package1:version:create:get)
+ _command_args=(
+ '(-i|--requestid)'{-i,--requestid}'[PackageUploadRequest ID]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:package:version:create:list)
+ _command_args=(
+ '(-c|--createdlastdays)'{-c,--createdlastdays}'[created in the last specified number of days (starting at 00:00:00 of first day to now; 0 for today)]' \
+ '(-s|--status)'{-s,--status}'[filter the list by version creation request status (Queued,InProgress,Success,Error)]' \
+ '(-v|--targetdevhubusername)'{-v,--targetdevhubusername}'[username or alias for the dev hub org; overrides default dev hub org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:package:version:create:report)
+ _command_args=(
+ '(-i|--packagecreaterequestid)'{-i,--packagecreaterequestid}'[package version creation request ID (starts with 08c)]' \
+ '(-v|--targetdevhubusername)'{-v,--targetdevhubusername}'[username or alias for the dev hub org; overrides default dev hub org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:package1:version:display)
+ _command_args=(
+ '(-i|--packageversionid)'{-i,--packageversionid}'[metadata package version ID (starts with 04t)]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:package:version:list)
+ _command_args=(
+ '(-c|--createdlastdays)'{-c,--createdlastdays}'[created in the last specified number of days (starting at 00:00:00 of first day to now; 0 for today)]' \
+ '(-m|--modifiedlastdays)'{-m,--modifiedlastdays}'[list items modified in the specified last number of days (starting at 00:00:00 of first day to now; 0 for today)]' \
+ '(-p|--packages)'{-p,--packages}'[filter results on specified comma-delimited packages (aliases or 0Ho IDs)]' \
+ '(-r|--released)'{-r,--released}'[display released versions only]' \
+ '(-o|--orderby)'{-o,--orderby}'[order by the specified package version fields]' \
+ '(-v|--targetdevhubusername)'{-v,--targetdevhubusername}'[username or alias for the dev hub org; overrides default dev hub org]' \
+ '(--concise)--concise[display limited package version details]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ '(--verbose)--verbose[display extended package version details]' \
+ )
+ ;;
+ force:package1:version:list)
+ _command_args=(
+ '(-i|--packageid)'{-i,--packageid}'[metadata package ID (starts with 033)]' \
+ '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:package:version:promote)
+ _command_args=(
+ '(-p|--package)'{-p,--package}'[ID (starts with 04t) or alias of the package version to promote]' \
+ '(-n|--noprompt)'{-n,--noprompt}'[no prompt to confirm setting the package version as released]' \
+ '(-v|--targetdevhubusername)'{-v,--targetdevhubusername}'[username or alias for the dev hub org; overrides default dev hub org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:package:version:report)
+ _command_args=(
+ '(-p|--package)'{-p,--package}'[ID (starts with 04t) or alias of the package to retrieve details for]' \
+ '(-v|--targetdevhubusername)'{-v,--targetdevhubusername}'[username or alias for the dev hub org; overrides default dev hub org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ '(--verbose)--verbose[displays extended package version details]' \
+ )
+ ;;
+ force:package:version:update)
+ _command_args=(
+ '(-p|--package)'{-p,--package}'[ID (starts with 04t) or alias of the package to update a version of]' \
+ '(-a|--versionname)'{-a,--versionname}'[new package version name]' \
+ '(-e|--versiondescription)'{-e,--versiondescription}'[new package version description]' \
+ '(-b|--branch)'{-b,--branch}'[new package version branch]' \
+ '(-t|--tag)'{-t,--tag}'[new package version tag]' \
+ '(-k|--installationkey)'{-k,--installationkey}'[new installation key for key-protected package (default: null)]' \
+ '(-v|--targetdevhubusername)'{-v,--targetdevhubusername}'[username or alias for the dev hub org; overrides default dev hub org]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ force:auth:web:login)
+ _command_args=(
+ '(-i|--clientid)'{-i,--clientid}'[OAuth client ID (sometimes called the consumer key)]' \
+ '(-r|--instanceurl)'{-r,--instanceurl}'[the login URL of the instance the org lives on]' \
+ '(-d|--setdefaultdevhubusername)'{-d,--setdefaultdevhubusername}'[set the authenticated org as the default dev hub org for scratch org creation]' \
+ '(-s|--setdefaultusername)'{-s,--setdefaultusername}'[set the authenticated org as the default username that all commands run against]' \
+ '(-a|--setalias)'{-a,--setalias}'[set an alias for the authenticated org]' \
+ '(--disablemasking)--disablemasking[disable masking of user input (for use with problematic terminals)]' \
+ '(-p|--noprompt)'{-p,--noprompt}'[do not prompt for auth confirmation in demo mode]' \
+ '(--json)--json[format output as json]' \
+ '(--loglevel)--loglevel[logging level for this command invocation (error*,trace,debug,info,warn,fatal)]' \
+ )
+ ;;
+ esac
+
+_arguments \
+ $_command_args \
+ && return 0
-- 
cgit v1.2.3-70-g09d2


From 978b724c4aeef4113773e27e60fd20af12ca57b8 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Wed, 17 Apr 2019 17:23:54 +0200
Subject: kubectl: rename k alias (#7749)

This uses `ku` instead of `k` as an alias for kubectl.

Fixes #6408
---
 plugins/kubectl/README.md          | 2 +-
 plugins/kubectl/kubectl.plugin.zsh | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'plugins')

diff --git a/plugins/kubectl/README.md b/plugins/kubectl/README.md
index 3343f0195..9cd4a369e 100644
--- a/plugins/kubectl/README.md
+++ b/plugins/kubectl/README.md
@@ -13,7 +13,7 @@ plugins=(... kubectl)
 
 | Alias   | Command                             | Description                                                                                      |
 |:--------|:------------------------------------|:-------------------------------------------------------------------------------------------------|
-| k       | `kubectl`                           | The kubectl command                                                                              |
+| ku      | `kubectl`                           | The kubectl command                                                                              |
 | kca     | `kubectl --all-namespaces`          | The kubectl command targeting all namespaces                                                     |
 | kaf     | `kubectl apply -f`                  | Apply a YML file                                                                                 |
 | keti    | `kubectl exec -ti`                  | Drop into an interactive terminal on a container                                                 |
diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index ab7a1a0a4..9a4489fb6 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -10,8 +10,7 @@ if (( $+commands[kubectl] )); then
     unset __KUBECTL_COMPLETION_FILE
 fi
 
-# This command is used a LOT both below and in daily life
-alias k=kubectl
+alias ku=kubectl
 
 # Execute a kubectl command against all namespaces
 alias kca='f(){ kubectl "$@" --all-namespaces;  unset -f f; }; f'
-- 
cgit v1.2.3-70-g09d2


From ebd13b60c107f424b40438404c18c3e8dc03433c Mon Sep 17 00:00:00 2001
From: Francisco de Zuviría <franciscodezuviria@gmail.com>
Date: Mon, 22 Apr 2019 16:06:47 -0300
Subject: colorize: add ability to colorize multiple files into less (#7662)

cless is an alias for a colorized less wrappper: colorize_via_pygmentize_less.
Note that cless opens many files as independent files, navigatable with `:n` and `:p`.
---
 plugins/colorize/README.md           | 15 +++++++++++++--
 plugins/colorize/colorize.plugin.zsh | 23 ++++++++++++++++++++++-
 2 files changed, 35 insertions(+), 3 deletions(-)

(limited to 'plugins')

diff --git a/plugins/colorize/README.md b/plugins/colorize/README.md
index c006071f9..71fa87861 100644
--- a/plugins/colorize/README.md
+++ b/plugins/colorize/README.md
@@ -2,6 +2,10 @@
 
 With this plugin you can syntax-highlight file contents of over 300 supported languages and other text formats.
 
+Colorize will highlight the content based on the filename extension. If it can't find a syntax-highlighting
+method for a given extension, it will try to find one by looking at the file contents. If no highlight method
+is found it will just cat the file normally, without syntax highlighting.
+
 To use it, add colorize to the plugins array of your zshrc file:
 ```
 plugins=(... colorize)
@@ -9,9 +13,16 @@ plugins=(... colorize)
 
 ## Usage
 
-* `ccat <file> [files]`: colorize the contents of the file (or files, if more than one are provided). If no arguments are passed it will colorize the standard input or stdin.
+* `ccat  <file> [files]`: colorize the contents of the file (or files, if more than one are provided). 
+  If no arguments are passed it will colorize the standard input or stdin.
+
+* `cless <file> [files]`: colorize the contents of the file (or files, if more than one are provided) and
+  open less. If no arguments are passed it will colorize the standard input or stdin.
 
-Colorize will highlight the content based on the filename extension. If it can't find a syntax-highlighting method for a given extension, it will try to find one by looking at the file contents. If no highlight method is found it will just cat the file normally, without syntax highlighting.
+Note that `cless` will behave as less when provided more than one file: you have to navigate files with
+the commands `:n` for next and `:p` for previous. The downside is that less options are not supported.
+But you can circumvent this by either using the LESS environment variable, or by running `ccat file1 file2|less --opts`.
+In the latter form, the file contents will be concatenated and presented by less as a single file.
 
 ## Requirements
 
diff --git a/plugins/colorize/colorize.plugin.zsh b/plugins/colorize/colorize.plugin.zsh
index 8eede9a94..b8790f260 100644
--- a/plugins/colorize/colorize.plugin.zsh
+++ b/plugins/colorize/colorize.plugin.zsh
@@ -1,5 +1,6 @@
 # easier alias to use the plugin
 alias ccat='colorize_via_pygmentize'
+alias cless='colorize_via_pygmentize_less'  
 
 colorize_via_pygmentize() {
     if ! (( $+commands[pygmentize] )); then
@@ -16,7 +17,7 @@ colorize_via_pygmentize() {
     # guess lexer from file extension, or
     # guess it from file contents if unsuccessful
     local FNAME lexer
-    for FNAME in $@
+    for FNAME in "$@"
     do
         lexer=$(pygmentize -N "$FNAME")
         if [[ $lexer != text ]]; then
@@ -26,3 +27,23 @@ colorize_via_pygmentize() {
         fi
     done
 }
+
+colorize_via_pygmentize_less() (   
+    # this function is a subshell so tmp_files can be shared to cleanup function
+    declare -a tmp_files 
+    
+    cleanup () {
+        [[ ${#tmp_files} -gt 0 ]] && rm -f "${tmp_files[@]}"
+        exit
+    }
+    trap 'cleanup' EXIT HUP TERM INT
+    
+    while (( $# != 0 )); do     #TODO: filter out less opts
+        tmp_file="$(mktemp --tmpdir "tmp.colorize.XXXX.$(sed 's/\//./g' <<< "$1")")"
+        tmp_files+=("$tmp_file")
+        colorize_via_pygmentize "$1" > "$tmp_file"
+        shift 1
+    done
+
+    less -f "${tmp_files[@]}"
+)
-- 
cgit v1.2.3-70-g09d2


From adade64cda7af2bb2f23b95a57f91f7010aa0cb8 Mon Sep 17 00:00:00 2001
From: Ibrahim Almuqrin <ialmoqren@gmail.com>
Date: Thu, 25 Apr 2019 17:14:17 +0300
Subject: react-native: use new iOS simulator names (#7717)

The simulator names changed after updating to Xcode 10.2 (iOS 12.2 SDK)
I don't know how to prevent this change from affecting those who didn't update yet, but it worth noting that updating is now required in order to submit iOS apps to the App Store.
---
 plugins/react-native/README.md               | 28 ++++++++++++++--------------
 plugins/react-native/react-native.plugin.zsh |  6 +++---
 2 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'plugins')

diff --git a/plugins/react-native/README.md b/plugins/react-native/README.md
index 0cfaa36b4..2cf7d2d19 100644
--- a/plugins/react-native/README.md
+++ b/plugins/react-native/README.md
@@ -24,28 +24,28 @@ plugins=(... react-native)
 | **rnios5s**    | `react-native run-ios --simulator "iPhone 5s"`                               |
 | **rnios6**     | `react-native run-ios --simulator "iPhone 6"`                                |
 | **rnios6s**    | `react-native run-ios --simulator "iPhone 6s"`                               |
-| **rnios7**     | `react-native run-ios --simulator "iPhone7"`                                 |
+| **rnios7**     | `react-native run-ios --simulator "iPhone 7"`                                |
 | **rnios7p**    | `react-native run-ios --simulator "iPhone 7 Plus"`                           |
 | **rnios8**     | `react-native run-ios --simulator "iPhone 8"`                                |
 | **rnios8p**    | `react-native run-ios --simulator "iPhone 8 Plus"`                           |
 | **rniosse**    | `react-native run-ios --simulator "iPhone SE"`                               |
 | **rniosx**     | `react-native run-ios --simulator "iPhone X"`                                |
-| **rniosxs**    | `react-native run-ios --simulator "iPhone XS"`                               |
-| **rniosxsm**   | `react-native run-ios --simulator "iPhone XS Max"`                           |
-| **rniosxr**    | `react-native run-ios --simulator "iPhone XR"`                               |
+| **rniosxs**    | `react-native run-ios --simulator "iPhone Xs"`                               |
+| **rniosxsm**   | `react-native run-ios --simulator "iPhone Xs Max"`                           |
+| **rniosxr**    | `react-native run-ios --simulator "iPhone Xʀ"`                               |
 | _iPads_        |                                                                              |
 | **rnipad2**    | `react-native run-ios --simulator "iPad 2"`                                  |
 | **rnipadr**    | `react-native run-ios --simulator "iPad Retina"`                             |
-| **rnipada**    | 'react-native run-ios --simulator "iPad Air"'                                |
-| **rnipada2**   | 'react-native run-ios --simulator "iPad Air 2"'                              |
-| **rnipad5**    | 'react-native run-ios --simulator "iPad (5th generation)"'                   |
-| **rnipad9**    | 'react-native run-ios --simulator "iPad Pro (9.7-inch)"'                     |
-| **rnipad12**   | 'react-native run-ios --simulator "iPad Pro (12.9-inch)"'                    |
-| **rnipad122**  | 'react-native run-ios --simulator "iPad Pro (12.9-inch) (2nd generation)"'   |
-| **rnipad10**   | 'react-native run-ios --simulator "iPad Pro (10.5-inch)"'                    |
-| **rnipad6**    | 'react-native run-ios --simulator "iPad Pro (6th generation)"'               |
-| **rnipad11**   | 'react-native run-ios --simulator "iPad Pro (11-inch)"'                      |
-| **rnipad123**  | 'react-native run-ios --simulator "iPad Pro (12.9-inch) (3rd generation)"'   |
+| **rnipada**    | `react-native run-ios --simulator "iPad Air"`                                |
+| **rnipada2**   | `react-native run-ios --simulator "iPad Air 2"`                              |
+| **rnipad5**    | `react-native run-ios --simulator "iPad (5th generation)"`                   |
+| **rnipad9**    | `react-native run-ios --simulator "iPad Pro (9.7-inch)"`                     |
+| **rnipad12**   | `react-native run-ios --simulator "iPad Pro (12.9-inch)"`                    |
+| **rnipad122**  | `react-native run-ios --simulator "iPad Pro (12.9-inch) (2nd generation)"`   |
+| **rnipad10**   | `react-native run-ios --simulator "iPad Pro (10.5-inch)"`                    |
+| **rnipad6**    | `react-native run-ios --simulator "iPad Pro (6th generation)"`               |
+| **rnipad11**   | `react-native run-ios --simulator "iPad Pro (11-inch)"`                      |
+| **rnipad123**  | `react-native run-ios --simulator "iPad Pro (12.9-inch) (3rd generation)"`   |
 | _Apple TVs_    |                                                                              |
 | **rnatv**      | `react-native run-ios --simulator "Apple TV"`                                |
 | **rnatv4k**    | `react-native run-ios --simulator "Apple TV 4K"`                             |
diff --git a/plugins/react-native/react-native.plugin.zsh b/plugins/react-native/react-native.plugin.zsh
index a4092a694..f3ef09124 100644
--- a/plugins/react-native/react-native.plugin.zsh
+++ b/plugins/react-native/react-native.plugin.zsh
@@ -15,9 +15,9 @@ alias rnios8='react-native run-ios --simulator "iPhone 8"'
 alias rnios8p='react-native run-ios --simulator "iPhone 8 Plus"'
 alias rniosse='react-native run-ios --simulator "iPhone SE"'
 alias rniosx='react-native run-ios --simulator "iPhone X"'
-alias rniosxs='react-native run-ios --simulator "iPhone XS"'
-alias rniosxsm='react-native run-ios --simulator "iPhone XS Max"'
-alias rniosxr='react-native run-ios --simulator "iPhone XR"'
+alias rniosxs='react-native run-ios --simulator "iPhone Xs"'
+alias rniosxsm='react-native run-ios --simulator "iPhone Xs Max"'
+alias rniosxr='react-native run-ios --simulator "iPhone Xʀ"'
 
 alias rnipad2='react-native run-ios --simulator "iPad 2"'
 alias rnipadr='react-native run-ios --simulator "iPad Retina"'
-- 
cgit v1.2.3-70-g09d2


From 2433ee819416665d3f205e22cfacd98154d5c2f2 Mon Sep 17 00:00:00 2001
From: Mohammed Abd El-Ra'ouf <Mohammed.Raouf.M@Gmail.com>
Date: Fri, 26 Apr 2019 16:49:31 +0200
Subject: react-native: add simulator aliases according to latest Xcode update
 (#7792)

---
 plugins/react-native/README.md               | 42 ++++++++++++++++++++--------
 plugins/react-native/react-native.plugin.zsh | 38 +++++++++++++++++++------
 2 files changed, 59 insertions(+), 21 deletions(-)

(limited to 'plugins')

diff --git a/plugins/react-native/README.md b/plugins/react-native/README.md
index 2cf7d2d19..dc0207184 100644
--- a/plugins/react-native/README.md
+++ b/plugins/react-native/README.md
@@ -16,14 +16,20 @@ plugins=(... react-native)
 | **rn**         | `react-native`                                                               |
 | **rns**        | `react-native start`                                                         |
 | **rnlink**     | `react-native link`                                                          |
-| _App testing_  |
+| _Logging_      |                                                                              |
+| **rnland**     | `react-native log-android`                                                   |
+| **rnlios**     | `react-native log-ios`                                                       |
+| _App Testing_  |                                                                              |
 | **rnand**      | `react-native run-android`                                                   |
 | **rnios**      | `react-native run-ios`                                                       |
+| _iPhone_       |                                                                              |
 | **rnios4s**    | `react-native run-ios --simulator "iPhone 4s"`                               |
 | **rnios5**     | `react-native run-ios --simulator "iPhone 5"`                                |
 | **rnios5s**    | `react-native run-ios --simulator "iPhone 5s"`                               |
 | **rnios6**     | `react-native run-ios --simulator "iPhone 6"`                                |
 | **rnios6s**    | `react-native run-ios --simulator "iPhone 6s"`                               |
+| **rnios6p**    | `react-native run-ios --simulator "iPhone 6 Plus"`                           |
+| **rnios6sp**   | `react-native run-ios --simulator "iPhone 6s Plus"`                          |
 | **rnios7**     | `react-native run-ios --simulator "iPhone 7"`                                |
 | **rnios7p**    | `react-native run-ios --simulator "iPhone 7 Plus"`                           |
 | **rnios8**     | `react-native run-ios --simulator "iPhone 8"`                                |
@@ -33,23 +39,35 @@ plugins=(... react-native)
 | **rniosxs**    | `react-native run-ios --simulator "iPhone Xs"`                               |
 | **rniosxsm**   | `react-native run-ios --simulator "iPhone Xs Max"`                           |
 | **rniosxr**    | `react-native run-ios --simulator "iPhone Xʀ"`                               |
-| _iPads_        |                                                                              |
+| _iPad_         |                                                                              |
 | **rnipad2**    | `react-native run-ios --simulator "iPad 2"`                                  |
+| **rnipad5**    | `react-native run-ios --simulator "iPad (5th generation)"`                   |
+| **rnipad6**    | `react-native run-ios --simulator "iPad (6th generation)"`                   |
 | **rnipadr**    | `react-native run-ios --simulator "iPad Retina"`                             |
 | **rnipada**    | `react-native run-ios --simulator "iPad Air"`                                |
 | **rnipada2**   | `react-native run-ios --simulator "iPad Air 2"`                              |
-| **rnipad5**    | `react-native run-ios --simulator "iPad (5th generation)"`                   |
-| **rnipad9**    | `react-native run-ios --simulator "iPad Pro (9.7-inch)"`                     |
-| **rnipad12**   | `react-native run-ios --simulator "iPad Pro (12.9-inch)"`                    |
-| **rnipad122**  | `react-native run-ios --simulator "iPad Pro (12.9-inch) (2nd generation)"`   |
-| **rnipad10**   | `react-native run-ios --simulator "iPad Pro (10.5-inch)"`                    |
-| **rnipad6**    | `react-native run-ios --simulator "iPad Pro (6th generation)"`               |
+| **rnipada3**   | `react-native run-ios --simulator "iPad Air (3rd generation)"`               |
+| **rnipadm2**   | `react-native run-ios --simulator "iPad mini 2"`                             |
+| **rnipadm3**   | `react-native run-ios --simulator "iPad mini 3"`                             |
+| **rnipadm4**   | `react-native run-ios --simulator "iPad mini 4"`                             |
+| **rnipadm5**   | `react-native run-ios --simulator "iPad mini (5th generation)"`              |
+| **rnipadp9**   | `react-native run-ios --simulator "iPad Pro (9.7-inch)"`                     |
+| **rnipadp12**  | `react-native run-ios --simulator "iPad Pro (12.9-inch)"`                    |
+| **rnipadp122** | `react-native run-ios --simulator "iPad Pro (12.9-inch) (2nd generation)"`   |
+| **rnipadp10**  | `react-native run-ios --simulator "iPad Pro (10.5-inch)"`                    |
 | **rnipad11**   | `react-native run-ios --simulator "iPad Pro (11-inch)"`                      |
 | **rnipad123**  | `react-native run-ios --simulator "iPad Pro (12.9-inch) (3rd generation)"`   |
-| _Apple TVs_    |                                                                              |
+| _Apple TV_     |                                                                              |
 | **rnatv**      | `react-native run-ios --simulator "Apple TV"`                                |
 | **rnatv4k**    | `react-native run-ios --simulator "Apple TV 4K"`                             |
 | **rnatv4k1080**| `react-native run-ios --simulator "Apple TV 4K (at 1080p)"`                  |
-| _Logging_      |
-| **rnland**     | `react-native log-android`                                                   |
-| **rnlios**     | `react-native log-ios`                                                       |
+| **rnipad123**  | `react-native run-ios --simulator "iPad Pro (12.9-inch) (3rd generation)"`   |
+| _Apple Watch_  |                                                                              |
+| **rnaw38**     | `react-native run-ios --simulator "Apple Watch - 38mm"`                      |
+| **rnaw42**     | `react-native run-ios --simulator "Apple Watch - 42mm"`                      |
+| **rnaws238**   | `react-native run-ios --simulator "Apple Watch Series 2 - 38mm"`             |
+| **rnaws242**   | `react-native run-ios --simulator "Apple Watch Series 2 - 42mm"`             |
+| **rnaws338**   | `react-native run-ios --simulator "Apple Watch Series 3 - 38mm"`             |
+| **rnaws342**   | `react-native run-ios --simulator "Apple Watch Series 3 - 42mm"`             |
+| **rnaws440**   | `react-native run-ios --simulator "Apple Watch Series 4 - 40mm"`             |
+| **rnaws444**   | `react-native run-ios --simulator "Apple Watch Series 4 - 44mm"`             |
diff --git a/plugins/react-native/react-native.plugin.zsh b/plugins/react-native/react-native.plugin.zsh
index f3ef09124..f7695d15f 100644
--- a/plugins/react-native/react-native.plugin.zsh
+++ b/plugins/react-native/react-native.plugin.zsh
@@ -1,14 +1,20 @@
+# React Native
 alias rn='react-native'
 alias rns='react-native start'
 alias rnlink='react-native link'
-
+alias rnland='react-native log-android'
+alias rnlios='react-native log-ios'
 alias rnand='react-native run-android'
 alias rnios='react-native run-ios'
+
+# iPhone
 alias rnios4s='react-native run-ios --simulator "iPhone 4s"'
 alias rnios5='react-native run-ios --simulator "iPhone 5"'
 alias rnios5s='react-native run-ios --simulator "iPhone 5s"'
 alias rnios6='react-native run-ios --simulator "iPhone 6"'
+alias rnios6p='react-native run-ios --simulator "iPhone 6 Plus"'
 alias rnios6s='react-native run-ios --simulator "iPhone 6s"'
+alias rnios6sp='react-native run-ios --simulator "iPhone 6s Plus"'
 alias rnios7='react-native run-ios --simulator "iPhone 7"'
 alias rnios7p='react-native run-ios --simulator "iPhone 7 Plus"'
 alias rnios8='react-native run-ios --simulator "iPhone 8"'
@@ -19,22 +25,36 @@ alias rniosxs='react-native run-ios --simulator "iPhone Xs"'
 alias rniosxsm='react-native run-ios --simulator "iPhone Xs Max"'
 alias rniosxr='react-native run-ios --simulator "iPhone Xʀ"'
 
+# iPad
 alias rnipad2='react-native run-ios --simulator "iPad 2"'
+alias rnipad5='react-native run-ios --simulator "iPad (5th generation)"'
+alias rnipad6='react-native run-ios --simulator "iPad (6th generation)"'
 alias rnipadr='react-native run-ios --simulator "iPad Retina"'
 alias rnipada='react-native run-ios --simulator "iPad Air"'
 alias rnipada2='react-native run-ios --simulator "iPad Air 2"'
-alias rnipad5='react-native run-ios --simulator "iPad (5th generation)"'
-alias rnipad9='react-native run-ios --simulator "iPad Pro (9.7-inch)"'
-alias rnipad12='react-native run-ios --simulator "iPad Pro (12.9-inch)"'
-alias rnipad122='react-native run-ios --simulator "iPad Pro (12.9-inch) (2nd generation)"'
-alias rnipad10='react-native run-ios --simulator "iPad Pro (10.5-inch)"'
-alias rnipad6='react-native run-ios --simulator "iPad Pro (6th generation)"'
+alias rnipada3='react-native run-ios --simulator "iPad Air (3rd generation)"'
+alias rnipadm2='react-native run-ios --simulator "iPad mini 2"'
+alias rnipadm3='react-native run-ios --simulator "iPad mini 3"'
+alias rnipadm4='react-native run-ios --simulator "iPad mini 4"'
+alias rnipadm5='react-native run-ios --simulator "iPad mini (5th generation)"'
+alias rnipadp9='react-native run-ios --simulator "iPad Pro (9.7-inch)"'
+alias rnipadp12='react-native run-ios --simulator "iPad Pro (12.9-inch)"'
+alias rnipadp122='react-native run-ios --simulator "iPad Pro (12.9-inch) (2nd generation)"'
+alias rnipadp10='react-native run-ios --simulator "iPad Pro (10.5-inch)"'
 alias rnipad11='react-native run-ios --simulator "iPad Pro (11-inch)"'
 alias rnipad123='react-native run-ios --simulator "iPad Pro (12.9-inch) (3rd generation)"'
 
+# Apple TV
 alias rnatv='react-native run-ios --simulator "Apple TV"'
 alias rnatv4k='react-native run-ios --simulator "Apple TV 4K"'
 alias rnatv4k1080='react-native run-ios --simulator "Apple TV 4K (at 1080p)"'
 
-alias rnland='react-native log-android'
-alias rnlios='react-native log-ios'
+# Apple Watch
+alias rnaw38='react-native run-ios --simulator "Apple Watch - 38mm"'
+alias rnaw42='react-native run-ios --simulator "Apple Watch - 42mm"'
+alias rnaws238='react-native run-ios --simulator "Apple Watch Series 2 - 38mm"'
+alias rnaws242='react-native run-ios --simulator "Apple Watch Series 2 - 42mm"'
+alias rnaws338='react-native run-ios --simulator "Apple Watch Series 3 - 38mm"'
+alias rnaws342='react-native run-ios --simulator "Apple Watch Series 3 - 42mm"'
+alias rnaws440='react-native run-ios --simulator "Apple Watch Series 4 - 40mm"'
+alias rnaws444='react-native run-ios --simulator "Apple Watch Series 4 - 44mm"'
-- 
cgit v1.2.3-70-g09d2


From c7154e88396fec404edfc8b03899949a2ce284ba Mon Sep 17 00:00:00 2001
From: Jay Schwerberg <jason@schwerberg.com>
Date: Tue, 5 Mar 2019 22:34:12 -0800
Subject: Add pygments style env var for colorized

---
 plugins/colorize/colorize.plugin.zsh | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

(limited to 'plugins')

diff --git a/plugins/colorize/colorize.plugin.zsh b/plugins/colorize/colorize.plugin.zsh
index b8790f260..4e383867a 100644
--- a/plugins/colorize/colorize.plugin.zsh
+++ b/plugins/colorize/colorize.plugin.zsh
@@ -1,6 +1,6 @@
 # easier alias to use the plugin
 alias ccat='colorize_via_pygmentize'
-alias cless='colorize_via_pygmentize_less'  
+alias cless='colorize_via_pygmentize_less'
 
 colorize_via_pygmentize() {
     if ! (( $+commands[pygmentize] )); then
@@ -8,36 +8,44 @@ colorize_via_pygmentize() {
         return 1
     fi
 
+    # If the environment varianle ZSH_COLORIZE_STYLE
+    # is set, use that theme instead. Otherwise,
+    # use the default.
+    if [ -z $ZSH_COLORIZE_STYLE ]; then
+        ZSH_COLORIZE_STYLE="default"
+    fi
+
     # pygmentize stdin if no arguments passed
     if [ $# -eq 0 ]; then
-        pygmentize -g
+        pygmentize -O style="$ZSH_COLORIZE_STYLE" -g
         return $?
     fi
 
     # guess lexer from file extension, or
     # guess it from file contents if unsuccessful
+
     local FNAME lexer
     for FNAME in "$@"
     do
         lexer=$(pygmentize -N "$FNAME")
         if [[ $lexer != text ]]; then
-            pygmentize -l "$lexer" "$FNAME"
+            pygmentize -O style="$ZSH_COLORIZE_STYLE" -l "$lexer" "$FNAME"
         else
-            pygmentize -g "$FNAME"
+            pygmentize -O style="$ZSH_COLORIZE_STYLE" -g "$FNAME"
         fi
     done
 }
 
-colorize_via_pygmentize_less() (   
+colorize_via_pygmentize_less() (
     # this function is a subshell so tmp_files can be shared to cleanup function
     declare -a tmp_files 
-    
+
     cleanup () {
         [[ ${#tmp_files} -gt 0 ]] && rm -f "${tmp_files[@]}"
         exit
     }
     trap 'cleanup' EXIT HUP TERM INT
-    
+
     while (( $# != 0 )); do     #TODO: filter out less opts
         tmp_file="$(mktemp --tmpdir "tmp.colorize.XXXX.$(sed 's/\//./g' <<< "$1")")"
         tmp_files+=("$tmp_file")
-- 
cgit v1.2.3-70-g09d2


From a46798b7903dab20adf48bcad7eb69de2c8ed8a7 Mon Sep 17 00:00:00 2001
From: Jay Schwerberg <jason@schwerberg.com>
Date: Tue, 5 Mar 2019 22:34:31 -0800
Subject: Update colorize README.md with env var details

---
 plugins/colorize/README.md | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'plugins')

diff --git a/plugins/colorize/README.md b/plugins/colorize/README.md
index 71fa87861..d1f878e62 100644
--- a/plugins/colorize/README.md
+++ b/plugins/colorize/README.md
@@ -11,6 +11,12 @@ To use it, add colorize to the plugins array of your zshrc file:
 plugins=(... colorize)
 ```
 
+## Styles
+
+Pygments offers multiple styles. By default, the `default` style is used, but you can choose another theme by setting the `ZSH_COLORIZE_STYLE` environment variable:
+
+`ZSH_COLORIZE_STYLE="colorful"`
+
 ## Usage
 
 * `ccat  <file> [files]`: colorize the contents of the file (or files, if more than one are provided). 
-- 
cgit v1.2.3-70-g09d2


From d16adb6a9f9b0ea46121f48751a012f0511b465b Mon Sep 17 00:00:00 2001
From: dorons <doron.segev@gmail.com>
Date: Mon, 29 Apr 2019 12:42:36 +0300
Subject: aws: fix path resolution of aws completion for Ubuntu (#7812)

---
 plugins/aws/aws.plugin.zsh | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'plugins')

diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index 0895cfb3a..4bec30490 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -67,11 +67,18 @@ _awscli-homebrew-installed() {
 # get aws_zsh_completer.sh location from $PATH
 _aws_zsh_completer_path="$commands[aws_zsh_completer.sh]"
 
-# otherwise check if installed via Homebrew
-if [[ -z $_aws_zsh_completer_path ]] && _awscli-homebrew-installed; then
-  _aws_zsh_completer_path=$_brew_prefix/libexec/bin/aws_zsh_completer.sh
-else
-  _aws_zsh_completer_path=/usr/share/zsh/site-functions/aws_zsh_completer.sh
+# otherwise check common locations
+if [[ -z $_aws_zsh_completer_path ]]; then
+  # Homebrew
+  if _awscli-homebrew-installed; then
+    _aws_zsh_completer_path=$_brew_prefix/libexec/bin/aws_zsh_completer.sh
+  # Ubuntu
+  elif [[ -e /usr/share/zsh/vendor-completions/_awscli ]]; then
+    _aws_zsh_completer_path=/usr/share/zsh/vendor-completions/_awscli
+  # RPM
+  else
+    _aws_zsh_completer_path=/usr/share/zsh/site-functions/aws_zsh_completer.sh
+  fi
 fi
 
 [[ -r $_aws_zsh_completer_path ]] && source $_aws_zsh_completer_path
-- 
cgit v1.2.3-70-g09d2


From 6da85279eb544c48e85a3714e6fe65f72fd78071 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Mon, 29 Apr 2019 15:48:24 +0200
Subject: Revert "kubectl: rename k alias" (#7817)

This reverts commit 978b724c4aeef4113773e27e60fd20af12ca57b8 (#7749)

See https://github.com/robbyrussell/oh-my-zsh/issues/6408#issuecomment-485718042 and later comments.
---
 plugins/kubectl/README.md          | 2 +-
 plugins/kubectl/kubectl.plugin.zsh | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/kubectl/README.md b/plugins/kubectl/README.md
index 9cd4a369e..3343f0195 100644
--- a/plugins/kubectl/README.md
+++ b/plugins/kubectl/README.md
@@ -13,7 +13,7 @@ plugins=(... kubectl)
 
 | Alias   | Command                             | Description                                                                                      |
 |:--------|:------------------------------------|:-------------------------------------------------------------------------------------------------|
-| ku      | `kubectl`                           | The kubectl command                                                                              |
+| k       | `kubectl`                           | The kubectl command                                                                              |
 | kca     | `kubectl --all-namespaces`          | The kubectl command targeting all namespaces                                                     |
 | kaf     | `kubectl apply -f`                  | Apply a YML file                                                                                 |
 | keti    | `kubectl exec -ti`                  | Drop into an interactive terminal on a container                                                 |
diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index 9a4489fb6..ab7a1a0a4 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -10,7 +10,8 @@ if (( $+commands[kubectl] )); then
     unset __KUBECTL_COMPLETION_FILE
 fi
 
-alias ku=kubectl
+# This command is used a LOT both below and in daily life
+alias k=kubectl
 
 # Execute a kubectl command against all namespaces
 alias kca='f(){ kubectl "$@" --all-namespaces;  unset -f f; }; f'
-- 
cgit v1.2.3-70-g09d2


From 56610be1989011fc7a5e84d27a811ca8feb646ff Mon Sep 17 00:00:00 2001
From: danhimalplanet <danhimalplanet@users.noreply.github.com>
Date: Mon, 29 Apr 2019 11:51:29 -0700
Subject: colorize: fix mktemp parameter for compatibility (#7789)

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

(limited to 'plugins')

diff --git a/plugins/colorize/colorize.plugin.zsh b/plugins/colorize/colorize.plugin.zsh
index b8790f260..bec9a2ac6 100644
--- a/plugins/colorize/colorize.plugin.zsh
+++ b/plugins/colorize/colorize.plugin.zsh
@@ -39,7 +39,7 @@ colorize_via_pygmentize_less() (
     trap 'cleanup' EXIT HUP TERM INT
     
     while (( $# != 0 )); do     #TODO: filter out less opts
-        tmp_file="$(mktemp --tmpdir "tmp.colorize.XXXX.$(sed 's/\//./g' <<< "$1")")"
+        tmp_file="$(mktemp -t "tmp.colorize.XXXX.$(sed 's/\//./g' <<< "$1")")"
         tmp_files+=("$tmp_file")
         colorize_via_pygmentize "$1" > "$tmp_file"
         shift 1
-- 
cgit v1.2.3-70-g09d2


From 4eae0549fd7e8a6d35c5627356098380b6b9ef82 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Mon, 29 Apr 2019 21:08:26 +0200
Subject: per-directory-history: redo README for Oh My Zsh

Closes #7726
---
 plugins/per-directory-history/README.md | 71 +++++++++++++++------------------
 1 file changed, 32 insertions(+), 39 deletions(-)

(limited to 'plugins')

diff --git a/plugins/per-directory-history/README.md b/plugins/per-directory-history/README.md
index ea445d329..69854aa38 100644
--- a/plugins/per-directory-history/README.md
+++ b/plugins/per-directory-history/README.md
@@ -1,55 +1,48 @@
-[Per-Directory-History][6]
-=========================
+per-directory-history plugin
+----------------------------
 
-Per directory history for zsh, as well as global history, and the
-ability to toggle between them with ^G.
+This plugin adds per-directory history for zsh, as well as a global history,
+and the ability to toggle between them with a keyboard shortcut. This is a
+bundle of the [official plugin by @jimhester][5].
 
-This is a implementation of per directory history for zsh, some
-implementations of which exist in bash[1][],[2][].  It also implements
-a per-directory-history-toggle-history function to change from using the
-directory history to using the global history.  In both cases the history is
-always saved to both the global history and the directory history, so the
-toggle state will not effect the saved histories.  Being able to switch
-between global and directory histories on the fly is a novel feature as far
-as I am aware.
+To use it, add `per-directory-history` to the plugins array in your zshrc file:
 
-This is a standalone repository for the script, however it is also included in
-[oh-my-zsh][4] as a plugin.
+```zsh
+plugins=(... per-directory-history)
+```
 
-----------------------------------------------------------------------------
-Usage
-----------------------------------------------------------------------------
+This is an implementation of per-directory history for zsh, some implementations
+of which exist in bash[1][],[2][]. It also implements a toggle-history function
+to change from using the directory history to using the global history. In both
+cases the history is always saved to both the global history and the directory
+history, so the toggle state will not effect the saved histories. Being able to
+switch between global and directory histories on the fly is a novel feature.
 
-1.  Load this script into your interactive ZSH session:
+## Usage
 
-        % source zsh-per-directory-history.zsh
+The default mode is per directory history, interact with your history as normal.
 
-2.  The default mode if per directory history, interact with your history as normal.
+Press ^G (the <kbd>Control</kbd> and <kbd>G</kbd> keys simultaneously) to toggle
+between local and global histories. If you would prefer a different shortcut to
+toggle set the `PER_DIRECTORY_HISTORY_TOGGLE` environment variable.
 
-3.  Press ^G (the Control and G keys simultaneously) to toggle between local
-    and global histories.  If you would prefer a different shortcut to toggle
-    set the PER_DIRECTORY_HISTORY_TOGGLE environment variable.
+## Configuration
 
--------------------------------------------------------------------------------
-Configuration
--------------------------------------------------------------------------------
+* `HISTORY_BASE` is a global variable that defines the base directory in which the
+  directory histories are stored (default `$HOME/.directory_history`).
+* `per-directory-history-toggle-history` is the function to toggle between local
+  and global histories.
+* `PER_DIRECTORY_HISTORY_TOGGLE` is the key binding used to run the toggle-history
+  function above (default `^G`)
 
-* HISTORY_BASE a global variable that defines the base directory in which the
-  directory histories are stored
-* per-directory-history-toggle-history is the function to toggle the history
-
--------------------------------------------------------------------------------
-History
--------------------------------------------------------------------------------
+## History
 
 The idea/inspiration for a per directory history is from [Stewart MacArthur][1]
-and [Dieter][2], the implementation idea is from [Bart Schaefer][3].  The
-implementation is by [Jim Hester][5] in September 2012.
+and [Dieter][2], the implementation idea is from [Bart Schaefer][3]. The
+implementation is by [Jim Hester][4] in September 2012.
 
 [1]: http://www.compbiome.com/2010/07/bash-per-directory-bash-history.html
 [2]: http://dieter.plaetinck.be/per_directory_bash
 [3]: https://www.zsh.org/mla/users/1997/msg00226.html
-[4]: https://github.com/robbyrussell/oh-my-zsh
-[5]: http://jimhester.com
-[6]: https://github.com/jimhester/per-directory-history
-
+[4]: https://jimhester.com
+[5]: https://github.com/jimhester/per-directory-history
-- 
cgit v1.2.3-70-g09d2


From 55f20fed6e34e6651816888ea823b61de2fedbcb Mon Sep 17 00:00:00 2001
From: Israel Rodrigo Faria <israel.faria@gmail.com>
Date: Wed, 1 May 2019 11:10:31 -0300
Subject: hub: update completion to 2019-02-21 (819aa96) (#7821)

---
 plugins/github/_hub | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/github/_hub b/plugins/github/_hub
index 1833a9c09..209a3df9e 100644
--- a/plugins/github/_hub
+++ b/plugins/github/_hub
@@ -58,6 +58,7 @@ __hub_setup_zsh_fns () {
       - set1 \
         '-m[message]' \
         '-F[file]' \
+        '--no-edit[use first commit message for pull request title/description]' \
         '-a[user]' \
         '-M[milestone]' \
         '-l[labels]' \
@@ -84,11 +85,15 @@ __hub_setup_zsh_fns () {
     hub_commands=(
       alias:'show shell instructions for wrapping git'
       pull-request:'open a pull request on GitHub'
+      pr:'list or checkout a GitHub pull request'
+      issue:'list or create a GitHub issue'
+      release:'list or create a GitHub release'
       fork:'fork origin repo on GitHub'
       create:'create new repo on GitHub for the current project'
+      delete:'delete a GitHub repo'
       browse:'browse the project on GitHub'
       compare:'open GitHub compare view'
-      ci-status:'lookup commit in GitHub Status API'
+      ci-status:'show status of GitHub checks for a commit'
       sync:'update local branches from upstream'
     )
     _describe -t hub-commands 'hub command' hub_commands && ret=0
@@ -111,8 +116,12 @@ __hub_setup_bash_fns () {
     cat <<-EOF
 alias
 pull-request
+pr
+issue
+release
 fork
 create
+delete
 browse
 compare
 ci-status
-- 
cgit v1.2.3-70-g09d2


From d0e4319a703ab6d1e56a8f615a8d202d3a3753fd Mon Sep 17 00:00:00 2001
From: j-griffith <john.griffith8@gmail.com>
Date: Fri, 3 May 2019 13:22:18 -0600
Subject: Add PersistentVolumeClaim support to kubectl plugin

Just add aliases for PVC actions.
---
 plugins/kubectl/README.md          | 6 ++++++
 plugins/kubectl/kubectl.plugin.zsh | 8 ++++++++
 2 files changed, 14 insertions(+)

(limited to 'plugins')

diff --git a/plugins/kubectl/README.md b/plugins/kubectl/README.md
index 3343f0195..29dc28d5f 100644
--- a/plugins/kubectl/README.md
+++ b/plugins/kubectl/README.md
@@ -89,3 +89,9 @@ plugins=(... kubectl)
 | keno    | `kubectl edit node`                 | Edit nodes resource from the default editor                                                      |
 | kdno    | `kubectl describe node`             | Describe node resource in detail                                                                 |
 | kdelno  | `kubectl delete node`               | Delete the node                                                                                  |
+|         |                                   | **Persistent Volume Claim management**                                                           |
+| kgpvc   | `kubectl get pvc`                   | List all PVCs                                                                                    |
+| kgpvcw  | `kgpvc --watch`                     | After listing/getting the requested object, watch for changes                                    |
+| kepvc   | `kubectl edit pvc`                  | Edit pvcs from the default editor                                                                |
+| kdpvc   | `kubectl describe pvc`              | Descirbe all pvcs                                                                                |
+| kdelpvc | `kubectl delete pvc`                | Delete all pvcs matching passed arguments                                                        |
diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index ab7a1a0a4..31c87ff82 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -112,3 +112,11 @@ alias kgno='kubectl get nodes'
 alias keno='kubectl edit node'
 alias kdno='kubectl describe node'
 alias kdelno='kubectl delete node'
+
+# PVC management.
+alias kgpvc='kubectl get pvc'
+alias kgpvcw='kgpvc --watch'
+alias kepvc='kubectl edit pvc'
+alias kdpvc='kubectl describe pvc'
+alias kdelpvc='kubectl delete pvc'
+
-- 
cgit v1.2.3-70-g09d2


From cfe2263f4cf9775466dddc128e7502de582f18da Mon Sep 17 00:00:00 2001
From: div_bhasin <divbest99@gmail.com>
Date: Sat, 4 May 2019 16:17:28 -0400
Subject: updated search URL for angular

---
 plugins/frontend-search/README.md                  | 2 +-
 plugins/frontend-search/frontend-search.plugin.zsh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'plugins')

diff --git a/plugins/frontend-search/README.md b/plugins/frontend-search/README.md
index f06e79102..d77a4210d 100644
--- a/plugins/frontend-search/README.md
+++ b/plugins/frontend-search/README.md
@@ -32,7 +32,7 @@ Available search contexts are:
 
 | context       | URL                                                                      |
 |---------------|--------------------------------------------------------------------------|
-| angularjs     | `https://google.com/search?as_sitesearch=angularjs.org&as_q=`            |
+| angularjs     | `https://angular.io/?search=`                                             |
 | aurajs        | `http://aurajs.com/api/#stq=`                                            |
 | bem           | `https://google.com/search?as_sitesearch=bem.info&as_q=`                 |
 | bootsnipp     | `https://bootsnipp.com/search?q=`                                         |
diff --git a/plugins/frontend-search/frontend-search.plugin.zsh b/plugins/frontend-search/frontend-search.plugin.zsh
index 14877fb0d..fe57a43d7 100644
--- a/plugins/frontend-search/frontend-search.plugin.zsh
+++ b/plugins/frontend-search/frontend-search.plugin.zsh
@@ -26,7 +26,7 @@ function frontend() {
   # define search context URLS
   typeset -A urls
   urls=(
-    angularjs      'https://google.com/search?as_sitesearch=angularjs.org&as_q='
+    angularjs      'https://angular.io/?search='
     aurajs         'http://aurajs.com/api/#stq='
     bem            'https://google.com/search?as_sitesearch=bem.info&as_q='
     bootsnipp      'https://bootsnipp.com/search?q='
@@ -53,7 +53,7 @@ function frontend() {
   if [[ $# -lt 2 ]]
   then
       print -P "Usage: frontend %Ucontext%u %Uterm%u [...%Umore%u] (or just: %Ucontext%u %Uterm%u [...%Umore%u])"
-      print -P ""
+      print -P "sample"
       print -P "%Uterm%u and what follows is what will be searched for in the %Ucontext%u website,"
       print -P "and %Ucontext%u is one of the following:"
       print -P ""
-- 
cgit v1.2.3-70-g09d2


From bcd41006259d88b9785e2cc7740d95545c6e07e3 Mon Sep 17 00:00:00 2001
From: div_bhasin <divbest99@gmail.com>
Date: Sat, 4 May 2019 16:42:06 -0400
Subject: convert + to %20 encoding

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

(limited to 'plugins')

diff --git a/plugins/frontend-search/frontend-search.plugin.zsh b/plugins/frontend-search/frontend-search.plugin.zsh
index fe57a43d7..cad692ec4 100644
--- a/plugins/frontend-search/frontend-search.plugin.zsh
+++ b/plugins/frontend-search/frontend-search.plugin.zsh
@@ -53,7 +53,7 @@ function frontend() {
   if [[ $# -lt 2 ]]
   then
       print -P "Usage: frontend %Ucontext%u %Uterm%u [...%Umore%u] (or just: %Ucontext%u %Uterm%u [...%Umore%u])"
-      print -P "sample"
+      print -P ""
       print -P "%Uterm%u and what follows is what will be searched for in the %Ucontext%u website,"
       print -P "and %Ucontext%u is one of the following:"
       print -P ""
@@ -83,7 +83,7 @@ function frontend() {
   # build search url:
   # join arguments passed with '+', then append to search context URL
   # TODO substitute for proper urlencode method
-  url="${urls[$1]}${(j:+:)@[2,-1]}"
+  url="${urls[$1]}${(j:%20:)@[2,-1]}"
 
   echo "Opening $url ..."
 
-- 
cgit v1.2.3-70-g09d2


From b3498d110e4dca90f00ce325b4f48835b27ed5da Mon Sep 17 00:00:00 2001
From: div_bhasin <divbest99@gmail.com>
Date: Sun, 5 May 2019 22:17:45 -0400
Subject: Extracted angularjs to its own context for users who still use
 Angular <= 2

---
 plugins/frontend-search/README.md                  | 3 ++-
 plugins/frontend-search/_frontend-search.sh        | 6 +++++-
 plugins/frontend-search/frontend-search.plugin.zsh | 7 ++++---
 3 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'plugins')

diff --git a/plugins/frontend-search/README.md b/plugins/frontend-search/README.md
index d77a4210d..24f82b262 100644
--- a/plugins/frontend-search/README.md
+++ b/plugins/frontend-search/README.md
@@ -32,7 +32,8 @@ Available search contexts are:
 
 | context       | URL                                                                      |
 |---------------|--------------------------------------------------------------------------|
-| angularjs     | `https://angular.io/?search=`                                             |
+| angular(>=2.0)| `https://angular.io/?search=`                                             |
+| angularjs(1.x)| `https://google.com/search?as_sitesearch=angularjs.org&as_q=`
 | aurajs        | `http://aurajs.com/api/#stq=`                                            |
 | bem           | `https://google.com/search?as_sitesearch=bem.info&as_q=`                 |
 | bootsnipp     | `https://bootsnipp.com/search?q=`                                         |
diff --git a/plugins/frontend-search/_frontend-search.sh b/plugins/frontend-search/_frontend-search.sh
index 9aad76f76..573aa3aae 100644
--- a/plugins/frontend-search/_frontend-search.sh
+++ b/plugins/frontend-search/_frontend-search.sh
@@ -33,7 +33,8 @@ function _frontend() {
     'unheap: Search in unheap website'
     'bem: Search in BEM website'
     'smacss: Search in SMACSS website'
-    'angularjs: Search in Angular website'
+    'angular: Search in Angular website for Angular 2.x'
+    'angularjs: Search in Angular website for Angular 1.x'
     'reactjs: Search in React website'
     'emberjs: Search in Ember website'
     'stackoverflow: Search in StackOverflow website'
@@ -99,6 +100,9 @@ function _frontend() {
         smacss)
           _describe -t points "Warp points" frontend_points && ret=0
           ;;
+        angular)
+          _describe -t points "Warp points" frontend_points && ret=0
+        ;;
         angularjs)
           _describe -t points "Warp points" frontend_points && ret=0
           ;;
diff --git a/plugins/frontend-search/frontend-search.plugin.zsh b/plugins/frontend-search/frontend-search.plugin.zsh
index cad692ec4..c5f5ea7a9 100644
--- a/plugins/frontend-search/frontend-search.plugin.zsh
+++ b/plugins/frontend-search/frontend-search.plugin.zsh
@@ -26,7 +26,8 @@ function frontend() {
   # define search context URLS
   typeset -A urls
   urls=(
-    angularjs      'https://angular.io/?search='
+    angular        'https://angular.io/?search='
+    angularjs      'https://google.com/search?as_sitesearch=angularjs.org&as_q='
     aurajs         'http://aurajs.com/api/#stq='
     bem            'https://google.com/search?as_sitesearch=bem.info&as_q='
     bootsnipp      'https://bootsnipp.com/search?q='
@@ -57,7 +58,7 @@ function frontend() {
       print -P "%Uterm%u and what follows is what will be searched for in the %Ucontext%u website,"
       print -P "and %Ucontext%u is one of the following:"
       print -P ""
-      print -P "  angularjs, aurajs, bem, bootsnipp, caniuse, codepen, compassdoc, cssflow,"
+      print -P "  angular (>= 2.0), angularjs (1.x), aurajs, bem, bootsnipp, caniuse, codepen, compassdoc, cssflow,"
       print -P "  dartlang, emberjs, fontello, html5please, jquery, lodash, mdn, npmjs,"
       print -P "  qunit, reactjs, smacss, stackoverflow, unheap"
       print -P ""
@@ -73,7 +74,7 @@ function frontend() {
     echo ""
     echo "Valid contexts are:"
     echo ""
-    echo "  angularjs, aurajs, bem, bootsnipp, caniuse, codepen, compassdoc, cssflow, "
+    echo "  angular (>= 2.0), angularjs (1.x), aurajs, bem, bootsnipp, caniuse, codepen, compassdoc, cssflow, "
     echo "  dartlang, emberjs, fontello, html5please, jquery, lodash, mdn, npmjs,  "
     echo "  qunit, reactjs, smacss, stackoverflow, unheap"
     echo ""
-- 
cgit v1.2.3-70-g09d2


From 63b8d652f251f2b7e22ee80dbeaba8ecf6b9b535 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Mon, 6 May 2019 19:09:51 +0200
Subject: Add small polishing touches

---
 plugins/frontend-search/frontend-search.plugin.zsh | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'plugins')

diff --git a/plugins/frontend-search/frontend-search.plugin.zsh b/plugins/frontend-search/frontend-search.plugin.zsh
index c5f5ea7a9..bef5992a3 100644
--- a/plugins/frontend-search/frontend-search.plugin.zsh
+++ b/plugins/frontend-search/frontend-search.plugin.zsh
@@ -1,3 +1,4 @@
+alias angular='frontend angular'
 alias angularjs='frontend angularjs'
 alias aurajs='frontend aurajs'
 alias bem='frontend bem'
@@ -58,9 +59,9 @@ function frontend() {
       print -P "%Uterm%u and what follows is what will be searched for in the %Ucontext%u website,"
       print -P "and %Ucontext%u is one of the following:"
       print -P ""
-      print -P "  angular (>= 2.0), angularjs (1.x), aurajs, bem, bootsnipp, caniuse, codepen, compassdoc, cssflow,"
-      print -P "  dartlang, emberjs, fontello, html5please, jquery, lodash, mdn, npmjs,"
-      print -P "  qunit, reactjs, smacss, stackoverflow, unheap"
+      print -P "  angular (>= 2.0), angularjs (1.x), aurajs, bem, bootsnipp, caniuse, codepen,"
+      print -P "  compassdoc, cssflow, dartlang, emberjs, fontello, html5please, jquery,"
+      print -P "  lodash, mdn, npmjs, qunit, reactjs, smacss, stackoverflow, unheap"
       print -P ""
       print -P "For example: frontend npmjs mocha (or just: npmjs mocha)."
       print -P ""
@@ -74,15 +75,15 @@ function frontend() {
     echo ""
     echo "Valid contexts are:"
     echo ""
-    echo "  angular (>= 2.0), angularjs (1.x), aurajs, bem, bootsnipp, caniuse, codepen, compassdoc, cssflow, "
-    echo "  dartlang, emberjs, fontello, html5please, jquery, lodash, mdn, npmjs,  "
-    echo "  qunit, reactjs, smacss, stackoverflow, unheap"
+    echo "  angular (>= 2.0), angularjs (1.x), aurajs, bem, bootsnipp, caniuse, codepen,"
+    echo "  compassdoc, cssflow, dartlang, emberjs, fontello, html5please, jquery,"
+    echo "  lodash, mdn, npmjs, qunit, reactjs, smacss, stackoverflow, unheap"
     echo ""
     return 1
   fi
 
   # build search url:
-  # join arguments passed with '+', then append to search context URL
+  # join arguments passed with '%20', then append to search context URL
   # TODO substitute for proper urlencode method
   url="${urls[$1]}${(j:%20:)@[2,-1]}"
 
-- 
cgit v1.2.3-70-g09d2


From 81ed25610dd6a7de858c38fa5bfb1545ebfc46e0 Mon Sep 17 00:00:00 2001
From: Wayne Porter <wporter82@users.noreply.github.com>
Date: Tue, 7 May 2019 09:11:28 -0700
Subject: jira: fix error when assigned or reported are default (#7731)

Signed-off-by: Wayne Porter <wporter82@gmail.com>
---
 plugins/jira/jira.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh
index 052481a60..fcf8b2959 100644
--- a/plugins/jira/jira.plugin.zsh
+++ b/plugins/jira/jira.plugin.zsh
@@ -43,7 +43,7 @@ function jira() {
     echo "Opening new issue"
     open_command "${jira_url}/secure/CreateIssue!default.jspa"
   elif [[ "$action" == "assigned" || "$action" == "reported" ]]; then
-    _jira_query $@
+    _jira_query ${@:-$action}
   elif [[ "$action" == "dashboard" ]]; then
     echo "Opening dashboard"
     if [[ "$JIRA_RAPID_BOARD" == "true" ]]; then
-- 
cgit v1.2.3-70-g09d2


From 58daf135286c03db1f3bb4225b471007dd994670 Mon Sep 17 00:00:00 2001
From: i5ar <i5ar@live.it>
Date: Tue, 7 May 2019 19:51:20 +0200
Subject: django: fix typo in completion (#6233)

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

(limited to 'plugins')

diff --git a/plugins/django/django.plugin.zsh b/plugins/django/django.plugin.zsh
index 29a51d29d..86558ff2e 100644
--- a/plugins/django/django.plugin.zsh
+++ b/plugins/django/django.plugin.zsh
@@ -154,7 +154,7 @@ _managepy-makemessages(){
     "--no-default-ignore[Don't ignore the common glob-style patterns 'CVS', '.*', '*~' and '*.pyc'.]" \
     "--no-wrap[Don't break long message lines into several lines.]" \
     "--no-location[Don't write '#: filename:line' lines.]" \
-    '--no-obsolete[emove obsolete message strings.]' \
+    '--no-obsolete[Remove obsolete message strings.]' \
     '--keep-pot[Keep .pot file after making messages.]' \
     $nul_args && ret=0
 }
-- 
cgit v1.2.3-70-g09d2


From 78b241b16ae34da0c6e0c3c2f0591f3f49e42980 Mon Sep 17 00:00:00 2001
From: Kewang <cpckewang@gmail.com>
Date: Wed, 8 May 2019 02:02:41 +0800
Subject: Capitalizate github to GitHub (#5932)

---
 plugins/catimg/catimg.plugin.zsh           |  2 +-
 plugins/catimg/catimg.sh                   |  2 +-
 plugins/git-extras/git-extras.plugin.zsh   |  4 ++--
 plugins/git-hubflow/git-hubflow.plugin.zsh | 12 ++++++------
 plugins/gulp/gulp.plugin.zsh               |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'plugins')

diff --git a/plugins/catimg/catimg.plugin.zsh b/plugins/catimg/catimg.plugin.zsh
index 5f58ecde3..ca46444cc 100644
--- a/plugins/catimg/catimg.plugin.zsh
+++ b/plugins/catimg/catimg.plugin.zsh
@@ -4,7 +4,7 @@
 #                                                                              #
 # Ouput the content of an image to the stdout using the 256 colors of the      #
 # terminal.                                                                    #
-# Github: https://github.com/posva/catimg                                      #
+# GitHub: https://github.com/posva/catimg                                      #
 ################################################################################
 
 
diff --git a/plugins/catimg/catimg.sh b/plugins/catimg/catimg.sh
index 83ccf6a95..713a03291 100644
--- a/plugins/catimg/catimg.sh
+++ b/plugins/catimg/catimg.sh
@@ -4,7 +4,7 @@
 #                                                                              #
 # Ouput the content of an image to the stdout using the 256 colors of the      #
 # terminal.                                                                    #
-# Github: https://github.com/posva/catimg                                      #
+# GitHub: https://github.com/posva/catimg                                      #
 ################################################################################
 
 function help() {
diff --git a/plugins/git-extras/git-extras.plugin.zsh b/plugins/git-extras/git-extras.plugin.zsh
index ef6c35988..b86d7c5b6 100644
--- a/plugins/git-extras/git-extras.plugin.zsh
+++ b/plugins/git-extras/git-extras.plugin.zsh
@@ -454,9 +454,9 @@ zstyle ':completion:*:*:git:*' user-commands $existing_user_commands \
     extras:'awesome git utilities' \
     feature:'create/merge feature branch' \
     force-clone:'overwrite local repositories with clone' \
-    fork:'fork a repo on github' \
+    fork:'fork a repo on GitHub' \
     fresh-branch:'create fresh branches' \
-    gh-pages:'create the github pages branch' \
+    gh-pages:'create the GitHub pages branch' \
     graft:'merge and destroy a given branch' \
     guilt:'calculate change between two revisions' \
     ignore-io:'get sample gitignore file' \
diff --git a/plugins/git-hubflow/git-hubflow.plugin.zsh b/plugins/git-hubflow/git-hubflow.plugin.zsh
index 05479f7e6..50d7b23ce 100644
--- a/plugins/git-hubflow/git-hubflow.plugin.zsh
+++ b/plugins/git-hubflow/git-hubflow.plugin.zsh
@@ -75,8 +75,8 @@ __git-hf-release ()
                 'finish:Finish a release branch.'
                 'list:List all your release branches. (Alias to `git hf release`)'
                 'cancel:Cancel release'
-                'push:Push release to github'
-                'pull:Pull release from github'
+                'push:Push release to GitHub'
+                'pull:Pull release from GitHub'
                 'track:Track release'
             )
             _describe -t commands 'git hf release' subcommands
@@ -133,8 +133,8 @@ __git-hf-hotfix ()
                 'list:List all your hotfix branches. (Alias to `git hf hotfix`)'
                 'publish:Publish the hotfix branch.'
                 'track:Track the hotfix branch.'
-                'pull:Pull the hotfix from github.'
-                'push:Push the hotfix to github.'
+                'pull:Pull the hotfix from GitHub.'
+                'push:Push the hotfix to GitHub.'
                 'cancel:Cancel the hotfix.'
             )
             _describe -t commands 'git hf hotfix' subcommands
@@ -195,8 +195,8 @@ __git-hf-feature ()
                 'diff:Diff'
                 'rebase:Rebase feature branch against develop'
                 'checkout:Checkout feature'
-                'pull:Pull feature branch from github'
-                'push:Push feature branch to github'
+                'pull:Pull feature branch from GitHub'
+                'push:Push feature branch to GitHub'
                 'cancel:Cancel feature'
             )
             _describe -t commands 'git hf feature' subcommands
diff --git a/plugins/gulp/gulp.plugin.zsh b/plugins/gulp/gulp.plugin.zsh
index ec597421d..6234302c5 100644
--- a/plugins/gulp/gulp.plugin.zsh
+++ b/plugins/gulp/gulp.plugin.zsh
@@ -11,7 +11,7 @@
 
 #
 # André König
-# Github: https://github.com/akoenig
+# GitHub: https://github.com/akoenig
 # Twitter: https://twitter.com/caiifr
 #
 
-- 
cgit v1.2.3-70-g09d2


From 0f0448fa6c431cb9894e82741ec5b4dd90872ba8 Mon Sep 17 00:00:00 2001
From: Jannik <6362150+janniks@users.noreply.github.com>
Date: Tue, 7 May 2019 21:21:55 +0200
Subject: ssh-agent: consolidate uppercase message (#7834)

---
 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 a7a4ee33a..9471ff49c 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -5,7 +5,7 @@ function _start_agent() {
 	zstyle -s :omz:plugins:ssh-agent lifetime lifetime
 
 	# start ssh-agent and setup environment
-	echo starting ssh-agent...
+	echo Starting ssh-agent...
 	ssh-agent -s ${lifetime:+-t} ${lifetime} | sed 's/^echo/#echo/' >! $_ssh_env_cache
 	chmod 600 $_ssh_env_cache
 	. $_ssh_env_cache > /dev/null
-- 
cgit v1.2.3-70-g09d2


From 4cadbcd23503e3aa1f29008b6748c82bd308dce6 Mon Sep 17 00:00:00 2001
From: Alan <alan@gangleri.net>
Date: Wed, 8 May 2019 08:48:28 +0100
Subject: Add plugin for pipenv (#6698)

- Add completion for pipenv
- Auto activate and deactivate for pipenv shell
- Add aliases for the most common pipenv commands
---
 plugins/pipenv/README.md         | 28 +++++++++++++++++++++++++++
 plugins/pipenv/pipenv.plugin.zsh | 42 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 plugins/pipenv/README.md
 create mode 100644 plugins/pipenv/pipenv.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/pipenv/README.md b/plugins/pipenv/README.md
new file mode 100644
index 000000000..ab1c1e442
--- /dev/null
+++ b/plugins/pipenv/README.md
@@ -0,0 +1,28 @@
+# Pipenv
+
+## Installation
+In your `.zshrc` file, add `pipenv` to the plugins section
+
+```
+plugins=(... pipenv ...)
+```
+
+## Features
+This plugin provides some features to simplify the use of Pipenv while working on ZSH. 
+- Adds completion for pipenv
+- Auto activates and deactivates pipenv shell
+- Adds short aliases for common pipenv commands
+  - `pch` is aliased to `pipenv check`
+  - `pcl` is aliased to `pipenv clean`
+  - `pgr` is aliased to `pipenv graph`
+  - `pi` is aliased to `pipenv install`
+  - `pidev` is aliased to `pipenv install --dev`
+  - `pl` is aliased to `pipenv lock`
+  - `po` is aliased to `pipenv open`
+  - `prun` is aliased to `pipenv run`
+  - `psh` is aliased to `pipenv shell`
+  - `psy` is aliased to `pipenv sync`
+  - `pu` is aliased to `pipenv uninstall`
+  - `pwh` is aliased to `pipenv --where`
+  - `pvenv` is aliased to `pipenv --venv`
+  - `ppy` is aliased to `pipenv --py`
diff --git a/plugins/pipenv/pipenv.plugin.zsh b/plugins/pipenv/pipenv.plugin.zsh
new file mode 100644
index 000000000..0a5dc56a4
--- /dev/null
+++ b/plugins/pipenv/pipenv.plugin.zsh
@@ -0,0 +1,42 @@
+# Pipenv completion
+_pipenv() {
+  eval $(env COMMANDLINE="${words[1,$CURRENT]}" _PIPENV_COMPLETE=complete-zsh  pipenv)
+}
+compdef _pipenv pipenv
+
+# Automatic pipenv shell activation/deactivation
+_togglePipenvShell() {
+  # deactivate shell if Pipfile doesn't exist and not in a subdir
+  if [[ ! -a "$PWD/Pipfile" ]]; then
+    if [[ "$PIPENV_ACTIVE" == 1 ]]; then
+      if [[ "$PWD" != "$pipfile_dir"* ]]; then
+        exit
+      fi
+    fi
+  fi
+
+  # activate the shell if Pipfile exists
+  if [[ "$PIPENV_ACTIVE" != 1 ]]; then
+    if [[ -a "$PWD/Pipfile" ]]; then
+      export pipfile_dir="$PWD"
+      pipenv shell
+    fi
+  fi
+}
+chpwd_functions+=(_togglePipenvShell)
+
+# Aliases
+alias pch="pipenv check"
+alias pcl="pipenv clean"
+alias pgr="pipenv graph"
+alias pi="pipenv install"
+alias pidev="pipenv install --dev"
+alias pl="pipenv lock"
+alias po="pipenv open"
+alias prun="pipenv run"
+alias psh="pipenv shell"
+alias psy="pipenv sync"
+alias pu="pipenv uninstall"
+alias pwh="pipenv --where"
+alias pvenv="pipenv --venv"
+alias ppy="pipenv --py"
-- 
cgit v1.2.3-70-g09d2


From 20ecca2ba9a9cf88a48fdfc48c4d3e2718752843 Mon Sep 17 00:00:00 2001
From: Thomas Kriechbaumer <Kriechi@users.noreply.github.com>
Date: Wed, 8 May 2019 09:51:05 +0200
Subject: rbenv: improve rbenv loading based on pyenv (#7626)

---
 plugins/pyenv/pyenv.plugin.zsh |  2 +-
 plugins/rbenv/rbenv.plugin.zsh | 87 ++++++++++++++++++++++--------------------
 2 files changed, 47 insertions(+), 42 deletions(-)

(limited to 'plugins')

diff --git a/plugins/pyenv/pyenv.plugin.zsh b/plugins/pyenv/pyenv.plugin.zsh
index 4e92b8017..40e58b5c2 100644
--- a/plugins/pyenv/pyenv.plugin.zsh
+++ b/plugins/pyenv/pyenv.plugin.zsh
@@ -38,4 +38,4 @@ else
     }
 fi
 
-unset FOUND_PYENV dir
+unset FOUND_PYENV pyenvdirs dir
diff --git a/plugins/rbenv/rbenv.plugin.zsh b/plugins/rbenv/rbenv.plugin.zsh
index 7430e9625..ed46d355b 100644
--- a/plugins/rbenv/rbenv.plugin.zsh
+++ b/plugins/rbenv/rbenv.plugin.zsh
@@ -1,60 +1,65 @@
-_homebrew-installed() {
-  type brew &> /dev/null
-}
-
-FOUND_RBENV=0
-rbenvdirs=("$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv" "/usr/local/opt/rbenv")
-if _homebrew-installed && rbenv_homebrew_path=$(brew --prefix rbenv 2>/dev/null); then
-    rbenvdirs=($rbenv_homebrew_path "${rbenvdirs[@]}")
-    unset rbenv_homebrew_path
-    if [[ $RBENV_ROOT = '' ]]; then 
-      RBENV_ROOT="$HOME/.rbenv"
-    fi
+# This plugin loads rbenv into the current shell and provides prompt info via
+# the 'rbenv_prompt_info' function.
+
+FOUND_RBENV=$+commands[rbenv]
+
+if [[ $FOUND_RBENV -ne 1 ]]; then
+    rbenvdirs=("$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv" "/usr/local/opt/rbenv")
+    for dir in $rbenvdirs; do
+        if [[ -d $dir/bin ]]; then
+            export PATH="$dir/bin:$PATH"
+            FOUND_RBENV=1
+            break
+        fi
+    done
 fi
 
-for rbenvdir in "${rbenvdirs[@]}" ; do
-  if [ -d $rbenvdir/bin -a $FOUND_RBENV -eq 0 ] ; then
-    FOUND_RBENV=1
-    if [[ $RBENV_ROOT = '' ]]; then
-      RBENV_ROOT=$rbenvdir
+if [[ $FOUND_RBENV -ne 1 ]]; then
+    if (( $+commands[brew] )) && dir=$(brew --prefix rbenv 2>/dev/null); then
+        if [[ -d $dir/bin ]]; then
+            export PATH="$dir/bin:$PATH"
+            FOUND_RBENV=1
+        fi
     fi
-    export RBENV_ROOT
-    export PATH=${rbenvdir}/bin:$PATH
+fi
+
+if [[ $FOUND_RBENV -eq 1 ]]; then
     eval "$(rbenv init --no-rehash - zsh)"
 
     alias rubies="rbenv versions"
     alias gemsets="rbenv gemset list"
 
     function current_ruby() {
-      echo "$(rbenv version-name)"
+        echo "$(rbenv version-name)"
     }
 
     function current_gemset() {
-      echo "$(rbenv gemset active 2&>/dev/null | sed -e ":a" -e '$ s/\n/+/gp;N;b a' | head -n1)"
+        echo "$(rbenv gemset active 2&>/dev/null | sed -e ":a" -e '$ s/\n/+/gp;N;b a' | head -n1)"
     }
 
-    function gems {
-      local rbenv_path=$(rbenv prefix)
-      gem list $@ | sed -E \
-        -e "s/\([0-9a-z, \.]+( .+)?\)/$fg[blue]&$reset_color/g" \
-        -e "s|$(echo $rbenv_path)|$fg[magenta]\$rbenv_path$reset_color|g" \
-        -e "s/$current_ruby@global/$fg[yellow]&$reset_color/g" \
-        -e "s/$current_ruby$current_gemset$/$fg[green]&$reset_color/g"
+    function gems() {
+        local rbenv_path=$(rbenv prefix)
+        gem list $@ | sed -E \
+          -e "s/\([0-9a-z, \.]+( .+)?\)/$fg[blue]&$reset_color/g" \
+          -e "s|$(echo $rbenv_path)|$fg[magenta]\$rbenv_path$reset_color|g" \
+          -e "s/$current_ruby@global/$fg[yellow]&$reset_color/g" \
+          -e "s/$current_ruby$current_gemset$/$fg[green]&$reset_color/g"
     }
 
     function rbenv_prompt_info() {
-      if [[ -n $(current_gemset) ]] ; then
-        echo "$(current_ruby)@$(current_gemset)"
-      else
-        echo "$(current_ruby)"
-      fi
+        if [[ -n $(current_gemset) ]] ; then
+            echo "$(current_ruby)@$(current_gemset)"
+        else
+            echo "$(current_ruby)"
+        fi
     }
-  fi
-done
-unset rbenvdir
-
-if [ $FOUND_RBENV -eq 0 ] ; then
-  alias rubies='ruby -v'
-  function gemsets() { echo 'not supported' }
-  function rbenv_prompt_info() { echo "system: $(ruby -v | cut -f-2 -d ' ')" }
+else
+    alias rubies="ruby -v"
+    function gemsets() { echo "not supported" }
+    function current_ruby() { echo "not supported" }
+    function current_gemset() { echo "not supported" }
+    function gems() { echo "not supported" }
+    function rbenv_prompt_info() { echo "system: $(ruby -v | cut -f-2 -d ' ')" }
 fi
+
+unset FOUND_RBENV rbenvdirs dir
-- 
cgit v1.2.3-70-g09d2


From b054e25d25aacdde7c64b002147b6cebdd78d0d2 Mon Sep 17 00:00:00 2001
From: Rahul Somasunderam <rahul.som@gmail.com>
Date: Wed, 8 May 2019 01:27:05 -0700
Subject: Add plugin for SDKMAN (#6483)

SDKMAN! is a tool for managing parallel versions of multiple
Software Development Kits on most Unix based systems.
---
 plugins/sdk/README.md      |  8 +++++
 plugins/sdk/sdk.plugin.zsh | 82 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 90 insertions(+)
 create mode 100644 plugins/sdk/README.md
 create mode 100644 plugins/sdk/sdk.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/sdk/README.md b/plugins/sdk/README.md
new file mode 100644
index 000000000..b237f3b4c
--- /dev/null
+++ b/plugins/sdk/README.md
@@ -0,0 +1,8 @@
+# sdk
+
+Plugin for SDKMAN, a tool for managing parallel versions of multiple Software Development Kits on most Unix based systems.
+Provides autocompletion for all known commands.
+
+## Requirements
+
+ * [SDKMAN](http://sdkman.io/)
diff --git a/plugins/sdk/sdk.plugin.zsh b/plugins/sdk/sdk.plugin.zsh
new file mode 100644
index 000000000..d00459b16
--- /dev/null
+++ b/plugins/sdk/sdk.plugin.zsh
@@ -0,0 +1,82 @@
+### SDKMAN Autocomplete for Oh My Zsh
+
+# This is the output from sdkman. All the these options are supported at the
+# moment.
+
+# Usage: sdk <command> [candidate] [version]
+#        sdk offline <enable|disable>
+#
+#    commands:
+#        install   or i    <candidate> [version]
+#        uninstall or rm   <candidate> <version>
+#        list      or ls   [candidate]
+#        use       or u    <candidate> [version]
+#        default   or d    <candidate> [version]
+#        current   or c    [candidate]
+#        upgrade   or ug   [candidate]
+#        version   or v
+#        broadcast or b
+#        help      or h
+#        offline           [enable|disable]
+#        selfupdate        [force]
+#        update
+#        flush             <candidates|broadcast|archives|temp>
+#
+#    candidate  :  the SDK to install: groovy, scala, grails, gradle, kotlin, etc.
+#                  use list command for comprehensive list of candidates
+#                  eg: $ sdk list
+#
+#    version    :  where optional, defaults to latest stable if not provided
+#                  eg: $ sdk install groovy
+
+local _sdk_commands=(
+    install     i
+    uninstall   rm
+    list        ls
+    use         u
+    default     d
+    current     c
+    upgrade     ug
+    version     v
+    broadcast   b
+    help        h
+    offline
+    selfupdate
+    update
+    flush
+)
+
+_listInstalledVersions() {
+  __sdkman_build_version_csv $1 | sed -e "s/,/ /g"
+}
+
+_listInstallableVersions() {
+  __sdkman_list_versions $1 | grep "^ " | sed -e "s/\* /*/g" | \
+      sed -e "s/>//g" | xargs -n 1 echo | grep -v "^*"
+}
+
+_listAllVersion() {
+  __sdkman_list_versions $1 | grep "^ " | sed -e "s/\*/ /g" | sed -e "s/>//g"
+}
+
+_sdk () {
+  case $CURRENT in
+    2)  compadd -- $_sdk_commands ;;
+    3)  case "$words[2]" in
+          i|install|rm|uninstall|ls|list|u|use|d|default|c|current|ug|upgrade)
+                      compadd -- $SDKMAN_CANDIDATES ;;
+          offline)    compadd -- enable disable ;;
+          selfupdate) compadd -- force ;;
+          flush)      compadd -- candidates broadcast archives temp ;;
+        esac
+        ;;
+    4)  case "$words[2]" in
+          rm|uninstall|d|default) compadd -- $(_listInstalledVersions $words[3]) ;;
+          i|install)              compadd -- $(_listInstallableVersions $words[3]) ;;
+          u|use)                  compadd -- $(_listAllVersion $words[3]) ;;
+        esac
+        ;;
+  esac
+}
+
+compdef _sdk sdk
-- 
cgit v1.2.3-70-g09d2


From 7b75163543a3f18652cd8978c1b111e8a196a3f8 Mon Sep 17 00:00:00 2001
From: George Cheng <Gerhut@GMail.com>
Date: Wed, 8 May 2019 22:32:27 +0800
Subject: vscode: add code-insiders support (#7836)

---
 plugins/vscode/README.md         | 15 +++++++++++++++
 plugins/vscode/vscode.plugin.zsh | 31 +++++++++++++++++--------------
 2 files changed, 32 insertions(+), 14 deletions(-)

(limited to 'plugins')

diff --git a/plugins/vscode/README.md b/plugins/vscode/README.md
index 8ee45525a..74b5a45aa 100644
--- a/plugins/vscode/README.md
+++ b/plugins/vscode/README.md
@@ -8,6 +8,21 @@ To start using it, add the `vscode` plugin to your `plugins` array in `~/.zshrc`
 plugins=(... vscode)
 ```
 
+If you are using [Visual Studio Code Insiders](https://code.visualstudio.com/insiders/),
+add the following line in the oh-my-zsh settings section (between the `ZSH_THEME` and
+the `plugins=()` line). This will make the plugin use the Insiders version instead.
+
+```zsh
+ZSH_THEME=...
+
+# Add this line to use code-insiders instead of code
+VSCODE=code-insiders
+
+plugins=(... vscode)
+
+source $ZSH/oh-my-zsh.sh
+```
+
 ## Common aliases
 
 | Alias                   | Command                        | Description                                                                                                 |
diff --git a/plugins/vscode/vscode.plugin.zsh b/plugins/vscode/vscode.plugin.zsh
index 902c23ecf..4c15df2b0 100644
--- a/plugins/vscode/vscode.plugin.zsh
+++ b/plugins/vscode/vscode.plugin.zsh
@@ -1,19 +1,22 @@
 # VScode zsh plugin
 # author: https://github.com/MarsiBarsi
 
-alias vsc='code .'
-alias vsca='code --add'
-alias vscd='code --diff'
-alias vscg='code --goto'
-alias vscn='code --new-window'
-alias vscr='code --reuse-window'
-alias vscw='code --wait'
-alias vscu='code --user-data-dir'
+# Use main Visual Studio Code version by default
+: ${VSCODE:=code}
 
-alias vsced='code --extensions-dir'
-alias vscie='code --install-extension'
-alias vscue='code --uninstall-extension'
+alias vsc="$VSCODE ."
+alias vsca="$VSCODE --add"
+alias vscd="$VSCODE --diff"
+alias vscg="$VSCODE --goto"
+alias vscn="$VSCODE --new-window"
+alias vscr="$VSCODE --reuse-window"
+alias vscw="$VSCODE --wait"
+alias vscu="$VSCODE --user-data-dir"
 
-alias vscv='code --verbose'
-alias vscl='code --log'
-alias vscde='code --disable-extensions'
+alias vsced="$VSCODE --extensions-dir"
+alias vscie="$VSCODE --install-extension"
+alias vscue="$VSCODE --uninstall-extension"
+
+alias vscv="$VSCODE --verbose"
+alias vscl="$VSCODE --log"
+alias vscde="$VSCODE --disable-extensions"
-- 
cgit v1.2.3-70-g09d2


From ebc700be9b2fa7ae770a644093a5c46a8e323726 Mon Sep 17 00:00:00 2001
From: chpeer <19874293+chpeer@users.noreply.github.com>
Date: Mon, 22 Jan 2018 17:50:36 +0000
Subject: Add plugin for Please (#6568)

---
 plugins/please/README.md         | 26 ++++++++++++++++++++++++++
 plugins/please/please.plugin.zsh |  7 +++++++
 2 files changed, 33 insertions(+)
 create mode 100644 plugins/please/README.md
 create mode 100644 plugins/please/please.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/please/README.md b/plugins/please/README.md
new file mode 100644
index 000000000..89bfbf105
--- /dev/null
+++ b/plugins/please/README.md
@@ -0,0 +1,26 @@
+# please plugin
+
+[Please](https://please.build) is a cross-language build system with an emphasis on
+high performance, extensibility and reproduceability. It supports a number of popular
+languages and can automate nearly any aspect of your build process.
+
+This plugin adds autocomplete and major aliases for `plz`, the command line tool for
+Please.
+
+To use it, add `please` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... please)
+```
+
+## Aliases
+
+| Alias | Command     |
+|-------|-------------|
+| `pb`  | `plz build` |
+| `pt`  | `plz test`  |
+| `pw`  | `plz watch` |
+
+## Maintainer
+
+[@thought-machine](https://github.com/thought-machine)
diff --git a/plugins/please/please.plugin.zsh b/plugins/please/please.plugin.zsh
new file mode 100644
index 000000000..0f58307ab
--- /dev/null
+++ b/plugins/please/please.plugin.zsh
@@ -0,0 +1,7 @@
+if (( $+commands[plz] )); then
+    source <(plz --completion_script)
+fi
+
+alias pb='plz build'
+alias pt='plz test'
+alias pw='plz watch'
-- 
cgit v1.2.3-70-g09d2


From f5f630ff342571097fd92f069ea5fe006599703d Mon Sep 17 00:00:00 2001
From: DT <dmofot@gmail.com>
Date: Thu, 9 May 2019 08:17:22 -0400
Subject: osx: update spotify to v2.1 (#7820)

---
 plugins/osx/README.md |  2 +-
 plugins/osx/spotify   | 64 +++++++++++++++++++++++++++++++++++++++------------
 2 files changed, 50 insertions(+), 16 deletions(-)

(limited to 'plugins')

diff --git a/plugins/osx/README.md b/plugins/osx/README.md
index 3559dee02..4595ee319 100644
--- a/plugins/osx/README.md
+++ b/plugins/osx/README.md
@@ -18,7 +18,7 @@ This application makes use of the following third party scripts:
 
 [shpotify](https://github.com/hnarayanan/shpotify)
 
-Copyright (c) 2012–2017 [Harish Narayanan](https://harishnarayanan.org/).
+Copyright (c) 2012–2019 [Harish Narayanan](https://harishnarayanan.org/).
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/plugins/osx/spotify b/plugins/osx/spotify
index b4215dbe7..39f8e0437 100644
--- a/plugins/osx/spotify
+++ b/plugins/osx/spotify
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 function spotify() {
-# Copyright (c) 2012--2018 Harish Narayanan <mail@harishnarayanan.org>
+# Copyright (c) 2012--2019 Harish Narayanan <mail@harishnarayanan.org>
 #
 # Contains numerous helpful contributions from Jorge Colindres, Thomas
 # Pritchard, iLan Epstein, Gabriele Bonetti, Sean Heller, Eric Martin
@@ -70,7 +70,7 @@ showHelp () {
     echo;
     echo "  next                         # Skips to the next song in a playlist.";
     echo "  prev                         # Returns to the previous song in a playlist.";
-    echo "  replay                       # Replays the current track from the begining.";
+    echo "  replay                       # Replays the current track from the beginning.";
     echo "  pos <time>                   # Jumps to a time (in secs) in the current song.";
     echo "  pause                        # Pauses (or resumes) Spotify playback.";
     echo "  stop                         # Stops playback.";
@@ -82,6 +82,9 @@ showHelp () {
     echo "  vol [show]                   # Shows the current Spotify volume.";
     echo;
     echo "  status                       # Shows the current player status.";
+    echo "  status artist                # Shows the currently playing artist.";
+    echo "  status album                 # Shows the currently playing album.";
+    echo "  status track                 # Shows the currently playing track.";
     echo;
     echo "  share                        # Displays the current song's Spotify URL and URI."
     echo "  share url                    # Displays the current song's Spotify URL and copies it to the clipboard."
@@ -99,12 +102,21 @@ cecho(){
     echo $bold$green"$1"$reset;
 }
 
+showArtist() {
+    echo `osascript -e 'tell application "Spotify" to artist of current track as string'`;
+}
+
+showAlbum() {
+    echo `osascript -e 'tell application "Spotify" to album of current track as string'`;
+}
+
+showTrack() {
+    echo `osascript -e 'tell application "Spotify" to name of current track as string'`;
+}
+
 showStatus () {
     state=`osascript -e 'tell application "Spotify" to player state as string'`;
     cecho "Spotify is currently $state.";
-    artist=`osascript -e 'tell application "Spotify" to artist of current track as string'`;
-    album=`osascript -e 'tell application "Spotify" to album of current track as string'`;
-    track=`osascript -e 'tell application "Spotify" to name of current track as string'`;
     duration=`osascript -e 'tell application "Spotify"
             set durSec to (duration of current track / 1000) as text
             set tM to (round (durSec / 60) rounding down) as text
@@ -128,7 +140,7 @@ showStatus () {
             end tell
             return nowAt'`;
 
-    echo -e $reset"Artist: $artist\nAlbum: $album\nTrack: $track \nPosition: $position / $duration";
+    echo -e $reset"Artist: $(showArtist)\nAlbum: $(showAlbum)\nTrack: $(showTrack) \nPosition: $position / $duration";
 }
 
 if [ $# = 0 ]; then
@@ -223,18 +235,18 @@ while [ $# -gt 0 ]; do
 
                         results=$( \
                             curl -s -G $SPOTIFY_SEARCH_API --data-urlencode "q=$Q" -d "type=playlist&limit=10&offset=0" -H "Accept: application/json" -H "Authorization: Bearer ${SPOTIFY_ACCESS_TOKEN}" \
-                            | grep -E -o "spotify:user:[a-zA-Z0-9_]+:playlist:[a-zA-Z0-9]+" -m 10 \
+                            | grep -E -o "spotify:playlist:[a-zA-Z0-9]+" -m 10 \
                         )
 
                         count=$( \
-                            echo "$results" | grep -c "spotify:user" \
+                            echo "$results" | grep -c "spotify:playlist" \
                         )
 
                         if [ "$count" -gt 0 ]; then
                             random=$(( $RANDOM % $count));
 
                             SPOTIFY_PLAY_URI=$( \
-                                echo "$results" | awk -v random="$random" '/spotify:user:[a-zA-Z0-9]+:playlist:[a-zA-Z0-9]+/{i++}i==random{print; exit}' \
+                                echo "$results" | awk -v random="$random" '/spotify:playlist:[a-zA-Z0-9]+/{i++}i==random{print; exit}' \
                             )
                         fi;;
 
@@ -295,7 +307,7 @@ while [ $# -gt 0 ]; do
 
         "quit"    ) cecho "Quitting Spotify.";
             osascript -e 'tell application "Spotify" to quit';
-            exit 1 ;;
+            exit 0 ;;
 
         "next"    ) cecho "Going to next track." ;
             osascript -e 'tell application "Spotify" to next track';
@@ -346,7 +358,7 @@ while [ $# -gt 0 ]; do
                 echo "  vol down                     # Decreases the volume by 10%.";
                 echo "  vol [amount]                 # Sets the volume to an amount between 0 and 100.";
                 echo "  vol                          # Shows the current Spotify volume.";
-                break
+                exit 1;
             fi
 
             osascript -e "tell application \"Spotify\" to set sound volume to $newvol";
@@ -365,7 +377,25 @@ while [ $# -gt 0 ]; do
             break ;;
 
         "status" )
-            showStatus;
+            if [ $# != 1 ]; then
+                # There are additional arguments, a status subcommand
+                case $2 in
+                    "artist" )
+                        showArtist;
+                        break ;;
+
+                    "album" )
+                        showAlbum;
+                        break ;;
+
+                    "track" )
+                        showTrack;
+                        break ;;
+                esac
+            else
+                # status is the only param
+                showStatus;
+            fi
             break ;;
 
         "info" )
@@ -428,16 +458,20 @@ while [ $# -gt 0 ]; do
                 cecho "Spotify URI: $uri";
                 echo -n $uri | pbcopy
             fi
-            break;;
+            break ;;
 
         "pos"   )
             cecho "Adjusting Spotify play position."
             osascript -e "tell application \"Spotify\" to set player position to $2";
-            break;;
+            break ;;
 
-        "help" | * )
+        "help" )
             showHelp;
             break ;;
+        * )
+            showHelp;
+            exit 1;
+
     esac
 done
 }
-- 
cgit v1.2.3-70-g09d2


From 4585c6662be4cefafd6e67df1d859abb7988168e Mon Sep 17 00:00:00 2001
From: Mohamed El Mouctar Haidara <elmhaidara@gmail.com>
Date: Fri, 10 May 2019 17:28:31 +0200
Subject: aws: really unset AWS*PROFILE variables in asp function (#7838)

---
 plugins/aws/aws.plugin.zsh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'plugins')

diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index 4bec30490..d70a64fcc 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -5,13 +5,15 @@ function agp {
 }
 
 function asp {
-  export AWS_DEFAULT_PROFILE=$1
-  export AWS_PROFILE=$1
-  export AWS_EB_PROFILE=$1
-
   if [[ -z "$1" ]]; then
+    unset AWS_DEFAULT_PROFILE AWS_PROFILE AWS_EB_PROFILE
     echo AWS profile cleared.
+    return
   fi
+
+  export AWS_DEFAULT_PROFILE=$1
+  export AWS_PROFILE=$1
+  export AWS_EB_PROFILE=$1
 }
 
 function aws_change_access_key {
-- 
cgit v1.2.3-70-g09d2


From 5aa62461d91546ce1fd5dcc6531569d0e6e6f17f Mon Sep 17 00:00:00 2001
From: Mert Simsek <mertsmsk0@gmail.com>
Date: Fri, 17 May 2019 15:36:20 +0300
Subject: rails: change rg alias to `rgen` (#7858)

The rg alias conflicted with ripgrep.
---
 plugins/rails/README.md        | 2 +-
 plugins/rails/rails.plugin.zsh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/rails/README.md b/plugins/rails/README.md
index 7a3db3d64..51742b2a3 100644
--- a/plugins/rails/README.md
+++ b/plugins/rails/README.md
@@ -18,7 +18,7 @@ plugins=(... rails)
 | `rcs` | `rails console --sandbox`  | Test code in a sandbox, without changing any data  |
 | `rd`  | `rails destroy`            | Undo a generate operation                          |
 | `rdb` | `rails dbconsole`          | Interact with your db from the console             |
-| `rg`  | `rails generate`           | Generate boilerplate code                          |
+| `rgen`  | `rails generate`           | Generate boilerplate code                          |
 | `rgm` | `rails generate migration` | Generate a db migration                            |
 | `rp`  | `rails plugin`             | Run a Rails plugin command                         |
 | `ru`  | `rails runner`             | Run Ruby code in the context of Rails              |
diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
index eb3f30360..a8ec79db2 100644
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@@ -43,7 +43,7 @@ alias rc='rails console'
 alias rcs='rails console --sandbox'
 alias rd='rails destroy'
 alias rdb='rails dbconsole'
-alias rg='rails generate'
+alias rgen='rails generate'
 alias rgm='rails generate migration'
 alias rp='rails plugin'
 alias ru='rails runner'
-- 
cgit v1.2.3-70-g09d2


From 5f7666e20b411ac4b71844d72945f9e122909dbc Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sun, 19 May 2019 18:22:23 +0200
Subject: vi-mode: reset KEYMAP on accept-line (#7818)

Fixes #7797
---
 plugins/vi-mode/vi-mode.plugin.zsh | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh
index a82e41439..c91ba05ba 100644
--- a/plugins/vi-mode/vi-mode.plugin.zsh
+++ b/plugins/vi-mode/vi-mode.plugin.zsh
@@ -8,13 +8,24 @@ function zle-keymap-select() {
 }
 
 zle -N zle-keymap-select
-zle -N edit-command-line
+
+function vi-accept-line() {
+  VI_KEYMAP=main
+  zle accept-line
+}
+
+zle -N vi-accept-line
 
 
 bindkey -v
 
+# use custom accept-line widget to update $VI_KEYMAP
+bindkey -M vicmd '^J' vi-accept-line
+bindkey -M vicmd '^M' vi-accept-line
+
 # allow v to edit the command line (standard behaviour)
 autoload -Uz edit-command-line
+zle -N edit-command-line
 bindkey -M vicmd 'v' edit-command-line
 
 # allow ctrl-p, ctrl-n for navigate history (standard behaviour)
-- 
cgit v1.2.3-70-g09d2


From f960e2be6f01abe5f185d668be661b57051322ac Mon Sep 17 00:00:00 2001
From: Arshad Kazmi <arshadkazmi42@gmail.com>
Date: Mon, 20 May 2019 02:15:27 +0530
Subject: dotenv: add support for custom env file names (#7861)

---
 plugins/dotenv/README.md         | 11 +++++++++++
 plugins/dotenv/dotenv.plugin.zsh | 12 ++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

(limited to 'plugins')

diff --git a/plugins/dotenv/README.md b/plugins/dotenv/README.md
index e880e9d69..cac552485 100644
--- a/plugins/dotenv/README.md
+++ b/plugins/dotenv/README.md
@@ -32,6 +32,17 @@ PORT=3001
 ```
 You can even mix both formats, although it's probably a bad idea.
 
+### ZSH_DOTENV_FILE
+
+You can also modify the name of the file to be loaded with the variable `ZSH_DOTENV_FILE`.
+If the variable isn't set, the plugin will default to use `.env`.
+For example, this will make the plugin look for files named `.dotenv` and load them:
+
+```
+# in ~/.zshrc, before Oh My Zsh is sourced:
+ZSH_DOTENV_FILE=.dotenv
+```
+
 ## Version Control
 
 **It's strongly recommended to add `.env` file to `.gitignore`**, because usually it contains sensitive information such as your credentials, secret keys, passwords etc. You don't want to commit this file, it's supposed to be local only.
diff --git a/plugins/dotenv/dotenv.plugin.zsh b/plugins/dotenv/dotenv.plugin.zsh
index b701b5596..89763d0ee 100644
--- a/plugins/dotenv/dotenv.plugin.zsh
+++ b/plugins/dotenv/dotenv.plugin.zsh
@@ -1,13 +1,13 @@
 source_env() {
-  if [[ -f .env ]]; then
+  if [[ -f $ZSH_DOTENV_FILE ]]; then
     # test .env syntax
-    zsh -fn .env || echo 'dotenv: error when sourcing `.env` file' >&2
+    zsh -fn $ZSH_DOTENV_FILE || echo "dotenv: error when sourcing '$ZSH_DOTENV_FILE' file" >&2
 
     if [[ -o a ]]; then
-      source .env
+      source $ZSH_DOTENV_FILE
     else
       set -a
-      source .env
+      source $ZSH_DOTENV_FILE
       set +a
     fi
   fi
@@ -16,4 +16,8 @@ source_env() {
 autoload -U add-zsh-hook
 add-zsh-hook chpwd source_env
 
+if [[ -z $ZSH_DOTENV_FILE ]]; then
+    ZSH_DOTENV_FILE=.env
+fi
+
 source_env
-- 
cgit v1.2.3-70-g09d2


From 8022fdbd1386f8ff2b07083dd0f2e9032de140f4 Mon Sep 17 00:00:00 2001
From: Melebius <melebius@gmail.com>
Date: Mon, 20 May 2019 22:31:48 +0200
Subject: svn-fast-info: fix svn-fast-info printfs (#7140)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The svn-fast-info plugin printf commands was not well formatted, now it can handle empty
variables. Also removed redundant spaces.

Co-authored-by: RazManor <Raz.Manor@valens.com>
Co-authored-by: Marc Cornellà <marc.cornella@live.com>
---
 plugins/svn-fast-info/svn-fast-info.plugin.zsh | 49 +++++++++++++-------------
 1 file changed, 25 insertions(+), 24 deletions(-)

(limited to 'plugins')

diff --git a/plugins/svn-fast-info/svn-fast-info.plugin.zsh b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
index 9ea7f641d..fe5265315 100644
--- a/plugins/svn-fast-info/svn-fast-info.plugin.zsh
+++ b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
@@ -16,30 +16,30 @@ function svn_prompt_info() {
 
   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
+      "$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
-    printf '%s%s%s %s%s:%s%s%s%s%s' \
-      $ZSH_PROMPT_BASE_COLOR \
-      $ZSH_THEME_SVN_PROMPT_PREFIX \
+    printf '%s%s%s%s %s%s%s:%s%s%s%s' \
+      "$ZSH_PROMPT_BASE_COLOR" \
+      "$ZSH_THEME_SVN_PROMPT_PREFIX" \
       \
       "$(svn_status_info $info)" \
-      $ZSH_PROMPT_BASE_COLOR \
+      "$ZSH_PROMPT_BASE_COLOR" \
       \
-      $ZSH_THEME_BRANCH_NAME_COLOR \
-      $(svn_current_branch_name $info) \
-      $ZSH_PROMPT_BASE_COLOR \
+      "$ZSH_THEME_BRANCH_NAME_COLOR" \
+      "$(svn_current_branch_name $info)" \
+      "$ZSH_PROMPT_BASE_COLOR" \
       \
-      $(svn_current_revision $info) \
-      $ZSH_PROMPT_BASE_COLOR \
+      "$(svn_current_revision $info)" \
+      "$ZSH_PROMPT_BASE_COLOR" \
       \
-      $ZSH_THEME_SVN_PROMPT_SUFFIX \
-      $ZSH_PROMPT_BASE_COLOR
+      "$ZSH_THEME_SVN_PROMPT_SUFFIX" \
+      "$ZSH_PROMPT_BASE_COLOR"
   fi
 }
 
@@ -63,11 +63,12 @@ function svn_current_revision() {
 function svn_status_info() {
   local svn_status_string="$ZSH_THEME_SVN_PROMPT_CLEAN"
   local svn_status="$(svn status 2> /dev/null)";
-  if command grep -E '^\s*A' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_ADDITIONS:-+}"; fi
-  if command grep -E '^\s*D' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_DELETIONS:-✖}"; fi
-  if command grep -E '^\s*M' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_MODIFICATIONS:-✎}"; fi
-  if command grep -E '^\s*[R~]' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_REPLACEMENTS:-∿}"; fi
-  if command grep -E '^\s*\?' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_UNTRACKED:-?}"; fi
-  if command grep -E '^\s*[CI!L]' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_DIRTY:-'!'}"; fi
+  if command grep -E '^\s*A' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string${ZSH_THEME_SVN_PROMPT_ADDITIONS:-+}"; fi
+  if command grep -E '^\s*D' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string${ZSH_THEME_SVN_PROMPT_DELETIONS:-✖}"; fi
+  if command grep -E '^\s*M' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string${ZSH_THEME_SVN_PROMPT_MODIFICATIONS:-✎}"; fi
+  if command grep -E '^\s*[R~]' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string${ZSH_THEME_SVN_PROMPT_REPLACEMENTS:-∿}"; fi
+  if command grep -E '^\s*\?' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string${ZSH_THEME_SVN_PROMPT_UNTRACKED:-?}"; fi
+  if command 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
 }
+
-- 
cgit v1.2.3-70-g09d2


From f8d5fdce3a351390a2aa540eed7e713997b576f4 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 21 May 2019 10:53:11 +0200
Subject: git: move documentation from wiki to README

---
 plugins/git/README.md | 206 ++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 201 insertions(+), 5 deletions(-)

(limited to 'plugins')

diff --git a/plugins/git/README.md b/plugins/git/README.md
index 76da2a8ae..6cb73c11c 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -1,10 +1,206 @@
-## git
+# git plugin
 
-**Maintainer:** [@ncanceill](https://github.com/ncanceill)
+The git plugin provides many [aliases](#aliases) and a few useful [functions](#functions).
 
-This plugin adds many useful aliases and functions.
+To use it, add `git` to the plugins array in your zshrc file:
 
-### Usage
+```zsh
+plugins=(... git)
+```
 
-See the [wiki](https://github.com/robbyrussell/oh-my-zsh/wiki/Plugin:git) for a list of aliases and functions provided by the plugin.
+## Aliases
 
+| Alias                | Command                                                                                                                       |
+|:---------------------|:------------------------------------------------------------------------------------------------------------------------------|
+| g                    | git                                                                                                                           |
+| ga                   | git add                                                                                                                       |
+| gaa                  | git add --all                                                                                                                 |
+| gapa                 | git add --patch                                                                                                               |
+| gau                  | git add --update                                                                                                              |
+| gav                  | git add --verbose                                                                                                             |
+| gap                  | git apply                                                                                                                     |
+| gb                   | git branch                                                                                                                    |
+| gba                  | git branch -a                                                                                                                 |
+| gbd                  | git branch -d                                                                                                                 |
+| gbda                 | git branch --no-color --merged \| command grep -vE "^(\*\|\s*(master\|develop\|dev)\s*$)" \| command xargs -n 1 git branch -d |
+| gbD                  | git branch -D                                                                                                                 |
+| gbl                  | git blame -b -w                                                                                                               |
+| gbnm                 | git branch --no-merged                                                                                                        |
+| gbr                  | git branch --remote                                                                                                           |
+| gbs                  | git bisect                                                                                                                    |
+| gbsb                 | git bisect bad                                                                                                                |
+| gbsg                 | git bisect good                                                                                                               |
+| gbsr                 | git bisect reset                                                                                                              |
+| gbss                 | git bisect start                                                                                                              |
+| gc                   | git commit -v                                                                                                                 |
+| gc!                  | git commit -v --amend                                                                                                         |
+| gcn!                 | git commit -v --no-edit --amend                                                                                               |
+| gca                  | git commit -v -a                                                                                                              |
+| gca!                 | git commit -v -a --amend                                                                                                      |
+| gcan!                | git commit -v -a --no-edit --amend                                                                                            |
+| gcans!               | git commit -v -a -s --no-edit --amend                                                                                         |
+| gcam                 | git commit -a -m                                                                                                              |
+| gcsm                 | git commit -s -m                                                                                                              |
+| gcb                  | git checkout -b                                                                                                               |
+| gcf                  | git config --list                                                                                                             |
+| gcl                  | git clone --recurse-submodules                                                                                                |
+| gclean               | git clean -id                                                                                                                 |
+| gpristine            | git reset --hard && git clean -dfx                                                                                            |
+| gcm                  | git checkout master                                                                                                           |
+| gcd                  | git checkout develop                                                                                                          |
+| gcmsg                | git commit -m                                                                                                                 |
+| gco                  | git checkout                                                                                                                  |
+| gcount               | git shortlog -sn                                                                                                              |
+| gcp                  | git cherry-pick                                                                                                               |
+| gcpa                 | git cherry-pick --abort                                                                                                       |
+| gcpc                 | git cherry-pick --continue                                                                                                    |
+| gcs                  | git commit -S                                                                                                                 |
+| gd                   | git diff                                                                                                                      |
+| gdca                 | git diff --cached                                                                                                             |
+| gdcw                 | git diff --cached --word-diff                                                                                                 |
+| gdct                 | git describe --tags $(git rev-list --tags --max-count=1)                                                                      |
+| gds                  | git diff --staged                                                                                                             |
+| gdt                  | git diff-tree --no-commit-id --name-only -r                                                                                   |
+| gdv                  | git diff -w $@ \| view -                                                                                                      |
+| gdw                  | git diff --word-diff                                                                                                          |
+| gf                   | git fetch                                                                                                                     |
+| gfa                  | git fetch --all --prune                                                                                                       |
+| gfg                  | git ls-files \| grep                                                                                                          |
+| gfo                  | git fetch origin                                                                                                              |
+| gg                   | git gui citool                                                                                                                |
+| gga                  | git gui citool --amend                                                                                                        |
+| ggf                  | git push --force origin $(current_branch)                                                                                     |
+| ggfl                 | git push --force-with-lease origin $(current_branch)                                                                          |
+| ggl                  | git pull origin $(current_branch)                                                                                             |
+| ggp                  | git push origin $(current_branch)                                                                                             |
+| ggpnp                | ggl && ggp                                                                                                                    |
+| ggpull               | git pull origin "$(git_current_branch)"                                                                                       |
+| ggpur                | ggu                                                                                                                           |
+| ggpush               | git push origin "$(git_current_branch)"                                                                                       |
+| ggsup                | git branch --set-upstream-to=origin/$(git_current_branch)                                                                     |
+| ggu                  | git pull --rebase origin $(current_branch)                                                                                    |
+| gpsup                | git push --set-upstream origin $(git_current_branch)                                                                          |
+| ghh                  | git help                                                                                                                      |
+| gignore              | git update-index --assume-unchanged                                                                                           |
+| gignored             | git ls-files -v \| grep "^[[:lower:]]"                                                                                        |
+| git-svn-dcommit-push | git svn dcommit && git push github master:svntrunk                                                                            |
+| gk                   | gitk --all --branches                                                                                                         |
+| gke                  | gitk --all $(git log -g --pretty=%h)                                                                                          |
+| gl                   | git pull                                                                                                                      |
+| glg                  | git log --stat                                                                                                                |
+| glgp                 | git log --stat -p                                                                                                             |
+| glgg                 | git log --graph                                                                                                               |
+| glgga                | git log --graph --decorate --all                                                                                              |
+| glgm                 | git log --graph --max-count=10                                                                                                |
+| glo                  | git log --oneline --decorate                                                                                                  |
+| glol                 | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'                        |
+| glols                | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --stat                 |
+| glod                 | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset'                        |
+| glods                | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset' --date=short           |
+| glola                | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --all                  |
+| glog                 | git log --oneline --decorate --graph                                                                                          |
+| gloga                | git log --oneline --decorate --graph --all                                                                                    |
+| glp                  | `_git_log_prettily`                                                                                                           |
+| gm                   | git merge                                                                                                                     |
+| gmom                 | git merge origin/master                                                                                                       |
+| gmt                  | git mergetool --no-prompt                                                                                                     |
+| gmtvim               | git mergetool --no-prompt --tool=vimdiff                                                                                      |
+| gmum                 | git merge upstream/master                                                                                                     |
+| gma                  | git merge --abort                                                                                                             |
+| gp                   | git push                                                                                                                      |
+| gpd                  | git push --dry-run                                                                                                            |
+| gpf                  | git push --force-with-lease                                                                                                   |
+| gpf!                 | git push --force                                                                                                              |
+| gpoat                | git push origin --all && git push origin --tags                                                                               |
+| gpu                  | git push upstream                                                                                                             |
+| gpv                  | git push -v                                                                                                                   |
+| gr                   | git remote                                                                                                                    |
+| gra                  | git remote add                                                                                                                |
+| grb                  | git rebase                                                                                                                    |
+| grba                 | git rebase --abort                                                                                                            |
+| grbc                 | git rebase --continue                                                                                                         |
+| grbd                 | git rebase develop                                                                                                            |
+| grbi                 | git rebase -i                                                                                                                 |
+| grbm                 | git rebase master                                                                                                             |
+| grbs                 | git rebase --skip                                                                                                             |
+| grh                  | git reset                                                                                                                     |
+| grhh                 | git reset --hard                                                                                                              |
+| groh                 | git reset origin/$(git_current_branch) --hard                                                                                 |
+| grm                  | git rm                                                                                                                        |
+| grmc                 | git rm --cached                                                                                                               |
+| grmv                 | git remote rename                                                                                                             |
+| grrm                 | git remote remove                                                                                                             |
+| grset                | git remote set-url                                                                                                            |
+| grt                  | cd "$(git rev-parse --show-toplevel \|\| echo .)"                                                                             |
+| gru                  | git reset --                                                                                                                  |
+| grup                 | git remote update                                                                                                             |
+| grv                  | git remote -v                                                                                                                 |
+| gsb                  | git status -sb                                                                                                                |
+| gsd                  | git svn dcommit                                                                                                               |
+| gsh                  | git show                                                                                                                      |
+| gsi                  | git submodule init                                                                                                            |
+| gsps                 | git show --pretty=short --show-signature                                                                                      |
+| gsr                  | git svn rebase                                                                                                                |
+| gss                  | git status -s                                                                                                                 |
+| gst                  | git status                                                                                                                    |
+| gsta                 | git stash push                                                                                                                |
+| gsta                 | git stash save                                                                                                                |
+| gstaa                | git stash apply                                                                                                               |
+| gstc                 | git stash clear                                                                                                               |
+| gstd                 | git stash drop                                                                                                                |
+| gstl                 | git stash list                                                                                                                |
+| gstp                 | git stash pop                                                                                                                 |
+| gsts                 | git stash show --text                                                                                                         |
+| gstall               | git stash --all                                                                                                               |
+| gsu                  | git submodule update                                                                                                          |
+| gts                  | git tag -s                                                                                                                    |
+| gtv                  | git tag \| sort -V                                                                                                            |
+| gtl                  | gtl(){ git tag --sort=-v:refname -n -l ${1}* }; noglob gtl                                                                    |
+| gunignore            | git update-index --no-assume-unchanged                                                                                        |
+| gunwip               | git log -n 1 \| grep -q -c "\-\-wip\-\-" && git reset HEAD~1                                                                  |
+| gup                  | git pull --rebase                                                                                                             |
+| gupv                 | git pull --rebase -v                                                                                                          |
+| gupa                 | git pull --rebase --autostash                                                                                                 |
+| gupav                | git pull --rebase --autostash -v                                                                                              |
+| glum                 | git pull upstream master                                                                                                      |
+| gwch                 | git whatchanged -p --abbrev-commit --pretty=medium                                                                            |
+| gwip                 | git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign -m "--wip-- [skip ci]"        |
+
+### Deprecated
+
+These are aliases that have been removed, renamed, or otherwise modified in a way that may, or may not, receive further support.
+
+| Alias  |                                Command                                             |                                             Modification                                            |
+| :----- | :----------------------------------------------------------------------------------| --------------------------------------------------------------------------------------------------- |
+| gap    | git add --patch                                                                    | new alias `gapa`                                                                                    |
+| gcl    | git config --list                                                                  | new alias `gcf`                                                                                     |
+| gdc    | git diff --cached                                                                  | new alias `gdca`                                                                                    |
+| gdt    | git difftool                                                                       | no replacement                                                                                      |
+| ggpull | git pull origin $(current_branch)                                                  | new alias `ggl` (`ggpull` still exists for now though)                                              |
+| ggpur  | git pull --rebase origin $(current_branch)                                         | new alias `ggu` (`ggpur` still exists for now though)                                               |
+| ggpush | git push origin $(current_branch)                                                  | new alias `ggp` (`ggpush` still exists for now though)                                              |
+| gk     | gitk --all --branches                                                              | now aliased to `gitk --all --branches`                                                              |
+| glg    | git log --stat --max-count = 10                                                    | now aliased to `git log --stat --color`                                                             |
+| glgg   | git log --graph --max-count = 10                                                   | now aliased to `git log --graph --color`                                                            |
+| gwc    | git whatchanged -p --abbrev-commit --pretty = medium                               | new alias `gwch`                                                                                    |
+
+## Functions
+
+### Current
+
+| Command                | Description                             |
+|:-----------------------|:----------------------------------------|
+| current_branch         | Return the name of the current branch   |
+| current_repository     | Return the names of the current remotes |
+| git_current_user_name  | Returns the `user.name` config value    |
+| git_current_user_email | Returns the `user.email` config value   |
+
+### Work in Progress (WIP)
+
+These features allow to pause a branch development and switch to another one (_"Work in Progress"_,  or wip). When you want to go back to work, just unwip it.
+
+| Command          | Description                                     |
+|:-----------------|:------------------------------------------------|
+| work_in_progress | Echoes a warning if the current branch is a wip |
+| gwip             | Commit wip branch                               |
+| gunwip           | Uncommit wip branch                             |
-- 
cgit v1.2.3-70-g09d2


From 4ad4a81657d044de2839e988ff3338fa398e5d9b Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 21 May 2019 10:57:37 +0200
Subject: git: clean up plugin file and delete current_repository function

Closes #6329
---
 plugins/git/README.md      |  7 ++++++-
 plugins/git/git.plugin.zsh | 47 ++++++++++++++--------------------------------
 2 files changed, 20 insertions(+), 34 deletions(-)

(limited to 'plugins')

diff --git a/plugins/git/README.md b/plugins/git/README.md
index 6cb73c11c..d66ad234d 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -191,7 +191,6 @@ These are aliases that have been removed, renamed, or otherwise modified in a wa
 | Command                | Description                             |
 |:-----------------------|:----------------------------------------|
 | current_branch         | Return the name of the current branch   |
-| current_repository     | Return the names of the current remotes |
 | git_current_user_name  | Returns the `user.name` config value    |
 | git_current_user_email | Returns the `user.email` config value   |
 
@@ -204,3 +203,9 @@ These features allow to pause a branch development and switch to another one (_"
 | work_in_progress | Echoes a warning if the current branch is a wip |
 | gwip             | Commit wip branch                               |
 | gunwip           | Uncommit wip branch                             |
+
+### Deprecated
+
+| Command                | Description                             | Reason                                                          |
+|:-----------------------|:----------------------------------------|:----------------------------------------------------------------|
+| current_repository     | Return the names of the current remotes | Didn't work properly. Use `git remote -v` instead (`grv` alias) |
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index b82d49b5e..09998003a 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -1,7 +1,3 @@
-# Query/use custom command for `git`.
-zstyle -s ":vcs_info:git:*:-all-" "command" _omz_git_git_cmd
-: ${_omz_git_git_cmd:=git}
-
 #
 # Functions
 #
@@ -13,19 +9,15 @@ zstyle -s ":vcs_info:git:*:-all-" "command" _omz_git_git_cmd
 function current_branch() {
   git_current_branch
 }
-# The list of remotes
-function current_repository() {
-  if ! $_omz_git_git_cmd rev-parse --is-inside-work-tree &> /dev/null; then
-    return
-  fi
-  echo $($_omz_git_git_cmd remote -v | cut -d':' -f 2)
-}
+
 # Pretty log messages
 function _git_log_prettily(){
   if ! [ -z $1 ]; then
     git log --pretty=$1
   fi
 }
+compdef _git _git_log_prettily=git-log
+
 # Warn if the current branch is a WIP
 function work_in_progress() {
   if $(git log -n 1 2>/dev/null | grep -q -c "\-\-wip\-\-"); then
@@ -80,7 +72,6 @@ alias gcd='git checkout develop'
 alias gcmsg='git commit -m'
 alias gco='git checkout'
 alias gcount='git shortlog -sn'
-compdef _git gcount
 alias gcp='git cherry-pick'
 alias gcpa='git cherry-pick --abort'
 alias gcpc='git cherry-pick --continue'
@@ -89,35 +80,35 @@ alias gcs='git commit -S'
 alias gd='git diff'
 alias gdca='git diff --cached'
 alias gdcw='git diff --cached --word-diff'
-alias gdct='git describe --tags `git rev-list --tags --max-count=1`'
+alias gdct='git describe --tags $(git rev-list --tags --max-count=1)'
 alias gds='git diff --staged'
 alias gdt='git diff-tree --no-commit-id --name-only -r'
 alias gdw='git diff --word-diff'
 
-gdv() { git diff -w "$@" | view - }
+function gdv() { git diff -w "$@" | view - }
 compdef _git gdv=git-diff
 
 alias gf='git fetch'
 alias gfa='git fetch --all --prune'
 alias gfo='git fetch origin'
 
-function gfg() { git ls-files | grep $@ }
-compdef _grep gfg
+alias gfg='git ls-files | grep'
 
 alias gg='git gui citool'
 alias gga='git gui citool --amend'
 
-ggf() {
+function ggf() {
   [[ "$#" != 1 ]] && local b="$(git_current_branch)"
   git push --force origin "${b:=$1}"
 }
-ggfl() {
+compdef _git ggf=git-checkout
+function ggfl() {
   [[ "$#" != 1 ]] && local b="$(git_current_branch)"
   git push --force-with-lease origin "${b:=$1}"
 }
-compdef _git ggf=git-checkout
+compdef _git ggfl=git-checkout
 
-ggl() {
+function ggl() {
   if [[ "$#" != 0 ]] && [[ "$#" != 1 ]]; then
     git pull origin "${*}"
   else
@@ -127,7 +118,7 @@ ggl() {
 }
 compdef _git ggl=git-checkout
 
-ggp() {
+function ggp() {
   if [[ "$#" != 0 ]] && [[ "$#" != 1 ]]; then
     git push origin "${*}"
   else
@@ -137,7 +128,7 @@ ggp() {
 }
 compdef _git ggp=git-checkout
 
-ggpnp() {
+function ggpnp() {
   if [[ "$#" == 0 ]]; then
     ggl && ggp
   else
@@ -146,20 +137,15 @@ ggpnp() {
 }
 compdef _git ggpnp=git-checkout
 
-ggu() {
+function ggu() {
   [[ "$#" != 1 ]] && local b="$(git_current_branch)"
   git pull --rebase origin "${b:=$1}"
 }
 compdef _git ggu=git-checkout
 
 alias ggpur='ggu'
-compdef _git ggpur=git-checkout
-
 alias ggpull='git pull origin "$(git_current_branch)"'
-compdef _git ggpull=git-checkout
-
 alias ggpush='git push origin "$(git_current_branch)"'
-compdef _git ggpush=git-checkout
 
 alias ggsup='git branch --set-upstream-to=origin/$(git_current_branch)'
 alias gpsup='git push --set-upstream origin $(git_current_branch)'
@@ -169,12 +155,9 @@ alias ghh='git help'
 alias gignore='git update-index --assume-unchanged'
 alias gignored='git ls-files -v | grep "^[[:lower:]]"'
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
-compdef _git git-svn-dcommit-push=git
 
 alias gk='\gitk --all --branches'
-compdef _git gk='gitk'
 alias gke='\gitk --all $(git log -g --pretty=%h)'
-compdef _git gke='gitk'
 
 alias gl='git pull'
 alias glg='git log --stat'
@@ -191,7 +174,6 @@ alias glola="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgr
 alias glog='git log --oneline --decorate --graph'
 alias gloga='git log --oneline --decorate --graph --all'
 alias glp="_git_log_prettily"
-compdef _git glp=git-log
 
 alias gm='git merge'
 alias gmom='git merge origin/master'
@@ -205,7 +187,6 @@ alias gpd='git push --dry-run'
 alias gpf='git push --force-with-lease'
 alias gpf!='git push --force'
 alias gpoat='git push origin --all && git push origin --tags'
-compdef _git gpoat=git-push
 alias gpu='git push upstream'
 alias gpv='git push -v'
 
-- 
cgit v1.2.3-70-g09d2


From 60736c9f37ccf886291a5995dfc6f7215b0d8b56 Mon Sep 17 00:00:00 2001
From: Miral <13769268+MiralDesai@users.noreply.github.com>
Date: Tue, 21 May 2019 23:13:05 +0100
Subject: Add new kubectl alias to list all contexts (#7823)

* Add alias to list all contexts

* Update readme to include new alias
---
 plugins/kubectl/README.md          | 1 +
 plugins/kubectl/kubectl.plugin.zsh | 3 +++
 2 files changed, 4 insertions(+)

(limited to 'plugins')

diff --git a/plugins/kubectl/README.md b/plugins/kubectl/README.md
index 3343f0195..0514d8f3f 100644
--- a/plugins/kubectl/README.md
+++ b/plugins/kubectl/README.md
@@ -22,6 +22,7 @@ plugins=(... kubectl)
 | kcsc    | `kubectl config set-context`        | Set a context entry in kubeconfig                                                                |
 | kcdc    | `kubectl config delete-context`     | Delete the specified context from the kubeconfig                                                 |
 | kccc    | `kubectl config current-context`    | Display the current-context                                                                      |
+| kcgc    | `kubectl config get-contexts` | List of contexts available
 |         |                                     | **General aliases**                                                                              |
 | kdel    | `kubectl delete`                    | Delete resources by filenames, stdin, resources and names, or by resources and label selector    |
 | kdelf   | `kubectl delete -f`                 | Delete a pod using the type and name specified in -f argument                                    |
diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index ab7a1a0a4..cf42beaea 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -28,6 +28,9 @@ alias kcsc='kubectl config set-context'
 alias kcdc='kubectl config delete-context'
 alias kccc='kubectl config current-context'
 
+# List all contexts
+alias kcgc='kubectl config get-contexts'
+
 # General aliases
 alias kdel='kubectl delete'
 alias kdelf='kubectl delete -f'
-- 
cgit v1.2.3-70-g09d2


From fa187791cad4447029402a236f70d98424f511ee Mon Sep 17 00:00:00 2001
From: Aliaksei Maiseyeu <jetfire6@gmail.com>
Date: Fri, 24 May 2019 13:17:26 +0300
Subject: torrent: add README (#7873)

---
 plugins/torrent/README.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 plugins/torrent/README.md

(limited to 'plugins')

diff --git a/plugins/torrent/README.md b/plugins/torrent/README.md
new file mode 100644
index 000000000..079aafcb0
--- /dev/null
+++ b/plugins/torrent/README.md
@@ -0,0 +1,13 @@
+# torrent
+
+This plugin creates a Torrent file based on a [MagnetURI](https://en.wikipedia.org/wiki/Magnet_URI_scheme).
+
+To use it, add `torrent` to the plugins array in your zshrc file.
+
+```zsh
+plugins=(... torrent)
+```
+
+## Plugin commands
+
+* `magnet_to_torrent <MagnetURI>`: creates Torrent file.
-- 
cgit v1.2.3-70-g09d2


From 9598a855fa55f9f126f099a4ab792335d2dc1a69 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sat, 25 May 2019 10:24:43 +0200
Subject: aws: check for existence of config file in aws_profiles

Fixes #7872
---
 plugins/aws/aws.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins')

diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index d70a64fcc..b78cd2ac1 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -33,6 +33,7 @@ function aws_change_access_key {
 }
 
 function aws_profiles {
+  [[ -r "${AWS_CONFIG_FILE:-$HOME/.aws/config}" ]] || return 1
   reply=($(grep '\[profile' "${AWS_CONFIG_FILE:-$HOME/.aws/config}"|sed -e 's/.*profile \([a-zA-Z0-9_\.-]*\).*/\1/'))
 }
 compctl -K aws_profiles asp aws_change_access_key
-- 
cgit v1.2.3-70-g09d2


From 8d4d766bac7b7dc3a7b11dce12ce0468d5e49c91 Mon Sep 17 00:00:00 2001
From: Will Mendes <willmendesneto@gmail.com>
Date: Sat, 25 May 2019 19:59:47 +1000
Subject: frontend: add frontend search commands (#7863)

---
 plugins/frontend-search/README.md                  | 78 ++++++++++++----------
 plugins/frontend-search/_frontend-search.sh        | 65 ++++++++++++------
 plugins/frontend-search/frontend-search.plugin.zsh | 32 ++++++---
 3 files changed, 106 insertions(+), 69 deletions(-)

(limited to 'plugins')

diff --git a/plugins/frontend-search/README.md b/plugins/frontend-search/README.md
index 24f82b262..bf76902fd 100644
--- a/plugins/frontend-search/README.md
+++ b/plugins/frontend-search/README.md
@@ -1,9 +1,8 @@
-## Introduction ##
+## Introduction
 
 > Searches for your frontend web development made easier
 
-
-## Installation ##
+## Installation
 
 Open your `~/.zshrc` file and enable the `frontend-search` plugin:
 
@@ -13,54 +12,59 @@ plugins=( ... frontend-search)
 
 ```
 
-
-## Usage ##
+## Usage
 
 You can use the frontend-search plugin in these two forms:
 
-* `frontend <context> <term> [more terms if you want]`
-* `<context> <term> [more terms if you want]`
+- `frontend <context> <term> [more terms if you want]`
+- `<context> <term> [more terms if you want]`
 
 For example, these two are equivalent:
 
 ```zsh
-$ frontend angularjs dependency injection
-$ angularjs dependency injection
+$ angular dependency injection
+# Will turn into ...
+$ frontend angular dependency injection
 ```
 
 Available search contexts are:
 
-| context       | URL                                                                      |
-|---------------|--------------------------------------------------------------------------|
-| angular(>=2.0)| `https://angular.io/?search=`                                             |
-| angularjs(1.x)| `https://google.com/search?as_sitesearch=angularjs.org&as_q=`
-| aurajs        | `http://aurajs.com/api/#stq=`                                            |
-| bem           | `https://google.com/search?as_sitesearch=bem.info&as_q=`                 |
-| bootsnipp     | `https://bootsnipp.com/search?q=`                                         |
-| caniuse       | `https://caniuse.com/#search=`                                            |
-| codepen       | `https://codepen.io/search?q=`                                            |
-| compassdoc    | `http://compass-style.org/search?q=`                                     |
-| cssflow       | `http://www.cssflow.com/search?q=`                                       |
-| dartlang      | `https://api.dartlang.org/apidocs/channels/stable/dartdoc-viewer/dart:`  |
-| emberjs       | `https://emberjs.com/api/#stp=1&stq=`                                     |
-| fontello      | `http://fontello.com/#search=`                                           |
-| html5please   | `http://html5please.com/#`                                               |
-| jquery        | `https://api.jquery.com/?s=`                                             |
-| lodash        | `https://devdocs.io/lodash/index#`                                       |
-| mdn           | `https://developer.mozilla.org/search?q=`                                |
-| npmjs         | `https://www.npmjs.com/search?q=`                                        |
-| qunit         | `https://api.qunitjs.com/?s=`                                            |
-| reactjs       | `https://google.com/search?as_sitesearch=facebook.github.io/react&as_q=` |
-| smacss        | `https://google.com/search?as_sitesearch=smacss.com&as_q=`               |
-| stackoverflow | `https://stackoverflow.com/search?q=`                                     |
-| unheap        | `http://www.unheap.com/?s=`                                              |
+| context       | URL                                                                         |
+| ------------- | --------------------------------------------------------------------------- |
+| angular       | `https://angular.io/?search=`                                               |
+| angularjs     | `https://google.com/search?as_sitesearch=angularjs.org&as_q=`               |
+| bem           | `https://google.com/search?as_sitesearch=bem.info&as_q=`                    |
+| bootsnipp     | `https://bootsnipp.com/search?q=`                                           |
+| bundlephobia  | `https://bundlephobia.com/result?p=`                                        |
+| caniuse       | `https://caniuse.com/#search=`                                              |
+| codepen       | `https://codepen.io/search?q=`                                              |
+| compassdoc    | `http://compass-style.org/search?q=`                                        |
+| cssflow       | `http://www.cssflow.com/search?q=`                                          |
+| dartlang      | `https://api.dartlang.org/apidocs/channels/stable/dartdoc-viewer/dart:`     |
+| emberjs       | `https://www.google.com/search?as_sitesearch=emberjs.com/&as_q=`            |
+| flowtype      | `https://google.com/search?as_sitesearch=flow.org/en/docs/&as_q=`           |
+| fontello      | `http://fontello.com/#search=`                                              |
+| github        | `https://github.com/search?q=`                                              |
+| html5please   | `https://html5please.com/#`                                                 |
+| jestjs        | `https://www.google.com/search?as_sitesearch=jestjs.io&as_q=`               |
+| jquery        | `https://api.jquery.com/?s=`                                                |
+| lodash        | `https://devdocs.io/lodash/index#`                                          |
+| mdn           | `https://developer.mozilla.org/search?q=`                                   |
+| nodejs        | `https://www.google.com/search?as_sitesearch=nodejs.org/en/docs/&as_q=`     |
+| npmjs         | `https://www.npmjs.com/search?q=`                                           |
+| qunit         | `https://api.qunitjs.com/?s=`                                               |
+| reactjs       | `https://google.com/search?as_sitesearch=facebook.github.io/react&as_q=`    |
+| smacss        | `https://google.com/search?as_sitesearch=smacss.com&as_q=`                  |
+| stackoverflow | `https://stackoverflow.com/search?q=`                                       |
+| typescript    | `https://google.com/search?as_sitesearch=www.typescriptlang.org/docs&as_q=` |
+| unheap        | `http://www.unheap.com/?s=`                                                 |
+| vuejs         | `https://www.google.com/search?as_sitesearch=vuejs.org&as_q=`               |
 
 If you want to have another context, open an Issue and tell us!
 
-
 ## Author
 
 **Wilson Mendes (willmendesneto)**
-+ <https://plus.google.com/+WilsonMendes>
-+ <https://twitter.com/willmendesneto>
-+ <https://github.com/willmendesneto>
+
+- <https://twitter.com/willmendesneto>
+- <https://github.com/willmendesneto>
diff --git a/plugins/frontend-search/_frontend-search.sh b/plugins/frontend-search/_frontend-search.sh
index 573aa3aae..c59640e74 100644
--- a/plugins/frontend-search/_frontend-search.sh
+++ b/plugins/frontend-search/_frontend-search.sh
@@ -17,28 +17,34 @@ function _frontend() {
   frontend_points=( "${(f)mapfile[$CONFIG]//$HOME/~}" )
 
   commands=(
-    'jquery: Search in jQuery website'
-    'mdn: Search in MDN website'
-    'compassdoc: Search in COMPASS website'
-    'html5please: Search in HTML5 Please website'
+    'angular: Search in Angular.io website'
+    'angularjs: Search in docs.angularjs.org website'
+    'bem: Search in BEM website'
+    'bootsnipp: Search in bootsnipp website'
+    'bundlephobia: Search in Bundlephobia website'
     'caniuse: Search in Can I Use website'
-    'aurajs: Search in AuraJs website'
+    'codepen: Search in codepen website'
+    'compassdoc: Search in COMPASS website'
+    'cssflow: Search in cssflow website'
     'dartlang: Search in Dart website'
+    'emberjs: Search in Ember website'
+    'flowtype: Search in Flowtype website'
+    'fontello: Search in fontello website'
+    'github: Search in GitHub website'
+    'html5please: Search in HTML5 Please website'
+    'jestjs: Search in Jest website'
+    'jquery: Search in jQuery website'
     'lodash: Search in Lo-Dash website'
+    'mdn: Search in MDN website'
+    'nodejs: Search in NodeJS website'
+    'npmjs: Search in NPMJS website'
     'qunit: Search in Qunit website'
-    'fontello: Search in fontello website'
-    'bootsnipp: Search in bootsnipp website'
-    'cssflow: Search in cssflow website'
-    'codepen: Search in codepen website'
-    'unheap: Search in unheap website'
-    'bem: Search in BEM website'
-    'smacss: Search in SMACSS website'
-    'angular: Search in Angular website for Angular 2.x'
-    'angularjs: Search in Angular website for Angular 1.x'
     'reactjs: Search in React website'
-    'emberjs: Search in Ember website'
+    'smacss: Search in SMACSS website'
     'stackoverflow: Search in StackOverflow website'
-    'npmjs: Search in NPMJS website'
+    'typescript: Search in TypeScript website'
+    'unheap: Search in unheap website'
+    'vuejs: Search in VueJS website'
   )
 
   _arguments -C \
@@ -67,9 +73,6 @@ function _frontend() {
         caniuse)
           _describe -t points "Warp points" frontend_points && ret=0
           ;;
-        aurajs)
-          _describe -t points "Warp points" frontend_points && ret=0
-          ;;
         dartlang)
           _describe -t points "Warp points" frontend_points && ret=0
           ;;
@@ -82,6 +85,9 @@ function _frontend() {
         fontello)
           _describe -t points "Warp points" frontend_points && ret=0
           ;;
+        github)
+          _describe -t points "Warp points" frontend_points && ret=0
+          ;;
         bootsnipp)
           _describe -t points "Warp points" frontend_points && ret=0
           ;;
@@ -100,9 +106,6 @@ function _frontend() {
         smacss)
           _describe -t points "Warp points" frontend_points && ret=0
           ;;
-        angular)
-          _describe -t points "Warp points" frontend_points && ret=0
-        ;;
         angularjs)
           _describe -t points "Warp points" frontend_points && ret=0
           ;;
@@ -118,6 +121,24 @@ function _frontend() {
         npmjs)
           _describe -t points "Warp points" frontend_points && ret=0
           ;;
+        bundlephobia)
+          _describe -t points "Warp points" frontend_points && ret=0
+          ;;
+        flowtype)
+          _describe -t points "Warp points" frontend_points && ret=0
+          ;;
+        typescript)
+          _describe -t points "Warp points" frontend_points && ret=0
+          ;;
+        vuejs)
+          _describe -t points "Warp points" frontend_points && ret=0
+          ;;
+        nodejs)
+          _describe -t points "Warp points" frontend_points && ret=0
+          ;;
+        jestjs)
+          _describe -t points "Warp points" frontend_points && ret=0
+          ;;
       esac
       ;;
   esac
diff --git a/plugins/frontend-search/frontend-search.plugin.zsh b/plugins/frontend-search/frontend-search.plugin.zsh
index bef5992a3..87243be13 100644
--- a/plugins/frontend-search/frontend-search.plugin.zsh
+++ b/plugins/frontend-search/frontend-search.plugin.zsh
@@ -1,25 +1,31 @@
 alias angular='frontend angular'
 alias angularjs='frontend angularjs'
-alias aurajs='frontend aurajs'
 alias bem='frontend bem'
 alias bootsnipp='frontend bootsnipp'
+alias bundlephobia='frontend bundlephobia'
 alias caniuse='frontend caniuse'
 alias codepen='frontend codepen'
 alias compassdoc='frontend compassdoc'
 alias cssflow='frontend cssflow'
 alias dartlang='frontend dartlang'
 alias emberjs='frontend emberjs'
+alias flowtype='frontend flowtype'
 alias fontello='frontend fontello'
+alias github='frontend github'
 alias html5please='frontend html5please'
+alias jestjs='frontend jestjs'
 alias jquery='frontend jquery'
 alias lodash='frontend lodash'
 alias mdn='frontend mdn'
+alias nodejs='frontend nodejs'
 alias npmjs='frontend npmjs'
 alias qunit='frontend qunit'
 alias reactjs='frontend reactjs'
 alias smacss='frontend smacss'
 alias stackoverflow='frontend stackoverflow'
+alias typescript='frontend typescript'
 alias unheap='frontend unheap'
+alias vuejs='frontend vuejs'
 
 function frontend() {
   emulate -L zsh
@@ -29,26 +35,32 @@ function frontend() {
   urls=(
     angular        'https://angular.io/?search='
     angularjs      'https://google.com/search?as_sitesearch=angularjs.org&as_q='
-    aurajs         'http://aurajs.com/api/#stq='
     bem            'https://google.com/search?as_sitesearch=bem.info&as_q='
     bootsnipp      'https://bootsnipp.com/search?q='
+    bundlephobia   'https://bundlephobia.com/result?p='
     caniuse        'https://caniuse.com/#search='
     codepen        'https://codepen.io/search?q='
     compassdoc     'http://compass-style.org/search?q='
     cssflow        'http://www.cssflow.com/search?q='
     dartlang       'https://api.dartlang.org/apidocs/channels/stable/dartdoc-viewer/dart:'
-    emberjs        'https://emberjs.com/api/#stp=1&stq='
+    emberjs        'https://www.google.com/search?as_sitesearch=emberjs.com/&as_q='
+    flowtype       'https://google.com/search?as_sitesearch=flow.org/en/docs/&as_q='
     fontello       'http://fontello.com/#search='
-    html5please    'http://html5please.com/#'
+    github         'https://github.com/search?q='
+    html5please    'https://html5please.com/#'
+    jestjs         'https://www.google.com/search?as_sitesearch=jestjs.io&as_q='
     jquery         'https://api.jquery.com/?s='
     lodash         'https://devdocs.io/lodash/index#'
     mdn            'https://developer.mozilla.org/search?q='
+    nodejs         'https://www.google.com/search?as_sitesearch=nodejs.org/en/docs/&as_q='
     npmjs          'https://www.npmjs.com/search?q='
     qunit          'https://api.qunitjs.com/?s='
     reactjs        'https://google.com/search?as_sitesearch=facebook.github.io/react&as_q='
     smacss         'https://google.com/search?as_sitesearch=smacss.com&as_q='
     stackoverflow  'https://stackoverflow.com/search?q='
+    typescript     'https://google.com/search?as_sitesearch=www.typescriptlang.org/docs&as_q='
     unheap         'http://www.unheap.com/?s='
+    vuejs          'https://www.google.com/search?as_sitesearch=vuejs.org&as_q='
   )
 
   # show help for command list
@@ -59,9 +71,9 @@ function frontend() {
       print -P "%Uterm%u and what follows is what will be searched for in the %Ucontext%u website,"
       print -P "and %Ucontext%u is one of the following:"
       print -P ""
-      print -P "  angular (>= 2.0), angularjs (1.x), aurajs, bem, bootsnipp, caniuse, codepen,"
-      print -P "  compassdoc, cssflow, dartlang, emberjs, fontello, html5please, jquery,"
-      print -P "  lodash, mdn, npmjs, qunit, reactjs, smacss, stackoverflow, unheap"
+      print -P "  angular, angularjs, bem, bootsnipp, caniuse, codepen, compassdoc, cssflow,"
+      print -P "  dartlang, emberjs, fontello, flowtype, github, html5please, jestjs, jquery, lodash,"
+      print -P "  mdn, npmjs, nodejs, qunit, reactjs, smacss, stackoverflow, unheap, vuejs, bundlephobia"
       print -P ""
       print -P "For example: frontend npmjs mocha (or just: npmjs mocha)."
       print -P ""
@@ -75,9 +87,9 @@ function frontend() {
     echo ""
     echo "Valid contexts are:"
     echo ""
-    echo "  angular (>= 2.0), angularjs (1.x), aurajs, bem, bootsnipp, caniuse, codepen,"
-    echo "  compassdoc, cssflow, dartlang, emberjs, fontello, html5please, jquery,"
-    echo "  lodash, mdn, npmjs, qunit, reactjs, smacss, stackoverflow, unheap"
+    echo "  angular, angularjs, bem, bootsnipp, caniuse, codepen, compassdoc, cssflow,"
+    echo "  dartlang, emberjs, fontello, github, html5please, jest, jquery, lodash,"
+    echo "  mdn, npmjs, nodejs, qunit, reactjs, smacss, stackoverflow, unheap, vuejs, bundlephobia"
     echo ""
     return 1
   fi
-- 
cgit v1.2.3-70-g09d2


From 1f078898887bf96e793772a80e0dae1e96eeadc8 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sat, 25 May 2019 12:19:51 +0200
Subject: emotty: fix for undefined $TTY (FreeBSD) (#7844)

See https://github.com/robbyrussell/oh-my-zsh/pull/6731#issuecomment-449653115
---
 plugins/emotty/emotty.plugin.zsh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/emotty/emotty.plugin.zsh b/plugins/emotty/emotty.plugin.zsh
index b0d24c322..e288b5cfb 100644
--- a/plugins/emotty/emotty.plugin.zsh
+++ b/plugins/emotty/emotty.plugin.zsh
@@ -25,8 +25,14 @@ emotty_default_set=emoji
 function emotty() {
   # Use emotty set defined by user, fallback to default
   local emotty=${_emotty_sets[${emotty_set:-$emotty_default_set}]}
-  # Parse $TTY number, normalizing it to an emotty set index
-  (( tty = (${TTY##/dev/tty} % ${#${=emotty}}) + 1 ))
+
+  # Parse tty number via prompt expansion. %l equals:
+  # - N      if tty = /dev/ttyN
+  # - pts/N  if tty = /dev/pts/N
+  local tty = ${${(%):-%l}##pts/}
+  # Normalize it to an emotty set index
+  (( tty = (tty % ${#${=emotty}}) + 1 ))
+
   local character_name=${${=emotty}[tty]}
   echo "${emoji[${character_name}]}${emoji2[emoji_style]}"
 }
-- 
cgit v1.2.3-70-g09d2


From 5d875d68123471b0002946a14bfaecd7451d39b0 Mon Sep 17 00:00:00 2001
From: "Rachel M. Carmena" <rachelcarmena@users.noreply.github.com>
Date: Sat, 25 May 2019 19:35:33 +0200
Subject: ng: fix shwordsplit option use (#7880)

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

(limited to 'plugins')

diff --git a/plugins/ng/ng.plugin.zsh b/plugins/ng/ng.plugin.zsh
index b802bf617..44102e2a6 100644
--- a/plugins/ng/ng.plugin.zsh
+++ b/plugins/ng/ng.plugin.zsh
@@ -1,4 +1,3 @@
-
 ng_opts='addon asset-sizes b build completion d destroy doc e2e g generate get github-pages:deploy gh-pages:deploy h help i init install lint make-this-awesome new s serve server set t test update v version -h --help'
 
 _ng_completion () {
@@ -73,9 +72,7 @@ _ng_completion () {
       ;;
   esac
 
-  setopt shwordsplit
-  reply=($opts)
-  unset shwordsplit
+  reply=(${=opts})
 }
 
 compctl -K _ng_completion ng
-- 
cgit v1.2.3-70-g09d2


From 1343ab67edd8a81b75aceca77ddb526be87a20c1 Mon Sep 17 00:00:00 2001
From: programmer04 <jakub.warczarek@gmail.com>
Date: Sun, 26 May 2019 12:31:37 +0200
Subject: aws: check availability of aws profiles (#7839)

---
 plugins/aws/aws.plugin.zsh | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

(limited to 'plugins')

diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index b78cd2ac1..5f5bf9bbb 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -1,29 +1,35 @@
-# AWS profile selection
-
-function agp {
+agp() {
   echo $AWS_PROFILE
 }
 
-function asp {
+# AWS profile selection
+asp() {
   if [[ -z "$1" ]]; then
     unset AWS_DEFAULT_PROFILE AWS_PROFILE AWS_EB_PROFILE
     echo AWS profile cleared.
     return
   fi
 
+  local available_profiles=($(aws_profiles))
+  if [[ -z "${available_profiles[(r)$1]}" ]]; then
+    echo "${fg[red]}Profile '$1' not found in '${AWS_CONFIG_FILE:-$HOME/.aws/config}'" >&2
+    echo "Available profiles: ${(j:, :)available_profiles:-no profiles found}${reset_color}" >&2
+    return 1
+  fi
+
   export AWS_DEFAULT_PROFILE=$1
   export AWS_PROFILE=$1
   export AWS_EB_PROFILE=$1
 }
 
-function aws_change_access_key {
-  if [[ -z "$1" ]] then
+aws_change_access_key() {
+  if [[ -z "$1" ]]; then
     echo "usage: $0 <profile>"
     return 1
   fi
 
   echo Insert the credentials when asked.
-  asp "$1"
+  asp "$1" || return 1
   aws iam create-access-key
   aws configure --profile "$1"
 
@@ -32,16 +38,18 @@ function aws_change_access_key {
   aws iam list-access-keys
 }
 
-function aws_profiles {
+aws_profiles() {
   [[ -r "${AWS_CONFIG_FILE:-$HOME/.aws/config}" ]] || return 1
-  reply=($(grep '\[profile' "${AWS_CONFIG_FILE:-$HOME/.aws/config}"|sed -e 's/.*profile \([a-zA-Z0-9_\.-]*\).*/\1/'))
+  grep '\[profile' "${AWS_CONFIG_FILE:-$HOME/.aws/config}"|sed -e 's/.*profile \([a-zA-Z0-9_\.-]*\).*/\1/'
 }
-compctl -K aws_profiles asp aws_change_access_key
 
+_aws_profiles() {
+  reply=($(aws_profiles))
+}
+compctl -K _aws_profiles asp aws_change_access_key
 
 # AWS prompt
-
-function aws_prompt_info() {
+aws_prompt_info() {
   [[ -z $AWS_PROFILE ]] && return
   echo "${ZSH_THEME_AWS_PREFIX:=<aws:}${AWS_PROFILE}${ZSH_THEME_AWS_SUFFIX:=>}"
 }
-- 
cgit v1.2.3-70-g09d2


From 7f66a070a4be1ae797151e761f9eaaf3ef8549a8 Mon Sep 17 00:00:00 2001
From: Pete Johns <johnsyweb@users.noreply.github.com>
Date: Tue, 28 May 2019 02:22:07 +1000
Subject: osx: add more arguments to `itunes vol` command (#7845)

- Get the iTunes volume without an argument
- Shift up / down iTunes volume
---
 plugins/osx/osx.plugin.zsh | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index 7deed0ba6..eb3c4fb7a 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -236,7 +236,19 @@ function itunes() {
 			opt="$opt track"
 			;;
 		vol)
-			opt="set sound volume to $1" #$1 Due to the shift
+			local new_volume volume=$(osascript -e 'tell application "iTunes" to get sound volume')
+			if [[ $# -eq 0 ]]; then
+				echo "Current volume is ${volume}."
+				return 0
+			fi
+			case $1 in
+				up) new_volume=$((volume + 10 < 100 ? volume + 10 : 100)) ;;
+				down) new_volume=$((volume - 10 > 0 ? volume - 10 : 0)) ;;
+				<0-100>) new_volume=$1 ;;
+				*) echo "'$1' is not valid. Expected <0-100>, up or down."
+				   return 1 ;;
+			esac
+			opt="set sound volume to ${new_volume}"
 			;;
 		playlist)
 		# Inspired by: https://gist.github.com/nakajijapan/ac8b45371064ae98ea7f
@@ -299,7 +311,7 @@ EOF
 			echo "\tmute|unmute\tcontrol volume set"
 			echo "\tnext|previous\tplay next or previous track"
 			echo "\tshuf|shuffle [on|off|toggle]\tSet shuffled playback. Default: toggle. Note: toggle doesn't support the MiniPlayer."
-			echo "\tvol\tSet the volume, takes an argument from 0 to 100"
+			echo "\tvol [0-100|up|down]\tGet or set the volume. 0 to 100 sets the volume. 'up' / 'down' increases / decreases by 10 points. No argument displays current volume."
 			echo "\tplaying|status\tShow what song is currently playing in iTunes."
 			echo "\tplaylist [playlist name]\t Play specific playlist"
 			echo "\thelp\tshow this message and exit"
-- 
cgit v1.2.3-70-g09d2


From 9930dd6e49df5630ac23c68b85465f0bb801d17f Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 28 May 2019 15:33:02 +0200
Subject: aws: use function keyword in function definitions

Fixes #7886
---
 plugins/aws/aws.plugin.zsh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'plugins')

diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index 5f5bf9bbb..231ac5ad2 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -1,9 +1,9 @@
-agp() {
+function agp() {
   echo $AWS_PROFILE
 }
 
 # AWS profile selection
-asp() {
+function asp() {
   if [[ -z "$1" ]]; then
     unset AWS_DEFAULT_PROFILE AWS_PROFILE AWS_EB_PROFILE
     echo AWS profile cleared.
@@ -22,7 +22,7 @@ asp() {
   export AWS_EB_PROFILE=$1
 }
 
-aws_change_access_key() {
+function aws_change_access_key() {
   if [[ -z "$1" ]]; then
     echo "usage: $0 <profile>"
     return 1
@@ -38,18 +38,18 @@ aws_change_access_key() {
   aws iam list-access-keys
 }
 
-aws_profiles() {
+function aws_profiles() {
   [[ -r "${AWS_CONFIG_FILE:-$HOME/.aws/config}" ]] || return 1
   grep '\[profile' "${AWS_CONFIG_FILE:-$HOME/.aws/config}"|sed -e 's/.*profile \([a-zA-Z0-9_\.-]*\).*/\1/'
 }
 
-_aws_profiles() {
+function _aws_profiles() {
   reply=($(aws_profiles))
 }
 compctl -K _aws_profiles asp aws_change_access_key
 
 # AWS prompt
-aws_prompt_info() {
+function aws_prompt_info() {
   [[ -z $AWS_PROFILE ]] && return
   echo "${ZSH_THEME_AWS_PREFIX:=<aws:}${AWS_PROFILE}${ZSH_THEME_AWS_SUFFIX:=>}"
 }
@@ -61,7 +61,7 @@ fi
 
 # Load awscli completions
 
-_awscli-homebrew-installed() {
+function _awscli-homebrew-installed() {
   # check if Homebrew is installed
   (( $+commands[brew] )) || return 1
 
-- 
cgit v1.2.3-70-g09d2


From 27228d83fe403cf664c0c8626a3874ed3989d084 Mon Sep 17 00:00:00 2001
From: Michael Morgan <morgan.michael@me.com>
Date: Sat, 1 Jun 2019 11:40:04 -0700
Subject: fasd: update `v` alias to evaluate $EDITOR lazily (#7900)

For the `v` alias to work in its current state, the environment variable
EDITOR must already be defined by the time `source $ZSH/oh-my-zsh.sh`
happens. However, in the included zshrc template, EDITOR is set from
within the "User configuration" section, which begins immediately after
the above line. This means that, unless the user knows to move their
`export EDITOR` statements, EDITOR will be undefined when fasd.plugin.zsh
loads, and therefore the alias will have the value 'f -e ""', preventing
it from functioning.

With this change, `"$EDITOR"` will be evaluated each time the alias is
invoked, instead of just once when the alias is created. This allows for
EDITOR to be set from "User configuration" in the zshrc, and has the
additional flexibility of allowing a user to specify a different EDITOR
for a single session or invocation of the alias.
---
 plugins/fasd/fasd.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/fasd/fasd.plugin.zsh b/plugins/fasd/fasd.plugin.zsh
index 36a0428a7..ec2e5183a 100644
--- a/plugins/fasd/fasd.plugin.zsh
+++ b/plugins/fasd/fasd.plugin.zsh
@@ -6,7 +6,7 @@ if [ $commands[fasd] ]; then # check if fasd is installed
   source "$fasd_cache"
   unset fasd_cache
 
-  alias v="f -e \"$EDITOR\""
+  alias v='f -e "$EDITOR"'
   alias o='a -e xdg-open'
   alias j='zz'
 fi
-- 
cgit v1.2.3-70-g09d2


From eb3d46308157e10eb11ec96bcf14b319279d09d3 Mon Sep 17 00:00:00 2001
From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Fri, 7 Jun 2019 10:57:47 -0500
Subject: gitfast: update to upstream v2.21 (#7914)

* gitfast: use $OSTYPE again

In the last update to upstream this was reverted:

 a56eac7a (Use OSTYPE instead of uname whenever possible for better speed. (#5496))

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>

* gitfast: simplify plugin

No need to set and unset a variable we use once.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>

* gitfast: add script to update from upstream

This would make easier the process of updating, and also not miss our
patches.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>

* gitfast: update to upstream v2.21

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 plugins/gitfast/_git                |   13 +-
 plugins/gitfast/git-completion.bash | 1244 ++++++++++++++---------------------
 plugins/gitfast/git-prompt.sh       |    7 +-
 plugins/gitfast/gitfast.plugin.zsh  |    5 +-
 plugins/gitfast/update              |    9 +
 plugins/gitfast/updates.patch       |   56 ++
 6 files changed, 572 insertions(+), 762 deletions(-)
 create mode 100755 plugins/gitfast/update
 create mode 100644 plugins/gitfast/updates.patch

(limited to 'plugins')

diff --git a/plugins/gitfast/_git b/plugins/gitfast/_git
index 78a6dbb3d..c003a6771 100644
--- a/plugins/gitfast/_git
+++ b/plugins/gitfast/_git
@@ -39,7 +39,7 @@ if [ -z "$script" ]; then
 		test -f $e && script="$e" && break
 	done
 fi
-ZSH_VERSION='' . "$script"
+GIT_SOURCING_ZSH_COMPLETION=y . "$script"
 
 __gitcomp ()
 {
@@ -93,13 +93,22 @@ __gitcomp_nl_append ()
 	compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0
 }
 
+__gitcomp_file_direct ()
+{
+	emulate -L zsh
+
+	local IFS=$'\n'
+	compset -P '*[=:]'
+	compadd -f -- ${=1} && _ret=0
+}
+
 __gitcomp_file ()
 {
 	emulate -L zsh
 
 	local IFS=$'\n'
 	compset -P '*[=:]'
-	compadd -Q -p "${2-}" -f -- ${=1} && _ret=0
+	compadd -p "${2-}" -f -- ${=1} && _ret=0
 }
 
 __git_zsh_bash_func ()
diff --git a/plugins/gitfast/git-completion.bash b/plugins/gitfast/git-completion.bash
index d93441747..700417879 100644
--- a/plugins/gitfast/git-completion.bash
+++ b/plugins/gitfast/git-completion.bash
@@ -29,6 +29,8 @@
 # tell the completion to use commit completion.  This also works with aliases
 # of form "!sh -c '...'".  For example, "!sh -c ': git commit ; ... '".
 #
+# Compatible with bash 3.2.57.
+#
 # You can set the following environment variables to influence the behavior of
 # the completion routines:
 #
@@ -92,6 +94,70 @@ __git ()
 		${__git_dir:+--git-dir="$__git_dir"} "$@" 2>/dev/null
 }
 
+# Removes backslash escaping, single quotes and double quotes from a word,
+# stores the result in the variable $dequoted_word.
+# 1: The word to dequote.
+__git_dequote ()
+{
+	local rest="$1" len ch
+
+	dequoted_word=""
+
+	while test -n "$rest"; do
+		len=${#dequoted_word}
+		dequoted_word="$dequoted_word${rest%%[\\\'\"]*}"
+		rest="${rest:$((${#dequoted_word}-$len))}"
+
+		case "${rest:0:1}" in
+		\\)
+			ch="${rest:1:1}"
+			case "$ch" in
+			$'\n')
+				;;
+			*)
+				dequoted_word="$dequoted_word$ch"
+				;;
+			esac
+			rest="${rest:2}"
+			;;
+		\')
+			rest="${rest:1}"
+			len=${#dequoted_word}
+			dequoted_word="$dequoted_word${rest%%\'*}"
+			rest="${rest:$((${#dequoted_word}-$len+1))}"
+			;;
+		\")
+			rest="${rest:1}"
+			while test -n "$rest" ; do
+				len=${#dequoted_word}
+				dequoted_word="$dequoted_word${rest%%[\\\"]*}"
+				rest="${rest:$((${#dequoted_word}-$len))}"
+				case "${rest:0:1}" in
+				\\)
+					ch="${rest:1:1}"
+					case "$ch" in
+					\"|\\|\$|\`)
+						dequoted_word="$dequoted_word$ch"
+						;;
+					$'\n')
+						;;
+					*)
+						dequoted_word="$dequoted_word\\$ch"
+						;;
+					esac
+					rest="${rest:2}"
+					;;
+				\")
+					rest="${rest:1}"
+					break
+					;;
+				esac
+			done
+			;;
+		esac
+	done
+}
+
 # The following function is based on code from:
 #
 #   bash_completion - programmable completion functions for bash 3.2+
@@ -111,8 +177,7 @@ __git ()
 #   GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software Foundation,
-#   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#   along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 #   The latest version of this software can be obtained here:
 #
@@ -265,9 +330,32 @@ __gitcomp ()
 	case "$cur_" in
 	--*=)
 		;;
+	--no-*)
+		local c i=0 IFS=$' \t\n'
+		for c in $1; do
+			if [[ $c == "--" ]]; then
+				continue
+			fi
+			c="$c${4-}"
+			if [[ $c == "$cur_"* ]]; then
+				case $c in
+				--*=*|*.) ;;
+				*) c="$c " ;;
+				esac
+				COMPREPLY[i++]="${2-}$c"
+			fi
+		done
+		;;
 	*)
 		local c i=0 IFS=$' \t\n'
 		for c in $1; do
+			if [[ $c == "--" ]]; then
+				c="--no-...${4-}"
+				if [[ $c == "$cur_"* ]]; then
+					COMPREPLY[i++]="${2-}$c "
+				fi
+				break
+			fi
 			c="$c${4-}"
 			if [[ $c == "$cur_"* ]]; then
 				case $c in
@@ -281,6 +369,47 @@ __gitcomp ()
 	esac
 }
 
+# Clear the variables caching builtins' options when (re-)sourcing
+# the completion script.
+if [[ -n ${ZSH_VERSION-} ]]; then
+	unset $(set |sed -ne 's/^\(__gitcomp_builtin_[a-zA-Z0-9_][a-zA-Z0-9_]*\)=.*/\1/p') 2>/dev/null
+else
+	unset $(compgen -v __gitcomp_builtin_)
+fi
+
+# This function is equivalent to
+#
+#    __gitcomp "$(git xxx --git-completion-helper) ..."
+#
+# except that the output is cached. Accept 1-3 arguments:
+# 1: the git command to execute, this is also the cache key
+# 2: extra options to be added on top (e.g. negative forms)
+# 3: options to be excluded
+__gitcomp_builtin ()
+{
+	# spaces must be replaced with underscore for multi-word
+	# commands, e.g. "git remote add" becomes remote_add.
+	local cmd="$1"
+	local incl="$2"
+	local excl="$3"
+
+	local var=__gitcomp_builtin_"${cmd/-/_}"
+	local options
+	eval "options=\$$var"
+
+	if [ -z "$options" ]; then
+		# leading and trailing spaces are significant to make
+		# option removal work correctly.
+		options=" $incl $(__git ${cmd/_/ } --git-completion-helper) "
+		for i in $excl; do
+			options="${options/ $i / }"
+		done
+		eval "$var=\"$options\""
+	fi
+
+	__gitcomp "$options"
+}
+
 # Variation of __gitcomp_nl () that appends to the existing list of
 # completion candidates, COMPREPLY.
 __gitcomp_nl_append ()
@@ -304,6 +433,24 @@ __gitcomp_nl ()
 	__gitcomp_nl_append "$@"
 }
 
+# Fills the COMPREPLY array with prefiltered paths without any additional
+# processing.
+# Callers must take care of providing only paths that match the current path
+# to be completed and adding any prefix path components, if necessary.
+# 1: List of newline-separated matching paths, complete with all prefix
+#    path components.
+__gitcomp_file_direct ()
+{
+	local IFS=$'\n'
+
+	COMPREPLY=($1)
+
+	# 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 ||
+	true
+}
+
 # Generates completion reply with compgen from newline-separated possible
 # completion filenames.
 # It accepts 1 to 3 arguments:
@@ -323,7 +470,8 @@ __gitcomp_file ()
 
 	# 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
+	compgen -f /non-existing-dir/ >/dev/null ||
+	true
 }
 
 # Execute 'git ls-files', unless the --committable option is specified, in
@@ -333,10 +481,12 @@ __gitcomp_file ()
 __git_ls_files_helper ()
 {
 	if [ "$2" == "--committable" ]; then
-		__git -C "$1" diff-index --name-only --relative HEAD
+		__git -C "$1" -c core.quotePath=false diff-index \
+			--name-only --relative HEAD -- "${3//\\/\\\\}*"
 	else
 		# NOTE: $2 is not quoted in order to support multiple options
-		__git -C "$1" ls-files --exclude-standard $2
+		__git -C "$1" -c core.quotePath=false ls-files \
+			--exclude-standard $2 -- "${3//\\/\\\\}*"
 	fi
 }
 
@@ -347,17 +497,103 @@ __git_ls_files_helper ()
 #    If provided, only files within the specified directory are listed.
 #    Sub directories are never recursed.  Path must have a trailing
 #    slash.
+# 3: List only paths matching this path component (optional).
 __git_index_files ()
 {
-	local root="${2-.}" file
+	local root="$2" match="$3"
 
-	__git_ls_files_helper "$root" "$1" |
-	while read -r file; do
-		case "$file" in
-		?*/*) echo "${file%%/*}" ;;
-		*) echo "$file" ;;
-		esac
-	done | sort | uniq
+	__git_ls_files_helper "$root" "$1" "$match" |
+	awk -F / -v pfx="${2//\\/\\\\}" '{
+		paths[$1] = 1
+	}
+	END {
+		for (p in paths) {
+			if (substr(p, 1, 1) != "\"") {
+				# No special characters, easy!
+				print pfx p
+				continue
+			}
+
+			# The path is quoted.
+			p = dequote(p)
+			if (p == "")
+				continue
+
+			# Even when a directory name itself does not contain
+			# any special characters, it will still be quoted if
+			# any of its (stripped) trailing path components do.
+			# Because of this we may have seen the same direcory
+			# both quoted and unquoted.
+			if (p in paths)
+				# We have seen the same directory unquoted,
+				# skip it.
+				continue
+			else
+				print pfx p
+		}
+	}
+	function dequote(p,    bs_idx, out, esc, esc_idx, dec) {
+		# Skip opening double quote.
+		p = substr(p, 2)
+
+		# Interpret backslash escape sequences.
+		while ((bs_idx = index(p, "\\")) != 0) {
+			out = out substr(p, 1, bs_idx - 1)
+			esc = substr(p, bs_idx + 1, 1)
+			p = substr(p, bs_idx + 2)
+
+			if ((esc_idx = index("abtvfr\"\\", esc)) != 0) {
+				# C-style one-character escape sequence.
+				out = out substr("\a\b\t\v\f\r\"\\",
+						 esc_idx, 1)
+			} else if (esc == "n") {
+				# Uh-oh, a newline character.
+				# We cant reliably put a pathname
+				# containing a newline into COMPREPLY,
+				# and the newline would create a mess.
+				# Skip this path.
+				return ""
+			} else {
+				# Must be a \nnn octal value, then.
+				dec = esc             * 64 + \
+				      substr(p, 1, 1) * 8  + \
+				      substr(p, 2, 1)
+				out = out sprintf("%c", dec)
+				p = substr(p, 3)
+			}
+		}
+		# Drop closing double quote, if there is one.
+		# (There isnt any if this is a directory, as it was
+		# already stripped with the trailing path components.)
+		if (substr(p, length(p), 1) == "\"")
+			out = out substr(p, 1, length(p) - 1)
+		else
+			out = out p
+
+		return out
+	}'
+}
+
+# __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 dequoted_word pfx="" cur_
+
+	__git_dequote "$cur"
+
+	case "$dequoted_word" in
+	?*/*)
+		pfx="${dequoted_word%/*}/"
+		cur_="${dequoted_word##*/}"
+		;;
+	*)
+		cur_="$dequoted_word"
+	esac
+
+	__gitcomp_file_direct "$(__git_index_files "$1" "$pfx" "$cur_")"
 }
 
 # Lists branches from the local repository.
@@ -440,7 +676,7 @@ __git_refs ()
 			track=""
 			;;
 		*)
-			for i in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD; do
+			for i in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD REBASE_HEAD; do
 				case "$i" in
 				$match*)
 					if [ -e "$dir/$i" ]; then
@@ -595,7 +831,7 @@ __git_is_configured_remote ()
 
 __git_list_merge_strategies ()
 {
-	git merge -s help 2>&1 |
+	LANG=C LC_ALL=C git merge -s help 2>&1 |
 	sed -n -e '/[Aa]vailable strategies are: /,/^$/{
 		s/\.$//
 		s/.*://
@@ -619,7 +855,7 @@ __git_compute_merge_strategies ()
 
 __git_complete_revlist_file ()
 {
-	local pfx ls ref cur_="$cur"
+	local dequoted_word pfx ls ref cur_="$cur"
 	case "$cur_" in
 	*..?*:*)
 		return
@@ -627,14 +863,18 @@ __git_complete_revlist_file ()
 	?*:*)
 		ref="${cur_%%:*}"
 		cur_="${cur_#*:}"
-		case "$cur_" in
+
+		__git_dequote "$cur_"
+
+		case "$dequoted_word" in
 		?*/*)
-			pfx="${cur_%/*}"
-			cur_="${cur_##*/}"
+			pfx="${dequoted_word%/*}"
+			cur_="${dequoted_word##*/}"
 			ls="$ref:$pfx"
 			pfx="$pfx/"
 			;;
 		*)
+			cur_="$dequoted_word"
 			ls="$ref"
 			;;
 		esac
@@ -644,21 +884,10 @@ __git_complete_revlist_file ()
 		*)   pfx="$ref:$pfx" ;;
 		esac
 
-		__gitcomp_nl "$(__git ls-tree "$ls" \
-				| sed '/^100... blob /{
-				           s,^.*	,,
-				           s,$, ,
-				       }
-				       /^120000 blob /{
-				           s,^.*	,,
-				           s,$, ,
-				       }
-				       /^040000 tree /{
-				           s,^.*	,,
-				           s,$,/,
-				       }
-				       s/^.*	//')" \
-			"$pfx" "$cur_" ""
+		__gitcomp_file "$(__git ls-tree "$ls" \
+				| sed 's/^.*	//
+				       s/$//')" \
+			"$pfx" "$cur_"
 		;;
 	*...*)
 		pfx="${cur_%...*}..."
@@ -676,26 +905,6 @@ __git_complete_revlist_file ()
 	esac
 }
 
-
-# __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"
-
-	case "$cur_" in
-	?*/*)
-		pfx="${cur_%/*}"
-		cur_="${cur_##*/}"
-		pfx="${pfx}/"
-		;;
-	esac
-
-	__gitcomp_file "$(__git_index_files "$1" ${pfx:+"$pfx"})" "$pfx" "$cur_"
-}
-
 __git_complete_file ()
 {
 	__git_complete_revlist_file
@@ -727,6 +936,7 @@ __git_complete_remote_or_refspec ()
 			*) ;;
 			esac
 			;;
+		--multiple) no_complete_refspec=1; break ;;
 		-*) ;;
 		*) remote="$i"; break ;;
 		esac
@@ -796,126 +1006,11 @@ __git_complete_strategy ()
 	return 1
 }
 
-__git_commands () {
-	if test -n "${GIT_TESTING_COMMAND_COMPLETION:-}"
-	then
-		printf "%s" "${GIT_TESTING_COMMAND_COMPLETION}"
-	else
-		git help -a|egrep '^  [a-zA-Z0-9]'
-	fi
-}
-
-__git_list_all_commands ()
-{
-	local i IFS=" "$'\n'
-	for i in $(__git_commands)
-	do
-		case $i in
-		*--*)             : helper pattern;;
-		*) echo $i;;
-		esac
-	done
-}
-
 __git_all_commands=
 __git_compute_all_commands ()
 {
 	test -n "$__git_all_commands" ||
-	__git_all_commands=$(__git_list_all_commands)
-}
-
-__git_list_porcelain_commands ()
-{
-	local i IFS=" "$'\n'
-	__git_compute_all_commands
-	for i in $__git_all_commands
-	do
-		case $i in
-		*--*)             : helper pattern;;
-		applymbox)        : ask gittus;;
-		applypatch)       : ask gittus;;
-		archimport)       : import;;
-		cat-file)         : plumbing;;
-		check-attr)       : plumbing;;
-		check-ignore)     : plumbing;;
-		check-mailmap)    : plumbing;;
-		check-ref-format) : plumbing;;
-		checkout-index)   : plumbing;;
-		column)           : internal helper;;
-		commit-tree)      : plumbing;;
-		count-objects)    : infrequent;;
-		credential)       : credentials;;
-		credential-*)     : credentials helper;;
-		cvsexportcommit)  : export;;
-		cvsimport)        : import;;
-		cvsserver)        : daemon;;
-		daemon)           : daemon;;
-		diff-files)       : plumbing;;
-		diff-index)       : plumbing;;
-		diff-tree)        : plumbing;;
-		fast-import)      : import;;
-		fast-export)      : export;;
-		fsck-objects)     : plumbing;;
-		fetch-pack)       : plumbing;;
-		fmt-merge-msg)    : plumbing;;
-		for-each-ref)     : plumbing;;
-		hash-object)      : plumbing;;
-		http-*)           : transport;;
-		index-pack)       : plumbing;;
-		init-db)          : deprecated;;
-		local-fetch)      : plumbing;;
-		ls-files)         : plumbing;;
-		ls-remote)        : plumbing;;
-		ls-tree)          : plumbing;;
-		mailinfo)         : plumbing;;
-		mailsplit)        : plumbing;;
-		merge-*)          : plumbing;;
-		mktree)           : plumbing;;
-		mktag)            : plumbing;;
-		pack-objects)     : plumbing;;
-		pack-redundant)   : plumbing;;
-		pack-refs)        : plumbing;;
-		parse-remote)     : plumbing;;
-		patch-id)         : plumbing;;
-		prune)            : plumbing;;
-		prune-packed)     : plumbing;;
-		quiltimport)      : import;;
-		read-tree)        : plumbing;;
-		receive-pack)     : plumbing;;
-		remote-*)         : transport;;
-		rerere)           : plumbing;;
-		rev-list)         : plumbing;;
-		rev-parse)        : plumbing;;
-		runstatus)        : plumbing;;
-		sh-setup)         : internal;;
-		shell)            : daemon;;
-		show-ref)         : plumbing;;
-		send-pack)        : plumbing;;
-		show-index)       : plumbing;;
-		ssh-*)            : transport;;
-		stripspace)       : plumbing;;
-		symbolic-ref)     : plumbing;;
-		unpack-file)      : plumbing;;
-		unpack-objects)   : plumbing;;
-		update-index)     : plumbing;;
-		update-ref)       : plumbing;;
-		update-server-info) : daemon;;
-		upload-archive)   : plumbing;;
-		upload-pack)      : plumbing;;
-		write-tree)       : plumbing;;
-		var)              : infrequent;;
-		verify-pack)      : infrequent;;
-		verify-tag)       : plumbing;;
-		*) echo $i;;
-		esac
-	done
-}
-
-__git_porcelain_commands=
-__git_compute_porcelain_commands ()
-{
-	test -n "$__git_porcelain_commands" ||
-	__git_porcelain_commands=$(__git_list_porcelain_commands)
+	__git_all_commands=$(git --list-cmds=main,others,alias,nohelpers)
 }
 
 # Lists all set config variables starting with the given section prefix,
@@ -933,11 +1028,6 @@ __git_pretty_aliases ()
 	__git_get_config_variables "pretty"
 }
 
-__git_aliases ()
-{
-	__git_get_config_variables "alias"
-}
-
 # __git_aliased_command requires 1 argument
 __git_aliased_command ()
 {
@@ -1073,12 +1163,13 @@ __git_count_arguments ()
 }
 
 __git_whitespacelist="nowarn warn error error-all fix"
+__git_am_inprogress_options="--skip --continue --resolved --abort --quit --show-current-patch"
 
 _git_am ()
 {
 	__git_find_repo_path
 	if [ -d "$__git_repo_path"/rebase-apply ]; then
-		__gitcomp "--skip --continue --resolved --abort"
+		__gitcomp "$__git_am_inprogress_options"
 		return
 	fi
 	case "$cur" in
@@ -1087,12 +1178,8 @@ _git_am ()
 		return
 		;;
 	--*)
-		__gitcomp "
-			--3way --committer-date-is-author-date --ignore-date
-			--ignore-whitespace --ignore-space-change
-			--interactive --keep --no-utf8 --signoff --utf8
-			--whitespace= --scissors
-			"
+		__gitcomp_builtin am "" \
+			"$__git_am_inprogress_options"
 		return
 	esac
 }
@@ -1105,14 +1192,7 @@ _git_apply ()
 		return
 		;;
 	--*)
-		__gitcomp "
-			--stat --numstat --summary --check --index
-			--cached --index-info --reverse --reject --unidiff-zero
-			--apply --no-add --exclude=
-			--ignore-whitespace --ignore-space-change
-			--whitespace= --inaccurate-eof --verbose
-			--recount --directory=
-			"
+		__gitcomp_builtin apply
 		return
 	esac
 }
@@ -1121,10 +1201,7 @@ _git_add ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "
-			--interactive --refresh --patch --update --dry-run
-			--ignore-errors --intent-to-add --force --edit --chmod=
-			"
+		__gitcomp_builtin add
 		return
 	esac
 
@@ -1201,13 +1278,7 @@ _git_branch ()
 		__git_complete_refs --cur="${cur##--set-upstream-to=}"
 		;;
 	--*)
-		__gitcomp "
-			--color --no-color --verbose --abbrev= --no-abbrev
-			--track --no-track --contains --no-contains --merged --no-merged
-			--set-upstream-to= --edit-description --list
-			--unset-upstream --delete --move --remotes
-			--column --no-column --sort= --points-at
-			"
+		__gitcomp_builtin branch
 		;;
 	*)
 		if [ $only_local_ref = "y" -a $has_r = "n" ]; then
@@ -1248,10 +1319,7 @@ _git_checkout ()
 		__gitcomp "diff3 merge" "" "${cur##--conflict=}"
 		;;
 	--*)
-		__gitcomp "
-			--quiet --ours --theirs --track --no-track --merge
-			--conflict= --orphan --patch
-			"
+		__gitcomp_builtin checkout
 		;;
 	*)
 		# check if --track, --no-track, or --no-guess was specified
@@ -1266,21 +1334,19 @@ _git_checkout ()
 	esac
 }
 
-_git_cherry ()
-{
-	__git_complete_refs
-}
+__git_cherry_pick_inprogress_options="--continue --quit --abort"
 
 _git_cherry_pick ()
 {
 	__git_find_repo_path
 	if [ -f "$__git_repo_path"/CHERRY_PICK_HEAD ]; then
-		__gitcomp "--continue --quit --abort"
+		__gitcomp "$__git_cherry_pick_inprogress_options"
 		return
 	fi
 	case "$cur" in
 	--*)
-		__gitcomp "--edit --no-commit --signoff --strategy= --mainline"
+		__gitcomp_builtin cherry-pick "" \
+			"$__git_cherry_pick_inprogress_options"
 		;;
 	*)
 		__git_complete_refs
@@ -1292,7 +1358,7 @@ _git_clean ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "--dry-run --quiet"
+		__gitcomp_builtin clean
 		return
 		;;
 	esac
@@ -1305,26 +1371,7 @@ _git_clone ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "
-			--local
-			--no-hardlinks
-			--shared
-			--reference
-			--quiet
-			--no-checkout
-			--bare
-			--mirror
-			--origin
-			--upload-pack
-			--template=
-			--depth
-			--single-branch
-			--no-tags
-			--branch
-			--recurse-submodules
-			--no-single-branch
-			--shallow-submodules
-			"
+		__gitcomp_builtin clone
 		return
 		;;
 	esac
@@ -1357,16 +1404,7 @@ _git_commit ()
 		return
 		;;
 	--*)
-		__gitcomp "
-			--all --author= --signoff --verify --no-verify
-			--edit --no-edit
-			--amend --include --only --interactive
-			--dry-run --reuse-message= --reedit-message=
-			--reset-author --file= --message= --template=
-			--cleanup= --untracked-files --untracked-files=
-			--verbose --quiet --fixup= --squash=
-			--patch --short --date --allow-empty
-			"
+		__gitcomp_builtin commit
 		return
 	esac
 
@@ -1382,11 +1420,7 @@ _git_describe ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "
-			--all --tags --contains --abbrev= --candidates=
-			--exact-match --debug --long --match --always --first-parent
-			--exclude
-			"
+		__gitcomp_builtin describe
 		return
 	esac
 	__git_complete_refs
@@ -1400,7 +1434,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
 			--patch-with-stat --name-only --name-status --color
 			--no-color --color-words --no-renames --check
 			--full-index --binary --abbrev --diff-filter=
-			--find-copies-harder
+			--find-copies-harder --ignore-cr-at-eol
 			--text --ignore-space-at-eol --ignore-space-change
 			--ignore-all-space --ignore-blank-lines --exit-code
 			--quiet --ext-diff --no-ext-diff
@@ -1411,7 +1445,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
 			--dirstat --dirstat= --dirstat-by-file
 			--dirstat-by-file= --cumulative
 			--diff-algorithm=
-			--submodule --submodule=
+			--submodule --submodule= --ignore-submodules
 "
 
 _git_diff ()
@@ -1452,11 +1486,11 @@ _git_difftool ()
 		return
 		;;
 	--*)
-		__gitcomp "--cached --staged --pickaxe-all --pickaxe-regex
-			--base --ours --theirs
-			--no-renames --diff-filter= --find-copies-harder
-			--relative --ignore-submodules
-			--tool="
+		__gitcomp_builtin difftool "$__git_diff_common_options
+					--base --cached --ours --theirs
+					--pickaxe-all --pickaxe-regex
+					--relative --staged
+					"
 		return
 		;;
 	esac
@@ -1465,12 +1499,6 @@ _git_difftool ()
 
 __git_fetch_recurse_submodules="yes on-demand no"
 
-__git_fetch_options="
-	--quiet --verbose --append --upload-pack --force --keep --depth=
-	--tags --no-tags --all --prune --dry-run --recurse-submodules=
-	--unshallow --update-shallow
-"
-
 _git_fetch ()
 {
 	case "$cur" in
@@ -1479,20 +1507,16 @@ _git_fetch ()
 		return
 		;;
 	--*)
-		__gitcomp "$__git_fetch_options"
+		__gitcomp_builtin fetch
 		return
 		;;
 	esac
 	__git_complete_remote_or_refspec
 }
 
-__git_format_patch_options="
-	--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_extra_options="
+	--full-index --not --all --no-prefix --src-prefix=
+	--dst-prefix= --notes
 "
 
 _git_format_patch ()
@@ -1505,7 +1529,7 @@ _git_format_patch ()
 		return
 		;;
 	--*)
-		__gitcomp "$__git_format_patch_options"
+		__gitcomp_builtin format-patch "$__git_format_patch_extra_options"
 		return
 		;;
 	esac
@@ -1516,20 +1540,7 @@ _git_fsck ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "
-			--tags --root --unreachable --cache --no-reflogs --full
-			--strict --verbose --lost-found --name-objects
-			"
-		return
-		;;
-	esac
-}
-
-_git_gc ()
-{
-	case "$cur" in
-	--*)
-		__gitcomp "--prune --aggressive"
+		__gitcomp_builtin fsck
 		return
 		;;
 	esac
@@ -1585,21 +1596,7 @@ _git_grep ()
 
 	case "$cur" in
 	--*)
-		__gitcomp "
-			--cached
-			--text --ignore-case --word-regexp --invert-match
-			--full-name --line-number
-			--extended-regexp --basic-regexp --fixed-strings
-			--perl-regexp
-			--threads
-			--files-with-matches --name-only
-			--files-without-match
-			--max-depth
-			--count
-			--and --or --not --all-match
-			--break --heading --show-function --function-context
-			--untracked --no-index
-			"
+		__gitcomp_builtin grep
 		return
 		;;
 	esac
@@ -1617,17 +1614,16 @@ _git_help ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "--all --guides --info --man --web"
+		__gitcomp_builtin help
 		return
 		;;
 	esac
-	__git_compute_all_commands
-	__gitcomp "$__git_all_commands $(__git_aliases)
-		attributes cli core-tutorial cvs-migration
-		diffcore everyday gitk glossary hooks ignore modules
-		namespaces repository-layout revisions tutorial tutorial-2
-		workflows
-		"
+	if test -n "$GIT_TESTING_ALL_COMMAND_LIST"
+	then
+		__gitcomp "$GIT_TESTING_ALL_COMMAND_LIST $(git --list-cmds=alias,list-guide) gitk"
+	else
+		__gitcomp "$(git --list-cmds=main,nohelpers,alias,list-guide) gitk"
+	fi
 }
 
 _git_init ()
@@ -1640,7 +1636,7 @@ _git_init ()
 		return
 		;;
 	--*)
-		__gitcomp "--quiet --bare --template= --shared --shared="
+		__gitcomp_builtin init
 		return
 		;;
 	esac
@@ -1650,13 +1646,7 @@ _git_ls_files ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "--cached --deleted --modified --others --ignored
-			--stage --directory --no-empty-directory --unmerged
-			--killed --exclude= --exclude-from=
-			--exclude-per-directory= --exclude-standard
-			--error-unmatch --with-tree= --full-name
-			--abbrev --ignored --exclude-per-directory
-			"
+		__gitcomp_builtin ls-files
 		return
 		;;
 	esac
@@ -1670,7 +1660,7 @@ _git_ls_remote ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "--heads --tags --refs --get-url --symref"
+		__gitcomp_builtin ls-remote
 		return
 		;;
 	esac
@@ -1679,6 +1669,13 @@ _git_ls_remote ()
 
 _git_ls_tree ()
 {
+	case "$cur" in
+	--*)
+		__gitcomp_builtin ls-tree
+		return
+		;;
+	esac
+
 	__git_complete_file
 }
 
@@ -1794,22 +1791,13 @@ _git_log ()
 	__git_complete_revlist
 }
 
-# Common merge options shared by git-merge(1) and git-pull(1).
-__git_merge_options="
-	--no-commit --no-stat --log --no-log --squash --strategy
-	--commit --stat --no-squash --ff --no-ff --ff-only --edit --no-edit
-	--verify-signatures --no-verify-signatures --gpg-sign
-	--quiet --verbose --progress --no-progress
-"
-
 _git_merge ()
 {
 	__git_complete_strategy && return
 
 	case "$cur" in
 	--*)
-		__gitcomp "$__git_merge_options
-			--rerere-autoupdate --no-rerere-autoupdate --abort --continue"
+		__gitcomp_builtin merge
 		return
 	esac
 	__git_complete_refs
@@ -1823,7 +1811,7 @@ _git_mergetool ()
 		return
 		;;
 	--*)
-		__gitcomp "--tool= --prompt --no-prompt"
+		__gitcomp "--tool= --prompt --no-prompt --gui --no-gui"
 		return
 		;;
 	esac
@@ -1833,7 +1821,7 @@ _git_merge_base ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "--octopus --independent --is-ancestor --fork-point"
+		__gitcomp_builtin merge-base
 		return
 		;;
 	esac
@@ -1844,7 +1832,7 @@ _git_mv ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "--dry-run"
+		__gitcomp_builtin mv
 		return
 		;;
 	esac
@@ -1858,19 +1846,14 @@ _git_mv ()
 	fi
 }
 
-_git_name_rev ()
-{
-	__gitcomp "--tags --all --stdin"
-}
-
 _git_notes ()
 {
-	local subcommands='add append copy edit list prune remove show'
+	local subcommands='add append copy edit get-ref list merge prune remove show'
 	local subcommand="$(__git_find_on_cmdline "$subcommands")"
 
 	case "$subcommand,$cur" in
 	,--*)
-		__gitcomp '--ref'
+		__gitcomp_builtin notes
 		;;
 	,*)
 		case "$prev" in
@@ -1882,21 +1865,14 @@ _git_notes ()
 			;;
 		esac
 		;;
-	add,--reuse-message=*|append,--reuse-message=*|\
-	add,--reedit-message=*|append,--reedit-message=*)
+	*,--reuse-message=*|*,--reedit-message=*)
 		__git_complete_refs --cur="${cur#*=}"
 		;;
-	add,--*|append,--*)
-		__gitcomp '--file= --message= --reedit-message=
-				--reuse-message='
-		;;
-	copy,--*)
-		__gitcomp '--stdin'
-		;;
-	prune,--*)
-		__gitcomp '--dry-run --verbose'
+	*,--*)
+		__gitcomp_builtin notes_$subcommand
 		;;
-	prune,*)
+	prune,*|get-ref,*)
+		# this command does not take a ref, do not complete it
 		;;
 	*)
 		case "$prev" in
@@ -1920,11 +1896,8 @@ _git_pull ()
 		return
 		;;
 	--*)
-		__gitcomp "
-			--rebase --no-rebase
-			$__git_merge_options
-			$__git_fetch_options
-		"
+		__gitcomp_builtin pull
+
 		return
 		;;
 	esac
@@ -1974,28 +1947,37 @@ _git_push ()
 		__git_complete_force_with_lease "${cur##--force-with-lease=}"
 		return
 		;;
+	--*)
+		__gitcomp_builtin push
+		return
+		;;
+	esac
+	__git_complete_remote_or_refspec
+}
+
+_git_range_diff ()
+{
+	case "$cur" in
 	--*)
 		__gitcomp "
-			--all --mirror --tags --dry-run --force --verbose
-			--quiet --prune --delete --follow-tags
-			--receive-pack= --repo= --set-upstream
-			--force-with-lease --force-with-lease= --recurse-submodules=
+			--creation-factor= --no-dual-color
+			$__git_diff_common_options
 		"
 		return
 		;;
 	esac
-	__git_complete_remote_or_refspec
+	__git_complete_revlist
 }
 
 _git_rebase ()
 {
 	__git_find_repo_path
 	if [ -f "$__git_repo_path"/rebase-merge/interactive ]; then
-		__gitcomp "--continue --skip --abort --quit --edit-todo"
+		__gitcomp "--continue --skip --abort --quit --edit-todo --show-current-patch"
 		return
 	elif [ -d "$__git_repo_path"/rebase-apply ] || \
 	     [ -d "$__git_repo_path"/rebase-merge ]; then
-		__gitcomp "--continue --skip --abort --quit"
+		__gitcomp "--continue --skip --abort --quit --show-current-patch"
 		return
 	fi
 	__git_complete_strategy && return
@@ -2007,7 +1989,7 @@ _git_rebase ()
 	--*)
 		__gitcomp "
 			--onto --merge --strategy --interactive
-			--preserve-merges --stat --no-stat
+			--rebase-merges --preserve-merges --stat --no-stat
 			--committer-date-is-author-date --ignore-date
 			--ignore-whitespace --whitespace=
 			--autosquash --no-autosquash
@@ -2015,6 +1997,7 @@ _git_rebase ()
 			--autostash --no-autostash
 			--verify --no-verify
 			--keep-empty --root --force-rebase --no-ff
+			--rerere-autoupdate
 			--exec
 			"
 
@@ -2076,16 +2059,16 @@ _git_send_email ()
 		return
 		;;
 	--*)
-		__gitcomp "--annotate --bcc --cc --cc-cmd --chain-reply-to
+		__gitcomp_builtin send-email "--annotate --bcc --cc --cc-cmd --chain-reply-to
 			--compose --confirm= --dry-run --envelope-sender
 			--from --identity
 			--in-reply-to --no-chain-reply-to --no-signed-off-by-cc
-			--no-suppress-from --no-thread --quiet
+			--no-suppress-from --no-thread --quiet --reply-to
 			--signed-off-by-cc --smtp-pass --smtp-server
 			--smtp-server-port --smtp-encryption= --smtp-user
 			--subject --suppress-cc= --suppress-from --thread --to
 			--validate --no-validate
-			$__git_format_patch_options"
+			$__git_format_patch_extra_options"
 		return
 		;;
 	esac
@@ -2118,11 +2101,7 @@ _git_status ()
 		return
 		;;
 	--*)
-		__gitcomp "
-			--short --branch --porcelain --long --verbose
-			--untracked-files= --ignore-submodules= --ignored
-			--column= --no-column
-			"
+		__gitcomp_builtin status
 		return
 		;;
 	esac
@@ -2169,9 +2148,24 @@ __git_config_get_set_variables ()
 	__git config $config_file --name-only --list
 }
 
+__git_config_vars=
+__git_compute_config_vars ()
+{
+	test -n "$__git_config_vars" ||
+	__git_config_vars="$(git help --config-for-completion | sort | uniq)"
+}
+
 _git_config ()
 {
-	case "$prev" in
+	local varname
+
+	if [ "${BASH_VERSINFO[0]:-0}" -ge 4 ]; then
+		varname="${prev,,}"
+	else
+		varname="$(echo "$prev" |tr A-Z a-z)"
+	fi
+
+	case "$varname" in
 	branch.*.remote|branch.*.pushremote)
 		__gitcomp_nl "$(__git_remotes)"
 		return
@@ -2181,7 +2175,7 @@ _git_config ()
 		return
 		;;
 	branch.*.rebase)
-		__gitcomp "false true preserve interactive"
+		__gitcomp "false true merges preserve interactive"
 		return
 		;;
 	remote.pushdefault)
@@ -2238,7 +2232,7 @@ _git_config ()
 		__gitcomp "$__git_log_date_formats"
 		return
 		;;
-	sendemail.aliasesfiletype)
+	sendemail.aliasfiletype)
 		__gitcomp "mutt mailrc pine elm gnus"
 		return
 		;;
@@ -2264,32 +2258,25 @@ _git_config ()
 	esac
 	case "$cur" in
 	--*)
-		__gitcomp "
-			--system --global --local --file=
-			--list --replace-all
-			--get --get-all --get-regexp
-			--add --unset --unset-all
-			--remove-section --rename-section
-			--name-only
-			"
+		__gitcomp_builtin config
 		return
 		;;
 	branch.*.*)
 		local pfx="${cur%.*}." cur_="${cur##*.}"
-		__gitcomp "remote pushremote merge mergeoptions rebase" "$pfx" "$cur_"
+		__gitcomp "remote pushRemote merge mergeOptions rebase" "$pfx" "$cur_"
 		return
 		;;
 	branch.*)
 		local pfx="${cur%.*}." cur_="${cur#*.}"
 		__gitcomp_direct "$(__git_heads "$pfx" "$cur_" ".")"
-		__gitcomp_nl_append $'autosetupmerge\nautosetuprebase\n' "$pfx" "$cur_"
+		__gitcomp_nl_append $'autoSetupMerge\nautoSetupRebase\n' "$pfx" "$cur_"
 		return
 		;;
 	guitool.*.*)
 		local pfx="${cur%.*}." cur_="${cur##*.}"
 		__gitcomp "
-			argprompt cmd confirm needsfile noconsole norescan
-			prompt revprompt revunmerged title
+			argPrompt cmd confirm needsFile noConsole noRescan
+			prompt revPrompt revUnmerged title
 			" "$pfx" "$cur_"
 		return
 		;;
@@ -2318,14 +2305,14 @@ _git_config ()
 		local pfx="${cur%.*}." cur_="${cur##*.}"
 		__gitcomp "
 			url proxy fetch push mirror skipDefaultUpdate
-			receivepack uploadpack tagopt pushurl
+			receivepack uploadpack tagOpt pushurl
 			" "$pfx" "$cur_"
 		return
 		;;
 	remote.*)
 		local pfx="${cur%.*}." cur_="${cur#*.}"
 		__gitcomp_nl "$(__git_remotes)" "$pfx" "$cur_" "."
-		__gitcomp_nl_append "pushdefault" "$pfx" "$cur_"
+		__gitcomp_nl_append "pushDefault" "$pfx" "$cur_"
 		return
 		;;
 	url.*.*)
@@ -2333,330 +2320,14 @@ _git_config ()
 		__gitcomp "insteadOf pushInsteadOf" "$pfx" "$cur_"
 		return
 		;;
+	*.*)
+		__git_compute_config_vars
+		__gitcomp "$__git_config_vars"
+		;;
+	*)
+		__git_compute_config_vars
+		__gitcomp "$(echo "$__git_config_vars" | sed 's/\.[^ ]*/./g')"
 	esac
-	__gitcomp "
-		add.ignoreErrors
-		advice.amWorkDir
-		advice.commitBeforeMerge
-		advice.detachedHead
-		advice.implicitIdentity
-		advice.pushAlreadyExists
-		advice.pushFetchFirst
-		advice.pushNeedsForce
-		advice.pushNonFFCurrent
-		advice.pushNonFFMatching
-		advice.pushUpdateRejected
-		advice.resolveConflict
-		advice.rmHints
-		advice.statusHints
-		advice.statusUoption
-		alias.
-		am.keepcr
-		am.threeWay
-		apply.ignorewhitespace
-		apply.whitespace
-		branch.autosetupmerge
-		branch.autosetuprebase
-		browser.
-		clean.requireForce
-		color.branch
-		color.branch.current
-		color.branch.local
-		color.branch.plain
-		color.branch.remote
-		color.decorate.HEAD
-		color.decorate.branch
-		color.decorate.remoteBranch
-		color.decorate.stash
-		color.decorate.tag
-		color.diff
-		color.diff.commit
-		color.diff.frag
-		color.diff.func
-		color.diff.meta
-		color.diff.new
-		color.diff.old
-		color.diff.plain
-		color.diff.whitespace
-		color.grep
-		color.grep.context
-		color.grep.filename
-		color.grep.function
-		color.grep.linenumber
-		color.grep.match
-		color.grep.selected
-		color.grep.separator
-		color.interactive
-		color.interactive.error
-		color.interactive.header
-		color.interactive.help
-		color.interactive.prompt
-		color.pager
-		color.showbranch
-		color.status
-		color.status.added
-		color.status.changed
-		color.status.header
-		color.status.localBranch
-		color.status.nobranch
-		color.status.remoteBranch
-		color.status.unmerged
-		color.status.untracked
-		color.status.updated
-		color.ui
-		commit.cleanup
-		commit.gpgSign
-		commit.status
-		commit.template
-		commit.verbose
-		core.abbrev
-		core.askpass
-		core.attributesfile
-		core.autocrlf
-		core.bare
-		core.bigFileThreshold
-		core.checkStat
-		core.commentChar
-		core.compression
-		core.createObject
-		core.deltaBaseCacheLimit
-		core.editor
-		core.eol
-		core.excludesfile
-		core.fileMode
-		core.fsyncobjectfiles
-		core.gitProxy
-		core.hideDotFiles
-		core.hooksPath
-		core.ignoreStat
-		core.ignorecase
-		core.logAllRefUpdates
-		core.loosecompression
-		core.notesRef
-		core.packedGitLimit
-		core.packedGitWindowSize
-		core.packedRefsTimeout
-		core.pager
-		core.precomposeUnicode
-		core.preferSymlinkRefs
-		core.preloadindex
-		core.protectHFS
-		core.protectNTFS
-		core.quotepath
-		core.repositoryFormatVersion
-		core.safecrlf
-		core.sharedRepository
-		core.sparseCheckout
-		core.splitIndex
-		core.sshCommand
-		core.symlinks
-		core.trustctime
-		core.untrackedCache
-		core.warnAmbiguousRefs
-		core.whitespace
-		core.worktree
-		credential.helper
-		credential.useHttpPath
-		credential.username
-		credentialCache.ignoreSIGHUP
-		diff.autorefreshindex
-		diff.external
-		diff.ignoreSubmodules
-		diff.mnemonicprefix
-		diff.noprefix
-		diff.renameLimit
-		diff.renames
-		diff.statGraphWidth
-		diff.submodule
-		diff.suppressBlankEmpty
-		diff.tool
-		diff.wordRegex
-		diff.algorithm
-		difftool.
-		difftool.prompt
-		fetch.recurseSubmodules
-		fetch.unpackLimit
-		format.attach
-		format.cc
-		format.coverLetter
-		format.from
-		format.headers
-		format.numbered
-		format.pretty
-		format.signature
-		format.signoff
-		format.subjectprefix
-		format.suffix
-		format.thread
-		format.to
-		gc.
-		gc.aggressiveDepth
-		gc.aggressiveWindow
-		gc.auto
-		gc.autoDetach
-		gc.autopacklimit
-		gc.logExpiry
-		gc.packrefs
-		gc.pruneexpire
-		gc.reflogexpire
-		gc.reflogexpireunreachable
-		gc.rerereresolved
-		gc.rerereunresolved
-		gc.worktreePruneExpire
-		gitcvs.allbinary
-		gitcvs.commitmsgannotation
-		gitcvs.dbTableNamePrefix
-		gitcvs.dbdriver
-		gitcvs.dbname
-		gitcvs.dbpass
-		gitcvs.dbuser
-		gitcvs.enabled
-		gitcvs.logfile
-		gitcvs.usecrlfattr
-		guitool.
-		gui.blamehistoryctx
-		gui.commitmsgwidth
-		gui.copyblamethreshold
-		gui.diffcontext
-		gui.encoding
-		gui.fastcopyblame
-		gui.matchtrackingbranch
-		gui.newbranchtemplate
-		gui.pruneduringfetch
-		gui.spellingdictionary
-		gui.trustmtime
-		help.autocorrect
-		help.browser
-		help.format
-		http.lowSpeedLimit
-		http.lowSpeedTime
-		http.maxRequests
-		http.minSessions
-		http.noEPSV
-		http.postBuffer
-		http.proxy
-		http.sslCipherList
-		http.sslVersion
-		http.sslCAInfo
-		http.sslCAPath
-		http.sslCert
-		http.sslCertPasswordProtected
-		http.sslKey
-		http.sslVerify
-		http.useragent
-		i18n.commitEncoding
-		i18n.logOutputEncoding
-		imap.authMethod
-		imap.folder
-		imap.host
-		imap.pass
-		imap.port
-		imap.preformattedHTML
-		imap.sslverify
-		imap.tunnel
-		imap.user
-		init.templatedir
-		instaweb.browser
-		instaweb.httpd
-		instaweb.local
-		instaweb.modulepath
-		instaweb.port
-		interactive.singlekey
-		log.date
-		log.decorate
-		log.showroot
-		mailmap.file
-		man.
-		man.viewer
-		merge.
-		merge.conflictstyle
-		merge.log
-		merge.renameLimit
-		merge.renormalize
-		merge.stat
-		merge.tool
-		merge.verbosity
-		mergetool.
-		mergetool.keepBackup
-		mergetool.keepTemporaries
-		mergetool.prompt
-		notes.displayRef
-		notes.rewrite.
-		notes.rewrite.amend
-		notes.rewrite.rebase
-		notes.rewriteMode
-		notes.rewriteRef
-		pack.compression
-		pack.deltaCacheLimit
-		pack.deltaCacheSize
-		pack.depth
-		pack.indexVersion
-		pack.packSizeLimit
-		pack.threads
-		pack.window
-		pack.windowMemory
-		pager.
-		pretty.
-		pull.octopus
-		pull.twohead
-		push.default
-		push.followTags
-		rebase.autosquash
-		rebase.stat
-		receive.autogc
-		receive.denyCurrentBranch
-		receive.denyDeleteCurrent
-		receive.denyDeletes
-		receive.denyNonFastForwards
-		receive.fsckObjects
-		receive.unpackLimit
-		receive.updateserverinfo
-		remote.pushdefault
-		remotes.
-		repack.usedeltabaseoffset
-		rerere.autoupdate
-		rerere.enabled
-		sendemail.
-		sendemail.aliasesfile
-		sendemail.aliasfiletype
-		sendemail.bcc
-		sendemail.cc
-		sendemail.cccmd
-		sendemail.chainreplyto
-		sendemail.confirm
-		sendemail.envelopesender
-		sendemail.from
-		sendemail.identity
-		sendemail.multiedit
-		sendemail.signedoffbycc
-		sendemail.smtpdomain
-		sendemail.smtpencryption
-		sendemail.smtppass
-		sendemail.smtpserver
-		sendemail.smtpserveroption
-		sendemail.smtpserverport
-		sendemail.smtpuser
-		sendemail.suppresscc
-		sendemail.suppressfrom
-		sendemail.thread
-		sendemail.to
-		sendemail.validate
-		sendemail.smtpbatchsize
-		sendemail.smtprelogindelay
-		showbranch.default
-		status.relativePaths
-		status.showUntrackedFiles
-		status.submodulesummary
-		submodule.
-		tar.umask
-		transfer.unpackLimit
-		url.
-		user.email
-		user.name
-		user.signingkey
-		web.browser
-		branch. remote.
-	"
 }
 
 _git_remote ()
@@ -2669,7 +2340,7 @@ _git_remote ()
 	if [ -z "$subcommand" ]; then
 		case "$cur" in
 		--*)
-			__gitcomp "--verbose"
+			__gitcomp_builtin remote
 			;;
 		*)
 			__gitcomp "$subcommands"
@@ -2680,33 +2351,33 @@ _git_remote ()
 
 	case "$subcommand,$cur" in
 	add,--*)
-		__gitcomp "--track --master --fetch --tags --no-tags --mirror="
+		__gitcomp_builtin remote_add
 		;;
 	add,*)
 		;;
 	set-head,--*)
-		__gitcomp "--auto --delete"
+		__gitcomp_builtin remote_set-head
 		;;
 	set-branches,--*)
-		__gitcomp "--add"
+		__gitcomp_builtin remote_set-branches
 		;;
 	set-head,*|set-branches,*)
 		__git_complete_remote_or_refspec
 		;;
 	update,--*)
-		__gitcomp "--prune"
+		__gitcomp_builtin remote_update
 		;;
 	update,*)
-		__gitcomp "$(__git_get_config_variables "remotes")"
+		__gitcomp "$(__git_remotes) $(__git_get_config_variables "remotes")"
 		;;
 	set-url,--*)
-		__gitcomp "--push --add --delete"
+		__gitcomp_builtin remote_set-url
 		;;
 	get-url,--*)
-		__gitcomp "--push --all"
+		__gitcomp_builtin remote_get-url
 		;;
 	prune,--*)
-		__gitcomp "--dry-run"
+		__gitcomp_builtin remote_prune
 		;;
 	*)
 		__gitcomp_nl "$(__git_remotes)"
@@ -2718,7 +2389,7 @@ _git_replace ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "--edit --graft --format= --list --delete"
+		__gitcomp_builtin replace
 		return
 		;;
 	esac
@@ -2742,26 +2413,26 @@ _git_reset ()
 
 	case "$cur" in
 	--*)
-		__gitcomp "--merge --mixed --hard --soft --patch --keep"
+		__gitcomp_builtin reset
 		return
 		;;
 	esac
 	__git_complete_refs
 }
 
+__git_revert_inprogress_options="--continue --quit --abort"
+
 _git_revert ()
 {
 	__git_find_repo_path
 	if [ -f "$__git_repo_path"/REVERT_HEAD ]; then
-		__gitcomp "--continue --quit --abort"
+		__gitcomp "$__git_revert_inprogress_options"
 		return
 	fi
 	case "$cur" in
 	--*)
-		__gitcomp "
-			--edit --mainline --no-edit --no-commit --signoff
-			--strategy= --strategy-option=
-			"
+		__gitcomp_builtin revert "" \
+			"$__git_revert_inprogress_options"
 		return
 		;;
 	esac
@@ -2772,7 +2443,7 @@ _git_rm ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "--cached --dry-run --ignore-unmatch --quiet"
+		__gitcomp_builtin rm
 		return
 		;;
 	esac
@@ -2830,12 +2501,7 @@ _git_show_branch ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "
-			--all --remotes --topo-order --date-order --current --more=
-			--list --independent --merge-base --no-name
-			--color --no-color
-			--sha1-name --sparse --topics --reflog
-			"
+		__gitcomp_builtin show-branch
 		return
 		;;
 	esac
@@ -2845,13 +2511,21 @@ _git_show_branch ()
 _git_stash ()
 {
 	local save_opts='--all --keep-index --no-keep-index --quiet --patch --include-untracked'
-	local subcommands='push save list show apply clear drop pop create branch'
-	local subcommand="$(__git_find_on_cmdline "$subcommands")"
+	local subcommands='push list show apply clear drop pop create branch'
+	local subcommand="$(__git_find_on_cmdline "$subcommands save")"
+	if [ -n "$(__git_find_on_cmdline "-p")" ]; then
+		subcommand="push"
+	fi
 	if [ -z "$subcommand" ]; then
 		case "$cur" in
 		--*)
 			__gitcomp "$save_opts"
 			;;
+		sa*)
+			if [ -z "$(__git_find_on_cmdline "$save_opts")" ]; then
+				__gitcomp "save"
+			fi
+			;;
 		*)
 			if [ -z "$(__git_find_on_cmdline "$save_opts")" ]; then
 				__gitcomp "$subcommands"
@@ -2872,6 +2546,9 @@ _git_stash ()
 		drop,--*)
 			__gitcomp "--quiet"
 			;;
+		list,--*)
+			__gitcomp "--name-status --oneline --patch-with-stat"
+			;;
 		show,--*|branch,--*)
 			;;
 		branch,*)
@@ -3042,7 +2719,7 @@ _git_tag ()
 	while [ $c -lt $cword ]; do
 		i="${words[c]}"
 		case "$i" in
-		-d|-v)
+		-d|--delete|-v|--verify)
 			__gitcomp_direct "$(__git_tags "" "$cur" " ")"
 			return
 			;;
@@ -3068,11 +2745,7 @@ _git_tag ()
 
 	case "$cur" in
 	--*)
-		__gitcomp "
-			--list --delete --verify --annotate --message --file
-			--sign --cleanup --local-user --force --column --sort=
-			--contains --no-contains --points-at --merged --no-merged --create-reflog
-			"
+		__gitcomp_builtin tag
 		;;
 	esac
 }
@@ -3084,23 +2757,26 @@ _git_whatchanged ()
 
 _git_worktree ()
 {
-	local subcommands="add list lock prune unlock"
+	local subcommands="add list lock move prune remove unlock"
 	local subcommand="$(__git_find_on_cmdline "$subcommands")"
 	if [ -z "$subcommand" ]; then
 		__gitcomp "$subcommands"
 	else
 		case "$subcommand,$cur" in
 		add,--*)
-			__gitcomp "--detach"
+			__gitcomp_builtin worktree_add
 			;;
 		list,--*)
-			__gitcomp "--porcelain"
+			__gitcomp_builtin worktree_list
 			;;
 		lock,--*)
-			__gitcomp "--reason"
+			__gitcomp_builtin worktree_lock
 			;;
 		prune,--*)
-			__gitcomp "--dry-run --expire --verbose"
+			__gitcomp_builtin worktree_prune
+			;;
+		remove,--*)
+			__gitcomp "--force"
 			;;
 		*)
 			;;
@@ -3108,6 +2784,52 @@ _git_worktree ()
 	fi
 }
 
+__git_complete_common () {
+	local command="$1"
+
+	case "$cur" in
+	--*)
+		__gitcomp_builtin "$command"
+		;;
+	esac
+}
+
+__git_cmds_with_parseopt_helper=
+__git_support_parseopt_helper () {
+	test -n "$__git_cmds_with_parseopt_helper" ||
+		__git_cmds_with_parseopt_helper="$(__git --list-cmds=parseopt)"
+
+	case " $__git_cmds_with_parseopt_helper " in
+	*" $1 "*)
+		return 0
+		;;
+	*)
+		return 1
+		;;
+	esac
+}
+
+__git_complete_command () {
+	local command="$1"
+	local completion_func="_git_${command//-/_}"
+	if ! declare -f $completion_func >/dev/null 2>/dev/null &&
+		declare -f _completion_loader >/dev/null 2>/dev/null
+	then
+		_completion_loader "git-$command"
+	fi
+	if declare -f $completion_func >/dev/null 2>/dev/null
+	then
+		$completion_func
+		return 0
+	elif __git_support_parseopt_helper "$command"
+	then
+		__git_complete_common "$command"
+		return 0
+	else
+		return 1
+	fi
+}
+
 __git_main ()
 {
 	local i c=1 command __git_dir __git_repo_path
@@ -3161,20 +2883,24 @@ __git_main ()
 			--help
 			"
 			;;
-		*)     __git_compute_porcelain_commands
-		       __gitcomp "$__git_porcelain_commands $(__git_aliases)" ;;
+		*)
+			if test -n "$GIT_TESTING_PORCELAIN_COMMAND_LIST"
+			then
+				__gitcomp "$GIT_TESTING_PORCELAIN_COMMAND_LIST"
+			else
+				__gitcomp "$(git --list-cmds=list-mainporcelain,others,nohelpers,alias,list-complete,config)"
+			fi
+			;;
 		esac
 		return
 	fi
 
-	local completion_func="_git_${command//-/_}"
-	declare -f $completion_func >/dev/null 2>/dev/null && $completion_func && return
+	__git_complete_command "$command" && return
 
 	local expansion=$(__git_aliased_command "$command")
 	if [ -n "$expansion" ]; then
 		words[1]=$expansion
-		completion_func="_git_${expansion//-/_}"
-		declare -f $completion_func >/dev/null 2>/dev/null && $completion_func
+		__git_complete_command "$expansion"
 	fi
 }
 
@@ -3202,7 +2928,10 @@ __gitk_main ()
 	__git_complete_revlist
 }
 
-if [[ -n ${ZSH_VERSION-} ]]; then
+if [[ -n ${ZSH_VERSION-} ]] &&
+   # Don't define these functions when sourced from 'git-completion.zsh',
+   # it has its own implementations.
+   [[ -z ${GIT_SOURCING_ZSH_COMPLETION-} ]]; then
 	echo "WARNING: this script is deprecated, please see git-completion.zsh" 1>&2
 
 	autoload -U +X compinit && compinit
@@ -3251,13 +2980,22 @@ if [[ -n ${ZSH_VERSION-} ]]; then
 		compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0
 	}
 
+	__gitcomp_file_direct ()
+	{
+		emulate -L zsh
+
+		local IFS=$'\n'
+		compset -P '*[=:]'
+		compadd -f -- ${=1} && _ret=0
+	}
+
 	__gitcomp_file ()
 	{
 		emulate -L zsh
 
 		local IFS=$'\n'
 		compset -P '*[=:]'
-		compadd -Q -p "${2-}" -f -- ${=1} && _ret=0
+		compadd -p "${2-}" -f -- ${=1} && _ret=0
 	}
 
 	_git ()
@@ -3312,6 +3050,6 @@ __git_complete gitk __gitk_main
 # when the user has tab-completed the executable name and consequently
 # included the '.exe' suffix.
 #
-if [ Cygwin = "$(uname -o 2>/dev/null)" ]; then
+if [[ "$OSTYPE" = cygwin* ]]; then
 __git_complete git.exe __git_main
 fi
diff --git a/plugins/gitfast/git-prompt.sh b/plugins/gitfast/git-prompt.sh
index cd905759e..fd2b049db 100644
--- a/plugins/gitfast/git-prompt.sh
+++ b/plugins/gitfast/git-prompt.sh
@@ -278,11 +278,12 @@ __git_ps1_colorize_gitstring ()
 	r="$c_clear$r"
 }
 
+# Helper function to read the first line of a file into a variable.
+# __git_eread requires 2 arguments, the file path and the name of the
+# variable, in that order.
 __git_eread ()
 {
-	local f="$1"
-	shift
-	test -r "$f" && read "$@" <"$f"
+	test -r "$1" && IFS=$'\r\n' read "$2" <"$1"
 }
 
 # __git_ps1 accepts 0 or 1 arguments (i.e., format string)
diff --git a/plugins/gitfast/gitfast.plugin.zsh b/plugins/gitfast/gitfast.plugin.zsh
index 8c2aea497..7b6b67e92 100644
--- a/plugins/gitfast/gitfast.plugin.zsh
+++ b/plugins/gitfast/gitfast.plugin.zsh
@@ -1,9 +1,6 @@
-dir="${0:A:h}"
-source "$dir/git-prompt.sh"
+source "${0:A:h}/git-prompt.sh"
 
 function git_prompt_info() {
   dirty="$(parse_git_dirty)"
   __git_ps1 "${ZSH_THEME_GIT_PROMPT_PREFIX//\%/%%}%s${dirty//\%/%%}${ZSH_THEME_GIT_PROMPT_SUFFIX//\%/%%}"
 }
-
-unset dir
diff --git a/plugins/gitfast/update b/plugins/gitfast/update
new file mode 100755
index 000000000..76ecc71e0
--- /dev/null
+++ b/plugins/gitfast/update
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+url="https://git.kernel.org/pub/scm/git/git.git/plain/contrib/completion"
+version="2.21.0"
+
+curl -s -o _git "${url}/git-completion.zsh?h=v${version}" &&
+curl -s -o git-completion.bash "${url}/git-completion.bash?h=v${version}" &&
+curl -s -o git-prompt.sh "${url}/git-prompt.sh?h=v${version}" &&
+git apply updates.patch
diff --git a/plugins/gitfast/updates.patch b/plugins/gitfast/updates.patch
new file mode 100644
index 000000000..28a31f859
--- /dev/null
+++ b/plugins/gitfast/updates.patch
@@ -0,0 +1,56 @@
+diff --git b/plugins/gitfast/_git a/plugins/gitfast/_git
+index e2554130..a2e3bef5 100644
+--- b/plugins/gitfast/_git
++++ a/plugins/gitfast/_git
+@@ -30,7 +30,7 @@ if [ -z "$script" ]; then
+ 	local -a locations
+ 	local e
+ 	locations=(
+-		$(dirname ${funcsourcetrace[1]%:*})/git-completion.bash
++		"$(dirname ${funcsourcetrace[1]%:*})/git-completion.bash"
+ 		'/etc/bash_completion.d/git' # fedora, old debian
+ 		'/usr/share/bash-completion/completions/git' # arch, ubuntu, new debian
+ 		'/usr/share/bash-completion/git' # gentoo
+@@ -214,8 +214,10 @@ _git ()
+ 
+ 	if (( $+functions[__${service}_zsh_main] )); then
+ 		__${service}_zsh_main
+-	else
++	elif (( $+functions[__${service}_main] )); then
+ 		emulate ksh -c __${service}_main
++	elif (( $+functions[_${service}] )); then
++		emulate ksh -c _${service}
+ 	fi
+ 
+ 	let _ret && _default && _ret=0
+diff --git b/plugins/gitfast/git-completion.bash a/plugins/gitfast/git-completion.bash
+index 9c8f7380..14012cab 100644
+--- b/plugins/gitfast/git-completion.bash
++++ a/plugins/gitfast/git-completion.bash
+@@ -2915,6 +2915,6 @@ __git_complete gitk __gitk_main
+ # when the user has tab-completed the executable name and consequently
+ # included the '.exe' suffix.
+ #
+-if [ Cygwin = "$(uname -o 2>/dev/null)" ]; then
++if [[ "$OSTYPE" = cygwin* ]]; then
+ __git_complete git.exe __git_main
+ fi
+diff --git b/plugins/gitfast/git-prompt.sh a/plugins/gitfast/git-prompt.sh
+index 97eacd78..c1de34eb 100644
+--- b/plugins/gitfast/git-prompt.sh
++++ a/plugins/gitfast/git-prompt.sh
+@@ -502,9 +502,11 @@ __git_ps1 ()
+ 
+ 	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
++	# NO color option unless in PROMPT_COMMAND mode or it's Zsh
++	if [ -n "${GIT_PS1_SHOWCOLORHINTS-}" ]; then
++		if [ $pcmode = yes ] || [ -n "${ZSH_VERSION-}" ]; then
++			__git_ps1_colorize_gitstring
++		fi
+ 	fi
+ 
+ 	b=${b##refs/heads/}
-- 
cgit v1.2.3-70-g09d2


From 65f34ce80ed0aabe92ad3815ceb79db45004598b Mon Sep 17 00:00:00 2001
From: Roger Steneteg <36709673+rsteneteg@users.noreply.github.com>
Date: Fri, 7 Jun 2019 11:30:08 -0500
Subject: kube-ps1: fix color bleeding in prompt (#7915)

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

(limited to 'plugins')

diff --git a/plugins/kube-ps1/kube-ps1.plugin.zsh b/plugins/kube-ps1/kube-ps1.plugin.zsh
index 8a751bda8..3cb21284a 100644
--- a/plugins/kube-ps1/kube-ps1.plugin.zsh
+++ b/plugins/kube-ps1/kube-ps1.plugin.zsh
@@ -41,9 +41,9 @@ KUBE_PS1_SUFFIX="${KUBE_PS1_SUFFIX-)}"
 KUBE_PS1_LAST_TIME=0
 KUBE_PS1_ENABLED=true
 
-KUBE_PS1_COLOR_SYMBOL="%F{blue}"
-KUBE_PS1_COLOR_CONTEXT="%F{red}"
-KUBE_PS1_COLOR_NS="%F{cyan}"
+KUBE_PS1_COLOR_SYMBOL="%{$fg[blue]%}"
+KUBE_PS1_COLOR_CONTEXT="%{$fg[red]%}"
+KUBE_PS1_COLOR_NS="%{$fg[cyan]%}"
 
 _kube_ps1_binary_check() {
   command -v "$1" >/dev/null
-- 
cgit v1.2.3-70-g09d2


From d69bad8eb4157e5fd5c1a4ce98f93cf522477a8c Mon Sep 17 00:00:00 2001
From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Sat, 8 Jun 2019 09:33:56 -0500
Subject: gitfast: downgrade to upstream v2.16 (#7918)

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 plugins/gitfast/_git                |   13 +-
 plugins/gitfast/git-completion.bash | 1241 +++++++++++++++++++++--------------
 plugins/gitfast/update              |    2 +-
 3 files changed, 756 insertions(+), 500 deletions(-)

(limited to 'plugins')

diff --git a/plugins/gitfast/_git b/plugins/gitfast/_git
index c003a6771..78a6dbb3d 100644
--- a/plugins/gitfast/_git
+++ b/plugins/gitfast/_git
@@ -39,7 +39,7 @@ if [ -z "$script" ]; then
 		test -f $e && script="$e" && break
 	done
 fi
-GIT_SOURCING_ZSH_COMPLETION=y . "$script"
+ZSH_VERSION='' . "$script"
 
 __gitcomp ()
 {
@@ -93,22 +93,13 @@ __gitcomp_nl_append ()
 	compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0
 }
 
-__gitcomp_file_direct ()
-{
-	emulate -L zsh
-
-	local IFS=$'\n'
-	compset -P '*[=:]'
-	compadd -f -- ${=1} && _ret=0
-}
-
 __gitcomp_file ()
 {
 	emulate -L zsh
 
 	local IFS=$'\n'
 	compset -P '*[=:]'
-	compadd -p "${2-}" -f -- ${=1} && _ret=0
+	compadd -Q -p "${2-}" -f -- ${=1} && _ret=0
 }
 
 __git_zsh_bash_func ()
diff --git a/plugins/gitfast/git-completion.bash b/plugins/gitfast/git-completion.bash
index 700417879..b6ff5dc08 100644
--- a/plugins/gitfast/git-completion.bash
+++ b/plugins/gitfast/git-completion.bash
@@ -29,8 +29,6 @@
 # tell the completion to use commit completion.  This also works with aliases
 # of form "!sh -c '...'".  For example, "!sh -c ': git commit ; ... '".
 #
-# Compatible with bash 3.2.57.
-#
 # You can set the following environment variables to influence the behavior of
 # the completion routines:
 #
@@ -94,70 +92,6 @@ __git ()
 		${__git_dir:+--git-dir="$__git_dir"} "$@" 2>/dev/null
 }
 
-# Removes backslash escaping, single quotes and double quotes from a word,
-# stores the result in the variable $dequoted_word.
-# 1: The word to dequote.
-__git_dequote ()
-{
-	local rest="$1" len ch
-
-	dequoted_word=""
-
-	while test -n "$rest"; do
-		len=${#dequoted_word}
-		dequoted_word="$dequoted_word${rest%%[\\\'\"]*}"
-		rest="${rest:$((${#dequoted_word}-$len))}"
-
-		case "${rest:0:1}" in
-		\\)
-			ch="${rest:1:1}"
-			case "$ch" in
-			$'\n')
-				;;
-			*)
-				dequoted_word="$dequoted_word$ch"
-				;;
-			esac
-			rest="${rest:2}"
-			;;
-		\')
-			rest="${rest:1}"
-			len=${#dequoted_word}
-			dequoted_word="$dequoted_word${rest%%\'*}"
-			rest="${rest:$((${#dequoted_word}-$len+1))}"
-			;;
-		\")
-			rest="${rest:1}"
-			while test -n "$rest" ; do
-				len=${#dequoted_word}
-				dequoted_word="$dequoted_word${rest%%[\\\"]*}"
-				rest="${rest:$((${#dequoted_word}-$len))}"
-				case "${rest:0:1}" in
-				\\)
-					ch="${rest:1:1}"
-					case "$ch" in
-					\"|\\|\$|\`)
-						dequoted_word="$dequoted_word$ch"
-						;;
-					$'\n')
-						;;
-					*)
-						dequoted_word="$dequoted_word\\$ch"
-						;;
-					esac
-					rest="${rest:2}"
-					;;
-				\")
-					rest="${rest:1}"
-					break
-					;;
-				esac
-			done
-			;;
-		esac
-	done
-}
-
 # The following function is based on code from:
 #
 #   bash_completion - programmable completion functions for bash 3.2+
@@ -330,32 +264,9 @@ __gitcomp ()
 	case "$cur_" in
 	--*=)
 		;;
-	--no-*)
-		local c i=0 IFS=$' \t\n'
-		for c in $1; do
-			if [[ $c == "--" ]]; then
-				continue
-			fi
-			c="$c${4-}"
-			if [[ $c == "$cur_"* ]]; then
-				case $c in
-				--*=*|*.) ;;
-				*) c="$c " ;;
-				esac
-				COMPREPLY[i++]="${2-}$c"
-			fi
-		done
-		;;
 	*)
 		local c i=0 IFS=$' \t\n'
 		for c in $1; do
-			if [[ $c == "--" ]]; then
-				c="--no-...${4-}"
-				if [[ $c == "$cur_"* ]]; then
-					COMPREPLY[i++]="${2-}$c "
-				fi
-				break
-			fi
 			c="$c${4-}"
 			if [[ $c == "$cur_"* ]]; then
 				case $c in
@@ -369,47 +280,6 @@ __gitcomp ()
 	esac
 }
 
-# Clear the variables caching builtins' options when (re-)sourcing
-# the completion script.
-if [[ -n ${ZSH_VERSION-} ]]; then
-	unset $(set |sed -ne 's/^\(__gitcomp_builtin_[a-zA-Z0-9_][a-zA-Z0-9_]*\)=.*/\1/p') 2>/dev/null
-else
-	unset $(compgen -v __gitcomp_builtin_)
-fi
-
-# This function is equivalent to
-#
-#    __gitcomp "$(git xxx --git-completion-helper) ..."
-#
-# except that the output is cached. Accept 1-3 arguments:
-# 1: the git command to execute, this is also the cache key
-# 2: extra options to be added on top (e.g. negative forms)
-# 3: options to be excluded
-__gitcomp_builtin ()
-{
-	# spaces must be replaced with underscore for multi-word
-	# commands, e.g. "git remote add" becomes remote_add.
-	local cmd="$1"
-	local incl="$2"
-	local excl="$3"
-
-	local var=__gitcomp_builtin_"${cmd/-/_}"
-	local options
-	eval "options=\$$var"
-
-	if [ -z "$options" ]; then
-		# leading and trailing spaces are significant to make
-		# option removal work correctly.
-		options=" $incl $(__git ${cmd/_/ } --git-completion-helper) "
-		for i in $excl; do
-			options="${options/ $i / }"
-		done
-		eval "$var=\"$options\""
-	fi
-
-	__gitcomp "$options"
-}
-
 # Variation of __gitcomp_nl () that appends to the existing list of
 # completion candidates, COMPREPLY.
 __gitcomp_nl_append ()
@@ -433,24 +303,6 @@ __gitcomp_nl ()
 	__gitcomp_nl_append "$@"
 }
 
-# Fills the COMPREPLY array with prefiltered paths without any additional
-# processing.
-# Callers must take care of providing only paths that match the current path
-# to be completed and adding any prefix path components, if necessary.
-# 1: List of newline-separated matching paths, complete with all prefix
-#    path components.
-__gitcomp_file_direct ()
-{
-	local IFS=$'\n'
-
-	COMPREPLY=($1)
-
-	# 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 ||
-	true
-}
-
 # Generates completion reply with compgen from newline-separated possible
 # completion filenames.
 # It accepts 1 to 3 arguments:
@@ -470,8 +322,7 @@ __gitcomp_file ()
 
 	# 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 ||
-	true
+	compgen -f /non-existing-dir/ > /dev/null
 }
 
 # Execute 'git ls-files', unless the --committable option is specified, in
@@ -481,12 +332,10 @@ __gitcomp_file ()
 __git_ls_files_helper ()
 {
 	if [ "$2" == "--committable" ]; then
-		__git -C "$1" -c core.quotePath=false diff-index \
-			--name-only --relative HEAD -- "${3//\\/\\\\}*"
+		__git -C "$1" diff-index --name-only --relative HEAD
 	else
 		# NOTE: $2 is not quoted in order to support multiple options
-		__git -C "$1" -c core.quotePath=false ls-files \
-			--exclude-standard $2 -- "${3//\\/\\\\}*"
+		__git -C "$1" ls-files --exclude-standard $2
 	fi
 }
 
@@ -497,103 +346,17 @@ __git_ls_files_helper ()
 #    If provided, only files within the specified directory are listed.
 #    Sub directories are never recursed.  Path must have a trailing
 #    slash.
-# 3: List only paths matching this path component (optional).
 __git_index_files ()
 {
-	local root="$2" match="$3"
+	local root="${2-.}" file
 
-	__git_ls_files_helper "$root" "$1" "$match" |
-	awk -F / -v pfx="${2//\\/\\\\}" '{
-		paths[$1] = 1
-	}
-	END {
-		for (p in paths) {
-			if (substr(p, 1, 1) != "\"") {
-				# No special characters, easy!
-				print pfx p
-				continue
-			}
-
-			# The path is quoted.
-			p = dequote(p)
-			if (p == "")
-				continue
-
-			# Even when a directory name itself does not contain
-			# any special characters, it will still be quoted if
-			# any of its (stripped) trailing path components do.
-			# Because of this we may have seen the same direcory
-			# both quoted and unquoted.
-			if (p in paths)
-				# We have seen the same directory unquoted,
-				# skip it.
-				continue
-			else
-				print pfx p
-		}
-	}
-	function dequote(p,    bs_idx, out, esc, esc_idx, dec) {
-		# Skip opening double quote.
-		p = substr(p, 2)
-
-		# Interpret backslash escape sequences.
-		while ((bs_idx = index(p, "\\")) != 0) {
-			out = out substr(p, 1, bs_idx - 1)
-			esc = substr(p, bs_idx + 1, 1)
-			p = substr(p, bs_idx + 2)
-
-			if ((esc_idx = index("abtvfr\"\\", esc)) != 0) {
-				# C-style one-character escape sequence.
-				out = out substr("\a\b\t\v\f\r\"\\",
-						 esc_idx, 1)
-			} else if (esc == "n") {
-				# Uh-oh, a newline character.
-				# We cant reliably put a pathname
-				# containing a newline into COMPREPLY,
-				# and the newline would create a mess.
-				# Skip this path.
-				return ""
-			} else {
-				# Must be a \nnn octal value, then.
-				dec = esc             * 64 + \
-				      substr(p, 1, 1) * 8  + \
-				      substr(p, 2, 1)
-				out = out sprintf("%c", dec)
-				p = substr(p, 3)
-			}
-		}
-		# Drop closing double quote, if there is one.
-		# (There isnt any if this is a directory, as it was
-		# already stripped with the trailing path components.)
-		if (substr(p, length(p), 1) == "\"")
-			out = out substr(p, 1, length(p) - 1)
-		else
-			out = out p
-
-		return out
-	}'
-}
-
-# __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 dequoted_word pfx="" cur_
-
-	__git_dequote "$cur"
-
-	case "$dequoted_word" in
-	?*/*)
-		pfx="${dequoted_word%/*}/"
-		cur_="${dequoted_word##*/}"
-		;;
-	*)
-		cur_="$dequoted_word"
-	esac
-
-	__gitcomp_file_direct "$(__git_index_files "$1" "$pfx" "$cur_")"
+	__git_ls_files_helper "$root" "$1" |
+	while read -r file; do
+		case "$file" in
+		?*/*) echo "${file%%/*}" ;;
+		*) echo "$file" ;;
+		esac
+	done | sort | uniq
 }
 
 # Lists branches from the local repository.
@@ -676,7 +439,7 @@ __git_refs ()
 			track=""
 			;;
 		*)
-			for i in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD REBASE_HEAD; do
+			for i in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD; do
 				case "$i" in
 				$match*)
 					if [ -e "$dir/$i" ]; then
@@ -831,7 +594,7 @@ __git_is_configured_remote ()
 
 __git_list_merge_strategies ()
 {
-	LANG=C LC_ALL=C git merge -s help 2>&1 |
+	git merge -s help 2>&1 |
 	sed -n -e '/[Aa]vailable strategies are: /,/^$/{
 		s/\.$//
 		s/.*://
@@ -855,7 +618,7 @@ __git_compute_merge_strategies ()
 
 __git_complete_revlist_file ()
 {
-	local dequoted_word pfx ls ref cur_="$cur"
+	local pfx ls ref cur_="$cur"
 	case "$cur_" in
 	*..?*:*)
 		return
@@ -863,18 +626,14 @@ __git_complete_revlist_file ()
 	?*:*)
 		ref="${cur_%%:*}"
 		cur_="${cur_#*:}"
-
-		__git_dequote "$cur_"
-
-		case "$dequoted_word" in
+		case "$cur_" in
 		?*/*)
-			pfx="${dequoted_word%/*}"
-			cur_="${dequoted_word##*/}"
+			pfx="${cur_%/*}"
+			cur_="${cur_##*/}"
 			ls="$ref:$pfx"
 			pfx="$pfx/"
 			;;
 		*)
-			cur_="$dequoted_word"
 			ls="$ref"
 			;;
 		esac
@@ -884,10 +643,21 @@ __git_complete_revlist_file ()
 		*)   pfx="$ref:$pfx" ;;
 		esac
 
-		__gitcomp_file "$(__git ls-tree "$ls" \
-				| sed 's/^.*	//
-				       s/$//')" \
-			"$pfx" "$cur_"
+		__gitcomp_nl "$(__git ls-tree "$ls" \
+				| sed '/^100... blob /{
+				           s,^.*	,,
+				           s,$, ,
+				       }
+				       /^120000 blob /{
+				           s,^.*	,,
+				           s,$, ,
+				       }
+				       /^040000 tree /{
+				           s,^.*	,,
+				           s,$,/,
+				       }
+				       s/^.*	//')" \
+			"$pfx" "$cur_" ""
 		;;
 	*...*)
 		pfx="${cur_%...*}..."
@@ -905,6 +675,26 @@ __git_complete_revlist_file ()
 	esac
 }
 
+
+# __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"
+
+	case "$cur_" in
+	?*/*)
+		pfx="${cur_%/*}"
+		cur_="${cur_##*/}"
+		pfx="${pfx}/"
+		;;
+	esac
+
+	__gitcomp_file "$(__git_index_files "$1" ${pfx:+"$pfx"})" "$pfx" "$cur_"
+}
+
 __git_complete_file ()
 {
 	__git_complete_revlist_file
@@ -936,7 +726,6 @@ __git_complete_remote_or_refspec ()
 			*) ;;
 			esac
 			;;
-		--multiple) no_complete_refspec=1; break ;;
 		-*) ;;
 		*) remote="$i"; break ;;
 		esac
@@ -1006,11 +795,126 @@ __git_complete_strategy ()
 	return 1
 }
 
+__git_commands () {
+	if test -n "${GIT_TESTING_COMMAND_COMPLETION:-}"
+	then
+		printf "%s" "${GIT_TESTING_COMMAND_COMPLETION}"
+	else
+		git help -a|egrep '^  [a-zA-Z0-9]'
+	fi
+}
+
+__git_list_all_commands ()
+{
+	local i IFS=" "$'\n'
+	for i in $(__git_commands)
+	do
+		case $i in
+		*--*)             : helper pattern;;
+		*) echo $i;;
+		esac
+	done
+}
+
 __git_all_commands=
 __git_compute_all_commands ()
 {
 	test -n "$__git_all_commands" ||
-	__git_all_commands=$(git --list-cmds=main,others,alias,nohelpers)
+	__git_all_commands=$(__git_list_all_commands)
+}
+
+__git_list_porcelain_commands ()
+{
+	local i IFS=" "$'\n'
+	__git_compute_all_commands
+	for i in $__git_all_commands
+	do
+		case $i in
+		*--*)             : helper pattern;;
+		applymbox)        : ask gittus;;
+		applypatch)       : ask gittus;;
+		archimport)       : import;;
+		cat-file)         : plumbing;;
+		check-attr)       : plumbing;;
+		check-ignore)     : plumbing;;
+		check-mailmap)    : plumbing;;
+		check-ref-format) : plumbing;;
+		checkout-index)   : plumbing;;
+		column)           : internal helper;;
+		commit-tree)      : plumbing;;
+		count-objects)    : infrequent;;
+		credential)       : credentials;;
+		credential-*)     : credentials helper;;
+		cvsexportcommit)  : export;;
+		cvsimport)        : import;;
+		cvsserver)        : daemon;;
+		daemon)           : daemon;;
+		diff-files)       : plumbing;;
+		diff-index)       : plumbing;;
+		diff-tree)        : plumbing;;
+		fast-import)      : import;;
+		fast-export)      : export;;
+		fsck-objects)     : plumbing;;
+		fetch-pack)       : plumbing;;
+		fmt-merge-msg)    : plumbing;;
+		for-each-ref)     : plumbing;;
+		hash-object)      : plumbing;;
+		http-*)           : transport;;
+		index-pack)       : plumbing;;
+		init-db)          : deprecated;;
+		local-fetch)      : plumbing;;
+		ls-files)         : plumbing;;
+		ls-remote)        : plumbing;;
+		ls-tree)          : plumbing;;
+		mailinfo)         : plumbing;;
+		mailsplit)        : plumbing;;
+		merge-*)          : plumbing;;
+		mktree)           : plumbing;;
+		mktag)            : plumbing;;
+		pack-objects)     : plumbing;;
+		pack-redundant)   : plumbing;;
+		pack-refs)        : plumbing;;
+		parse-remote)     : plumbing;;
+		patch-id)         : plumbing;;
+		prune)            : plumbing;;
+		prune-packed)     : plumbing;;
+		quiltimport)      : import;;
+		read-tree)        : plumbing;;
+		receive-pack)     : plumbing;;
+		remote-*)         : transport;;
+		rerere)           : plumbing;;
+		rev-list)         : plumbing;;
+		rev-parse)        : plumbing;;
+		runstatus)        : plumbing;;
+		sh-setup)         : internal;;
+		shell)            : daemon;;
+		show-ref)         : plumbing;;
+		send-pack)        : plumbing;;
+		show-index)       : plumbing;;
+		ssh-*)            : transport;;
+		stripspace)       : plumbing;;
+		symbolic-ref)     : plumbing;;
+		unpack-file)      : plumbing;;
+		unpack-objects)   : plumbing;;
+		update-index)     : plumbing;;
+		update-ref)       : plumbing;;
+		update-server-info) : daemon;;
+		upload-archive)   : plumbing;;
+		upload-pack)      : plumbing;;
+		write-tree)       : plumbing;;
+		var)              : infrequent;;
+		verify-pack)      : infrequent;;
+		verify-tag)       : plumbing;;
+		*) echo $i;;
+		esac
+	done
+}
+
+__git_porcelain_commands=
+__git_compute_porcelain_commands ()
+{
+	test -n "$__git_porcelain_commands" ||
+	__git_porcelain_commands=$(__git_list_porcelain_commands)
 }
 
 # Lists all set config variables starting with the given section prefix,
@@ -1028,6 +932,11 @@ __git_pretty_aliases ()
 	__git_get_config_variables "pretty"
 }
 
+__git_aliases ()
+{
+	__git_get_config_variables "alias"
+}
+
 # __git_aliased_command requires 1 argument
 __git_aliased_command ()
 {
@@ -1163,13 +1072,12 @@ __git_count_arguments ()
 }
 
 __git_whitespacelist="nowarn warn error error-all fix"
-__git_am_inprogress_options="--skip --continue --resolved --abort --quit --show-current-patch"
 
 _git_am ()
 {
 	__git_find_repo_path
 	if [ -d "$__git_repo_path"/rebase-apply ]; then
-		__gitcomp "$__git_am_inprogress_options"
+		__gitcomp "--skip --continue --resolved --abort"
 		return
 	fi
 	case "$cur" in
@@ -1178,8 +1086,12 @@ _git_am ()
 		return
 		;;
 	--*)
-		__gitcomp_builtin am "" \
-			"$__git_am_inprogress_options"
+		__gitcomp "
+			--3way --committer-date-is-author-date --ignore-date
+			--ignore-whitespace --ignore-space-change
+			--interactive --keep --no-utf8 --signoff --utf8
+			--whitespace= --scissors
+			"
 		return
 	esac
 }
@@ -1192,7 +1104,14 @@ _git_apply ()
 		return
 		;;
 	--*)
-		__gitcomp_builtin apply
+		__gitcomp "
+			--stat --numstat --summary --check --index
+			--cached --index-info --reverse --reject --unidiff-zero
+			--apply --no-add --exclude=
+			--ignore-whitespace --ignore-space-change
+			--whitespace= --inaccurate-eof --verbose
+			--recount --directory=
+			"
 		return
 	esac
 }
@@ -1201,7 +1120,10 @@ _git_add ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp_builtin add
+		__gitcomp "
+			--interactive --refresh --patch --update --dry-run
+			--ignore-errors --intent-to-add --force --edit --chmod=
+			"
 		return
 	esac
 
@@ -1278,7 +1200,13 @@ _git_branch ()
 		__git_complete_refs --cur="${cur##--set-upstream-to=}"
 		;;
 	--*)
-		__gitcomp_builtin branch
+		__gitcomp "
+			--color --no-color --verbose --abbrev= --no-abbrev
+			--track --no-track --contains --no-contains --merged --no-merged
+			--set-upstream-to= --edit-description --list
+			--unset-upstream --delete --move --copy --remotes
+			--column --no-column --sort= --points-at
+			"
 		;;
 	*)
 		if [ $only_local_ref = "y" -a $has_r = "n" ]; then
@@ -1319,7 +1247,11 @@ _git_checkout ()
 		__gitcomp "diff3 merge" "" "${cur##--conflict=}"
 		;;
 	--*)
-		__gitcomp_builtin checkout
+		__gitcomp "
+			--quiet --ours --theirs --track --no-track --merge
+			--conflict= --orphan --patch --detach --ignore-skip-worktree-bits
+			--recurse-submodules --no-recurse-submodules
+			"
 		;;
 	*)
 		# check if --track, --no-track, or --no-guess was specified
@@ -1334,19 +1266,21 @@ _git_checkout ()
 	esac
 }
 
-__git_cherry_pick_inprogress_options="--continue --quit --abort"
+_git_cherry ()
+{
+	__git_complete_refs
+}
 
 _git_cherry_pick ()
 {
 	__git_find_repo_path
 	if [ -f "$__git_repo_path"/CHERRY_PICK_HEAD ]; then
-		__gitcomp "$__git_cherry_pick_inprogress_options"
+		__gitcomp "--continue --quit --abort"
 		return
 	fi
 	case "$cur" in
 	--*)
-		__gitcomp_builtin cherry-pick "" \
-			"$__git_cherry_pick_inprogress_options"
+		__gitcomp "--edit --no-commit --signoff --strategy= --mainline"
 		;;
 	*)
 		__git_complete_refs
@@ -1358,7 +1292,7 @@ _git_clean ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp_builtin clean
+		__gitcomp "--dry-run --quiet"
 		return
 		;;
 	esac
@@ -1371,7 +1305,26 @@ _git_clone ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp_builtin clone
+		__gitcomp "
+			--local
+			--no-hardlinks
+			--shared
+			--reference
+			--quiet
+			--no-checkout
+			--bare
+			--mirror
+			--origin
+			--upload-pack
+			--template=
+			--depth
+			--single-branch
+			--no-tags
+			--branch
+			--recurse-submodules
+			--no-single-branch
+			--shallow-submodules
+			"
 		return
 		;;
 	esac
@@ -1404,7 +1357,16 @@ _git_commit ()
 		return
 		;;
 	--*)
-		__gitcomp_builtin commit
+		__gitcomp "
+			--all --author= --signoff --verify --no-verify
+			--edit --no-edit
+			--amend --include --only --interactive
+			--dry-run --reuse-message= --reedit-message=
+			--reset-author --file= --message= --template=
+			--cleanup= --untracked-files --untracked-files=
+			--verbose --quiet --fixup= --squash=
+			--patch --short --date --allow-empty
+			"
 		return
 	esac
 
@@ -1420,7 +1382,11 @@ _git_describe ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp_builtin describe
+		__gitcomp "
+			--all --tags --contains --abbrev= --candidates=
+			--exact-match --debug --long --match --always --first-parent
+			--exclude --dirty --broken
+			"
 		return
 	esac
 	__git_complete_refs
@@ -1445,7 +1411,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
 			--dirstat --dirstat= --dirstat-by-file
 			--dirstat-by-file= --cumulative
 			--diff-algorithm=
-			--submodule --submodule= --ignore-submodules
+			--submodule --submodule=
 "
 
 _git_diff ()
@@ -1486,11 +1452,11 @@ _git_difftool ()
 		return
 		;;
 	--*)
-		__gitcomp_builtin difftool "$__git_diff_common_options
-					--base --cached --ours --theirs
-					--pickaxe-all --pickaxe-regex
-					--relative --staged
-					"
+		__gitcomp "--cached --staged --pickaxe-all --pickaxe-regex
+			--base --ours --theirs
+			--no-renames --diff-filter= --find-copies-harder
+			--relative --ignore-submodules
+			--tool="
 		return
 		;;
 	esac
@@ -1499,6 +1465,12 @@ _git_difftool ()
 
 __git_fetch_recurse_submodules="yes on-demand no"
 
+__git_fetch_options="
+	--quiet --verbose --append --upload-pack --force --keep --depth=
+	--tags --no-tags --all --prune --dry-run --recurse-submodules=
+	--unshallow --update-shallow
+"
+
 _git_fetch ()
 {
 	case "$cur" in
@@ -1507,16 +1479,20 @@ _git_fetch ()
 		return
 		;;
 	--*)
-		__gitcomp_builtin fetch
+		__gitcomp "$__git_fetch_options"
 		return
 		;;
 	esac
 	__git_complete_remote_or_refspec
 }
 
-__git_format_patch_extra_options="
-	--full-index --not --all --no-prefix --src-prefix=
-	--dst-prefix= --notes
+__git_format_patch_options="
+	--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 ()
@@ -1529,7 +1505,7 @@ _git_format_patch ()
 		return
 		;;
 	--*)
-		__gitcomp_builtin format-patch "$__git_format_patch_extra_options"
+		__gitcomp "$__git_format_patch_options"
 		return
 		;;
 	esac
@@ -1540,7 +1516,20 @@ _git_fsck ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp_builtin fsck
+		__gitcomp "
+			--tags --root --unreachable --cache --no-reflogs --full
+			--strict --verbose --lost-found --name-objects
+			"
+		return
+		;;
+	esac
+}
+
+_git_gc ()
+{
+	case "$cur" in
+	--*)
+		__gitcomp "--prune --aggressive"
 		return
 		;;
 	esac
@@ -1596,7 +1585,21 @@ _git_grep ()
 
 	case "$cur" in
 	--*)
-		__gitcomp_builtin grep
+		__gitcomp "
+			--cached
+			--text --ignore-case --word-regexp --invert-match
+			--full-name --line-number
+			--extended-regexp --basic-regexp --fixed-strings
+			--perl-regexp
+			--threads
+			--files-with-matches --name-only
+			--files-without-match
+			--max-depth
+			--count
+			--and --or --not --all-match
+			--break --heading --show-function --function-context
+			--untracked --no-index
+			"
 		return
 		;;
 	esac
@@ -1614,16 +1617,17 @@ _git_help ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp_builtin help
+		__gitcomp "--all --guides --info --man --web"
 		return
 		;;
 	esac
-	if test -n "$GIT_TESTING_ALL_COMMAND_LIST"
-	then
-		__gitcomp "$GIT_TESTING_ALL_COMMAND_LIST $(git --list-cmds=alias,list-guide) gitk"
-	else
-		__gitcomp "$(git --list-cmds=main,nohelpers,alias,list-guide) gitk"
-	fi
+	__git_compute_all_commands
+	__gitcomp "$__git_all_commands $(__git_aliases)
+		attributes cli core-tutorial cvs-migration
+		diffcore everyday gitk glossary hooks ignore modules
+		namespaces repository-layout revisions tutorial tutorial-2
+		workflows
+		"
 }
 
 _git_init ()
@@ -1636,7 +1640,7 @@ _git_init ()
 		return
 		;;
 	--*)
-		__gitcomp_builtin init
+		__gitcomp "--quiet --bare --template= --shared --shared="
 		return
 		;;
 	esac
@@ -1646,7 +1650,13 @@ _git_ls_files ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp_builtin ls-files
+		__gitcomp "--cached --deleted --modified --others --ignored
+			--stage --directory --no-empty-directory --unmerged
+			--killed --exclude= --exclude-from=
+			--exclude-per-directory= --exclude-standard
+			--error-unmatch --with-tree= --full-name
+			--abbrev --ignored --exclude-per-directory
+			"
 		return
 		;;
 	esac
@@ -1660,7 +1670,7 @@ _git_ls_remote ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp_builtin ls-remote
+		__gitcomp "--heads --tags --refs --get-url --symref"
 		return
 		;;
 	esac
@@ -1669,13 +1679,6 @@ _git_ls_remote ()
 
 _git_ls_tree ()
 {
-	case "$cur" in
-	--*)
-		__gitcomp_builtin ls-tree
-		return
-		;;
-	esac
-
 	__git_complete_file
 }
 
@@ -1791,13 +1794,22 @@ _git_log ()
 	__git_complete_revlist
 }
 
+# Common merge options shared by git-merge(1) and git-pull(1).
+__git_merge_options="
+	--no-commit --no-stat --log --no-log --squash --strategy
+	--commit --stat --no-squash --ff --no-ff --ff-only --edit --no-edit
+	--verify-signatures --no-verify-signatures --gpg-sign
+	--quiet --verbose --progress --no-progress
+"
+
 _git_merge ()
 {
 	__git_complete_strategy && return
 
 	case "$cur" in
 	--*)
-		__gitcomp_builtin merge
+		__gitcomp "$__git_merge_options
+			--rerere-autoupdate --no-rerere-autoupdate --abort --continue"
 		return
 	esac
 	__git_complete_refs
@@ -1811,7 +1823,7 @@ _git_mergetool ()
 		return
 		;;
 	--*)
-		__gitcomp "--tool= --prompt --no-prompt --gui --no-gui"
+		__gitcomp "--tool= --prompt --no-prompt"
 		return
 		;;
 	esac
@@ -1821,7 +1833,7 @@ _git_merge_base ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp_builtin merge-base
+		__gitcomp "--octopus --independent --is-ancestor --fork-point"
 		return
 		;;
 	esac
@@ -1832,7 +1844,7 @@ _git_mv ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp_builtin mv
+		__gitcomp "--dry-run"
 		return
 		;;
 	esac
@@ -1846,14 +1858,19 @@ _git_mv ()
 	fi
 }
 
+_git_name_rev ()
+{
+	__gitcomp "--tags --all --stdin"
+}
+
 _git_notes ()
 {
-	local subcommands='add append copy edit get-ref list merge prune remove show'
+	local subcommands='add append copy edit list prune remove show'
 	local subcommand="$(__git_find_on_cmdline "$subcommands")"
 
 	case "$subcommand,$cur" in
 	,--*)
-		__gitcomp_builtin notes
+		__gitcomp '--ref'
 		;;
 	,*)
 		case "$prev" in
@@ -1865,14 +1882,21 @@ _git_notes ()
 			;;
 		esac
 		;;
-	*,--reuse-message=*|*,--reedit-message=*)
+	add,--reuse-message=*|append,--reuse-message=*|\
+	add,--reedit-message=*|append,--reedit-message=*)
 		__git_complete_refs --cur="${cur#*=}"
 		;;
-	*,--*)
-		__gitcomp_builtin notes_$subcommand
+	add,--*|append,--*)
+		__gitcomp '--file= --message= --reedit-message=
+				--reuse-message='
+		;;
+	copy,--*)
+		__gitcomp '--stdin'
+		;;
+	prune,--*)
+		__gitcomp '--dry-run --verbose'
 		;;
-	prune,*|get-ref,*)
-		# this command does not take a ref, do not complete it
+	prune,*)
 		;;
 	*)
 		case "$prev" in
@@ -1896,8 +1920,12 @@ _git_pull ()
 		return
 		;;
 	--*)
-		__gitcomp_builtin pull
-
+		__gitcomp "
+			--rebase --no-rebase
+			--autostash --no-autostash
+			$__git_merge_options
+			$__git_fetch_options
+		"
 		return
 		;;
 	esac
@@ -1947,37 +1975,28 @@ _git_push ()
 		__git_complete_force_with_lease "${cur##--force-with-lease=}"
 		return
 		;;
-	--*)
-		__gitcomp_builtin push
-		return
-		;;
-	esac
-	__git_complete_remote_or_refspec
-}
-
-_git_range_diff ()
-{
-	case "$cur" in
 	--*)
 		__gitcomp "
-			--creation-factor= --no-dual-color
-			$__git_diff_common_options
+			--all --mirror --tags --dry-run --force --verbose
+			--quiet --prune --delete --follow-tags
+			--receive-pack= --repo= --set-upstream
+			--force-with-lease --force-with-lease= --recurse-submodules=
 		"
 		return
 		;;
 	esac
-	__git_complete_revlist
+	__git_complete_remote_or_refspec
 }
 
 _git_rebase ()
 {
 	__git_find_repo_path
 	if [ -f "$__git_repo_path"/rebase-merge/interactive ]; then
-		__gitcomp "--continue --skip --abort --quit --edit-todo --show-current-patch"
+		__gitcomp "--continue --skip --abort --quit --edit-todo"
 		return
 	elif [ -d "$__git_repo_path"/rebase-apply ] || \
 	     [ -d "$__git_repo_path"/rebase-merge ]; then
-		__gitcomp "--continue --skip --abort --quit --show-current-patch"
+		__gitcomp "--continue --skip --abort --quit"
 		return
 	fi
 	__git_complete_strategy && return
@@ -1989,7 +2008,7 @@ _git_rebase ()
 	--*)
 		__gitcomp "
 			--onto --merge --strategy --interactive
-			--rebase-merges --preserve-merges --stat --no-stat
+			--preserve-merges --stat --no-stat
 			--committer-date-is-author-date --ignore-date
 			--ignore-whitespace --whitespace=
 			--autosquash --no-autosquash
@@ -1997,7 +2016,6 @@ _git_rebase ()
 			--autostash --no-autostash
 			--verify --no-verify
 			--keep-empty --root --force-rebase --no-ff
-			--rerere-autoupdate
 			--exec
 			"
 
@@ -2059,16 +2077,16 @@ _git_send_email ()
 		return
 		;;
 	--*)
-		__gitcomp_builtin send-email "--annotate --bcc --cc --cc-cmd --chain-reply-to
+		__gitcomp "--annotate --bcc --cc --cc-cmd --chain-reply-to
 			--compose --confirm= --dry-run --envelope-sender
 			--from --identity
 			--in-reply-to --no-chain-reply-to --no-signed-off-by-cc
-			--no-suppress-from --no-thread --quiet --reply-to
+			--no-suppress-from --no-thread --quiet
 			--signed-off-by-cc --smtp-pass --smtp-server
 			--smtp-server-port --smtp-encryption= --smtp-user
 			--subject --suppress-cc= --suppress-from --thread --to
 			--validate --no-validate
-			$__git_format_patch_extra_options"
+			$__git_format_patch_options"
 		return
 		;;
 	esac
@@ -2101,7 +2119,11 @@ _git_status ()
 		return
 		;;
 	--*)
-		__gitcomp_builtin status
+		__gitcomp "
+			--short --branch --porcelain --long --verbose
+			--untracked-files= --ignore-submodules= --ignored
+			--column= --no-column
+			"
 		return
 		;;
 	esac
@@ -2148,24 +2170,9 @@ __git_config_get_set_variables ()
 	__git config $config_file --name-only --list
 }
 
-__git_config_vars=
-__git_compute_config_vars ()
-{
-	test -n "$__git_config_vars" ||
-	__git_config_vars="$(git help --config-for-completion | sort | uniq)"
-}
-
 _git_config ()
 {
-	local varname
-
-	if [ "${BASH_VERSINFO[0]:-0}" -ge 4 ]; then
-		varname="${prev,,}"
-	else
-		varname="$(echo "$prev" |tr A-Z a-z)"
-	fi
-
-	case "$varname" in
+	case "$prev" in
 	branch.*.remote|branch.*.pushremote)
 		__gitcomp_nl "$(__git_remotes)"
 		return
@@ -2175,7 +2182,7 @@ _git_config ()
 		return
 		;;
 	branch.*.rebase)
-		__gitcomp "false true merges preserve interactive"
+		__gitcomp "false true preserve interactive"
 		return
 		;;
 	remote.pushdefault)
@@ -2232,7 +2239,7 @@ _git_config ()
 		__gitcomp "$__git_log_date_formats"
 		return
 		;;
-	sendemail.aliasfiletype)
+	sendemail.aliasesfiletype)
 		__gitcomp "mutt mailrc pine elm gnus"
 		return
 		;;
@@ -2258,25 +2265,32 @@ _git_config ()
 	esac
 	case "$cur" in
 	--*)
-		__gitcomp_builtin config
+		__gitcomp "
+			--system --global --local --file=
+			--list --replace-all
+			--get --get-all --get-regexp
+			--add --unset --unset-all
+			--remove-section --rename-section
+			--name-only
+			"
 		return
 		;;
 	branch.*.*)
 		local pfx="${cur%.*}." cur_="${cur##*.}"
-		__gitcomp "remote pushRemote merge mergeOptions rebase" "$pfx" "$cur_"
+		__gitcomp "remote pushremote merge mergeoptions rebase" "$pfx" "$cur_"
 		return
 		;;
 	branch.*)
 		local pfx="${cur%.*}." cur_="${cur#*.}"
 		__gitcomp_direct "$(__git_heads "$pfx" "$cur_" ".")"
-		__gitcomp_nl_append $'autoSetupMerge\nautoSetupRebase\n' "$pfx" "$cur_"
+		__gitcomp_nl_append $'autosetupmerge\nautosetuprebase\n' "$pfx" "$cur_"
 		return
 		;;
 	guitool.*.*)
 		local pfx="${cur%.*}." cur_="${cur##*.}"
 		__gitcomp "
-			argPrompt cmd confirm needsFile noConsole noRescan
-			prompt revPrompt revUnmerged title
+			argprompt cmd confirm needsfile noconsole norescan
+			prompt revprompt revunmerged title
 			" "$pfx" "$cur_"
 		return
 		;;
@@ -2305,14 +2319,14 @@ _git_config ()
 		local pfx="${cur%.*}." cur_="${cur##*.}"
 		__gitcomp "
 			url proxy fetch push mirror skipDefaultUpdate
-			receivepack uploadpack tagOpt pushurl
+			receivepack uploadpack tagopt pushurl
 			" "$pfx" "$cur_"
 		return
 		;;
 	remote.*)
 		local pfx="${cur%.*}." cur_="${cur#*.}"
 		__gitcomp_nl "$(__git_remotes)" "$pfx" "$cur_" "."
-		__gitcomp_nl_append "pushDefault" "$pfx" "$cur_"
+		__gitcomp_nl_append "pushdefault" "$pfx" "$cur_"
 		return
 		;;
 	url.*.*)
@@ -2320,14 +2334,332 @@ _git_config ()
 		__gitcomp "insteadOf pushInsteadOf" "$pfx" "$cur_"
 		return
 		;;
-	*.*)
-		__git_compute_config_vars
-		__gitcomp "$__git_config_vars"
-		;;
-	*)
-		__git_compute_config_vars
-		__gitcomp "$(echo "$__git_config_vars" | sed 's/\.[^ ]*/./g')"
 	esac
+	__gitcomp "
+		add.ignoreErrors
+		advice.amWorkDir
+		advice.commitBeforeMerge
+		advice.detachedHead
+		advice.implicitIdentity
+		advice.pushAlreadyExists
+		advice.pushFetchFirst
+		advice.pushNeedsForce
+		advice.pushNonFFCurrent
+		advice.pushNonFFMatching
+		advice.pushUpdateRejected
+		advice.resolveConflict
+		advice.rmHints
+		advice.statusHints
+		advice.statusUoption
+		advice.ignoredHook
+		alias.
+		am.keepcr
+		am.threeWay
+		apply.ignorewhitespace
+		apply.whitespace
+		branch.autosetupmerge
+		branch.autosetuprebase
+		browser.
+		clean.requireForce
+		color.branch
+		color.branch.current
+		color.branch.local
+		color.branch.plain
+		color.branch.remote
+		color.decorate.HEAD
+		color.decorate.branch
+		color.decorate.remoteBranch
+		color.decorate.stash
+		color.decorate.tag
+		color.diff
+		color.diff.commit
+		color.diff.frag
+		color.diff.func
+		color.diff.meta
+		color.diff.new
+		color.diff.old
+		color.diff.plain
+		color.diff.whitespace
+		color.grep
+		color.grep.context
+		color.grep.filename
+		color.grep.function
+		color.grep.linenumber
+		color.grep.match
+		color.grep.selected
+		color.grep.separator
+		color.interactive
+		color.interactive.error
+		color.interactive.header
+		color.interactive.help
+		color.interactive.prompt
+		color.pager
+		color.showbranch
+		color.status
+		color.status.added
+		color.status.changed
+		color.status.header
+		color.status.localBranch
+		color.status.nobranch
+		color.status.remoteBranch
+		color.status.unmerged
+		color.status.untracked
+		color.status.updated
+		color.ui
+		commit.cleanup
+		commit.gpgSign
+		commit.status
+		commit.template
+		commit.verbose
+		core.abbrev
+		core.askpass
+		core.attributesfile
+		core.autocrlf
+		core.bare
+		core.bigFileThreshold
+		core.checkStat
+		core.commentChar
+		core.compression
+		core.createObject
+		core.deltaBaseCacheLimit
+		core.editor
+		core.eol
+		core.excludesfile
+		core.fileMode
+		core.fsyncobjectfiles
+		core.gitProxy
+		core.hideDotFiles
+		core.hooksPath
+		core.ignoreStat
+		core.ignorecase
+		core.logAllRefUpdates
+		core.loosecompression
+		core.notesRef
+		core.packedGitLimit
+		core.packedGitWindowSize
+		core.packedRefsTimeout
+		core.pager
+		core.precomposeUnicode
+		core.preferSymlinkRefs
+		core.preloadindex
+		core.protectHFS
+		core.protectNTFS
+		core.quotepath
+		core.repositoryFormatVersion
+		core.safecrlf
+		core.sharedRepository
+		core.sparseCheckout
+		core.splitIndex
+		core.sshCommand
+		core.symlinks
+		core.trustctime
+		core.untrackedCache
+		core.warnAmbiguousRefs
+		core.whitespace
+		core.worktree
+		credential.helper
+		credential.useHttpPath
+		credential.username
+		credentialCache.ignoreSIGHUP
+		diff.autorefreshindex
+		diff.external
+		diff.ignoreSubmodules
+		diff.mnemonicprefix
+		diff.noprefix
+		diff.renameLimit
+		diff.renames
+		diff.statGraphWidth
+		diff.submodule
+		diff.suppressBlankEmpty
+		diff.tool
+		diff.wordRegex
+		diff.algorithm
+		difftool.
+		difftool.prompt
+		fetch.recurseSubmodules
+		fetch.unpackLimit
+		format.attach
+		format.cc
+		format.coverLetter
+		format.from
+		format.headers
+		format.numbered
+		format.pretty
+		format.signature
+		format.signoff
+		format.subjectprefix
+		format.suffix
+		format.thread
+		format.to
+		gc.
+		gc.aggressiveDepth
+		gc.aggressiveWindow
+		gc.auto
+		gc.autoDetach
+		gc.autopacklimit
+		gc.logExpiry
+		gc.packrefs
+		gc.pruneexpire
+		gc.reflogexpire
+		gc.reflogexpireunreachable
+		gc.rerereresolved
+		gc.rerereunresolved
+		gc.worktreePruneExpire
+		gitcvs.allbinary
+		gitcvs.commitmsgannotation
+		gitcvs.dbTableNamePrefix
+		gitcvs.dbdriver
+		gitcvs.dbname
+		gitcvs.dbpass
+		gitcvs.dbuser
+		gitcvs.enabled
+		gitcvs.logfile
+		gitcvs.usecrlfattr
+		guitool.
+		gui.blamehistoryctx
+		gui.commitmsgwidth
+		gui.copyblamethreshold
+		gui.diffcontext
+		gui.encoding
+		gui.fastcopyblame
+		gui.matchtrackingbranch
+		gui.newbranchtemplate
+		gui.pruneduringfetch
+		gui.spellingdictionary
+		gui.trustmtime
+		help.autocorrect
+		help.browser
+		help.format
+		http.lowSpeedLimit
+		http.lowSpeedTime
+		http.maxRequests
+		http.minSessions
+		http.noEPSV
+		http.postBuffer
+		http.proxy
+		http.sslCipherList
+		http.sslVersion
+		http.sslCAInfo
+		http.sslCAPath
+		http.sslCert
+		http.sslCertPasswordProtected
+		http.sslKey
+		http.sslVerify
+		http.useragent
+		i18n.commitEncoding
+		i18n.logOutputEncoding
+		imap.authMethod
+		imap.folder
+		imap.host
+		imap.pass
+		imap.port
+		imap.preformattedHTML
+		imap.sslverify
+		imap.tunnel
+		imap.user
+		init.templatedir
+		instaweb.browser
+		instaweb.httpd
+		instaweb.local
+		instaweb.modulepath
+		instaweb.port
+		interactive.singlekey
+		log.date
+		log.decorate
+		log.showroot
+		mailmap.file
+		man.
+		man.viewer
+		merge.
+		merge.conflictstyle
+		merge.log
+		merge.renameLimit
+		merge.renormalize
+		merge.stat
+		merge.tool
+		merge.verbosity
+		mergetool.
+		mergetool.keepBackup
+		mergetool.keepTemporaries
+		mergetool.prompt
+		notes.displayRef
+		notes.rewrite.
+		notes.rewrite.amend
+		notes.rewrite.rebase
+		notes.rewriteMode
+		notes.rewriteRef
+		pack.compression
+		pack.deltaCacheLimit
+		pack.deltaCacheSize
+		pack.depth
+		pack.indexVersion
+		pack.packSizeLimit
+		pack.threads
+		pack.window
+		pack.windowMemory
+		pager.
+		pretty.
+		pull.octopus
+		pull.twohead
+		push.default
+		push.followTags
+		rebase.autosquash
+		rebase.stat
+		receive.autogc
+		receive.denyCurrentBranch
+		receive.denyDeleteCurrent
+		receive.denyDeletes
+		receive.denyNonFastForwards
+		receive.fsckObjects
+		receive.unpackLimit
+		receive.updateserverinfo
+		remote.pushdefault
+		remotes.
+		repack.usedeltabaseoffset
+		rerere.autoupdate
+		rerere.enabled
+		sendemail.
+		sendemail.aliasesfile
+		sendemail.aliasfiletype
+		sendemail.bcc
+		sendemail.cc
+		sendemail.cccmd
+		sendemail.chainreplyto
+		sendemail.confirm
+		sendemail.envelopesender
+		sendemail.from
+		sendemail.identity
+		sendemail.multiedit
+		sendemail.signedoffbycc
+		sendemail.smtpdomain
+		sendemail.smtpencryption
+		sendemail.smtppass
+		sendemail.smtpserver
+		sendemail.smtpserveroption
+		sendemail.smtpserverport
+		sendemail.smtpuser
+		sendemail.suppresscc
+		sendemail.suppressfrom
+		sendemail.thread
+		sendemail.to
+		sendemail.tocmd
+		sendemail.validate
+		sendemail.smtpbatchsize
+		sendemail.smtprelogindelay
+		showbranch.default
+		status.relativePaths
+		status.showUntrackedFiles
+		status.submodulesummary
+		submodule.
+		tar.umask
+		transfer.unpackLimit
+		url.
+		user.email
+		user.name
+		user.signingkey
+		web.browser
+		branch. remote.
+	"
 }
 
 _git_remote ()
@@ -2340,7 +2672,7 @@ _git_remote ()
 	if [ -z "$subcommand" ]; then
 		case "$cur" in
 		--*)
-			__gitcomp_builtin remote
+			__gitcomp "--verbose"
 			;;
 		*)
 			__gitcomp "$subcommands"
@@ -2351,33 +2683,33 @@ _git_remote ()
 
 	case "$subcommand,$cur" in
 	add,--*)
-		__gitcomp_builtin remote_add
+		__gitcomp "--track --master --fetch --tags --no-tags --mirror="
 		;;
 	add,*)
 		;;
 	set-head,--*)
-		__gitcomp_builtin remote_set-head
+		__gitcomp "--auto --delete"
 		;;
 	set-branches,--*)
-		__gitcomp_builtin remote_set-branches
+		__gitcomp "--add"
 		;;
 	set-head,*|set-branches,*)
 		__git_complete_remote_or_refspec
 		;;
 	update,--*)
-		__gitcomp_builtin remote_update
+		__gitcomp "--prune"
 		;;
 	update,*)
-		__gitcomp "$(__git_remotes) $(__git_get_config_variables "remotes")"
+		__gitcomp "$(__git_get_config_variables "remotes")"
 		;;
 	set-url,--*)
-		__gitcomp_builtin remote_set-url
+		__gitcomp "--push --add --delete"
 		;;
 	get-url,--*)
-		__gitcomp_builtin remote_get-url
+		__gitcomp "--push --all"
 		;;
 	prune,--*)
-		__gitcomp_builtin remote_prune
+		__gitcomp "--dry-run"
 		;;
 	*)
 		__gitcomp_nl "$(__git_remotes)"
@@ -2389,7 +2721,7 @@ _git_replace ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp_builtin replace
+		__gitcomp "--edit --graft --format= --list --delete"
 		return
 		;;
 	esac
@@ -2413,26 +2745,26 @@ _git_reset ()
 
 	case "$cur" in
 	--*)
-		__gitcomp_builtin reset
+		__gitcomp "--merge --mixed --hard --soft --patch --keep"
 		return
 		;;
 	esac
 	__git_complete_refs
 }
 
-__git_revert_inprogress_options="--continue --quit --abort"
-
 _git_revert ()
 {
 	__git_find_repo_path
 	if [ -f "$__git_repo_path"/REVERT_HEAD ]; then
-		__gitcomp "$__git_revert_inprogress_options"
+		__gitcomp "--continue --quit --abort"
 		return
 	fi
 	case "$cur" in
 	--*)
-		__gitcomp_builtin revert "" \
-			"$__git_revert_inprogress_options"
+		__gitcomp "
+			--edit --mainline --no-edit --no-commit --signoff
+			--strategy= --strategy-option=
+			"
 		return
 		;;
 	esac
@@ -2443,7 +2775,7 @@ _git_rm ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp_builtin rm
+		__gitcomp "--cached --dry-run --ignore-unmatch --quiet"
 		return
 		;;
 	esac
@@ -2501,7 +2833,12 @@ _git_show_branch ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp_builtin show-branch
+		__gitcomp "
+			--all --remotes --topo-order --date-order --current --more=
+			--list --independent --merge-base --no-name
+			--color --no-color
+			--sha1-name --sparse --topics --reflog
+			"
 		return
 		;;
 	esac
@@ -2511,21 +2848,13 @@ _git_show_branch ()
 _git_stash ()
 {
 	local save_opts='--all --keep-index --no-keep-index --quiet --patch --include-untracked'
-	local subcommands='push list show apply clear drop pop create branch'
-	local subcommand="$(__git_find_on_cmdline "$subcommands save")"
-	if [ -n "$(__git_find_on_cmdline "-p")" ]; then
-		subcommand="push"
-	fi
+	local subcommands='push save list show apply clear drop pop create branch'
+	local subcommand="$(__git_find_on_cmdline "$subcommands")"
 	if [ -z "$subcommand" ]; then
 		case "$cur" in
 		--*)
 			__gitcomp "$save_opts"
 			;;
-		sa*)
-			if [ -z "$(__git_find_on_cmdline "$save_opts")" ]; then
-				__gitcomp "save"
-			fi
-			;;
 		*)
 			if [ -z "$(__git_find_on_cmdline "$save_opts")" ]; then
 				__gitcomp "$subcommands"
@@ -2546,9 +2875,6 @@ _git_stash ()
 		drop,--*)
 			__gitcomp "--quiet"
 			;;
-		list,--*)
-			__gitcomp "--name-status --oneline --patch-with-stat"
-			;;
 		show,--*|branch,--*)
 			;;
 		branch,*)
@@ -2719,7 +3045,7 @@ _git_tag ()
 	while [ $c -lt $cword ]; do
 		i="${words[c]}"
 		case "$i" in
-		-d|--delete|-v|--verify)
+		-d|-v)
 			__gitcomp_direct "$(__git_tags "" "$cur" " ")"
 			return
 			;;
@@ -2745,7 +3071,11 @@ _git_tag ()
 
 	case "$cur" in
 	--*)
-		__gitcomp_builtin tag
+		__gitcomp "
+			--list --delete --verify --annotate --message --file
+			--sign --cleanup --local-user --force --column --sort=
+			--contains --no-contains --points-at --merged --no-merged --create-reflog
+			"
 		;;
 	esac
 }
@@ -2757,26 +3087,23 @@ _git_whatchanged ()
 
 _git_worktree ()
 {
-	local subcommands="add list lock move prune remove unlock"
+	local subcommands="add list lock prune unlock"
 	local subcommand="$(__git_find_on_cmdline "$subcommands")"
 	if [ -z "$subcommand" ]; then
 		__gitcomp "$subcommands"
 	else
 		case "$subcommand,$cur" in
 		add,--*)
-			__gitcomp_builtin worktree_add
+			__gitcomp "--detach"
 			;;
 		list,--*)
-			__gitcomp_builtin worktree_list
+			__gitcomp "--porcelain"
 			;;
 		lock,--*)
-			__gitcomp_builtin worktree_lock
+			__gitcomp "--reason"
 			;;
 		prune,--*)
-			__gitcomp_builtin worktree_prune
-			;;
-		remove,--*)
-			__gitcomp "--force"
+			__gitcomp "--dry-run --expire --verbose"
 			;;
 		*)
 			;;
@@ -2784,52 +3111,6 @@ _git_worktree ()
 	fi
 }
 
-__git_complete_common () {
-	local command="$1"
-
-	case "$cur" in
-	--*)
-		__gitcomp_builtin "$command"
-		;;
-	esac
-}
-
-__git_cmds_with_parseopt_helper=
-__git_support_parseopt_helper () {
-	test -n "$__git_cmds_with_parseopt_helper" ||
-		__git_cmds_with_parseopt_helper="$(__git --list-cmds=parseopt)"
-
-	case " $__git_cmds_with_parseopt_helper " in
-	*" $1 "*)
-		return 0
-		;;
-	*)
-		return 1
-		;;
-	esac
-}
-
-__git_complete_command () {
-	local command="$1"
-	local completion_func="_git_${command//-/_}"
-	if ! declare -f $completion_func >/dev/null 2>/dev/null &&
-		declare -f _completion_loader >/dev/null 2>/dev/null
-	then
-		_completion_loader "git-$command"
-	fi
-	if declare -f $completion_func >/dev/null 2>/dev/null
-	then
-		$completion_func
-		return 0
-	elif __git_support_parseopt_helper "$command"
-	then
-		__git_complete_common "$command"
-		return 0
-	else
-		return 1
-	fi
-}
-
 __git_main ()
 {
 	local i c=1 command __git_dir __git_repo_path
@@ -2883,24 +3164,20 @@ __git_main ()
 			--help
 			"
 			;;
-		*)
-			if test -n "$GIT_TESTING_PORCELAIN_COMMAND_LIST"
-			then
-				__gitcomp "$GIT_TESTING_PORCELAIN_COMMAND_LIST"
-			else
-				__gitcomp "$(git --list-cmds=list-mainporcelain,others,nohelpers,alias,list-complete,config)"
-			fi
-			;;
+		*)     __git_compute_porcelain_commands
+		       __gitcomp "$__git_porcelain_commands $(__git_aliases)" ;;
 		esac
 		return
 	fi
 
-	__git_complete_command "$command" && return
+	local completion_func="_git_${command//-/_}"
+	declare -f $completion_func >/dev/null 2>/dev/null && $completion_func && return
 
 	local expansion=$(__git_aliased_command "$command")
 	if [ -n "$expansion" ]; then
 		words[1]=$expansion
-		__git_complete_command "$expansion"
+		completion_func="_git_${expansion//-/_}"
+		declare -f $completion_func >/dev/null 2>/dev/null && $completion_func
 	fi
 }
 
@@ -2928,10 +3205,7 @@ __gitk_main ()
 	__git_complete_revlist
 }
 
-if [[ -n ${ZSH_VERSION-} ]] &&
-   # Don't define these functions when sourced from 'git-completion.zsh',
-   # it has its own implementations.
-   [[ -z ${GIT_SOURCING_ZSH_COMPLETION-} ]]; then
+if [[ -n ${ZSH_VERSION-} ]]; then
 	echo "WARNING: this script is deprecated, please see git-completion.zsh" 1>&2
 
 	autoload -U +X compinit && compinit
@@ -2980,22 +3254,13 @@ if [[ -n ${ZSH_VERSION-} ]] &&
 		compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0
 	}
 
-	__gitcomp_file_direct ()
-	{
-		emulate -L zsh
-
-		local IFS=$'\n'
-		compset -P '*[=:]'
-		compadd -f -- ${=1} && _ret=0
-	}
-
 	__gitcomp_file ()
 	{
 		emulate -L zsh
 
 		local IFS=$'\n'
 		compset -P '*[=:]'
-		compadd -p "${2-}" -f -- ${=1} && _ret=0
+		compadd -Q -p "${2-}" -f -- ${=1} && _ret=0
 	}
 
 	_git ()
diff --git a/plugins/gitfast/update b/plugins/gitfast/update
index 76ecc71e0..05054245f 100755
--- a/plugins/gitfast/update
+++ b/plugins/gitfast/update
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 url="https://git.kernel.org/pub/scm/git/git.git/plain/contrib/completion"
-version="2.21.0"
+version="2.16.0"
 
 curl -s -o _git "${url}/git-completion.zsh?h=v${version}" &&
 curl -s -o git-completion.bash "${url}/git-completion.bash?h=v${version}" &&
-- 
cgit v1.2.3-70-g09d2


From d0b29ff0b3544f6f52fa763d224a91b7b0a08ac2 Mon Sep 17 00:00:00 2001
From: Ryan Greenblatt <greenblattryan@gmail.com>
Date: Sun, 9 Jun 2019 18:02:08 -0400
Subject: pip: fix no such file or directory error (#7916)

Zsh may be configured such that ">>" will error if the file doesn't exist (`setopt noclobber`).
---
 plugins/pip/pip.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins')

diff --git a/plugins/pip/pip.plugin.zsh b/plugins/pip/pip.plugin.zsh
index 5539187e1..aaae90185 100644
--- a/plugins/pip/pip.plugin.zsh
+++ b/plugins/pip/pip.plugin.zsh
@@ -29,6 +29,7 @@ zsh-pip-cache-packages() {
   if [[ ! -f $ZSH_PIP_CACHE_FILE ]]; then
       echo -n "(...caching package index...)"
       tmp_cache=/tmp/zsh_tmp_cache
+      touch $tmp_cache
       for index in $ZSH_PIP_INDEXES ; do
           # well... I've already got two problems
           curl -L $index 2>/dev/null | \
-- 
cgit v1.2.3-70-g09d2


From 7f98e1cb52d1bf42837f48ad4727d04a1cc5a4c8 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 11 Jun 2019 15:02:04 +0200
Subject: debian: fix alias completion, rename ag and clean up README (#7698)

* Use double quotes to cache value of $apt_pref and $apt_upgr
* Clean up and fix syntax of command checks
* Clean up README and document $apt_pref/$apt_upgr overriding mechanism
* Rename `ag` alias (apt upgrade) to `au`
* Clean up README and fix syntax

Fixes #3686
Fixes #4660
Closes #5906

Co-authored-by: Noah Vesely <fowlslegs@riseup.net>
---
 plugins/debian/README.md         | 114 +++++++++++++++++++++------------------
 plugins/debian/debian.plugin.zsh |  97 ++++++++++++++++-----------------
 2 files changed, 107 insertions(+), 104 deletions(-)

(limited to 'plugins')

diff --git a/plugins/debian/README.md b/plugins/debian/README.md
index a676674dc..da5675c66 100644
--- a/plugins/debian/README.md
+++ b/plugins/debian/README.md
@@ -1,75 +1,85 @@
 # debian
 
-This plugin provides debian related zsh aliases.
+This plugin provides Debian-related aliases and functions for zsh.
+
 To use it add `debian` to the plugins array in your zshrc file.
 
 ```zsh
 plugins=(... debian)
 ```
 
+## Settings
+
+- `$apt_pref`: use apt or aptitude if installed, fallback is apt-get.
+- `$apt_upgr`: use upgrade or safe-upgrade (for aptitude).
+
+Set `$apt_pref` and `$apt_upgr` to whatever command you want (before sourcing Oh My Zsh) to override this behavior.
+
 ## Common Aliases
 
-| Alias    | Command                                                                       | Description                                                                |
-| -------- | ------------------------------------------------------------------------------|--------------------------------------------------------------------------- |
-| `age`    | apt-get                                                                       | Command line tool for handling packages                                    |
-| `api`    | aptitude                                                                      | Same functionality as `apt-get`, provides extra options while installation |
-| `acs`    | apt-cache search                                                              | Command line tool for searching apt software package cache                 |
-| `aps`    | aptitude search                                                               | Searches installed packages using aptitude                                 |
-| `as`     | aptitude -F \"* %p -> %d \n(%v/%V)\" \ -no-gui --disable-columns search       | -                                                                          |
-| `afs`    | apt-file search --regexp                                                      | Search file in packages                                                    |
-| `asrc`   | apt-get source                                                                | Fetch source packages through `apt-get`                                    |
-| `app`    | apt-cache policy                                                              | Displays priority of package sources                                       |
+| Alias  | Command                                                                | Description                                                |
+| ------ | ---------------------------------------------------------------------- | ---------------------------------------------------------- |
+| `age`  | `apt-get`                                                              | Command line tool for handling packages                    |
+| `api`  | `aptitude`                                                             | Same functionality as `apt-get`, provides extra options    |
+| `acs`  | `apt-cache search`                                                     | Command line tool for searching apt software package cache |
+| `aps`  | `aptitude search`                                                      | Searches installed packages using aptitude                 |
+| `as`   | `aptitude -F '* %p -> %d \n(%v/%V)' --no-gui --disable-columns search` | Print searched packages using a custom format              |
+| `afs`  | `apt-file search --regexp`                                             | Search file in packages                                    |
+| `asrc` | `apt-get source`                                                       | Fetch source packages through `apt-get`                    |
+| `app`  | `apt-cache policy`                                                     | Displays priority of package sources                       |
 
 ## Superuser Operations Aliases
 
-| Alias    | Command                                                                                          | Description                                                                                 |
-| -------- | -------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------- |
-| `aac`    | sudo $apt_pref autoclean                                                                         | Clears out the local repository of retrieved package files                                  |
-| `abd`    | sudo $apt_pref build-dep                                                                         | Installs all dependencies for building packages                                             |
-| `ac`     | sudo $apt_pref clean                                                                             | Clears out the local repository of retrieved package files except lock files                |
-| `ad`     | sudo $apt_pref update                                                                            | Updates the package lists for upgrades for packages                                         | 
-| `adg`    | sudo $apt_pref update && sudo $apt_pref $apt_upgr                                                | Update and upgrade packages                                                                 |
-| `adu`    | sudo $apt_pref update && sudo $apt_pref dist-upgrade                                             | Smart upgrade that handles dependencies                                                     |
-| `afu`    | sudo apt-file update                                                                             | Update the files in packages                                                                |
-| `au`     | sudo $apt_pref $apt_upgr                                                                         | -                                                                                           |
-| `ai`     | sudo $apt_pref install                                                                           | Command-line tool to install package                                                        |
-| `ail`    | sed -e 's/  */ /g' -e 's/ *//' &#124; cut -s -d ' ' -f 1 &#124; "' xargs sudo $apt_pref install  | Install all packages given on the command line while using only the first word of each line |
-| `ap`     | sudo $apt_pref purge                                                                             | Removes packages along with configuration files                                             |
-| `ar`     | sudo $apt_pref remove                                                                            | Removes packages, keeps the configuration files                                             |
-| `ads`    | sudo apt-get dselect-upgrade                                                                     | Installs packages from list and removes all not in the list                                 |
-| `dia`    | sudo dpkg -i ./*.deb                                                                             | Install all .deb files in the current directory                                             |
-| `di`     | sudo dpkg -i                                                                                     | Install all .deb files in the current directory                                             |
-| `kclean` | sudo aptitude remove -P ?and(~i~nlinux-(ima&#124;hea) ?not(~n`uname -r`))                        | Remove ALL kernel images and headers EXCEPT the one in use                                  |
-
-- `$apt_pref` - Use apt or aptitude if installed, fallback is apt-get.
-- `$apt_upgr` - Use upgrade.
+| Alias    | Command                                                                                | Description                                                                                 |
+| -------- | -------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------- |
+| `aac`    | `sudo $apt_pref autoclean`                                                             | Clears out the local repository of retrieved package files                                  |
+| `abd`    | `sudo $apt_pref build-dep`                                                             | Installs all dependencies for building packages                                             |
+| `ac`     | `sudo $apt_pref clean`                                                                 | Clears out the local repository of retrieved package files except lock files                |
+| `ad`     | `sudo $apt_pref update`                                                                | Updates the package lists for upgrades for packages                                         |
+| `adg`    | `sudo $apt_pref update && sudo $apt_pref $apt_upgr`                                    | Update and upgrade packages                                                                 |
+| `adu`    | `sudo $apt_pref update && sudo $apt_pref dist-upgrade`                                 | Smart upgrade that handles dependencies                                                     |
+| `afu`    | `sudo apt-file update`                                                                 | Update the files in packages                                                                |
+| `au`     | `sudo $apt_pref $apt_upgr`                                                             | Install package upgrades                                                                    |
+| `ai`     | `sudo $apt_pref install`                                                               | Command-line tool to install package                                                        |
+| `ail`    | `sed -e 's/  */ /g' -e 's/ *//' \| cut -s -d ' ' -f 1 \| xargs sudo $apt_pref install` | Install all packages given on the command line while using only the first word of each line |
+| `ap`     | `sudo $apt_pref purge`                                                                 | Removes packages along with configuration files                                             |
+| `ar`     | `sudo $apt_pref remove`                                                                | Removes packages, keeps the configuration files                                             |
+| `ads`    | `sudo apt-get dselect-upgrade`                                                         | Installs packages from list and removes all not in the list                                 |
+| `dia`    | `sudo dpkg -i ./*.deb`                                                                 | Install all .deb files in the current directory                                             |
+| `di`     | `sudo dpkg -i`                                                                         | Install all .deb files in the current directory                                             |
+| `kclean` | `sudo aptitude remove -P ?and(~i~nlinux-(ima\|hea) ?not(~n$(uname -r)))`               | Remove ALL kernel images and headers EXCEPT the one in use                                  |
 
 ## Aliases - Commands using `su`
 
-| Alias    | Command                                                                       |
-| -------- | ------------------------------------------------------------------------------|
-| `aac`    | su -ls \'$apt_pref autoclean\' root                                           |
-| `ac`     | su -ls \'$apt_pref clean\' root                                               |
-| `ad`     | su -lc \'$apt_pref update\' root                                              |
-| `adg`    | su -lc \'$apt_pref update && aptitude $apt_upgr\' root                        |
-| `adu`    | su -lc \'$apt_pref update && aptitude dist-upgrade\' root                     |
-| `afu`    | su -lc "apt-file update                                                       |
-| `ag`     | su -lc \'$apt_pref $apt_upgr\' root                                           |
-| `dia`    | su -lc "dpkg -i ./*.deb" root                                                 |
+| Alias | Command                                                   |
+| ----- | --------------------------------------------------------- |
+| `aac` | `su -ls "$apt_pref autoclean" root`                       |
+| `ac`  | `su -ls "$apt_pref clean" root`                           |
+| `ad`  | `su -lc "$apt_pref update" root`                          |
+| `adg` | `su -lc "$apt_pref update && aptitude $apt_upgr" root`    |
+| `adu` | `su -lc "$apt_pref update && aptitude dist-upgrade" root` |
+| `afu` | `su -lc "apt-file update"`                                |
+| `au`  | `su -lc "$apt_pref $apt_upgr" root`                       |
+| `dia` | `su -lc "dpkg -i ./*.deb" root`                           |
 
 ## Miscellaneous Aliases
 
-| Alias    | Command                                          | Description                             |
-| -------- | -------------------------------------------------|---------------------------------------- |
-| `allpkgs`| aptitude search -F "%p" --disable-columns ~i     | Display all installed packages          |  
-| `mydeb`  | time dpkg-buildpackage -rfakeroot -us -uc        | Create a basic .deb package             |
+| Alias     | Command                                        | Description                    |
+| --------- | ---------------------------------------------- | ------------------------------ |
+| `allpkgs` | `aptitude search -F "%p" --disable-columns ~i` | Display all installed packages |
+| `mydeb`   | `time dpkg-buildpackage -rfakeroot -us -uc`    | Create a basic .deb package    |
 
 ## Functions
 
-| Fucntion              | Description                                                                   |
-|-----------------------|-------------------------------------------------------------------------------|
-| `apt-copy`            | Create a simple script that can be used to 'duplicate' a system               |
-| `apt-history`         | Displays apt history for a command                                            | 
-| `kerndeb`             | Builds kernel packages                                                        |
-| `apt-list-packages`   | List packages by size                                                         |
+| Function            | Description                                                     |
+| ------------------- | --------------------------------------------------------------- |
+| `apt-copy`          | Create a simple script that can be used to 'duplicate' a system |
+| `apt-history`       | Displays apt history for a command                              |
+| `kerndeb`           | Builds kernel packages                                          |
+| `apt-list-packages` | List packages by size                                           |
+
+## Authors
 
+- [@AlexBio](https://github.com/AlexBio)
+- [@dbb](https://github.com/dbb)
+- [@Mappleconfusers](https://github.com/Mappleconfusers)
diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index 654b692d2..be4062ebf 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -1,25 +1,21 @@
-# Authors:
-# https://github.com/AlexBio
-# https://github.com/dbb
-# https://github.com/Mappleconfusers
-#
-# Debian-related zsh aliases and functions for zsh
-
 # Use apt or aptitude if installed, fallback is apt-get
 # You can just set apt_pref='apt-get' to override it.
-if [[ -e $( which -p apt 2>&1 ) ]]; then
-    apt_pref='apt'
-    apt_upgr='upgrade'
-elif [[ -e $( which -p aptitude 2>&1 ) ]]; then
-    apt_pref='aptitude'
-    apt_upgr='safe-upgrade'
-else
-    apt_pref='apt-get'
-    apt_upgr='upgrade'
+
+if [[ -z $apt_pref || -z $apt_upgr ]]; then
+    if [[ -e $commands[apt] ]]; then
+        apt_pref='apt'
+        apt_upgr='upgrade'
+    elif [[ -e $commands[aptitude] ]]; then
+        apt_pref='aptitude'
+        apt_upgr='safe-upgrade'
+    else
+        apt_pref='apt-get'
+        apt_upgr='upgrade'
+    fi
 fi
 
 # Use sudo by default if it's installed
-if [[ -e $( which -p sudo 2>&1 ) ]]; then
+if [[ -e $commands[sudo] ]]; then
     use_sudo=1
 fi
 
@@ -32,8 +28,7 @@ alias api='aptitude'
 # Some self-explanatory aliases
 alias acs="apt-cache search"
 alias aps='aptitude search'
-alias as="aptitude -F \"* %p -> %d \n(%v/%V)\" \
-		--no-gui --disable-columns search"	# search package
+alias as="aptitude -F '* %p -> %d \n(%v/%V)' --no-gui --disable-columns search"
 
 # apt-file
 alias afs='apt-file search --regexp'
@@ -46,49 +41,48 @@ alias app='apt-cache policy'
 # superuser operations ######################################################
 if [[ $use_sudo -eq 1 ]]; then
 # commands using sudo #######
-    alias aac='sudo $apt_pref autoclean'
-    alias abd='sudo $apt_pref build-dep'
-    alias ac='sudo $apt_pref clean'
-    alias ad='sudo $apt_pref update'
-    alias adg='sudo $apt_pref update && sudo $apt_pref $apt_upgr'
-    alias adu='sudo $apt_pref update && sudo $apt_pref dist-upgrade'
-    alias afu='sudo apt-file update'
-    alias au='sudo $apt_pref $apt_upgr'
-    alias ai='sudo $apt_pref install'
+    alias aac="sudo $apt_pref autoclean"
+    alias abd="sudo $apt_pref build-dep"
+    alias ac="sudo $apt_pref clean"
+    alias ad="sudo $apt_pref update"
+    alias adg="sudo $apt_pref update && sudo $apt_pref $apt_upgr"
+    alias adu="sudo $apt_pref update && sudo $apt_pref dist-upgrade"
+    alias afu="sudo apt-file update"
+    alias au="sudo $apt_pref $apt_upgr"
+    alias ai="sudo $apt_pref install"
     # Install all packages given on the command line while using only the first word of each line:
     # acs ... | ail
-    alias ail="sed -e 's/  */ /g' -e 's/ *//' | cut -s -d ' ' -f 1 | "' xargs sudo $apt_pref install'
-    alias ap='sudo $apt_pref purge'
-    alias ar='sudo $apt_pref remove'
+    alias ail="sed -e 's/  */ /g' -e 's/ *//' | cut -s -d ' ' -f 1 | xargs sudo $apt_pref install"
+    alias ap="sudo $apt_pref purge"
+    alias ar="sudo $apt_pref remove"
 
     # apt-get only
-    alias ads='sudo apt-get dselect-upgrade'
+    alias ads="sudo apt-get dselect-upgrade"
 
     # Install all .deb files in the current directory.
     # Warning: you will need to put the glob in single quotes if you use:
     # glob_subst
-    alias dia='sudo dpkg -i ./*.deb'
-    alias di='sudo dpkg -i'
+    alias dia="sudo dpkg -i ./*.deb"
+    alias di="sudo dpkg -i"
 
     # Remove ALL kernel images and headers EXCEPT the one in use
-    alias kclean='sudo aptitude remove -P ?and(~i~nlinux-(ima|hea) \
-        ?not(~n`uname -r`))'
+    alias kclean='sudo aptitude remove -P ?and(~i~nlinux-(ima|hea) ?not(~n$(uname -r)))'
 
 
 # commands using su #########
 else
-    alias aac='su -ls \'$apt_pref autoclean\' root'
+    alias aac="su -ls '$apt_pref autoclean' root"
     abd() {
         cmd="su -lc '$apt_pref build-dep $@' root"
         print "$cmd"
         eval "$cmd"
     }
-    alias ac='su -ls \'$apt_pref clean\' root'
-    alias ad='su -lc \'$apt_pref update\' root'
-    alias adg='su -lc \'$apt_pref update && aptitude $apt_upgr\' root'
-    alias adu='su -lc \'$apt_pref update && aptitude dist-upgrade\' root'
-    alias afu='su -lc "apt-file update"'
-    alias ag='su -lc \'$apt_pref $apt_upgr\' root'
+    alias ac="su -ls '$apt_pref clean' root"
+    alias ad="su -lc '$apt_pref update' root"
+    alias adg="su -lc '$apt_pref update && aptitude $apt_upgr' root"
+    alias adu="su -lc '$apt_pref update && aptitude dist-upgrade' root"
+    alias afu="su -lc '$apt-file update'"
+    alias au="su -lc '$apt_pref $apt_upgr' root"
     ai() {
         cmd="su -lc 'aptitude -P install $@' root"
         print "$cmd"
@@ -111,8 +105,7 @@ else
     alias di='su -lc "dpkg -i" root'
 
     # Remove ALL kernel images and headers EXCEPT the one in use
-    alias kclean='su -lc '\''aptitude remove -P ?and(~i~nlinux-(ima|hea) \
-        ?not(~n`uname -r`))'\'' root'
+    alias kclean='su -lc "aptitude remove -P ?and(~i~nlinux-(ima|hea) ?not(~n$(uname -r)))" root'
 fi
 
 # Completion ################################################################
@@ -126,11 +119,11 @@ apt_pref_compdef() {
     f="_apt_pref_${2}"
 
     eval "function ${f}() {
-        shift words; 
-	service=\"\$apt_pref\"; 
-	words=(\"\$apt_pref\" '$2' \$words); 
-	((CURRENT++))
-	test \"\${apt_pref}\" = 'aptitude' && _aptitude || _apt
+        shift words;
+        service=\"\$apt_pref\";
+        words=(\"\$apt_pref\" '$2' \$words);
+        ((CURRENT++))
+        test \"\${apt_pref}\" = 'aptitude' && _aptitude || _apt
     }"
 
     compdef "$f" "$1"
@@ -141,7 +134,7 @@ apt_pref_compdef abd "build-dep"
 apt_pref_compdef ac  "clean"
 apt_pref_compdef ad  "update"
 apt_pref_compdef afu "update"
-apt_pref_compdef ag  "$apt_upgr"
+apt_pref_compdef au  "$apt_upgr"
 apt_pref_compdef ai  "install"
 apt_pref_compdef ail "install"
 apt_pref_compdef ap  "purge"
@@ -213,7 +206,7 @@ kerndeb () {
     # temporarily unset MAKEFLAGS ( '-j3' will fail )
     MAKEFLAGS=$( print - $MAKEFLAGS | perl -pe 's/-j\s*[\d]+//g' )
     print '$MAKEFLAGS set to '"'$MAKEFLAGS'"
-	appendage='-custom' # this shows up in $ (uname -r )
+    appendage='-custom' # this shows up in $(uname -r )
     revision=$(date +"%Y%m%d") # this shows up in the .deb file name
 
     make-kpkg clean
-- 
cgit v1.2.3-70-g09d2


From 078f64dcf9c56f45d1d5e9e49dd5709baedc1386 Mon Sep 17 00:00:00 2001
From: Viktor Fonic <viktor.fonic@gmail.com>
Date: Thu, 13 Jun 2019 00:45:43 +0700
Subject: rails: fix typo in README (#7923)

---
 plugins/rails/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/rails/README.md b/plugins/rails/README.md
index 51742b2a3..5549ba18b 100644
--- a/plugins/rails/README.md
+++ b/plugins/rails/README.md
@@ -66,7 +66,7 @@ plugins=(... rails)
 | `RET` | `RAILS_ENV=test`        | Sets `RAILS_ENV` to test        |
 
 These are global aliases. Use in combination with a command or just run them
-separately. For example: `RED rake db:migrate` will migrate the production db.
+separately. For example: `REP rake db:migrate` will migrate the production db.
 
 ### Legacy stuff
 
-- 
cgit v1.2.3-70-g09d2


From f992d434ec9057a33b9778fd945a6e80d8c2df75 Mon Sep 17 00:00:00 2001
From: SomeDer <48731521+SomeDer@users.noreply.github.com>
Date: Sat, 15 Jun 2019 18:47:23 +0100
Subject: git: add git revert alias (#7841)

* git: add `alias grev="git revert"`

* Swapping double for single quotes

Matching the conventions in the plugin
---
 plugins/git/git.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 09998003a..e0ce27fd4 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -199,6 +199,7 @@ alias grbd='git rebase develop'
 alias grbi='git rebase -i'
 alias grbm='git rebase master'
 alias grbs='git rebase --skip'
+alias grev='git revert'
 alias grh='git reset'
 alias grhh='git reset --hard'
 alias groh='git reset origin/$(git_current_branch) --hard'
-- 
cgit v1.2.3-70-g09d2


From 5f18dbf895675ff22dcbe2afa78b72b74350ea58 Mon Sep 17 00:00:00 2001
From: Sung Won Cho <hello@sung.io>
Date: Sun, 16 Jun 2019 03:52:22 +1000
Subject: Add a completion plugin for dnote (#7885)

---
 plugins/dnote/README.md | 51 +++++++++++++++++++++++++++++++++++++++++++++++++
 plugins/dnote/_dnote    | 39 +++++++++++++++++++++++++++++++++++++
 2 files changed, 90 insertions(+)
 create mode 100644 plugins/dnote/README.md
 create mode 100644 plugins/dnote/_dnote

(limited to 'plugins')

diff --git a/plugins/dnote/README.md b/plugins/dnote/README.md
new file mode 100644
index 000000000..e1b9b7044
--- /dev/null
+++ b/plugins/dnote/README.md
@@ -0,0 +1,51 @@
+# Dnote Plugin
+
+This plugin adds auto-completion for [Dnote](https://dnote.io) project.
+
+To use it, add `dnote` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(dnote)
+```
+
+## Usage
+
+At the basic level, this plugin completes all Dnote commands.
+
+```zsh
+$ dnote a(press <TAB> here)
+```
+
+would result in:
+
+```zsh
+$ dnote add
+```
+
+For some commands, this plugin dynamically suggests matching book names.
+
+For instance, if you have three books that begin with 'j': 'javascript', 'job', 'js',
+
+```zsh
+$ dnote view j(press <TAB> here)
+```
+
+would result in:
+
+```zsh
+$ dnote v j
+javascript  job         js
+```
+
+As another example,
+
+```zsh
+$ dnote edit ja(press <TAB> here)
+```
+
+would result in:
+
+
+```zsh
+$ dnote v javascript
+``````
diff --git a/plugins/dnote/_dnote b/plugins/dnote/_dnote
new file mode 100644
index 000000000..c8b33486a
--- /dev/null
+++ b/plugins/dnote/_dnote
@@ -0,0 +1,39 @@
+#compdef dnote
+
+local -a _1st_arguments
+
+_1st_arguments=(
+  'add:add a new note'
+  'view:list books, notes, or view a content'
+  'edit:edit a note or a book'
+  'remove:remove a note or a book'
+  'find:find notes by keywords'
+  'sync:sync data with the server'
+  'login:login to the dnote server'
+  'logout:logout from the dnote server'
+  'version:print the current version'
+  'help:get help about any command'
+)
+
+get_booknames() {
+  local names=$(dnote view --name-only)
+  local -a ret
+
+  while read -r line; do
+    ret+=("${line}")
+  done <<< "$names"
+
+  echo "$ret"
+}
+
+if (( CURRENT == 2 )); then
+  _describe -t commands "dnote subcommand" _1st_arguments
+  return
+elif (( CURRENT == 3 )); then
+  case "$words[2]" in
+    v|view|a|add)
+      _alternative \
+        "names:book names:($(get_booknames))"
+  esac
+fi
+
-- 
cgit v1.2.3-70-g09d2


From fec2e56bc9361edb8d403d231117686630c1b85b Mon Sep 17 00:00:00 2001
From: Nicholas Wehr <33910651+wwwehr@users.noreply.github.com>
Date: Sun, 16 Jun 2019 00:54:19 +0700
Subject: adding gatsby command set (#7831)

---
 plugins/gatsby/README.md |  7 +++++++
 plugins/gatsby/_gatsby   | 24 ++++++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 plugins/gatsby/README.md
 create mode 100644 plugins/gatsby/_gatsby

(limited to 'plugins')

diff --git a/plugins/gatsby/README.md b/plugins/gatsby/README.md
new file mode 100644
index 000000000..36846a228
--- /dev/null
+++ b/plugins/gatsby/README.md
@@ -0,0 +1,7 @@
+# gatsby autocomplete plugin
+
+* Adds autocomplete options for all gatsby commands.
+
+## Requirements
+
+In order to make this work, you will need to have gatsby set up in your path.
diff --git a/plugins/gatsby/_gatsby b/plugins/gatsby/_gatsby
new file mode 100644
index 000000000..66eb02f00
--- /dev/null
+++ b/plugins/gatsby/_gatsby
@@ -0,0 +1,24 @@
+#compdef gatsby
+#autoload
+
+# in order to make this work, you will need to have gatsby
+# https://www.gatsbyjs.org/
+
+local -a _1st_arguments
+_1st_arguments=(
+'develop:Start development server. Watches files, rebuilds, and hot reloads if something changes'
+'build:Build a Gatsby project.'
+'serve:Serve previously built Gatsby site.'
+'info:Get environment information for debugging and issue reporting'
+'clean:Wipe the local gatsby environment including built assets and cache'
+'repl:Get a node repl with context of Gatsby environment, see (add docs link here)'
+'new: [rootPath] [starter]  Create new Gatsby project.'
+'telemetry:Enable or disable Gatsby anonymous analytics collection.'
+)
+
+_arguments -C '*:: :->subcmds' && return 0
+
+if (( CURRENT == 1 )); then
+    _describe -t commands "gatsby subcommand" _1st_arguments
+    return
+fi
-- 
cgit v1.2.3-70-g09d2


From c105c04b6b1ddb917c12eadacb26c252f44ddfad Mon Sep 17 00:00:00 2001
From: Jason Schwerberg <jason@schwerberg.com>
Date: Sat, 15 Jun 2019 11:49:33 -0700
Subject: kubectl: add statefulset aliases (#7826)

---
 plugins/kubectl/README.md          |  9 +++++++++
 plugins/kubectl/kubectl.plugin.zsh | 10 ++++++++++
 2 files changed, 19 insertions(+)

(limited to 'plugins')

diff --git a/plugins/kubectl/README.md b/plugins/kubectl/README.md
index 4541c7e92..c0db59362 100644
--- a/plugins/kubectl/README.md
+++ b/plugins/kubectl/README.md
@@ -96,3 +96,12 @@ plugins=(... kubectl)
 | kepvc   | `kubectl edit pvc`                  | Edit pvcs from the default editor                                                                |
 | kdpvc   | `kubectl describe pvc`              | Descirbe all pvcs                                                                                |
 | kdelpvc | `kubectl delete pvc`                | Delete all pvcs matching passed arguments                                                        |
+|         |                                     |                                                                                                  |
+| kgss    | `kubectl get statefulset`           | List the statefulsets in ps format                                                               |
+| kgssw   | `kgss --watch`                      | After getting the list of statefulsets, watch for changes                                        |
+| kgsswide| `kgss -o wide`                      | After getting the statefulsets, output in plain-text format with any additional information      |
+| kess    | `kubectl edit statefulset`          | Edit statefulset resource from the default editor                                                |
+| kdss    | `kubectl describe statefulset`      | Describe statefulset resource in detail                                                          |
+| kdelss  | `kubectl delete statefulset`        | Delete the statefulset                                                                           |
+| ksss    | `kubectl scale statefulset`         | Scale a statefulset                                                                              |
+| krsss   | `kubectl rollout status statefulset`| Check the rollout status of a deployment                                                         |
diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index 5097732db..6c1696d5e 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -96,6 +96,16 @@ alias kgrs='kubectl get rs'
 alias krh='kubectl rollout history'
 alias kru='kubectl rollout undo'
 
+# Statefulset management.
+alias kgss='kubectl get statefulset'
+alias kgssw='kgss --watch'
+alias kgsswide='kgss -o wide'
+alias kess='kubectl edit statefulset'
+alias kdss='kubectl describe statefulset'
+alias kdelss='kubectl delete statefulset'
+alias ksss='kubectl scale statefulset'
+alias krsss='kubectl rollout status statefulset'
+
 # Port forwarding
 alias kpf="kubectl port-forward"
 
-- 
cgit v1.2.3-70-g09d2


From 5f743e1a84b9c23004bd9e4f6995939b7674d4cc Mon Sep 17 00:00:00 2001
From: tom-apfm <51799266+tom-apfm@users.noreply.github.com>
Date: Wed, 26 Jun 2019 06:20:41 -0700
Subject: terraform: update README (#7934)

Add better usage instructions for the plugin which actually work
---
 plugins/terraform/README.md | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'plugins')

diff --git a/plugins/terraform/README.md b/plugins/terraform/README.md
index e5d9e47b6..471aef24e 100644
--- a/plugins/terraform/README.md
+++ b/plugins/terraform/README.md
@@ -10,6 +10,12 @@ Current as of Terraform v0.11.7
 
 ### Usage
 
+To use it, add `terraform` to the plugins array of your `~/.zshrc` file:
+
+```shell
+plugins=(... terraform)
+```
+
  * Type `terraform` into your prompt and hit `TAB` to see available completion options
 
 ### Expanding ZSH prompt with current Terraform workspace name
@@ -17,7 +23,6 @@ Current as of Terraform v0.11.7
 If you want to get current Terraform workspace name in your ZSH prompt open
 your .zsh-theme file and in a chosen place insert:
 
-```
-$FG[045]\
-$(tf_prompt_info)\
+```shell
+PROMPT=$'%{$fg[white]%}$(tf_prompt_info)%{$reset_color%} '
 ```
-- 
cgit v1.2.3-70-g09d2


From 7b2c4327e7d40ec17b72fe7fce3031dfc92fb165 Mon Sep 17 00:00:00 2001
From: Jacky Wu <Colstuwjx@gmail.com>
Date: Fri, 28 Jun 2019 00:49:00 +0800
Subject: golang: add missing gom alias to README (#7961)

---
 plugins/golang/README.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins')

diff --git a/plugins/golang/README.md b/plugins/golang/README.md
index 72845b2a1..0a1b43c30 100644
--- a/plugins/golang/README.md
+++ b/plugins/golang/README.md
@@ -21,6 +21,7 @@ plugins=(... golang)
 | gog     | `go get`                | Downloads packages and then installs them to $GOPATH          |
 | goi     | `go install`            | Compiles and installs packages to $GOPATH                     |
 | gol     | `go list`               | Lists Go packages                                             |
+| gom     | `go mod`                | Access to operations on modules                               |
 | gop     | `cd $GOPATH`            | Takes you to $GOPATH                                          |
 | gopb    | `cd $GOPATH/bin`        | Takes you to $GOPATH/bin                                      |
 | gops    | `cd $GOPATH/src`        | Takes you to $GOPATH/src                                      |
-- 
cgit v1.2.3-70-g09d2


From c7a7b70e074be0ecc50d1447c6161207f01984dc Mon Sep 17 00:00:00 2001
From: Jackson Delahunt <jackson@jacksondelahunt.com>
Date: Mon, 1 Jul 2019 23:10:59 +1000
Subject: git-auto-fetch: silence stderr output (#7970)

Redirect stderr to avoid printing errors to the console when the ssh key is not
unlocked.
---
 plugins/git-auto-fetch/git-auto-fetch.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
index 1d20bc04b..745c669b5 100644
--- a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
+++ b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
@@ -5,7 +5,7 @@ function git-fetch-all {
   dir=`git rev-parse --git-dir` &&
   [[ ! -f $dir/NO_AUTO_FETCH ]] &&
   (( `date +%s` - `date -r $dir/FETCH_LOG +%s 2>/dev/null || echo 0` > $GIT_AUTO_FETCH_INTERVAL )) &&
-  git fetch --all &>! $dir/FETCH_LOG &)
+  git fetch --all 2>/dev/null &>! $dir/FETCH_LOG &)
 }
 
 function git-auto-fetch {
-- 
cgit v1.2.3-70-g09d2


From 6cb98eda151253e7f11678abef7f0e7b5c96f12d Mon Sep 17 00:00:00 2001
From: Adriaan Knapen <hi@aknapen.nl>
Date: Thu, 11 Jul 2019 21:42:28 +0300
Subject: git: add missing grev alias to README (#7984)

---
 plugins/git/README.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins')

diff --git a/plugins/git/README.md b/plugins/git/README.md
index d66ad234d..fc89b27e0 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -123,6 +123,7 @@ plugins=(... git)
 | grbi                 | git rebase -i                                                                                                                 |
 | grbm                 | git rebase master                                                                                                             |
 | grbs                 | git rebase --skip                                                                                                             |
+| grev                 | git revert                                                                                                                   |
 | grh                  | git reset                                                                                                                     |
 | grhh                 | git reset --hard                                                                                                              |
 | groh                 | git reset origin/$(git_current_branch) --hard                                                                                 |
-- 
cgit v1.2.3-70-g09d2


From b90f76c1411b4a2182f4fd54b5739be5f78410e8 Mon Sep 17 00:00:00 2001
From: Ilya Gorski <52842983+gorsil@users.noreply.github.com>
Date: Mon, 15 Jul 2019 00:40:28 +0300
Subject: fzf: Adding support for debian packages

---
 plugins/fzf/fzf.plugin.zsh | 150 ++++++++++++++++++++++++++++-----------------
 1 file changed, 93 insertions(+), 57 deletions(-)

(limited to 'plugins')

diff --git a/plugins/fzf/fzf.plugin.zsh b/plugins/fzf/fzf.plugin.zsh
index 27e2d9246..e191bebbd 100644
--- a/plugins/fzf/fzf.plugin.zsh
+++ b/plugins/fzf/fzf.plugin.zsh
@@ -1,57 +1,93 @@
-test -d "${FZF_BASE}" && fzf_base="${FZF_BASE}"
-
-if [[ -z "${fzf_base}" ]]; then
-  fzfdirs=(
-    "${HOME}/.fzf"
-    "/usr/local/opt/fzf"
-    "/usr/share/fzf"
-  )
-  for dir in ${fzfdirs}; do
-      if [[ -d "${dir}" ]]; then
-          fzf_base="${dir}"
-          break
-      fi
-  done
-
-  if [[ -z "${fzf_base}" ]]; then
-      if (( ${+commands[brew]} )) && dir="$(brew --prefix fzf 2>/dev/null)"; then
-          if [[ -d "${dir}" ]]; then
-              fzf_base="${dir}"
-          fi
-      fi
-  fi
-fi
-
-if [[ -n "${fzf_base}" ]]; then
-
-  # Fix fzf shell directory for Archlinux package
-  if [[ ! -d "${fzf_base}/shell" ]] && [[ -f /etc/arch-release ]]; then
-    fzf_shell="${fzf_base}"
-  else
-    fzf_shell="${fzf_base}/shell"
-  fi
-
-  # Setup fzf
-  # ---------
-  if ! (( ${+commands[fzf]} )) && [[ ! "$PATH" == *$fzf_base/bin* ]]; then
-    export PATH="$PATH:$fzf_base/bin"
-  fi
-  
-  # Auto-completion
-  # ---------------
-  if [[ ! "$DISABLE_FZF_AUTO_COMPLETION" == "true" ]]; then
-    [[ $- == *i* ]] && source "${fzf_shell}/completion.zsh" 2> /dev/null
-  fi
-  
-  # Key bindings
-  # ------------
-  if [[ ! "$DISABLE_FZF_KEY_BINDINGS" == "true" ]]; then
-    source "${fzf_shell}/key-bindings.zsh"
-  fi
-
-else
-  print "[oh-my-zsh] fzf plugin: Cannot find fzf installation directory.\n"\
-        "Please add \`export FZF_BASE=/path/to/fzf/install/dir\` to your .zshrc" >&2
-fi
-
-unset fzf_base fzf_shell dir fzfdirs
+function setup_using_base_dir() {
+	# Declare all variables local not no mess with outside env in any way
+	local fzf_base
+	local fzf_shell
+	local fzfdirs
+	local dir
+
+    test -d "${FZF_BASE}" && fzf_base="${FZF_BASE}"
+
+    if [[ -z "${fzf_base}" ]]; then
+        fzfdirs=(
+          "${HOME}/.fzf"
+          "/usr/local/opt/fzf"
+          "/usr/share/fzf"
+        )
+        for dir in ${fzfdirs}; do
+            if [[ -d "${dir}" ]]; then
+                fzf_base="${dir}"
+                break
+            fi
+        done
+
+        if [[ -z "${fzf_base}" ]]; then
+            if (( ${+commands[brew]} )) && dir="$(brew --prefix fzf 2>/dev/null)"; then
+                if [[ -d "${dir}" ]]; then
+                    fzf_base="${dir}"
+                fi
+            fi
+        fi
+    fi
+
+    if [[ -d "${fzf_base}" ]]; then
+        # Fix fzf shell directory for Archlinux package
+        if [[ ! -d "${fzf_base}/shell" ]] && [[ -f /etc/arch-release ]]; then
+          fzf_shell="${fzf_base}"
+        else
+          fzf_shell="${fzf_base}/shell"
+        fi
+
+        # Setup fzf binary path
+        if ! (( ${+commands[fzf]} )) && [[ ! "$PATH" == *$fzf_base/bin* ]]; then
+          export PATH="$PATH:$fzf_base/bin"
+        fi
+
+        # Auto-completion
+        if [[ ! "$DISABLE_FZF_AUTO_COMPLETION" == "true" ]]; then
+          [[ $- == *i* ]] && source "${fzf_shell}/completion.zsh" 2> /dev/null
+        fi
+
+        # Key bindings
+        if [[ ! "$DISABLE_FZF_KEY_BINDINGS" == "true" ]]; then
+          source "${fzf_shell}/key-bindings.zsh"
+        fi
+    else
+        return 1
+    fi
+}
+
+
+function setup_using_debian_package() {
+    dpkg -s fzf &> /dev/null
+    if (( $? )); then
+        # Either not a debian based distro, or no fzf installed. In any case skip ahead
+        return 1
+    fi
+
+    # NOTE: There is no need to configure PATH for debian package, all binaries
+    # are installed to /usr/bin by default
+
+    local completions="/usr/share/zsh/vendor-completions/_fzf"
+    local key_bindings="/usr/share/doc/fzf/examples/key-bindings.zsh"
+
+    # Auto-completion
+    if [[ $- == *i* ]] && [[ ! "$DISABLE_FZF_AUTO_COMPLETION" == "true" ]]; then
+         source $completions 2> /dev/null
+    fi
+
+    # Key bindings
+    if [[ ! "$DISABLE_FZF_KEY_BINDINGS" == "true" ]]; then
+        source $key_bindings
+    fi
+
+    return 0
+}
+
+function indicate_error() {
+    print "[oh-my-zsh] fzf plugin: Cannot find fzf installation directory.\n"\
+          "Please add \`export FZF_BASE=/path/to/fzf/install/dir\` to your .zshrc" >&2
+}
+
+# Check for debian package first, because it easy to short cut
+# Indicate to user that fzf installation not found if nothing worked
+setup_using_debian_package || setup_using_base_dir || indicate_error
-- 
cgit v1.2.3-70-g09d2


From 0565251c3bd91994073a265cdb8abb7eac9439e5 Mon Sep 17 00:00:00 2001
From: Ilya Gorski <52842983+gorsil@users.noreply.github.com>
Date: Wed, 17 Jul 2019 02:43:00 +0300
Subject: Unset all local functions after running them

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

(limited to 'plugins')

diff --git a/plugins/fzf/fzf.plugin.zsh b/plugins/fzf/fzf.plugin.zsh
index e191bebbd..646148297 100644
--- a/plugins/fzf/fzf.plugin.zsh
+++ b/plugins/fzf/fzf.plugin.zsh
@@ -91,3 +91,5 @@ function indicate_error() {
 # Check for debian package first, because it easy to short cut
 # Indicate to user that fzf installation not found if nothing worked
 setup_using_debian_package || setup_using_base_dir || indicate_error
+
+unset -f setup_using_debian_package setup_using_base_dir indicate_error
-- 
cgit v1.2.3-70-g09d2


From 783dd1504f99bd34aedd1d4a68ae6f14e38606da Mon Sep 17 00:00:00 2001
From: Pavel Omelchenko <p.Omelchenko@gmail.com>
Date: Wed, 17 Jul 2019 15:17:34 +0300
Subject: change key string

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

(limited to 'plugins')

diff --git a/plugins/homestead/homestead.plugin.zsh b/plugins/homestead/homestead.plugin.zsh
index cdbc564e4..f67a582f4 100644
--- a/plugins/homestead/homestead.plugin.zsh
+++ b/plugins/homestead/homestead.plugin.zsh
@@ -1,6 +1,6 @@
 # Homestead basic command completion
 _homestead_get_command_list () {
-  homestead --no-ansi | sed "1,/Available commands/d" | awk '/^ +[a-z]+/ { print $1 }'
+  homestead --no-ansi | sed "1,/Common commands/d" | awk '/^ +[a-z]+/ { print $1 }'
 }
 
 _homestead () {
-- 
cgit v1.2.3-70-g09d2


From 508cba2fc2ec545504abcf38ecdd958f3a89e5e8 Mon Sep 17 00:00:00 2001
From: PLANET ARGON <github@planetargon.com>
Date: Mon, 22 Jul 2019 07:28:33 -0700
Subject: Removing plugin that was named after an external tool, which carries
 a history as a racist phrase. Was reported by a user of OMZ who shared some
 background on the terminology and how it made them feel. (#8027)

---
 plugins/bwana/README.md        | 12 ------------
 plugins/bwana/bwana.plugin.zsh | 13 -------------
 2 files changed, 25 deletions(-)
 delete mode 100644 plugins/bwana/README.md
 delete mode 100644 plugins/bwana/bwana.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/bwana/README.md b/plugins/bwana/README.md
deleted file mode 100644
index dd4fe9f9c..000000000
--- a/plugins/bwana/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Bwana
-
-This plugin provides a function to open `man` pages directly with [Bwana](https://www.bruji.com/bwana/).
-
-To use it add bwana to the plugins array in your zshrc file.
-
-```bash
-plugins=(... bwana)
-```
-
-The `bwana` function opens the man page of the passed argument in the Bwana app.
-For example: `bwana ln` opens the man page for `ln` in Bwana.
diff --git a/plugins/bwana/bwana.plugin.zsh b/plugins/bwana/bwana.plugin.zsh
deleted file mode 100644
index 71c9eb18d..000000000
--- a/plugins/bwana/bwana.plugin.zsh
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Requires https://www.bruji.com/bwana/
-#
-if [[ -e /Applications/Bwana.app ]] ||
-    ( system_profiler -detailLevel mini SPApplicationsDataType | grep -q Bwana )
-then
-  function bwana() {
-    open "man:$1"
-  }
-else
-  echo "Bwana lets you read man files in Safari through a man: URI scheme"
-  echo "To use it within Zsh, install it from https://www.bruji.com/bwana/"
-fi
-- 
cgit v1.2.3-70-g09d2


From 9817e1e7ff62494abf9d7c78870e92908567e8f4 Mon Sep 17 00:00:00 2001
From: Gopal9816 <gopalkurup@gmail.com>
Date: Sat, 27 Jul 2019 17:39:00 +0530
Subject: common-aliases: add README (#8039)

---
 plugins/common-aliases/README.md | 121 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 121 insertions(+)
 create mode 100644 plugins/common-aliases/README.md

(limited to 'plugins')

diff --git a/plugins/common-aliases/README.md b/plugins/common-aliases/README.md
new file mode 100644
index 000000000..d198a29ac
--- /dev/null
+++ b/plugins/common-aliases/README.md
@@ -0,0 +1,121 @@
+# Common Aliases Plugin
+
+This plugin creates helpful shortcut aliases for many commonly used commands.
+
+To use it add `common-aliases` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... common-aliases)
+```
+
+## Aliases
+
+### ls command
+
+| Alias | Command       | Description                                                                    |
+|-------|---------------|--------------------------------------------------------------------------------|
+| l     | `ls -lFh`     | List files as a long list, show size, type, human-readable                     |
+| la    | `ls -lAFh`    | List almost all files as a long list show size, type, human-readable           |
+| lr    | `ls -tRFh`    | List files recursively sorted by date, show type, human-readable               |
+| lt    | `ls -ltFh`    | List files as a long list sorted by date, show type, human-readable            |
+| ll    | `ls -l`       | List files as a long list                                                      |
+| ldot  | `ls -ld .*`   | List dot files as a long list                                                  |
+| lS    | `ls -1FSsh`   | List files showing only size and name sorted by size                           |
+| lart  | `ls -1Fcart`  | List all files sorted in reverse of create/modification time (oldest first)    |
+| lrt   | `ls -1Fcrt`   | List files sorted in reverse of create/modification time(oldest first)         |
+
+### File handling
+
+| Alias | Command               | Description                                                                        |
+|-------|-----------------------|------------------------------------------------------------------------------------|
+| rm    | `rm -i`               | Remove a file                                                                      |
+| cp    | `cp -i`               | Copy a file                                                                        |
+| mv    | `mv -i`               | Move a file                                                                        |
+| zshrc | `${=EDITOR} ~/.zshrc` | Quickly access the ~/.zshrc file                                                   |
+| dud   | `du -d 1 -h`          | Display the size of files at depth 1 in current location in human-readable form    |
+| duf   | `du -sh`              | Display the size of files in current location in human-readable form               |
+| t     | `tail -f`             | Shorthand for tail which outputs the last part of a file                           |
+
+### find and grep
+
+| Alias | Command                                             | Description                             |
+|-------|-----------------------------------------------------|-----------------------------------------|
+| fd    | `find . -type d -name`                              | Find a directory with the given name    |
+| ff    | `find . -type f -name`                              | Find a file with the given name         |
+| grep  | `grep --color`                                      | Searches for a query string             |
+| sgrep | `grep -R -n -H -C 5 --exclude-dir={.git,.svn,CVS}`  | Useful for searching within files       |
+
+### Other Aliases
+
+| Alias     | Command             | Description                                                 |
+|-----------|---------------------|-------------------------------------------------------------|
+| h         | `history`           | Lists all recently used commands                            |
+| hgrep     | `fc -El 0 \| grep`  | Searches for a word in the list of previously used commands |
+| help      | `man`               | Opens up the man page for a command                         |
+| p         | `ps -f`             | Displays currently executing processes                      |
+| sortnr    | `sort -n -r`        | Used to sort the lines of a text file                       |
+| unexport  | `unset`             | Used to unset an environment variable                       |
+
+## Global aliases
+
+These aliases are expanded in any position in the command line, meaning you can use them even at the
+end of the command you've typed. Examples:
+
+Quickly pipe to less:
+```zsh
+$ ls -l /var/log L
+# will run
+$ ls -l /var/log | less
+```
+Silences stderr output:
+```zsh
+$ find . -type f NE
+# will run
+$ find . -type f 2>/dev/null
+```
+
+| Alias | Command                     | Description                                                 |
+|-------|-----------------------------|-------------------------------------------------------------| 
+| H     | `\| head`                   | Pipes output to head which outputs the first part of a file |
+| T     | `\| tail`                   | Pipes output to tail which outputs the last part of a file  |
+| G     | `\| grep`                   | Pipes output to grep to search for some word                |
+| L     | `\| less`                   | Pipes output to less, useful for paging                     |
+| M     | `\| most`                   | Pipes output to more, useful for paging                     |
+| LL    | `2>&1 \| less`              | Writes stderr to stdout and passes it to less               |
+| CA    | `2>&1 \| cat -A`            | Writes stderr to stdout and passes it to cat                |
+| NE    | `2 > /dev/null`             | Silences stderr                                             |
+| NUL   | `> /dev/null 2>&1`          | Silences both stdout and stderr                             |
+| P     | `2>&1\| pygmentize -l pytb` | Writes stderr to stdout and passes it to pygmentize         |
+
+## File extension aliases
+
+These are special aliases that are triggered when a file name is passed as the command. For example,
+if the pdf file extension is aliased to `acroread` (a popular Linux pdf reader), when running `file.pdf`
+that file will be open with `acroread`.
+
+### Reading Docs
+
+| Alias | Command     | Description                         |
+|-------|-------------|-------------------------------------|
+| pdf   | `acroread`  | Opens up a document using acroread  |
+| ps    | `gv`        | Opens up a .ps file using gv        |
+| dvi   | `xdvi`      | Opens up a .dvi file using xdvi     | 
+| chm   | `xchm`      | Opens up a .chm file using xchm     |
+| djvu  | `djview`    | Opens up a .djvu file using djview  |
+
+### Listing files inside a packed file
+
+| Alias   | Command     | Description                         |
+|---------|-------------|-------------------------------------|
+| zip     | `unzip -l`  | Lists files inside a .zip file      |
+| rar     | `unrar l`   | Lists files inside a .rar file      |
+| tar     | `tar tf`    | Lists files inside a .tar file      |
+| tar.gz  | `echo`      | Lists files inside a .tar.gz file   |
+| ace     | `unace l`   | Lists files inside a .ace file      |
+
+### Some other features
+
+- Opens urls in terminal using browser specified by the variable `$BROWSER`
+- Opens C, C++, Tex and text files using editor specified by the variable `$EDITOR`
+- Opens images using image viewer specified by the variable `$XIVIEWER`
+- Opens videos and other media using mplayer
-- 
cgit v1.2.3-70-g09d2


From 6d2221e697ea4a2445202b1c32283610f84585ef Mon Sep 17 00:00:00 2001
From: Jack Brown <jackbrown@users.noreply.github.com>
Date: Wed, 31 Jul 2019 17:45:54 +1000
Subject: frontend-search: add duckduckgo as an option for fallback search
 (#7973)

---
 plugins/frontend-search/README.md                  |  4 +++
 plugins/frontend-search/frontend-search.plugin.zsh | 31 +++++++++++++++-------
 2 files changed, 25 insertions(+), 10 deletions(-)

(limited to 'plugins')

diff --git a/plugins/frontend-search/README.md b/plugins/frontend-search/README.md
index bf76902fd..ddcb3d72b 100644
--- a/plugins/frontend-search/README.md
+++ b/plugins/frontend-search/README.md
@@ -62,6 +62,10 @@ Available search contexts are:
 
 If you want to have another context, open an Issue and tell us!
 
+## Fallback search behaviour
+
+The plugin will use Google as a fallback if the docs site for a search context does not have a search function. You can set the fallback search engine to DuckDuckGo by setting  `FRONTEND_SEARCH_FALLBACK='duckduckgo'` in your `~/.zshrc` file before Oh My Zsh is sourced.
+
 ## Author
 
 **Wilson Mendes (willmendesneto)**
diff --git a/plugins/frontend-search/frontend-search.plugin.zsh b/plugins/frontend-search/frontend-search.plugin.zsh
index 87243be13..ed19280c4 100644
--- a/plugins/frontend-search/frontend-search.plugin.zsh
+++ b/plugins/frontend-search/frontend-search.plugin.zsh
@@ -27,6 +27,17 @@ alias typescript='frontend typescript'
 alias unheap='frontend unheap'
 alias vuejs='frontend vuejs'
 
+function _frontend_fallback() {
+  local url
+  if [[ "$FRONTEND_SEARCH_FALLBACK" == duckduckgo ]]; then
+    url="https://duckduckgo.com/?sites=$1&q="
+  else
+    url="https://google.com/search?as_sitesearch=$1&as_q="
+  fi
+
+  echo "$url"
+}
+
 function frontend() {
   emulate -L zsh
 
@@ -34,8 +45,8 @@ function frontend() {
   typeset -A urls
   urls=(
     angular        'https://angular.io/?search='
-    angularjs      'https://google.com/search?as_sitesearch=angularjs.org&as_q='
-    bem            'https://google.com/search?as_sitesearch=bem.info&as_q='
+    angularjs      $(_frontend_fallback 'angularjs.org')
+    bem            $(_frontend_fallback 'bem.info')
     bootsnipp      'https://bootsnipp.com/search?q='
     bundlephobia   'https://bundlephobia.com/result?p='
     caniuse        'https://caniuse.com/#search='
@@ -43,24 +54,24 @@ function frontend() {
     compassdoc     'http://compass-style.org/search?q='
     cssflow        'http://www.cssflow.com/search?q='
     dartlang       'https://api.dartlang.org/apidocs/channels/stable/dartdoc-viewer/dart:'
-    emberjs        'https://www.google.com/search?as_sitesearch=emberjs.com/&as_q='
-    flowtype       'https://google.com/search?as_sitesearch=flow.org/en/docs/&as_q='
+    emberjs        $(_frontend_fallback 'emberjs.com/')
+    flowtype       $(_frontend_fallback 'flow.org/en/docs/')
     fontello       'http://fontello.com/#search='
     github         'https://github.com/search?q='
     html5please    'https://html5please.com/#'
-    jestjs         'https://www.google.com/search?as_sitesearch=jestjs.io&as_q='
+    jestjs         $(_frontend_fallback 'jestjs.io')
     jquery         'https://api.jquery.com/?s='
     lodash         'https://devdocs.io/lodash/index#'
     mdn            'https://developer.mozilla.org/search?q='
-    nodejs         'https://www.google.com/search?as_sitesearch=nodejs.org/en/docs/&as_q='
+    nodejs         $(_frontend_fallback 'nodejs.org/en/docs/')
     npmjs          'https://www.npmjs.com/search?q='
     qunit          'https://api.qunitjs.com/?s='
-    reactjs        'https://google.com/search?as_sitesearch=facebook.github.io/react&as_q='
-    smacss         'https://google.com/search?as_sitesearch=smacss.com&as_q='
+    reactjs        $(_frontend_fallback 'reactjs.org/')
+    smacss         $(_frontend_fallback 'smacss.com')
     stackoverflow  'https://stackoverflow.com/search?q='
-    typescript     'https://google.com/search?as_sitesearch=www.typescriptlang.org/docs&as_q='
+    typescript     $(_frontend_fallback 'www.typescriptlang.org/docs')
     unheap         'http://www.unheap.com/?s='
-    vuejs          'https://www.google.com/search?as_sitesearch=vuejs.org&as_q='
+    vuejs          $(_frontend_fallback 'vuejs.org')
   )
 
   # show help for command list
-- 
cgit v1.2.3-70-g09d2


From 26aad59779b2cd7ce313798a4e6b76a29b9f2347 Mon Sep 17 00:00:00 2001
From: Iulian Onofrei <iulian.onofrei@yahoo.com>
Date: Sun, 4 Aug 2019 00:33:40 +0300
Subject: Add README file

---
 plugins/colored-man-pages/README.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 plugins/colored-man-pages/README.md

(limited to 'plugins')

diff --git a/plugins/colored-man-pages/README.md b/plugins/colored-man-pages/README.md
new file mode 100644
index 000000000..d9f6acb2a
--- /dev/null
+++ b/plugins/colored-man-pages/README.md
@@ -0,0 +1,15 @@
+# Colored man pages plugin
+
+This plugin adds colors to man pages.
+
+To use it, add `colored-man-pages` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... colored-man-pages)
+```
+
+You can also try to color other pages by prefixing the respective command with `colored`:
+
+```zsh
+colored git help clone
+```
-- 
cgit v1.2.3-70-g09d2


From 40fafe0f59371d1a9d83b83c614acfd1d740aabb Mon Sep 17 00:00:00 2001
From: Jisse Reitsma <jisse@yireo.com>
Date: Wed, 7 Aug 2019 20:16:25 +0200
Subject: n98-magerun: support magerun for Magento 2 (#7950)

---
 plugins/n98-magerun/n98-magerun.plugin.zsh | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'plugins')

diff --git a/plugins/n98-magerun/n98-magerun.plugin.zsh b/plugins/n98-magerun/n98-magerun.plugin.zsh
index bfcf27b98..d79aee7eb 100644
--- a/plugins/n98-magerun/n98-magerun.plugin.zsh
+++ b/plugins/n98-magerun/n98-magerun.plugin.zsh
@@ -2,7 +2,8 @@
 # FILE: n98-magerun.plugin.zsh
 # DESCRIPTION: oh-my-zsh n98-magerun plugin file. Adapted from composer plugin 
 # AUTHOR: Andrew Dwyer (andrewrdwyer at gmail dot com)
-# VERSION: 1.0.0
+# AUTHOR: Jisse Reitsma (jisse at yireo dot com)
+# VERSION: 1.1.0
 # ------------------------------------------------------------------------------
 
 # n98-magerun basic command completion
@@ -24,11 +25,18 @@ _n98_magerun () {
 
 compdef _n98_magerun n98-magerun.phar
 compdef _n98_magerun n98-magerun
+compdef _n98_magerun n98-magerun2.phar
+compdef _n98_magerun n98-magerun2
 
 # Aliases
 alias n98='n98-magerun.phar'
 alias mage='n98-magerun.phar'
-alias magefl='n98-magerun.phar cache:flush'
+alias magerun='n98-magerun.phar'
+
+alias n98-2='n98-magerun2.phar'
+alias mage2='n98-magerun2.phar'
+alias magerun2='n98-magerun2.phar'
 
 # Install n98-magerun into the current directory
-alias mage-get='wget https://raw.github.com/netz98/n98-magerun/master/n98-magerun.phar'
+alias mage-get='wget https://files.magerun.net/n98-magerun.phar'
+alias mage2-get='wget https://files.magerun.net/n98-magerun2.phar'
-- 
cgit v1.2.3-70-g09d2


From 28232904bec1e8e15da52ae048a8a31ef7fac67b Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 13 Aug 2019 18:19:07 +0200
Subject: git-auto-fetch: override zle-line-init only if it exists

---
 plugins/git-auto-fetch/git-auto-fetch.plugin.zsh | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'plugins')

diff --git a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
index 745c669b5..56ab86dbe 100644
--- a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
+++ b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
@@ -18,10 +18,18 @@ function git-auto-fetch {
     echo "${fg_bold[red]}disabled${reset_color}")
 }
 
-eval "override-git-auto-fetch-$(declare -f zle-line-init)"
-
-function zle-line-init () {
-  git-fetch-all
-  override-git-auto-fetch-zle-line-init
-}
+# Override zle-line-init if it exists
+if (( $+functions[zle-line-init] )); then
+  eval "override-git-auto-fetch-$(declare -f zle-line-init)"
+  
+  function zle-line-init () {
+    git-fetch-all
+    override-git-auto-fetch-zle-line-init
+  }
+else
+  function zle-line-init () {
+    git-fetch-all
+  }
+fi
+  
 zle -N zle-line-init
-- 
cgit v1.2.3-70-g09d2


From 97c0d0a563d2303adc64e94c78544bb4d2dbf83c Mon Sep 17 00:00:00 2001
From: SomeDer <48731521+SomeDer@users.noreply.github.com>
Date: Mon, 19 Aug 2019 11:14:22 +0100
Subject: Allow plugins sudo and thefuck to be loaded before vi-mode (#8087)

---
 plugins/sudo/sudo.plugin.zsh       | 4 +++-
 plugins/thefuck/thefuck.plugin.zsh | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/sudo/sudo.plugin.zsh b/plugins/sudo/sudo.plugin.zsh
index 0b843822e..f405b025f 100644
--- a/plugins/sudo/sudo.plugin.zsh
+++ b/plugins/sudo/sudo.plugin.zsh
@@ -28,4 +28,6 @@ sudo-command-line() {
 }
 zle -N sudo-command-line
 # Defined shortcut keys: [Esc] [Esc]
-bindkey "\e\e" sudo-command-line
+bindkey -M emacs '\e\e' sudo-command-line
+bindkey -M vicmd '\e\e' sudo-command-line
+bindkey -M viins '\e\e' sudo-command-line
diff --git a/plugins/thefuck/thefuck.plugin.zsh b/plugins/thefuck/thefuck.plugin.zsh
index ac88e67de..b8586c70d 100644
--- a/plugins/thefuck/thefuck.plugin.zsh
+++ b/plugins/thefuck/thefuck.plugin.zsh
@@ -15,4 +15,6 @@ fuck-command-line() {
 }
 zle -N fuck-command-line
 # Defined shortcut keys: [Esc] [Esc]
-bindkey "\e\e" fuck-command-line
+bindkey -M emacs '\e\e' fuck-command-line
+bindkey -M vicmd '\e\e' fuck-command-line
+bindkey -M viins '\e\e' fuck-command-line
-- 
cgit v1.2.3-70-g09d2


From 90a0de4698d8ec4300bf6aa3d6847e299a05b1f5 Mon Sep 17 00:00:00 2001
From: SomeDer <48731521+SomeDer@users.noreply.github.com>
Date: Mon, 19 Aug 2019 16:53:13 +0100
Subject: Add alias-finder plugin (#7768)

---
 plugins/alias-finder/README.md               | 46 ++++++++++++++++++++++++++++
 plugins/alias-finder/alias-finder.plugin.zsh | 46 ++++++++++++++++++++++++++++
 2 files changed, 92 insertions(+)
 create mode 100644 plugins/alias-finder/README.md
 create mode 100644 plugins/alias-finder/alias-finder.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/alias-finder/README.md b/plugins/alias-finder/README.md
new file mode 100644
index 000000000..409f4b653
--- /dev/null
+++ b/plugins/alias-finder/README.md
@@ -0,0 +1,46 @@
+# alias-finder plugin
+
+This plugin searches the defined aliases and outputs any that match the command inputted. This makes learning new aliases easier.
+
+To use it, add `alias-finder` to the `plugins` array of your zshrc file:
+```
+plugins=(... alias-finder)
+```
+
+## Usage
+To see if there is an alias defined for the command, pass it as an argument to `alias-finder`. This can also run automatically before each command you input - add `ZSH_ALIAS_FINDER_AUTOMATIC=true` to your zshrc if you want this.
+
+## Options
+
+- Use `--longer` or `-l` to allow the aliases to be longer than the input (match aliases if they contain the input).
+- Use `--exact` or `-e` to avoid matching aliases that are shorter than the input.
+
+## Examples
+```
+$ alias-finder "git pull"
+gl='git pull'
+g=git
+```
+```
+$ alias-finder "web_search google oh my zsh"
+google='web_search google'
+```
+```
+$ alias-finder "git commit -v"
+gc="git commit -v"
+g=git
+```
+```
+$ alias-finder -e "git commit -v"
+gc='git commit -v'
+```
+```
+$ alias-finder -l "git commit -v"
+gc='git commit -v'
+'gc!'='git commit -v --amend'
+gca='git commit -v -a'
+'gca!'='git commit -v -a --amend'
+'gcan!'='git commit -v -a --no-edit --amend'
+'gcans!'='git commit -v -a -s --no-edit --amend'
+'gcn!'='git commit -v --no-edit --amend'
+```
diff --git a/plugins/alias-finder/alias-finder.plugin.zsh b/plugins/alias-finder/alias-finder.plugin.zsh
new file mode 100644
index 000000000..2bfaad597
--- /dev/null
+++ b/plugins/alias-finder/alias-finder.plugin.zsh
@@ -0,0 +1,46 @@
+alias-finder() {
+  local cmd="" exact="" longer="" wordStart="" wordEnd="" multiWordEnd=""
+  for i in $@; do
+    case $i in
+      -e|--exact) exact=true;;
+      -l|--longer) longer=true;;
+      *) 
+        if [[ -z $cmd ]]; then
+          cmd=$i
+        else
+          cmd="$cmd $i"
+        fi
+        ;;
+    esac
+  done
+  cmd=$(sed 's/[].\|$(){}?+*^[]/\\&/g' <<< $cmd) # adds escaping for grep
+  if [[ $(wc -l <<< $cmd) == 1 ]]; then
+    while [[ $cmd != "" ]]; do
+      if [[ $longer = true ]]; then
+        wordStart="'{0,1}"
+      else
+        wordEnd="$"
+        multiWordEnd="'$"
+      fi
+      if [[ $cmd == *" "* ]]; then
+        local finder="'$cmd$multiWordEnd"
+      else
+        local finder=$wordStart$cmd$wordEnd
+      fi
+      alias | grep -E "=$finder"
+      if [[ $exact = true || $longer = true ]]; then
+        break
+      else
+        cmd=$(sed -E 's/ {0,1}[^ ]*$//' <<< $cmd) # removes last word
+      fi
+    done
+  fi
+}
+
+preexec_alias-finder() {
+  if [[ $ZSH_ALIAS_FINDER_AUTOMATIC = true ]]; then
+    alias-finder $1
+  fi
+}
+
+preexec_functions+=(preexec_alias-finder)
-- 
cgit v1.2.3-70-g09d2


From 8634d9542a974ce4700ca14c3d3bc410945cc20a Mon Sep 17 00:00:00 2001
From: Matthew Turney <matthew.a.turney@gmail.com>
Date: Mon, 19 Aug 2019 10:57:19 -0500
Subject: Add git-escape-magic plugin (#2847)

---
 plugins/git-escape-magic/README.md                 |  17 +++
 plugins/git-escape-magic/git-escape-magic          | 135 +++++++++++++++++++++
 .../git-escape-magic/git-escape-magic.plugin.zsh   |   9 ++
 3 files changed, 161 insertions(+)
 create mode 100644 plugins/git-escape-magic/README.md
 create mode 100644 plugins/git-escape-magic/git-escape-magic
 create mode 100644 plugins/git-escape-magic/git-escape-magic.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/git-escape-magic/README.md b/plugins/git-escape-magic/README.md
new file mode 100644
index 000000000..a14364f22
--- /dev/null
+++ b/plugins/git-escape-magic/README.md
@@ -0,0 +1,17 @@
+# Git Escape Magic
+
+This plugin is copied from the original at
+https://github.com/knu/zsh-git-escape-magic. All credit for the
+functionality enabled by this plugin should go to @knu.
+
+An excerpt from that project's readme explains it's purpose.
+
+> It eliminates the need for manually escaping those meta-characters. The zle function it provides is context aware and recognizes the characteristics of each subcommand of git. Every time you type one of these meta-characters on a git command line, it automatically escapes the meta-character with a backslash as necessary and as appropriate.
+
+## Useage
+
+To use this plugin add it to your list of plugins in your `.zshrc` file.
+
+**NOTE**: If you use url-quote-magic it must be included before this
+plugin runs to prevent any conflicts.
+
diff --git a/plugins/git-escape-magic/git-escape-magic b/plugins/git-escape-magic/git-escape-magic
new file mode 100644
index 000000000..94a8d7b0f
--- /dev/null
+++ b/plugins/git-escape-magic/git-escape-magic
@@ -0,0 +1,135 @@
+# -*- mode: sh -*-
+#
+# git-escape-magic - zle tweak for git command line arguments
+#
+# Copyright (c) 2011, 2012, 2014 Akinori MUSHA
+# Licensed under the 2-clause BSD license.
+#
+# This tweak eliminates the need for manually escaping shell
+# meta-characters such as [~^{}] that are used for specifying a git
+# object (commit or tree).  Every time you type one of these
+# characters on a git command line, it is automatically escaped with a
+# backslash as necessary and as appropriate.
+#
+# If you want to use this with url-quote-magic, make sure to enable it
+# first.
+#
+# Usage:
+#     autoload -Uz git-escape-magic
+#     git-escape-magic
+#
+
+git-escape-magic.self-insert() {
+    emulate -L zsh
+    setopt extendedglob
+    local self_insert_function
+    zstyle -s ':git-escape-magic' self-insert-function self_insert_function
+
+    if [[ "$KEYS" == [{}~^]* ]] && {
+        local qkey="${(q)KEYS}"
+        [[ "$KEYS" != "$qkey" ]]
+    } && {
+        local lbuf="$LBUFFER$qkey"
+        [[ "${(Q)LBUFFER}$KEYS" == "${(Q)lbuf}" ]]
+    } && {
+        local -a words
+        words=("${(@Q)${(z)lbuf}}")
+        [[ "$words[(i)(*/|)git(|-[^/]##)]" -le $#words ]]
+    }
+    then
+        local i
+        i="$words[(I)([;(){\&]|\&[\&\!]|\|\||[=<>]\(*)]"
+        if [[ $i -gt 0 ]]; then
+            shift $((i-1)) words
+            if [[ "$words[1]" == [\=\<\>]\(* ]]; then
+                words[1]="${words[1]#[=<>]\(}"
+            else
+                [[ "$words[1]" == \; && $words[2] == (then|else|elif|do) ]] && shift words
+                shift words
+            fi
+        fi
+        while [[ "$words[1]" == (if|while|until|\!) ]]; do
+            shift words
+        done
+        while [[ "$words[1]" == [A-Za-z_][A-Za-z0-9_]#=* ]]; do
+            shift words
+        done
+        [[ "$words[1]" == (*/|)git(|-[^/]##) ]] && {
+            local subcommand
+            subcommand="${words[1]##*/git-}"
+            if [[ -z "$subcommand" ]]; then
+                shift words
+                subcommand="$words[1]"
+            fi
+            [[ $#words -ge 2 ]]
+        } &&
+        case "$subcommand" in
+            # commands that may take pathspec but never take refspec with [{}~^]
+            (add|rm|am|apply|check-attr|checkout-index|clean|clone|config|diff-files|hash-object|help|index-pack|mailinfo|mailsplit|merge-file|merge-index|mergetool|mktag|mv|pack-objects|pack-redundant|relink|send-email|show-index|show-ref|stage|status|verify-pack)
+                false ;;
+            # commands that may take pathspec but rarely take refspec with [{}~^]
+            (for-each-ref|grep|ls-files|update-index)
+                false ;;
+            (archive|ls-tree)
+                ! [[ $#words -ge 3 &&
+                        "$words[-2]" == [^-]* ]] ;;
+            (diff-tree)
+                ! [[ $#words -ge 4 &&
+                        "$words[-2]" == [^-]* &&
+                        "$words[-3]" == [^-]* ]] ;;
+            (*)
+                [[ $words[(i)--] -gt $#words ]] ;;
+        esac &&
+        case "${words[-1]%%"$KEYS"}" in
+            (*[@^])
+                [[ "$KEYS" == [{~^]* ]] ;;
+            (*[@^]\{[^}]##)
+                [[ "$KEYS" == \}* ]] ;;
+            (?*)
+                [[ "$KEYS" == [~^]* ]] ;;
+            (*)
+                false ;;
+        esac &&
+        LBUFFER="$LBUFFER\\"
+    fi
+
+    zle "$self_insert_function"
+}
+
+git-escape-magic.on() {
+    emulate -L zsh
+    local self_insert_function="${$(zle -lL | awk \
+        '$1=="zle"&&$2=="-N"&&$3=="self-insert"{print $4;exit}'):-.self-insert}"
+
+    [[ "$self_insert_function" == git-escape-magic.self-insert ]] &&
+        return 0
+
+    # For url-quote-magic which does not zle -N itself
+    zle -la "$self_insert_function" || zle -N "$self_insert_function"
+
+    zstyle ':git-escape-magic' self-insert-function "$self_insert_function"
+
+    zle -A git-escape-magic.self-insert self-insert
+    return 0
+}
+
+git-escape-magic.off() {
+    emulate -L zsh
+    local self_insert_function
+    zstyle -s ':git-escape-magic' self-insert-function self_insert_function
+
+    [[ -n "$self_insert_function" ]] &&
+        zle -A "$self_insert_function" self-insert
+    return 0
+}
+
+zle -N git-escape-magic.self-insert
+zle -N git-escape-magic.on
+zle -N git-escape-magic.off
+
+git-escape-magic() {
+        git-escape-magic.on
+}
+
+[[ -o kshautoload ]] || git-escape-magic "$@"
+
diff --git a/plugins/git-escape-magic/git-escape-magic.plugin.zsh b/plugins/git-escape-magic/git-escape-magic.plugin.zsh
new file mode 100644
index 000000000..c021ea707
--- /dev/null
+++ b/plugins/git-escape-magic/git-escape-magic.plugin.zsh
@@ -0,0 +1,9 @@
+# Automatically detect and escape zsh globbing meta-characters when used with
+# git refspec characters like `[^~{}]`. NOTE: This must be loaded _after_
+# url-quote-magic.
+#
+# This trick is detailed at https://github.com/knu/zsh-git-escape-magic and is
+# what allowed this plugin to exist.
+
+autoload -Uz git-escape-magic
+git-escape-magic
-- 
cgit v1.2.3-70-g09d2


From 1908f7bddcacdfb18a5a4b1c883f0c405d1660a8 Mon Sep 17 00:00:00 2001
From: Kirill Pinchuk <cybergrind@gmail.com>
Date: Mon, 19 Aug 2019 19:12:53 +0300
Subject: fabric: support fabric 2+ completion (#8010)

---
 plugins/fabric/_fab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/fabric/_fab b/plugins/fabric/_fab
index 9628e1224..4c2e61306 100644
--- a/plugins/fabric/_fab
+++ b/plugins/fabric/_fab
@@ -5,7 +5,7 @@ local curcontext=$curcontext state line
 declare -A opt_args
 
 declare target_list
-target_list=(`fab --shortlist 2>/dev/null`)
+target_list=(`fab --shortlist 2>/dev/null || fab --complete 2>/dev/null`)
 
 _targets() {
     _describe -t commands "fabric targets" target_list
-- 
cgit v1.2.3-70-g09d2


From de3b14cf69eeb43797bae8320af6972032b604ff Mon Sep 17 00:00:00 2001
From: Julien Janvier <3691804+jjanvier@users.noreply.github.com>
Date: Tue, 20 Aug 2019 12:11:38 +0200
Subject: git: add aliases for git switch and restore (#8089)

---
 plugins/git/README.md      | 4 ++++
 plugins/git/git.plugin.zsh | 4 ++++
 2 files changed, 8 insertions(+)

(limited to 'plugins')

diff --git a/plugins/git/README.md b/plugins/git/README.md
index fc89b27e0..3311ccf55 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -131,7 +131,9 @@ plugins=(... git)
 | grmc                 | git rm --cached                                                                                                               |
 | grmv                 | git remote rename                                                                                                             |
 | grrm                 | git remote remove                                                                                                             |
+| grs                  | git restore                                                                                                                   |
 | grset                | git remote set-url                                                                                                            |
+| grss                 | git restore --source                                                                                                          |
 | grt                  | cd "$(git rev-parse --show-toplevel \|\| echo .)"                                                                             |
 | gru                  | git reset --                                                                                                                  |
 | grup                 | git remote update                                                                                                             |
@@ -154,6 +156,8 @@ plugins=(... git)
 | gsts                 | git stash show --text                                                                                                         |
 | gstall               | git stash --all                                                                                                               |
 | gsu                  | git submodule update                                                                                                          |
+| gsw                  | git switch                                                                                                                    |
+| gswc                 | git switch -c                                                                                                                 |
 | gts                  | git tag -s                                                                                                                    |
 | gtv                  | git tag \| sort -V                                                                                                            |
 | gtl                  | gtl(){ git tag --sort=-v:refname -n -l ${1}* }; noglob gtl                                                                    |
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index e0ce27fd4..9787392de 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -207,7 +207,9 @@ alias grm='git rm'
 alias grmc='git rm --cached'
 alias grmv='git remote rename'
 alias grrm='git remote remove'
+alias grs='git restore'
 alias grset='git remote set-url'
+alias grss='git restore --source'
 alias grt='cd "$(git rev-parse --show-toplevel || echo .)"'
 alias gru='git reset --'
 alias grup='git remote update'
@@ -236,6 +238,8 @@ alias gstp='git stash pop'
 alias gsts='git stash show --text'
 alias gstall='git stash --all'
 alias gsu='git submodule update'
+alias gsw='git switch'
+alias gswc='git switch -c'
 
 alias gts='git tag -s'
 alias gtv='git tag | sort -V'
-- 
cgit v1.2.3-70-g09d2


From 246e7832ef6f4b77ae998508d0ba90c82961fd0a Mon Sep 17 00:00:00 2001
From: Pavel Omelchenko <p.Omelchenko@gmail.com>
Date: Thu, 22 Aug 2019 12:00:31 +0300
Subject: feature: add condition for regular expression

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

(limited to 'plugins')

diff --git a/plugins/homestead/homestead.plugin.zsh b/plugins/homestead/homestead.plugin.zsh
index f67a582f4..b9940dbcf 100644
--- a/plugins/homestead/homestead.plugin.zsh
+++ b/plugins/homestead/homestead.plugin.zsh
@@ -1,6 +1,6 @@
 # Homestead basic command completion
 _homestead_get_command_list () {
-  homestead --no-ansi | sed "1,/Common commands/d" | awk '/^ +[a-z]+/ { print $1 }'
+  homestead --no-ansi | sed "1,/(Available|Common) commands/d" | awk '/^ +[a-z]+/ { print $1 }'
 }
 
 _homestead () {
-- 
cgit v1.2.3-70-g09d2


From caf0bfa0461d5d787ab4f336139aadffcea379a9 Mon Sep 17 00:00:00 2001
From: Vignesh Balasubramaniam <vigneshb.hp@gmail.com>
Date: Fri, 23 Aug 2019 10:58:21 -0400
Subject: ubuntu: fix aglu to list available upgrades (#8082)

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

(limited to 'plugins')

diff --git a/plugins/ubuntu/ubuntu.plugin.zsh b/plugins/ubuntu/ubuntu.plugin.zsh
index d589096c3..a53752fb2 100644
--- a/plugins/ubuntu/ubuntu.plugin.zsh
+++ b/plugins/ubuntu/ubuntu.plugin.zsh
@@ -12,10 +12,10 @@ alias acp='apt-cache policy'
 #List all installed packages
 alias agli='apt list --installed'
 
-# superuser operations ######################################################
-
 # List available updates only
-alias aglu='sudo apt-get -u upgrade --assume-no'
+alias aglu='apt list --upgradable'
+
+# superuser operations ######################################################
 
 alias afu='sudo apt-file update'
 
-- 
cgit v1.2.3-70-g09d2


From df9cf723963e38d152b750d85f0907b57dde53bb Mon Sep 17 00:00:00 2001
From: Ryan Styrczula <rmstyrczula@users.noreply.github.com>
Date: Fri, 23 Aug 2019 11:05:11 -0400
Subject: plugins/git: Fix `gbda` trying to delete worktree branches

Git learned to add a `+` in front of branches that are
checked out in other worktrees.

See: https://github.com/git/git/blob/745f6812895b31c02b29bdfe4ae8e5498f776c26/Documentation/RelNotes/2.23.0.txt#L252-L256
---
 plugins/git/README.md      | 2 +-
 plugins/git/git.plugin.zsh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/git/README.md b/plugins/git/README.md
index 3311ccf55..7878f747b 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -22,7 +22,7 @@ plugins=(... git)
 | gb                   | git branch                                                                                                                    |
 | gba                  | git branch -a                                                                                                                 |
 | gbd                  | git branch -d                                                                                                                 |
-| gbda                 | git branch --no-color --merged \| command grep -vE "^(\*\|\s*(master\|develop\|dev)\s*$)" \| command xargs -n 1 git branch -d |
+| gbda                 | git branch --no-color --merged \| command grep -vE "^(\+|\*\|\s*(master\|develop\|dev)\s*$)" \| command xargs -n 1 git branch -d |
 | gbD                  | git branch -D                                                                                                                 |
 | gbl                  | git blame -b -w                                                                                                               |
 | gbnm                 | git branch --no-merged                                                                                                        |
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 9787392de..2edee0298 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -42,7 +42,7 @@ alias gap='git apply'
 alias gb='git branch'
 alias gba='git branch -a'
 alias gbd='git branch -d'
-alias gbda='git branch --no-color --merged | command grep -vE "^(\*|\s*(master|develop|dev)\s*$)" | command xargs -n 1 git branch -d'
+alias gbda='git branch --no-color --merged | command grep -vE "^(\+|\*|\s*(master|develop|dev)\s*$)" | command xargs -n 1 git branch -d'
 alias gbD='git branch -D'
 alias gbl='git blame -b -w'
 alias gbnm='git branch --no-merged'
-- 
cgit v1.2.3-70-g09d2


From 08beebd89f9eec956c126c732a287ec5a5a197a8 Mon Sep 17 00:00:00 2001
From: Pavel Omelchenko <p.omelchenko@gmail.com>
Date: Sat, 24 Aug 2019 01:00:08 +0300
Subject: homestead: repair sed regex (#8103)

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

(limited to 'plugins')

diff --git a/plugins/homestead/homestead.plugin.zsh b/plugins/homestead/homestead.plugin.zsh
index b9940dbcf..ea2803d77 100644
--- a/plugins/homestead/homestead.plugin.zsh
+++ b/plugins/homestead/homestead.plugin.zsh
@@ -1,6 +1,6 @@
 # Homestead basic command completion
 _homestead_get_command_list () {
-  homestead --no-ansi | sed "1,/(Available|Common) commands/d" | awk '/^ +[a-z]+/ { print $1 }'
+  homestead --no-ansi | sed -E "1,/(Available|Common) commands/d" | awk '/^ +[a-z]+/ { print $1 }'
 }
 
 _homestead () {
-- 
cgit v1.2.3-70-g09d2


From 2217a7c803f0db15e1d5d8465854e0277d4ca200 Mon Sep 17 00:00:00 2001
From: Jonathan Klimt <jonathan.klimt@rwth-aachen.de>
Date: Tue, 27 Aug 2019 15:09:13 +0200
Subject: ripgrep: update completion to latest version (#8083)

---
 plugins/ripgrep/README.md |   4 +-
 plugins/ripgrep/_ripgrep  | 187 +++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 185 insertions(+), 6 deletions(-)

(limited to 'plugins')

diff --git a/plugins/ripgrep/README.md b/plugins/ripgrep/README.md
index 794b105ee..937f73c81 100644
--- a/plugins/ripgrep/README.md
+++ b/plugins/ripgrep/README.md
@@ -8,6 +8,6 @@ To use it, add `ripgrep` to the plugins array in your zshrc file:
 plugins=(... ripgrep)
 ```
 
-Completion is taken from the ripgrep release [`0.10.0`](https://github.com/BurntSushi/ripgrep/releases/tag/0.10.0).
+Completion is taken from the ripgrep release [`11.0.2`](https://github.com/BurntSushi/ripgrep/releases/tag/11.0.2).
 
-Updated on September 27th, 2018.
+Updated on August 16th, 2019.
diff --git a/plugins/ripgrep/_ripgrep b/plugins/ripgrep/_ripgrep
index 53f135dde..d7dcfd64a 100644
--- a/plugins/ripgrep/_ripgrep
+++ b/plugins/ripgrep/_ripgrep
@@ -3,6 +3,12 @@
 ##
 # zsh completion function for ripgrep
 #
+# Run ci/test_complete.sh after building to ensure that the options supported by
+# this function stay in synch with the `rg` binary.
+#
+# For convenience, a completion reference guide is included at the bottom of
+# this file.
+#
 # Originally based on code from the zsh-users project — see copyright notice
 # below.
 
@@ -37,6 +43,7 @@ _rg() {
     + '(exclusive)' # Misc. fully exclusive options
     '(: * -)'{-h,--help}'[display help information]'
     '(: * -)'{-V,--version}'[display version information]'
+    '(: * -)'--pcre2-version'[print the version of PCRE2 used by ripgrep, if available]'
 
     + '(buffered)' # buffering options
     '--line-buffered[force line buffering]'
@@ -79,7 +86,7 @@ _rg() {
 
     + '(file-name)' # File-name options
     {-H,--with-filename}'[show file name for matches]'
-    "--no-filename[don't show file name for matches]"
+    {-I,--no-filename}"[don't show file name for matches]"
 
     + '(file-system)' # File system options
     "--one-file-system[don't descend into directories on other file systems]"
@@ -97,6 +104,10 @@ _rg() {
     '*'{-g+,--glob=}'[include/exclude files matching specified glob]:glob'
     '*--iglob=[include/exclude files matching specified case-insensitive glob]:glob'
 
+    + '(glob-case-insensitive)' # File-glob case sensitivity options
+    '--glob-case-insensitive[treat -g/--glob patterns case insensitively]'
+    $no'--no-glob-case-insensitive[treat -g/--glob patterns case sensitively]'
+
     + '(heading)' # Heading options
     '(pretty-vimgrep)--heading[show matches grouped by file name]'
     "(pretty-vimgrep)--no-heading[don't show matches grouped by file name]"
@@ -105,9 +116,17 @@ _rg() {
     '--hidden[search hidden files and directories]'
     $no"--no-hidden[don't search hidden files and directories]"
 
+    + '(hybrid)' # hybrid regex options
+    '--auto-hybrid-regex[dynamically use PCRE2 if necessary]'
+    $no"--no-auto-hybrid-regex[don't dynamically use PCRE2 if necessary]"
+
     + '(ignore)' # Ignore-file options
-    "(--no-ignore-global --no-ignore-parent --no-ignore-vcs)--no-ignore[don't respect ignore files]"
-    $no'(--ignore-global --ignore-parent --ignore-vcs)--ignore[respect ignore files]'
+    "(--no-ignore-global --no-ignore-parent --no-ignore-vcs --no-ignore-dot)--no-ignore[don't respect ignore files]"
+    $no'(--ignore-global --ignore-parent --ignore-vcs --ignore-dot)--ignore[respect ignore files]'
+
+    + '(ignore-file-case-insensitive)' # Ignore-file case sensitivity options
+    '--ignore-file-case-insensitive[process ignore files case insensitively]'
+    $no'--no-ignore-file-case-insensitive[process ignore files case sensitively]'
 
     + '(ignore-global)' # Global ignore-file options
     "--no-ignore-global[don't respect global ignore files]"
@@ -121,6 +140,10 @@ _rg() {
     "--no-ignore-vcs[don't respect version control ignore files]"
     $no'--ignore-vcs[respect version control ignore files]'
 
+    + '(ignore-dot)' # .ignore-file options
+    "--no-ignore-dot[don't respect .ignore files]"
+    $no'--ignore-dot[respect .ignore files]'
+
     + '(json)' # JSON options
     '--json[output results in JSON Lines format]'
     $no"--no-json[don't output results in JSON Lines format]"
@@ -134,6 +157,10 @@ _rg() {
     $no"--no-crlf[don't use CRLF as line terminator]"
     '(text)--null-data[use NUL as line terminator]'
 
+    + '(max-columns-preview)' # max column preview options
+    '--max-columns-preview[show preview for long lines (with -M)]'
+    $no"--no-max-columns-preview[don't show preview for long lines (with -M)]"
+
     + '(max-depth)' # Directory-depth options
     '--max-depth=[specify max number of directories to descend]:number of directories'
     '!--maxdepth=:number of directories'
@@ -213,6 +240,8 @@ _rg() {
 
     + '(text)' # Binary-search options
     {-a,--text}'[search binary files as if they were text]'
+    "--binary[search binary files, don't print binary data]"
+    $no"--no-binary[don't search binary files]"
     $no"(--null-data)--no-text[don't search binary files as if they were text]"
 
     + '(threads)' # Thread-count options
@@ -364,7 +393,7 @@ _rg_encodings() {
     shift{-,_}jis csshiftjis {,x-}sjis ms_kanji ms932
     utf{,-}8 utf-16{,be,le} unicode-1-1-utf-8
     windows-{31j,874,949,125{0..8}} dos-874 tis-620 ansi_x3.4-1968
-    x-user-defined auto
+    x-user-defined auto none
   )
 
   _wanted encodings expl encoding compadd -a "$@" - _encodings
@@ -382,6 +411,156 @@ _rg_types() {
 
 _rg "$@"
 
+################################################################################
+# ZSH COMPLETION REFERENCE
+#
+# For the convenience of developers who aren't especially familiar with zsh
+# completion functions, a brief reference guide follows. This is in no way
+# comprehensive; it covers just enough of the basic structure, syntax, and
+# conventions to help someone make simple changes like adding new options. For
+# more complete documentation regarding zsh completion functions, please see the
+# following:
+#
+# * http://zsh.sourceforge.net/Doc/Release/Completion-System.html
+# * https://github.com/zsh-users/zsh/blob/master/Etc/completion-style-guide
+#
+# OVERVIEW
+#
+# Most zsh completion functions are defined in terms of `_arguments`, which is a
+# shell function that takes a series of argument specifications. The specs for
+# `rg` are stored in an array, which is common for more complex functions; the
+# elements of the array are passed to `_arguments` on invocation.
+#
+# ARGUMENT-SPECIFICATION SYNTAX
+#
+# The following is a contrived example of the argument specs for a simple tool:
+#
+#   '(: * -)'{-h,--help}'[display help information]'
+#   '(-q -v --quiet --verbose)'{-q,--quiet}'[decrease output verbosity]'
+#   '!(-q -v --quiet --verbose)--silent'
+#   '(-q -v --quiet --verbose)'{-v,--verbose}'[increase output verbosity]'
+#   '--color=[specify when to use colors]:when:(always never auto)'
+#   '*:example file:_files'
+#
+# Although there may appear to be six specs here, there are actually nine; we
+# use brace expansion to combine specs for options that go by multiple names,
+# like `-q` and `--quiet`. This is customary, and ties in with the fact that zsh
+# merges completion possibilities together when they have the same description.
+#
+# The first line defines the option `-h`/`--help`. With most tools, it isn't
+# useful to complete anything after `--help` because it effectively overrides
+# all others; the `(: * -)` at the beginning of the spec tells zsh not to
+# complete any other operands (`:` and `*`) or options (`-`) after this one has
+# been used. The `[...]` at the end associates a description with `-h`/`--help`;
+# as mentioned, zsh will see the identical descriptions and merge these options
+# together when offering completion possibilities.
+#
+# The next line defines `-q`/`--quiet`. Here we don't want to suppress further
+# completions entirely, but we don't want to offer `-q` if `--quiet` has been
+# given (since they do the same thing), nor do we want to offer `-v` (since it
+# doesn't make sense to be quiet and verbose at the same time). We don't need to
+# tell zsh not to offer `--quiet` a second time, since that's the default
+# behaviour, but since this line expands to two specs describing `-q` *and*
+# `--quiet` we do need to explicitly list all of them here.
+#
+# The next line defines a hidden option `--silent` — maybe it's a deprecated
+# synonym for `--quiet`. The leading `!` indicates that zsh shouldn't offer this
+# option during completion. The benefit of providing a spec for an option that
+# shouldn't be completed is that, if someone *does* use it, we can correctly
+# suppress completion of other options afterwards.
+#
+# The next line defines `-v`/`--verbose`; this works just like `-q`/`--quiet`.
+#
+# The next line defines `--color`. In this example, `--color` doesn't have a
+# corresponding short option, so we don't need to use brace expansion. Further,
+# there are no other options it's exclusive with (just itself), so we don't need
+# to define those at the beginning. However, it does take a mandatory argument.
+# The `=` at the end of `--color=` indicates that the argument may appear either
+# like `--color always` or like `--color=always`; this is how most GNU-style
+# command-line tools work. The corresponding short option would normally use `+`
+# — for example, `-c+` would allow either `-c always` or `-calways`. For this
+# option, the arguments are known ahead of time, so we can simply list them in
+# parentheses at the end (`when` is used as the description for the argument).
+#
+# The last line defines an operand (a non-option argument). In this example, the
+# operand can be used any number of times (the leading `*`), and it should be a
+# file path, so we tell zsh to call the `_files` function to complete it. The
+# `example file` in the middle is the description to use for this operand; we
+# could use a space instead to accept the default provided by `_files`.
+#
+# GROUPING ARGUMENT SPECIFICATIONS
+#
+# Newer versions of zsh support grouping argument specs together. All specs
+# following a `+` and then a group name are considered to be members of the
+# named group. Grouping is useful mostly for organisational purposes; it makes
+# the relationship between different options more obvious, and makes it easier
+# to specify exclusions.
+#
+# We could rewrite our example above using grouping as follows:
+#
+#   '(: * -)'{-h,--help}'[display help information]'
+#   '--color=[specify when to use colors]:when:(always never auto)'
+#   '*:example file:_files'
+#   + '(verbosity)'
+#   {-q,--quiet}'[decrease output verbosity]'
+#   '!--silent'
+#   {-v,--verbose}'[increase output verbosity]'
+#
+# Here we take advantage of a useful feature of spec grouping — when the group
+# name is surrounded by parentheses, as in `(verbosity)`, it tells zsh that all
+# of the options in that group are exclusive with each other. As a result, we
+# don't need to manually list out the exclusions at the beginning of each
+# option.
+#
+# Groups can also be referred to by name in other argument specs; for example:
+#
+#   '(xyz)--aaa' '*: :_files'
+#   + xyz --xxx --yyy --zzz
+#
+# Here we use the group name `xyz` to tell zsh that `--xxx`, `--yyy`, and
+# `--zzz` are not to be completed after `--aaa`. This makes the exclusion list
+# much more compact and reusable.
+#
+# CONVENTIONS
+#
+# zsh completion functions generally adhere to the following conventions:
+#
+# * Use two spaces for indentation
+# * Combine specs for options with different names using brace expansion
+# * In combined specs, list the short option first (as in `{-a,--text}`)
+# * Use `+` or `=` as described above for options that take arguments
+# * Provide a description for all options, option-arguments, and operands
+# * Capitalise/punctuate argument descriptions as phrases, not complete
+#   sentences — 'display help information', never 'Display help information.'
+#   (but still capitalise acronyms and proper names)
+# * Write argument descriptions as verb phrases — 'display x', 'enable y',
+#   'use z'
+# * Word descriptions to make it clear when an option expects an argument;
+#   usually this is done with the word 'specify', as in 'specify x' or
+#   'use specified x')
+# * Write argument descriptions as tersely as possible — for example, articles
+#   like 'a' and 'the' should be omitted unless it would be confusing
+#
+# Other conventions currently used by this function:
+#
+# * Order argument specs alphabetically by group name, then option name
+# * Group options that are directly related, mutually exclusive, or frequently
+#   referenced by other argument specs
+# * Use only characters in the set [a-z0-9_-] in group names
+# * Order exclusion lists as follows: short options, long options, groups
+# * Use American English in descriptions
+# * Use 'don't' in descriptions instead of 'do not'
+# * Word descriptions for related options as similarly as possible. For example,
+#   `--foo[enable foo]` and `--no-foo[disable foo]`, or `--foo[use foo]` and
+#   `--no-foo[don't use foo]`
+# * Word descriptions to make it clear when an option only makes sense with
+#   another option, usually by adding '(with -x)' to the end
+# * Don't quote strings or variables unnecessarily. When quotes are required,
+#   prefer single-quotes to double-quotes
+# * Prefix option specs with `$no` when the option serves only to negate the
+#   behaviour of another option that must be provided explicitly by the user.
+#   This prevents rarely used options from cluttering up the completion menu
+################################################################################
 
 # ------------------------------------------------------------------------------
 # Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
-- 
cgit v1.2.3-70-g09d2


From 9524db7398f405b26091f58fa8e2125d4e440a24 Mon Sep 17 00:00:00 2001
From: mapshen <mapshen@users.noreply.github.com>
Date: Tue, 27 Aug 2019 15:41:44 -0400
Subject: autojump: fix loading when autojump is not in $PATH (#8074)

The `commands[autojump]` block errs out when autojump is not found, and the rest, which is intended to be used for loading `autojump`, does not get executed.
---
 plugins/autojump/autojump.plugin.zsh | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'plugins')

diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh
index 13c1d00ed..d80c88822 100644
--- a/plugins/autojump/autojump.plugin.zsh
+++ b/plugins/autojump/autojump.plugin.zsh
@@ -1,8 +1,3 @@
-(( $+commands[autojump] )) || {
-  echo '[oh-my-zsh] Please install autojump first (https://github.com/wting/autojump)'
-  return
-}
-
 declare -a autojump_paths
 autojump_paths=(
   $HOME/.autojump/etc/profile.d/autojump.zsh         # manual installation
-- 
cgit v1.2.3-70-g09d2


From a331063a04fff829805e3731b2ef75835d4243b0 Mon Sep 17 00:00:00 2001
From: "Ing. Jan Kaláb" <jan+github@kalabovi.org>
Date: Mon, 2 Sep 2019 13:30:26 +0200
Subject: git-escape-magic: fix typo (#8113)

---
 plugins/git-escape-magic/README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/git-escape-magic/README.md b/plugins/git-escape-magic/README.md
index a14364f22..c3e3898f5 100644
--- a/plugins/git-escape-magic/README.md
+++ b/plugins/git-escape-magic/README.md
@@ -8,10 +8,9 @@ An excerpt from that project's readme explains it's purpose.
 
 > It eliminates the need for manually escaping those meta-characters. The zle function it provides is context aware and recognizes the characteristics of each subcommand of git. Every time you type one of these meta-characters on a git command line, it automatically escapes the meta-character with a backslash as necessary and as appropriate.
 
-## Useage
+## Usage
 
 To use this plugin add it to your list of plugins in your `.zshrc` file.
 
 **NOTE**: If you use url-quote-magic it must be included before this
 plugin runs to prevent any conflicts.
-
-- 
cgit v1.2.3-70-g09d2


From 15dd77055e2b4a931d50ad3e05f823893aac66af Mon Sep 17 00:00:00 2001
From: Salomon Smeke <SalomonSmeke@users.noreply.github.com>
Date: Mon, 2 Sep 2019 06:40:39 -0500
Subject: wd: point to the correct directory even if installed with antibody
 (#8116)

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

(limited to 'plugins')

diff --git a/plugins/wd/wd.plugin.zsh b/plugins/wd/wd.plugin.zsh
index c0559293d..4b7cd3c19 100644
--- a/plugins/wd/wd.plugin.zsh
+++ b/plugins/wd/wd.plugin.zsh
@@ -1,11 +1,7 @@
-#!/bin/zsh
-
 # WARP DIRECTORY
 # ==============
 # oh-my-zsh plugin
 #
 # @github.com/mfaerevaag/wd
 
-wd() {
-    . $ZSH/plugins/wd/wd.sh
-}
+eval "wd() { source '${0:A:h}/wd.sh' }"
-- 
cgit v1.2.3-70-g09d2


From b3d3ce8aa604aecc52c132a9d67e075b0ca64722 Mon Sep 17 00:00:00 2001
From: Braxton Schafer <braxton@epic.com>
Date: Tue, 3 Sep 2019 14:15:13 -0500
Subject: Fix bad function definitions in Debian plugin

There appears to be a definition issue for some functions/aliases which
result in the following errors when sourcing .zshrc:

```
/home/username/.oh-my-zsh/plugins/debian/debian.plugin.zsh:75: defining function based on alias `abd'
/home/username/.oh-my-zsh/plugins/debian/debian.plugin.zsh:75: parse error near `()'
```

Fixes #7986
---
 plugins/debian/debian.plugin.zsh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'plugins')

diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index be4062ebf..dd80485d0 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -72,7 +72,7 @@ if [[ $use_sudo -eq 1 ]]; then
 # commands using su #########
 else
     alias aac="su -ls '$apt_pref autoclean' root"
-    abd() {
+    function abd() {
         cmd="su -lc '$apt_pref build-dep $@' root"
         print "$cmd"
         eval "$cmd"
@@ -83,17 +83,17 @@ else
     alias adu="su -lc '$apt_pref update && aptitude dist-upgrade' root"
     alias afu="su -lc '$apt-file update'"
     alias au="su -lc '$apt_pref $apt_upgr' root"
-    ai() {
+    function ai() {
         cmd="su -lc 'aptitude -P install $@' root"
         print "$cmd"
         eval "$cmd"
     }
-    ap() {
+    function ap() {
         cmd="su -lc '$apt_pref -P purge $@' root"
         print "$cmd"
         eval "$cmd"
     }
-    ar() {
+    function ar() {
         cmd="su -lc '$apt_pref -P remove $@' root"
         print "$cmd"
         eval "$cmd"
-- 
cgit v1.2.3-70-g09d2


From 1f58cd92ddb94fb75e4fb45f231eebfd55aa19dd Mon Sep 17 00:00:00 2001
From: Addison G <AddisonG@users.noreply.github.com>
Date: Fri, 6 Sep 2019 14:12:56 +1000
Subject: Updated git-prompt.sh to quote variables

An error was thrown (`bash: [: =: unary operator expected`) when using the __git_ps1_colorize_gitstring function outside of the one place it's called (line 512), because the "detached" variable was not quoted, and was unset.
---
 plugins/gitfast/git-prompt.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'plugins')

diff --git a/plugins/gitfast/git-prompt.sh b/plugins/gitfast/git-prompt.sh
index fd2b049db..3e86e9cca 100644
--- a/plugins/gitfast/git-prompt.sh
+++ b/plugins/gitfast/git-prompt.sh
@@ -219,7 +219,7 @@ __git_ps1_show_upstream ()
 		if [[ -n "$count" && -n "$name" ]]; then
 			__git_ps1_upstream_name=$(git rev-parse \
 				--abbrev-ref "$upstream" 2>/dev/null)
-			if [ $pcmode = yes ] && [ $ps1_expanded = yes ]; then
+			if [ "$pcmode" = "yes" ] && [ "$ps1_expanded" = "yes" ]; then
 				p="$p \${__git_ps1_upstream_name}"
 			else
 				p="$p ${__git_ps1_upstream_name}"
@@ -237,7 +237,7 @@ __git_ps1_show_upstream ()
 # to build a gitstring.
 __git_ps1_colorize_gitstring ()
 {
-	if [[ -n ${ZSH_VERSION-} ]]; then
+	if [[ -n "${ZSH_VERSION-}" ]]; then
 		local c_red='%F{red}'
 		local c_green='%F{green}'
 		local c_lblue='%F{blue}'
@@ -255,7 +255,7 @@ __git_ps1_colorize_gitstring ()
 	local flags_color="$c_lblue"
 
 	local branch_color=""
-	if [ $detached = no ]; then
+	if [ "$detached" = no ]; then
 		branch_color="$ok_color"
 	else
 		branch_color="$bad_color"
@@ -508,13 +508,13 @@ __git_ps1 ()
 
 	# NO color option unless in PROMPT_COMMAND mode or it's Zsh
 	if [ -n "${GIT_PS1_SHOWCOLORHINTS-}" ]; then
-		if [ $pcmode = yes ] || [ -n "${ZSH_VERSION-}" ]; then
+		if [ "$pcmode" = "yes" ] || [ -n "${ZSH_VERSION-}" ]; then
 			__git_ps1_colorize_gitstring
 		fi
 	fi
 
 	b=${b##refs/heads/}
-	if [ $pcmode = yes ] && [ $ps1_expanded = yes ]; then
+	if [ "$pcmode" = "yes" ] && [ "$ps1_expanded" = "yes" ]; then
 		__git_ps1_branch_name=$b
 		b="\${__git_ps1_branch_name}"
 	fi
@@ -522,8 +522,8 @@ __git_ps1 ()
 	local f="$w$i$s$u"
 	local gitstring="$c$b${f:+$z$f}$r$p"
 
-	if [ $pcmode = yes ]; then
-		if [ "${__git_printf_supports_v-}" != yes ]; then
+	if [ "$pcmode" = "yes" ]; then
+		if [ "${__git_printf_supports_v-}" != "yes" ]; then
 			gitstring=$(printf -- "$printf_format" "$gitstring")
 		else
 			printf -v gitstring -- "$printf_format" "$gitstring"
-- 
cgit v1.2.3-70-g09d2


From a870fee6a7cb6783e85abe42a222c7d5f4e89676 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sun, 8 Sep 2019 14:58:46 +0200
Subject: Update syntax on the remaining functions

---
 plugins/debian/debian.plugin.zsh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'plugins')

diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index dd80485d0..68c6df1ae 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -114,7 +114,7 @@ fi
 # Registers a compdef for $1 that calls $apt_pref with the commands $2
 # To do that it creates a new completion function called _apt_pref_$2
 #
-apt_pref_compdef() {
+function apt_pref_compdef() {
     local f fb
     f="_apt_pref_${2}"
 
@@ -151,7 +151,7 @@ alias mydeb='time dpkg-buildpackage -rfakeroot -us -uc'
 
 # Functions #################################################################
 # create a simple script that can be used to 'duplicate' a system
-apt-copy() {
+function apt-copy() {
     print '#!/bin/sh'"\n" > apt-copy.sh
 
     cmd='$apt_pref install'
@@ -173,7 +173,7 @@ apt-copy() {
 #   apt-history rollback
 #   apt-history list
 # Based On: https://linuxcommando.blogspot.com/2008/08/how-to-show-apt-log-history.html
-apt-history () {
+function apt-history() {
   case "$1" in
     install)
       zgrep --no-filename 'install ' $(ls -rt /var/log/dpkg*)
@@ -202,7 +202,7 @@ apt-history () {
 }
 
 # Kernel-package building shortcut
-kerndeb () {
+function kerndeb() {
     # temporarily unset MAKEFLAGS ( '-j3' will fail )
     MAKEFLAGS=$( print - $MAKEFLAGS | perl -pe 's/-j\s*[\d]+//g' )
     print '$MAKEFLAGS set to '"'$MAKEFLAGS'"
@@ -216,10 +216,9 @@ kerndeb () {
 }
 
 # List packages by size
-function apt-list-packages {
+function apt-list-packages() {
     dpkg-query -W --showformat='${Installed-Size} ${Package} ${Status}\n' | \
     grep -v deinstall | \
     sort -n | \
     awk '{print $1" "$2}'
 }
-
-- 
cgit v1.2.3-70-g09d2


From 101ea872326211830e90d2bd01bd8506673f9d11 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sun, 8 Sep 2019 16:07:06 +0200
Subject: ssh-agent: check if `ssh-add -l` was successful

---
 plugins/ssh-agent/ssh-agent.plugin.zsh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'plugins')

diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index 9471ff49c..6ab041c21 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -12,7 +12,7 @@ function _start_agent() {
 }
 
 function _add_identities() {
-	local id line sig
+	local id line sig lines
 	local -a identities loaded_sigs loaded_ids not_loaded
 	zstyle -a :omz:plugins:ssh-agent identities identities
 
@@ -32,10 +32,12 @@ function _add_identities() {
 	fi
 
 	# get list of loaded identities' signatures and filenames
-	for line in ${(f)"$(ssh-add -l)"}; do
-		loaded_sigs+=${${(z)line}[2]}
-		loaded_ids+=${${(z)line}[3]}
-	done
+	if lines=$(ssh-add -l); then
+		for line in ${(f)lines}; do
+			loaded_sigs+=${${(z)line}[2]}
+			loaded_ids+=${${(z)line}[3]}
+		done
+	fi
 
 	# add identities if not already loaded
 	for id in $identities; do
-- 
cgit v1.2.3-70-g09d2


From 229a1c971903aaae0bebf73dfda41cb71c25560c Mon Sep 17 00:00:00 2001
From: Prajjwal Singh <sin@prajjwal.com>
Date: Sun, 8 Sep 2019 19:46:00 +0530
Subject: gitfast: update completions (#8130)

Includes completions for `git switch`.
---
 plugins/gitfast/_git                |   19 +-
 plugins/gitfast/git-completion.bash | 1351 +++++++++++++++--------------------
 2 files changed, 604 insertions(+), 766 deletions(-)

(limited to 'plugins')

diff --git a/plugins/gitfast/_git b/plugins/gitfast/_git
index 78a6dbb3d..886bf95d1 100644
--- a/plugins/gitfast/_git
+++ b/plugins/gitfast/_git
@@ -30,7 +30,7 @@ if [ -z "$script" ]; then
 	local -a locations
 	local e
 	locations=(
-		"$(dirname ${funcsourcetrace[1]%:*})/git-completion.bash"
+		$(dirname ${funcsourcetrace[1]%:*})/git-completion.bash
 		'/etc/bash_completion.d/git' # fedora, old debian
 		'/usr/share/bash-completion/completions/git' # arch, ubuntu, new debian
 		'/usr/share/bash-completion/git' # gentoo
@@ -39,7 +39,7 @@ if [ -z "$script" ]; then
 		test -f $e && script="$e" && break
 	done
 fi
-ZSH_VERSION='' . "$script"
+GIT_SOURCING_ZSH_COMPLETION=y . "$script"
 
 __gitcomp ()
 {
@@ -93,13 +93,22 @@ __gitcomp_nl_append ()
 	compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0
 }
 
+__gitcomp_file_direct ()
+{
+	emulate -L zsh
+
+	local IFS=$'\n'
+	compset -P '*[=:]'
+	compadd -f -- ${=1} && _ret=0
+}
+
 __gitcomp_file ()
 {
 	emulate -L zsh
 
 	local IFS=$'\n'
 	compset -P '*[=:]'
-	compadd -Q -p "${2-}" -f -- ${=1} && _ret=0
+	compadd -p "${2-}" -f -- ${=1} && _ret=0
 }
 
 __git_zsh_bash_func ()
@@ -223,10 +232,8 @@ _git ()
 
 	if (( $+functions[__${service}_zsh_main] )); then
 		__${service}_zsh_main
-	elif (( $+functions[__${service}_main] )); then
+	else
 		emulate ksh -c __${service}_main
-	elif (( $+functions[_${service}] )); then
-		emulate ksh -c _${service}
 	fi
 
 	let _ret && _default && _ret=0
diff --git a/plugins/gitfast/git-completion.bash b/plugins/gitfast/git-completion.bash
index b6ff5dc08..e087c4bf0 100644
--- a/plugins/gitfast/git-completion.bash
+++ b/plugins/gitfast/git-completion.bash
@@ -29,13 +29,16 @@
 # tell the completion to use commit completion.  This also works with aliases
 # of form "!sh -c '...'".  For example, "!sh -c ': git commit ; ... '".
 #
+# Compatible with bash 3.2.57.
+#
 # You can set the following environment variables to influence the behavior of
 # the completion routines:
 #
 #   GIT_COMPLETION_CHECKOUT_NO_GUESS
 #
 #     When set to "1", do not include "DWIM" suggestions in git-checkout
-#     completion (e.g., completing "foo" when "origin/foo" exists).
+#     and git-switch completion (e.g., completing "foo" when "origin/foo"
+#     exists).
 
 case "$COMP_WORDBREAKS" in
 *:*) : great ;;
@@ -92,6 +95,70 @@ __git ()
 		${__git_dir:+--git-dir="$__git_dir"} "$@" 2>/dev/null
 }
 
+# Removes backslash escaping, single quotes and double quotes from a word,
+# stores the result in the variable $dequoted_word.
+# 1: The word to dequote.
+__git_dequote ()
+{
+	local rest="$1" len ch
+
+	dequoted_word=""
+
+	while test -n "$rest"; do
+		len=${#dequoted_word}
+		dequoted_word="$dequoted_word${rest%%[\\\'\"]*}"
+		rest="${rest:$((${#dequoted_word}-$len))}"
+
+		case "${rest:0:1}" in
+		\\)
+			ch="${rest:1:1}"
+			case "$ch" in
+			$'\n')
+				;;
+			*)
+				dequoted_word="$dequoted_word$ch"
+				;;
+			esac
+			rest="${rest:2}"
+			;;
+		\')
+			rest="${rest:1}"
+			len=${#dequoted_word}
+			dequoted_word="$dequoted_word${rest%%\'*}"
+			rest="${rest:$((${#dequoted_word}-$len+1))}"
+			;;
+		\")
+			rest="${rest:1}"
+			while test -n "$rest" ; do
+				len=${#dequoted_word}
+				dequoted_word="$dequoted_word${rest%%[\\\"]*}"
+				rest="${rest:$((${#dequoted_word}-$len))}"
+				case "${rest:0:1}" in
+				\\)
+					ch="${rest:1:1}"
+					case "$ch" in
+					\"|\\|\$|\`)
+						dequoted_word="$dequoted_word$ch"
+						;;
+					$'\n')
+						;;
+					*)
+						dequoted_word="$dequoted_word\\$ch"
+						;;
+					esac
+					rest="${rest:2}"
+					;;
+				\")
+					rest="${rest:1}"
+					break
+					;;
+				esac
+			done
+			;;
+		esac
+	done
+}
+
 # The following function is based on code from:
 #
 #   bash_completion - programmable completion functions for bash 3.2+
@@ -264,9 +331,32 @@ __gitcomp ()
 	case "$cur_" in
 	--*=)
 		;;
+	--no-*)
+		local c i=0 IFS=$' \t\n'
+		for c in $1; do
+			if [[ $c == "--" ]]; then
+				continue
+			fi
+			c="$c${4-}"
+			if [[ $c == "$cur_"* ]]; then
+				case $c in
+				--*=*|*.) ;;
+				*) c="$c " ;;
+				esac
+				COMPREPLY[i++]="${2-}$c"
+			fi
+		done
+		;;
 	*)
 		local c i=0 IFS=$' \t\n'
 		for c in $1; do
+			if [[ $c == "--" ]]; then
+				c="--no-...${4-}"
+				if [[ $c == "$cur_"* ]]; then
+					COMPREPLY[i++]="${2-}$c "
+				fi
+				break
+			fi
 			c="$c${4-}"
 			if [[ $c == "$cur_"* ]]; then
 				case $c in
@@ -280,6 +370,48 @@ __gitcomp ()
 	esac
 }
 
+# Clear the variables caching builtins' options when (re-)sourcing
+# the completion script.
+if [[ -n ${ZSH_VERSION-} ]]; then
+	unset $(set |sed -ne 's/^\(__gitcomp_builtin_[a-zA-Z0-9_][a-zA-Z0-9_]*\)=.*/\1/p') 2>/dev/null
+else
+	unset $(compgen -v __gitcomp_builtin_)
+fi
+
+# This function is equivalent to
+#
+#    __gitcomp "$(git xxx --git-completion-helper) ..."
+#
+# except that the output is cached. Accept 1-3 arguments:
+# 1: the git command to execute, this is also the cache key
+# 2: extra options to be added on top (e.g. negative forms)
+# 3: options to be excluded
+__gitcomp_builtin ()
+{
+	# spaces must be replaced with underscore for multi-word
+	# commands, e.g. "git remote add" becomes remote_add.
+	local cmd="$1"
+	local incl="$2"
+	local excl="$3"
+
+	local var=__gitcomp_builtin_"${cmd/-/_}"
+	local options
+	eval "options=\$$var"
+
+	if [ -z "$options" ]; then
+		# leading and trailing spaces are significant to make
+		# option removal work correctly.
+		options=" $incl $(__git ${cmd/_/ } --git-completion-helper) " || return
+
+		for i in $excl; do
+			options="${options/ $i / }"
+		done
+		eval "$var=\"$options\""
+	fi
+
+	__gitcomp "$options"
+}
+
 # Variation of __gitcomp_nl () that appends to the existing list of
 # completion candidates, COMPREPLY.
 __gitcomp_nl_append ()
@@ -303,6 +435,24 @@ __gitcomp_nl ()
 	__gitcomp_nl_append "$@"
 }
 
+# Fills the COMPREPLY array with prefiltered paths without any additional
+# processing.
+# Callers must take care of providing only paths that match the current path
+# to be completed and adding any prefix path components, if necessary.
+# 1: List of newline-separated matching paths, complete with all prefix
+#    path components.
+__gitcomp_file_direct ()
+{
+	local IFS=$'\n'
+
+	COMPREPLY=($1)
+
+	# 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 ||
+	true
+}
+
 # Generates completion reply with compgen from newline-separated possible
 # completion filenames.
 # It accepts 1 to 3 arguments:
@@ -322,7 +472,8 @@ __gitcomp_file ()
 
 	# 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
+	compgen -f /non-existing-dir/ >/dev/null ||
+	true
 }
 
 # Execute 'git ls-files', unless the --committable option is specified, in
@@ -332,10 +483,12 @@ __gitcomp_file ()
 __git_ls_files_helper ()
 {
 	if [ "$2" == "--committable" ]; then
-		__git -C "$1" diff-index --name-only --relative HEAD
+		__git -C "$1" -c core.quotePath=false diff-index \
+			--name-only --relative HEAD -- "${3//\\/\\\\}*"
 	else
 		# NOTE: $2 is not quoted in order to support multiple options
-		__git -C "$1" ls-files --exclude-standard $2
+		__git -C "$1" -c core.quotePath=false ls-files \
+			--exclude-standard $2 -- "${3//\\/\\\\}*"
 	fi
 }
 
@@ -346,17 +499,103 @@ __git_ls_files_helper ()
 #    If provided, only files within the specified directory are listed.
 #    Sub directories are never recursed.  Path must have a trailing
 #    slash.
+# 3: List only paths matching this path component (optional).
 __git_index_files ()
 {
-	local root="${2-.}" file
+	local root="$2" match="$3"
 
-	__git_ls_files_helper "$root" "$1" |
-	while read -r file; do
-		case "$file" in
-		?*/*) echo "${file%%/*}" ;;
-		*) echo "$file" ;;
-		esac
-	done | sort | uniq
+	__git_ls_files_helper "$root" "$1" "$match" |
+	awk -F / -v pfx="${2//\\/\\\\}" '{
+		paths[$1] = 1
+	}
+	END {
+		for (p in paths) {
+			if (substr(p, 1, 1) != "\"") {
+				# No special characters, easy!
+				print pfx p
+				continue
+			}
+
+			# The path is quoted.
+			p = dequote(p)
+			if (p == "")
+				continue
+
+			# Even when a directory name itself does not contain
+			# any special characters, it will still be quoted if
+			# any of its (stripped) trailing path components do.
+			# Because of this we may have seen the same direcory
+			# both quoted and unquoted.
+			if (p in paths)
+				# We have seen the same directory unquoted,
+				# skip it.
+				continue
+			else
+				print pfx p
+		}
+	}
+	function dequote(p,    bs_idx, out, esc, esc_idx, dec) {
+		# Skip opening double quote.
+		p = substr(p, 2)
+
+		# Interpret backslash escape sequences.
+		while ((bs_idx = index(p, "\\")) != 0) {
+			out = out substr(p, 1, bs_idx - 1)
+			esc = substr(p, bs_idx + 1, 1)
+			p = substr(p, bs_idx + 2)
+
+			if ((esc_idx = index("abtvfr\"\\", esc)) != 0) {
+				# C-style one-character escape sequence.
+				out = out substr("\a\b\t\v\f\r\"\\",
+						 esc_idx, 1)
+			} else if (esc == "n") {
+				# Uh-oh, a newline character.
+				# We cant reliably put a pathname
+				# containing a newline into COMPREPLY,
+				# and the newline would create a mess.
+				# Skip this path.
+				return ""
+			} else {
+				# Must be a \nnn octal value, then.
+				dec = esc             * 64 + \
+				      substr(p, 1, 1) * 8  + \
+				      substr(p, 2, 1)
+				out = out sprintf("%c", dec)
+				p = substr(p, 3)
+			}
+		}
+		# Drop closing double quote, if there is one.
+		# (There isnt any if this is a directory, as it was
+		# already stripped with the trailing path components.)
+		if (substr(p, length(p), 1) == "\"")
+			out = out substr(p, 1, length(p) - 1)
+		else
+			out = out p
+
+		return out
+	}'
+}
+
+# __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 dequoted_word pfx="" cur_
+
+	__git_dequote "$cur"
+
+	case "$dequoted_word" in
+	?*/*)
+		pfx="${dequoted_word%/*}/"
+		cur_="${dequoted_word##*/}"
+		;;
+	*)
+		cur_="$dequoted_word"
+	esac
+
+	__gitcomp_file_direct "$(__git_index_files "$1" "$pfx" "$cur_")"
 }
 
 # Lists branches from the local repository.
@@ -439,7 +678,7 @@ __git_refs ()
 			track=""
 			;;
 		*)
-			for i in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD; do
+			for i in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD REBASE_HEAD; do
 				case "$i" in
 				$match*)
 					if [ -e "$dir/$i" ]; then
@@ -594,7 +833,7 @@ __git_is_configured_remote ()
 
 __git_list_merge_strategies ()
 {
-	git merge -s help 2>&1 |
+	LANG=C LC_ALL=C git merge -s help 2>&1 |
 	sed -n -e '/[Aa]vailable strategies are: /,/^$/{
 		s/\.$//
 		s/.*://
@@ -616,9 +855,14 @@ __git_compute_merge_strategies ()
 	__git_merge_strategies=$(__git_list_merge_strategies)
 }
 
+__git_merge_strategy_options="ours theirs subtree subtree= patience
+	histogram diff-algorithm= ignore-space-change ignore-all-space
+	ignore-space-at-eol renormalize no-renormalize no-renames
+	find-renames find-renames= rename-threshold="
+
 __git_complete_revlist_file ()
 {
-	local pfx ls ref cur_="$cur"
+	local dequoted_word pfx ls ref cur_="$cur"
 	case "$cur_" in
 	*..?*:*)
 		return
@@ -626,14 +870,18 @@ __git_complete_revlist_file ()
 	?*:*)
 		ref="${cur_%%:*}"
 		cur_="${cur_#*:}"
-		case "$cur_" in
+
+		__git_dequote "$cur_"
+
+		case "$dequoted_word" in
 		?*/*)
-			pfx="${cur_%/*}"
-			cur_="${cur_##*/}"
+			pfx="${dequoted_word%/*}"
+			cur_="${dequoted_word##*/}"
 			ls="$ref:$pfx"
 			pfx="$pfx/"
 			;;
 		*)
+			cur_="$dequoted_word"
 			ls="$ref"
 			;;
 		esac
@@ -643,21 +891,10 @@ __git_complete_revlist_file ()
 		*)   pfx="$ref:$pfx" ;;
 		esac
 
-		__gitcomp_nl "$(__git ls-tree "$ls" \
-				| sed '/^100... blob /{
-				           s,^.*	,,
-				           s,$, ,
-				       }
-				       /^120000 blob /{
-				           s,^.*	,,
-				           s,$, ,
-				       }
-				       /^040000 tree /{
-				           s,^.*	,,
-				           s,$,/,
-				       }
-				       s/^.*	//')" \
-			"$pfx" "$cur_" ""
+		__gitcomp_file "$(__git ls-tree "$ls" \
+				| sed 's/^.*	//
+				       s/$//')" \
+			"$pfx" "$cur_"
 		;;
 	*...*)
 		pfx="${cur_%...*}..."
@@ -675,26 +912,6 @@ __git_complete_revlist_file ()
 	esac
 }
 
-
-# __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"
-
-	case "$cur_" in
-	?*/*)
-		pfx="${cur_%/*}"
-		cur_="${cur_##*/}"
-		pfx="${pfx}/"
-		;;
-	esac
-
-	__gitcomp_file "$(__git_index_files "$1" ${pfx:+"$pfx"})" "$pfx" "$cur_"
-}
-
 __git_complete_file ()
 {
 	__git_complete_revlist_file
@@ -726,6 +943,7 @@ __git_complete_remote_or_refspec ()
 			*) ;;
 			esac
 			;;
+		--multiple) no_complete_refspec=1; break ;;
 		-*) ;;
 		*) remote="$i"; break ;;
 		esac
@@ -785,136 +1003,30 @@ __git_complete_strategy ()
 	-s|--strategy)
 		__gitcomp "$__git_merge_strategies"
 		return 0
+		;;
+	-X)
+		__gitcomp "$__git_merge_strategy_options"
+		return 0
+		;;
 	esac
 	case "$cur" in
 	--strategy=*)
 		__gitcomp "$__git_merge_strategies" "" "${cur##--strategy=}"
 		return 0
 		;;
+	--strategy-option=*)
+		__gitcomp "$__git_merge_strategy_options" "" "${cur##--strategy-option=}"
+		return 0
+		;;
 	esac
 	return 1
 }
 
-__git_commands () {
-	if test -n "${GIT_TESTING_COMMAND_COMPLETION:-}"
-	then
-		printf "%s" "${GIT_TESTING_COMMAND_COMPLETION}"
-	else
-		git help -a|egrep '^  [a-zA-Z0-9]'
-	fi
-}
-
-__git_list_all_commands ()
-{
-	local i IFS=" "$'\n'
-	for i in $(__git_commands)
-	do
-		case $i in
-		*--*)             : helper pattern;;
-		*) echo $i;;
-		esac
-	done
-}
-
 __git_all_commands=
 __git_compute_all_commands ()
 {
 	test -n "$__git_all_commands" ||
-	__git_all_commands=$(__git_list_all_commands)
-}
-
-__git_list_porcelain_commands ()
-{
-	local i IFS=" "$'\n'
-	__git_compute_all_commands
-	for i in $__git_all_commands
-	do
-		case $i in
-		*--*)             : helper pattern;;
-		applymbox)        : ask gittus;;
-		applypatch)       : ask gittus;;
-		archimport)       : import;;
-		cat-file)         : plumbing;;
-		check-attr)       : plumbing;;
-		check-ignore)     : plumbing;;
-		check-mailmap)    : plumbing;;
-		check-ref-format) : plumbing;;
-		checkout-index)   : plumbing;;
-		column)           : internal helper;;
-		commit-tree)      : plumbing;;
-		count-objects)    : infrequent;;
-		credential)       : credentials;;
-		credential-*)     : credentials helper;;
-		cvsexportcommit)  : export;;
-		cvsimport)        : import;;
-		cvsserver)        : daemon;;
-		daemon)           : daemon;;
-		diff-files)       : plumbing;;
-		diff-index)       : plumbing;;
-		diff-tree)        : plumbing;;
-		fast-import)      : import;;
-		fast-export)      : export;;
-		fsck-objects)     : plumbing;;
-		fetch-pack)       : plumbing;;
-		fmt-merge-msg)    : plumbing;;
-		for-each-ref)     : plumbing;;
-		hash-object)      : plumbing;;
-		http-*)           : transport;;
-		index-pack)       : plumbing;;
-		init-db)          : deprecated;;
-		local-fetch)      : plumbing;;
-		ls-files)         : plumbing;;
-		ls-remote)        : plumbing;;
-		ls-tree)          : plumbing;;
-		mailinfo)         : plumbing;;
-		mailsplit)        : plumbing;;
-		merge-*)          : plumbing;;
-		mktree)           : plumbing;;
-		mktag)            : plumbing;;
-		pack-objects)     : plumbing;;
-		pack-redundant)   : plumbing;;
-		pack-refs)        : plumbing;;
-		parse-remote)     : plumbing;;
-		patch-id)         : plumbing;;
-		prune)            : plumbing;;
-		prune-packed)     : plumbing;;
-		quiltimport)      : import;;
-		read-tree)        : plumbing;;
-		receive-pack)     : plumbing;;
-		remote-*)         : transport;;
-		rerere)           : plumbing;;
-		rev-list)         : plumbing;;
-		rev-parse)        : plumbing;;
-		runstatus)        : plumbing;;
-		sh-setup)         : internal;;
-		shell)            : daemon;;
-		show-ref)         : plumbing;;
-		send-pack)        : plumbing;;
-		show-index)       : plumbing;;
-		ssh-*)            : transport;;
-		stripspace)       : plumbing;;
-		symbolic-ref)     : plumbing;;
-		unpack-file)      : plumbing;;
-		unpack-objects)   : plumbing;;
-		update-index)     : plumbing;;
-		update-ref)       : plumbing;;
-		update-server-info) : daemon;;
-		upload-archive)   : plumbing;;
-		upload-pack)      : plumbing;;
-		write-tree)       : plumbing;;
-		var)              : infrequent;;
-		verify-pack)      : infrequent;;
-		verify-tag)       : plumbing;;
-		*) echo $i;;
-		esac
-	done
-}
-
-__git_porcelain_commands=
-__git_compute_porcelain_commands ()
-{
-	test -n "$__git_porcelain_commands" ||
-	__git_porcelain_commands=$(__git_list_porcelain_commands)
+	__git_all_commands=$(__git --list-cmds=main,others,alias,nohelpers)
 }
 
 # Lists all set config variables starting with the given section prefix,
@@ -932,11 +1044,6 @@ __git_pretty_aliases ()
 	__git_get_config_variables "pretty"
 }
 
-__git_aliases ()
-{
-	__git_get_config_variables "alias"
-}
-
 # __git_aliased_command requires 1 argument
 __git_aliased_command ()
 {
@@ -1072,12 +1179,14 @@ __git_count_arguments ()
 }
 
 __git_whitespacelist="nowarn warn error error-all fix"
+__git_patchformat="mbox stgit stgit-series hg mboxrd"
+__git_am_inprogress_options="--skip --continue --resolved --abort --quit --show-current-patch"
 
 _git_am ()
 {
 	__git_find_repo_path
 	if [ -d "$__git_repo_path"/rebase-apply ]; then
-		__gitcomp "--skip --continue --resolved --abort"
+		__gitcomp "$__git_am_inprogress_options"
 		return
 	fi
 	case "$cur" in
@@ -1085,13 +1194,13 @@ _git_am ()
 		__gitcomp "$__git_whitespacelist" "" "${cur##--whitespace=}"
 		return
 		;;
+	--patch-format=*)
+		__gitcomp "$__git_patchformat" "" "${cur##--patch-format=}"
+		return
+		;;
 	--*)
-		__gitcomp "
-			--3way --committer-date-is-author-date --ignore-date
-			--ignore-whitespace --ignore-space-change
-			--interactive --keep --no-utf8 --signoff --utf8
-			--whitespace= --scissors
-			"
+		__gitcomp_builtin am "" \
+			"$__git_am_inprogress_options"
 		return
 	esac
 }
@@ -1104,14 +1213,7 @@ _git_apply ()
 		return
 		;;
 	--*)
-		__gitcomp "
-			--stat --numstat --summary --check --index
-			--cached --index-info --reverse --reject --unidiff-zero
-			--apply --no-add --exclude=
-			--ignore-whitespace --ignore-space-change
-			--whitespace= --inaccurate-eof --verbose
-			--recount --directory=
-			"
+		__gitcomp_builtin apply
 		return
 	esac
 }
@@ -1119,11 +1221,12 @@ _git_apply ()
 _git_add ()
 {
 	case "$cur" in
+	--chmod=*)
+		__gitcomp "+x -x" "" "${cur##--chmod=}"
+		return
+		;;
 	--*)
-		__gitcomp "
-			--interactive --refresh --patch --update --dry-run
-			--ignore-errors --intent-to-add --force --edit --chmod=
-			"
+		__gitcomp_builtin add
 		return
 	esac
 
@@ -1182,6 +1285,8 @@ _git_bisect ()
 	esac
 }
 
+__git_ref_fieldlist="refname objecttype objectsize objectname upstream push HEAD symref"
+
 _git_branch ()
 {
 	local i c=1 only_local_ref="n" has_r="n"
@@ -1200,13 +1305,7 @@ _git_branch ()
 		__git_complete_refs --cur="${cur##--set-upstream-to=}"
 		;;
 	--*)
-		__gitcomp "
-			--color --no-color --verbose --abbrev= --no-abbrev
-			--track --no-track --contains --no-contains --merged --no-merged
-			--set-upstream-to= --edit-description --list
-			--unset-upstream --delete --move --copy --remotes
-			--column --no-column --sort= --points-at
-			"
+		__gitcomp_builtin branch
 		;;
 	*)
 		if [ $only_local_ref = "y" -a $has_r = "n" ]; then
@@ -1247,11 +1346,7 @@ _git_checkout ()
 		__gitcomp "diff3 merge" "" "${cur##--conflict=}"
 		;;
 	--*)
-		__gitcomp "
-			--quiet --ours --theirs --track --no-track --merge
-			--conflict= --orphan --patch --detach --ignore-skip-worktree-bits
-			--recurse-submodules --no-recurse-submodules
-			"
+		__gitcomp_builtin checkout
 		;;
 	*)
 		# check if --track, --no-track, or --no-guess was specified
@@ -1266,21 +1361,22 @@ _git_checkout ()
 	esac
 }
 
-_git_cherry ()
-{
-	__git_complete_refs
-}
+__git_cherry_pick_inprogress_options="--continue --quit --abort"
 
 _git_cherry_pick ()
 {
 	__git_find_repo_path
 	if [ -f "$__git_repo_path"/CHERRY_PICK_HEAD ]; then
-		__gitcomp "--continue --quit --abort"
+		__gitcomp "$__git_cherry_pick_inprogress_options"
 		return
 	fi
+
+	__git_complete_strategy && return
+
 	case "$cur" in
 	--*)
-		__gitcomp "--edit --no-commit --signoff --strategy= --mainline"
+		__gitcomp_builtin cherry-pick "" \
+			"$__git_cherry_pick_inprogress_options"
 		;;
 	*)
 		__git_complete_refs
@@ -1292,7 +1388,7 @@ _git_clean ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "--dry-run --quiet"
+		__gitcomp_builtin clean
 		return
 		;;
 	esac
@@ -1305,26 +1401,7 @@ _git_clone ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "
-			--local
-			--no-hardlinks
-			--shared
-			--reference
-			--quiet
-			--no-checkout
-			--bare
-			--mirror
-			--origin
-			--upload-pack
-			--template=
-			--depth
-			--single-branch
-			--no-tags
-			--branch
-			--recurse-submodules
-			--no-single-branch
-			--shallow-submodules
-			"
+		__gitcomp_builtin clone
 		return
 		;;
 	esac
@@ -1357,16 +1434,7 @@ _git_commit ()
 		return
 		;;
 	--*)
-		__gitcomp "
-			--all --author= --signoff --verify --no-verify
-			--edit --no-edit
-			--amend --include --only --interactive
-			--dry-run --reuse-message= --reedit-message=
-			--reset-author --file= --message= --template=
-			--cleanup= --untracked-files --untracked-files=
-			--verbose --quiet --fixup= --squash=
-			--patch --short --date --allow-empty
-			"
+		__gitcomp_builtin commit
 		return
 	esac
 
@@ -1382,11 +1450,7 @@ _git_describe ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "
-			--all --tags --contains --abbrev= --candidates=
-			--exact-match --debug --long --match --always --first-parent
-			--exclude --dirty --broken
-			"
+		__gitcomp_builtin describe
 		return
 	esac
 	__git_complete_refs
@@ -1411,7 +1475,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
 			--dirstat --dirstat= --dirstat-by-file
 			--dirstat-by-file= --cumulative
 			--diff-algorithm=
-			--submodule --submodule=
+			--submodule --submodule= --ignore-submodules
 "
 
 _git_diff ()
@@ -1439,7 +1503,8 @@ _git_diff ()
 }
 
 __git_mergetools_common="diffuse diffmerge ecmerge emerge kdiff3 meld opendiff
-			tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc codecompare
+			tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc
+			codecompare smerge
 "
 
 _git_difftool ()
@@ -1452,11 +1517,11 @@ _git_difftool ()
 		return
 		;;
 	--*)
-		__gitcomp "--cached --staged --pickaxe-all --pickaxe-regex
-			--base --ours --theirs
-			--no-renames --diff-filter= --find-copies-harder
-			--relative --ignore-submodules
-			--tool="
+		__gitcomp_builtin difftool "$__git_diff_common_options
+					--base --cached --ours --theirs
+					--pickaxe-all --pickaxe-regex
+					--relative --staged
+					"
 		return
 		;;
 	esac
@@ -1465,12 +1530,6 @@ _git_difftool ()
 
 __git_fetch_recurse_submodules="yes on-demand no"
 
-__git_fetch_options="
-	--quiet --verbose --append --upload-pack --force --keep --depth=
-	--tags --no-tags --all --prune --dry-run --recurse-submodules=
-	--unshallow --update-shallow
-"
-
 _git_fetch ()
 {
 	case "$cur" in
@@ -1478,21 +1537,21 @@ _git_fetch ()
 		__gitcomp "$__git_fetch_recurse_submodules" "" "${cur##--recurse-submodules=}"
 		return
 		;;
+	--filter=*)
+		__gitcomp "blob:none blob:limit= sparse:oid=" "" "${cur##--filter=}"
+		return
+		;;
 	--*)
-		__gitcomp "$__git_fetch_options"
+		__gitcomp_builtin fetch
 		return
 		;;
 	esac
 	__git_complete_remote_or_refspec
 }
 
-__git_format_patch_options="
-	--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_extra_options="
+	--full-index --not --all --no-prefix --src-prefix=
+	--dst-prefix= --notes
 "
 
 _git_format_patch ()
@@ -1505,7 +1564,7 @@ _git_format_patch ()
 		return
 		;;
 	--*)
-		__gitcomp "$__git_format_patch_options"
+		__gitcomp_builtin format-patch "$__git_format_patch_extra_options"
 		return
 		;;
 	esac
@@ -1516,20 +1575,7 @@ _git_fsck ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "
-			--tags --root --unreachable --cache --no-reflogs --full
-			--strict --verbose --lost-found --name-objects
-			"
-		return
-		;;
-	esac
-}
-
-_git_gc ()
-{
-	case "$cur" in
-	--*)
-		__gitcomp "--prune --aggressive"
+		__gitcomp_builtin fsck
 		return
 		;;
 	esac
@@ -1585,21 +1631,7 @@ _git_grep ()
 
 	case "$cur" in
 	--*)
-		__gitcomp "
-			--cached
-			--text --ignore-case --word-regexp --invert-match
-			--full-name --line-number
-			--extended-regexp --basic-regexp --fixed-strings
-			--perl-regexp
-			--threads
-			--files-with-matches --name-only
-			--files-without-match
-			--max-depth
-			--count
-			--and --or --not --all-match
-			--break --heading --show-function --function-context
-			--untracked --no-index
-			"
+		__gitcomp_builtin grep
 		return
 		;;
 	esac
@@ -1617,17 +1649,16 @@ _git_help ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "--all --guides --info --man --web"
+		__gitcomp_builtin help
 		return
 		;;
 	esac
-	__git_compute_all_commands
-	__gitcomp "$__git_all_commands $(__git_aliases)
-		attributes cli core-tutorial cvs-migration
-		diffcore everyday gitk glossary hooks ignore modules
-		namespaces repository-layout revisions tutorial tutorial-2
-		workflows
-		"
+	if test -n "$GIT_TESTING_ALL_COMMAND_LIST"
+	then
+		__gitcomp "$GIT_TESTING_ALL_COMMAND_LIST $(__git --list-cmds=alias,list-guide) gitk"
+	else
+		__gitcomp "$(__git --list-cmds=main,nohelpers,alias,list-guide) gitk"
+	fi
 }
 
 _git_init ()
@@ -1640,7 +1671,7 @@ _git_init ()
 		return
 		;;
 	--*)
-		__gitcomp "--quiet --bare --template= --shared --shared="
+		__gitcomp_builtin init
 		return
 		;;
 	esac
@@ -1650,13 +1681,7 @@ _git_ls_files ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "--cached --deleted --modified --others --ignored
-			--stage --directory --no-empty-directory --unmerged
-			--killed --exclude= --exclude-from=
-			--exclude-per-directory= --exclude-standard
-			--error-unmatch --with-tree= --full-name
-			--abbrev --ignored --exclude-per-directory
-			"
+		__gitcomp_builtin ls-files
 		return
 		;;
 	esac
@@ -1670,7 +1695,7 @@ _git_ls_remote ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "--heads --tags --refs --get-url --symref"
+		__gitcomp_builtin ls-remote
 		return
 		;;
 	esac
@@ -1679,6 +1704,13 @@ _git_ls_remote ()
 
 _git_ls_tree ()
 {
+	case "$cur" in
+	--*)
+		__gitcomp_builtin ls-tree
+		return
+		;;
+	esac
+
 	__git_complete_file
 }
 
@@ -1705,8 +1737,8 @@ __git_log_shortlog_options="
 	--all-match --invert-grep
 "
 
-__git_log_pretty_formats="oneline short medium full fuller email raw format:"
-__git_log_date_formats="relative iso8601 rfc2822 short local default raw"
+__git_log_pretty_formats="oneline short medium full fuller email raw format: mboxrd"
+__git_log_date_formats="relative iso8601 iso8601-strict rfc2822 short local default raw unix format:"
 
 _git_log ()
 {
@@ -1794,22 +1826,13 @@ _git_log ()
 	__git_complete_revlist
 }
 
-# Common merge options shared by git-merge(1) and git-pull(1).
-__git_merge_options="
-	--no-commit --no-stat --log --no-log --squash --strategy
-	--commit --stat --no-squash --ff --no-ff --ff-only --edit --no-edit
-	--verify-signatures --no-verify-signatures --gpg-sign
-	--quiet --verbose --progress --no-progress
-"
-
 _git_merge ()
 {
 	__git_complete_strategy && return
 
 	case "$cur" in
 	--*)
-		__gitcomp "$__git_merge_options
-			--rerere-autoupdate --no-rerere-autoupdate --abort --continue"
+		__gitcomp_builtin merge
 		return
 	esac
 	__git_complete_refs
@@ -1823,7 +1846,7 @@ _git_mergetool ()
 		return
 		;;
 	--*)
-		__gitcomp "--tool= --prompt --no-prompt"
+		__gitcomp "--tool= --prompt --no-prompt --gui --no-gui"
 		return
 		;;
 	esac
@@ -1833,7 +1856,7 @@ _git_merge_base ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "--octopus --independent --is-ancestor --fork-point"
+		__gitcomp_builtin merge-base
 		return
 		;;
 	esac
@@ -1844,7 +1867,7 @@ _git_mv ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "--dry-run"
+		__gitcomp_builtin mv
 		return
 		;;
 	esac
@@ -1858,19 +1881,14 @@ _git_mv ()
 	fi
 }
 
-_git_name_rev ()
-{
-	__gitcomp "--tags --all --stdin"
-}
-
 _git_notes ()
 {
-	local subcommands='add append copy edit list prune remove show'
+	local subcommands='add append copy edit get-ref list merge prune remove show'
 	local subcommand="$(__git_find_on_cmdline "$subcommands")"
 
 	case "$subcommand,$cur" in
 	,--*)
-		__gitcomp '--ref'
+		__gitcomp_builtin notes
 		;;
 	,*)
 		case "$prev" in
@@ -1882,21 +1900,14 @@ _git_notes ()
 			;;
 		esac
 		;;
-	add,--reuse-message=*|append,--reuse-message=*|\
-	add,--reedit-message=*|append,--reedit-message=*)
+	*,--reuse-message=*|*,--reedit-message=*)
 		__git_complete_refs --cur="${cur#*=}"
 		;;
-	add,--*|append,--*)
-		__gitcomp '--file= --message= --reedit-message=
-				--reuse-message='
-		;;
-	copy,--*)
-		__gitcomp '--stdin'
+	*,--*)
+		__gitcomp_builtin notes_$subcommand
 		;;
-	prune,--*)
-		__gitcomp '--dry-run --verbose'
-		;;
-	prune,*)
+	prune,*|get-ref,*)
+		# this command does not take a ref, do not complete it
 		;;
 	*)
 		case "$prev" in
@@ -1920,12 +1931,8 @@ _git_pull ()
 		return
 		;;
 	--*)
-		__gitcomp "
-			--rebase --no-rebase
-			--autostash --no-autostash
-			$__git_merge_options
-			$__git_fetch_options
-		"
+		__gitcomp_builtin pull
+
 		return
 		;;
 	esac
@@ -1975,28 +1982,37 @@ _git_push ()
 		__git_complete_force_with_lease "${cur##--force-with-lease=}"
 		return
 		;;
+	--*)
+		__gitcomp_builtin push
+		return
+		;;
+	esac
+	__git_complete_remote_or_refspec
+}
+
+_git_range_diff ()
+{
+	case "$cur" in
 	--*)
 		__gitcomp "
-			--all --mirror --tags --dry-run --force --verbose
-			--quiet --prune --delete --follow-tags
-			--receive-pack= --repo= --set-upstream
-			--force-with-lease --force-with-lease= --recurse-submodules=
+			--creation-factor= --no-dual-color
+			$__git_diff_common_options
 		"
 		return
 		;;
 	esac
-	__git_complete_remote_or_refspec
+	__git_complete_revlist
 }
 
 _git_rebase ()
 {
 	__git_find_repo_path
 	if [ -f "$__git_repo_path"/rebase-merge/interactive ]; then
-		__gitcomp "--continue --skip --abort --quit --edit-todo"
+		__gitcomp "--continue --skip --abort --quit --edit-todo --show-current-patch"
 		return
 	elif [ -d "$__git_repo_path"/rebase-apply ] || \
 	     [ -d "$__git_repo_path"/rebase-merge ]; then
-		__gitcomp "--continue --skip --abort --quit"
+		__gitcomp "--continue --skip --abort --quit --show-current-patch"
 		return
 	fi
 	__git_complete_strategy && return
@@ -2008,7 +2024,7 @@ _git_rebase ()
 	--*)
 		__gitcomp "
 			--onto --merge --strategy --interactive
-			--preserve-merges --stat --no-stat
+			--rebase-merges --preserve-merges --stat --no-stat
 			--committer-date-is-author-date --ignore-date
 			--ignore-whitespace --whitespace=
 			--autosquash --no-autosquash
@@ -2016,6 +2032,7 @@ _git_rebase ()
 			--autostash --no-autostash
 			--verify --no-verify
 			--keep-empty --root --force-rebase --no-ff
+			--rerere-autoupdate
 			--exec
 			"
 
@@ -2077,16 +2094,16 @@ _git_send_email ()
 		return
 		;;
 	--*)
-		__gitcomp "--annotate --bcc --cc --cc-cmd --chain-reply-to
+		__gitcomp_builtin send-email "--annotate --bcc --cc --cc-cmd --chain-reply-to
 			--compose --confirm= --dry-run --envelope-sender
 			--from --identity
 			--in-reply-to --no-chain-reply-to --no-signed-off-by-cc
-			--no-suppress-from --no-thread --quiet
+			--no-suppress-from --no-thread --quiet --reply-to
 			--signed-off-by-cc --smtp-pass --smtp-server
 			--smtp-server-port --smtp-encryption= --smtp-user
 			--subject --suppress-cc= --suppress-from --thread --to
 			--validate --no-validate
-			$__git_format_patch_options"
+			$__git_format_patch_extra_options"
 		return
 		;;
 	esac
@@ -2119,11 +2136,7 @@ _git_status ()
 		return
 		;;
 	--*)
-		__gitcomp "
-			--short --branch --porcelain --long --verbose
-			--untracked-files= --ignore-submodules= --ignored
-			--column= --no-column
-			"
+		__gitcomp_builtin status
 		return
 		;;
 	esac
@@ -2148,6 +2161,44 @@ _git_status ()
 	__git_complete_index_file "$complete_opt"
 }
 
+_git_switch ()
+{
+	case "$cur" in
+	--conflict=*)
+		__gitcomp "diff3 merge" "" "${cur##--conflict=}"
+		;;
+	--*)
+		__gitcomp_builtin switch
+		;;
+	*)
+		# check if --track, --no-track, or --no-guess was specified
+		# if so, disable DWIM mode
+		local track_opt="--track" only_local_ref=n
+		if [ "$GIT_COMPLETION_CHECKOUT_NO_GUESS" = "1" ] ||
+		   [ -n "$(__git_find_on_cmdline "--track --no-track --no-guess")" ]; then
+			track_opt=''
+		fi
+		# explicit --guess enables DWIM mode regardless of
+		# $GIT_COMPLETION_CHECKOUT_NO_GUESS
+		if [ -n "$(__git_find_on_cmdline "--guess")" ]; then
+			track_opt='--track'
+		fi
+		if [ -z "$(__git_find_on_cmdline "-d --detach")" ]; then
+			only_local_ref=y
+		else
+			# --guess --detach is invalid combination, no
+			# dwim will be done when --detach is specified
+			track_opt=
+		fi
+		if [ $only_local_ref = y -a -z "$track_opt" ]; then
+			__gitcomp_direct "$(__git_heads "" "$cur" " ")"
+		else
+			__git_complete_refs $track_opt
+		fi
+		;;
+	esac
+}
+
 __git_config_get_set_variables ()
 {
 	local prevword word config_file= c=$cword
@@ -2170,9 +2221,24 @@ __git_config_get_set_variables ()
 	__git config $config_file --name-only --list
 }
 
+__git_config_vars=
+__git_compute_config_vars ()
+{
+	test -n "$__git_config_vars" ||
+	__git_config_vars="$(git help --config-for-completion | sort | uniq)"
+}
+
 _git_config ()
 {
-	case "$prev" in
+	local varname
+
+	if [ "${BASH_VERSINFO[0]:-0}" -ge 4 ]; then
+		varname="${prev,,}"
+	else
+		varname="$(echo "$prev" |tr A-Z a-z)"
+	fi
+
+	case "$varname" in
 	branch.*.remote|branch.*.pushremote)
 		__gitcomp_nl "$(__git_remotes)"
 		return
@@ -2182,7 +2248,7 @@ _git_config ()
 		return
 		;;
 	branch.*.rebase)
-		__gitcomp "false true preserve interactive"
+		__gitcomp "false true merges preserve interactive"
 		return
 		;;
 	remote.pushdefault)
@@ -2228,7 +2294,7 @@ _git_config ()
 		return
 		;;
 	diff.submodule)
-		__gitcomp "log short"
+		__gitcomp "$__git_diff_submodule_formats"
 		return
 		;;
 	help.format)
@@ -2239,7 +2305,7 @@ _git_config ()
 		__gitcomp "$__git_log_date_formats"
 		return
 		;;
-	sendemail.aliasesfiletype)
+	sendemail.aliasfiletype)
 		__gitcomp "mutt mailrc pine elm gnus"
 		return
 		;;
@@ -2265,32 +2331,25 @@ _git_config ()
 	esac
 	case "$cur" in
 	--*)
-		__gitcomp "
-			--system --global --local --file=
-			--list --replace-all
-			--get --get-all --get-regexp
-			--add --unset --unset-all
-			--remove-section --rename-section
-			--name-only
-			"
+		__gitcomp_builtin config
 		return
 		;;
 	branch.*.*)
 		local pfx="${cur%.*}." cur_="${cur##*.}"
-		__gitcomp "remote pushremote merge mergeoptions rebase" "$pfx" "$cur_"
+		__gitcomp "remote pushRemote merge mergeOptions rebase" "$pfx" "$cur_"
 		return
 		;;
 	branch.*)
 		local pfx="${cur%.*}." cur_="${cur#*.}"
 		__gitcomp_direct "$(__git_heads "$pfx" "$cur_" ".")"
-		__gitcomp_nl_append $'autosetupmerge\nautosetuprebase\n' "$pfx" "$cur_"
+		__gitcomp_nl_append $'autoSetupMerge\nautoSetupRebase\n' "$pfx" "$cur_"
 		return
 		;;
 	guitool.*.*)
 		local pfx="${cur%.*}." cur_="${cur##*.}"
 		__gitcomp "
-			argprompt cmd confirm needsfile noconsole norescan
-			prompt revprompt revunmerged title
+			argPrompt cmd confirm needsFile noConsole noRescan
+			prompt revPrompt revUnmerged title
 			" "$pfx" "$cur_"
 		return
 		;;
@@ -2319,14 +2378,14 @@ _git_config ()
 		local pfx="${cur%.*}." cur_="${cur##*.}"
 		__gitcomp "
 			url proxy fetch push mirror skipDefaultUpdate
-			receivepack uploadpack tagopt pushurl
+			receivepack uploadpack tagOpt pushurl
 			" "$pfx" "$cur_"
 		return
 		;;
 	remote.*)
 		local pfx="${cur%.*}." cur_="${cur#*.}"
 		__gitcomp_nl "$(__git_remotes)" "$pfx" "$cur_" "."
-		__gitcomp_nl_append "pushdefault" "$pfx" "$cur_"
+		__gitcomp_nl_append "pushDefault" "$pfx" "$cur_"
 		return
 		;;
 	url.*.*)
@@ -2334,332 +2393,14 @@ _git_config ()
 		__gitcomp "insteadOf pushInsteadOf" "$pfx" "$cur_"
 		return
 		;;
+	*.*)
+		__git_compute_config_vars
+		__gitcomp "$__git_config_vars"
+		;;
+	*)
+		__git_compute_config_vars
+		__gitcomp "$(echo "$__git_config_vars" | sed 's/\.[^ ]*/./g')"
 	esac
-	__gitcomp "
-		add.ignoreErrors
-		advice.amWorkDir
-		advice.commitBeforeMerge
-		advice.detachedHead
-		advice.implicitIdentity
-		advice.pushAlreadyExists
-		advice.pushFetchFirst
-		advice.pushNeedsForce
-		advice.pushNonFFCurrent
-		advice.pushNonFFMatching
-		advice.pushUpdateRejected
-		advice.resolveConflict
-		advice.rmHints
-		advice.statusHints
-		advice.statusUoption
-		advice.ignoredHook
-		alias.
-		am.keepcr
-		am.threeWay
-		apply.ignorewhitespace
-		apply.whitespace
-		branch.autosetupmerge
-		branch.autosetuprebase
-		browser.
-		clean.requireForce
-		color.branch
-		color.branch.current
-		color.branch.local
-		color.branch.plain
-		color.branch.remote
-		color.decorate.HEAD
-		color.decorate.branch
-		color.decorate.remoteBranch
-		color.decorate.stash
-		color.decorate.tag
-		color.diff
-		color.diff.commit
-		color.diff.frag
-		color.diff.func
-		color.diff.meta
-		color.diff.new
-		color.diff.old
-		color.diff.plain
-		color.diff.whitespace
-		color.grep
-		color.grep.context
-		color.grep.filename
-		color.grep.function
-		color.grep.linenumber
-		color.grep.match
-		color.grep.selected
-		color.grep.separator
-		color.interactive
-		color.interactive.error
-		color.interactive.header
-		color.interactive.help
-		color.interactive.prompt
-		color.pager
-		color.showbranch
-		color.status
-		color.status.added
-		color.status.changed
-		color.status.header
-		color.status.localBranch
-		color.status.nobranch
-		color.status.remoteBranch
-		color.status.unmerged
-		color.status.untracked
-		color.status.updated
-		color.ui
-		commit.cleanup
-		commit.gpgSign
-		commit.status
-		commit.template
-		commit.verbose
-		core.abbrev
-		core.askpass
-		core.attributesfile
-		core.autocrlf
-		core.bare
-		core.bigFileThreshold
-		core.checkStat
-		core.commentChar
-		core.compression
-		core.createObject
-		core.deltaBaseCacheLimit
-		core.editor
-		core.eol
-		core.excludesfile
-		core.fileMode
-		core.fsyncobjectfiles
-		core.gitProxy
-		core.hideDotFiles
-		core.hooksPath
-		core.ignoreStat
-		core.ignorecase
-		core.logAllRefUpdates
-		core.loosecompression
-		core.notesRef
-		core.packedGitLimit
-		core.packedGitWindowSize
-		core.packedRefsTimeout
-		core.pager
-		core.precomposeUnicode
-		core.preferSymlinkRefs
-		core.preloadindex
-		core.protectHFS
-		core.protectNTFS
-		core.quotepath
-		core.repositoryFormatVersion
-		core.safecrlf
-		core.sharedRepository
-		core.sparseCheckout
-		core.splitIndex
-		core.sshCommand
-		core.symlinks
-		core.trustctime
-		core.untrackedCache
-		core.warnAmbiguousRefs
-		core.whitespace
-		core.worktree
-		credential.helper
-		credential.useHttpPath
-		credential.username
-		credentialCache.ignoreSIGHUP
-		diff.autorefreshindex
-		diff.external
-		diff.ignoreSubmodules
-		diff.mnemonicprefix
-		diff.noprefix
-		diff.renameLimit
-		diff.renames
-		diff.statGraphWidth
-		diff.submodule
-		diff.suppressBlankEmpty
-		diff.tool
-		diff.wordRegex
-		diff.algorithm
-		difftool.
-		difftool.prompt
-		fetch.recurseSubmodules
-		fetch.unpackLimit
-		format.attach
-		format.cc
-		format.coverLetter
-		format.from
-		format.headers
-		format.numbered
-		format.pretty
-		format.signature
-		format.signoff
-		format.subjectprefix
-		format.suffix
-		format.thread
-		format.to
-		gc.
-		gc.aggressiveDepth
-		gc.aggressiveWindow
-		gc.auto
-		gc.autoDetach
-		gc.autopacklimit
-		gc.logExpiry
-		gc.packrefs
-		gc.pruneexpire
-		gc.reflogexpire
-		gc.reflogexpireunreachable
-		gc.rerereresolved
-		gc.rerereunresolved
-		gc.worktreePruneExpire
-		gitcvs.allbinary
-		gitcvs.commitmsgannotation
-		gitcvs.dbTableNamePrefix
-		gitcvs.dbdriver
-		gitcvs.dbname
-		gitcvs.dbpass
-		gitcvs.dbuser
-		gitcvs.enabled
-		gitcvs.logfile
-		gitcvs.usecrlfattr
-		guitool.
-		gui.blamehistoryctx
-		gui.commitmsgwidth
-		gui.copyblamethreshold
-		gui.diffcontext
-		gui.encoding
-		gui.fastcopyblame
-		gui.matchtrackingbranch
-		gui.newbranchtemplate
-		gui.pruneduringfetch
-		gui.spellingdictionary
-		gui.trustmtime
-		help.autocorrect
-		help.browser
-		help.format
-		http.lowSpeedLimit
-		http.lowSpeedTime
-		http.maxRequests
-		http.minSessions
-		http.noEPSV
-		http.postBuffer
-		http.proxy
-		http.sslCipherList
-		http.sslVersion
-		http.sslCAInfo
-		http.sslCAPath
-		http.sslCert
-		http.sslCertPasswordProtected
-		http.sslKey
-		http.sslVerify
-		http.useragent
-		i18n.commitEncoding
-		i18n.logOutputEncoding
-		imap.authMethod
-		imap.folder
-		imap.host
-		imap.pass
-		imap.port
-		imap.preformattedHTML
-		imap.sslverify
-		imap.tunnel
-		imap.user
-		init.templatedir
-		instaweb.browser
-		instaweb.httpd
-		instaweb.local
-		instaweb.modulepath
-		instaweb.port
-		interactive.singlekey
-		log.date
-		log.decorate
-		log.showroot
-		mailmap.file
-		man.
-		man.viewer
-		merge.
-		merge.conflictstyle
-		merge.log
-		merge.renameLimit
-		merge.renormalize
-		merge.stat
-		merge.tool
-		merge.verbosity
-		mergetool.
-		mergetool.keepBackup
-		mergetool.keepTemporaries
-		mergetool.prompt
-		notes.displayRef
-		notes.rewrite.
-		notes.rewrite.amend
-		notes.rewrite.rebase
-		notes.rewriteMode
-		notes.rewriteRef
-		pack.compression
-		pack.deltaCacheLimit
-		pack.deltaCacheSize
-		pack.depth
-		pack.indexVersion
-		pack.packSizeLimit
-		pack.threads
-		pack.window
-		pack.windowMemory
-		pager.
-		pretty.
-		pull.octopus
-		pull.twohead
-		push.default
-		push.followTags
-		rebase.autosquash
-		rebase.stat
-		receive.autogc
-		receive.denyCurrentBranch
-		receive.denyDeleteCurrent
-		receive.denyDeletes
-		receive.denyNonFastForwards
-		receive.fsckObjects
-		receive.unpackLimit
-		receive.updateserverinfo
-		remote.pushdefault
-		remotes.
-		repack.usedeltabaseoffset
-		rerere.autoupdate
-		rerere.enabled
-		sendemail.
-		sendemail.aliasesfile
-		sendemail.aliasfiletype
-		sendemail.bcc
-		sendemail.cc
-		sendemail.cccmd
-		sendemail.chainreplyto
-		sendemail.confirm
-		sendemail.envelopesender
-		sendemail.from
-		sendemail.identity
-		sendemail.multiedit
-		sendemail.signedoffbycc
-		sendemail.smtpdomain
-		sendemail.smtpencryption
-		sendemail.smtppass
-		sendemail.smtpserver
-		sendemail.smtpserveroption
-		sendemail.smtpserverport
-		sendemail.smtpuser
-		sendemail.suppresscc
-		sendemail.suppressfrom
-		sendemail.thread
-		sendemail.to
-		sendemail.tocmd
-		sendemail.validate
-		sendemail.smtpbatchsize
-		sendemail.smtprelogindelay
-		showbranch.default
-		status.relativePaths
-		status.showUntrackedFiles
-		status.submodulesummary
-		submodule.
-		tar.umask
-		transfer.unpackLimit
-		url.
-		user.email
-		user.name
-		user.signingkey
-		web.browser
-		branch. remote.
-	"
 }
 
 _git_remote ()
@@ -2672,7 +2413,7 @@ _git_remote ()
 	if [ -z "$subcommand" ]; then
 		case "$cur" in
 		--*)
-			__gitcomp "--verbose"
+			__gitcomp_builtin remote
 			;;
 		*)
 			__gitcomp "$subcommands"
@@ -2683,33 +2424,33 @@ _git_remote ()
 
 	case "$subcommand,$cur" in
 	add,--*)
-		__gitcomp "--track --master --fetch --tags --no-tags --mirror="
+		__gitcomp_builtin remote_add
 		;;
 	add,*)
 		;;
 	set-head,--*)
-		__gitcomp "--auto --delete"
+		__gitcomp_builtin remote_set-head
 		;;
 	set-branches,--*)
-		__gitcomp "--add"
+		__gitcomp_builtin remote_set-branches
 		;;
 	set-head,*|set-branches,*)
 		__git_complete_remote_or_refspec
 		;;
 	update,--*)
-		__gitcomp "--prune"
+		__gitcomp_builtin remote_update
 		;;
 	update,*)
-		__gitcomp "$(__git_get_config_variables "remotes")"
+		__gitcomp "$(__git_remotes) $(__git_get_config_variables "remotes")"
 		;;
 	set-url,--*)
-		__gitcomp "--push --add --delete"
+		__gitcomp_builtin remote_set-url
 		;;
 	get-url,--*)
-		__gitcomp "--push --all"
+		__gitcomp_builtin remote_get-url
 		;;
 	prune,--*)
-		__gitcomp "--dry-run"
+		__gitcomp_builtin remote_prune
 		;;
 	*)
 		__gitcomp_nl "$(__git_remotes)"
@@ -2720,8 +2461,12 @@ _git_remote ()
 _git_replace ()
 {
 	case "$cur" in
+	--format=*)
+		__gitcomp "short medium long" "" "${cur##--format=}"
+		return
+		;;
 	--*)
-		__gitcomp "--edit --graft --format= --list --delete"
+		__gitcomp_builtin replace
 		return
 		;;
 	esac
@@ -2745,26 +2490,42 @@ _git_reset ()
 
 	case "$cur" in
 	--*)
-		__gitcomp "--merge --mixed --hard --soft --patch --keep"
+		__gitcomp_builtin reset
 		return
 		;;
 	esac
 	__git_complete_refs
 }
 
+_git_restore ()
+{
+	case "$cur" in
+	--conflict=*)
+		__gitcomp "diff3 merge" "" "${cur##--conflict=}"
+		;;
+	--source=*)
+		__git_complete_refs --cur="${cur##--source=}"
+		;;
+	--*)
+		__gitcomp_builtin restore
+		;;
+	esac
+}
+
+__git_revert_inprogress_options="--continue --quit --abort"
+
 _git_revert ()
 {
 	__git_find_repo_path
 	if [ -f "$__git_repo_path"/REVERT_HEAD ]; then
-		__gitcomp "--continue --quit --abort"
+		__gitcomp "$__git_revert_inprogress_options"
 		return
 	fi
+	__git_complete_strategy && return
 	case "$cur" in
 	--*)
-		__gitcomp "
-			--edit --mainline --no-edit --no-commit --signoff
-			--strategy= --strategy-option=
-			"
+		__gitcomp_builtin revert "" \
+			"$__git_revert_inprogress_options"
 		return
 		;;
 	esac
@@ -2775,7 +2536,7 @@ _git_rm ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "--cached --dry-run --ignore-unmatch --quiet"
+		__gitcomp_builtin rm
 		return
 		;;
 	esac
@@ -2833,12 +2594,7 @@ _git_show_branch ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "
-			--all --remotes --topo-order --date-order --current --more=
-			--list --independent --merge-base --no-name
-			--color --no-color
-			--sha1-name --sparse --topics --reflog
-			"
+		__gitcomp_builtin show-branch
 		return
 		;;
 	esac
@@ -2848,13 +2604,21 @@ _git_show_branch ()
 _git_stash ()
 {
 	local save_opts='--all --keep-index --no-keep-index --quiet --patch --include-untracked'
-	local subcommands='push save list show apply clear drop pop create branch'
-	local subcommand="$(__git_find_on_cmdline "$subcommands")"
+	local subcommands='push list show apply clear drop pop create branch'
+	local subcommand="$(__git_find_on_cmdline "$subcommands save")"
+	if [ -n "$(__git_find_on_cmdline "-p")" ]; then
+		subcommand="push"
+	fi
 	if [ -z "$subcommand" ]; then
 		case "$cur" in
 		--*)
 			__gitcomp "$save_opts"
 			;;
+		sa*)
+			if [ -z "$(__git_find_on_cmdline "$save_opts")" ]; then
+				__gitcomp "save"
+			fi
+			;;
 		*)
 			if [ -z "$(__git_find_on_cmdline "$save_opts")" ]; then
 				__gitcomp "$subcommands"
@@ -2875,6 +2639,9 @@ _git_stash ()
 		drop,--*)
 			__gitcomp "--quiet"
 			;;
+		list,--*)
+			__gitcomp "--name-status --oneline --patch-with-stat"
+			;;
 		show,--*|branch,--*)
 			;;
 		branch,*)
@@ -2899,7 +2666,7 @@ _git_submodule ()
 {
 	__git_has_doubledash && return
 
-	local subcommands="add status init deinit update summary foreach sync"
+	local subcommands="add status init deinit update set-branch summary foreach sync absorbgitdirs"
 	local subcommand="$(__git_find_on_cmdline "$subcommands")"
 	if [ -z "$subcommand" ]; then
 		case "$cur" in
@@ -2930,6 +2697,9 @@ _git_submodule ()
 			--force --rebase --merge --reference --depth --recursive --jobs
 		"
 		;;
+	set-branch,--*)
+		__gitcomp "--default --branch"
+		;;
 	summary,--*)
 		__gitcomp "--cached --files --summary-limit"
 		;;
@@ -3045,7 +2815,7 @@ _git_tag ()
 	while [ $c -lt $cword ]; do
 		i="${words[c]}"
 		case "$i" in
-		-d|-v)
+		-d|--delete|-v|--verify)
 			__gitcomp_direct "$(__git_tags "" "$cur" " ")"
 			return
 			;;
@@ -3071,11 +2841,7 @@ _git_tag ()
 
 	case "$cur" in
 	--*)
-		__gitcomp "
-			--list --delete --verify --annotate --message --file
-			--sign --cleanup --local-user --force --column --sort=
-			--contains --no-contains --points-at --merged --no-merged --create-reflog
-			"
+		__gitcomp_builtin tag
 		;;
 	esac
 }
@@ -3087,23 +2853,26 @@ _git_whatchanged ()
 
 _git_worktree ()
 {
-	local subcommands="add list lock prune unlock"
+	local subcommands="add list lock move prune remove unlock"
 	local subcommand="$(__git_find_on_cmdline "$subcommands")"
 	if [ -z "$subcommand" ]; then
 		__gitcomp "$subcommands"
 	else
 		case "$subcommand,$cur" in
 		add,--*)
-			__gitcomp "--detach"
+			__gitcomp_builtin worktree_add
 			;;
 		list,--*)
-			__gitcomp "--porcelain"
+			__gitcomp_builtin worktree_list
 			;;
 		lock,--*)
-			__gitcomp "--reason"
+			__gitcomp_builtin worktree_lock
 			;;
 		prune,--*)
-			__gitcomp "--dry-run --expire --verbose"
+			__gitcomp_builtin worktree_prune
+			;;
+		remove,--*)
+			__gitcomp "--force"
 			;;
 		*)
 			;;
@@ -3111,6 +2880,52 @@ _git_worktree ()
 	fi
 }
 
+__git_complete_common () {
+	local command="$1"
+
+	case "$cur" in
+	--*)
+		__gitcomp_builtin "$command"
+		;;
+	esac
+}
+
+__git_cmds_with_parseopt_helper=
+__git_support_parseopt_helper () {
+	test -n "$__git_cmds_with_parseopt_helper" ||
+		__git_cmds_with_parseopt_helper="$(__git --list-cmds=parseopt)"
+
+	case " $__git_cmds_with_parseopt_helper " in
+	*" $1 "*)
+		return 0
+		;;
+	*)
+		return 1
+		;;
+	esac
+}
+
+__git_complete_command () {
+	local command="$1"
+	local completion_func="_git_${command//-/_}"
+	if ! declare -f $completion_func >/dev/null 2>/dev/null &&
+		declare -f _completion_loader >/dev/null 2>/dev/null
+	then
+		_completion_loader "git-$command"
+	fi
+	if declare -f $completion_func >/dev/null 2>/dev/null
+	then
+		$completion_func
+		return 0
+	elif __git_support_parseopt_helper "$command"
+	then
+		__git_complete_common "$command"
+		return 0
+	else
+		return 1
+	fi
+}
+
 __git_main ()
 {
 	local i c=1 command __git_dir __git_repo_path
@@ -3164,20 +2979,24 @@ __git_main ()
 			--help
 			"
 			;;
-		*)     __git_compute_porcelain_commands
-		       __gitcomp "$__git_porcelain_commands $(__git_aliases)" ;;
+		*)
+			if test -n "$GIT_TESTING_PORCELAIN_COMMAND_LIST"
+			then
+				__gitcomp "$GIT_TESTING_PORCELAIN_COMMAND_LIST"
+			else
+				__gitcomp "$(__git --list-cmds=list-mainporcelain,others,nohelpers,alias,list-complete,config)"
+			fi
+			;;
 		esac
 		return
 	fi
 
-	local completion_func="_git_${command//-/_}"
-	declare -f $completion_func >/dev/null 2>/dev/null && $completion_func && return
+	__git_complete_command "$command" && return
 
 	local expansion=$(__git_aliased_command "$command")
 	if [ -n "$expansion" ]; then
 		words[1]=$expansion
-		completion_func="_git_${expansion//-/_}"
-		declare -f $completion_func >/dev/null 2>/dev/null && $completion_func
+		__git_complete_command "$expansion"
 	fi
 }
 
@@ -3205,7 +3024,10 @@ __gitk_main ()
 	__git_complete_revlist
 }
 
-if [[ -n ${ZSH_VERSION-} ]]; then
+if [[ -n ${ZSH_VERSION-} ]] &&
+   # Don't define these functions when sourced from 'git-completion.zsh',
+   # it has its own implementations.
+   [[ -z ${GIT_SOURCING_ZSH_COMPLETION-} ]]; then
 	echo "WARNING: this script is deprecated, please see git-completion.zsh" 1>&2
 
 	autoload -U +X compinit && compinit
@@ -3254,13 +3076,22 @@ if [[ -n ${ZSH_VERSION-} ]]; then
 		compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0
 	}
 
+	__gitcomp_file_direct ()
+	{
+		emulate -L zsh
+
+		local IFS=$'\n'
+		compset -P '*[=:]'
+		compadd -f -- ${=1} && _ret=0
+	}
+
 	__gitcomp_file ()
 	{
 		emulate -L zsh
 
 		local IFS=$'\n'
 		compset -P '*[=:]'
-		compadd -Q -p "${2-}" -f -- ${=1} && _ret=0
+		compadd -p "${2-}" -f -- ${=1} && _ret=0
 	}
 
 	_git ()
@@ -3315,6 +3146,6 @@ __git_complete gitk __gitk_main
 # when the user has tab-completed the executable name and consequently
 # included the '.exe' suffix.
 #
-if [[ "$OSTYPE" = cygwin* ]]; then
+if [ Cygwin = "$(uname -o 2>/dev/null)" ]; then
 __git_complete git.exe __git_main
 fi
-- 
cgit v1.2.3-70-g09d2


From 4fb50b3333ce8685ce3b6570ef5e075ce2633b6a Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sun, 8 Sep 2019 20:28:59 +0200
Subject: Unquote yes in conditional expressions for style consistency

---
 plugins/gitfast/git-prompt.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'plugins')

diff --git a/plugins/gitfast/git-prompt.sh b/plugins/gitfast/git-prompt.sh
index 3e86e9cca..f7009b063 100644
--- a/plugins/gitfast/git-prompt.sh
+++ b/plugins/gitfast/git-prompt.sh
@@ -219,7 +219,7 @@ __git_ps1_show_upstream ()
 		if [[ -n "$count" && -n "$name" ]]; then
 			__git_ps1_upstream_name=$(git rev-parse \
 				--abbrev-ref "$upstream" 2>/dev/null)
-			if [ "$pcmode" = "yes" ] && [ "$ps1_expanded" = "yes" ]; then
+			if [ "$pcmode" = yes ] && [ "$ps1_expanded" = yes ]; then
 				p="$p \${__git_ps1_upstream_name}"
 			else
 				p="$p ${__git_ps1_upstream_name}"
@@ -508,13 +508,13 @@ __git_ps1 ()
 
 	# NO color option unless in PROMPT_COMMAND mode or it's Zsh
 	if [ -n "${GIT_PS1_SHOWCOLORHINTS-}" ]; then
-		if [ "$pcmode" = "yes" ] || [ -n "${ZSH_VERSION-}" ]; then
+		if [ "$pcmode" = yes ] || [ -n "${ZSH_VERSION-}" ]; then
 			__git_ps1_colorize_gitstring
 		fi
 	fi
 
 	b=${b##refs/heads/}
-	if [ "$pcmode" = "yes" ] && [ "$ps1_expanded" = "yes" ]; then
+	if [ "$pcmode" = yes ] && [ "$ps1_expanded" = yes ]; then
 		__git_ps1_branch_name=$b
 		b="\${__git_ps1_branch_name}"
 	fi
@@ -522,8 +522,8 @@ __git_ps1 ()
 	local f="$w$i$s$u"
 	local gitstring="$c$b${f:+$z$f}$r$p"
 
-	if [ "$pcmode" = "yes" ]; then
-		if [ "${__git_printf_supports_v-}" != "yes" ]; then
+	if [ "$pcmode" = yes ]; then
+		if [ "${__git_printf_supports_v-}" != yes ]; then
 			gitstring=$(printf -- "$printf_format" "$gitstring")
 		else
 			printf -v gitstring -- "$printf_format" "$gitstring"
-- 
cgit v1.2.3-70-g09d2


From ddd359dd668f448856438304bedfe952d1749efd Mon Sep 17 00:00:00 2001
From: Jonas <jonasholtkamp@users.noreply.github.com>
Date: Wed, 11 Sep 2019 15:54:56 +0200
Subject: kube-ps1: add a note where to put the `PROMPT=...` line (#8142)

---
 plugins/kube-ps1/README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/kube-ps1/README.md b/plugins/kube-ps1/README.md
index 19dac42e9..82c0a77e6 100644
--- a/plugins/kube-ps1/README.md
+++ b/plugins/kube-ps1/README.md
@@ -53,10 +53,11 @@ plugins=(
   kube-ps1
 )
 
+# After the "source Oh My Zsh" line
 PROMPT=$PROMPT'$(kube_ps1) '
 ```
 
-Note: the `PROMPT` example above was tested with the theme `robbyrussell`
+Note: The `PROMPT` example above was tested with the theme `robbyrussell`.
 
 ## Enabling / Disabling on the current shell
 
@@ -100,4 +101,4 @@ The default settings can be overridden in ~/.zshrc
 ## Contributors
 
 - Jared Yanovich
-- Pedro Moranga
\ No newline at end of file
+- Pedro Moranga
-- 
cgit v1.2.3-70-g09d2


From 093b56a7d769d15bdcc2c5300bc4ebedc9d0a837 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Fri, 13 Sep 2019 11:20:20 +0200
Subject: git: fix gtl alias argument

Fixes the error `no matches found` because the argument is not quoted.
See https://github.com/robbyrussell/oh-my-zsh/pull/7629#issuecomment-531151821
---
 plugins/git/git.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 2edee0298..d8c4cffd1 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -243,7 +243,7 @@ alias gswc='git switch -c'
 
 alias gts='git tag -s'
 alias gtv='git tag | sort -V'
-alias gtl='gtl(){ git tag --sort=-v:refname -n -l ${1}* }; noglob gtl'
+alias gtl='gtl(){ git tag --sort=-v:refname -n -l "${1}*" }; noglob gtl'
 
 alias gunignore='git update-index --no-assume-unchanged'
 alias gunwip='git log -n 1 | grep -q -c "\-\-wip\-\-" && git reset HEAD~1'
-- 
cgit v1.2.3-70-g09d2


From 576e0992cac8a0cc4f824e20c0d60188578dd158 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Fri, 13 Sep 2019 11:41:13 +0200
Subject: z: update to latest version (e77e938)

Closes #8145

Co-authored-by: GHPS <GHPS@users.noreply.github.com>
---
 plugins/z/z.sh | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'plugins')

diff --git a/plugins/z/z.sh b/plugins/z/z.sh
index 5fe6d5266..5c5771d62 100644
--- a/plugins/z/z.sh
+++ b/plugins/z/z.sh
@@ -89,7 +89,7 @@ _z() {
         if [ $? -ne 0 -a -f "$datafile" ]; then
             env rm -f "$tempfile"
         else
-            [ "$_Z_OWNER" ] && chown $_Z_OWNER:$(id -ng $_Z_OWNER) "$tempfile"
+            [ "$_Z_OWNER" ] && chown $_Z_OWNER:"$(id -ng $_Z_OWNER)" "$tempfile"
             env mv -f "$tempfile" "$datafile" || env rm -f "$tempfile"
         fi
 
@@ -110,20 +110,21 @@ _z() {
 
     else
         # list/go
+        local echo fnd last list opt typ
         while [ "$1" ]; do case "$1" in
-            --) while [ "$1" ]; do shift; local fnd="$fnd${fnd:+ }$1";done;;
-            -*) local opt=${1:1}; while [ "$opt" ]; do case ${opt:0:1} in
-                    c) local fnd="^$PWD $fnd";;
-                    e) local echo=1;;
+            --) while [ "$1" ]; do shift; fnd="$fnd${fnd:+ }$1";done;;
+            -*) opt=${1:1}; while [ "$opt" ]; do case ${opt:0:1} in
+                    c) fnd="^$PWD $fnd";;
+                    e) echo=1;;
                     h) echo "${_Z_CMD:-z} [-cehlrtx] args" >&2; return;;
-                    l) local list=1;;
-                    r) local typ="rank";;
-                    t) local typ="recent";;
+                    l) list=1;;
+                    r) typ="rank";;
+                    t) typ="recent";;
                     x) sed -i -e "\:^${PWD}|.*:d" "$datafile";;
                 esac; opt=${opt:1}; done;;
-             *) local fnd="$fnd${fnd:+ }$1";;
-        esac; local last=$1; [ "$#" -gt 0 ] && shift; done
-        [ "$fnd" -a "$fnd" != "^$PWD " ] || local list=1
+             *) fnd="$fnd${fnd:+ }$1";;
+        esac; last=$1; [ "$#" -gt 0 ] && shift; done
+        [ "$fnd" -a "$fnd" != "^$PWD " ] || list=1
 
         # if we hit enter on a completion just go there
         case "$last" in
@@ -147,7 +148,7 @@ _z() {
             function output(matches, best_match, common) {
                 # list or return the desired directory
                 if( list ) {
-                    cmd = "sort -n >&2"
+                    cmd = "sort -g >&2"
                     for( x in matches ) {
                         if( matches[x] ) {
                             printf "%-10s %s\n", matches[x], x | cmd
-- 
cgit v1.2.3-70-g09d2


From 095d56b5ea44988c83d0be501e70f37df3d5066b Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Thu, 19 Sep 2019 16:20:02 +0200
Subject: Fix WSL check for WSL 2 and simplify nohup in open_command

WSL 2 changes the output of `uname -r`. For instance,

  WSL 1: 4.4.0-18980-Microsoft
  WSL 2: 4.19.67-microsoft-standard

Since WSL 2 lowercases the M, we can match for the rest of the string
which remains lowercase throughout both versions. Another option would
be to match for both upper- and lower-case Ms, like that:

  $(uname -r) = *[Mm]icrosoft*

Fixed use of nohup in open_command where it was only necessary for
xdg-open (and actually harmful for cmd.exe in WSL 2). The current logic
is simpler and more future-proof.
---
 lib/functions.zsh                  | 9 ++-------
 plugins/sublime/sublime.plugin.zsh | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

(limited to 'plugins')

diff --git a/lib/functions.zsh b/lib/functions.zsh
index 9f8736bd7..61dfa4780 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -21,7 +21,7 @@ function open_command() {
   case "$OSTYPE" in
     darwin*)  open_cmd='open' ;;
     cygwin*)  open_cmd='cygstart' ;;
-    linux*)   ! [[ $(uname -a) =~ "Microsoft" ]] && open_cmd='xdg-open' || {
+    linux*)   [[ "$(uname -r)" != *icrosoft* ]] && open_cmd='nohup xdg-open' || {
                 open_cmd='cmd.exe /c start ""'
                 [[ -e "$1" ]] && { 1="$(wslpath -w "${1:a}")" || return 1 }
               } ;;
@@ -31,12 +31,7 @@ function open_command() {
               ;;
   esac
 
-  # don't use nohup on OSX
-  if [[ "$OSTYPE" == darwin* ]]; then
-    ${=open_cmd} "$@" &>/dev/null
-  else
-    nohup ${=open_cmd} "$@" &>/dev/null
-  fi
+  ${=open_cmd} "$@" &>/dev/null
 }
 
 #
diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index 3a82d6c7f..69604ab4f 100644
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -15,7 +15,7 @@ alias stn=create_project
   declare -a _sublime_paths
 
   if [[ "$OSTYPE" == linux* ]]; then
-    if [[ "$(uname -r)" = *Microsoft* ]]; then
+    if [[ "$(uname -r)" = *icrosoft* ]]; then
       _sublime_paths=(
         "$(wslpath -u 'C:\Program Files\Sublime Text 3\subl.exe')"
         "$(wslpath -u 'C:\Program Files\Sublime Text 2\subl.exe')"
-- 
cgit v1.2.3-70-g09d2


From 6cfaa076272e08b6a81b6358b78d020e48f8a4a6 Mon Sep 17 00:00:00 2001
From: Ian Chesal <ian.chesal@gmail.com>
Date: Fri, 20 Sep 2019 04:58:35 -0700
Subject: Add gcloud plugin (#8144)

* A gcloud plugin

This PR addresses issue #6205

This adds support for loading completion for the Google Cloud SDK
command line tools. It searches the known paths for an SDK and loads the
provided completion if it is found. Users can supply a custom location
for the SDK by setting `CLOUDSDK_HOME` in their `zshrc` before loading
oh-my-zsh plugins.

* Canoncial zsh and some safe guards

Based on a PR review from mcornella. All off this has now been tested
on the following variants:

  - macOS 10.14.6 - Homebrew
  - macOS 10.14.6 - Custom install
  - Ubuntu 16.04.6 LTS - apt install
  - Ubuntu 18.04.3 LTS - apt install
  - Ubuntu 18.04.3 LTS - snap classic install
  - CentOS 7 - yum install
---
 plugins/gcloud/README.md         | 24 ++++++++++++++++++++++++
 plugins/gcloud/gcloud.plugin.zsh | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 plugins/gcloud/README.md
 create mode 100644 plugins/gcloud/gcloud.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/gcloud/README.md b/plugins/gcloud/README.md
new file mode 100644
index 000000000..e7ce0e0f1
--- /dev/null
+++ b/plugins/gcloud/README.md
@@ -0,0 +1,24 @@
+# gcloud
+
+This plugin provides completion support for the
+[Google Cloud SDK CLI](https://cloud.google.com/sdk/gcloud/).
+
+To use it, add `gcloud` to the plugins array in your zshrc file.
+
+```zsh
+plugins=(... gcloud)
+```
+
+It relies on you having installed the SDK using one of the supported options
+listed [here](https://cloud.google.com/sdk/install).
+
+## Plugin Options
+
+* Set `CLOUDSDK_HOME` in your `zshrc` file before you load oh-my-zsh if you have
+your GCloud SDK installed in a non-standard location. The plugin will use this
+as the base for your SDK if it finds it set already.
+
+* If you do not have a `python2` in your `PATH` you'll also need to set the
+`CLOUDSDK_PYTHON` environment variable at the end of your `.zshrc`. This is
+used by the SDK to call a compatible interpreter when you run one of the
+SDK commands.
diff --git a/plugins/gcloud/gcloud.plugin.zsh b/plugins/gcloud/gcloud.plugin.zsh
new file mode 100644
index 000000000..6433a7252
--- /dev/null
+++ b/plugins/gcloud/gcloud.plugin.zsh
@@ -0,0 +1,32 @@
+#####################################################
+# gcloud plugin for oh-my-zsh                       #
+# Author: Ian Chesal (github.com/ianchesal)         #
+#####################################################
+
+if [[ -z "${CLOUDSDK_HOME}" ]]; then
+  search_locations=(
+    "$HOME/google-cloud-sdk"
+    "/usr/local/Caskroom/google-cloud-sdk/latest/google-cloud-sdk"
+    "/usr/share/google-cloud-sdk"
+    "/snap/google-cloud-sdk/current"
+    "/usr/lib64/google-cloud-sdk/"
+  )
+
+  for gcloud_sdk_location in $search_locations; do
+    if [[ -d "${gcloud_sdk_location}" ]]; then
+      CLOUDSDK_HOME="${gcloud_sdk_location}"
+      break
+    fi
+  done
+fi
+
+if (( ${+CLOUDSDK_HOME} )); then
+  if (( ! $+commands[gcloud] )); then
+    # Only source this if GCloud isn't already on the path
+    if [[ -f "${CLOUDSDK_HOME}/path.zsh.inc" ]]; then
+      source "${CLOUDSDK_HOME}/path.zsh.inc"
+    fi
+  fi
+  source "${CLOUDSDK_HOME}/completion.zsh.inc"
+  export CLOUDSDK_HOME
+fi
-- 
cgit v1.2.3-70-g09d2


From be9160ef90bd55bc4f19f94df548b728c64d87bf Mon Sep 17 00:00:00 2001
From: Franco Catena <francocatena@gmail.com>
Date: Sat, 21 Sep 2019 18:11:25 -0300
Subject: gcloud: add search path for Arch Linux (#8164)

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

(limited to 'plugins')

diff --git a/plugins/gcloud/gcloud.plugin.zsh b/plugins/gcloud/gcloud.plugin.zsh
index 6433a7252..c7aebe697 100644
--- a/plugins/gcloud/gcloud.plugin.zsh
+++ b/plugins/gcloud/gcloud.plugin.zsh
@@ -10,6 +10,7 @@ if [[ -z "${CLOUDSDK_HOME}" ]]; then
     "/usr/share/google-cloud-sdk"
     "/snap/google-cloud-sdk/current"
     "/usr/lib64/google-cloud-sdk/"
+    "/opt/google-cloud-sdk"
   )
 
   for gcloud_sdk_location in $search_locations; do
-- 
cgit v1.2.3-70-g09d2


From f9e7c45a484723f693a77ab6128a1cc163f3704a Mon Sep 17 00:00:00 2001
From: Andrei Lesnitsky <andrei.lesnitsky@gmail.com>
Date: Tue, 24 Sep 2019 15:46:38 +0300
Subject: Add flutter plugin (#8150)

---
 plugins/flutter/README.md          | 21 +++++++++++++++++++++
 plugins/flutter/_flutter           | 37 +++++++++++++++++++++++++++++++++++++
 plugins/flutter/flutter.plugin.zsh |  7 +++++++
 3 files changed, 65 insertions(+)
 create mode 100644 plugins/flutter/README.md
 create mode 100644 plugins/flutter/_flutter
 create mode 100644 plugins/flutter/flutter.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/flutter/README.md b/plugins/flutter/README.md
new file mode 100644
index 000000000..be419144f
--- /dev/null
+++ b/plugins/flutter/README.md
@@ -0,0 +1,21 @@
+## Flutter plugin
+
+The Flutter plugin provides completion and useful aliases
+
+To use it, add flutter to the plugins array of your zshrc file:
+
+```
+plugins=(... flutter)
+```
+
+## Aliases
+
+| Alias      | Command                | Description                                                                |
+| :--------- | :--------------------- | :------------------------------------------------------------------------- |
+| `fl`       | `flutter`              | Shorthand for flutter command                                              |
+| `flr`      | `flutter run`          | Runs flutter app                                                           |
+| `fldoc`    | `flutter doctor`       | Runs flutter doctor                                                        |
+| `flb`      | `flutter build`        | Build flutter application                                                  |
+| `flattach` | `flutter attach`       | Attaches flutter to a running flutter application with enabled observatory |
+| `flget`    | `flutter packages get` | Installs dependencies                                                      |
+| `flc`      | `flutter clean`        | Cleans flutter porject                                                     |
diff --git a/plugins/flutter/_flutter b/plugins/flutter/_flutter
new file mode 100644
index 000000000..ab6ce4265
--- /dev/null
+++ b/plugins/flutter/_flutter
@@ -0,0 +1,37 @@
+#compdef flutter
+#autoload
+
+local -a _1st_arguments
+_1st_arguments=(
+  "analyze":"Analyze the project's Dart code."
+  "assemble":"Assemble and build flutter resources."
+  "attach":"Attach to a running application."
+  "build":"Flutter build commands."
+  "channel":"List or switch flutter channels."
+  "clean":"Delete the build/ and .dart_tool/ directories."
+  "config":"Configure Flutter settings."
+  "create":"Create a new Flutter project."
+  "devices":"List all connected devices."
+  "doctor":"Show information about the installed tooling."
+  "drive":"Runs Flutter Driver tests for the current project."
+  "emulators":"List, launch and create emulators."
+  "format":" Format one or more dart files."
+  "help":"Display help information for flutter."
+  "install":"Install a Flutter app on an attached device."
+  "logs":"Show log output for running Flutter apps."
+  "make-host-app-editable":"Moves host apps from generated directories to non-generated directories so that they can be edited by developers."
+  "precache":"Populates the Flutter tool's cache of binary artifacts."
+  "pub":"Commands for managing Flutter packages."
+  "run":"Run your Flutter app on an attached device."
+  "screenshot":"Take a screenshot from a connected device."
+  "test":"Run Flutter unit tests for the current project."
+  "upgrade":"Upgrade your copy of Flutter."
+  "version":"List or switch flutter versions."
+)
+
+_arguments -C '*:: :->subcmds'
+
+if (( CURRENT == 1 )); then
+  _describe -t commands "flutter command" _1st_arguments
+  return
+fi
diff --git a/plugins/flutter/flutter.plugin.zsh b/plugins/flutter/flutter.plugin.zsh
new file mode 100644
index 000000000..01c4c9f5f
--- /dev/null
+++ b/plugins/flutter/flutter.plugin.zsh
@@ -0,0 +1,7 @@
+alias fl="flutter"
+alias flr="flutter run"
+alias fldoc="flutter doctor"
+alias flb="flutter build"
+alias flattach="flutter attach"
+alias flget="flutter packages get"
+alias flc="flutter clean"
-- 
cgit v1.2.3-70-g09d2


From ccee223aed6c280f207d02dd7e23f3a0d3cfcda1 Mon Sep 17 00:00:00 2001
From: KevinHu2014 <kevinhu@weco.net>
Date: Wed, 25 Sep 2019 00:58:35 +0800
Subject: react-native: add aliases for newer iPhones

Added aliases for iPhone 11, 11 Pro, 11 Pro Max
---
 plugins/react-native/react-native.plugin.zsh | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'plugins')

diff --git a/plugins/react-native/react-native.plugin.zsh b/plugins/react-native/react-native.plugin.zsh
index f7695d15f..b33dedfed 100644
--- a/plugins/react-native/react-native.plugin.zsh
+++ b/plugins/react-native/react-native.plugin.zsh
@@ -24,6 +24,10 @@ alias rniosx='react-native run-ios --simulator "iPhone X"'
 alias rniosxs='react-native run-ios --simulator "iPhone Xs"'
 alias rniosxsm='react-native run-ios --simulator "iPhone Xs Max"'
 alias rniosxr='react-native run-ios --simulator "iPhone Xʀ"'
+alias rnios11='react-native run-ios --simulator "iPhone 11"'
+alias rnios11p='react-native run-ios --simulator "iPhone 11 Pro"'
+alias rnios11pm='react-native run-ios --simulator "iPhone 11 Pro Max"'
+
 
 # iPad
 alias rnipad2='react-native run-ios --simulator "iPad 2"'
-- 
cgit v1.2.3-70-g09d2


From 2004550a5890850505b29bda801dafdf3a94d0d7 Mon Sep 17 00:00:00 2001
From: Kevin <kevinhu@weco.net>
Date: Wed, 25 Sep 2019 01:03:08 +0800
Subject: react-native: add aliases for newer iPhones to Doc

Added aliases for iPhone 11, 11 Pro, 11 Pro Max to the Document.
---
 plugins/react-native/README.md | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'plugins')

diff --git a/plugins/react-native/README.md b/plugins/react-native/README.md
index dc0207184..a472ddb1c 100644
--- a/plugins/react-native/README.md
+++ b/plugins/react-native/README.md
@@ -39,6 +39,9 @@ plugins=(... react-native)
 | **rniosxs**    | `react-native run-ios --simulator "iPhone Xs"`                               |
 | **rniosxsm**   | `react-native run-ios --simulator "iPhone Xs Max"`                           |
 | **rniosxr**    | `react-native run-ios --simulator "iPhone Xʀ"`                               |
+| **rnios11**    | `react-native run-ios --simulator "iPhone 11"`                               |
+| **rnios11p**    | `react-native run-ios --simulator "iPhone 11 Pro"`                          |
+| **rnios11pm**    | `react-native run-ios --simulator "iPhone 11 Pro Max"`                     |
 | _iPad_         |                                                                              |
 | **rnipad2**    | `react-native run-ios --simulator "iPad 2"`                                  |
 | **rnipad5**    | `react-native run-ios --simulator "iPad (5th generation)"`                   |
-- 
cgit v1.2.3-70-g09d2


From 487f0af412e9ef968175d290a606bd6c0717fc9b Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Mon, 30 Sep 2019 19:49:09 +0200
Subject: Fix table alignment

---
 plugins/react-native/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/react-native/README.md b/plugins/react-native/README.md
index a472ddb1c..d0a53b8d7 100644
--- a/plugins/react-native/README.md
+++ b/plugins/react-native/README.md
@@ -40,8 +40,8 @@ plugins=(... react-native)
 | **rniosxsm**   | `react-native run-ios --simulator "iPhone Xs Max"`                           |
 | **rniosxr**    | `react-native run-ios --simulator "iPhone Xʀ"`                               |
 | **rnios11**    | `react-native run-ios --simulator "iPhone 11"`                               |
-| **rnios11p**    | `react-native run-ios --simulator "iPhone 11 Pro"`                          |
-| **rnios11pm**    | `react-native run-ios --simulator "iPhone 11 Pro Max"`                     |
+| **rnios11p**   | `react-native run-ios --simulator "iPhone 11 Pro"`                           |
+| **rnios11pm**  | `react-native run-ios --simulator "iPhone 11 Pro Max"`                       |
 | _iPad_         |                                                                              |
 | **rnipad2**    | `react-native run-ios --simulator "iPad 2"`                                  |
 | **rnipad5**    | `react-native run-ios --simulator "iPad (5th generation)"`                   |
-- 
cgit v1.2.3-70-g09d2


From f763244e3b7f66bf2259c6e1bd16af08dd4b465e Mon Sep 17 00:00:00 2001
From: Rhuan Oliveira <43691332+lif3code@users.noreply.github.com>
Date: Tue, 1 Oct 2019 07:56:41 -0300
Subject: autoenv: add README (#8184)

---
 plugins/autoenv/README.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 plugins/autoenv/README.md

(limited to 'plugins')

diff --git a/plugins/autoenv/README.md b/plugins/autoenv/README.md
new file mode 100644
index 000000000..de3881774
--- /dev/null
+++ b/plugins/autoenv/README.md
@@ -0,0 +1,14 @@
+# Autoenv plugin
+
+This plugin loads the [Autoenv](https://github.com/inishchith/autoenv).
+
+To use it, add `autoenv` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... autoenv)
+```
+## Requirements
+
+In order to make this work, you will need to have the autoenv installed.
+
+More info on the usage and install: https://github.com/inishchith/autoenv
-- 
cgit v1.2.3-70-g09d2


From 8bfeb3759c34a8e2e6a5795c3f40630a220e709b Mon Sep 17 00:00:00 2001
From: David Woodward <hello@davidwoodward.me>
Date: Tue, 1 Oct 2019 19:02:28 +0800
Subject: oc: add README (#8188)

---
 plugins/oc/README.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 plugins/oc/README.md

(limited to 'plugins')

diff --git a/plugins/oc/README.md b/plugins/oc/README.md
new file mode 100644
index 000000000..deae9b2d0
--- /dev/null
+++ b/plugins/oc/README.md
@@ -0,0 +1,13 @@
+# OC - OpenShift CLI
+
+This plugin provides autocompletion for [OC](https://docs.openshift.com/container-platform/3.7/cli_reference/index.html) commands, building, managing and updating operations.
+
+To use it, add `oc` to the plugins array of your zshrc file:
+
+```bash
+plugins=(... oc)
+```
+
+## Contributors
+
++ [kevinkirkup](https://github.com/kevinkirkup) - Plugin Author
-- 
cgit v1.2.3-70-g09d2


From 51f0eaad61d5870d990386ad8479bcd6a86108b6 Mon Sep 17 00:00:00 2001
From: Sukin Kumar K <kullsno2@gmail.com>
Date: Tue, 1 Oct 2019 16:43:18 +0530
Subject: Add README for thor and pip plugins (#8185)

---
 plugins/pip/README.md  | 19 +++++++++++++++++++
 plugins/thor/README.md | 10 ++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 plugins/pip/README.md
 create mode 100644 plugins/thor/README.md

(limited to 'plugins')

diff --git a/plugins/pip/README.md b/plugins/pip/README.md
new file mode 100644
index 000000000..f07b5c058
--- /dev/null
+++ b/plugins/pip/README.md
@@ -0,0 +1,19 @@
+# pip plugin
+
+This plugin adds completion for [pip](https://pip.pypa.io/en/latest/),
+the Python package manager.
+
+To use it, add `pip` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... pip)
+```
+
+## pip cache
+
+The pip plugin caches the names of available pip packages from the PyPI index.
+To trigger the caching process, try to complete `pip install`,
+or you can run `zsh-pip-cache-packages` directly.
+
+To reset the cache, run `zsh-pip-clear-cache` and it will be rebuilt next
+the next time you autocomplete `pip install`.
diff --git a/plugins/thor/README.md b/plugins/thor/README.md
new file mode 100644
index 000000000..09c705d9a
--- /dev/null
+++ b/plugins/thor/README.md
@@ -0,0 +1,10 @@
+# Thor plugin
+
+This plugin adds completion for [Thor](http://whatisthor.com/), 
+a ruby toolkit for building powerful command-line interfaces.
+
+To use it, add `thor` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... thor)
+```
-- 
cgit v1.2.3-70-g09d2


From ec7ef7eed15ceca8dabb2dc9269d9fe2a48f9cee Mon Sep 17 00:00:00 2001
From: Zach Whitten <zwhitten+github@gmail.com>
Date: Tue, 1 Oct 2019 14:10:11 -0400
Subject: lein: add README (#8189)

---
 plugins/lein/README.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 plugins/lein/README.md

(limited to 'plugins')

diff --git a/plugins/lein/README.md b/plugins/lein/README.md
new file mode 100644
index 000000000..0c4119663
--- /dev/null
+++ b/plugins/lein/README.md
@@ -0,0 +1,9 @@
+# Leiningen plugin
+
+This plugin adds completions for the [Leiningen](https://leiningen.org/) Clojure build tool.
+
+To use it, add `lein` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... lein)
+```
-- 
cgit v1.2.3-70-g09d2


From b8cfa0c77a68cb64c113b1f4a05b0d67d1bd7448 Mon Sep 17 00:00:00 2001
From: Caleb Williams <br0p0p@users.noreply.github.com>
Date: Tue, 1 Oct 2019 14:11:59 -0500
Subject: Update README: include Yarn workspace shortcuts

---
 plugins/yarn/README.md | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'plugins')

diff --git a/plugins/yarn/README.md b/plugins/yarn/README.md
index 671a272d9..e426053de 100644
--- a/plugins/yarn/README.md
+++ b/plugins/yarn/README.md
@@ -37,3 +37,5 @@ plugins=(... yarn)
 | yuc   | `yarn global upgrade && yarn cache clean` | Upgrade global packages and clean yarn's global cache       |
 | yui   | `yarn upgrade-interactive`                | Prompt for which outdated packages to upgrade               |
 | yup   | `yarn upgrade`                            | Upgrade packages to their latest version                    |
+| yw    | `yarn workspace`                          | Run a command within a single workspace.                    |
+| yws   | `yarn workspaces`                         | Run a command within all defined workspaces.                |
-- 
cgit v1.2.3-70-g09d2


From 77ad69e0805d722e673ae3f3c655788188ec1751 Mon Sep 17 00:00:00 2001
From: Zach Whitten <zwhitten+github@gmail.com>
Date: Tue, 1 Oct 2019 15:21:05 -0400
Subject: jruby: add README (#8190)

---
 plugins/jruby/README.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 plugins/jruby/README.md

(limited to 'plugins')

diff --git a/plugins/jruby/README.md b/plugins/jruby/README.md
new file mode 100644
index 000000000..821a46d5e
--- /dev/null
+++ b/plugins/jruby/README.md
@@ -0,0 +1,21 @@
+# JRuby plugin
+
+This plugin adds aliases for [JRuby](https://www.jruby.org/).
+
+To use it, add `jruby` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... jruby)
+```
+
+## Requirements
+
+This plugin assumes you already have jruby installed and available in your [path](https://www.jruby.org/getting-started).
+
+## Aliases
+
+| Alias        | Command                                                          |
+| ------------ | ---------------------------------------------------------------- |
+| `jrspec`     | `jruby --debug -S rspec --debug`                                 |
+| `jprofile`   | `jruby --profile.api -S rspec`                                   |
+| `jexec`      | `jruby -S`                                                       |
-- 
cgit v1.2.3-70-g09d2


From f32b30277d2cc0e47d9426ab8610d9a8a32979d3 Mon Sep 17 00:00:00 2001
From: 14nrv <34603467+14nrv@users.noreply.github.com>
Date: Tue, 1 Oct 2019 22:24:00 +0200
Subject: yarn: add yd as yarn dev alias (#7663)

---
 plugins/yarn/README.md       | 1 +
 plugins/yarn/yarn.plugin.zsh | 1 +
 2 files changed, 2 insertions(+)

(limited to 'plugins')

diff --git a/plugins/yarn/README.md b/plugins/yarn/README.md
index 671a272d9..5a3da0723 100644
--- a/plugins/yarn/README.md
+++ b/plugins/yarn/README.md
@@ -19,6 +19,7 @@ plugins=(... yarn)
 | yap   | `yarn add --peer`                         | Install a package in peerDependencies (`package.json`)      |
 | yb    | `yarn build`                              | Run the build script defined in `package.json`              |
 | ycc   | `yarn cache clean`                        | Clean yarn's global cache of packages                       |
+| yd    | `yarn dev`                                | Run the dev script defined in `package.json`                |
 | yga   | `yarn global add`                         | Install packages globally on your operating system          |
 | ygls  | `yarn global list`                        | Lists global installed packages                             |
 | ygrm  | `yarn global remove`                      | Remove global installed packages from your OS               |
diff --git a/plugins/yarn/yarn.plugin.zsh b/plugins/yarn/yarn.plugin.zsh
index 9ed8322cd..d00e1c897 100644
--- a/plugins/yarn/yarn.plugin.zsh
+++ b/plugins/yarn/yarn.plugin.zsh
@@ -4,6 +4,7 @@ alias yad="yarn add --dev"
 alias yap="yarn add --peer"
 alias yb="yarn build"
 alias ycc="yarn cache clean"
+alias yd="yarn dev"
 alias yga="yarn global add"
 alias ygls="yarn global list"
 alias ygrm="yarn global remove"
-- 
cgit v1.2.3-70-g09d2


From e38099de96e8b62976354b468da1b21ec2d57f68 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Wed, 2 Oct 2019 13:10:17 +0200
Subject: sublime: ignore wslpath errors if C drive is missing

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

(limited to 'plugins')

diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index 69604ab4f..dd5063360 100644
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -17,8 +17,8 @@ alias stn=create_project
   if [[ "$OSTYPE" == linux* ]]; then
     if [[ "$(uname -r)" = *icrosoft* ]]; then
       _sublime_paths=(
-        "$(wslpath -u 'C:\Program Files\Sublime Text 3\subl.exe')"
-        "$(wslpath -u 'C:\Program Files\Sublime Text 2\subl.exe')"
+        "$(wslpath -u 'C:\Program Files\Sublime Text 3\subl.exe' 2>/dev/null)"
+        "$(wslpath -u 'C:\Program Files\Sublime Text 2\subl.exe' 2>/dev/null)"
       )
     else
       _sublime_paths=(
-- 
cgit v1.2.3-70-g09d2


From fc9093b745096a970c8b87b2275a69ad13d665db Mon Sep 17 00:00:00 2001
From: David Shaffer <dave.shaffer@gmail.com>
Date: Thu, 26 Sep 2019 10:12:30 -0400
Subject: Add rubocop to bundled_commands

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

(limited to 'plugins')

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index 668e15d2f..c4a4fd40a 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -27,6 +27,7 @@ bundled_commands=(
   rainbows
   rake
   rspec
+  rubocop
   shotgun
   sidekiq
   spec
-- 
cgit v1.2.3-70-g09d2


From 372bb48cee7e1d2d20ebef660a86742a7e57756b Mon Sep 17 00:00:00 2001
From: David Shaffer <dave.shaffer@gmail.com>
Date: Wed, 2 Oct 2019 07:45:19 -0400
Subject: Add rubocop to bundler readme

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

(limited to 'plugins')

diff --git a/plugins/bundler/README.md b/plugins/bundler/README.md
index dc2f17008..a7d40cd0a 100644
--- a/plugins/bundler/README.md
+++ b/plugins/bundler/README.md
@@ -2,7 +2,7 @@
 
 - adds completion for basic bundler commands
 - adds short aliases for common bundler commands
-  - `be` aliased to `bundle exec`.  
+  - `be` aliased to `bundle exec`.
     It also supports aliases (if `rs` is `rails server`, `be rs` will bundle-exec `rails server`).
   - `bl` aliased to `bundle list`
   - `bp` aliased to `bundle package`
@@ -15,7 +15,7 @@
   - calls `bundle exec <gem executable>` otherwise
 
 Common gems wrapped by default (by name of the executable):
-`annotate`, `cap`, `capify`, `cucumber`, `foodcritic`, `guard`, `hanami`, `irb`, `jekyll`, `kitchen`, `knife`, `middleman`, `nanoc`, `pry`, `puma`, `rackup`, `rainbows`, `rake`, `rspec`, `shotgun`, `sidekiq`, `spec`, `spork`, `spring`, `strainer`, `tailor`, `taps`, `thin`, `thor`, `unicorn` and `unicorn_rails`.
+`annotate`, `cap`, `capify`, `cucumber`, `foodcritic`, `guard`, `hanami`, `irb`, `jekyll`, `kitchen`, `knife`, `middleman`, `nanoc`, `pry`, `puma`, `rackup`, `rainbows`, `rake`, `rspec`, `rubocop`, `shotgun`, `sidekiq`, `spec`, `spork`, `spring`, `strainer`, `tailor`, `taps`, `thin`, `thor`, `unicorn` and `unicorn_rails`.
 
 ## Configuration
 
-- 
cgit v1.2.3-70-g09d2


From 4b8f4d529ef1965a9f6a233579ea432374f817dd Mon Sep 17 00:00:00 2001
From: Ekunola Ezekiel <ekunolaeasybuoy@gmail.com>
Date: Wed, 2 Oct 2019 17:58:15 +0100
Subject: yii: add README (#8194)

---
 plugins/yii/README.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 plugins/yii/README.md

(limited to 'plugins')

diff --git a/plugins/yii/README.md b/plugins/yii/README.md
new file mode 100644
index 000000000..f1b72e916
--- /dev/null
+++ b/plugins/yii/README.md
@@ -0,0 +1,14 @@
+# Yii plugin
+
+The plugin adds autocomplete commands and subcommands for [yii](https://www.yiiframework.com/).
+
+To use it, add `yii` to the plugins array of your zshrc file:
+```
+plugins=(... yii)
+```
+
+## Aliases
+
+| Alias  | Command              |
+|--------|----------------------|
+| yiic   | `protected/yiic`     |
-- 
cgit v1.2.3-70-g09d2


From ae0de1135dc96cfabe31d70f65112cbeadbfa3bf Mon Sep 17 00:00:00 2001
From: Rexben <rexben.rb@gmail.com>
Date: Wed, 2 Oct 2019 21:31:28 +0100
Subject: cakephp3: add README (#8196)

---
 plugins/cakephp3/README.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 plugins/cakephp3/README.md

(limited to 'plugins')

diff --git a/plugins/cakephp3/README.md b/plugins/cakephp3/README.md
new file mode 100644
index 000000000..7e8f6640d
--- /dev/null
+++ b/plugins/cakephp3/README.md
@@ -0,0 +1,16 @@
+# cakephp3 plugin
+
+The plugin adds aliases and autocompletion for [cakephp3](https://book.cakephp.org/3.0/en/index.html).
+
+To use it, add `cakephp3` to the plugins array of your zshrc file:
+```
+plugins=(... cakephp3)
+```
+
+## Aliases
+
+| Alias     | Command                       |
+|-----------|-------------------------------|
+| c3        | `bin/cake`                    |
+| c3cache   | `bin/cake orm_cache clear`    |
+| c3migrate | `bin/cake migrations migrate` |
-- 
cgit v1.2.3-70-g09d2


From 188eff0653a078ecf67e0a1c6b72de8d61384986 Mon Sep 17 00:00:00 2001
From: Zach Whitten <zwhitten@gmail.com>
Date: Wed, 2 Oct 2019 20:30:22 -0400
Subject: Adding README for rvm

---
 plugins/rvm/README.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 plugins/rvm/README.md

(limited to 'plugins')

diff --git a/plugins/rvm/README.md b/plugins/rvm/README.md
new file mode 100644
index 000000000..9d6fd8f85
--- /dev/null
+++ b/plugins/rvm/README.md
@@ -0,0 +1,19 @@
+# Ruby Version Manager plugin
+
+This plugin adds some utility functions and completions for [Ruby Version Manager](https://rvm.io/).
+
+To use it, add `rvm` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... rvm)
+```
+
+## Functions
+| Alias          | Command              |
+|----------------|----------------------|
+| `rb18`         | `rvm use ruby-1.8.7` |
+| `rb19`         | `rvm use ruby-1.9.3` |
+| `rb20`         | `rvm use ruby-2.0.0` |
+| `rb21`         | `rvm use ruby-2.1.2` |
+| `rvm-update`   | `rvm get head`       |
+| `gems`         | `gem list`           |
-- 
cgit v1.2.3-70-g09d2


From ff23aa0bf9851c477b956c89882fdd04e143042e Mon Sep 17 00:00:00 2001
From: Nicholas Meriano <nicmeriano@gmail.com>
Date: Thu, 3 Oct 2019 04:51:17 -0700
Subject: n98-magerun: add README (#8200)

---
 plugins/n98-magerun/README.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 plugins/n98-magerun/README.md

(limited to 'plugins')

diff --git a/plugins/n98-magerun/README.md b/plugins/n98-magerun/README.md
new file mode 100644
index 000000000..b0abe4747
--- /dev/null
+++ b/plugins/n98-magerun/README.md
@@ -0,0 +1,21 @@
+# n98-magerun plugin
+
+The swiss army knife for Magento developers, sysadmins and devops. The tool provides a huge set of well tested command line commands which save hours of work time.
+
+The [n98-magerun plugin](https://github.com/netz98/n98-magerun) provides many
+[useful aliases](#aliases) as well as completion for the `n98-magerun` command.
+
+Enable it by adding `n98-magerun` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... n98-magerun)
+```
+
+## Aliases
+
+| Alias     | Command                                            | Description                                                                       |
+| --------- | -------------------------------------------------- | --------------------------------------------------------------------------------- |
+| n98       | `n98-magerun.phar`                                 | The N98-Magerun phar-file (Version 1)                                             |
+| n98-2     | `n98-magerun2.phar`                                | The N98-Magerun phar-file (Version 2)                                             |
+| mage-get  | `wget https://files.magerun.net/n98-magerun.phar`  | Download the latest stable N98-Magerun phar-file from the file-server (Version 1) |
+| mage2-get | `wget https://files.magerun.net/n98-magerun2.phar` | Download the latest stable N98-Magerun phar-file from the file-server (Version 2) |
-- 
cgit v1.2.3-70-g09d2


From c60371a829901cde3322c18c6d35e88ddd9bc1f3 Mon Sep 17 00:00:00 2001
From: Zach Whitten <zwhitten+github@gmail.com>
Date: Thu, 3 Oct 2019 07:52:50 -0400
Subject: rebar: add README (#8198)

---
 plugins/rebar/README.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 plugins/rebar/README.md

(limited to 'plugins')

diff --git a/plugins/rebar/README.md b/plugins/rebar/README.md
new file mode 100644
index 000000000..456ba45c7
--- /dev/null
+++ b/plugins/rebar/README.md
@@ -0,0 +1,9 @@
+# rebar plugin
+
+This plugin adds completions for the [rebar](https://www.rebar3.org/) Erlang build tool.
+
+To use it, add `rebar` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... rebar)
+```
-- 
cgit v1.2.3-70-g09d2


From 3848102a5ec8534cef935d594c6abcbfc0f419c8 Mon Sep 17 00:00:00 2001
From: Shubham Kamath <44347043+shubhaemk@users.noreply.github.com>
Date: Thu, 3 Oct 2019 17:25:08 +0530
Subject: terminitor: add README (#8197)

---
 plugins/terminitor/README.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 plugins/terminitor/README.md

(limited to 'plugins')

diff --git a/plugins/terminitor/README.md b/plugins/terminitor/README.md
new file mode 100644
index 000000000..8c0e02113
--- /dev/null
+++ b/plugins/terminitor/README.md
@@ -0,0 +1,9 @@
+# Terminitor plugin
+
+This plugin adds completions for the [Terminitor](https://github.com/achiurizo/terminitor) development workflow setup tool.
+
+To use it, add `terminitor` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... terminitor)
+```
-- 
cgit v1.2.3-70-g09d2


From 1be840b8319b40c5608d18816031f6b2d6dc6849 Mon Sep 17 00:00:00 2001
From: Erwan ROUSSEL <erwan.roussel51@gmail.com>
Date: Sat, 5 Oct 2019 11:05:46 +0200
Subject: Create README.md

---
 plugins/redis-cli/README.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 plugins/redis-cli/README.md

(limited to 'plugins')

diff --git a/plugins/redis-cli/README.md b/plugins/redis-cli/README.md
new file mode 100644
index 000000000..f6e947f4c
--- /dev/null
+++ b/plugins/redis-cli/README.md
@@ -0,0 +1,14 @@
+# Redis-CLI
+
+This plugin adds [redis-cli](https://redis.io/topics/rediscli) completion, based off homebrew completion
+
+To use it, add `redis-cli` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... redis-cli)
+```
+## Requirements
+
+In order to make this work, you will need to have the redis installed.
+
+More info on the usage and install: https://redis.io/topics/quickstart
-- 
cgit v1.2.3-70-g09d2


From e1cb349ffe411b6de2fef696885ec687853d152f Mon Sep 17 00:00:00 2001
From: Erwan ROUSSEL <erwan.roussel51@gmail.com>
Date: Sat, 5 Oct 2019 11:14:12 +0200
Subject: Update README.md

---
 plugins/redis-cli/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/redis-cli/README.md b/plugins/redis-cli/README.md
index f6e947f4c..64956df13 100644
--- a/plugins/redis-cli/README.md
+++ b/plugins/redis-cli/README.md
@@ -9,6 +9,6 @@ plugins=(... redis-cli)
 ```
 ## Requirements
 
-In order to make this work, you will need to have the redis installed.
+In order to make this work, you will need to have redis installed.
 
 More info on the usage and install: https://redis.io/topics/quickstart
-- 
cgit v1.2.3-70-g09d2


From 53d987346f4d465c100f3dab234953db48eed7a1 Mon Sep 17 00:00:00 2001
From: Erwan ROUSSEL <erwan.roussel51@gmail.com>
Date: Sat, 5 Oct 2019 11:30:21 +0200
Subject: Create README.md

---
 plugins/perl/README.md | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 plugins/perl/README.md

(limited to 'plugins')

diff --git a/plugins/perl/README.md b/plugins/perl/README.md
new file mode 100644
index 000000000..f2f4b79ec
--- /dev/null
+++ b/plugins/perl/README.md
@@ -0,0 +1,36 @@
+# Perl
+
+This plugin adds [perl](https://www.perl.org/) useful aliases/functions.
+
+To use it, add `perl` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... perl)
+```
+
+## Aliases
+
+| Aliases       | Command         | Description                          |
+| :------------ | :-------------- | :----------------------------------- |
+| pbi           | perlbrew install|Install specific perl version         |
+| pbl           | perlbrew list   |List all perl version installed       |
+| pbo           | perlbrew off    |Go back to the system perl            |
+| pbs           | perlbrew switch |Turn it back on                       |
+| pbu           | perlbrew use    |Use specific version of perl          |
+| pd            | perldoc         |Show the perl documentation          |
+| ple           | perl -wlne      |Use perl like awk/sed                 |
+| latest-perl   | curl `...`      |Show the latest stable release of Perl|
+
+## Functions
+
+`newpl` - creates a basic Perl script file and opens it with $EDITOR
+
+`pgs` - Perl Global Substitution (find pattern = 1st arg ; replace pattern	= 2nd arg ; filename = 3rd arg)
+
+`prep` - Perl grep, because 'grep -P' is terrible. Lets you work with pipes or files. (pattern = 1st arg ; filename = 2nd arg)
+
+## Requirements
+
+In order to make this work, you will need to have perl installed.
+
+More info on the usage and install: https://www.perl.org/get.html
-- 
cgit v1.2.3-70-g09d2


From dd0ade161c0fc47ea4a9e43ce3787170db2f8f60 Mon Sep 17 00:00:00 2001
From: Alex Morozoff <a.j.morozoff@gmail.com>
Date: Sun, 6 Oct 2019 15:24:25 -0400
Subject: Create README.md

Added README for UFW plugin issue: [Good first PR] Add READMEs to undocumented plugins #7175
---
 plugins/ufw/README.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 plugins/ufw/README.md

(limited to 'plugins')

diff --git a/plugins/ufw/README.md b/plugins/ufw/README.md
new file mode 100644
index 000000000..a27487a46
--- /dev/null
+++ b/plugins/ufw/README.md
@@ -0,0 +1,17 @@
+# UFW
+This plugin adds support for managing everybody's favorite Uncomplicated Firewall (UFW). Learn more about [`UFW`](https://wiki.ubuntu.com/UncomplicatedFirewall).
+
+To use it, add ufw to the plugins array of your zshrc file:
+```
+plugins=(... ufw)
+```
+UFW is a simple Ubuntu interface for managing iptables. 
+
+Some of the commands include:
+
+* `allow <port>/<optional: protocol>` add an allow rule 
+* `default` set default policy
+* `delete <port>/<optional: protocol>` delete RULE
+* `deny <port>/<optional: protocol>` add deny rule
+* `disable` disables the firewall
+* `enable` enables the firewall
-- 
cgit v1.2.3-70-g09d2


From 4b65f439e2c92b7c839dd355f8701d72f3a8ea2b Mon Sep 17 00:00:00 2001
From: Michael C <rm.cuffaro@gmail.com>
Date: Sun, 6 Oct 2019 15:33:06 +0200
Subject: docs: add README.md for Dash plugin

---
 plugins/dash/README.md | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 plugins/dash/README.md

(limited to 'plugins')

diff --git a/plugins/dash/README.md b/plugins/dash/README.md
new file mode 100644
index 000000000..f69f834f3
--- /dev/null
+++ b/plugins/dash/README.md
@@ -0,0 +1,29 @@
+# Dash plugin
+
+This plugin adds command line functionality for [Dash](https://kapeli.com/dash),
+an API Documentation Browser.
+
+This plugin requires Dash to be installed to work.
+
+To use it, add `dash` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... dash)
+```
+
+Make sure to source your rc file:
+```
+source ~/.zshrc
+```
+
+## Usage
+
+Open and switch to the dash application.
+```
+dash
+```
+
+Query for something in dash app.
+```
+dash golang
+```
-- 
cgit v1.2.3-70-g09d2


From 357336bfb399ac95db21ceed40dc7b18eea6779c Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Mon, 7 Oct 2019 17:04:31 +0200
Subject: Remove redundant section and document keyword args

---
 plugins/dash/README.md | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'plugins')

diff --git a/plugins/dash/README.md b/plugins/dash/README.md
index f69f834f3..0ca3e4e44 100644
--- a/plugins/dash/README.md
+++ b/plugins/dash/README.md
@@ -1,9 +1,8 @@
 # Dash plugin
 
 This plugin adds command line functionality for [Dash](https://kapeli.com/dash),
-an API Documentation Browser.
-
-This plugin requires Dash to be installed to work.
+an API Documentation Browser for macOS. This plugin requires Dash to be installed
+to work.
 
 To use it, add `dash` to the plugins array in your zshrc file:
 
@@ -11,19 +10,19 @@ To use it, add `dash` to the plugins array in your zshrc file:
 plugins=(... dash)
 ```
 
-Make sure to source your rc file:
-```
-source ~/.zshrc
-```
-
 ## Usage
 
-Open and switch to the dash application.
+- Open and switch to the dash application.
 ```
 dash
 ```
 
-Query for something in dash app.
+- Query for something in dash app: `dash query`
+```
+dash golang 
+```
+
+- You can optionally provide a keyword: `dash [keyword:]query`
 ```
-dash golang
+dash python:tuple
 ```
-- 
cgit v1.2.3-70-g09d2


From b45e0f4836d7b2a3b5fe2266d669d878ccd737e7 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Mon, 7 Oct 2019 17:08:38 +0200
Subject: dash: simplify completion logic

---
 plugins/dash/dash.plugin.zsh | 52 ++++++++++++++++++++------------------------
 1 file changed, 23 insertions(+), 29 deletions(-)

(limited to 'plugins')

diff --git a/plugins/dash/dash.plugin.zsh b/plugins/dash/dash.plugin.zsh
index b00d4877e..ace2e33c1 100644
--- a/plugins/dash/dash.plugin.zsh
+++ b/plugins/dash/dash.plugin.zsh
@@ -35,36 +35,30 @@ _dash() {
           if [[ "$locator" == "platform" ]]; then
             # Since these are the only special cases right now, let's not do the
             # expensive processing unless we have to
-            if [[ "$keyword" == "python" ||  "$keyword" == "java" || \
-                  "$keyword" == "qt" || "$keyword" == "cocs2d" ]]; then
+            if [[ "$keyword" = (python|java|qt|cocos2d) ]]; then
               docsetName=`echo $doc | grep -Eo "docsetName = .*?;" | sed -e "s/docsetName = \(.*\);/\1/" -e "s/[\":]//g"`
-              if [[ "$keyword" == "python" ]]; then
-                if [[ "$docsetName" == "Python 2" ]]; then
-                  keyword="python2"
-                elif [[ "$docsetName" == "Python 3" ]]; then
-                  keyword="python3"
-                fi
-              elif [[ "$keyword" == "java" ]]; then
-                if [[ "$docsetName" == "Java SE7" ]]; then
-                  keyword="java7"
-                elif [[ "$docsetName" == "Java SE6" ]]; then
-                  keyword="java6"
-                elif [[ "$docsetName" == "Java SE8" ]]; then
-                  keyword="java8"
-                fi
-              elif [[ "$keyword" == "qt" ]]; then
-                if [[ "$docsetName" == "Qt 5" ]]; then
-                  keyword="qt5"
-                elif [[ "$docsetName" == "Qt 4" ]]; then
-                  keyword="qt4"
-                elif [[ "$docsetName" == "Qt" ]]; then
-                  keyword="qt4"
-                fi
-              elif [[ "$keyword" == "cocos2d" ]]; then
-                if [[ "$docsetName" == "Cocos3D" ]]; then
-                  keyword="cocos3d"
-                fi
-              fi
+              case "$keyword" in
+                python)
+                  case "$docsetName" in
+                    "Python 2") keyword="python2" ;;
+                    "Python 3") keyword="python3" ;;
+                  esac ;;
+                java)
+                  case "$docsetName" in
+                    "Java SE7") keyword="java7" ;;
+                    "Java SE6") keyword="java6" ;;
+                    "Java SE8") keyword="java8" ;;
+                  esac ;;
+                qt)
+                  case "$docsetName" in
+                    "Qt 5") keyword="qt5" ;;
+                    "Qt 4"|Qt) keyword="qt4" ;;
+                  esac ;;
+                cocos2d)
+                  case "$docsetName" in
+                    Cocos3D) keyword="cocos3d" ;;
+                  esac ;;
+              esac
             fi
           fi
 
-- 
cgit v1.2.3-70-g09d2


From 456814d8a61c644e59fdea8914e8dc7d2ba3dbf4 Mon Sep 17 00:00:00 2001
From: Aditya J Karia <adityakaria01@gmail.com>
Date: Mon, 7 Oct 2019 20:53:00 +0530
Subject: mysql-macports: add README (#8210)

---
 plugins/mysql-macports/README.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 plugins/mysql-macports/README.md

(limited to 'plugins')

diff --git a/plugins/mysql-macports/README.md b/plugins/mysql-macports/README.md
new file mode 100644
index 000000000..a4224d9c0
--- /dev/null
+++ b/plugins/mysql-macports/README.md
@@ -0,0 +1,20 @@
+# MySQL-Macports plugin
+
+This plugin adds aliases for some of the commonly used [MySQL](https://www.mysql.com/) commands when installed using [MacPorts](https://www.macports.org/) on macOS.
+
+To use it, add `mysql-macports` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... mysql-macports)
+```
+
+For instructions on how to install MySQL using MacPorts, read the [MacPorts wiki](https://trac.macports.org/wiki/howto/MySQL/).
+
+## Aliases
+
+| Alias        | Command                                                   | Description                                |
+| ------------ | --------------------------------------------------------- | ------------------------------------------ |
+| mysqlstart   | `sudo /opt/local/share/mysql5/mysql/mysql.server start`   | Start the MySQL server.                    |
+| mysqlstop    | `sudo /opt/local/share/mysql5/mysql/mysql.server stop`    | Stop the MySQL server.                     |
+| mysqlrestart | `sudo /opt/local/share/mysql5/mysql/mysql.server restart` | Restart the MySQL server.                  |
+| mysqlstatus  | `mysqladmin5 -u root -p ping`                             | Check whether the MySQL server is running. |
-- 
cgit v1.2.3-70-g09d2


From a9d382a297560647be79070349ac34a66101b9c8 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Mon, 7 Oct 2019 17:25:44 +0200
Subject: Small changes

---
 plugins/redis-cli/README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/redis-cli/README.md b/plugins/redis-cli/README.md
index 64956df13..bb6e94a0f 100644
--- a/plugins/redis-cli/README.md
+++ b/plugins/redis-cli/README.md
@@ -1,12 +1,13 @@
 # Redis-CLI
 
-This plugin adds [redis-cli](https://redis.io/topics/rediscli) completion, based off homebrew completion
+This plugin adds [redis-cli](https://redis.io/topics/rediscli) completion, based off of Homebrew completion.
 
 To use it, add `redis-cli` to the plugins array in your zshrc file:
 
 ```zsh
 plugins=(... redis-cli)
 ```
+
 ## Requirements
 
 In order to make this work, you will need to have redis installed.
-- 
cgit v1.2.3-70-g09d2


From 896dd271c8cadce8b8a618225cb4e79b9bca50f7 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Mon, 7 Oct 2019 17:40:51 +0200
Subject: Some syntax changes and more function docs

---
 plugins/perl/README.md | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

(limited to 'plugins')

diff --git a/plugins/perl/README.md b/plugins/perl/README.md
index f2f4b79ec..dd9b7dc75 100644
--- a/plugins/perl/README.md
+++ b/plugins/perl/README.md
@@ -10,27 +10,28 @@ plugins=(... perl)
 
 ## Aliases
 
-| Aliases       | Command         | Description                          |
-| :------------ | :-------------- | :----------------------------------- |
-| pbi           | perlbrew install|Install specific perl version         |
-| pbl           | perlbrew list   |List all perl version installed       |
-| pbo           | perlbrew off    |Go back to the system perl            |
-| pbs           | perlbrew switch |Turn it back on                       |
-| pbu           | perlbrew use    |Use specific version of perl          |
-| pd            | perldoc         |Show the perl documentation          |
-| ple           | perl -wlne      |Use perl like awk/sed                 |
-| latest-perl   | curl `...`      |Show the latest stable release of Perl|
+| Aliases       | Command            |  Description                           |
+| :------------ | :----------------- | :------------------------------------- |
+| pbi           | `perlbrew install` | Install specific perl version          |
+| pbl           | `perlbrew list`    | List all perl version installed        |
+| pbo           | `perlbrew off`     | Go back to the system perl             |
+| pbs           | `perlbrew switch`  | Turn it back on                        |
+| pbu           | `perlbrew use`     | Use specific version of perl           |
+| pd            | `perldoc`          | Show the perl documentation            |
+| ple           | `perl -wlne`       | Use perl like awk/sed                  |
+| latest-perl   | `curl ...`         | Show the latest stable release of Perl |
 
 ## Functions
 
-`newpl` - creates a basic Perl script file and opens it with $EDITOR
+* `newpl`: creates a basic Perl script file and opens it with $EDITOR.
 
-`pgs` - Perl Global Substitution (find pattern = 1st arg ; replace pattern	= 2nd arg ; filename = 3rd arg)
+* `pgs`: Perl Global Substitution: `pgs <find_pattern> <replace_pattern> <filename>`
+  Looks for `<find_pattern>` and replaces it with `<replace_pattern>` in `<filename>`.
 
-`prep` - Perl grep, because 'grep -P' is terrible. Lets you work with pipes or files. (pattern = 1st arg ; filename = 2nd arg)
+* `prep`: Perl grep, because 'grep -P' is terrible: `prep <pattern> [<filename>]`
+  Lets you work with pipes or files (if no `<filename>` provided, use stdin).
 
 ## Requirements
 
 In order to make this work, you will need to have perl installed.
-
 More info on the usage and install: https://www.perl.org/get.html
-- 
cgit v1.2.3-70-g09d2


From d5e7040ebdfc9d9525b964c35ef1e704da632be2 Mon Sep 17 00:00:00 2001
From: Joe Rattazzi <joerattazzi@gmail.com>
Date: Mon, 7 Oct 2019 10:53:18 -0500
Subject: pyenv: add README (#8224)

---
 plugins/pyenv/README.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 plugins/pyenv/README.md

(limited to 'plugins')

diff --git a/plugins/pyenv/README.md b/plugins/pyenv/README.md
new file mode 100644
index 000000000..d063b55b9
--- /dev/null
+++ b/plugins/pyenv/README.md
@@ -0,0 +1,16 @@
+# pyenv 
+
+This plugin looks for [pyenv](https://github.com/pyenv/pyenv), a Simple Python version
+management system, and loads it if it's found. It also loads pyenv-virtualenv, a pyenv
+plugin to manage virtualenv, if it's found.
+
+To use it, add `pyenv` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... pyenv)
+```
+
+## Functions
+
+- `pyenv_prompt_info`: displays the Python version in use by pyenv; or the global Python
+  version, if pyenv wasn't found.
-- 
cgit v1.2.3-70-g09d2


From 5f066dabc89b66479b36b5837ed11dc3c36a1d55 Mon Sep 17 00:00:00 2001
From: Denis Titusov <sescusu@gmail.com>
Date: Mon, 7 Oct 2019 19:01:08 +0300
Subject: Add README for pow and powify plugins (#8225)

---
 plugins/pow/README.md    | 21 +++++++++++++++++++++
 plugins/powify/README.md | 10 ++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 plugins/pow/README.md
 create mode 100644 plugins/powify/README.md

(limited to 'plugins')

diff --git a/plugins/pow/README.md b/plugins/pow/README.md
new file mode 100644
index 000000000..1f8a9d136
--- /dev/null
+++ b/plugins/pow/README.md
@@ -0,0 +1,21 @@
+# pow plugin
+
+This plugin adds completion and commands for [pow](http://pow.cx/), a
+zero-configuration Rack server for macOS.
+
+To use it, add pow to the plugins array of your zshrc file:
+
+```sh
+plugins=(... pow)
+```
+
+## Commands
+
+- `kapow` will restart an app.
+
+  ```bash
+  kapow myapp
+  ```
+
+- `kaput` will show the standard output from any pow app.
+- `repow` will restart the pow process.
diff --git a/plugins/powify/README.md b/plugins/powify/README.md
new file mode 100644
index 000000000..fd58b860e
--- /dev/null
+++ b/plugins/powify/README.md
@@ -0,0 +1,10 @@
+# powify plugin
+
+This plugin adds autocompletion for [powify](https://github.com/sethvargo/powify),
+an easy-to-use wrapper for Basecamp's [pow](https://github.com/basecamp/pow).
+
+To use it, add powify to the plugins array of your zshrc file:
+
+```sh
+plugins=(... powify)
+```
-- 
cgit v1.2.3-70-g09d2


From 5efe52d991ab1f2596c3aa7766c981412c621fd7 Mon Sep 17 00:00:00 2001
From: Michael C <rm.cuffaro@gmail.com>
Date: Mon, 7 Oct 2019 18:04:49 +0200
Subject: virtualenvwrapper: add README (#8226)

---
 plugins/virtualenvwrapper/README.md | 38 +++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 plugins/virtualenvwrapper/README.md

(limited to 'plugins')

diff --git a/plugins/virtualenvwrapper/README.md b/plugins/virtualenvwrapper/README.md
new file mode 100644
index 000000000..63eb58541
--- /dev/null
+++ b/plugins/virtualenvwrapper/README.md
@@ -0,0 +1,38 @@
+# Virtualenvwrapper plugin
+
+This plugin loads Python's [virtualenvwrapper](https://virtualenvwrapper.readthedocs.io/en/latest/) shell tools.
+
+To use it, add `virtualenvwrapper` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... virtualenvwrapper)
+```
+
+## Usage
+
+The plugin allows to automatically activate virtualenvs on cd into git repositories with a matching name:
+
+```
+➜  github $ cd ansible
+(ansible) ➜  ansible git:(devel) $ cd docs
+(ansible) ➜  docs git:(devel) $ cd ..
+(ansible) ➜  ansible git:(devel) $ cd ..
+➜  github $
+```
+
+We can override this by having a `.venv` file in the directory containing a differently named virtualenv:
+
+```
+➜  github $ cat ansible/.venv
+myvirtualenv
+➜  github $ cd ansible
+(myvirtualenv) ➜  ansible git:(devel) $ cd ..
+➜  github $
+```
+
+We can disable this behaviour by setting `DISABLE_VENV_CD=1` before Oh My Zsh is sourced:
+```zsh
+DISABLE_VENV_CD=1
+plugins=(... virtualenvwrapper)
+source $ZSH/oh-my-zsh.sh
+```
-- 
cgit v1.2.3-70-g09d2


From a3b63aa6ab948c1be278fbea6046cf09f69d3c42 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Mon, 7 Oct 2019 18:08:14 +0200
Subject: Reword

---
 plugins/ufw/README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'plugins')

diff --git a/plugins/ufw/README.md b/plugins/ufw/README.md
index a27487a46..ac377cd17 100644
--- a/plugins/ufw/README.md
+++ b/plugins/ufw/README.md
@@ -1,11 +1,12 @@
-# UFW
-This plugin adds support for managing everybody's favorite Uncomplicated Firewall (UFW). Learn more about [`UFW`](https://wiki.ubuntu.com/UncomplicatedFirewall).
+# UFW plugin
+
+This plugin adds completion for managing everybody's favorite Uncomplicated Firewall (UFW),
+a simple interface for managing iptables. Learn more about [`UFW`](https://wiki.ubuntu.com/UncomplicatedFirewall).
 
 To use it, add ufw to the plugins array of your zshrc file:
 ```
 plugins=(... ufw)
 ```
-UFW is a simple Ubuntu interface for managing iptables. 
 
 Some of the commands include:
 
-- 
cgit v1.2.3-70-g09d2


From fdebc2272e8789e9120ab9b195754e423990b317 Mon Sep 17 00:00:00 2001
From: Griffin J Rademacher <frdrckblrgnsnrf@gmail.com>
Date: Mon, 7 Oct 2019 12:37:42 -0400
Subject: Add READMEs for tugboat and colemak plugins (#8207)

---
 plugins/colemak/README.md | 48 +++++++++++++++++++++++++++++++++++++++++++++++
 plugins/tugboat/README.md | 12 ++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 plugins/colemak/README.md
 create mode 100644 plugins/tugboat/README.md

(limited to 'plugins')

diff --git a/plugins/colemak/README.md b/plugins/colemak/README.md
new file mode 100644
index 000000000..4da4bc126
--- /dev/null
+++ b/plugins/colemak/README.md
@@ -0,0 +1,48 @@
+# Colemak plugin
+
+This plugin remaps keys in `zsh`'s [`vi`-style navigation mode](http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html#Keymaps)
+for a [Colemak](https://colemak.com/) keyboard layout, to match the QWERTY position:
+
+![Colemak layout on a US keyboard](https://colemak.com/wiki/images/6/6c/Colemak2.png)
+
+To use it, add it to the plugins array in your `~/.zshrc` file:
+
+```
+plugins=(... colemak)
+```
+
+You will also need to enable `vi` mode, so add another line to `~/.zshrc`:
+```
+bindkey -v
+```
+
+Restart your shell and hit the `<ESC>` key to activate `vicmd` (navigation) mode,
+and start navigating `zsh` with your new keybindings!
+
+## Key bindings for vicmd
+
+| Old        | New        | Binding                   | Description                                        |
+|------------|------------|---------------------------|----------------------------------------------------|
+| `CTRL`+`j` | `CTRL`+`n` | accept-line               | Insert new line                                    |
+| `j`        | `n`        | down-line-or-history      | Move one line down or command history forwards     |
+| `k`        | `e`        | up-line-or-history        | Move one line up or command history backwards      |
+| `l`        | `i`        | vi-forward-char           | Move one character to the right                    |
+| `n`        | `k`        | vi-repeat-search          | Repeat command search forwards                     |
+| `N`        | `K`        | vi-rev-repeat-search      | Repeat command search backwards                    |
+| `i`        | `u`        | vi-insert                 | Enter insert mode                                  |
+| `I`        | `U`        | vi-insert-bol             | Move to first non-blank char and enter insert mode |
+| `<none>`   | `l`        | vi-undo-change            | Undo change                                        |
+| `J`        | `N`        | vi-join                   | Join the current line with the next one            |
+| `e`        | `j`        | vi-forward-word-end       | Move to the end of the next word                   |
+| `E`        | `J`        | vi-forward-blank-word-end | Move to end of the current or next word            |
+
+## Key bindings for less
+
+| Keyboard shortcut | `less` key binding |
+|-------------------|--------------------|
+| `n`               | forw-line          |
+| `e`               | back-line          |
+| `k`               | repeat-search      |
+| `ESC`+`k`         | repeat-search-all  |
+| `K`               | reverse-search     |
+| `ESC`+`K`         | reverse-search-all |
diff --git a/plugins/tugboat/README.md b/plugins/tugboat/README.md
new file mode 100644
index 000000000..14f828f85
--- /dev/null
+++ b/plugins/tugboat/README.md
@@ -0,0 +1,12 @@
+# Tugboat plugin
+
+This plugin adds autocompletion for Tugboat, a command line tool for interacting with your
+[DigitalOcean droplets](https://www.digitalocean.com/products/droplets/).
+
+To use it, add it to the plugins array in your `~/.zshrc` file:
+
+```zsh
+plugins=(... tugboat)
+```
+
+Further documentation for Tugboat can be found in the [Tugboat repository](https://github.com/petems/tugboat).
-- 
cgit v1.2.3-70-g09d2


From 7e842cddc45b8bdebe1b198e83eb96fd07b37787 Mon Sep 17 00:00:00 2001
From: Austin Ratcliff <hello@austinratcliff.com>
Date: Mon, 7 Oct 2019 11:50:01 -0500
Subject: cloudapp: add README (#8229)

---
 plugins/cloudapp/README.md | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 plugins/cloudapp/README.md

(limited to 'plugins')

diff --git a/plugins/cloudapp/README.md b/plugins/cloudapp/README.md
new file mode 100644
index 000000000..62975a631
--- /dev/null
+++ b/plugins/cloudapp/README.md
@@ -0,0 +1,24 @@
+# CloudApp plugin
+
+[CloudApp](https://www.getcloudapp.com) brings screen recording, screenshots, and GIF creation to the cloud, in an easy-to-use enterprise-level app. The CloudApp plugin allows you to upload a file to your CloadApp account from the command line.
+
+To use it, add `cloudapp` to the plugins array of your `~/.zshrc` file:
+
+```
+plugins=(... dash)
+```
+
+## Requirements
+
+1. [Aaron Russell's `cloudapp_api` gem](https://github.com/aaronrussell/cloudapp_api#installation)
+
+2. That you set your CloudApp credentials in `~/.cloudapp` as a simple text file like below:
+   ```
+   email
+   password
+   ```
+
+## Usage
+
+- `cloudapp <filename>`: uploads `<filename>` to your CloudApp account, and if you're using
+  macOS, copies the URL to your clipboard.
-- 
cgit v1.2.3-70-g09d2


From 82bd8828eb243199fccea87f5489a21a5be9c89c Mon Sep 17 00:00:00 2001
From: Chaitanya Raj <chaitanyarajdixit@gmail.com>
Date: Tue, 8 Oct 2019 14:01:57 +0530
Subject: Create README.md for compleat plugin

---
 plugins/compleat/README.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 plugins/compleat/README.md

(limited to 'plugins')

diff --git a/plugins/compleat/README.md b/plugins/compleat/README.md
new file mode 100644
index 000000000..1d7f0492d
--- /dev/null
+++ b/plugins/compleat/README.md
@@ -0,0 +1,9 @@
+# compleat
+
+This plugin runs [bashcompinit](https://github.com/zsh-users/zsh/blob/master/Completion/bashcompinit) which will allow zsh to read bash completion specifications and functions.
+
+To use it add compleat to the plugins array in your zshrc file.
+ 
+ ```
+plugins=(... compleat)
+```
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From c714d3fcedd2e729350b5f69f4a9312b9fc68a43 Mon Sep 17 00:00:00 2001
From: Qinfeng Chen <qinfchen@users.noreply.github.com>
Date: Tue, 8 Oct 2019 09:48:08 -0400
Subject: gradle: support gdub completion (#6135)

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

(limited to 'plugins')

diff --git a/plugins/gradle/gradle.plugin.zsh b/plugins/gradle/gradle.plugin.zsh
index 8d578e27b..6be583179 100644
--- a/plugins/gradle/gradle.plugin.zsh
+++ b/plugins/gradle/gradle.plugin.zsh
@@ -181,3 +181,4 @@ _gradlew_tasks () {
 ############################################################################
 compdef _gradle_tasks gradle
 compdef _gradlew_tasks gradlew
+compdef _gradlew_tasks gw
-- 
cgit v1.2.3-70-g09d2


From b09aed9cc7e2099f3e7f2aa2632660bc510f3e35 Mon Sep 17 00:00:00 2001
From: 14nrv <34603467+14nrv@users.noreply.github.com>
Date: Tue, 8 Oct 2019 20:38:25 +0200
Subject: yarn: add ytc alias for test with coverage (#7664)

---
 plugins/yarn/README.md       | 1 +
 plugins/yarn/yarn.plugin.zsh | 1 +
 2 files changed, 2 insertions(+)

(limited to 'plugins')

diff --git a/plugins/yarn/README.md b/plugins/yarn/README.md
index 439a9355f..a94f183e4 100644
--- a/plugins/yarn/README.md
+++ b/plugins/yarn/README.md
@@ -35,6 +35,7 @@ plugins=(... yarn)
 | ys    | `yarn serve`                              | Start the dev server                                        |
 | yst   | `yarn start`                              | Run the start script defined in `package.json`              |
 | yt    | `yarn test`                               | Run the test script defined in `package.json`               |
+| ytc   | `yarn test --coverage`                    | Run the test script defined in `package.json` with coverage |
 | yuc   | `yarn global upgrade && yarn cache clean` | Upgrade global packages and clean yarn's global cache       |
 | yui   | `yarn upgrade-interactive`                | Prompt for which outdated packages to upgrade               |
 | yup   | `yarn upgrade`                            | Upgrade packages to their latest version                    |
diff --git a/plugins/yarn/yarn.plugin.zsh b/plugins/yarn/yarn.plugin.zsh
index 6dc4786de..e7b6ce0d1 100644
--- a/plugins/yarn/yarn.plugin.zsh
+++ b/plugins/yarn/yarn.plugin.zsh
@@ -20,6 +20,7 @@ alias yrun="yarn run"
 alias ys="yarn serve"
 alias yst="yarn start"
 alias yt="yarn test"
+alias ytc="yarn test --coverage"
 alias yuc="yarn global upgrade && yarn cache clean"
 alias yui="yarn upgrade-interactive"
 alias yup="yarn upgrade"
-- 
cgit v1.2.3-70-g09d2


From 7d410549cdeb838c45db4225a3b7d63e7098866d Mon Sep 17 00:00:00 2001
From: Karolis Mazukna <karolis.mazukna@deepcrawl.com>
Date: Tue, 8 Oct 2019 22:42:18 +0100
Subject: Adds chruby plugib README.md

---
 plugins/chruby/README.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 plugins/chruby/README.md

(limited to 'plugins')

diff --git a/plugins/chruby/README.md b/plugins/chruby/README.md
new file mode 100644
index 000000000..c5e4b9332
--- /dev/null
+++ b/plugins/chruby/README.md
@@ -0,0 +1,19 @@
+# chruby plugin
+
+This plugin loads the [chruby](https://github.com/postmodern/chruby). Supports brew and manual installation of chruby.
+
+To use it, add `chruby` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... chruby)
+```
+
+## Usage
+
+If you'd prefer to specify an explicit path to load chruby from
+you can set variables like so:
+
+```
+zstyle :omz:plugins:chruby path /local/path/to/chruby.sh
+zstyle :omz:plugins:chruby auto /local/path/to/auto.sh
+```
-- 
cgit v1.2.3-70-g09d2


From c9841f43b1a95c6cc5fcca8422b47f8df511ecf6 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Wed, 9 Oct 2019 15:11:34 +0200
Subject: yarn: use zsh-completions latest version (87e1313)

Closes #7300
Closes #8115
Closes #8118
---
 plugins/yarn/_yarn | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

(limited to 'plugins')

diff --git a/plugins/yarn/_yarn b/plugins/yarn/_yarn
index 382f58a0a..3689ae960 100644
--- a/plugins/yarn/_yarn
+++ b/plugins/yarn/_yarn
@@ -71,7 +71,7 @@ _global_commands=(
   'bin:Displays the location of the yarn bin folder'
   'remove:Remove installed package from dependencies updating package.json'
   'upgrade:Upgrades packages to their latest version based on the specified range'
-  'upgrade-interactive'
+  'upgrade-interactive:Interactively upgrade packages'
 )
 
 _yarn_commands_scripts() {
@@ -81,9 +81,21 @@ _yarn_commands_scripts() {
 }
 
 _yarn_scripts() {
-  local -a scripts
-  scripts=($(yarn run --json 2>/dev/null | sed -E '/Commands available|possibleCommands/!d;s/.*Commands available from binary scripts: ([^"]+)".*/\1/;s/.*"items":\[([^]]+).*/\1/;s/[" ]//g' | tr , '\n' | sed -e 's/:/\\:/g'))
-  _describe 'script' scripts
+  local -a commands binaries scripts
+  local -a scriptNames scriptCommands
+  local i runJSON
+
+  runJSON=$(yarn run --json 2>/dev/null)
+  binaries=($(sed -E '/Commands available/!d;s/.*Commands available from binary scripts: ([^"]+)".*/\1/;s/.*"items":\[([^]]+).*/\1/;s/[" ]//g;s/:/\\:/g;s/,/\n/g' <<< "$runJSON"))
+  scriptNames=($(sed -E '/possibleCommands/!d;s/.*"items":\[([^]]+).*/\1/;s/[" ]//g;s/:/\\:/g;s/,/\n/g' <<< "$runJSON"))
+  scriptCommands=("${(@f)$(sed -E '/possibleCommands/!d;s/.*"hints":\{([^}]+)\}.*/\1/;s/"[^"]+"://g;s/:/\\:/g;s/","/\n/g;s/(^"|"$)//g' <<< "$runJSON")}")
+
+  for (( i=1; i <= $#scriptNames; i++ )); do
+    scripts+=("${scriptNames[$i]}:${scriptCommands[$i]}")
+  done
+
+  commands=($scripts $binaries)
+  _describe 'command' commands
 }
 
 _yarn_global_commands() {
@@ -240,7 +252,8 @@ _yarn() {
 
         run)
           _arguments \
-            '1: :_yarn_scripts'
+            '1: :_yarn_scripts' \
+            '*:: :_default'
         ;;
 
         tag)
@@ -255,6 +268,11 @@ _yarn() {
             '*:: :->team_args'
         ;;
 
+        upgrade-interactive)
+          _arguments \
+            '--latest:use the version tagged latest in the registry:'
+        ;;
+
         version)
           _arguments \
             '--new-version:version:' \
@@ -266,6 +284,10 @@ _yarn() {
           _arguments \
             '1:query:_files'
         ;;
+
+        *) 
+          _default
+        ;;
       esac
     ;;
   esac
-- 
cgit v1.2.3-70-g09d2


From 79b2944a8ae19fc9d065d3b92c916345feb65fa4 Mon Sep 17 00:00:00 2001
From: Frani <frani@users.noreply.github.com>
Date: Wed, 9 Oct 2019 10:17:05 -0300
Subject: yarn: add yarn version alias (#8138)

---
 plugins/yarn/README.md       | 1 +
 plugins/yarn/yarn.plugin.zsh | 1 +
 2 files changed, 2 insertions(+)

(limited to 'plugins')

diff --git a/plugins/yarn/README.md b/plugins/yarn/README.md
index a94f183e4..e6daae44f 100644
--- a/plugins/yarn/README.md
+++ b/plugins/yarn/README.md
@@ -39,5 +39,6 @@ plugins=(... yarn)
 | yuc   | `yarn global upgrade && yarn cache clean` | Upgrade global packages and clean yarn's global cache       |
 | yui   | `yarn upgrade-interactive`                | Prompt for which outdated packages to upgrade               |
 | yup   | `yarn upgrade`                            | Upgrade packages to their latest version                    |
+| yv    | `yarn version`                            | Update the version of your package                          |
 | yw    | `yarn workspace`                          | Run a command within a single workspace.                    |
 | yws   | `yarn workspaces`                         | Run a command within all defined workspaces.                |
diff --git a/plugins/yarn/yarn.plugin.zsh b/plugins/yarn/yarn.plugin.zsh
index e7b6ce0d1..18c5dcc89 100644
--- a/plugins/yarn/yarn.plugin.zsh
+++ b/plugins/yarn/yarn.plugin.zsh
@@ -24,5 +24,6 @@ alias ytc="yarn test --coverage"
 alias yuc="yarn global upgrade && yarn cache clean"
 alias yui="yarn upgrade-interactive"
 alias yup="yarn upgrade"
+alias yv="yarn version"
 alias yw="yarn workspace"
 alias yws="yarn workspaces"
-- 
cgit v1.2.3-70-g09d2


From f5614d2b3a844305b363b50e6857ca064fdbbc84 Mon Sep 17 00:00:00 2001
From: otherpaco <27810032+otherpaco@users.noreply.github.com>
Date: Wed, 9 Oct 2019 15:55:35 +0200
Subject: terminalapp: delete plugin deprecated since 2015 (#8230)

---
 plugins/terminalapp/terminalapp.plugin.zsh | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 plugins/terminalapp/terminalapp.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/terminalapp/terminalapp.plugin.zsh b/plugins/terminalapp/terminalapp.plugin.zsh
deleted file mode 100644
index 7c0c278b9..000000000
--- a/plugins/terminalapp/terminalapp.plugin.zsh
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file is intentionally empty.
-#
-# The terminalapp plugin is deprecated and may be removed in a future release.
-# Its functionality has been folded in to the core lib/termsupport.zsh, which
-# is loaded for all users. You can remove terminalapp from your $plugins list
-# once all your systems are updated to the current version of Oh My Zsh.
-- 
cgit v1.2.3-70-g09d2


From 8bb9b044699f5c96830c7fe2bb78de19854d4973 Mon Sep 17 00:00:00 2001
From: otherpaco <27810032+otherpaco@users.noreply.github.com>
Date: Wed, 9 Oct 2019 16:58:58 +0200
Subject: singlechar: add README (#8232)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <marc.cornella@live.com>
---
 plugins/singlechar/README.md             | 118 +++++++++++++++++++++++++++++++
 plugins/singlechar/singlechar.plugin.zsh |  12 +---
 2 files changed, 119 insertions(+), 11 deletions(-)
 create mode 100644 plugins/singlechar/README.md

(limited to 'plugins')

diff --git a/plugins/singlechar/README.md b/plugins/singlechar/README.md
new file mode 100644
index 000000000..d89029900
--- /dev/null
+++ b/plugins/singlechar/README.md
@@ -0,0 +1,118 @@
+# Singlechar plugin
+
+This plugin adds single char shortcuts (and combinations) for some commands.
+
+To use it, add `singlechar` to the plugins array of your zshrc file:
+```
+plugins=(... singlechar)
+```
+
+## Aliases
+
+### CAT, GREP, CURL, WGET
+
+| Alias | Command          | Description |
+|-------|------------------|-------------|
+| y     | `grep -Ri`       | Find case-insensitive string in all files and directories, recursively. Follows symlinks. |
+| n     | `grep -Rvi`      | Same as above but only show lines that don't match the string.                            |
+| f     | `grep -Rli`      | Same as 'y' but only print the filenames where the string is found.                       |
+| fn    | `grep -Rlvi`     | Same as above but only show files that don't contain the string.                          |
+| f.    | `find . \| grep` | Grep list of files in current directory                                                   |
+| f:    | `find`           | 'find' command                                                                            |
+| p     | `less`           | 'less' command                                                                            |
+| m     | `man`            | 'man' command                                                                             |
+| d     | `wget`           | 'wget' command                                                                            |
+| u     | `curl`           | 'curl' command                                                                            |
+| c     | `cat`            | 'cat' command                                                                             |
+| w     | `echo >`         | Write arguments to file, overwriting it if it exists.                                     |
+| a     | `echo >>`        | Write arguments to file, appending them if the file exists.                               |
+| w:    | `cat >`          | Write stdin to file, overwriting if it exists.                                            |
+| a:    | `cat >>`         | Write stdin to file, appending it if the file exists.                                     |
+
+### XARGS
+
+These aliases are versions of the aliases above but using xargs. This can be used
+by piping the arguments to the xargs aliases.
+
+| Alias | Command              | Description                     |
+|-------|----------------------|---------------------------------|
+| x     | `xargs`              | 'xargs' command                 |
+| xy    | `xargs grep -Ri`     | Same as 'y' alias using xargs.  |
+| xn    | `xargs grep -Rvi`    | Same as 'n' alias using xargs.  |
+| xf    | `xargs grep -Rli`    | Same as 'f' alias using xargs.  |
+| xfn   | `xargs grep -Rlvi`   | Same as 'fn' alias using xargs. |
+| xf.   | `xargs find \| grep` | Same as 'f.' alias using xargs. |
+| xf:   | `xargs find`         | Same as 'f:' alias using xargs. |
+| xc    | `xargs cat`          | Same as 'c' alias using xargs.  |
+| xp    | `xargs less`         | Same as 'p' alias using xargs.  |
+| xm    | `xargs man`          | Same as 'm' alias using xargs.  |
+| xd    | `xargs wget`         | Same as 'd' alias using xargs.  |
+| xu    | `xargs curl`         | Same as 'u' alias using xargs.  |
+| xw    | `xargs echo >`       | Same as 'w' alias using xargs.  |
+| xa    | `xargs echo >>`      | Same as 'a' alias using xargs.  |
+| xw:   | `xargs cat >`        | Same as 'w:' alias using xargs. |
+| xa:   | `xargs >>`           | Same as 'a:' alias using xargs. |
+
+### SUDO
+
+These aliases are versions of the aliases above in [CAT, GREP, CURL, WGET](#cat-grep-curl-wget)
+but using sudo to run them with root permission.
+
+| Alias | Command               | Description                    |
+|-------|-----------------------|--------------------------------|
+| s     | `sudo`                | 'sudo' command                 |
+| sy    | `sudo grep -Ri`       | Same as 'y' alias using sudo.  |
+| sn    | `sudo grep -Riv`      | Same as 'n' alias using sudo.  |
+| sf    | `sudo grep -Rli`      | Same as 'f' alias using sudo.  |
+| sfn   | `sudo grep -Rlvi`     | Same as 'fn' alias using sudo. |
+| sf.   | `sudo find . \| grep` | Same as 'f.' alias using sudo. |
+| sf:   | `sudo find`           | Same as 'f:' alias using sudo. |
+| sp    | `sudo less`           | Same as 'p' alias using sudo.  |
+| sm    | `sudo man`            | Same as 'm' alias using sudo.  |
+| sd    | `sudo wget`           | Same as 'd' alias using sudo.  |
+| sc    | `sudo cat`            | Same as 'c' alias using sudo.  |
+| sw    | `sudo echo >`         | Same as 'w' alias using sudo.  |
+| sa    | `sudo echo >>`        | Same as 'a' alias using sudo.  |
+| sw:   | `sudo cat >`          | Same as 'w:' alias using sudo. |
+| sa:   | `sudo cat >>`         | Same as 'a:' alias using sudo. |
+
+### SUDO-XARGS
+
+Same as above but using both sudo and xargs.
+
+| Alias | Command                   | Description                     |
+|-------|---------------------------|---------------------------------|
+| sx    | `sudo xargs`              | 'sudo xargs' command            |
+| sxy   | `sudo xargs grep -Ri`     | Same as 'xy' alias using sudo.  |
+| sxn   | `sudo xargs grep -Riv`    | Same as 'xn' alias using sudo.  |
+| sxf   | `sudo xargs grep -li`     | Same as 'xf' alias using sudo.  |
+| sxfn  | `sudo xargs grep -lvi`    | Same as 'xfn' alias using sudo. |
+| sxf.  | `sudo xargs find \| grep` | Same as 'xf.' alias using sudo. |
+| sxf:  | `sudo xargs find`         | Same as 'xf:' alias using sudo. |
+| sxp   | `sudo xargs less`         | Same as 'xp' alias using sudo.  |
+| sxm   | `sudo xargs man`          | Same as 'xm' alias using sudo.  |
+| sxd   | `sudo xargs wget`         | Same as 'xd' alias using sudo.  |
+| sxu   | `sudo xargs curl`         | Same as 'xu' alias using sudo.  |
+| sxc   | `sudo xargs cat`          | Same as 'xc' alias using sudo.  |
+| sxw   | `sudo xargs echo >`       | Same as 'xw' alias using sudo.  |
+| sxa   | `sudo xargs echo >>`      | Same as 'xa' alias using sudo.  |
+| sxw:  | `sudo xargs cat >`        | Same as 'xw:' alias using sudo. |
+| sxa:  | `sudo xargs cat >>`       | Same as 'xa:' alias using sudo. |
+
+## Options
+
+The commands `grep`, `sudo`, `wget`, `curl`, and `less` can be configured to use other commands
+via the setup variables below, before Oh My Zsh is sourced. If they are not set yet, they will
+use their default values:
+
+| Setup variable | Default value |
+|----------------|---------------|
+| GREP           | `grep`        |
+| ROOT           | `sudo`        |
+| WGET           | `wget`        |
+| CURL           | `curl`        |
+| PAGER          | `less`        |
+
+## Author
+
+- [Karolin Varner](https://github.com/koraa)
diff --git a/plugins/singlechar/singlechar.plugin.zsh b/plugins/singlechar/singlechar.plugin.zsh
index 44bd998aa..d4b0b6735 100644
--- a/plugins/singlechar/singlechar.plugin.zsh
+++ b/plugins/singlechar/singlechar.plugin.zsh
@@ -1,13 +1,3 @@
-################################################################################
-#          FILE:  singlechar.plugin.zsh
-#   DESCRIPTION:  oh-my-zsh plugin file.
-#        AUTHOR:  Michael Varner (musikmichael@web.de)
-#       VERSION:  1.0.0
-#
-# This plugin adds single char shortcuts (and combinations) for some commands.
-#
-################################################################################
-
 ###########################
 # Settings 
 
@@ -130,4 +120,4 @@ alias sxd='"$ROOT" xargs "$WGET"'
 alias sxu='"$ROOT" xargs "$CURL"'
 
 alias sxw:='"$ROOT" xargs cat >'
-alias sxa:='"$ROOT" xargs cat >>'
\ No newline at end of file
+alias sxa:='"$ROOT" xargs cat >>'
-- 
cgit v1.2.3-70-g09d2


From abc05fa422a183e974df9faefc61a8512abe1db9 Mon Sep 17 00:00:00 2001
From: Noah Nichols <noahjacknichols@gmail.com>
Date: Wed, 9 Oct 2019 11:51:47 -0400
Subject: sprunge: add README and refactor (#8239)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <marc.cornella@live.com>
---
 plugins/sprunge/README.md          | 31 ++++++++++++++
 plugins/sprunge/sprunge.plugin.zsh | 86 ++++++++++++++++++--------------------
 2 files changed, 71 insertions(+), 46 deletions(-)
 create mode 100644 plugins/sprunge/README.md

(limited to 'plugins')

diff --git a/plugins/sprunge/README.md b/plugins/sprunge/README.md
new file mode 100644
index 000000000..2a363d3bd
--- /dev/null
+++ b/plugins/sprunge/README.md
@@ -0,0 +1,31 @@
+# Sprunge plugin
+
+This plugin uploads data and fetch URL from the pastebin http://sprunge.us
+
+To enable it, add 'sprunge' to your plugins:
+```
+plugins=(... sprunge)
+```
+
+## Usage
+
+| Command                      | Description                               |
+|------------------------------|-------------------------------------------|
+| `sprunge filename.txt`       | Uploads filename.txt                      |
+| `sprunge "this is a string"` | Uploads plain text                        |
+| `sprunge < filename.txt`     | Redirects filename.txt content to sprunge |
+| `echo data \| sprunge`       | Any piped data will be uploaded           |
+
+Once sprunge has processed the input it will give you a unique HTTP address:
+```
+$ sprunge "hello"
+http://sprunge.us/XxjnKz
+```
+
+## Notes
+
+- Sprunge accepts piped data, stdin redirection, text strings as input or filenames.
+  Only one of these can be used at a time.
+- Argument precedence goes as follows: stdin > piped input > text strings.
+- If a filename is mispelled or doesn't have the necessary path description, it will NOT
+  generate an error, but instead treat it as a text string.
diff --git a/plugins/sprunge/sprunge.plugin.zsh b/plugins/sprunge/sprunge.plugin.zsh
index e1c89b729..5d5687a82 100644
--- a/plugins/sprunge/sprunge.plugin.zsh
+++ b/plugins/sprunge/sprunge.plugin.zsh
@@ -2,12 +2,9 @@
 # Created by the blogger at the URL below...I don't know where to find his/her name
 # Original found at https://www.shellperson.net/sprunge-pastebin-script/
 
-usage() {
-description | fmt -s >&2
-}
-
-description() {
-cat << HERE
+sprunge() {
+  if [[ "$1" = --help ]]; then
+    fmt -s >&2 << EOF
 
 DESCRIPTION
   Upload data and fetch URL from the pastebin http://sprunge.us
@@ -19,44 +16,41 @@ USAGE
   piped_data | $0
 
 NOTES
---------------------------------------------------------------------------
-* INPUT METHODS *
-$0 can accept piped data, STDIN redirection [<filename.txt], text strings following the command as arguments, or filenames as arguments.  Only one of these methods can be used at a time, so please see the note on precedence.  Also, note that using a pipe or STDIN redirection will treat tabs as spaces, or disregard them entirely (if they appear at the beginning of a line).  So I suggest using a filename as an argument if tabs are important either to the function or readability of the code.
-
-* PRECEDENCE *
-STDIN redirection has precedence, then piped input, then a filename as an argument, and finally text strings as an arguments.
-
-  EXAMPLE:
-  echo piped | "$0" arguments.txt < stdin_redirection.txt
-
-In this example, the contents of file_as_stdin_redirection.txt would be uploaded. Both the piped_text and the file_as_argument.txt are ignored. If there is piped input and arguments, the arguments will be ignored, and the piped input uploaded.
-
-* FILENAMES *
-If a filename is misspelled or doesn't have the necessary path description, it will NOT generate an error, but will instead treat it as a text string and upload it.
---------------------------------------------------------------------------
-
-HERE
-exit
-}
-
-sprunge() {
-	if [ -t 0 ]; then
-	  echo Running interactively, checking for arguments... >&2
-	  if [ "$*" ]; then
-		echo Arguments present... >&2
-		if [ -f "$*" ]; then
-		  echo Uploading the contents of "$*"... >&2
-		  cat "$*"
-		else
-		  echo Uploading the text: \""$*"\"... >&2
-		  echo "$*"
-		fi | curl -F 'sprunge=<-' http://sprunge.us
-	  else
-		echo No arguments found, printing USAGE and exiting. >&2
-		usage
-	  fi
-	else
-	  echo Using input from a pipe or STDIN redirection... >&2
-	  curl -F 'sprunge=<-' http://sprunge.us
-	fi
+  Input Methods:
+  $0 can accept piped data, STDIN redirection [< filename.txt], text strings following the command as arguments, or filenames as arguments. Only one of these methods can be used at a time, so please see the note on precedence. Also, note that using a pipe or STDIN redirection will treat tabs as spaces, or disregard them entirely (if they appear at the beginning of a line). So I suggest using a filename as an argument if tabs are important either to the function or readability of the code.
+
+  Precedence:
+  STDIN redirection has precedence, then piped input, then a filename as an argument, and finally text strings as arguments. For example:
+
+    echo piped | $0 arguments.txt < stdin_redirection.txt
+
+  In this example, the contents of file_as_stdin_redirection.txt would be uploaded. Both the piped_text and the file_as_argument.txt are ignored. If there is piped input and arguments, the arguments will be ignored, and the piped input uploaded.
+
+  Filenames:
+  If a filename is misspelled or doesn't have the necessary path description, it will NOT generate an error, but will instead treat it as a text string and upload it.
+
+EOF
+    return
+  fi
+
+  if [ -t 0 ]; then
+    echo Running interactively, checking for arguments... >&2
+    if [ "$*" ]; then
+      echo Arguments present... >&2
+      if [ -f "$*" ]; then
+        echo Uploading the contents of "$*"... >&2
+        cat "$*"
+      else
+        echo Uploading the text: \""$*"\"... >&2
+        echo "$*"
+      fi | curl -F 'sprunge=<-' http://sprunge.us
+    else
+      echo No arguments found, printing USAGE and exiting. >&2
+      sprunge --help
+      return 1
+    fi
+  else
+    echo Using input from a pipe or STDIN redirection... >&2
+    curl -F 'sprunge=<-' http://sprunge.us
+  fi
 }
-- 
cgit v1.2.3-70-g09d2


From 7ea05bd5003a1b7bd69b69fbcf3bfe3de4fcfe7e Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Wed, 9 Oct 2019 18:07:02 +0200
Subject: Change description

---
 plugins/compleat/README.md | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'plugins')

diff --git a/plugins/compleat/README.md b/plugins/compleat/README.md
index 1d7f0492d..630c91503 100644
--- a/plugins/compleat/README.md
+++ b/plugins/compleat/README.md
@@ -1,9 +1,8 @@
-# compleat
+# compleat plugin
 
-This plugin runs [bashcompinit](https://github.com/zsh-users/zsh/blob/master/Completion/bashcompinit) which will allow zsh to read bash completion specifications and functions.
+This plugin looks for [compleat](https://github.com/mbrubeck/compleat) and loads its completion.
 
-To use it add compleat to the plugins array in your zshrc file.
- 
- ```
+To use it, add compleat to the plugins array in your zshrc file:
+```
 plugins=(... compleat)
-```
\ No newline at end of file
+```
-- 
cgit v1.2.3-70-g09d2


From 11e23477527a0314ffbed74a3d061ae76034da15 Mon Sep 17 00:00:00 2001
From: Martin Mladenov <30376060+martinmladenov@users.noreply.github.com>
Date: Wed, 9 Oct 2019 19:09:29 +0300
Subject: git-escape-magic: fix typos in README (#8234)

---
 plugins/git-escape-magic/README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'plugins')

diff --git a/plugins/git-escape-magic/README.md b/plugins/git-escape-magic/README.md
index c3e3898f5..7fefed39d 100644
--- a/plugins/git-escape-magic/README.md
+++ b/plugins/git-escape-magic/README.md
@@ -4,13 +4,13 @@ This plugin is copied from the original at
 https://github.com/knu/zsh-git-escape-magic. All credit for the
 functionality enabled by this plugin should go to @knu.
 
-An excerpt from that project's readme explains it's purpose.
+An excerpt from that project's readme explains its purpose.
 
 > It eliminates the need for manually escaping those meta-characters. The zle function it provides is context aware and recognizes the characteristics of each subcommand of git. Every time you type one of these meta-characters on a git command line, it automatically escapes the meta-character with a backslash as necessary and as appropriate.
 
 ## Usage
 
-To use this plugin add it to your list of plugins in your `.zshrc` file.
+To use this plugin, add it to your list of plugins in your `.zshrc` file.
 
-**NOTE**: If you use url-quote-magic it must be included before this
+**NOTE**: If you use url-quote-magic, it must be included before this
 plugin runs to prevent any conflicts.
-- 
cgit v1.2.3-70-g09d2


From 98cd133c4d15c1a147679cc00c0bd924fd91f11c Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Wed, 9 Oct 2019 18:12:58 +0200
Subject: Reword and add extra information

---
 plugins/chruby/README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/chruby/README.md b/plugins/chruby/README.md
index c5e4b9332..d373006a5 100644
--- a/plugins/chruby/README.md
+++ b/plugins/chruby/README.md
@@ -1,9 +1,10 @@
 # chruby plugin
 
-This plugin loads the [chruby](https://github.com/postmodern/chruby). Supports brew and manual installation of chruby.
+This plugin loads [chruby](https://github.com/postmodern/chruby), a tool that changes the
+current Ruby version, and completion and a prompt function to display the Ruby version.
+Supports brew and manual installation of chruby.
 
 To use it, add `chruby` to the plugins array in your zshrc file:
-
 ```zsh
 plugins=(... chruby)
 ```
-- 
cgit v1.2.3-70-g09d2


From c5b4613bf6e1256e56b5451bccce5972a255a58b Mon Sep 17 00:00:00 2001
From: Maciej Motyka <39633561+maciejmotyka@users.noreply.github.com>
Date: Wed, 9 Oct 2019 19:13:25 +0200
Subject: python: add recurse flag to pygrep (#8217)

As described in #7053
---
 plugins/python/python.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/python/python.plugin.zsh b/plugins/python/python.plugin.zsh
index f754ea261..950b0e01a 100644
--- a/plugins/python/python.plugin.zsh
+++ b/plugins/python/python.plugin.zsh
@@ -11,5 +11,5 @@ function pyclean() {
 }
 
 # Grep among .py files
-alias pygrep='grep --include="*.py"'
+alias pygrep='grep -r --include="*.py"'
 
-- 
cgit v1.2.3-70-g09d2


From 49c423c7e0a6d5193b77e60107e7c329da28d987 Mon Sep 17 00:00:00 2001
From: 927589452 <927589452@users.noreply.github.com>
Date: Wed, 9 Oct 2019 19:24:44 +0200
Subject: battery: add support for sysctl in FreeBSD (#8155)

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

(limited to 'plugins')

diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh
index 8f398cfb3..6b6684716 100644
--- a/plugins/battery/battery.plugin.zsh
+++ b/plugins/battery/battery.plugin.zsh
@@ -7,6 +7,9 @@
 # Email: neuralsandwich@gmail.com         #
 # Modified to add support for Apple Mac   #
 ###########################################
+# Author: J (927589452)                   #
+# Modified to add support for FreeBSD     #
+###########################################
 
 if [[ "$OSTYPE" = darwin* ]] ; then
 
@@ -64,6 +67,52 @@ if [[ "$OSTYPE" = darwin* ]] ; then
     [[ $(ioreg -rc "AppleSmartBattery"| grep '^.*"IsCharging"\ =\ ' | sed -e 's/^.*"IsCharging"\ =\ //') == "Yes" ]]
   }
 
+elif [[ "$OSTYPE" = freebsd*  ]] ; then
+
+  function battery_is_charging() {
+    [[ $(sysctl -n hw.acpi.battery.state) -eq 2 ]]
+  }
+
+  function battery_pct() {
+    if (( $+commands[sysctl] )) ; then
+      echo "$(sysctl -n hw.acpi.battery.life)"
+    fi
+  }
+
+  function battery_pct_remaining() {
+    if [ ! $(battery_is_charging) ] ; then
+      battery_pct
+    else
+      echo "External Power"
+    fi
+  }
+
+  function battery_time_remaining() {
+    remaining_time=$(sysctl -n hw.acpi.battery.time)
+    if [[ $remaining_time -ge 0 ]] ; then
+      # calculation from https://www.unix.com/shell-programming-and-scripting/23695-convert-minutes-hours-minutes-seconds.html
+      ((hour=$remaining_time/60))
+      ((minute=$remaining_time-$hour*60))
+      echo $hour:$minute
+    fi
+  }
+
+  function battery_pct_prompt() {
+    b=$(battery_pct_remaining)
+    if [ ! $(battery_is_charging) ] ; then
+      if [ $b -gt 50 ] ; then
+        color='green'
+      elif [ $b -gt 20 ] ; then
+        color='yellow'
+      else
+        color='red'
+      fi
+      echo "%{$fg[$color]%}$(battery_pct_remaining)%%%{$reset_color%}"
+    else
+      echo "∞"
+    fi
+  }
+
 elif [[ "$OSTYPE" = linux*  ]] ; then
 
   function battery_is_charging() {
-- 
cgit v1.2.3-70-g09d2


From a2cc84dd20d13f60bab51438ebbf4ea220a255ee Mon Sep 17 00:00:00 2001
From: Kirill <30822663+KirillDemtchenko@users.noreply.github.com>
Date: Wed, 9 Oct 2019 21:55:16 +0300
Subject: fbterm: add README (#8241)

---
 plugins/fbterm/README.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 plugins/fbterm/README.md

(limited to 'plugins')

diff --git a/plugins/fbterm/README.md b/plugins/fbterm/README.md
new file mode 100644
index 000000000..eec33d7ee
--- /dev/null
+++ b/plugins/fbterm/README.md
@@ -0,0 +1,9 @@
+# fbterm
+
+This plugin automatically starts [fbterm](https://github.com/zhangyuanwei/fbterm)
+if on a real TTY (`/dev/tty*`).
+
+To use it, add fbterm to the plugins array of your zshrc file:
+```
+plugins=(... fbterm)
+```
-- 
cgit v1.2.3-70-g09d2


From 710a3d5a1e2888a4dfb1769f8f1edd8a590eee22 Mon Sep 17 00:00:00 2001
From: Kirill <30822663+KirillDemtchenko@users.noreply.github.com>
Date: Wed, 9 Oct 2019 22:04:49 +0300
Subject: emotty: add README (#8240)

---
 plugins/emotty/README.md | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 plugins/emotty/README.md

(limited to 'plugins')

diff --git a/plugins/emotty/README.md b/plugins/emotty/README.md
new file mode 100644
index 000000000..2cfbe120c
--- /dev/null
+++ b/plugins/emotty/README.md
@@ -0,0 +1,39 @@
+# emotty plugin
+
+This plugin returns an emoji for the current $TTY number so it can be used
+in a prompt.
+
+To use it, add emotty to the plugins array in your zshrc file:
+```
+plugins=(... emotty)
+```
+
+**NOTE:** it requires the [emoji plugin](https://github.com/robbyrussell/oh-my-zsh/tree/master/plugins/emoji).
+
+## Usage
+
+The function `emotty` displays an emoji from the current character set (default: `emoji`), based
+on the number associated to the `$TTY`.
+
+There are different sets of emoji characters available, to choose a different
+set, set `$emotty_set` to the name of the set you would like to use, e.g.:
+```
+emotty_set=nature
+```
+
+### Character Sets
+
+- emoji
+- loral
+- love
+- nature
+- stellar
+- zodiac
+
+Use the `display_emotty` function to list the emojis in the current character set, or
+the character set passed as the first argument. For example:
+
+```
+$ display_emotty zodiac
+<list of all the emojis in the zodiac character set>
+```
-- 
cgit v1.2.3-70-g09d2


From 35aa3c13311e12ff3375f2eef561562244433ee8 Mon Sep 17 00:00:00 2001
From: jotaro-sama <36264038+jotaro-sama@users.noreply.github.com>
Date: Thu, 10 Oct 2019 03:57:25 +0200
Subject: add readme for the rust plugin

---
 plugins/rust/README.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 plugins/rust/README.md

(limited to 'plugins')

diff --git a/plugins/rust/README.md b/plugins/rust/README.md
new file mode 100644
index 000000000..7cc1ceb66
--- /dev/null
+++ b/plugins/rust/README.md
@@ -0,0 +1,15 @@
+# rust
+
+This plugin adds completion for [`rustc`](https://doc.rust-lang.org/rustc/index.html), the compiler for the Rust programming language.
+
+To use it, add `rust` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... rust)
+```
+
+## Aliases
+
+| Command          | Description                                                                     |
+|------------------|---------------------------------------------------------------------------------|
+| `rustc`          | Compiler for the Rust language                                                  |
-- 
cgit v1.2.3-70-g09d2


From bb97a9b3ecb809dc7f4f64713170e42b44853d1a Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Thu, 10 Oct 2019 11:07:33 +0200
Subject: Delete alias section

---
 plugins/rust/README.md | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'plugins')

diff --git a/plugins/rust/README.md b/plugins/rust/README.md
index 7cc1ceb66..83d7d91ba 100644
--- a/plugins/rust/README.md
+++ b/plugins/rust/README.md
@@ -7,9 +7,3 @@ To use it, add `rust` to the plugins array in your zshrc file:
 ```zsh
 plugins=(... rust)
 ```
-
-## Aliases
-
-| Command          | Description                                                                     |
-|------------------|---------------------------------------------------------------------------------|
-| `rustc`          | Compiler for the Rust language                                                  |
-- 
cgit v1.2.3-70-g09d2


From f2be66177d440719dc58ce974077709b9b1b8f33 Mon Sep 17 00:00:00 2001
From: Yasna Kateb <yasnakatebzadeh@gmail.com>
Date: Mon, 14 Oct 2019 13:05:12 +0330
Subject: Added README for pod

---
 plugins/pod/README.md | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 plugins/pod/README.md

(limited to 'plugins')

diff --git a/plugins/pod/README.md b/plugins/pod/README.md
new file mode 100644
index 000000000..1009a0855
--- /dev/null
+++ b/plugins/pod/README.md
@@ -0,0 +1,10 @@
+# pod
+
+This plugin adds completion for [`CocoaPods`](https://cocoapods.org/)
+CocoaPods is a dependency manager for Swift and Objective-C Cocoa projects.
+
+To use it, add `pod` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... pod)
+```
-- 
cgit v1.2.3-70-g09d2


From c1bc062e6b56e03fe0b8b31df9520941d219b43f Mon Sep 17 00:00:00 2001
From: yasnakateb <37741028+yasnakateb@users.noreply.github.com>
Date: Mon, 14 Oct 2019 13:06:20 +0330
Subject: Update README

---
 plugins/pod/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/pod/README.md b/plugins/pod/README.md
index 1009a0855..0a3cc7a36 100644
--- a/plugins/pod/README.md
+++ b/plugins/pod/README.md
@@ -1,6 +1,6 @@
 # pod
 
-This plugin adds completion for [`CocoaPods`](https://cocoapods.org/)
+This plugin adds completion for [`CocoaPods`](https://cocoapods.org/).
 CocoaPods is a dependency manager for Swift and Objective-C Cocoa projects.
 
 To use it, add `pod` to the plugins array in your zshrc file:
-- 
cgit v1.2.3-70-g09d2


From f56b678888c0ad4ac71458680d75d88b442cf09b Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 15 Oct 2019 16:51:51 +0200
Subject: fzf: check for dpkg before checking for fzf in debian

Fixes #8253
Co-authored-by: Mariusz B <mb@binary-offensive.com>
---
 plugins/fzf/fzf.plugin.zsh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'plugins')

diff --git a/plugins/fzf/fzf.plugin.zsh b/plugins/fzf/fzf.plugin.zsh
index 646148297..f701fdf32 100644
--- a/plugins/fzf/fzf.plugin.zsh
+++ b/plugins/fzf/fzf.plugin.zsh
@@ -1,9 +1,9 @@
 function setup_using_base_dir() {
-	# Declare all variables local not no mess with outside env in any way
-	local fzf_base
-	local fzf_shell
-	local fzfdirs
-	local dir
+    # Declare all variables local not no mess with outside env in any way
+    local fzf_base
+    local fzf_shell
+    local fzfdirs
+    local dir
 
     test -d "${FZF_BASE}" && fzf_base="${FZF_BASE}"
 
@@ -58,7 +58,7 @@ function setup_using_base_dir() {
 
 
 function setup_using_debian_package() {
-    dpkg -s fzf &> /dev/null
+    (( $+command[dpkg] )) && dpkg -s fzf &> /dev/null
     if (( $? )); then
         # Either not a debian based distro, or no fzf installed. In any case skip ahead
         return 1
-- 
cgit v1.2.3-70-g09d2


From 1f8989aee81740760fd4202172c90446d1c391d9 Mon Sep 17 00:00:00 2001
From: Kenny Heaton <kennyheaton@gmail.com>
Date: Tue, 15 Oct 2019 16:21:16 -0500
Subject: rake: add README (#8254)

---
 plugins/rake/README.md | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 plugins/rake/README.md

(limited to 'plugins')

diff --git a/plugins/rake/README.md b/plugins/rake/README.md
new file mode 100644
index 000000000..e235bd91a
--- /dev/null
+++ b/plugins/rake/README.md
@@ -0,0 +1,37 @@
+# Rake plugin
+
+This plugin adds support for [rake](https://ruby.github.io/rake/), the Ruby
+build tool or Ruby Make.
+
+To use it, add `rake` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... rake)
+```
+
+## Aliases
+
+The plugin aliases the rake command so you can pass arguments when invoking rake tasks
+without having to escape the brackets, i.e., you can run
+```
+rake namespace:task['argument']
+```
+instead of having to do
+```
+rake namespace:task\['argument'\]
+```
+
+| Alias  | Command                        | Description                                   |
+|--------|--------------------------------|-----------------------------------------------|
+| rake   | `noglob rake`                  | Allows unescaped square brackets              |
+| brake  | `noglob bundle exec rake`      | Same as above but call rake using bundler     |
+| srake  | `noglob sudo rake`             | Same as rake but using sudo                   |
+| sbrake | `noglob sudo bundle exec rake` | Same as above but using both sudo and bundler |
+
+## Jim Weirich
+
+The plugin also aliases `rake` to [`jimweirich`](https://github.com/jimweirich), author of Rake
+and big time contributor to the Ruby open source community. He passed away in 2014:
+
+> Thank you Jim for everything you contributed to the Ruby and open source community 
+> over the years. We will miss you dearly. — [**@robbyrussell**](https://github.com/robbyrussell/oh-my-zsh/commit/598a9c6f990756386517d66b6bcf77e53791e905)
-- 
cgit v1.2.3-70-g09d2


From 11f36cf9226618666a3335833e5cfb246fce44b9 Mon Sep 17 00:00:00 2001
From: flowin <winkler@b1-systems.de>
Date: Tue, 15 Oct 2019 23:25:56 +0200
Subject: screen: add README (#8256)

---
 plugins/screen/README.md | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 plugins/screen/README.md

(limited to 'plugins')

diff --git a/plugins/screen/README.md b/plugins/screen/README.md
new file mode 100644
index 000000000..103e17237
--- /dev/null
+++ b/plugins/screen/README.md
@@ -0,0 +1,10 @@
+# screen
+
+This plugin sets title and hardstatus of the tab window for [screen](https://www.gnu.org/software/screen/),
+the terminal multiplexer.
+
+To use it add `screen` to the plugins array in your zshrc file.
+
+```zsh
+plugins=(... screen)
+```
-- 
cgit v1.2.3-70-g09d2


From 767be6c42f1b71fe497c46faa67c2ef4e70ab829 Mon Sep 17 00:00:00 2001
From: Sofia Rivas <sofi.rivasm@gmail.com>
Date: Tue, 15 Oct 2019 16:46:40 -0500
Subject: git-remote-branch: add README (#8259)

---
 plugins/git-remote-branch/README.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 plugins/git-remote-branch/README.md

(limited to 'plugins')

diff --git a/plugins/git-remote-branch/README.md b/plugins/git-remote-branch/README.md
new file mode 100644
index 000000000..bd73e5dec
--- /dev/null
+++ b/plugins/git-remote-branch/README.md
@@ -0,0 +1,14 @@
+# git-remote-branch plugin
+
+This plugin adds completion for [`grb`](https://github.com/webmat/git_remote_branch),
+or `git_remote_branch`.
+
+To use it, add `git-remote-branch` to the plugins array of your `.zshrc` file:
+```
+plugins=(... git-remote-branch)
+```
+
+## Deprecation
+
+[git_remote_branch was archived in 2018](https://github.com/webmat/git_remote_branch#archived),
+meaning it's not actively maintained anymore. Use at your own risk.
-- 
cgit v1.2.3-70-g09d2


From 563c0708ab7100c23aab218a9053a61d81fe1317 Mon Sep 17 00:00:00 2001
From: Jakub Łuczyński <doubleloop@users.noreply.github.com>
Date: Wed, 16 Oct 2019 17:59:06 +0200
Subject: fzf: fix regression (#8269)

Typo introduced in f56b678 fixing #8253
---
 plugins/fzf/fzf.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/fzf/fzf.plugin.zsh b/plugins/fzf/fzf.plugin.zsh
index f701fdf32..fe471a363 100644
--- a/plugins/fzf/fzf.plugin.zsh
+++ b/plugins/fzf/fzf.plugin.zsh
@@ -58,7 +58,7 @@ function setup_using_base_dir() {
 
 
 function setup_using_debian_package() {
-    (( $+command[dpkg] )) && dpkg -s fzf &> /dev/null
+    (( $+commands[dpkg] )) && dpkg -s fzf &> /dev/null
     if (( $? )); then
         # Either not a debian based distro, or no fzf installed. In any case skip ahead
         return 1
-- 
cgit v1.2.3-70-g09d2


From a41d308f70181db085938c5a8f2fe3d0d8e312c5 Mon Sep 17 00:00:00 2001
From: Nick Fagerlund <nick@hashicorp.com>
Date: Fri, 18 Oct 2019 09:43:25 -0700
Subject: bundler: make it play nice with functions that call wrapped commands
 (#8271)

When another function calls one of the bundler plugin's wrapper functions, the
command to run gets passed as an array instead of a space-separated string. That
works fine when the arguments are expanded alone, like `bundle exec $@`, but
something like `./bin/$@` will expand to something like `./bin/rake
./bin/--silent ./bin/--tasks`, which of course will explode. This was causing a
nasty interaction with the rake-fast plugin, and I'd be shocked if it wasn't
causing other problems.

The fix is to explicitly turn off the `RC_EXPAND_PARAM` option for that expansion.
See http://zsh.sourceforge.net/Doc/Release/Expansion.html#Parameter-Expansion
for more details.
---
 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 c4a4fd40a..d93fac01e 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -95,7 +95,7 @@ _binstubbed() {
 _run-with-bundler() {
   if _bundler-installed && _within-bundled-project; then
     if _binstubbed $1; then
-      ./bin/$@
+      ./bin/${^^@}
     else
       bundle exec $@
     fi
-- 
cgit v1.2.3-70-g09d2


From e8a6d328ac36df80901dae540c6a466354327bb0 Mon Sep 17 00:00:00 2001
From: Nick <24370162+deltaclock@users.noreply.github.com>
Date: Fri, 18 Oct 2019 17:05:47 +0000
Subject: eecms: add README (#8277)

---
 plugins/eecms/README.md | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 plugins/eecms/README.md

(limited to 'plugins')

diff --git a/plugins/eecms/README.md b/plugins/eecms/README.md
new file mode 100644
index 000000000..c53835521
--- /dev/null
+++ b/plugins/eecms/README.md
@@ -0,0 +1,11 @@
+# eecms plugin
+
+This plugin adds auto-completion of console commands for [`eecms`](https://github.com/ExpressionEngine/ExpressionEngine).
+
+To use it, add `eecms` to the plugins array of your `.zshrc` file:
+```
+plugins=(... eecms)
+```
+
+It also adds the alias `eecms` which finds the eecms file in the current project
+and runs it with php.
-- 
cgit v1.2.3-70-g09d2


From 45d2236941cdb55d33c418c7779b66f3fd1dd3f0 Mon Sep 17 00:00:00 2001
From: Nick <24370162+deltaclock@users.noreply.github.com>
Date: Fri, 18 Oct 2019 17:12:05 +0000
Subject: phing: add README (#8278)

---
 plugins/phing/README.md | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 plugins/phing/README.md

(limited to 'plugins')

diff --git a/plugins/phing/README.md b/plugins/phing/README.md
new file mode 100644
index 000000000..e2ac0bdf5
--- /dev/null
+++ b/plugins/phing/README.md
@@ -0,0 +1,8 @@
+# Phing plugin
+
+This plugin adds autocompletion for [`phing`](https://github.com/phingofficial/phing) targets.
+
+To use it, add `phing` to the plugins array of your `.zshrc` file:
+```
+plugins=(... eecms)
+```
-- 
cgit v1.2.3-70-g09d2


From efee47b5c0438f7dd0cfd03b9339bd6e1b4ab932 Mon Sep 17 00:00:00 2001
From: flowin <winkler@b1-systems.de>
Date: Fri, 18 Oct 2019 20:05:49 +0200
Subject: pass: add README (#8282)

---
 plugins/pass/README.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 plugins/pass/README.md

(limited to 'plugins')

diff --git a/plugins/pass/README.md b/plugins/pass/README.md
new file mode 100644
index 000000000..2b0704981
--- /dev/null
+++ b/plugins/pass/README.md
@@ -0,0 +1,22 @@
+# pass
+
+This plugin provides completion for the [pass](https://www.passwordstore.org/) password manager.
+
+To use it, add `pass` to the plugins array in your zshrc file.
+
+```
+plugins=(... pass)
+```
+
+## Configuration
+
+### Multiple repositories
+
+If you use multiple repositories, you can configure completion like this:
+```zsh
+compdef _pass workpass
+zstyle ':completion::complete:workpass::' prefix "$HOME/work/pass"
+workpass() {
+  PASSWORD_STORE_DIR=$HOME/work/pass pass $@
+}
+```
-- 
cgit v1.2.3-70-g09d2


From 6b6f2b6dfdc4bc327e814477170f81f0b91a9740 Mon Sep 17 00:00:00 2001
From: Vsevolod Romashov <7@7vn.ru>
Date: Fri, 18 Oct 2019 22:55:56 +0300
Subject: bundler: support new file naming convention (#6594)

---
 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 d93fac01e..665cb5e43 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -82,7 +82,7 @@ _bundler-installed() {
 _within-bundled-project() {
   local check_dir="$PWD"
   while [ "$check_dir" != "/" ]; do
-    [ -f "$check_dir/Gemfile" ] && return
+    [ -f "$check_dir/Gemfile" -o -f "$check_dir/gems.rb" ] && return
     check_dir="$(dirname $check_dir)"
   done
   false
-- 
cgit v1.2.3-70-g09d2


From 74165aba4ad500e6467973c5037e1379c55e9560 Mon Sep 17 00:00:00 2001
From: Angelos Orfanakos <me@agorf.gr>
Date: Fri, 18 Oct 2019 22:56:30 +0300
Subject: rails: detect gems.rb in _rake_command (#8223)

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

(limited to 'plugins')

diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
index a8ec79db2..1fd5f0f86 100644
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@@ -17,7 +17,7 @@ function _rake_command () {
     bin/stubs/rake $@
   elif [ -e "bin/rake" ]; then
     bin/rake $@
-  elif type bundle &> /dev/null && [ -e "Gemfile" ]; then
+  elif type bundle &> /dev/null && ([ -e "Gemfile" ] || [ -e "gems.rb" ]); then
     bundle exec rake $@
   else
     command rake $@
-- 
cgit v1.2.3-70-g09d2


From 39a4f9281b5d41736eb37ab535cb81a909e9f4b1 Mon Sep 17 00:00:00 2001
From: Marco Zühlke <mzuehlke@gmail.com>
Date: Fri, 18 Oct 2019 23:37:51 +0200
Subject: Add Readme.md for supervisor. Sync completion with original source.

---
 plugins/supervisor/README.md      | 13 +++++++++++++
 plugins/supervisor/_supervisorctl |  7 +++++++
 2 files changed, 20 insertions(+)
 create mode 100644 plugins/supervisor/README.md

(limited to 'plugins')

diff --git a/plugins/supervisor/README.md b/plugins/supervisor/README.md
new file mode 100644
index 000000000..25a04c968
--- /dev/null
+++ b/plugins/supervisor/README.md
@@ -0,0 +1,13 @@
+# supervisor plugin
+
+This plugin adds tab-completion for supervisord/supervisorctl in [Supervisor](http://supervisord.org/).
+
+Supervisor is a client/server system that allows its users to monitor and control a number of processes on UNIX-like operating systems.
+
+To use it, add `supervisor` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... supervisor)
+```
+
+These scripts are from [zshcompfunc4supervisor](https://bitbucket.org/hhatto/zshcompfunc4supervisor).
diff --git a/plugins/supervisor/_supervisorctl b/plugins/supervisor/_supervisorctl
index d159f20e0..9f576c0c0 100644
--- a/plugins/supervisor/_supervisorctl
+++ b/plugins/supervisor/_supervisorctl
@@ -112,6 +112,13 @@ _supervisorctl_start() {
         '*::supvervisor process:_get_supervisor_procs'
 }
 
+(( $+functions[_supervisorctl_restart] )) ||
+_supervisorctl_restart() {
+    # TODO: add 'all'
+    _arguments -s \
+        '*::supvervisor process:_get_supervisor_procs'
+}
+
 (( $+functions[_supervisorctl_status] )) ||
 _supervisorctl_status() {
     _arguments \
-- 
cgit v1.2.3-70-g09d2


From 166719c0abecbcea418f2fc1db2939ed811971d4 Mon Sep 17 00:00:00 2001
From: Marco Zühlke <mzuehlke@gmail.com>
Date: Fri, 18 Oct 2019 23:52:26 +0200
Subject: Format docker Readme like the other plugins.

---
 plugins/docker/README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'plugins')

diff --git a/plugins/docker/README.md b/plugins/docker/README.md
index e91798485..f7e5b8fe4 100644
--- a/plugins/docker/README.md
+++ b/plugins/docker/README.md
@@ -1,5 +1,13 @@
 ## Docker autocomplete plugin
 
+This plugin adds auto-completion for docker.
+
+To use it add `docker` to the plugins array in your zshrc file.
+
+```zsh
+plugins=(... docker)
+```
+
 A copy of the completion script from the
 [docker/cli](https://github.com/docker/cli/blob/master/contrib/completion/zsh/_docker)
 git repo.
-- 
cgit v1.2.3-70-g09d2


From f48a40ee91b48ca78703395e07aba5b2dd9e3c97 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sat, 19 Oct 2019 17:28:43 +0200
Subject: Reorganize stuff

---
 plugins/docker/README.md | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'plugins')

diff --git a/plugins/docker/README.md b/plugins/docker/README.md
index f7e5b8fe4..4d9f3ae9b 100644
--- a/plugins/docker/README.md
+++ b/plugins/docker/README.md
@@ -1,13 +1,11 @@
-## Docker autocomplete plugin
+# Docker plugin
 
-This plugin adds auto-completion for docker.
+This plugin adds auto-completion for [docker](https://www.docker.com/).
 
 To use it add `docker` to the plugins array in your zshrc file.
-
 ```zsh
 plugins=(... docker)
 ```
 
-A copy of the completion script from the
-[docker/cli](https://github.com/docker/cli/blob/master/contrib/completion/zsh/_docker)
-git repo.
+A copy of the completion script from the docker/cli git repo:
+https://github.com/docker/cli/blob/master/contrib/completion/zsh/_docker
-- 
cgit v1.2.3-70-g09d2


From 160a801bedc9663db5539d4f663d2c2dbdf6cdcc Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sat, 19 Oct 2019 17:29:46 +0200
Subject: Clean up README

---
 plugins/supervisor/README.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'plugins')

diff --git a/plugins/supervisor/README.md b/plugins/supervisor/README.md
index 25a04c968..1eacea6d3 100644
--- a/plugins/supervisor/README.md
+++ b/plugins/supervisor/README.md
@@ -1,11 +1,10 @@
 # supervisor plugin
 
-This plugin adds tab-completion for supervisord/supervisorctl in [Supervisor](http://supervisord.org/).
-
-Supervisor is a client/server system that allows its users to monitor and control a number of processes on UNIX-like operating systems.
+This plugin adds tab-completion for `supervisord`/`supervisorctl` in [Supervisor](http://supervisord.org/).
+Supervisor is a client/server system that allows its users to monitor and control a number
+of processes on UNIX-like operating systems.
 
 To use it, add `supervisor` to the plugins array in your zshrc file:
-
 ```zsh
 plugins=(... supervisor)
 ```
-- 
cgit v1.2.3-70-g09d2


From aebf333b0ce05bb6710729180335957ceed80dd4 Mon Sep 17 00:00:00 2001
From: Marco Zühlke <mzuehlke@gmail.com>
Date: Sat, 19 Oct 2019 17:39:03 +0200
Subject: magic-enter: update README (#8284)

---
 plugins/magic-enter/Readme.md | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'plugins')

diff --git a/plugins/magic-enter/Readme.md b/plugins/magic-enter/Readme.md
index b401ab415..78514c67d 100644
--- a/plugins/magic-enter/Readme.md
+++ b/plugins/magic-enter/Readme.md
@@ -1,14 +1,17 @@
-## Magic Enter
+## Magic Enter plugin
 
-**Maintainer:** [@dufferzafar](https://github.com/dufferzafar)
-
-Makes your enter key magical, by binding commonly used commands to it.
+This plugin makes your enter key magical, by binding commonly used commands to it.
 
-You can set the commands to be run in your .zshrc, before the line containing plugins!
+To use it, add `magic-enter` to the plugins array in your zshrc file. You can set the
+commands to be run in your .zshrc, before the line containing plugins. If no command
+is specified in a git directory, `git status` is executed; in other directories, `ls`.
 
-```bash
+```zsh
+# defaults
 MAGIC_ENTER_GIT_COMMAND='git status -u .'
 MAGIC_ENTER_OTHER_COMMAND='ls -lh .'
 
-plugins=(magic-enter)
+plugins=(... magic-enter)
 ```
+
+**Maintainer:** [@dufferzafar](https://github.com/dufferzafar)
-- 
cgit v1.2.3-70-g09d2


From 05dfd0ae8520e58e852c574f55c83fe6f49fb189 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sat, 19 Oct 2019 17:51:28 +0200
Subject: cargo: update completion to latest version (cdac4a8)

https://github.com/rust-lang/cargo/blob/cdac4a8/src/etc/_cargo
---
 plugins/cargo/_cargo | 853 +++++++++++++++++++++------------------------------
 1 file changed, 358 insertions(+), 495 deletions(-)

(limited to 'plugins')

diff --git a/plugins/cargo/_cargo b/plugins/cargo/_cargo
index 395c517cd..12694901e 100644
--- a/plugins/cargo/_cargo
+++ b/plugins/cargo/_cargo
@@ -2,489 +2,367 @@
 
 autoload -U regexp-replace
 
-zstyle -T ':completion:*:*:cargo:*' tag-order && \
-  zstyle ':completion:*:*:cargo:*' tag-order 'common-commands'
-
 _cargo() {
-local context state state_descr line
-typeset -A opt_args
-
-# leading items in parentheses are an exclusion list for the arguments following that arg
-# See: http://zsh.sourceforge.net/Doc/Release/Completion-System.html#Completion-Functions
-#   - => exclude all other options
-#   1 => exclude positional arg 1
-#   * => exclude all other args
-#   +blah => exclude +blah
-_arguments \
-    '(- 1 *)'{-h,--help}'[show help message]' \
-    '(- 1 *)--list[list installed commands]' \
-    '(- 1 *)'{-V,--version}'[show version information]' \
-    {-v,--verbose}'[use verbose output]' \
-    --color'[colorization option]' \
-    '(+beta +nightly)+stable[use the stable toolchain]' \
-    '(+stable +nightly)+beta[use the beta toolchain]' \
-    '(+stable +beta)+nightly[use the nightly toolchain]' \
-    '1: :->command' \
-    '*:: :->args'
-
-case $state in
-    command)
-      _alternative 'common-commands:common:_cargo_cmds' 'all-commands:all:_cargo_all_cmds'
-      ;;
-
-    args)
-        case $words[1] in
-            bench)
-                _arguments \
-                    '--features=[space separated feature list]' \
-                    '--all-features[enable all available features]' \
-                    '(-h, --help)'{-h,--help}'[show help message]' \
-                    '(-j, --jobs)'{-j,--jobs}'[number of parallel jobs, defaults to # of CPUs]' \
-                    "${command_scope_spec[@]}" \
-                    '--manifest-path=[path to manifest]: :_files -/' \
-                    '--no-default-features[do not build the default features]' \
-                    '--no-run[compile but do not run]' \
-                    '(-p,--package)'{-p=,--package=}'[package to run benchmarks for]:packages:_get_package_names' \
-                    '--target=[target triple]' \
-                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
-                    '--color=:colorization option:(auto always never)' \
-                    ;;
-
-            build)
-                _arguments \
-                    '--features=[space separated feature list]' \
-                    '--all-features[enable all available features]' \
-                    '(-h, --help)'{-h,--help}'[show help message]' \
-                    '(-j, --jobs)'{-j,--jobs}'[number of parallel jobs, defaults to # of CPUs]' \
-                    "${command_scope_spec[@]}" \
-                    '--manifest-path=[path to manifest]: :_files -/' \
-                    '--no-default-features[do not build the default features]' \
-                    '(-p,--package)'{-p=,--package=}'[package to build]:packages:_get_package_names' \
-                    '--release=[build in release mode]' \
-                    '--target=[target triple]' \
-                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
-                    '--color=:colorization option:(auto always never)' \
-                    ;;
-
-            check)
-                _arguments \
-                    '--features=[space separated feature list]' \
-                    '--all-features[enable all available features]' \
-                    '(-h, --help)'{-h,--help}'[show help message]' \
-                    '(-j, --jobs)'{-j,--jobs}'[number of parallel jobs, defaults to # of CPUs]' \
-                    "${command_scope_spec[@]}" \
-                    '--manifest-path=[path to manifest]: :_files -/' \
-                    '--no-default-features[do not check the default features]' \
-                    '(-p,--package)'{-p=,--package=}'[package to check]:packages:_get_package_names' \
-                    '--release=[check in release mode]' \
-                    '--target=[target triple]' \
-                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
-                    '--color=:colorization option:(auto always never)' \
-                    ;;
-
-            clean)
-                _arguments \
-                    '(-h, --help)'{-h,--help}'[show help message]' \
-                    '--manifest-path=[path to manifest]: :_files -/' \
-                    '(-p,--package)'{-p=,--package=}'[package to clean]:packages:_get_package_names' \
-                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
-                    '--release[whether or not to clean release artifacts]' \
-                    '--target=[target triple(default:all)]' \
-                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=:colorization option:(auto always never)' \
-                    ;;
-
-            doc)
-                _arguments \
-                    '--features=[space separated feature list]' \
-                    '--all-features[enable all available features]' \
-                    '(-h, --help)'{-h,--help}'[show help message]' \
-                    '(-j, --jobs)'{-j,--jobs}'[number of parallel jobs, defaults to # of CPUs]' \
-                    '--manifest-path=[path to manifest]: :_files -/' \
-                    '--no-deps[do not build docs for dependencies]' \
-                    '--no-default-features[do not build the default features]' \
-                    '--open[open docs in browser after the build]' \
-                    '(-p, --package)'{-p,--package}'=[package to document]' \
-                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
-                    '--release[build artifacts in release mode, with optimizations]' \
-                    '--target=[build for the target triple]' \
-                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=:colorization option:(auto always never)' \
-                    ;;
-
-            fetch)
-                _arguments \
-                    '(-h, --help)'{-h,--help}'[show help message]' \
-                    '--manifest-path=[path to manifest]: :_files -/' \
-                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
-                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=:colorization option:(auto always never)' \
-                    ;;
-
-            generate-lockfile)
-                _arguments \
-                    '(-h, --help)'{-h,--help}'[show help message]' \
-                    '--manifest-path=[path to manifest]: :_files -/' \
-                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
-                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=:colorization option:(auto always never)' \
-                    ;;
-
-            git-checkout)
-                _arguments \
-                    '(-h, --help)'{-h,--help}'[show help message]' \
-                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
-                    '--reference=[REF]' \
-                    '--url=[URL]' \
-                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=:colorization option:(auto always never)' \
-                    ;;
-
-            help)
-                _arguments \
-                    '(-h, --help)'{-h,--help}'[show help message]' \
-                    '*: :_cargo_cmds' \
-                    ;;
-
-            init)
-                _arguments \
-                    '--bin[use binary template]' \
-                    '--vcs:initialize a new repo with a given VCS:(git hg none)' \
-                    '(-h, --help)'{-h,--help}'[show help message]' \
-                    '--name=[set the resulting package name]' \
-                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
-                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=:colorization option:(auto always never)' \
-                    ;;
-
-            install)
-                _arguments \
-                    '--bin=[only install the specified binary]' \
-                    '--branch=[branch to use when installing from git]' \
-                    '--color=:colorization option:(auto always never)' \
-                    '--debug[build in debug mode instead of release mode]' \
-                    '--example[install the specified example instead of binaries]' \
-                    '--features=[space separated feature list]' \
-                    '--all-features[enable all available features]' \
-                    '--git=[URL from which to install the crate]' \
-                    '(-h, --help)'{-h,--help}'[show help message]' \
-                    '(-j, --jobs)'{-j,--jobs}'[number of parallel jobs, defaults to # of CPUs]' \
-                    '--no-default-features[do not build the default features]' \
-                    '--path=[local filesystem path to crate to install]: :_files -/' \
-                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
-                    '--rev=[specific commit to use when installing from git]' \
-                    '--root=[directory to install packages into]: :_files -/' \
-                    '--tag=[tag to use when installing from git]' \
-                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--vers=[version to install from crates.io]' \
-                    ;;
-
-            locate-project)
-                _arguments \
-                    '(-h, --help)'{-h,--help}'[show help message]' \
-                    '--manifest-path=[path to manifest]: :_files -/' \
-                    ;;
-
-            login)
-                _arguments \
-                    '(-h, --help)'{-h,--help}'[show help message]' \
-                    '--host=[Host to set the token for]' \
-                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
-                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=:colorization option:(auto always never)' \
-                    ;;
-
-            metadata)
-                _arguments \
-                    '(-h, --help)'{-h,--help}'[show help message]' \
-                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
-                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    "--no-deps[output information only about the root package and don't fetch dependencies]" \
-                    '--no-default-features[do not include the default feature]' \
-                    '--manifest-path=[path to manifest]: :_files -/' \
-                    '--features=[space separated feature list]' \
-                    '--all-features[enable all available features]' \
-                    '--format-version=[format version(default: 1)]' \
-                    '--color=:colorization option:(auto always never)' \
-                    ;;
-
-            new)
-                _arguments \
-                    '--bin[use binary template]' \
-                    '--vcs:initialize a new repo with a given VCS:(git hg none)' \
-                    '(-h, --help)'{-h,--help}'[show help message]' \
-                    '--name=[set the resulting package name]' \
-                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
-                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=:colorization option:(auto always never)' \
-                    ;;
-
-            owner)
-                _arguments \
-                    '(-a, --add)'{-a,--add}'[add owner LOGIN]' \
-                    '(-h, --help)'{-h,--help}'[show help message]' \
-                    '--index[registry index]' \
-                    '(-l, --list)'{-l,--list}'[list owners of a crate]' \
-                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
-                    '(-r, --remove)'{-r,--remove}'[remove owner LOGIN]' \
-                    '--token[API token to use when authenticating]' \
-                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=:colorization option:(auto always never)' \
-                    ;;
-
-            package)
-                _arguments \
-                    '(-h, --help)'{-h,--help}'[show help message]' \
-                    '(-l, --list)'{-l,--list}'[print files included in a package without making one]' \
-                    '--manifest-path=[path to manifest]: :_files -/' \
-                    '--no-metadata[ignore warnings about a lack of human-usable metadata]' \
-                    '--no-verify[do not build to verify contents]' \
-                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
-                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=:colorization option:(auto always never)' \
-                    ;;
-
-            pkgid)
-                _arguments \
-                    '(-h, --help)'{-h,--help}'[show help message]' \
-                    '--manifest-path=[path to manifest]: :_files -/' \
-                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
-                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=:colorization option:(auto always never)' \
-                    ;;
-
-            publish)
-                _arguments \
-                    '(-h, --help)'{-h,--help}'[show help message]' \
-                    '--host=[Host to set the token for]' \
-                    '--manifest-path=[path to manifest]: :_files -/' \
-                    '--no-verify[Do not verify tarball until before publish]' \
-                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
-                    '--token[token to use when uploading]' \
-                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=:colorization option:(auto always never)' \
-                    ;;
-
-            read-manifest)
-                _arguments \
-                    '(-h, --help)'{-h,--help}'[show help message]' \
-                    '--manifest-path=[path to manifest]: :_files -/' \
-                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=:colorization option:(auto always never)' \
-                    ;;
-
-            run)
-                _arguments \
-                    '--example=[name of the bin target]' \
-                    '--features=[space separated feature list]' \
-                    '--all-features[enable all available features]' \
-                    '(-h, --help)'{-h,--help}'[show help message]' \
-                    '(-j, --jobs)'{-j,--jobs}'[number of parallel jobs, defaults to # of CPUs]' \
-                    '--manifest-path=[path to manifest]: :_files -/' \
-                    '--bin=[name of the bin target]' \
-                    '--no-default-features[do not build the default features]' \
-                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
-                    '--release=[build in release mode]' \
-                    '--target=[target triple]' \
-                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=:colorization option:(auto always never)' \
-                    '*: :_normal' \
-                    ;;
-
-            rustc)
-                _arguments \
-                    '--color=:colorization option:(auto always never)' \
-                    '--features=[features to compile for the package]' \
-                    '--all-features[enable all available features]' \
-                    '(-h, --help)'{-h,--help}'[show help message]' \
-                    '(-j, --jobs)'{-j,--jobs}'=[number of parallel jobs, defaults to # of CPUs]' \
-                    '--manifest-path=[path to the manifest to fetch dependencies for]: :_files -/' \
-                    '--no-default-features[do not compile default features for the package]' \
-                    '(-p, --package)'{-p,--package}'=[profile to compile for]' \
-                    '--profile=[profile to build the selected target for]' \
-                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
-                    '--release[build artifacts in release mode, with optimizations]' \
-                    '--target=[target triple which compiles will be for]' \
-                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    "${command_scope_spec[@]}" \
-                    ;;
-
-            rustdoc)
-                _arguments \
-                    '--color=:colorization option:(auto always never)' \
-                    '--features=[space-separated list of features to also build]' \
-                    '--all-features[enable all available features]' \
-                    '(-h, --help)'{-h,--help}'[show help message]' \
-                    '(-j, --jobs)'{-j,--jobs}'=[number of parallel jobs, defaults to # of CPUs]' \
-                    '--manifest-path=[path to the manifest to document]: :_files -/' \
-                    '--no-default-features[do not build the `default` feature]' \
-                    '--open[open the docs in a browser after the operation]' \
-                    '(-p, --package)'{-p,--package}'=[package to document]' \
-                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
-                    '--release[build artifacts in release mode, with optimizations]' \
-                    '--target=[build for the target triple]' \
-                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    "${command_scope_spec[@]}" \
-                    ;;
-
-            search)
-                _arguments \
-                    '--color=:colorization option:(auto always never)' \
-                    '(-h, --help)'{-h,--help}'[show help message]' \
-                    '--host=[host of a registry to search in]' \
-                    '--limit=[limit the number of results]' \
-                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
-                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    ;;
-
-            test)
-                _arguments \
-                    '--features=[space separated feature list]' \
-                    '--all-features[enable all available features]' \
-                    '(-h, --help)'{-h,--help}'[show help message]' \
-                    '(-j, --jobs)'{-j,--jobs}'[number of parallel jobs, defaults to # of CPUs]' \
-                    '--manifest-path=[path to manifest]: :_files -/' \
-                    '--test=[test name]: :_test_names' \
-                    '--no-default-features[do not build the default features]' \
-                    '--no-fail-fast[run all tests regardless of failure]' \
-                    '--no-run[compile but do not run]' \
-                    '(-p,--package)'{-p=,--package=}'[package to run tests for]:packages:_get_package_names' \
-                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
-                    '--release[build artifacts in release mode, with optimizations]' \
-                    '--target=[target triple]' \
-                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=:colorization option:(auto always never)' \
-                    '1: :_test_names' \
-                    '(--doc --bin --example --test --bench)--lib[only test library]' \
-                    '(--lib --bin --example --test --bench)--doc[only test documentation]' \
-                    '(--lib --doc --example --test --bench)--bin=[binary name]' \
-                    '(--lib --doc --bin --test --bench)--example=[example name]' \
-                    '(--lib --doc --bin --example --bench)--test=[test name]' \
-                    '(--lib --doc --bin --example --test)--bench=[benchmark name]' \
-                    '--message-format:error format:(human json short)' \
-                    '--frozen[require lock and cache up to date]' \
-                    '--locked[require lock up to date]'
-                    ;;
-
-            uninstall)
-                _arguments \
-                    '--bin=[only uninstall the binary NAME]' \
-                    '--color=:colorization option:(auto always never)' \
-                    '(-h, --help)'{-h,--help}'[show help message]' \
-                    '(-q, --quiet)'{-q,--quiet}'[less output printed to stdout]' \
-                    '--root=[directory to uninstall packages from]: :_files -/' \
-                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    ;;
-
-            update)
-                _arguments \
-                    '--aggressive=[force dependency update]' \
-                    '(-h, --help)'{-h,--help}'[show help message]' \
-                    '--manifest-path=[path to manifest]: :_files -/' \
-                    '(-p,--package)'{-p=,--package=}'[package to update]:packages:__get_package_names' \
-                    '--precise=[update single dependency to PRECISE]: :' \
-                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
-                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=:colorization option:(auto always never)' \
-                    ;;
-
-            verify-project)
-                _arguments \
-                    '(-h, --help)'{-h,--help}'[show help message]' \
-                    '--manifest-path=[path to manifest]: :_files -/' \
-                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
-                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=:colorization option:(auto always never)' \
-                    ;;
-
-            version)
-                _arguments \
-                    '(-h, --help)'{-h,--help}'[show help message]' \
-                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=:colorization option:(auto always never)' \
-                    ;;
-
-            yank)
-                _arguments \
-                    '(-h, --help)'{-h,--help}'[show help message]' \
-                    '--index[registry index]' \
-                    '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
-                    '--token[API token to use when authenticating]' \
-                    '--undo[undo a yank, putting a version back into the index]' \
-                    '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
-                    '--color=:colorization option:(auto always never)' \
-                    '--vers[yank version]' \
-                    ;;
-        esac
-        ;;
-esac
+    local curcontext="$curcontext" ret=1
+    local -a command_scope_spec common parallel features msgfmt triple target registry
+    local -a state line state_descr # These are set by _arguments
+    typeset -A opt_args
+
+    common=(
+        '(-q --quiet)*'{-v,--verbose}'[use verbose output]'
+        '(-q --quiet -v --verbose)'{-q,--quiet}'[no output printed to stdout]'
+        '-Z+[pass unstable (nightly-only) flags to cargo]: :_cargo_unstable_flags'
+        '--frozen[require that Cargo.lock and cache are up-to-date]'
+        '--locked[require that Cargo.lock is up-to-date]'
+        '--color=[specify colorization option]:coloring:(auto always never)'
+        '(- 1 *)'{-h,--help}'[show help message]'
+    )
+
+    # leading items in parentheses are an exclusion list for the arguments following that arg
+    # See: http://zsh.sourceforge.net/Doc/Release/Completion-System.html#Completion-Functions
+    #   - => exclude all other options
+    #   1 => exclude positional arg 1
+    #   * => exclude all other args
+    #   +blah => exclude +blah
+    _arguments -s -S -C $common \
+        '(- 1 *)--list[list installed commands]' \
+        '(- 1 *)--explain=[provide a detailed explanation of an error message]:error code' \
+        '(- 1 *)'{-V,--version}'[show version information]' \
+        '(+beta +nightly)+stable[use the stable toolchain]' \
+        '(+stable +nightly)+beta[use the beta toolchain]' \
+        '(+stable +beta)+nightly[use the nightly toolchain]' \
+        '1: :_cargo_cmds' \
+        '*:: :->args'
+
+    # These flags are mutually exclusive specifiers for the scope of a command; as
+    # they are used in multiple places without change, they are expanded into the
+    # appropriate command's `_arguments` where appropriate.
+    command_scope_spec=(
+        '(--bin --example --test --lib)--bench=[specify benchmark name]: :_cargo_benchmark_names'
+        '(--bench --bin --test --lib)--example=[specify example name]:example name'
+        '(--bench --example --test --lib)--bin=[specify binary name]:binary name'
+        '(--bench --bin --example --test)--lib=[specify library name]:library name'
+        '(--bench --bin --example --lib)--test=[specify test name]:test name'
+    )
+
+    parallel=(
+        '(-j --jobs)'{-j+,--jobs=}'[specify number of parallel jobs]:jobs [# of CPUs]'
+    )
+
+    features=(
+        '(--all-features)--features=[specify features to activate]:feature'
+        '(--features)--all-features[activate all available features]'
+        "--no-default-features[don't build the default features]"
+    )
+
+    msgfmt='--message-format=[specify error format]:error format [human]:(human json short)'
+    triple='--target=[specify target triple]:target triple'
+    target='--target-dir=[specify directory for all generated artifacts]:directory:_directories'
+    manifest='--manifest-path=[specify path to manifest]:path:_directories'
+    registry='--registry=[specify registry to use]:registry'
+
+    case $state in
+        args)
+            curcontext="${curcontext%:*}-${words[1]}:"
+            case ${words[1]} in
+                bench)
+                    _arguments -s -A "^--" $common $parallel $features $msgfmt $triple $target $manifest \
+                        "${command_scope_spec[@]}" \
+                        '--all-targets[benchmark all targets]' \
+                        "--no-run[compile but don't run]" \
+                        '(-p --package)'{-p+,--package=}'[specify package to run benchmarks for]:package:_cargo_package_names' \
+                        '--exclude=[exclude packages from the benchmark]:spec' \
+                        '--no-fail-fast[run all benchmarks regardless of failure]' \
+                        '1: :_guard "^-*" "bench name"' \
+                        '*:args:_default'
+                        ;;
+
+                build)
+                    _arguments -s -S $common $parallel $features $msgfmt $triple $target $manifest \
+                        '--all-targets[equivalent to specifying --lib --bins --tests --benches --examples]' \
+                        "${command_scope_spec[@]}" \
+                        '(-p --package)'{-p+,--package=}'[specify package to build]:package:_cargo_package_names' \
+                        '--release[build in release mode]' \
+                        '--build-plan[output the build plan in JSON]' \
+                        ;;
+
+                check)
+                    _arguments -s -S $common $parallel $features $msgfmt $triple $target $manifest \
+                        '--all-targets[equivalent to specifying --lib --bins --tests --benches --examples]' \
+                        "${command_scope_spec[@]}" \
+                        '(-p --package)'{-p+,--package=}'[specify package to check]:package:_cargo_package_names' \
+                        '--release[check in release mode]' \
+                        ;;
+
+                clean)
+                    _arguments -s -S $common $triple $target $manifest \
+                        '(-p --package)'{-p+,--package=}'[specify package to clean]:package:_cargo_package_names' \
+                        '--release[clean release artifacts]' \
+                        '--doc[clean just the documentation directory]'
+                        ;;
+
+                doc)
+                    _arguments -s -S $common $parallel $features $msgfmt $triple $target $manifest \
+                        '--no-deps[do not build docs for dependencies]' \
+                        '--document-private-items[include non-public items in the documentation]' \
+                        '--open[open docs in browser after the build]' \
+                        '(-p --package)'{-p+,--package=}'[specify package to document]:package:_cargo_package_names' \
+                        '--release[build artifacts in release mode, with optimizations]' \
+                        ;;
+
+                fetch)
+                    _arguments -s -S $common $triple $manifest
+                        ;;
+
+                fix)
+                    _arguments -s -S $common $parallel $features $msgfmt $triple $target $manifest \
+                        "${command_scope_spec[@]}" \
+                        '--broken-code[fix code even if it already has compiler errors]' \
+                        '--edition[fix in preparation for the next edition]' \
+                        '--edition-idioms[fix warnings to migrate to the idioms of an edition]' \
+                        '--allow-no-vcs[fix code even if a VCS was not detected]' \
+                        '--allow-dirty[fix code even if the working directory is dirty]' \
+                        '--allow-staged[fix code even if the working directory has staged changes]'
+                ;;
+
+                generate-lockfile)
+                    _arguments -s -S $common $manifest
+                        ;;
+
+                git-checkout)
+                    _arguments -s -S $common \
+                        '--reference=:reference' \
+                        '--url=:url:_urls'
+                        ;;
+
+                help)
+                    _cargo_cmds
+                        ;;
+
+                init)
+                    _arguments -s -S $common $registry \
+                        '--lib[use library template]' \
+                        '--edition=[specify edition to set for the crate generated]:edition:(2015 2018)' \
+                        '--vcs=[initialize a new repo with a given VCS]:vcs:(git hg pijul fossil none)' \
+                        '--name=[set the resulting package name]:name' \
+                        '1:path:_directories'
+                        ;;
+
+                install)
+                    _arguments -s -S $common $parallel $features $triple $registry \
+                        '(-f --force)'{-f,--force}'[force overwriting of existing crates or binaries]' \
+                        '--bin=[only install the specified binary]:binary' \
+                        '--branch=[branch to use when installing from git]:branch' \
+                        '--debug[build in debug mode instead of release mode]' \
+                        '--example=[install the specified example instead of binaries]:example' \
+                        '--git=[specify URL from which to install the crate]:url:_urls' \
+                        '--path=[local filesystem path to crate to install]: :_directories' \
+                        '--rev=[specific commit to use when installing from git]:commit' \
+                        '--root=[directory to install packages into]: :_directories' \
+                        '--tag=[tag to use when installing from git]:tag' \
+                        '--vers=[version to install from crates.io]:version' \
+                        '--list[list all installed packages and their versions]' \
+                        '*: :_guard "^-*" "crate"'
+                        ;;
+
+                locate-project)
+                    _arguments -s -S $common $manifest
+                        ;;
+
+                login)
+                    _arguments -s -S $common $registry \
+                        '*: :_guard "^-*" "token"'
+                        ;;
+
+                metadata)
+                    _arguments -s -S $common $features $manifest \
+                        "--no-deps[output information only about the root package and don't fetch dependencies]" \
+                        '--format-version=[specify format version]:version [1]:(1)'
+                        ;;
+
+                new)
+                    _arguments -s -S $common $registry \
+                        '--lib[use library template]' \
+                        '--vcs:initialize a new repo with a given VCS:(git hg none)' \
+                        '--name=[set the resulting package name]'
+                        ;;
+
+                owner)
+                    _arguments -s -S $common $registry \
+                        '(-a --add)'{-a,--add}'[specify name of a user or team to invite as an owner]:name' \
+                        '--index=[specify registry index]:index' \
+                        '(-l --list)'{-l,--list}'[list owners of a crate]' \
+                        '(-r --remove)'{-r,--remove}'[specify name of a user or team to remove as an owner]:name' \
+                        '--token=[specify API token to use when authenticating]:token' \
+                        '*: :_guard "^-*" "crate"'
+                        ;;
+
+                package)
+                    _arguments -s -S $common $parallel $features $triple $target $manifest \
+                        '(-l --list)'{-l,--list}'[print files included in a package without making one]' \
+                        '--no-metadata[ignore warnings about a lack of human-usable metadata]' \
+                        '--allow-dirty[allow dirty working directories to be packaged]' \
+                        "--no-verify[don't build to verify contents]"
+                        ;;
+
+                pkgid)
+                    _arguments -s -S $common $manifest \
+                        '(-p --package)'{-p+,--package=}'[specify package to get ID specifier for]:package:_cargo_package_names' \
+                        '*: :_guard "^-*" "spec"'
+                        ;;
+
+                publish)
+                    _arguments -s -S $common $parallel $features $triple $target $manifest $registry \
+                        '--index=[specify registry index]:index' \
+                        '--allow-dirty[allow dirty working directories to be packaged]' \
+                        "--no-verify[don't verify the contents by building them]" \
+                        '--token=[specify token to use when uploading]:token' \
+                        '--dry-run[perform all checks without uploading]'
+                        ;;
+
+                read-manifest)
+                    _arguments -s -S $common $manifest
+                        ;;
+
+                run)
+                    _arguments -s -S $common $parallel $features $msgfmt $triple $target $manifest \
+                        '--example=[name of the bin target]:name' \
+                        '--bin=[name of the bin target]:name' \
+                        '(-p --package)'{-p+,--package=}'[specify package with the target to run]:package:_cargo_package_names' \
+                        '--release[build in release mode]' \
+                        '*: :_default'
+                        ;;
+
+                rustc)
+                    _arguments -s -S $common $parallel $features $msgfmt $triple $target $manifest \
+                        '(-p --package)'{-p+,--package=}'[specify package to build]:package:_cargo_package_names' \
+                        '--profile=[specify profile to build the selected target for]:profile' \
+                        '--release[build artifacts in release mode, with optimizations]' \
+                        "${command_scope_spec[@]}" \
+                        '*: : _dispatch rustc rustc -default-'
+                        ;;
+
+                rustdoc)
+                    _arguments -s -S $common $parallel $features $msgfmt $triple $target $manifest \
+                        '--document-private-items[include non-public items in the documentation]' \
+                        '--open[open the docs in a browser after the operation]' \
+                        '(-p --package)'{-p+,--package=}'[specify package to document]:package:_cargo_package_names' \
+                        '--release[build artifacts in release mode, with optimizations]' \
+                        "${command_scope_spec[@]}" \
+                        '*: : _dispatch rustdoc rustdoc -default-'
+                        ;;
+
+                search)
+                    _arguments -s -S $common $registry \
+                        '--index=[specify registry index]:index' \
+                        '--limit=[limit the number of results]:results [10]' \
+                        '*: :_guard "^-*" "query"'
+                        ;;
+
+                test)
+                    _arguments -s -S $common $parallel $features $msgfmt $triple $target $manifest \
+                        '--test=[test name]: :_cargo_test_names' \
+                        '--no-fail-fast[run all tests regardless of failure]' \
+                        '--no-run[compile but do not run]' \
+                        '(-p --package)'{-p+,--package=}'[package to run tests for]:package:_cargo_package_names' \
+                        '--all[test all packages in the workspace]' \
+                        '--release[build artifacts in release mode, with optimizations]' \
+                        '1: :_cargo_test_names' \
+                        '(--doc --bin --example --test --bench)--lib[only test library]' \
+                        '(--lib --bin --example --test --bench)--doc[only test documentation]' \
+                        '(--lib --doc --example --test --bench)--bin=[binary name]' \
+                        '(--lib --doc --bin --test --bench)--example=[example name]' \
+                        '(--lib --doc --bin --example --bench)--test=[test name]' \
+                        '(--lib --doc --bin --example --test)--bench=[benchmark name]' \
+                        '*: :_default'
+                        ;;
+
+                uninstall)
+                    _arguments -s -S $common \
+                        '(-p --package)'{-p+,--package=}'[specify package to uninstall]:package:_cargo_package_names' \
+                        '--bin=[only uninstall the specified binary]:name' \
+                        '--root=[directory to uninstall packages from]: :_files -/' \
+                        '*:crate:_cargo_installed_crates -F line'
+                        ;;
+
+                update)
+                    _arguments -s -S $common $manifest \
+                        '--aggressive=[force dependency update]' \
+                        "--dry-run[don't actually write the lockfile]" \
+                        '(-p --package)'{-p+,--package=}'[specify package to update]:package:_cargo_package_names' \
+                        '--precise=[update single dependency to precise release]:release'
+                        ;;
+
+                verify-project)
+                    _arguments -s -S $common $manifest
+                        ;;
+
+                version)
+                    _arguments -s -S $common
+                        ;;
+
+                yank)
+                    _arguments -s -S $common $registry \
+                        '--vers=[specify yank version]:version' \
+                        '--undo[undo a yank, putting a version back into the index]' \
+                        '--index=[specify registry index to yank from]:registry index' \
+                        '--token=[specify API token to use when authenticating]:token' \
+                        '*: :_guard "^-*" "crate"'
+                        ;;
+                *)
+                    # allow plugins to define their own functions
+                    if ! _call_function ret _cargo-${words[1]}; then
+                        # fallback on default completion for unknown commands
+                        _default && ret=0
+                    fi
+                    (( ! ret ))
+                ;;
+            esac
+            ;;
+    esac
+}
+
+_cargo_unstable_flags() {
+    local flags
+    flags=( help ${${${(M)${(f)"$(_call_program flags cargo -Z help)"}:#*--*}/ #-- #/:}##*-Z } )
+    _describe -t flags 'unstable flag' flags
 }
 
-_cargo_cmds(){
-local -a commands;commands=(
-'bench:execute all benchmarks of a local package'
-'build:compile the current package'
-'check:check the current package without compiling'
-'clean:remove generated artifacts'
-'doc:build package documentation'
-'fetch:fetch package dependencies'
-'generate-lockfile:create lockfile'
-'git-checkout:git checkout'
-'help:get help for commands'
-'init:create new package in current directory'
-'install:install a Rust binary'
-'locate-project:print "Cargo.toml" location'
-'login:login to remote server'
-'metadata:the metadata for a package in json'
-'new:create a new package'
-'owner:manage the owners of a crate on the registry'
-'package:assemble local package into a distributable tarball'
-'pkgid:print a fully qualified package specification'
-'publish:upload package to the registry'
-'read-manifest:print manifest in JSON format'
-'run:run the main binary of the local package'
-'rustc:compile a package and all of its dependencies'
-'rustdoc:build documentation for a package'
-'search:search packages on crates.io'
-'test:execute all unit and tests of a local package'
-'uninstall:remove a Rust binary'
-'update:update dependencies'
-'verify-project:check Cargo.toml'
-'version:show version information'
-'yank:remove pushed file from index'
-)
-_describe -t common-commands 'common commands' commands
+_cargo_installed_crates() {
+    local expl
+    _description crates expl 'crate'
+    compadd "$@" "$expl[@]" - ${${${(f)"$(cargo install --list)"}:# *}%% *}
 }
 
-_cargo_all_cmds(){
-local -a commands;commands=($(cargo --list))
-_describe -t all-commands 'all commands' commands
+_cargo_cmds() {
+    local -a commands
+    # This uses Parameter Expansion Flags, which are a built-in Zsh feature.
+    # See more: http://zsh.sourceforge.net/Doc/Release/Expansion.html#Parameter-Expansion-Flags
+    # and       http://zsh.sourceforge.net/Doc/Release/Expansion.html#Parameter-Expansion
+    #
+    # # How this work?
+    #
+    # First it splits the result of `cargo --list` at newline, then it removes the first line.
+    # Then it removes indentation (4 whitespaces) before each items. (Note the x## pattern [1]).
+    # Then it replaces those spaces between item and description with a `:`
+    #
+    # [1]: https://github.com/zsh-users/zsh-completions/blob/master/zsh-completions-howto.org#patterns
+    commands=( ${${${(M)"${(f)$(_call_program commands cargo --list)}":#    *}/ ##/}/ ##/:} )
+    _describe -t commands 'command' commands
 }
 
 
 #FIXME: Disabled until fixed
 #gets package names from the manifest file
-_get_package_names()
-{
-}
-
-#TODO:see if it makes sense to have 'locate-project' to have non-json output.
-#strips package name from json stuff
-_locate_manifest(){
-local manifest=`cargo locate-project 2>/dev/null`
-regexp-replace manifest '\{"root":"|"\}' ''
-echo $manifest
+_cargo_package_names() {
+    _message -e packages package
 }
 
 # Extracts the values of "name" from the array given in $1 and shows them as
 # command line options for completion
-_get_names_from_array()
-{
-    local -a filelist;
-    local manifest=$(_locate_manifest)
+_cargo_names_from_array() {
+    # strip json from the path
+    local manifest=${${${"$(cargo locate-project)"}%\"\}}##*\"}
     if [[ -z $manifest ]]; then
         return 0
     fi
@@ -494,51 +372,36 @@ _get_names_from_array()
     local in_block=false
     local block_name=$1
     names=()
-    while read line
-    do
+    while read -r line; do
         if [[ $last_line == "[[$block_name]]" ]]; then
             in_block=true
         else
-            if [[ $last_line =~ '.*\[\[.*' ]]; then
+            if [[ $last_line =~ '\s*\[\[.*' ]]; then
                 in_block=false
             fi
         fi
 
         if [[ $in_block == true ]]; then
-            if [[ $line =~ '.*name.*=' ]]; then
-                regexp-replace line '^.*name *= *|"' ""
-                names+=$line
+            if [[ $line =~ '\s*name\s*=' ]]; then
+                regexp-replace line '^\s*name\s*=\s*|"' ''
+                names+=( "$line" )
             fi
         fi
 
         last_line=$line
-    done < $manifest
-    _describe $block_name names
+    done < "$manifest"
+    _describe "$block_name" names
 
 }
 
 #Gets the test names from the manifest file
-_test_names()
-{
-    _get_names_from_array "test"
+_cargo_test_names() {
+    _cargo_names_from_array "test"
 }
 
 #Gets the bench names from the manifest file
-_benchmark_names()
-{
-    _get_names_from_array "bench"
+_cargo_benchmark_names() {
+    _cargo_names_from_array "bench"
 }
 
-# These flags are mutually exclusive specifiers for the scope of a command; as
-# they are used in multiple places without change, they are expanded into the
-# appropriate command's `_arguments` where appropriate.
-set command_scope_spec
-command_scope_spec=(
-    '(--bin --example --test --lib)--bench=[benchmark name]: :_benchmark_names'
-    '(--bench --bin --test --lib)--example=[example name]'
-    '(--bench --example --test --lib)--bin=[binary name]'
-    '(--bench --bin --example --test)--lib=[library name]'
-    '(--bench --bin --example --lib)--test=[test name]'
-)
-
 _cargo
-- 
cgit v1.2.3-70-g09d2


From 090ab73daa587cd592bbd03445223bc570f91367 Mon Sep 17 00:00:00 2001
From: Netoun <coulonnier.nicolas.44@gmail.com>
Date: Sun, 20 Oct 2019 19:19:58 +0200
Subject: safe-paste: add README (#8292)

---
 plugins/safe-paste/README.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 plugins/safe-paste/README.md

(limited to 'plugins')

diff --git a/plugins/safe-paste/README.md b/plugins/safe-paste/README.md
new file mode 100644
index 000000000..a2e7ddbfc
--- /dev/null
+++ b/plugins/safe-paste/README.md
@@ -0,0 +1,9 @@
+# safe-paste
+
+Preventing any code from actually running while pasting, so you have a chance to review what was actually pasted before running it.
+
+To use it, add `safe-paste` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... safe-paste)
+```
-- 
cgit v1.2.3-70-g09d2


From a7c740b1d7d0033c6de118439c7935962b2a5c2a Mon Sep 17 00:00:00 2001
From: Kenny Heaton <kenny.heaton@life.church>
Date: Sun, 20 Oct 2019 13:16:37 -0500
Subject: rbenv: add README (#8293)

---
 plugins/rbenv/README.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 plugins/rbenv/README.md

(limited to 'plugins')

diff --git a/plugins/rbenv/README.md b/plugins/rbenv/README.md
new file mode 100644
index 000000000..43a2e93ac
--- /dev/null
+++ b/plugins/rbenv/README.md
@@ -0,0 +1,26 @@
+# rbenv plugin
+
+The primary job of this plugin is to provide `rbenv_prompt_info` which can be added to your theme to include Ruby
+version and gemset information into your prompt.
+
+Some functionality of this plugin will not work unless you also have the rbenv plugin *gemset* installed.
+https://github.com/jf/rbenv-gemset
+
+To use it, add `rbenv` to the plugins array in your zshrc file:
+```zsh
+plugins=(... rbenv)
+```
+
+## Alias
+
+| Alias          | Command             | Description                      |
+|----------------|---------------------|----------------------------------|
+| rubies         | `rbenv versions`    | List the installed Ruby versions |
+| gemsets        | `rbenv gemset list` | List the existing gemsets        |
+
+## Functions
+
+* `current_ruby`: The version of Ruby currently being used.
+* `current_gemset`: The name of the current gemset.
+* `gems`: Lists installed gems with enhanced formatting and color.
+* `rbenv_prompt_info`: For adding information to your prompt. Format: `<ruby version>@<current gemset>`.
-- 
cgit v1.2.3-70-g09d2


From 40df67bc3b9b51caa24df5d220487043040d1f9a Mon Sep 17 00:00:00 2001
From: Tim <0xTim@users.noreply.github.com>
Date: Tue, 22 Oct 2019 17:24:05 +0100
Subject: swiftpm: update completion for Swift 5.1 (#8248)

---
 plugins/swiftpm/README.md |   2 +-
 plugins/swiftpm/_swift    | 190 ++++++++++++++++++++++++----------------------
 2 files changed, 100 insertions(+), 92 deletions(-)

(limited to 'plugins')

diff --git a/plugins/swiftpm/README.md b/plugins/swiftpm/README.md
index 291458511..a722c03e4 100644
--- a/plugins/swiftpm/README.md
+++ b/plugins/swiftpm/README.md
@@ -2,7 +2,7 @@
 
 ## Description
 
-This plugin provides a few utilities that make you faster on your daily work with the [Swift Package Manager](https://github.com/apple/swift-package-manager), as well as autocompletion for Swift 5.0.
+This plugin provides a few utilities that make you faster on your daily work with the [Swift Package Manager](https://github.com/apple/swift-package-manager), as well as autocompletion for Swift 5.1.
 
 To start using it, add the `swiftpm` plugin to your `plugins` array in `~/.zshrc`:
 
diff --git a/plugins/swiftpm/_swift b/plugins/swiftpm/_swift
index 1366b4d9c..fe6f1c9aa 100644
--- a/plugins/swiftpm/_swift
+++ b/plugins/swiftpm/_swift
@@ -82,13 +82,15 @@ _swift_build() {
         "(--verbose -v)"{--verbose,-v}"[Increase verbosity of informational output]"
         "--no-static-swift-stdlib[Do not link Swift stdlib statically \[default\]]"
         "--static-swift-stdlib[Link Swift stdlib statically]"
-        "--enable-llbuild-library[Enable building with the llbuild library]"
         "--force-resolved-versions[]"
         "--disable-automatic-resolution[Disable automatic resolution if Package.resolved file is out-of-date]"
         "--enable-index-store[Enable indexing-while-building feature]"
         "--disable-index-store[Disable indexing-while-building feature]"
         "--enable-pubgrub-resolver[\[Experimental\] Enable the new Pubgrub dependency resolver]"
         "--enable-parseable-module-interfaces[]"
+        "--trace-resolver[]"
+        "(--jobs -j)"{--jobs,-j}"[The number of jobs to spawn in parallel during the build process]:The number of jobs to spawn in parallel during the build process: "
+        "--enable-test-discovery[Enable test discovery on platforms without Objective-C runtime]"
         "--build-tests[Build both source and test targets]"
         "--product[Build the specified product]:Build the specified product: "
         "--target[Build the specified target]:Build the specified target: "
@@ -125,13 +127,15 @@ _swift_run() {
         "(--verbose -v)"{--verbose,-v}"[Increase verbosity of informational output]"
         "--no-static-swift-stdlib[Do not link Swift stdlib statically \[default\]]"
         "--static-swift-stdlib[Link Swift stdlib statically]"
-        "--enable-llbuild-library[Enable building with the llbuild library]"
         "--force-resolved-versions[]"
         "--disable-automatic-resolution[Disable automatic resolution if Package.resolved file is out-of-date]"
         "--enable-index-store[Enable indexing-while-building feature]"
         "--disable-index-store[Disable indexing-while-building feature]"
         "--enable-pubgrub-resolver[\[Experimental\] Enable the new Pubgrub dependency resolver]"
         "--enable-parseable-module-interfaces[]"
+        "--trace-resolver[]"
+        "(--jobs -j)"{--jobs,-j}"[The number of jobs to spawn in parallel during the build process]:The number of jobs to spawn in parallel during the build process: "
+        "--enable-test-discovery[Enable test discovery on platforms without Objective-C runtime]"
         "--skip-build[Skip building the executable product]"
         "--build-tests[Build both source and test targets]"
         "--repl[Launch Swift REPL for the package]"
@@ -166,13 +170,15 @@ _swift_package() {
         "(--verbose -v)"{--verbose,-v}"[Increase verbosity of informational output]"
         "--no-static-swift-stdlib[Do not link Swift stdlib statically \[default\]]"
         "--static-swift-stdlib[Link Swift stdlib statically]"
-        "--enable-llbuild-library[Enable building with the llbuild library]"
         "--force-resolved-versions[]"
         "--disable-automatic-resolution[Disable automatic resolution if Package.resolved file is out-of-date]"
         "--enable-index-store[Enable indexing-while-building feature]"
         "--disable-index-store[Disable indexing-while-building feature]"
         "--enable-pubgrub-resolver[\[Experimental\] Enable the new Pubgrub dependency resolver]"
         "--enable-parseable-module-interfaces[]"
+        "--trace-resolver[]"
+        "(--jobs -j)"{--jobs,-j}"[The number of jobs to spawn in parallel during the build process]:The number of jobs to spawn in parallel during the build process: "
+        "--enable-test-discovery[Enable test discovery on platforms without Objective-C runtime]"
         '(-): :->command'
         '(-)*:: :->arg'
     )
@@ -181,49 +187,61 @@ _swift_package() {
         (command)
             local modes
             modes=(
-                'update:Update package dependencies'
+                'completion-tool:Completion tool (for shell completions)'
+                'dump-package:Print parsed Package.swift as JSON'
                 'describe:Describe the current package'
-                'resolve:Resolve package dependencies'
-                'tools-version:Manipulate tools version of the current package'
-                'unedit:Remove a package from editable mode'
+                'clean:Delete build artifacts'
                 'show-dependencies:Print the resolved dependency graph'
+                'init:Initialize a new package'
+                'unedit:Remove a package from editable mode'
+                'tools-version:Manipulate tools version of the current package'
                 'fetch:'
-                'dump-package:Print parsed Package.swift as JSON'
+                'resolve:Resolve package dependencies'
+                'reset:Reset the complete cache/build directory'
+                'generate-xcodeproj:Generates an Xcode project'
                 'edit:Put a package in editable mode'
                 'config:Manipulate configuration of the package'
-                'completion-tool:Completion tool (for shell completions)'
-                'clean:Delete build artifacts'
-                'generate-xcodeproj:Generates an Xcode project'
-                'reset:Reset the complete cache/build directory'
-                'init:Initialize a new package'
+                'update:Update package dependencies'
             )
             _describe "mode" modes
             ;;
         (arg)
             case ${words[1]} in
-                (update)
-                    _swift_package_update
+                (completion-tool)
+                    _swift_package_completion-tool
+                    ;;
+                (dump-package)
+                    _swift_package_dump-package
                     ;;
                 (describe)
                     _swift_package_describe
                     ;;
-                (resolve)
-                    _swift_package_resolve
+                (clean)
+                    _swift_package_clean
                     ;;
-                (tools-version)
-                    _swift_package_tools-version
+                (show-dependencies)
+                    _swift_package_show-dependencies
+                    ;;
+                (init)
+                    _swift_package_init
                     ;;
                 (unedit)
                     _swift_package_unedit
                     ;;
-                (show-dependencies)
-                    _swift_package_show-dependencies
+                (tools-version)
+                    _swift_package_tools-version
                     ;;
                 (fetch)
                     _swift_package_fetch
                     ;;
-                (dump-package)
-                    _swift_package_dump-package
+                (resolve)
+                    _swift_package_resolve
+                    ;;
+                (reset)
+                    _swift_package_reset
+                    ;;
+                (generate-xcodeproj)
+                    _swift_package_generate-xcodeproj
                     ;;
                 (edit)
                     _swift_package_edit
@@ -231,27 +249,22 @@ _swift_package() {
                 (config)
                     _swift_package_config
                     ;;
-                (completion-tool)
-                    _swift_package_completion-tool
-                    ;;
-                (clean)
-                    _swift_package_clean
-                    ;;
-                (generate-xcodeproj)
-                    _swift_package_generate-xcodeproj
-                    ;;
-                (reset)
-                    _swift_package_reset
-                    ;;
-                (init)
-                    _swift_package_init
+                (update)
+                    _swift_package_update
                     ;;
             esac
             ;;
     esac
 }
 
-_swift_package_update() {
+_swift_package_completion-tool() {
+    arguments=(
+        ": :{_values '' 'generate-bash-script[generate Bash completion script]' 'generate-zsh-script[generate Bash completion script]' 'list-dependencies[list all dependencies' names]' 'list-executables[list all executables' names]'}"
+    )
+    _arguments $arguments && return
+}
+
+_swift_package_dump-package() {
     arguments=(
     )
     _arguments $arguments && return
@@ -264,20 +277,23 @@ _swift_package_describe() {
     _arguments $arguments && return
 }
 
-_swift_package_resolve() {
+_swift_package_clean() {
     arguments=(
-        ":The name of the package to resolve:_swift_dependency"
-        "--version[The version to resolve at]:The version to resolve at: "
-        "--branch[The branch to resolve at]:The branch to resolve at: "
-        "--revision[The revision to resolve at]:The revision to resolve at: "
     )
     _arguments $arguments && return
 }
 
-_swift_package_tools-version() {
+_swift_package_show-dependencies() {
     arguments=(
-        "--set[Set tools version of package to the given value]:Set tools version of package to the given value: "
-        "--set-current[Set tools version of package to the current tools version in use]"
+        "--format[text|dot|json|flatlist]: :{_values '' 'text[list dependencies using text format]' 'dot[list dependencies using dot format]' 'json[list dependencies using JSON format]'}"
+    )
+    _arguments $arguments && return
+}
+
+_swift_package_init() {
+    arguments=(
+        "--type[empty|library|executable|system-module|manifest]: :{_values '' 'empty[generates an empty project]' 'library[generates project for a dynamic library]' 'executable[generates a project for a cli executable]' 'system-module[generates a project for a system module]'}"
+        "--name[Provide custom package name]:Provide custom package name: "
     )
     _arguments $arguments && return
 }
@@ -290,9 +306,10 @@ _swift_package_unedit() {
     _arguments $arguments && return
 }
 
-_swift_package_show-dependencies() {
+_swift_package_tools-version() {
     arguments=(
-        "--format[text|dot|json|flatlist]: :{_values '' 'text[list dependencies using text format]' 'dot[list dependencies using dot format]' 'json[list dependencies using JSON format]'}"
+        "--set[Set tools version of package to the given value]:Set tools version of package to the given value: "
+        "--set-current[Set tools version of package to the current tools version in use]"
     )
     _arguments $arguments && return
 }
@@ -303,8 +320,30 @@ _swift_package_fetch() {
     _arguments $arguments && return
 }
 
-_swift_package_dump-package() {
+_swift_package_resolve() {
     arguments=(
+        ":The name of the package to resolve:_swift_dependency"
+        "--version[The version to resolve at]:The version to resolve at: "
+        "--branch[The branch to resolve at]:The branch to resolve at: "
+        "--revision[The revision to resolve at]:The revision to resolve at: "
+    )
+    _arguments $arguments && return
+}
+
+_swift_package_reset() {
+    arguments=(
+    )
+    _arguments $arguments && return
+}
+
+_swift_package_generate-xcodeproj() {
+    arguments=(
+        "--xcconfig-overrides[Path to xcconfig file]:Path to xcconfig file:_files"
+        "--enable-code-coverage[Enable code coverage in the generated project]"
+        "--output[Path where the Xcode project should be generated]:Path where the Xcode project should be generated:_files"
+        "--legacy-scheme-generator[Use the legacy scheme generator]"
+        "--watch[Watch for changes to the Package manifest to regenerate the Xcode project]"
+        "--skip-extra-files[Do not add file references for extra files to the generated Xcode project]"
     )
     _arguments $arguments && return
 }
@@ -330,8 +369,8 @@ _swift_package_config() {
             local modes
             modes=(
                 'unset-mirror:Remove an existing mirror'
-                'set-mirror:Set a mirror for a dependency'
                 'get-mirror:Print mirror configuration for the given package dependency'
+                'set-mirror:Set a mirror for a dependency'
             )
             _describe "mode" modes
             ;;
@@ -340,12 +379,12 @@ _swift_package_config() {
                 (unset-mirror)
                     _swift_package_config_unset-mirror
                     ;;
-                (set-mirror)
-                    _swift_package_config_set-mirror
-                    ;;
                 (get-mirror)
                     _swift_package_config_get-mirror
                     ;;
+                (set-mirror)
+                    _swift_package_config_set-mirror
+                    ;;
             esac
             ;;
     esac
@@ -359,14 +398,6 @@ _swift_package_config_unset-mirror() {
     _arguments $arguments && return
 }
 
-_swift_package_config_set-mirror() {
-    arguments=(
-        "--package-url[The package dependency url]:The package dependency url: "
-        "--mirror-url[The mirror url]:The mirror url: "
-    )
-    _arguments $arguments && return
-}
-
 _swift_package_config_get-mirror() {
     arguments=(
         "--package-url[The package dependency url]:The package dependency url: "
@@ -374,41 +405,16 @@ _swift_package_config_get-mirror() {
     _arguments $arguments && return
 }
 
-_swift_package_completion-tool() {
-    arguments=(
-        ": :{_values '' 'generate-bash-script[generate Bash completion script]' 'generate-zsh-script[generate Bash completion script]' 'list-dependencies[list all dependencies' names]' 'list-executables[list all executables' names]'}"
-    )
-    _arguments $arguments && return
-}
-
-_swift_package_clean() {
-    arguments=(
-    )
-    _arguments $arguments && return
-}
-
-_swift_package_generate-xcodeproj() {
-    arguments=(
-        "--xcconfig-overrides[Path to xcconfig file]:Path to xcconfig file:_files"
-        "--enable-code-coverage[Enable code coverage in the generated project]"
-        "--output[Path where the Xcode project should be generated]:Path where the Xcode project should be generated:_files"
-        "--legacy-scheme-generator[Use the legacy scheme generator]"
-        "--watch[Watch for changes to the Package manifest to regenerate the Xcode project]"
-        "--skip-extra-files[Do not add file references for extra files to the generated Xcode project]"
-    )
-    _arguments $arguments && return
-}
-
-_swift_package_reset() {
+_swift_package_config_set-mirror() {
     arguments=(
+        "--package-url[The package dependency url]:The package dependency url: "
+        "--mirror-url[The mirror url]:The mirror url: "
     )
     _arguments $arguments && return
 }
 
-_swift_package_init() {
+_swift_package_update() {
     arguments=(
-        "--type[empty|library|executable|system-module]: :{_values '' 'empty[generates an empty project]' 'library[generates project for a dynamic library]' 'executable[generates a project for a cli executable]' 'system-module[generates a project for a system module]'}"
-        "--name[Provide custom package name]:Provide custom package name: "
     )
     _arguments $arguments && return
 }
@@ -440,13 +446,15 @@ _swift_test() {
         "(--verbose -v)"{--verbose,-v}"[Increase verbosity of informational output]"
         "--no-static-swift-stdlib[Do not link Swift stdlib statically \[default\]]"
         "--static-swift-stdlib[Link Swift stdlib statically]"
-        "--enable-llbuild-library[Enable building with the llbuild library]"
         "--force-resolved-versions[]"
         "--disable-automatic-resolution[Disable automatic resolution if Package.resolved file is out-of-date]"
         "--enable-index-store[Enable indexing-while-building feature]"
         "--disable-index-store[Disable indexing-while-building feature]"
         "--enable-pubgrub-resolver[\[Experimental\] Enable the new Pubgrub dependency resolver]"
         "--enable-parseable-module-interfaces[]"
+        "--trace-resolver[]"
+        "(--jobs -j)"{--jobs,-j}"[The number of jobs to spawn in parallel during the build process]:The number of jobs to spawn in parallel during the build process: "
+        "--enable-test-discovery[Enable test discovery on platforms without Objective-C runtime]"
         "--skip-build[Skip building the test target]"
         "(--list-tests -l)"{--list-tests,-l}"[Lists test methods in specifier format]"
         "--generate-linuxmain[Generate LinuxMain.swift entries for the package]"
-- 
cgit v1.2.3-70-g09d2