|
|
@ -16,11 +16,7 @@ |
|
|
|
# --------------------------------------------------------------------------- |
|
|
|
|
|
|
|
if [ -f `brew --prefix`/etc/bash_completion ]; then |
|
|
|
. `brew --prefix`/etc/bash_completion |
|
|
|
fi |
|
|
|
|
|
|
|
if [ -f ~/.git-completion.bash ]; then |
|
|
|
. ~/.git-completion.bash |
|
|
|
. `brew --prefix`/etc/bash_completion |
|
|
|
fi |
|
|
|
|
|
|
|
if [ -f ~/.bash_aliases ]; then |
|
|
@ -30,9 +26,7 @@ fi |
|
|
|
# Git branch in prompt. |
|
|
|
|
|
|
|
parse_git_branch() { |
|
|
|
|
|
|
|
git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/' |
|
|
|
|
|
|
|
git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/' |
|
|
|
} |
|
|
|
|
|
|
|
# ------------------------------- |
|
|
@ -43,7 +37,7 @@ parse_git_branch() { |
|
|
|
# ------------------------------------------------------------ |
|
|
|
|
|
|
|
|
|
|
|
# export PS1="\n________________________________________________________________________________\n$BLUEBOLD\$(parse_git_branch) $RED\w $PURPLE@ $GREEN\h $GREENBOLD(\u) $RESETCOLOR=> $WHITE" |
|
|
|
# export PS1="\n________________________________________________________________________________\n$BLUEBOLD\$(parse_git_branch) $RED\w $PURPLE@ $GREEN\h $GREENBOLD(\u) $RESETCOLOR=> $WHITE" |
|
|
|
|
|
|
|
|
|
|
|
# Load the shell dotfiles, and then some: |
|
|
@ -53,7 +47,7 @@ parse_git_branch() { |
|
|
|
source ~/.bash_prompt |
|
|
|
|
|
|
|
for file in ~/.{bash_prompt}; do |
|
|
|
[ -r "$file" ] && [ -f "$file" ] && source "$file"; |
|
|
|
[ -r "$file" ] && [ -f "$file" ] && source "$file"; |
|
|
|
done; |
|
|
|
unset file; |
|
|
|
|
|
|
@ -63,24 +57,24 @@ unset file; |
|
|
|
|
|
|
|
# Set Paths |
|
|
|
# ------------------------------------------------------------ |
|
|
|
export PATH="$PATH:/usr/local/bin/" |
|
|
|
export PATH="/usr/local/git/bin:/sw/bin/:/usr/local/bin:/usr/local/:/usr/local/sbin:/usr/local/mysql/bin:$PATH" |
|
|
|
export PATH="$PATH:/usr/local/bin/" |
|
|
|
export PATH="/usr/local/git/bin:/sw/bin/:/usr/local/bin:/usr/local/:/usr/local/sbin:/usr/local/mysql/bin:$PATH" |
|
|
|
|
|
|
|
# Set Default Editor (change 'Nano' to the editor of your choice) |
|
|
|
# ------------------------------------------------------------ |
|
|
|
export EDITOR=/usr/bin/nano |
|
|
|
export EDITOR=/usr/bin/nano |
|
|
|
|
|
|
|
# Set default blocksize for ls, df, du |
|
|
|
# from this: http://hints.macworld.com/comment.php?mode=view&cid=24491 |
|
|
|
# ------------------------------------------------------------ |
|
|
|
export BLOCKSIZE=1k |
|
|
|
export BLOCKSIZE=1k |
|
|
|
|
|
|
|
# Add color to terminal |
|
|
|
# (this is all commented out as I use Mac Terminal Profiles) |
|
|
|
# from http://osxdaily.com/2012/02/21/add-color-to-the-terminal-in-mac-os-x/ |
|
|
|
# ------------------------------------------------------------ |
|
|
|
export CLICOLOR=1 |
|
|
|
export LSCOLORS=GxFxCxDxBxegedabagaced |
|
|
|
export CLICOLOR=1 |
|
|
|
export LSCOLORS=GxFxCxDxBxegedabagaced |
|
|
|
|
|
|
|
|
|
|
|
# ----------------------------- |
|
|
|