Merge pull request #191 from fizerkhan/master
Jitsu aliases
diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash
index 75b8f65..40919f3 100644
--- a/aliases/available/git.aliases.bash
+++ b/aliases/available/git.aliases.bash
@@ -11,6 +11,7 @@
alias gs='git status'
alias gss='git status -s'
alias gl='git pull'
+alias gpr='git pull --rebase'
alias gup='git fetch && git rebase'
alias gp='git push'
alias gpo='git push origin'
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
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
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 {