forked from ohmyzsh/ohmyzsh
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* master: (29 commits) Removed trailing spaces in Git files. Fixes ohmyzsh#867 update rails runner alias to ru adding engine yard command (ey) to bundler binstubs adding rbenv support to all the rvm themes Add middleman to bundled commands Grammar update Updated to latest version of taskwarrior completions (using Taskwarrior 2.0b4) bug : stop creating those ~ directories add powit command to symlink an app if it hasn't been already don't check for tmp dir add alias to view the standard out (puts) from any pow app take in csexton's changes fix for pow plugin to default to current dir added a rake plugin to disable zsh file globbing when calling rake tasks with square brackets fix bundler plugin for root level folders fixing ohmyzsh#812: adding plugins w/o plugin.zsh file to fpath. Add Thor to bundled commands Removed the assignments to fpath as well, since that's all handled in the .oh-my-zsh/oh-my-zsh.sh boot script. Don’t report that Oh My Zsh has been updated when it hasn’t. Removed calls to compinit in the extract and the bundler plugins. compinit should only be called once, after all modules, libs, etc are imported. check if autojump is installed ... Conflicts: lib/git.zsh
- Loading branch information
Showing
33 changed files
with
348 additions
and
159 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -1,5 +1,9 @@ | |||
if [ -f /opt/local/etc/profile.d/autojump.sh ]; then | if [ $commands[autojump] ]; then # check if autojump is installed | ||
. /opt/local/etc/profile.d/autojump.sh | if [ -f /usr/share/autojump/autojump.zsh ]; then # debian and ubuntu package | ||
elif [ -f `brew --prefix`/etc/autojump ]; then | . /usr/share/autojump/autojump.zsh | ||
. `brew --prefix`/etc/autojump | elif [ -f /etc/profile.d/autojump.zsh ]; then # manual installation | ||
. /etc/profile.d/autojump.zsh | |||
elif [ $commands[brew] -a -f `brew --prefix`/etc/autojump ]; then # mac os x with brew | |||
. `brew --prefix`/etc/autojump | |||
fi | |||
fi | fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -1,14 +1,14 @@ | |||
|
|
||
# Mercurial | # Mercurial | ||
alias hgc='hg commit -v' | alias hgc='hg commit' | ||
alias hgb='hg branch -v' | alias hgb='hg branch' | ||
alias hgba='hg branches' | alias hgba='hg branches' | ||
alias hgco='hg checkout' | alias hgco='hg checkout' | ||
alias hgd='hg diff' | alias hgd='hg diff' | ||
alias hged='hg diffmerge' | alias hged='hg diffmerge' | ||
# pull and update | # pull and update | ||
alias hgl='hg pull -u -v' | alias hgl='hg pull -u' | ||
alias hgp='hg push -v' | alias hgp='hg push' | ||
alias hgs='hg status -v' | alias hgs='hg status' | ||
# this is the 'git commit --amend' equivalent | # this is the 'git commit --amend' equivalent | ||
alias hgca='hg qimport -r tip ; hg qrefresh -e ; hg qfinish tip' | alias hgca='hg qimport -r tip ; hg qrefresh -e ; hg qfinish tip' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -1,10 +1,66 @@ | |||
# Thanks to Christopher Sexton | # Restart a rack app running under pow | ||
# https://gist.github.com/965032 | # http://pow.cx/ | ||
function kapow { | # | ||
touch ~/.pow/$1/tmp/restart.txt | # Adds a kapow command that will restart an app | ||
if [ $? -eq 0 ]; then | # | ||
echo "$fg[yellow]Pow restarting $1...$reset_color" | # $ kapow myapp | ||
fi | # | ||
# Supports command completion. | |||
# | |||
# If you are not already using completion you might need to enable it with | |||
# | |||
# autoload -U compinit compinit | |||
# | |||
# Changes: | |||
# | |||
# Defaults to the current application, and will walk up the tree to find | |||
# a config.ru file and restart the corresponding app | |||
# | |||
# Will Detect if a app does not exist in pow and print a (slightly) helpful | |||
# error message | |||
|
|||
rack_root_detect(){ | |||
setopt chaselinks | |||
local orgdir=$(pwd) | |||
local basedir=$(pwd) | |||
|
|||
while [[ $basedir != '/' ]]; do | |||
test -e "$basedir/config.ru" && break | |||
builtin cd ".." 2>/dev/null | |||
basedir="$(pwd)" | |||
done | |||
|
|||
builtin cd $orgdir 2>/dev/null | |||
[[ ${basedir} == "/" ]] && return 1 | |||
echo `basename $basedir | sed -E "s/.(com|net|org)//"` | |||
} | } | ||
|
|
||
kapow(){ | |||
local vhost=$1 | |||
[ ! -n "$vhost" ] && vhost=$(rack_root_detect) | |||
if [ ! -h ~/.pow/$vhost ] | |||
then | |||
echo "pow: This domain isn’t set up yet. Symlink your application to ${vhost} first." | |||
return 1 | |||
fi | |||
|
|||
[ ! -d ~/.pow/${vhost}/tmp ] && mkdir -p ~/.pow/$vhost/tmp | |||
touch ~/.pow/$vhost/tmp/restart.txt; | |||
[ $? -eq 0 ] && echo "pow: restarting $vhost.dev" | |||
} | |||
compctl -W ~/.pow -/ kapow | compctl -W ~/.pow -/ kapow | ||
|
|||
powit(){ | |||
local basedir=$(pwd) | |||
local vhost=$1 | |||
[ ! -n "$vhost" ] && vhost=$(rack_root_detect) | |||
if [ ! -h ~/.pow/$vhost ] | |||
then | |||
echo "pow: Symlinking your app with pow. ${vhost}" | |||
[ ! -d ~/.pow/${vhost} ] && ln -s $basedir ~/.pow/$vhost | |||
return 1 | |||
fi | |||
} | |||
|
|||
# View the standard out (puts) from any pow app | |||
alias kaput="tail -f ~/Library/Logs/Pow/apps/*" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -0,0 +1,6 @@ | |||
alias rake="noglob rake" # allows square brackts for rake task invocation | |||
alias brake='noglob bundle exec rake' # execute the bundled rake gem | |||
alias srake='noglob sudo rake' # noglob must come before sudo | |||
alias sbrake='noglob sudo bundle exec rake' # altogether now ... | |||
|
|||
|
Oops, something went wrong.