commit bc7636dbbb5e16ecb98fef46dc28549c394cc2f9
author Travis Swicegood <travis@domain51.com> 周二 4月 23 20:20:34 2013 -0700
committer Travis Swicegood <travis@domain51.com> 周二 4月 23 20:20:34 2013 -0700
tree bbbedc42bc9fbc33921132df46f70917b2545fc8
parent 0ae68249256e678ad1dae3e9d99f8d113c2943f3
parent e9c9049b2285606da1a167a9d75b9c9fe1d1e24b

Merge pull request #192 from robb1e/master

"git pull --rebase" alias

install.sh

diff --git a/install.sh b/install.sh
index 0f1da39..46edcf2 100755
--- a/install.sh
+++ b/install.sh
@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 BASH_IT="$HOME/.bash_it"
 
-cp $HOME/.bash_profile $HOME/.bash_profile.bak
-
-echo "Your original .bash_profile has been backed up to .bash_profile.bak"
+test -w $HOME/.bash_profile &&
+  cp $HOME/.bash_profile $HOME/.bash_profile.bak &&
+  echo "Your original .bash_profile has been backed up to .bash_profile.bak"
 
 cp $HOME/.bash_it/template/bash_profile.template.bash $HOME/.bash_profile
 

lib/helpers.bash

diff --git a/lib/helpers.bash b/lib/helpers.bash
index e1787fe..b99ae3d 100644
--- a/lib/helpers.bash
+++ b/lib/helpers.bash
@@ -277,6 +277,8 @@
             return
         fi
 
+        mkdir -p $BASH_IT/$subdirectory/enabled
+
         ln -s $BASH_IT/$subdirectory/available/$plugin $BASH_IT/$subdirectory/enabled/$plugin
     fi
 

themes/base.theme.bash

diff --git a/themes/base.theme.bash b/themes/base.theme.bash
index 18c6c9d..5a5edd3 100644
--- a/themes/base.theme.bash
+++ b/themes/base.theme.bash
@@ -108,8 +108,8 @@
     fi
     SCM_PREFIX=${HG_THEME_PROMPT_PREFIX:-$SCM_THEME_PROMPT_PREFIX}
     SCM_SUFFIX=${HG_THEME_PROMPT_SUFFIX:-$SCM_THEME_PROMPT_SUFFIX}
-    SCM_BRANCH=$(hg summary 2> /dev/null | grep branch | awk '{print $2}')
-    SCM_CHANGE=$(hg summary 2> /dev/null | grep parent | awk '{print $2}')
+    SCM_BRANCH=$(hg summary 2> /dev/null | grep branch: | awk '{print $2}')
+    SCM_CHANGE=$(hg summary 2> /dev/null | grep parent: | awk '{print $2}')
 }
 
 function rvm_version_prompt {