github-repos/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-12-28 07:50:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4563 from danhawkins/master

Browse Source 
use capit instead of shipit as shipit conflicts with npm package shipit
This commit is contained in:
Robby Russell 2015-11-12 10:37:00 +00:00
commit 135c3763cc
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/capistrano/_capistrano
View File

@ -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

2
plugins/capistrano/capistrano.plugin.zsh
View File

@ -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 $*