README.markdown bash/aws.sh bash/git_autocompletion.sh bash/ruby_switcher.sh @@ -46,14 +46,15 @@ alias m8prof='m ~/src/scripts/profile.d/' # ignore svn metadata - pipe this into xargs to do stuff alias no_svn="find . -path '*/.svn' -prune -o -type f -print" -function findfile { find . -name \*$1\* -} -function orig { mv $1 orig-$1 ; cp orig-$1 $1; ls -lt $1 orig-$1 -} -function ps? { ps -aux | grep -i $* | grep -v grep +# grep for a process +function psg { + FIRST=`echo $1 | sed -e 's/^\(.\).*/\1/'` + REST=`echo $1 | sed -e 's/^.\(.*\)/\1/'` + ps aux | grep "[$FIRST]$REST" } # Mac style apache control +# TODO init this style of aliases for darwin arch # alias htstart='sudo /System/Library/StartupItems/Apache/Apache start' # alias htrestart='sudo /System/Library/StartupItems/Apache/Apache restart' # alias htstop='sudo /System/Library/StartupItems/Apache/Apache stop' @@ -69,7 +70,6 @@ alias docs='cd ~/documents' alias scripts='cd ~/src/scripts' alias h?="history | grep " -alias ps?="ps aux | grep " # display battery info on your Mac # see http://blog.justingreer.com/post/45839440/a-tale-of-two-batteries bash/aliases.sh @@ -10,6 +10,15 @@ __prompt_command() { echo ${sub_dir#/} } + + # http://github.com/blog/297-dirty-git-state-in-your-prompt + function parse_git_dirty { + [[ $(git status 2> /dev/null | tail -n1) != "nothing to commit (working directory clean)" ]] && echo "${_bold}*${_normal}" + } + function parse_git_branch { + git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e "s/* \(.*\)/\1$(parse_git_dirty)/" + } + git_dir() { base_dir=$(git rev-parse --show-cdup 2>/dev/null) || return 1 if [ -n "$base_dir" ]; then @@ -19,8 +28,7 @@ __prompt_command() { fi sub_dir=$(git rev-parse --show-prefix) sub_dir="/${sub_dir%/}" - ref=$(git symbolic-ref -q HEAD || git name-rev --name-only HEAD 2>/dev/null) - ref=${ref#refs/heads/} + ref=$(parse_git_branch) vcs="git" alias pull="git pull" alias commit="git commit -v -a" bash/bash_vcs.sh @@ -1,11 +1,10 @@ # Aliases for getting around on a deployed production/staging Rails server. - -if [ -z "${PROJECT_DIR}" ]; then - echo "You must define PROJECT_DIR in ~/.bash_profile for this to work." +if [ -z "${PROJECT_ROOT}" ]; then + echo "You must define PROJECT_ROOT in ~/.bash_profile for this to work it should point at the deploy_to location of your app." fi # TODO add support and autodetection for /data root, maybe the /u root, and allowing user to override the root -PROJECT_ROOT="/var/www/domains/${PROJECT_DIR}/www/app" + PROJECT_CURRENT="${PROJECT_ROOT}/current" PROJECT_SHARED="${PROJECT_ROOT}/shared" bash/deploy.sh @@ -1,6 +1,7 @@ # Thanks to Geoffrey's peepcode for many of these alias g='git ' alias gst='git status' +alias gs='git status' alias gl='git pull' alias gp='git push' alias gd='git diff | mate' @@ -14,10 +15,3 @@ alias gpp='git pull; git push' # For when you are stuck between worlds... alias gsd='git svn dcommit' alias gsr='git svn rebase' - -# git auto completion - don't write your own when its already been done (better) and is in git-core -# sudo port install git-core +bash_completion -if [ -f /opt/local/etc/bash_completion ]; then - . /opt/local/etc/bash_completion - complete -o default -o nospace -F _git g -fi bash/git.sh @@ -10,6 +10,9 @@ fi for PARENT_DIR in ${PROJECT_PARENT_DIRS[@]} ; do if [ -d "$PARENT_DIR" ]; then for PROJECT_DIR in $(ls $PARENT_DIR); do + if [ ! -z `which $PROJECT_DIR` ]; then + continue # don't set alias if there is something already a command on the path with the same name + fi if [ -d "$PARENT_DIR/$PROJECT_DIR" ]; then alias "$PROJECT_DIR"="cd $PARENT_DIR/$PROJECT_DIR" fi bash/project_aliases.sh @@ -21,7 +21,7 @@ alias rdfl='rake db:fixtures:load' alias rdr='rake db:rollback' alias rroutes='rake routes' alias mroutes='rroutes | mate' -alias rmate='mate *.rb Rakefile README* app config doc db lib public script spec test stories features' +alias rmate='mate *.rb Rakefile README* app config doc examples db lib public script spec test stories features' # capistrano alias csd='cap staging deploy' bash/rails.sh @@ -1,9 +1,6 @@ # always load gems for ruby export RUBYOPT=rubygems -# this is broken - disabling for now... -# complete -C ~/src/relevance/etc/bash/rake_autocompletion.rb -o default rake - # rubygems shortcuts (http://stephencelis.com/archive/2008/6/bashfully-yours-gem-shortcuts) alias gems='cd /opt/local/lib/ruby/gems/1.8/gems' export GEMDIR=`gem env gemdir` @@ -16,6 +13,10 @@ _gemdocomplete() { } complete -o default -o nospace -F _gemdocomplete gemdoc +gemlite() { + gem install $1 --no-rdoc --no-ri +} + # unit_record and autotest alias autou='autotest' alias autof='AUTOTEST=functional autotest' bash/ruby.sh 71e6a4b837aea07c6479c536f5e040c45a98d31b c0f4ad613c208eb80a239e1c986ecc9e29aa1d9e Jason Rudolph github@jasonrudolph.com http://github.com/relevance/etc/commit/1fde16029946890f923f64d258513afbdb8bdc88 1fde16029946890f923f64d258513afbdb8bdc88 2009-02-20T18:53:39-08:00 2009-02-20T18:53:39-08:00 Merge branch 'master' of git@github.com:relevance/etc ae3e34a3d475462238095aa209b9b31209e74fa7 Jason Rudolph github@jasonrudolph.com