removing -e tests when cheking for -f or -d

adding local variable flag and setting the variable if java home isn't
taken care of in the first if check.

For some reason there were different tab widths for this bottom
section, unifying to what the top was at -- 2 spaces.
This commit is contained in:
Daniel Mijares 2014-12-26 11:47:59 -07:00 committed by Bruno Pinto
parent efa2746e45
commit 228b9c5e34

View File

@ -9,14 +9,14 @@ end
# ONLY checked on OSX! Please add for other OS's...
if test -z $JAVA_HOME
if test -e "/usr/libexec/java_home" -a -f "/usr/libexec/java_home"
if test -f "/usr/libexec/java_home"
set -gx JAVA_HOME (/usr/libexec/java_home)
end
set java_homes "/Library/Java/Home" "/System/Library/Frameworks/JavaVM.framework/Home"
if test -z $JAVA_HOME
set -l java_homes "/Library/Java/Home" "/System/Library/Frameworks/JavaVM.framework/Home"
for file in $java_homes
echo $file
if test -e $file -a -d $file
if test -d $file
set -gx JAVA_HOME $file
break
end