Cleaner colors for reuse

diff --git a/themes/base.bash b/themes/base.bash
index 2007c9e..eaf0e83 100644 (file)
--- a/themes/base.bash
+++ b/themes/base.bash
@@ -1,32 +1,30 @@
 #!/bin/bash
 
+# Normal Colors
+GREEN=$'\e[0;32m'
+RED=$'\e[0;31m'
+BLUE=$'\e[0;34m'
+WHITE=$'\e[1;37m'
+BLACK=$'\e[0;30m'
+YELLOW=$'\e[0;33m'
+PURPLE=$'\e[0;35m'
+CYAN=$'\e[0;36m'
+GRAY=$'\e[1;30m'
+PINK=$'\e[37;1;35m'
+ORANGE=$'\e[33;40m'
 
-GREEN='\[\033[0;32m\]'
-RED='\[\033[0;31m\]'
-BLUE='\[\033[0;34m\]'
-PINK='\[\e[37;1;35m\]'
-WHITE='\[\033[1;37m\]'
-BLACK='\[\033[0;30m\]'
-YELLOW='\[\033[0;33m\]'
-PURPLE='\[\033[0;35m\]'
-CYAN='\[\033[0;36m\]'
-GRAY='\[\033[1;30m\]'
-NORMAL='\[\033[00m\]'
+# Revert color back to the normal color
+NORMAL=$'\e[00m'
 
-LIGHT_BLUE='\[\033[1;34m\]'
-LIGHT_GREEN='\[\033[1;32m\]'
-LIGHT_CYAN='\[\033[1;36m\]'
-LIGHT_RED='\[\033[1;31m\]'
-LIGHT_PURPLE='\[\033[1;35m\]'
-LIGHT_YELLOW='\[\033[1;33m\]'
-LIGHT_GRAY='\[\033[0;37m\]'
+# LIGHT COLORS
+LIGHT_BLUE=$'\e[1;34m'
+LIGHT_GREEN=$'\e[1;32m'
+LIGHT_CYAN=$'\e[1;36m'
+LIGHT_RED=$'\e[1;31m'
+LIGHT_PURPLE=$'\e[1;35m'
+LIGHT_YELLOW=$'\e[1;33m'
+LIGHT_GRAY=$'\e[0;37m'
 
-# Stole these from Steve Losh
-# TODO: 
-D=$'\e[37;40m'
-PINK=$'\e[35;40m'
-GREEN=$'\e[32;40m'
-ORANGE=$'\e[33;40m'
 
 # Stolen from Steve Losh
 function prompt_char {

diff --git a/themes/bobby/bobby.bash b/themes/bobby/bobby.bash
index 9dbf147..724eb2c 100644 (file)
--- a/themes/bobby/bobby.bash
+++ b/themes/bobby/bobby.bash
@@ -1,2 +1,2 @@
 #!/bin/bash
-export PS1='\[\033[1;34m\]$(prompt_char)\[\033[1;32m\] $(parse_git_branch) ${ORANGE}\h ${D}in ${GREEN}\w ${D}→ '
\ No newline at end of file
+export PS1='${LIGHT_BLUE}$(prompt_char)${LIGHT_GREEN} $(parse_git_branch) ${ORANGE}\h ${NORMAL}in ${GREEN}\w ${NORMAL}→ '
\ No newline at end of file