From 30b45038ebd349553c63cc5d17c045a3d793a730 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Tue, 8 Apr 2014 05:50:21 -0700
Subject: [PATCH] Add ls colors.

---
 bootstrap.sh                    | 20 +++++++++++---------
 dotfiles/lib/shellrc/aliases.sh |  8 ++++++++
 dotfiles/lib/shellrc/exports.sh |  4 +++-
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 7e267f35..9a1f457d 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 case `uname` in
     'Darwin')
         readlink_command='greadlink'
@@ -6,29 +6,31 @@ case `uname` in
     *)
         readlink_command='readlink'
 esac
-
-CURRENT_DIRECTORY="$(dirname "${BASH_SOURCE}" | xargs "${readlink_command}" -f)/dotfiles"
-cd $CURRENT_DIRECTORY
-
-echo "Linking From $CURRENT_DIRECTORY"
+DOTFILES_DIRECTORY="$(dirname "${BASH_SOURCE}" | xargs "${readlink_command}" -f)/dotfiles"
 
 function symlink_dotfiles() {
-    [[ -a ~/.dotfiles-backups ]] || mkdir ~/.dotfiles-backups
+    cd $DOTFILES_DIRECTORY
+    [[ -a ~/.dotfiles-backups ]] && mv ~/.dotfiles-backups ~/.dotfiles-backups.old
+    mkdir ~/.dotfiles-backups
     for filename in *; do
         local link_destination="$HOME/.$filename"
         local absolute_path="$($readlink_command -f $filename)"
+        echo "linking $link_destination to $absolute_path"
         [[ -a $link_destination ]] && mv $link_destination ~/.dotfiles-backups
         ln -si $absolute_path $link_destination
     done
+    [[ -a ~/.dotfiles-backups ]] && mv ~/.dotfiles-backups.old ~/.dotfiles-backups/.dotfiles-backups
 }
 
 if [ "$1" == "--force" -o "$1" == "-f" ]; then
-    doIt
+    symlink_dotfiles
 else
-    read -p "This may overwrite existing files in your home directory. Are you sure? (y/n) " -n 1
+    read -p "Symlinking files from $DOTFILES_DIRECTORY. This may overwrite existing files in your home directory. Do you wish to proceed? (y/n) " -n 1
     echo
     if [[ $REPLY =~ ^[Yy]$ ]]; then
 	symlink_dotfiles
     fi
 fi
+
 unset symlink_dotfiles
+unset DOTFILES_DIRECTORY
diff --git a/dotfiles/lib/shellrc/aliases.sh b/dotfiles/lib/shellrc/aliases.sh
index 72199a77..da618a90 100644
--- a/dotfiles/lib/shellrc/aliases.sh
+++ b/dotfiles/lib/shellrc/aliases.sh
@@ -5,6 +5,14 @@ alias emacs="emacsclient -t"
 # enables the sudoing of aliases.
 alias sudo='sudo '
 
+# Detect which `ls` flavor is in use
+if ls --color > /dev/null 2>&1; then # GNU `ls`
+    colorflag="--color"
+else # OS X `ls`
+    colorflag="-G"
+fi
+alias ls="command ls ${colorflag}"
+
 # IP addresses
 alias ip="dig +short myip.opendns.com @resolver1.opendns.com"
 alias localip="ifconfig getifaddr en1"
diff --git a/dotfiles/lib/shellrc/exports.sh b/dotfiles/lib/shellrc/exports.sh
index e009adde..9cec965b 100644
--- a/dotfiles/lib/shellrc/exports.sh
+++ b/dotfiles/lib/shellrc/exports.sh
@@ -18,4 +18,6 @@ export LC_ALL="en_US.UTF-8"
 export LESS_TERMCAP_md="$ORANGE"
 
 # Don’t clear the screen after quitting a manual page
-export MANPAGER="less -X"
\ No newline at end of file
+export MANPAGER="less -X"
+
+export LS_COLORS='no=00:fi=00:di=01;34:ln=01;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.gz=01;31:*.bz2=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.avi=01;35:*.fli=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.ogg=01;35:*.mp3=01;35:*.wav=01;35:'