From 720d09fdc4d75dc9e5c761a96f0497a0ec3924fb Mon Sep 17 00:00:00 2001
From: ViViDboarder <ViViDboarder@gmail.com>
Date: Mon, 28 Oct 2019 18:15:00 -0700
Subject: [PATCH] Clean up python paths on macos

---
 assets/default/dotfiles/bashrc      | 8 +++++---
 assets/default/fish/init/paths.fish | 7 +++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/assets/default/dotfiles/bashrc b/assets/default/dotfiles/bashrc
index a315f45..de460e3 100644
--- a/assets/default/dotfiles/bashrc
+++ b/assets/default/dotfiles/bashrc
@@ -30,9 +30,11 @@ elif [[ "$DET_OS" == "mac" ]]; then
     GOPATH=$HOME/workspace/go_path
 
     # Fix Python path on OSX to avoid considering System extras over newer versions
-    # export PATH=$HOME/Library/Python/2.7/bin:$PATH
-    # export PYTHONPATH=/Library/Python/2.7/site-packages:$PYTHONPATH
-    export PYTHONPATH=/opt/local/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages:/Library/Python/2.7/site-packages:$PYTHONPATH
+    # Local
+    export PATH=$HOME/Library/Python/3.7/bin:$HOME/Library/Python/2.7/bin:$PATH
+    export PYTHONPATH=$HOME/Library/Python/2.7/lib/python/site-packages:$PYTHONPATH
+    # MacPorts and system
+    export PYTHONPATH=/opt/local/Library/Frameworks/Python.framework/Versions/Current/lib/python2.7/site-packages:/Library/Python/2.7/site-packages:$PYTHONPATH
 fi
 
 # Android paths
diff --git a/assets/default/fish/init/paths.fish b/assets/default/fish/init/paths.fish
index 0e5bf40..41d1b6a 100644
--- a/assets/default/fish/init/paths.fish
+++ b/assets/default/fish/init/paths.fish
@@ -20,10 +20,13 @@ else if [ $det_os = "mac" ]
     set android_sdk $HOME/workspace/android-sdk-macosx
 
     # Fix Python path on OSX to avoid considering System extras over newer versions
-    set -gx PATH $HOME/Library/Python/2.7/bin $PATH
+    # Local
+    set -gx PATH $HOME/Library/Python/3.7/bin $HOME/Library/Python/2.7/bin $PATH
     set -gx PYTHONPATH $HOME/Library/Python/2.7/lib/python/site-packages:$PYTHONPATH
+    # Macports
     set -gx PATH $PATH /opt/local/Library/Frameworks/Python.framework/Versions/Current/bin
-    set -gx PYTHONPATH /opt/local/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages:$PYTHONPATH
+    # set -gx PYTHONPATH /opt/local/Library/Frameworks/Python.framework/Versions/Current/lib $PYTHONPATH
+    # set -gx PYTHONPATH /opt/local/Library/Frameworks/Python.framework/Versions/Current/lib/python2.7/site-packages /Library/Python/2.7/site-packages $PYTHONPATH
 end
 
 # Add rust path