mirror of
https://github.com/ViViDboarder/shoestrap.git
synced 2024-11-21 22:46:32 +00:00
Fix path vars
This commit is contained in:
parent
655c877c58
commit
80dc29e5ac
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user