From e0ae3a7db44f1a8acd162ae435dcf93a3438d34a Mon Sep 17 00:00:00 2001
From: Daniel Mijares <daniel.j.mijares@gmail.com>
Date: Sat, 6 Dec 2014 22:27:14 -0500
Subject: [PATCH] plugin was lacking setting {}_HOME variables for all gvm
 installed binaries, this fixes that.

This also sets JAVA_HOME (only tested on OSX).
---
 plugins/gvm/gvm.load | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/plugins/gvm/gvm.load b/plugins/gvm/gvm.load
index db881e7..f17cc2d 100644
--- a/plugins/gvm/gvm.load
+++ b/plugins/gvm/gvm.load
@@ -1,3 +1,30 @@
 for gvm_path in (find $HOME/.gvm/*/current/bin -maxdepth 0)
   _prepend_path $gvm_path
+  set -l module_info (echo $gvm_path | perl -ne 'm|(.*/.gvm/(\w+)/current)/bin| && print "$1 $2"')
+  set -l module_dir (echo $module_info | awk -F' ' '{print $1}')
+  set -l module_name (echo $module_info | awk -F' ' '{print $2}')
+  set -l module_home (echo $module_name | tr '[:lower:]' '[:upper:]')_HOME
+  set -gx "$module_home" $module_dir
 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
+      end
+   end
+end
+
+if test -z $JAVA_HOME
+   echo "GVM: JAVA_HOME not set please set JAVA_HOME."
+end
+