From: Travis Swicegood <development@domain51.com>
Date: Sat, 29 Oct 2011 23:37:31 +0000 (-0500)
Subject: Merge remote-tracking branch 'jfsiii/master'
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=ad7c1eb304b17a3d8800ffa3a6379ca069f6027f;p=common%2Fbash_it.git

Merge remote-tracking branch 'jfsiii/master'

Conflicts:
	bash_it.sh
---

ad7c1eb304b17a3d8800ffa3a6379ca069f6027f
diff --cc bash_it.sh
index bfa6664,64a9523..ee6957b
--- a/bash_it.sh
+++ b/bash_it.sh
@@@ -22,16 -10,14 +10,16 @@@ alias reload='source ~/.bash_profile
  # Load enabled aliases, completion, plugins
  for file_type in "aliases" "completion" "plugins"
  do
-   if [ ! -d "${BASH}/${file_type}/enabled" ]
+   if [ ! -d "${BASH_IT}/${file_type}/enabled" ]
    then
-     continue 
+     continue
    fi
-   FILES="${BASH}/${file_type}/enabled/*.bash"
+   FILES="${BASH_IT}/${file_type}/enabled/*.bash"
    for config_file in $FILES
    do
 -    source $config_file
 +    if [ -e "${config_file}" ]; then
 +      source $config_file
 +    fi
    done
  done
  
@@@ -42,14 -28,22 +30,24 @@@ the
  fi
  
  # Custom
- CUSTOM="${BASH}/custom/*.bash"
+ CUSTOM="${BASH_IT}/custom/*.bash"
  for config_file in $CUSTOM
  do
 -  source $config_file
 +  if [ -e "${config_file}" ]; then
 +    source $config_file
 +  fi
  done
  
+ # Load colors first so they can be use in base theme
+ source "${BASH_IT}/themes/colors.theme.bash"
+ source "${BASH_IT}/themes/base.theme.bash"
+ 
+ # library
+ LIB="${BASH_IT}/lib/*.bash"
+ for config_file in $LIB
+ do
+   source $config_file
+ done
  
  unset config_file
  if [[ $PROMPT ]]; then