From 80dc29e5accda32496a19108457eca8264865a99 Mon Sep 17 00:00:00 2001
From: ViViDboarder <ViViDboarder@gmail.com>
Date: Fri, 12 Jun 2015 17:34:49 -0700
Subject: [PATCH] Fix path vars

---
 assets/default/dotfiles/bashrc        |  3 +++
 assets/default/fish/custom/paths.load | 11 ++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/assets/default/dotfiles/bashrc b/assets/default/dotfiles/bashrc
index 086adc6..45d45bd 100644
--- a/assets/default/dotfiles/bashrc
+++ b/assets/default/dotfiles/bashrc
@@ -25,6 +25,9 @@ if [[ "$DET_OS" == "linux" ]]; then
 elif [[ "$DET_OS" == "mac" ]]; then
     ANDROID_SDK=$HOME/workspace/android-sdk-macosx
     export PATH=$HOME/Library/Python/2.7/bin:$PATH
+
+    # Fix Python path on OSX to avoid considering System extras over newer versions
+    export PYTHONPATH=/Library/Python/2.7/site-packages:$PYTHONPATH
 fi
 export ANDROID_HOME=$ANDROID_SDK
 export PATH=$PATH:$ANDROID_SDK/platform-tools:$ANDROID_SDK/tools
diff --git a/assets/default/fish/custom/paths.load b/assets/default/fish/custom/paths.load
index 4f79323..23a926f 100644
--- a/assets/default/fish/custom/paths.load
+++ b/assets/default/fish/custom/paths.load
@@ -12,15 +12,20 @@ end
 # opt directory
 set -gx PATH /opt/local/bin /opt/local/sbin $PATH
 
-# Android SDK
-if [ $det_os == "linux" ]
+if [ $det_os = "linux" ]
     set android_sdk $HOME/workspace/adt-bundle-linux/sdk
 
     set -gx GOROOT /usr/local/go
     set -gx PATH $PATH $GOROOT/bin
-else if [ $det_os == "mac" ]
+else if [ $det_os = "mac" ]
     set android_sdk $HOME/workspace/android-sdk-macosx
     # set PATH $HOME/Library/Python/2.7/bin $PATH
+
+    set -gx GOROOT $HOME/workspace/go
+    set -gx PATH $PATH $GOROOT/bin
+
+    # Fix Python path on OSX to avoid considering System extras over newer versions
+    set -gx PYTHONPATH /Library/Python/2.7/site-packages $PYTHONPATH
 end
 
 set -gx ANDROID_HOME $android_sdk