dcarrillo/prezto
1
0
Fork 0
mirror of https://github.com/dcarrillo/prezto.git synced 2025-06-16 03:11:42 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh

Browse Source 
Conflicts:
	.gitignore
	lib/aliases.zsh
	lib/completion.zsh
	lib/functions.zsh
	lib/git.zsh
	lib/key-bindings.zsh
	lib/misc.zsh
	lib/spectrum.zsh
	plugins/git/git.plugin.zsh
	plugins/osx/_man-preview
	plugins/osx/osx.plugin.zsh
	plugins/svn/svn.plugin.zsh
	templates/zshrc.zsh-template
	themes/lukerandall.zsh-theme
	themes/philips.zsh-theme
	tools/upgrade.sh
This commit is contained in:
Sorin Ionescu
2011-08-26 02:58:19 -04:00
parent 0e284f6c2a
commit ba9900a488
20 changed files with 1825 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/rails3/rails3.plugin.zsh
View File

@ -1,13 +1,5 @@
# Rails 3 aliases, backwards-compatible with Rails 2.
function _bundle_command {
if command -v bundle && [ -e "Gemfile" ]; then
bundle exec $@
else
$@
fi
}
function _rails_command () {
if [ -e "script/server" ]; then
ruby script/$@
@ -25,6 +17,3 @@ alias rp='_rails_command plugin'
alias rs='_rails_command server'
alias rsd='_rails_command server --debugger'
alias devlog='tail -f log/development.log'
alias rspec='_bundle_command rspec'
alias cuke='_bundle_command cucumber'