Repository: groovy Updated Branches: refs/heads/GROOVY_2_6_X 21c4bd997 -> 287a134fe
Add option `--add-modules ALL-SYSTEM` only when no `--add-modules` option is set (cherry picked from commit 12f3f81) Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/287a134f Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/287a134f Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/287a134f Branch: refs/heads/GROOVY_2_6_X Commit: 287a134fe502201d64f2a56bf8d42f3562a2f62c Parents: 21c4bd9 Author: sunlan <sun...@apache.org> Authored: Sat Sep 23 20:58:47 2017 +0800 Committer: sunlan <sun...@apache.org> Committed: Sat Sep 23 21:00:04 2017 +0800 ---------------------------------------------------------------------- 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/287a134f/src/bin/startGroovy ---------------------------------------------------------------------- diff --git a/src/bin/startGroovy b/src/bin/startGroovy index 30a6f06..be8b07a 100644 --- a/src/bin/startGroovy +++ b/src/bin/startGroovy @@ -279,7 +279,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/287a134f/src/bin/startGroovy.bat ---------------------------------------------------------------------- diff --git a/src/bin/startGroovy.bat b/src/bin/startGroovy.bat index 2c7aee7..e4f784e 100644 --- a/src/bin/startGroovy.bat +++ b/src/bin/startGroovy.bat @@ -271,7 +271,8 @@ for /f "tokens=3" %%g in ('%JAVA_EXE% -version 2^>^&1 ^| findstr /i "version"') ) 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"
