From e8b9958926c6e41fc681983bf4ec7d96e21e27db Mon Sep 17 00:00:00 2001
From: John Burwell <meaux@cockamamy.net>
Date: Sun, 3 Apr 2016 01:08:06 -0400
Subject: [PATCH 1/2] Add jenv plugin

Initializes jenv and provides the jenv_prompt_info funtion to add
Java version information to prompts.  This function is stubbed in
prompt_info_functions script to allow it to be safely called
regardless of whether or not the jenv plugin is loaded.

It also splits detection of the plugin/versions directory and bin directory
to suppport the way Homebrew splits the jenv bin and data directories
---
 lib/prompt_info_functions.zsh |  2 +-
 plugins/jenv/README.md        |  3 +++
 plugins/jenv/jenv.plugin.zsh  | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 plugins/jenv/README.md
 create mode 100644 plugins/jenv/jenv.plugin.zsh

diff --git a/lib/prompt_info_functions.zsh b/lib/prompt_info_functions.zsh
index 335c02a3d..1d5c23e41 100644
--- a/lib/prompt_info_functions.zsh
+++ b/lib/prompt_info_functions.zsh
@@ -12,7 +12,7 @@
 # Real implementations will be used when the respective plugins are loaded
 function chruby_prompt_info hg_prompt_info pyenv_prompt_info \
   rbenv_prompt_info svn_prompt_info vi_mode_prompt_info \
-  virtualenv_prompt_info {
+  virtualenv_prompt_info jenv_prompt_info {
   return 1
 }
 
diff --git a/plugins/jenv/README.md b/plugins/jenv/README.md
new file mode 100644
index 000000000..2f27d6786
--- /dev/null
+++ b/plugins/jenv/README.md
@@ -0,0 +1,3 @@
+# jenv oh-my-zsh plugin
+
+[jenv](http://www.jenv.be/) is a Java version manager similiar to [rbenv](http://rbenv.org/) and [pyenv]|(https://github.com/yyuu/pyenv).  This plugin initializes jenv and adds provides the jenv_prompt_info function to add Java version information to prompts.
diff --git a/plugins/jenv/jenv.plugin.zsh b/plugins/jenv/jenv.plugin.zsh
new file mode 100644
index 000000000..f131aa2f9
--- /dev/null
+++ b/plugins/jenv/jenv.plugin.zsh
@@ -0,0 +1,33 @@
+_homebrew-installed() {
+    type brew &> /dev/null
+}
+
+_jenv-from-homebrew-installed() {
+    brew --prefix jenv &> /dev/null
+}
+
+jenvdirs=("$HOME/.jenv" "/usr/local/jenv" "/opt/jenv")
+if _homebrew-installed && _jenv-from-homebrew-installed ; then
+    jenvdirs+=($(brew --prefix jenv) "${jenvdirs[@]}")
+fi
+
+FOUND_JENV=0
+for jenvdir in "${jenvdirs[@]}" ; do
+    if [ -d $jenvdir/bin -a $FOUND_JENV -eq 0 ] ; then
+        FOUND_JENV=1
+        export PATH="${jenvdir}/bin:$PATH"
+        eval "$(jenv init - zsh)"
+
+        function jenv_prompt_info() {
+          echo "$(jenv version-name)"
+        }
+    fi
+    if [ -d $jenvdir/versions -a $FOUND_JENV -eq 0 ] ; then
+        export JENV_ROOT=$jenvdir
+    fi
+done
+unset jenvdir
+
+if [ $FOUND_JENV -eq 0 ] ; then
+    function jenv_prompt_info() { echo "system: $(java -version 2>&1 | cut -f 2 -d ' ')" }
+fi

From 3a822bb5fdc30e5b623f409af5c894fe9ad90d15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sun, 19 Aug 2018 19:32:48 +0200
Subject: [PATCH 2/2] jenv: refactor and optimize logic

---
 plugins/jenv/jenv.plugin.zsh | 45 +++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/plugins/jenv/jenv.plugin.zsh b/plugins/jenv/jenv.plugin.zsh
index f131aa2f9..6c52635bb 100644
--- a/plugins/jenv/jenv.plugin.zsh
+++ b/plugins/jenv/jenv.plugin.zsh
@@ -1,33 +1,30 @@
-_homebrew-installed() {
-    type brew &> /dev/null
-}
-
-_jenv-from-homebrew-installed() {
-    brew --prefix jenv &> /dev/null
-}
-
 jenvdirs=("$HOME/.jenv" "/usr/local/jenv" "/opt/jenv")
-if _homebrew-installed && _jenv-from-homebrew-installed ; then
-    jenvdirs+=($(brew --prefix jenv) "${jenvdirs[@]}")
-fi
 
 FOUND_JENV=0
-for jenvdir in "${jenvdirs[@]}" ; do
-    if [ -d $jenvdir/bin -a $FOUND_JENV -eq 0 ] ; then
+for jenvdir in $jenvdirs; do
+    if [[ -d "${jenvdir}/bin" ]]; then
         FOUND_JENV=1
-        export PATH="${jenvdir}/bin:$PATH"
-        eval "$(jenv init - zsh)"
-
-        function jenv_prompt_info() {
-          echo "$(jenv version-name)"
-        }
-    fi
-    if [ -d $jenvdir/versions -a $FOUND_JENV -eq 0 ] ; then
-        export JENV_ROOT=$jenvdir
+        break
     fi
 done
-unset jenvdir
 
-if [ $FOUND_JENV -eq 0 ] ; then
+if [[ $FOUND_JENV -eq 0 ]]; then
+    if (( $+commands[brew] )) && jenvdir="$(brew --prefix jenv)"; then
+        FOUND_JENV=1
+    fi
+fi
+
+if [[ $FOUND_JENV -eq 1 ]]; then
+    export PATH="${jenvdir}/bin:$PATH"
+    eval "$(jenv init - zsh)"
+
+    function jenv_prompt_info() { jenv version-name 2>/dev/null }
+
+    if [[ -d "${jenvdir}/versions" ]]; then
+        export JENV_ROOT=$jenvdir
+    fi
+else
     function jenv_prompt_info() { echo "system: $(java -version 2>&1 | cut -f 2 -d ' ')" }
 fi
+
+unset jenvdir FOUND_JENV