Merge pull request #63 from tswicegood/refactor

Switch to single loop now that all directory use the same pattern

bash_it.sh

@@ -17,43 +17,22 @@ do
   source $config_file
 done
 
-# TODO: reduce the repetition here by combining these three into a loop
+# Load enabled aliases, completion, plugins
-# Tab Completion
+for file_type in "aliases" "completion" "plugins"
-if [ ! -d "${BASH}/completion/enabled" ]
-then
-  mkdir "${BASH}/completion/enabled"
-  ln -s ${BASH}/completion/available/* "${BASH}/completion/enabled"
-fi
-COMPLETION="${BASH}/completion/enabled/*.bash"
-for config_file in $COMPLETION
 do
-  source $config_file
+  if [ ! -d "${BASH}/${file_type}/enabled" ]
-done
+  then
-
+    mkdir "${BASH}/${file_type}/enabled"
-# Plugins
+    ln -s ${BASH}/${file_type}/available/* "${BASH}/${file_type}/enabled"
-if [ ! -d "${BASH}/plugins/enabled" ]
+  fi
-then
+  FILES="${BASH}/${file_type}/enabled/*.bash"
-  mkdir "${BASH}/plugins/enabled"
+  for config_file in $FILES
-  ln -s ${BASH}/plugins/available/* "${BASH}/plugins/enabled"
+  do
-fi
+    source $config_file
-PLUGINS="${BASH}/plugins/enabled/*.bash"
+  done
-for config_file in $PLUGINS
-do
-  source $config_file
-done
-
-# Aliases
-if [ ! -d "${BASH}/aliases/enabled" ]
-then
-  mkdir "${BASH}/aliases/enabled"
-  ln -s ${BASH}/aliases/available/* "${BASH}/aliases/enabled"
-fi
-FUNCTIONS="${BASH}/aliases/enabled/*.bash"
-for config_file in $FUNCTIONS
-do
-  source $config_file
 done
 
+# Load any custom aliases that the user has added
 if [ -e "${BASH}/aliases/custom.aliases.bash" ]
 then
   source "${BASH}/aliases/custom.aliases.bash"