Cleans and fixes for mappings

[rbdr/dotfiles] / bash_profile

diff --git a/bash_profile b/bash_profile
index 9c2e2a17bd5321791a985b12e17caaaf703ef7ae..df81cbe677a17a3d97cf70e5e4eba190a0150dce 100644 (file)
--- a/bash_profile
+++ b/bash_profile
@@ -8,16 +8,16 @@ export TERM=screen-256color
 
 #git function
 function _set_git_envar_info() {
 
 #git function
 function _set_git_envar_info() {

-    GIT_BRANCH=""
+  GIT_BRANCH=""

        GIT_PREFIX=""
        GIT_PREFIX=""

-    GIT_STATE=""
+  GIT_STATE=""

        CHECK_SHIT="lol"
  RVM_COMMAND=$(rvm-prompt)
  if [[ $RVM_COMMAND == "" ]]
  then
    RVM_COMMAND="system"
  fi
        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)
     then
         local STATUS
         STATUS=$(git status 2>/dev/null)


@@ -55,7 +55,7 @@ export -f _set_git_envar_info
 
 #this thing for my prompt.
 export PROMPT_COMMAND="_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"
 
 #display fortune when I start
 echo -e "\033[30m"


@@ -72,8 +72,8 @@ alias ls="ls -FG"
 alias rspec="rspec --color"
 
 #Git utility aliases
 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
 
 #Enable Bash Completion
 if [ -f `brew --prefix`/etc/bash_completion ]; then