vividboarder/shoestrap
1
0
Fork 0
mirror of https://github.com/ViViDboarder/shoestrap.git synced 2024-11-22 05:06:41 +00:00
Code Issues Releases Wiki Activity

Fix path vars

Browse Source
This commit is contained in:
ViViDboarder 2015-06-12 17:34:49 -07:00
parent 655c877c58
commit 80dc29e5ac
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
assets/default/dotfiles/bashrc
View File

@ -25,6 +25,9 @@ if [[ "$DET_OS" == "linux" ]]; then
elif [[ "$DET_OS" == "mac" ]]; then elif [[ "$DET_OS" == "mac" ]]; then
ANDROID_SDK=$HOME/workspace/android-sdk-macosx ANDROID_SDK=$HOME/workspace/android-sdk-macosx
export PATH=$HOME/Library/Python/2.7/bin:$PATH 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 fi
export ANDROID_HOME=$ANDROID_SDK export ANDROID_HOME=$ANDROID_SDK
export PATH=$PATH:$ANDROID_SDK/platform-tools:$ANDROID_SDK/tools export PATH=$PATH:$ANDROID_SDK/platform-tools:$ANDROID_SDK/tools

11
assets/default/fish/custom/paths.load
View File

@ -12,15 +12,20 @@ end
# opt directory # opt directory
set -gx PATH /opt/local/bin /opt/local/sbin $PATH 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 android_sdk $HOME/workspace/adt-bundle-linux/sdk
set -gx GOROOT /usr/local/go set -gx GOROOT /usr/local/go
set -gx PATH $PATH $GOROOT/bin 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 android_sdk $HOME/workspace/android-sdk-macosx
# set PATH $HOME/Library/Python/2.7/bin $PATH # 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 end
set -gx ANDROID_HOME $android_sdk set -gx ANDROID_HOME $android_sdk