(ignite-3) branch main updated: IGNITE-23739 CLI doesn't accept options with spaces (#4770)

[apkhmv]

This is an automated email from the ASF dual-hosted git repository.

apkhmv pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git


The following commit(s) were added to refs/heads/main by this push:
     new 887a3daa6e IGNITE-23739 CLI doesn't accept options with spaces (#4770)
887a3daa6e is described below

commit 887a3daa6e45cc3a4f25ac2abfbf723ae36bf848
Author: Vadim Pakhnushev <8614891+valep...@users.noreply.github.com>
AuthorDate: Thu Nov 21 17:45:02 2024 +0300

    IGNITE-23739 CLI doesn't accept options with spaces (#4770)
---
 packaging/cli/build.gradle |  1 -
 packaging/cli/start.sh     | 11 +----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/packaging/cli/build.gradle b/packaging/cli/build.gradle
index 7ba82f5019..4587dd7859 100644
--- a/packaging/cli/build.gradle
+++ b/packaging/cli/build.gradle
@@ -50,7 +50,6 @@ def tokens = [
         APP_JAR             : 
"${project(':ignite-cli').name}-${project(':ignite-cli').version}.jar".toString(),
         SETUP_JAVA_FILE_NAME: 'setup-java.sh',
         MAIN_CLASS          : 'org.apache.ignite.internal.cli.Main',
-        ARGS                : '$@'
 ]
 
 def createChecksums = tasks.register('createChecksums', Checksum) {
diff --git a/packaging/cli/start.sh b/packaging/cli/start.sh
index 6918836f90..281e940c96 100644
--- a/packaging/cli/start.sh
+++ b/packaging/cli/start.sh
@@ -22,19 +22,10 @@
 LOG_DIR="@LOG_DIR@"
 CLASSPATH="@LIB_DIR@/@APP_JAR@:@LIB_DIR@/*"
 MAIN_CLASS="@MAIN_CLASS@"
-ARGS="@ARGS@"
 
 DEFAULT_JVM_OPTS="-Dfile.encoding=UTF-8 \
     -XX:+HeapDumpOnOutOfMemoryError \
     -XX:+ExitOnOutOfMemoryError \
     -XX:HeapDumpPath=${LOG_DIR}"
 
-
-CMD="${JAVACMD} \
-${DEFAULT_JVM_OPTS} \
--classpath ${CLASSPATH} \
-${MAIN_CLASS} \
-${ARGS}"
-
-${CMD}
-
+${JAVACMD} ${DEFAULT_JVM_OPTS} -classpath ${CLASSPATH} ${MAIN_CLASS} "$@"