From 6ef2e1f51c42a1e8b96f5ffc8a5b8f1e715d1738 Mon Sep 17 00:00:00 2001 From: To1ne Date: Mon, 12 Oct 2009 21:17:36 +0200 Subject: [PATCH 1/3] Added some comment --- lib/aliases.zsh | 28 ++++++++++++++++++++++------ lib/completion.zsh | 5 ++--- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/lib/aliases.zsh b/lib/aliases.zsh index cd17781a..da616850 100644 --- a/lib/aliases.zsh +++ b/lib/aliases.zsh @@ -1,19 +1,23 @@ +#!/bin/zsh + +# Push and pop directories on directory stack alias pu='pushd' alias po='popd' -alias sc='ruby script/console' -alias sd='ruby script/server --debugger' +# Ruby related alias ss='thin --stats "/thin/stats" start' -alias mr='mate CHANGELOG app config db lib public script spec test' +# Basic directory operations alias .='pwd' alias ...='cd ../..' +# Super user alias _='sudo' alias ss='sudo su -' #alias g='grep -in' +# Git related alias g='git' alias gst='git status' alias gl='git pull' @@ -24,24 +28,36 @@ alias gca='git commit -v -a' alias gb='git branch' alias gba='git branch -a' +# Show history alias history='fc -l 1' -alias ls='ls -F' +# List direcory contents +#alias ls='ls -F' # This messes up colors on my linux system +alias l='ls -la' alias ll='ls -alr' -alias l='ls' -alias ll='ls -l' alias sl=ls # often screw this up alias sgem='sudo gem' +# Find ruby file alias rfind='find . -name *.rb | xargs grep -n' +# Git and svn mix alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk' +# TextMate 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 &' +## Ruby related +# Ruby scripts +alias sc='ruby script/console' +alias sd='ruby script/server --debugger' + +# Editor Ruby file in TextMate +alias mr='mate CHANGELOG app config db lib public script spec test' + diff --git a/lib/completion.zsh b/lib/completion.zsh index 795903d0..7a564d64 100644 --- a/lib/completion.zsh +++ b/lib/completion.zsh @@ -14,7 +14,7 @@ compinit zmodload -i zsh/complist ## case-insensitive (all),partial-word and then substring completion -zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*' +#zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*' zstyle ':completion:*' list-colors '' zstyle ':completion:*' hosts $( sed 's/[, ].*$//' $HOME/.ssh/known_hosts ) @@ -32,8 +32,7 @@ zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z- zstyle ':completion:*:*:*:*:processes' command "ps -u `whoami` -o pid,user,comm -w -w" zstyle ':completion:*:*:(ssh|scp):*:*' hosts `sed 's/^\([^ ,]*\).*$/\1/' ~/.ssh/known_hosts` - -#complete on history +# Complete on history # zstyle ':completion:*:history-words' stop yes # zstyle ':completion:*:history-words' remove-all-dups yes # zstyle ':completion:*:history-words' list false From 11d0b3c2ac271f8d87629c73c9832f135558a6a2 Mon Sep 17 00:00:00 2001 From: Toon Claes Date: Fri, 16 Oct 2009 22:12:31 +0200 Subject: [PATCH 2/3] extended path variable, temporary --- oh-my-zsh.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh index 6e73519b..dd6ffec0 100644 --- a/oh-my-zsh.sh +++ b/oh-my-zsh.sh @@ -6,3 +6,6 @@ for config_file ($ZSH/lib/*.zsh) source $config_file # Load all of your custom configurations from custom/ for config_file ($ZSH/custom/*.zsh) source $config_file + + +export PATH=~/bin:/opt/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/local/sbin:/opt/local/lib/postgresql83/bin From 886d97f41e72b8662232a2c6b196fb60508e4f67 Mon Sep 17 00:00:00 2001 From: Toon Claes Date: Fri, 16 Oct 2009 23:03:50 +0200 Subject: [PATCH 3/3] Removed useless else --- tools/install.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) mode change 100644 => 100755 tools/install.sh diff --git a/tools/install.sh b/tools/install.sh old mode 100644 new mode 100755 index 5c9f5592..5a7c0095 --- a/tools/install.sh +++ b/tools/install.sh @@ -2,11 +2,11 @@ if [ -d ~/.oh-my-zsh ] then echo "You already have Oh My Zsh installed. You'll need to remove ~/.oh-my-zsh if you want to install" exit -else - echo "Cloning Oh My Zsh..." - /usr/bin/env git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh fi +echo "Cloning Oh My Zsh..." +/usr/bin/env git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh + echo "Looking for an existing zsh config..." if [ -f ~/.zshrc ] || [ -h ~/.zshrc ] then @@ -27,4 +27,3 @@ chsh -s /bin/zsh echo "Hooray! Oh My Zsh has been installed." /bin/zsh source ~/.zshrc -