mirror of
https://github.com/ViViDboarder/shoestrap.git
synced 2024-12-03 17:26:47 +00:00
Clean up android and java paths
This commit is contained in:
parent
b5108d1259
commit
62ac80be7c
@ -24,10 +24,10 @@ if [ -d /opt/local ]; then
|
||||
fi
|
||||
|
||||
if [[ "$DET_OS" == "linux" ]]; then
|
||||
ANDROID_SDK=$HOME/workspace/adt-bundle-linux/sdk
|
||||
export ANDROID_HOME="$HOME/workspace/adt-bundle-linux/sdk"
|
||||
GOROOT=/usr/local/go
|
||||
elif [[ "$DET_OS" == "mac" ]]; then
|
||||
ANDROID_SDK=$HOME/workspace/android-sdk-macosx
|
||||
export ANDROID_HOME="$HOME/Library/Android/sdk"
|
||||
|
||||
# Set GOPATH
|
||||
GOROOT=/opt/local/lib/go
|
||||
@ -47,9 +47,13 @@ elif [[ "$DET_OS" == "mac" ]]; then
|
||||
fi
|
||||
|
||||
# Android paths
|
||||
if [ -d "$ANDROID_SDK" ]; then
|
||||
export ANDROID_HOME=$ANDROID_SDK
|
||||
export PATH=$PATH:$ANDROID_SDK/platform-tools:$ANDROID_SDK/tools
|
||||
if [ -d "$ANDROID_HOME" ]; then
|
||||
export PATH=$PATH:$ANDROID_HOME/platform-tools:$ANDROID_HOME/tools
|
||||
fi
|
||||
|
||||
# Java paths
|
||||
if type /usr/libexec/java_home &> /dev/null ; then
|
||||
export JAVA_HOME="$(/usr/libexec/java_home)"
|
||||
fi
|
||||
|
||||
# Go paths
|
||||
|
@ -25,9 +25,9 @@ if [ -d /opt/local ]; then
|
||||
fi
|
||||
|
||||
if [[ "$DET_OS" == "linux" ]]; then
|
||||
ANDROID_SDK=$HOME/workspace/adt-bundle-linux/sdk
|
||||
export ANDROID_HOME="$HOME/workspace/adt-bundle-linux/sdk"
|
||||
elif [[ "$DET_OS" == "mac" ]]; then
|
||||
ANDROID_SDK=$HOME/workspace/android-sdk-macosx
|
||||
export ANDROID_HOME="$HOME/Library/Android/sdk"
|
||||
|
||||
# Set GOPATH
|
||||
GOROOT=/opt/local/lib/go
|
||||
@ -47,9 +47,13 @@ elif [[ "$DET_OS" == "mac" ]]; then
|
||||
fi
|
||||
|
||||
# Android paths
|
||||
if [ -d "$ANDROID_SDK" ]; then
|
||||
export ANDROID_HOME=$ANDROID_SDK
|
||||
export PATH=$PATH:$ANDROID_SDK/platform-tools:$ANDROID_SDK/tools
|
||||
if [ -d "$ANDROID_HOME" ]; then
|
||||
export PATH=$PATH:$ANDROID_HOME/platform-tools:$ANDROID_HOME/tools
|
||||
fi
|
||||
|
||||
# Java paths
|
||||
if type /usr/libexec/java_home &> /dev/null ; then
|
||||
export JAVA_HOME="$(/usr/libexec/java_home)"
|
||||
fi
|
||||
|
||||
# Go paths
|
||||
|
@ -77,10 +77,16 @@ _maybe_set -p PATH "/usr/local/go/bin"
|
||||
if [ $det_os = "linux" ]
|
||||
set -gx ANDROID_HOME "$HOME/workspace/adt-bundle-linux/sdk"
|
||||
else if [ $det_os = "mac" ]
|
||||
set -gx ANDROID_HOME "$HOME/workspace/android-sdk-macosx"
|
||||
set -gx ANDROID_HOME "$HOME/Library/Android/sdk"
|
||||
end
|
||||
_maybe_set -a PATH "$ANDROID_HOME/tools"
|
||||
_maybe_set -a PATH "$ANDROID_HOME/tools/bin"
|
||||
_maybe_set -a PATH "$ANDROID_HOME/platform-tools"
|
||||
|
||||
# Java paths
|
||||
if type -q /usr/libexec/java_home
|
||||
set -gx JAVA_HOME (/usr/libexec/java_home)
|
||||
end
|
||||
_maybe_set -a PATH "$ANDROID_PATH/platform-tools"
|
||||
_maybe_set -a PATH "$ANDROID_PATH/tools"
|
||||
|
||||
# Ruby paths
|
||||
if type -q rbenv ; and status --is-interactive
|
||||
|
Loading…
Reference in New Issue
Block a user