vividboarder/shoestrap
1
0
Fork 0
mirror of https://github.com/ViViDboarder/shoestrap.git synced 2024-12-04 18:46:47 +00:00
Code Issues Releases Wiki Activity

Clean up android and java paths

Browse Source
This commit is contained in:
ViViDboarder 2024-06-24 11:51:47 -07:00
parent b5108d1259
commit 62ac80be7c
3 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
assets/default/dotfiles/bashrc
View File

@ -24,10 +24,10 @@ if [ -d /opt/local ]; then
fi fi
if [[ "$DET_OS" == "linux" ]]; then 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 GOROOT=/usr/local/go
elif [[ "$DET_OS" == "mac" ]]; then elif [[ "$DET_OS" == "mac" ]]; then
ANDROID_SDK=$HOME/workspace/android-sdk-macosx export ANDROID_HOME="$HOME/Library/Android/sdk"
# Set GOPATH # Set GOPATH
GOROOT=/opt/local/lib/go GOROOT=/opt/local/lib/go
@ -47,9 +47,13 @@ elif [[ "$DET_OS" == "mac" ]]; then
fi fi
# Android paths # Android paths
if [ -d "$ANDROID_SDK" ]; then if [ -d "$ANDROID_HOME" ]; then
export ANDROID_HOME=$ANDROID_SDK export PATH=$PATH:$ANDROID_HOME/platform-tools:$ANDROID_HOME/tools
export PATH=$PATH:$ANDROID_SDK/platform-tools:$ANDROID_SDK/tools fi
# Java paths
if type /usr/libexec/java_home &> /dev/null ; then
export JAVA_HOME="$(/usr/libexec/java_home)"
fi fi
# Go paths # Go paths

14
assets/default/dotfiles/zshrc
View File

@ -25,9 +25,9 @@ if [ -d /opt/local ]; then
fi fi
if [[ "$DET_OS" == "linux" ]]; then 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 elif [[ "$DET_OS" == "mac" ]]; then
ANDROID_SDK=$HOME/workspace/android-sdk-macosx export ANDROID_HOME="$HOME/Library/Android/sdk"
# Set GOPATH # Set GOPATH
GOROOT=/opt/local/lib/go GOROOT=/opt/local/lib/go
@ -47,9 +47,13 @@ elif [[ "$DET_OS" == "mac" ]]; then
fi fi
# Android paths # Android paths
if [ -d "$ANDROID_SDK" ]; then if [ -d "$ANDROID_HOME" ]; then
export ANDROID_HOME=$ANDROID_SDK export PATH=$PATH:$ANDROID_HOME/platform-tools:$ANDROID_HOME/tools
export PATH=$PATH:$ANDROID_SDK/platform-tools:$ANDROID_SDK/tools fi
# Java paths
if type /usr/libexec/java_home &> /dev/null ; then
export JAVA_HOME="$(/usr/libexec/java_home)"
fi fi
# Go paths # Go paths

12
assets/default/fish/init/paths.fish
View File

@ -77,10 +77,16 @@ _maybe_set -p PATH "/usr/local/go/bin"
if [ $det_os = "linux" ] if [ $det_os = "linux" ]
set -gx ANDROID_HOME "$HOME/workspace/adt-bundle-linux/sdk" set -gx ANDROID_HOME "$HOME/workspace/adt-bundle-linux/sdk"
else if [ $det_os = "mac" ] 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 end
_maybe_set -a PATH "$ANDROID_PATH/platform-tools"
_maybe_set -a PATH "$ANDROID_PATH/tools"
# Ruby paths # Ruby paths
if type -q rbenv ; and status --is-interactive if type -q rbenv ; and status --is-interactive