You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2017/09/23 12:59:09 UTC
groovy git commit: Add option `--add-modules ALL-SYSTEM` only when no
`--add-modules` option is set
Repository: groovy
Updated Branches:
refs/heads/master 3093abd2a -> 12f3f818b
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/12f3f818
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/12f3f818
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/12f3f818
Branch: refs/heads/master
Commit: 12f3f818bb366f98ddad6e2f4124e1981dc67947
Parents: 3093abd
Author: sunlan <su...@apache.org>
Authored: Sat Sep 23 20:58:47 2017 +0800
Committer: sunlan <su...@apache.org>
Committed: Sat Sep 23 20:58:47 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/12f3f818/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/12f3f818/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"