X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/blobdiff_plain/b100af91583692c01e3b68944875f8d8c2679983..a72dc03e3449cd17faf08adc589240d70c731aa1:/bash_profile diff --git a/bash_profile b/bash_profile index 86153d8..df81cbe 100644 --- a/bash_profile +++ b/bash_profile @@ -4,26 +4,20 @@ export NODE_PATH=/usr/local/lib/node_modules:$NODE_PATH #Java HOME Adition export JAVA_HOME=$(/usr/libexec/java_home) -#Amazon Stuff -export EC2_HOME=/Users/benbeltran/Documents/code/tools/ec2-api-tools-1.5.2.4 -export PATH=$PATH:$EC2_HOME/bin -export EC2_PRIVATE_KEY=~/.ec2/pk-XBFB3HSRRZAILOFUPE44QAJI5M4Z5TNN.pem -export EC2_CERT=~/.ec2/cert-XBFB3HSRRZAILOFUPE44QAJI5M4Z5TNN.pem - export TERM=screen-256color #git function function _set_git_envar_info() { - GIT_BRANCH="" + GIT_BRANCH="" GIT_PREFIX="" - GIT_STATE="" + GIT_STATE="" CHECK_SHIT="lol" RVM_COMMAND=$(rvm-prompt) if [[ $RVM_COMMAND == "" ]] then RVM_COMMAND="system" fi - if [[ $(which git 2> /dev/null) ]] + if [ -f `which git` ]; then local STATUS STATUS=$(git status 2>/dev/null) @@ -61,7 +55,7 @@ export -f _set_git_envar_info #this thing for my prompt. export PROMPT_COMMAND="_set_git_envar_info" -export PS1='\[\e[0;31m\]\u\[\e[0m\] at \[\e[0;33m\]\h\[\e[0m\] in \[\e[0;32m\]\w\[\e[0m\]$GIT_PREFIX\[\e[1;34m\]$GIT_BRANCH\[\e[0m\]\[\e[0;32m\]$GIT_STATE \[\e[0;33m\]($RVM_COMMAND) \[\e[0m\] \n\$ ' +export PS1='\[\e[0;31m\]\u\[\e[0m\] at \[\e[0;33m\]\h\[\e[0m\] in \[\e[0;32m\]\w\[\e[0m\]$GIT_PREFIX\[\e[1;34m\]$GIT_BRANCH\[\e[0m\]\[\e[0;32m\]$GIT_STATE \[\e[0;30m\]($RVM_COMMAND) \[\e[0m\] \n\$ ' #display fortune when I start echo -e "\033[30m" @@ -78,8 +72,8 @@ alias ls="ls -FG" alias rspec="rspec --color" #Git utility aliases -alias gpsc="git push origin "+$GIT_BRANCH -alias gplc="git pull origin "+$GIT_BRANCH +alias gpsc="git push origin $GIT_BRANCH" +alias gplc="git pull origin $GIT_BRANCH" #Enable Bash Completion if [ -f `brew --prefix`/etc/bash_completion ]; then