mirror of
https://github.com/ViViDboarder/shoestrap.git
synced 2025-01-08 07:27:40 +00:00
Fix check for java_home with missing java
This commit is contained in:
parent
40487ecb59
commit
2e7344776f
@ -52,7 +52,7 @@ if [ -d "$ANDROID_HOME" ]; then
|
||||
fi
|
||||
|
||||
# Java paths
|
||||
if type /usr/libexec/java_home &> /dev/null ; then
|
||||
if type /usr/libexec/java_home &> /dev/null && /usr/libexec/java_home &> /dev/null ; then
|
||||
export JAVA_HOME="$(/usr/libexec/java_home)"
|
||||
fi
|
||||
|
||||
|
@ -52,7 +52,7 @@ if [ -d "$ANDROID_HOME" ]; then
|
||||
fi
|
||||
|
||||
# Java paths
|
||||
if type /usr/libexec/java_home &> /dev/null ; then
|
||||
if type /usr/libexec/java_home &> /dev/null && /usr/libexec/java_home &> /dev/null ; then
|
||||
export JAVA_HOME="$(/usr/libexec/java_home)"
|
||||
fi
|
||||
|
||||
|
@ -84,7 +84,7 @@ _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
|
||||
if type -q /usr/libexec/java_home && /usr/libexec/java_home &> /dev/null
|
||||
set -gx JAVA_HOME (/usr/libexec/java_home)
|
||||
end
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user