Merge ef42010c7b into 279b60e26f

2011-06-12 17:48:40 -07:00 · 2011-06-12 17:48:40 -07:00 · 2aabce1fbe
parent 279b60e26f ef42010c7b
commit 2aabce1fbe
13 changed files with 7 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,4 @@
 aliases/enabled
 plugins/enabled
 .DS_Store
 custom/*.bash
--- a/aliases/available/emacs.aliases.bash
+++ b/aliases/available/emacs.aliases.bash
--- a/aliases/available/general.aliases.bash
+++ b/aliases/available/general.aliases.bash
--- a/aliases/available/git.aliases.bash
+++ b/aliases/available/git.aliases.bash
--- a/aliases/available/heroku.aliases.bash
+++ b/aliases/available/heroku.aliases.bash
--- a/aliases/available/hg.aliases.bash
+++ b/aliases/available/hg.aliases.bash
--- a/aliases/available/jekyll.aliases.bash
+++ b/aliases/available/jekyll.aliases.bash
--- a/aliases/available/osx.aliases.bash
+++ b/aliases/available/osx.aliases.bash
--- a/aliases/available/rails.aliases.bash
+++ b/aliases/available/rails.aliases.bash
--- a/aliases/available/textmate.aliases.bash
+++ b/aliases/available/textmate.aliases.bash
--- a/aliases/available/todo.txt-cli.aliases.bash
+++ b/aliases/available/todo.txt-cli.aliases.bash
--- a/aliases/available/vim.aliases.bash
+++ b/aliases/available/vim.aliases.bash
--- a/bash_it.sh
+++ b/bash_it.sh
@ -37,7 +37,12 @@ do
 done
 # Aliases
-FUNCTIONS="${BASH}/aliases/*.bash"
+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