Skip to content

Commit

Permalink
Updated bashrc for Ubuntu 18.04
Browse files Browse the repository at this point in the history
	modified:   bashrc
  • Loading branch information
AJ-Acevedo committed Nov 8, 2018
1 parent 87132ae commit 3e9bbcd
Showing 1 changed file with 28 additions and 10 deletions.
38 changes: 28 additions & 10 deletions bashrc
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ alias mb='mv'
alias .s='source ~/.bashrc'
alias tocuh='touch'
alias showip='ifconfig | grep "inet" | grep -v 127.0.0.1'
alias fixRSA='ssh-keygen -f ~/.ssh/known_hosts -R'


#-------------------------------------------------------------
Expand All @@ -72,15 +73,18 @@ export HISTCONTROL=ignoreboth:erasedups
# PS1 PROMPT 'user@hostname cwd (git_branch • )$ '
#-------------------------------------------------------------

# Add Git repo/branch and status to the PS1 PROMPT
source ~/.dotfiles/config/git-prompt.sh

# echo -n -e "\033]0;`basename $PWD`\007" Adds the cwd to the shell window and tab
PROMPT_COMMAND='__git_ps1 "\u@\h \W" "\\\$ ";echo -n -e "\033]0;`basename $PWD`\007"'
echo -n -e "\033]0;`basename $PWD`\007"
if [ -f ~/.dotfiles/config/git-prompt.sh ]; then
# Add Git repo/branch and status to the PS1 PROMPT
source ~/.dotfiles/config/git-prompt.sh

export GIT_PS1_SHOWDIRTYSTATE=true
export GIT_PS1_SHOWUNTRACKEDFILES=true
# echo -n -e "\033]0;`basename $PWD`\007" Adds the cwd to the shell window and tab
PROMPT_COMMAND='__git_ps1 "\u@\h \W" "\\\$ ";echo -n -e "\033]0;`basename $PWD`\007"'
echo -n -e "\033]0;`basename $PWD`\007"

export GIT_PS1_SHOWDIRTYSTATE=true
export GIT_PS1_SHOWUNTRACKEDFILES=true
fi

#-------------------------------------------------------------
# MISC
Expand Down Expand Up @@ -118,8 +122,9 @@ PATH=$(echo -n $PATH | awk -v RS=: -v ORS=: '!($0 in a) {a[$0]; print}' | sed "s
[[ -r $rvm_path/scripts/completion ]] && . $rvm_path/scripts/completion

# Git
source ~/.dotfiles/config/git-completion.sh

if [ -f ~/.dotfiles/config/git-completion.sh ]; then
source ~/.dotfiles/config/git-completion.sh
fi

#-------------------------------------------------------------
# Environments
Expand All @@ -135,6 +140,19 @@ export NODE_ENV=development
[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"


#-------------------------------------------------------------
# Python
#-------------------------------------------------------------

# Prevent those pesky .pyc and __pycache__ files/folder from being created.
#TODO: Fix conditional to not use which
if which python >/dev/null; then
export PYTHONDONTWRITEBYTECODE=1
else
echo "Python is not installed"
fi


##############################################################
# BEGIN - macOS Specific configurations
##############################################################
Expand Down Expand Up @@ -183,7 +201,7 @@ if [ `uname -s` == "Linux" ]; then
#-------------------------------------------------------------
# Linux specific aliases
#-------------------------------------------------------------
alias ls='ls -alh'
alias ls='ls --color -alh'

#-------------------------------------------------------------
# Set default Editor to vi
Expand Down

0 comments on commit 3e9bbcd

Please sign in to comment.