8d388e464c705153e6a4d15bb783048ff5e51612

Author
Danny Hawkins <danny.hawkins@gmail.com>
Committer
Danny Hawkins <danny.hawkins@gmail.com>
Date

Message

use capit instead of shipit as shipit conflicts with npm package shipit

Diff

 1diff --git a/plugins/capistrano/_capistrano b/plugins/capistrano/_capistrano
 2index c19c20b7a814a14f01563111ecb9f1af857ffb70..a79e47b2fa2ef75574e73017197c242932cc717d 100644
 3--- a/plugins/capistrano/_capistrano
 4+++ b/plugins/capistrano/_capistrano
 5@@ -1,7 +1,7 @@
 6-#compdef shipit
 7+#compdef capit
 8 #autoload
 9 
10-# Added `shipit` because `cap` is a reserved word. `cap` completion doesn't work.
11+# Added `capit` because `cap` is a reserved word. `cap` completion doesn't work.
12 # http://zsh.sourceforge.net/Doc/Release/Zsh-Modules.html#The-zsh_002fcap-Module
13 
14 local curcontext="$curcontext" state line ret=1
15@@ -14,7 +14,7 @@ _arguments -C \
16 _cap_tasks() {
17   if [[ -f config/deploy.rb || -f Capfile ]]; then
18     if [[ ! -f .cap_tasks~ ]]; then
19-      shipit --tasks | sed 's/\(\[\)\(.*\)\(\]\)/\2:/' | awk '{command=$2; $1=$2=$3=""; gsub(/^[ \t\r\n]+/, "", $0); gsub(":", "\\:", command); print command"["$0"]"}' > .cap_tasks~
20+      capit --tasks | sed 's/\(\[\)\(.*\)\(\]\)/\2:/' | awk '{command=$2; $1=$2=$3=""; gsub(/^[ \t\r\n]+/, "", $0); gsub(":", "\\:", command); print command"["$0"]"}' > .cap_tasks~
21     fi
22 
23     OLD_IFS=$IFS
24diff --git a/plugins/capistrano/capistrano.plugin.zsh b/plugins/capistrano/capistrano.plugin.zsh
25index c85eb474ca8a9cd85f8f3cc4446e54ce5a5a0c85..0b555979122c213d1fb038049fc00ec192dcb2c6 100644
26--- a/plugins/capistrano/capistrano.plugin.zsh
27+++ b/plugins/capistrano/capistrano.plugin.zsh
28@@ -1,7 +1,7 @@
29 # Added `shipit` because `cap` is a reserved word. `cap` completion doesn't work.
30 # http://zsh.sourceforge.net/Doc/Release/Zsh-Modules.html#The-zsh_002fcap-Module
31 
32-func shipit() {
33+func capit() {
34   if [ -f Gemfile ]
35   then
36     bundle exec cap $*