From 1c16fd3cdd065bf389080a86a4aa984d49a13401 Mon Sep 17 00:00:00 2001
From: wang--ge <wang__ge@126.com>
Date: Mon, 5 Feb 2024 11:35:05 +0800
Subject: [PATCH] replace run with exec

---
 groovy18-script | 22 ++++++++++++++++++++--
 groovy18.spec   |  7 +++++--
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/groovy18-script b/groovy18-script
index 150fdbd..f8f5ddf 100644
--- a/groovy18-script
+++ b/groovy18-script
@@ -15,9 +15,11 @@ else
 fi
 
 # Configuration
+JAVA_HOME="/usr/lib/jvm/java-1.8.0-openjdk"
+GROOVY_HOME="/usr/share/groovy"
 SCRIPT_PATH=$0
 PROGNAME=$(basename $SCRIPT_PATH)
-GROOVY_CONF=/etc/groovy18-starter.conf
+#GROOVY_CONF=/etc/groovy18-starter.conf
 TOOLS_JAR=$JAVA_HOME/lib/tools.jar
 STARTER_MAIN_CLASS=org.codehaus.groovy.tools.GroovyStarter
 MAIN_CLASS=$STARTER_MAIN_CLASS
@@ -78,6 +80,20 @@ BASE_JARS="$BASE_JARS xstream"
 BASE_JARS="$BASE_JARS jansi"
 BASE_JARS="$BASE_JARS gpars/gpars"
 
+BASE_JARS="$BASE_JARS ant/ant-antlr"
+BASE_JARS="$BASE_JARS ant/ant"
+BASE_JARS="$BASE_JARS ant/ant-launcher"
+BASE_JARS="$BASE_JARS extra166y.jar"
+BASE_JARS="$BASE_JARS hamcrest/core"
+BASE_JARS="$BASE_JARS jansi/jansi.jar"
+BASE_JARS="$BASE_JARS beust-jcommander.jar"
+BASE_JARS="$BASE_JARS jline/jline.jar"
+BASE_JARS="$BASE_JARS multiverse/multiverse-core"
+BASE_JARS="$BASE_JARS qdox"
+BASE_JARS="$BASE_JARS glassfish-servlet-api"
+BASE_JARS="$BASE_JARS testng"
+BASE_JARS="$BASE_JARS xpp3"
+BASE_JARS="$BASE_JARS xstream/xstream"
 # Set parameters
 set_jvm
 set_classpath $BASE_JARS
@@ -85,4 +101,6 @@ set_flags $BASE_FLAGS
 set_options $BASE_OPTIONS $GROOVY_OPTS
 
 # Let's start
-run --conf "$GROOVY_CONF" --main "$CLASS" "$@"
+export GROOVY_VERSION="1.8"
+. ${GROOVY_HOME}/bin/startGroovy
+startGroovy org.codehaus.groovy.tools.GrapeMain "${@}"
diff --git a/groovy18.spec b/groovy18.spec
index 123d96a..57d6057 100644
--- a/groovy18.spec
+++ b/groovy18.spec
@@ -2,9 +2,9 @@
 %global archiver 1_8_9
 Name:                groovy18
 Version:             1.8.9
-Release:             1
+Release:             2
 Summary:             Dynamic language for the Java Platform
-License:             ASL 2.0 and BSD and EPL and Public Domain and CC-BY
+License:             ASL 2.0 and BSD and EPL-1.0 and Public Domain and CPL-1.0
 URL:                 http://groovy-lang.org
 Source0:             https://github.com/groovy/groovy-core/archive/GROOVY_%{archiver}.zip
 Source1:             groovy18-script
@@ -122,5 +122,8 @@ install -p -m644 %{SOURCE2} \
 %license LICENSE.txt LICENSE-2.0.txt NOTICE.txt cpl-v10.txt epl-v10.txt
 
 %changelog
+* Mon Feb 05 2024 Ge Wang <wang__ge@126.com> - 1.8.9-2
+- Replace run with exec
+
 * Sat Aug 15 2020 zhanghua <zhanghua40@huawei.com> - 1.8.9-1
 - Package init
-- 
Gitee