Commit 24d615e

committed

[pkg] fix: add support for four-element version (three dots)

Surprise: 11.0.9.1 is a valid JDK version. Until now, all GA versions had only three elements, like 11.0.8.

1 parent 7f85468 commit 24d615eCopy full SHA for 24d615e

File tree

-1

lines changed

-1

lines changed

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,17 @@ if [ "$NUM_OF_FIELDS" -eq 0 ]; then`
`17`	`17`	`export DEB_JRI_MAJOR=$DEB_JRI_PREFIX`
`18`	`18`	`export DEB_JRI_MINOR=0`
`19`	`19`	`export DEB_JRI_PATCH=0`
	`20`	`+ export DEB_JRI_SUBPATCH=""`
`20`	`21`	`elif [ "$NUM_OF_FIELDS" -eq 2 ]; then`
`21`	`22`	`export DEB_JRI_MAJOR=$(echo "$DEB_JRI_PREFIX" \| cut -d . -f 1)`
`22`	`23`	`export DEB_JRI_MINOR=$(echo "$DEB_JRI_PREFIX" \| cut -d . -f 2)`
`23`	`24`	`export DEB_JRI_PATCH=$(echo "$DEB_JRI_PREFIX" \| cut -d . -f 3)`
	`25`	`+ export DEB_JRI_SUBPATCH=""`
	`26`	`+elif [ "$NUM_OF_FIELDS" -eq 3 ]; then`
	`27`	`+ export DEB_JRI_MAJOR=$(echo "$DEB_JRI_PREFIX" \| cut -d . -f 1)`
	`28`	`+ export DEB_JRI_MINOR=$(echo "$DEB_JRI_PREFIX" \| cut -d . -f 2)`
	`29`	`+ export DEB_JRI_PATCH=$(echo "$DEB_JRI_PREFIX" \| cut -d . -f 3)`
	`30`	`+ export DEB_JRI_SUBPATCH=".$(echo "$DEB_JRI_PREFIX" \| cut -d . -f 4)"`
`24`	`31`	`else`
`25`	`32`	`echo "Unsupported version string: $JAVA_VERSION" 1>&2`
`26`	`33`	`exit 1`
`@@ -38,7 +45,7 @@ if [ -z "$DEB_JRI_PATCH" ]; then`
`38`	`45`	`fi`
`39`	`46`
`40`	`47`	`PKG="jri-${DEB_JRI_MAJOR}-${DEB_JRI_PLATFORM}"`
`41`		`-PKGVER="${DEB_JRI_MAJOR}.${DEB_JRI_MINOR}.${DEB_JRI_PATCH}~${DEB_JRI_BUILD}"`
	`48`	`+PKGVER="${DEB_JRI_MAJOR}.${DEB_JRI_MINOR}.${DEB_JRI_PATCH}${DEB_JRI_SUBPATCH}~${DEB_JRI_BUILD}"`
`42`	`49`	`PKGNAME="${PKG}_${PKGVER}"`
`43`	`50`	`DATE=$(LC_ALL=C date -R)`
`44`	`51`	`if [ -z "$DISTRO" ]; then`

Comments

(0)