Skip to content

Commit

Permalink
Update operators
Browse files Browse the repository at this point in the history
  • Loading branch information
jpollone committed Apr 26, 2020
1 parent 7687cd2 commit ff463af
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions bin/launcher
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ PRODUCT_MAJORVERSION=$(parse_product_properties_file 'product.majorversion')
PRODUCT_PATCHVERSION=$(parse_product_properties_file 'product.patchversion')

# Set the JDK version based on the product
if [ "$PRODUCT_MAJORVERSION" == "10" ] && [ "$PRODUCT_PATCHVERSION" == "2" ]; then
if [ "$PRODUCT_MAJORVERSION" -eq "10" ] && [ "$PRODUCT_PATCHVERSION" -gt "1" ]; then
JAVA_PROP="java11.path"
launcher="./gwb"
elif [ "$PRODUCT_MAJORVERSION" == "8" ] ; then
elif [ "$PRODUCT_MAJORVERSION" -eq "8" ] ; then
JAVA_PROP="java17.path"
launcher="bin/gw'${PRODUCT_CODE}'"
else
Expand Down
6 changes: 3 additions & 3 deletions bin/launcher.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ REM Set the JDK version and launcher based on the product
SET JAVA_DIR=%java18.path%
SET LAUNCHER=gwb.bat

IF %product.majorversion%==10 (
IF %product.patchversion% == 2 (
IF %product.majorversion% EQU 10 (
IF %product.patchversion% GEQ 2 (
SET JAVA_DIR=%java11.path%
)
)
IF %product.majorversion% == 8 (
IF %product.majorversion% EQU 8 (
set JAVA_DIR=%java11.path%
set LAUNCHER=bin\gw%product.code%.bat
)
Expand Down

0 comments on commit ff463af

Please sign in to comment.