Browse Source

Merge pull request #350 from fwcd/skip-javahome-system-jdk

fix: Skip setting `JAVA_HOME` when using system JDK #422
pull/431/head
Barnesly 2 years ago committed by GitHub
parent
commit
56b25632c0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 4
      libexec/jenv-exec
  2. 4
      libexec/jenv-info
  3. 8
      libexec/jenv-javahome

4
libexec/jenv-exec

@ -33,7 +33,9 @@ JENV_COMMAND="$1" @@ -33,7 +33,9 @@ JENV_COMMAND="$1"
export JENV_OPTIONS="$(jenv-options)"
export JAVA_HOME="$JENV_ROOT/versions/$JENV_VERSION"
if [ "$JENV_VERSION" != "system" ]; then
export JAVA_HOME="$JENV_ROOT/versions/$JENV_VERSION"
fi
if [ -z "$JENV_COMMAND" ]; then
jenv-help --usage exec >&2

4
libexec/jenv-info

@ -32,7 +32,9 @@ export JENV_OPTIONS="$(jenv-options)" @@ -32,7 +32,9 @@ export JENV_OPTIONS="$(jenv-options)"
JENV_COMMAND="$1"
export JAVA_HOME="$JENV_ROOT/versions/$JENV_VERSION"
if [ "$JENV_VERSION" != "system" ]; then
export JAVA_HOME="$JENV_ROOT/versions/$JENV_VERSION"
fi
JENV_COMMAND_PATH="$(jenv-which "$JENV_COMMAND")"

8
libexec/jenv-javahome

@ -25,6 +25,10 @@ export JENV_VERSION="$(jenv-version-name)" @@ -25,6 +25,10 @@ export JENV_VERSION="$(jenv-version-name)"
export JENV_OPTIONS="$(jenv-options)"
export JAVA_HOME="$JENV_ROOT/versions/$JENV_VERSION"
if [ "$JENV_VERSION" == "system" ]; then
echo "Using system JDK, no JAVA_HOME set!"
exit 1
fi
echo $JAVA_HOME
export JAVA_HOME="$JENV_ROOT/versions/$JENV_VERSION"
echo $JAVA_HOME

Loading…
Cancel
Save