github-mirror/oh-my-fish
2
0
Fork 0
mirror of https://github.com/oh-my-fish/oh-my-fish.git synced 2024-11-23 08:26:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
plugins/gvm/gvm.load
View File

@ -9,22 +9,22 @@ 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"
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
for file in $java_homes
echo $file
if test -e $file -a -d $file
set -gx JAVA_HOME $file
break
end
if test -f "/usr/libexec/java_home"
set -gx JAVA_HOME (/usr/libexec/java_home)
end
if test -z $JAVA_HOME
set -l java_homes "/Library/Java/Home" "/System/Library/Frameworks/JavaVM.framework/Home"
for file in $java_homes
if test -d $file
set -gx JAVA_HOME $file
break
end
end
end
end
end
if test -z $JAVA_HOME
echo "GVM: JAVA_HOME not set please set JAVA_HOME."
echo "GVM: JAVA_HOME not set please set JAVA_HOME."
end