Browse Source

Merge pull request #244 from pmairif/master

add shortest version
pull/262/head
Gildas Cuisinier 6 years ago committed by GitHub
parent
commit
5a20be6733
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      libexec/jenv-add

7
libexec/jenv-add

@ -108,7 +108,8 @@ if [ -f "${JENV_JAVAPATH}/bin/java" ]; then @@ -108,7 +108,8 @@ if [ -f "${JENV_JAVAPATH}/bin/java" ]; then
JENV_ALIAS="${JAVA_PROVIDER}${JAVA_PLATFORM}-${JAVA_VERSION}"
JAVA_SHORTVERSION=$(sed 's/\([0-9].[0-9]\).*/\1/' <<< $JAVA_VERSION)
JAVA_SHORTVERSION=$(sed 's/\([0-9]\.[0-9]\).*/\1/' <<< $JAVA_VERSION)
JAVA_SHORTESTVERSION=$(sed 's/\([0-9]\)\..*/\1/' <<< $JAVA_VERSION)
add_alias_check $JENV_ALIAS
add_alias_check $JAVA_VERSION
@ -117,6 +118,10 @@ if [ -f "${JENV_JAVAPATH}/bin/java" ]; then @@ -117,6 +118,10 @@ if [ -f "${JENV_JAVAPATH}/bin/java" ]; then
add_alias_check $JAVA_SHORTVERSION
fi;
# don't add shortest version for jdk 1.x
if [ "$JAVA_SHORTESTVERSION" != 1 -a "$JAVA_SHORTESTVERSION" != "$JAVA_SHORTVERSION" ]; then
add_alias_check $JAVA_SHORTESTVERSION
fi
if $version_added ; then
$(jenv-rehash)

Loading…
Cancel
Save