Add option `--add-modules ALL-SYSTEM` only when no `--add-modules` option is set
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/006d1239 Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/006d1239 Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/006d1239 Branch: refs/heads/GROOVY_2_5_X Commit: 006d1239753006d5bc7cd47b745dceda08222e4d Parents: 809a847 Author: sunlan <sun...@apache.org> Authored: Sat Sep 23 20:58:47 2017 +0800 Committer: Paul King <pa...@asert.com.au> Committed: Thu Jul 12 22:37:27 2018 +1000 ---------------------------------------------------------------------- src/bin/startGroovy | 3 ++- src/bin/startGroovy.bat | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/006d1239/src/bin/startGroovy ---------------------------------------------------------------------- diff --git a/src/bin/startGroovy b/src/bin/startGroovy index bd40317..2ac37a6 100644 --- a/src/bin/startGroovy +++ b/src/bin/startGroovy @@ -280,7 +280,8 @@ fi startGroovy ( ) { JAVA_VERSION=`"$JAVACMD" -version 2>&1 | awk -F '"' '/version/ {print $2}' | cut -d "_" -f1` if [[ "$JAVA_VERSION" > "1.8.0" ]]; then - JAVA_OPTS="$JAVA_OPTS --add-modules ALL-SYSTEM" + ADD_MODULES_OPT="--add-modules" + test "${JAVA_OPTS#*$ADD_MODULES_OPT}" == "$JAVA_OPTS" && JAVA_OPTS="$JAVA_OPTS $ADD_MODULES_OPT ALL-SYSTEM" fi CLASS=$1 http://git-wip-us.apache.org/repos/asf/groovy/blob/006d1239/src/bin/startGroovy.bat ---------------------------------------------------------------------- diff --git a/src/bin/startGroovy.bat b/src/bin/startGroovy.bat index 3e7d385..1654990 100644 --- a/src/bin/startGroovy.bat +++ b/src/bin/startGroovy.bat @@ -271,7 +271,8 @@ for /f "tokens=3" %%g in ('java -version 2^>^&1 ^| findstr /i "version"') do ( ) for /f "useback tokens=*" %%a in ('%JAVA_VERSION%') do set JAVA_VERSION=%%~a set JAVA_VERSION=%JAVA_VERSION:~0,5% -if "%JAVA_VERSION%" gtr "1.8.0" set JAVA_OPTS=%JAVA_OPTS% --add-modules ALL-SYSTEM +set ADD_MODULES_OPT=--add-modules +if "%JAVA_VERSION%" gtr "1.8.0" echo.%JAVA_OPTS% | findstr /C:"%ADD_MODULES_OPT%" >nul 2>&1 || set JAVA_OPTS=%JAVA_OPTS% %ADD_MODULES_OPT% ALL-SYSTEM if exist "%USERPROFILE%/.groovy/postinit.bat" call "%USERPROFILE%/.groovy/postinit.bat"
