Browse Source

Merge pull request #451 from andrewflbarnes/bugfix/javahome-system-hook

fix: when version is system don't emit error text on export hook
pull/452/head
Barnesly 5 months ago committed by GitHub
parent
commit
e57acf4513
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      available-plugins/export/etc/jenv.d/init/export_jenv_hook.bash
  2. 2
      available-plugins/export/etc/jenv.d/init/export_jenv_hook.fish
  3. 2
      available-plugins/export/etc/jenv.d/init/export_jenv_hook.zsh
  4. 2
      changelog.sh
  5. 2
      libexec/jenv-javahome

2
available-plugins/export/etc/jenv.d/init/export_jenv_hook.bash

@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
_jenv_export_hook() {
export JAVA_HOME=$(jenv javahome)
export JAVA_HOME=$(jenv javahome 2>/dev/null)
export JENV_FORCEJAVAHOME=true
if [ -e "$JAVA_HOME/bin/javac" ]

2
available-plugins/export/etc/jenv.d/init/export_jenv_hook.fish

@ -3,7 +3,7 @@ function __jenv_export_hook --on-event fish_prompt @@ -3,7 +3,7 @@ function __jenv_export_hook --on-event fish_prompt
if not type -q jenv
return
end
set -gx JAVA_HOME (jenv javahome)
set -gx JAVA_HOME (jenv javahome 2>/dev/null)
set -gx JENV_FORCEJAVAHOME true
if test -e "$JAVA_HOME/bin/javac"

2
available-plugins/export/etc/jenv.d/init/export_jenv_hook.zsh

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
#export
_jenv_export_hook() {
export JAVA_HOME=$(jenv javahome)
export JAVA_HOME=$(jenv javahome 2>/dev/null)
export JENV_FORCEJAVAHOME=true
if [ -e "$JAVA_HOME/bin/javac" ]

2
changelog.sh

@ -19,7 +19,7 @@ changelog() { @@ -19,7 +19,7 @@ changelog() {
fi
local changelog_details
changelog_details=$(git-cliff $opts "$FROM_VERSION..")
changelog_details=$(git-cliff $opts -- "$FROM_VERSION..")
if [ -z "$changelog_details" ]
then

2
libexec/jenv-javahome

@ -22,7 +22,7 @@ export JENV_VERSION="$(jenv-version-name)" @@ -22,7 +22,7 @@ export JENV_VERSION="$(jenv-version-name)"
export JENV_OPTIONS="$(jenv-options)"
if [ "$JENV_VERSION" == "system" ]; then
echo "Using system JDK, no JAVA_HOME set!"
echo "Using system JDK, no JAVA_HOME set!" >&2
exit 1
fi

Loading…
Cancel
Save