From b698e417c40c71d1b1e76f8c893bb00b1876e2de Mon Sep 17 00:00:00 2001 From: andrewflbarnes Date: Wed, 16 Jul 2025 02:12:32 +0100 Subject: [PATCH 1/2] fix: when version is system don't emit error text on export hook --- available-plugins/export/etc/jenv.d/init/export_jenv_hook.bash | 2 +- available-plugins/export/etc/jenv.d/init/export_jenv_hook.fish | 2 +- available-plugins/export/etc/jenv.d/init/export_jenv_hook.zsh | 2 +- libexec/jenv-javahome | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/available-plugins/export/etc/jenv.d/init/export_jenv_hook.bash b/available-plugins/export/etc/jenv.d/init/export_jenv_hook.bash index 219f66e..b58390c 100644 --- a/available-plugins/export/etc/jenv.d/init/export_jenv_hook.bash +++ b/available-plugins/export/etc/jenv.d/init/export_jenv_hook.bash @@ -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" ] diff --git a/available-plugins/export/etc/jenv.d/init/export_jenv_hook.fish b/available-plugins/export/etc/jenv.d/init/export_jenv_hook.fish index 764ce61..7e399be 100644 --- a/available-plugins/export/etc/jenv.d/init/export_jenv_hook.fish +++ b/available-plugins/export/etc/jenv.d/init/export_jenv_hook.fish @@ -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" diff --git a/available-plugins/export/etc/jenv.d/init/export_jenv_hook.zsh b/available-plugins/export/etc/jenv.d/init/export_jenv_hook.zsh index 52c5f58..c921c0f 100644 --- a/available-plugins/export/etc/jenv.d/init/export_jenv_hook.zsh +++ b/available-plugins/export/etc/jenv.d/init/export_jenv_hook.zsh @@ -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" ] diff --git a/libexec/jenv-javahome b/libexec/jenv-javahome index 11a7094..319c61b 100755 --- a/libexec/jenv-javahome +++ b/libexec/jenv-javahome @@ -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 From 8b1cc3f2bf46ffbea96efbd878527d813623b72a Mon Sep 17 00:00:00 2001 From: andrewflbarnes Date: Wed, 16 Jul 2025 02:13:42 +0100 Subject: [PATCH 2/2] chore: fix changelog script --- changelog.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.sh b/changelog.sh index 7c54328..fea02fc 100755 --- a/changelog.sh +++ b/changelog.sh @@ -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