You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by lk...@apache.org on 2020/07/14 07:05:34 UTC
[netbeans] branch master updated: [NETBEANS-4548] Enable launcher
to detect java installed by sdkman
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 0c0c12e [NETBEANS-4548] Enable launcher to detect java installed by sdkman
0c0c12e is described below
commit 0c0c12e038a2c2b29a0a39554a8cab8f83e1298c
Author: Laszlo Kishalmi <la...@gmail.com>
AuthorDate: Mon Jul 6 12:29:23 2020 -0700
[NETBEANS-4548] Enable launcher to detect java installed by sdkman
---
platform/o.n.bootstrap/launcher/unix/nbexec | 64 ++++++++++++++++-------------
1 file changed, 35 insertions(+), 29 deletions(-)
diff --git a/platform/o.n.bootstrap/launcher/unix/nbexec b/platform/o.n.bootstrap/launcher/unix/nbexec
index df47fa0..ca7d16b 100644
--- a/platform/o.n.bootstrap/launcher/unix/nbexec
+++ b/platform/o.n.bootstrap/launcher/unix/nbexec
@@ -132,36 +132,42 @@ parse_args "$@"
#
if [ -z "$jdkhome" ] ; then
- # try to find JDK
- case "`uname`" in
- Darwin*)
- # read Java Preferences
- if [ -x "/usr/libexec/java_home" ]; then
- jdkhome=`/usr/libexec/java_home --version 1.8.0+ --failfast`
-
- # JDK1.8 as a fallback
- elif [ -f "/Library/Java/JavaVirtualMachines/jdk1.8.0.jdk/Contents/Home/bin/java" ] ; then
- jdkhome="/Library/Java/JavaVirtualMachines/jdk1.8.0.jdk/Contents/Home"
- fi
-
- # JRE fallback
- if [ ! -x "${jdkhome}/bin/java" -a -f "/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin/java" ] ; then
- jdkhome="/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home"
- fi
- ;;
- *) javac=`which javac`
- if [ -z "$javac" ] ; then
- java=`which java`
- if [ ! -z "$java" ] ; then
- java=`resolve_symlink "$java"`
- jdkhome=`dirname $java`"/.."
+ # Check Java installed with sdkman
+ if [ -x "$HOME/.sdkman/candidates/java/current/bin/java" ]; then
+ jdkhome=`resolve_symlink "$HOME/.sdkman/candidates/java/current"`
+ fi
+ if [ -z "$jdkhome" ] ; then
+ # try to find JDK
+ case "`uname`" in
+ Darwin*)
+ # read Java Preferences
+ if [ -x "/usr/libexec/java_home" ]; then
+ jdkhome=`/usr/libexec/java_home --version 1.8.0+ --failfast`
+
+ # JDK1.8 as a fallback
+ elif [ -f "/Library/Java/JavaVirtualMachines/jdk1.8.0.jdk/Contents/Home/bin/java" ] ; then
+ jdkhome="/Library/Java/JavaVirtualMachines/jdk1.8.0.jdk/Contents/Home"
fi
- else
- javac=`resolve_symlink "$javac"`
- jdkhome=`dirname $javac`"/.."
- fi
- ;;
- esac
+
+ # JRE fallback
+ if [ ! -x "${jdkhome}/bin/java" -a -f "/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin/java" ] ; then
+ jdkhome="/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home"
+ fi
+ ;;
+ *) javac=`which javac`
+ if [ -z "$javac" ] ; then
+ java=`which java`
+ if [ ! -z "$java" ] ; then
+ java=`resolve_symlink "$java"`
+ jdkhome=`dirname $java`"/.."
+ fi
+ else
+ javac=`resolve_symlink "$javac"`
+ jdkhome=`dirname $javac`"/.."
+ fi
+ ;;
+ esac
+ fi
fi
if [ ! -x "${jdkhome}/bin/java" ] ; then
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists