Clean up python paths on macos

This commit is contained in:
ViViDboarder 2019-10-28 18:15:00 -07:00
parent 7a8fb3370e
commit 720d09fdc4
2 changed files with 10 additions and 5 deletions

View File

@ -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

View File

@ -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