From 915ad7863b1416a708c0293ce73dc0ff5b95aa64 Mon Sep 17 00:00:00 2001
From: Vhati <tvtronix@yahoo.com>
Date: Mon, 1 Jan 2018 02:26:14 -0500
Subject: [PATCH] Continuation of commit a999e1e

---
 skel_unix/modman-cli.sh  | 20 +++++++++++++++++---
 skel_unix/modman.command | 29 ++++++++++++++++++++++-------
 2 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/skel_unix/modman-cli.sh b/skel_unix/modman-cli.sh
index ddf2b40..00104c8 100644
--- a/skel_unix/modman-cli.sh
+++ b/skel_unix/modman-cli.sh
@@ -9,12 +9,26 @@ fi
 
 cd "${maindir}";
 
+# Search in $PATH among other places.
 java_cmd=$(command -v java);
 
 # OSX uses a command to decide java's location.
 if [ -x "/usr/libexec/java_home" ]; then
-  export JAVA_HOME=`/usr/libexec/java_home`
-  java_cmd=${JAVA_HOME}/bin/java
+  export JAVA_HOME=$(/usr/libexec/java_home)
+
+  if [ -n "${JAVA_HOME}" ]; then
+    java_cmd=${JAVA_HOME}/bin/java
+  fi
 fi
 
-${java_cmd} -jar modman.jar "$@";
+if [ -n "${java_cmd}" ]; then
+
+  "${java_cmd}" -jar modman.jar "$@";
+
+else
+
+  echo "";
+  echo "This script was unable to find java."
+  echo "";
+
+fi
diff --git a/skel_unix/modman.command b/skel_unix/modman.command
index fdc5b42..1381d8f 100644
--- a/skel_unix/modman.command
+++ b/skel_unix/modman.command
@@ -47,19 +47,34 @@ fi
 cd "${maindir}";
 # - - -
 
+# Search in $PATH among other places.
 java_cmd=$(command -v java);
 
-# OSX uses a command to decide java's location.
+# OSX uses a command to decide java's location (or prompt the user to install it).
 if [ -x "/usr/libexec/java_home" ]; then
-  export JAVA_HOME=`/usr/libexec/java_home`
-  java_cmd=${JAVA_HOME}/bin/java
+  export JAVA_HOME=$(/usr/libexec/java_home --request)
+
+  if [ -n "${JAVA_HOME}" ]; then
+    java_cmd=${JAVA_HOME}/bin/java
+  fi
 fi
 
-echo "";
-echo "Found java at: ${java_cmd}";
-echo "";
+if [ -n "${java_cmd}" ]; then
+
+  echo "";
+  echo "Found java at: ${java_cmd}";
+  echo "";
+
+  "${java_cmd}" -jar modman.jar;
+
+else
+
+  echo "";
+  echo "This script was unable to find java."
+  echo "";
+
+fi
 
-${java_cmd} -jar modman.jar;
 # - - -
 
 if [ "${ingui}" = "1" ]; then