Redirect groovyw execution to a new 'util.groovy' under 'config/groov…

…y' and move item type scripts there as well (unchanged for now)
DarkWeird · Feb 18, 2018 · b3ff66b · b3ff66b
1 parent 5339343
commit b3ff66b
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 2 deletions.
diff --git a/facade.groovy → config/groovy/facade.groovy b/facade.groovy → config/groovy/facade.groovy
diff --git a/lib.groovy → config/groovy/lib.groovy b/lib.groovy → config/groovy/lib.groovy
diff --git a/meta.groovy → config/groovy/meta.groovy b/meta.groovy → config/groovy/meta.groovy
diff --git a/module.groovy → config/groovy/module.groovy b/module.groovy → config/groovy/module.groovy
diff --git a/config/groovy/util.groovy b/config/groovy/util.groovy
@@ -0,0 +1,2 @@
+println "Hi from util.groovy. Args are $args"
+
diff --git a/groovyw b/groovyw
@@ -162,7 +162,7 @@ save ( ) {
 APP_ARGS=$(save "$@")
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GroovyWrapperMain "$APP_ARGS"
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GroovyWrapperMain config/groovy/util.groovy "$APP_ARGS"
 
 # by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
 if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then

diff --git a/groovyw.bat b/groovyw.bat
@@ -66,7 +66,7 @@ set CMD_LINE_ARGS=%*
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar;%APP_HOME%\gradle\wrapper\groovy-wrapper.jar;
 
 @rem Execute Groovy via the Gradle Wrapper
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GroovyWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GroovyWrapperMain config/groovy/util.groovy %CMD_LINE_ARGS%
 
 :end
 @rem End local scope for the variables with windows NT shell
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		println "Hi from util.groovy. Args are $args"