diff options
| author | Robby Russell <robby@planetargon.com> | 2015-11-12 10:37:00 +0000 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2015-11-12 10:37:00 +0000 |
| commit | 135c3763ccfb07c4a5cde9a2529dfa8d6ba19b39 (patch) | |
| tree | 8ab76915cdc306756952ef948365de7050d2441f /plugins | |
| parent | 9041a23d61d5b5c77aa1616fd15045a3adfcc622 (diff) | |
| parent | 8d388e464c705153e6a4d15bb783048ff5e51612 (diff) | |
| download | zsh-135c3763ccfb07c4a5cde9a2529dfa8d6ba19b39.tar.gz zsh-135c3763ccfb07c4a5cde9a2529dfa8d6ba19b39.tar.bz2 zsh-135c3763ccfb07c4a5cde9a2529dfa8d6ba19b39.zip | |
Merge pull request #4563 from danhawkins/master
use capit instead of shipit as shipit conflicts with npm package shipit
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/capistrano/_capistrano | 6 | ||||
| -rw-r--r-- | plugins/capistrano/capistrano.plugin.zsh | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/capistrano/_capistrano b/plugins/capistrano/_capistrano index c19c20b7a..a79e47b2f 100644 --- a/plugins/capistrano/_capistrano +++ b/plugins/capistrano/_capistrano @@ -1,7 +1,7 @@ -#compdef shipit +#compdef capit #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 local curcontext="$curcontext" state line ret=1 @@ -14,7 +14,7 @@ _arguments -C \ _cap_tasks() { if [[ -f config/deploy.rb || -f Capfile ]]; 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 OLD_IFS=$IFS diff --git a/plugins/capistrano/capistrano.plugin.zsh b/plugins/capistrano/capistrano.plugin.zsh index c85eb474c..0b5559791 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. # http://zsh.sourceforge.net/Doc/Release/Zsh-Modules.html#The-zsh_002fcap-Module -func shipit() { +func capit() { if [ -f Gemfile ] then bundle exec cap $* |