浏览代码

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

Danny Hawkins 8 年之前
父节点
当前提交
8d388e464c
共有 2 个文件被更改,包括 4 次插入4 次删除
  1. 3 3
      plugins/capistrano/_capistrano
  2. 1 1
      plugins/capistrano/capistrano.plugin.zsh

+ 3 - 3
plugins/capistrano/_capistrano

@@ -1,7 +1,7 @@
-#compdef shipit
+#compdef capit
 #autoload
 #autoload
 
 
-# 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
 # http://zsh.sourceforge.net/Doc/Release/Zsh-Modules.html#The-zsh_002fcap-Module
 
 
 local curcontext="$curcontext" state line ret=1
 local curcontext="$curcontext" state line ret=1
@@ -14,7 +14,7 @@ _arguments -C \
 _cap_tasks() {
 _cap_tasks() {
   if [[ -f config/deploy.rb || -f Capfile ]]; then
   if [[ -f config/deploy.rb || -f Capfile ]]; then
     if [[ ! -f .cap_tasks~ ]]; then
     if [[ ! -f .cap_tasks~ ]]; then
-      shipit --tasks | sed 's/\(\[\)\(.*\)\(\]\)/\2:/' | awk '{command=$2; $1=$2=$3=""; gsub(/^[ \t\r\n]+/, "", $0); gsub(":", "\\:", command); print command"["$0"]"}' > .cap_tasks~
+      capit --tasks | sed 's/\(\[\)\(.*\)\(\]\)/\2:/' | awk '{command=$2; $1=$2=$3=""; gsub(/^[ \t\r\n]+/, "", $0); gsub(":", "\\:", command); print command"["$0"]"}' > .cap_tasks~
     fi
     fi
 
 
     OLD_IFS=$IFS
     OLD_IFS=$IFS

+ 1 - 1
plugins/capistrano/capistrano.plugin.zsh

@@ -1,7 +1,7 @@
 # Added `shipit` because `cap` is a reserved word. `cap` completion doesn't work.
 # Added `shipit` because `cap` is a reserved word. `cap` completion doesn't work.
 # http://zsh.sourceforge.net/Doc/Release/Zsh-Modules.html#The-zsh_002fcap-Module
 # http://zsh.sourceforge.net/Doc/Release/Zsh-Modules.html#The-zsh_002fcap-Module
 
 
-func shipit() {
+func capit() {
   if [ -f Gemfile ]
   if [ -f Gemfile ]
   then
   then
     bundle exec cap $*
     bundle exec cap $*