IGNITE-23739 CLI doesn't accept options with spaces (apache#4770)

12rcu · Nov 21, 2024 · 887a3da · 887a3da
1 parent ee004ae
commit 887a3da
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git 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
@@ -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} "$@"