Merge branch master

This commit is contained in:
Geoff Garside 2009-08-31 18:46:16 +01:00
commit d13332b135
5 changed files with 37 additions and 8 deletions

View file

@ -2,7 +2,8 @@ alias pu='pushd'
alias po='popd' alias po='popd'
alias sc='ruby script/console' alias sc='ruby script/console'
alias ss='ruby script/server' alias sd='ruby script/server --debugger'
alias ss='thin --stats "/thin/stats" start'
alias mr='mate CHANGELOG app config db lib public script spec test' alias mr='mate CHANGELOG app config db lib public script spec test'
alias .='pwd' alias .='pwd'
@ -10,7 +11,8 @@ alias ...='cd ../..'
alias _='sudo' alias _='sudo'
alias g='grep -in' #alias g='grep -in'
alias g='git'
alias history='fc -l 1' alias history='fc -l 1'
@ -26,4 +28,9 @@ alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
bindkey '\ew' kill-region bindkey '\ew' kill-region
bindkey -s '\el' "ls\n" bindkey -s '\el' "ls\n"
bindkey -s '\e.' "..\n" bindkey -s '\e.' "..\n"
alias et='mate . &'
alias ett='mate app config lib db public spec test Rakefile Capfile Todo &'
alias etp='mate app config lib db public spec test vendor/plugins vendor/gems Rakefile Capfile Todo &'
alias etts='mate app config lib db public script spec test vendor/plugins vendor/gems Rakefile Capfile Todo &'

View file

@ -22,4 +22,26 @@ function preexec {
function remote_console() { function remote_console() {
/usr/bin/env ssh $1 "( cd $2 && ruby script/console production )" /usr/bin/env ssh $1 "( cd $2 && ruby script/console production )"
} }
function tab() {
osascript 2>/dev/null <<EOF
tell application "System Events"
tell process "Terminal" to keystroke "t" using command down
end
tell application "Terminal"
activate
do script with command "cd $PWD; $*" in window 1
end tell
EOF
}
function take() {
mkdir -p $1
cd $1
}
function tm() {
cd $1
mate $1
}

View file

@ -4,7 +4,7 @@ function git_prompt_info() {
branch=${ref#refs/heads/} branch=${ref#refs/heads/}
if [[ -d .git ]]; then if [[ -d .git ]]; then
CURRENT_BRANCH="%{$fg[red]%}git:(%{$fg[green]${branch}%{$fg[red])" CURRENT_BRANCH="(${branch})"
else else
CURRENT_BRANCH='' CURRENT_BRANCH=''
fi fi

View file

@ -29,4 +29,4 @@ setopt prompt_subst
export LSCOLORS="Gxfxcxdxbxegedabagacad" export LSCOLORS="Gxfxcxdxbxegedabagacad"
source "$ZSH/themes/$ZSH_THEME.zsh-theme" source "$ZSH/themes/$ZSH_THEME.zsh-theme"

4
zshrc
View file

@ -10,6 +10,6 @@ export ZSH_THEME="robbyrussell"
for i in $ZSH/*zsh; do source $i; done; for i in $ZSH/*zsh; do source $i; done;
# Customize to your needs... # Customize to your needs...
export PATH=~/bin:/opt/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/local/sbin:/opt/local/lib/postgresql83/bin #export PATH=~/bin:/opt/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/local/sbin:/opt/local/lib/postgresql83/bin
export PATH=$PATH:$HOME/bin