osx updates, brew.sh updates.

setup.sh

@@ -1,26 +1,33 @@
 #!/usr/bin/env bash
-cd `dirname $BASH_SOURCE` && source resources/bootstrapping.sh
-source dotfiles/lib/shellrc/functions.sh
+function setup() {
+    cd `dirname $BASH_SOURCE` && source resources/bootstrapping.sh
+    source dotfiles/lib/shellrc/functions.sh
+    source dotfiles/lib/shellrc/brew.sh
+    source dotfiles/lib/shellrc/python.sh
 
+    case `uname` in
+        'Darwin')          
+            osx_setup
+            ;;
+        'Linux')
+            source resources/apt-get.sh
+            ;;
+    esac
 
-case `uname` in
-    'Darwin')
-        source resources/osx.sh
-        source resources/brew.sh
-        ;;
-    'Linux')
-        source resources/apt-get.sh
-        ;;
-esac
-
-
-function install_powerline() {
-    hash pip 2>/dev/null || sudo easy_install pip
-    if test -z $(pip show Powerline | grep Location | awk '{print $2}');
-    then
-        sudo pip install --user git+git://github.com/Lokaltog/powerline
-    fi
+    install_powerline
+    source bootstrap.sh
 }
 
-install_powerline
-source bootstrap.sh
+
+function osx_setup() {
+    while getopts "uebsmaho" OPTCHAR;
+    do
+        case $OPTCHAR in
+            h)
+                echo "brew options:"
+                do_the_brew -h
+                exit
+                ;;
+    source resources/osx.sh
+    do_the_brew $@
+}