fix: additional fixes

Author: befc

assemblies/core/static/src/main/resources-filtered/Spoon.bat

@@ -145,7 +145,7 @@ REM ******************************************************************
 
 if "%PENTAHO_DI_JAVA_OPTIONS%"=="" SET "PENTAHO_DI_JAVA_OPTIONS=-Xms1024m -Xmx2048m"
 
-SET "OPT=%OPT% %PENTAHO_DI_JAVA_OPTIONS% -Djava.library.path=%LIBSPATH%;%HADOOP_HOME%/bin %JAVA_ENDORSED_DIRS% %JAVA_LOCALE_COMPAT% -DKETTLE_HOME=%KETTLE_HOME% -DKETTLE_REPOSITORY=%KETTLE_REPOSITORY% -DKETTLE_USER=%KETTLE_USER% -DKETTLE_PASSWORD=%KETTLE_PASSWORD% -DKETTLE_PLUGIN_PACKAGES=%KETTLE_PLUGIN_PACKAGES% -DKETTLE_LOG_SIZE_LIMIT=%KETTLE_LOG_SIZE_LIMIT% -DKETTLE_JNDI_ROOT=%KETTLE_JNDI_ROOT%"
+SET "OPT=%OPT% %PENTAHO_DI_JAVA_OPTIONS% -Djava.library.path="%LIBSPATH%;%HADOOP_HOME%/bin" %JAVA_ENDORSED_DIRS% %JAVA_LOCALE_COMPAT% -DKETTLE_HOME="%KETTLE_HOME%" -DKETTLE_REPOSITORY="%KETTLE_REPOSITORY%" -DKETTLE_USER="%KETTLE_USER%" -DKETTLE_PASSWORD="%KETTLE_PASSWORD%" -DKETTLE_PLUGIN_PACKAGES="%KETTLE_PLUGIN_PACKAGES%" -DKETTLE_LOG_SIZE_LIMIT="%KETTLE_LOG_SIZE_LIMIT%" -DKETTLE_JNDI_ROOT="%KETTLE_JNDI_ROOT%""
 
 REM Add this option to allow orc's compatibility with protobuf-java 3.25.6 libraries
 SET "OPT=%OPT% -Dcom.google.protobuf.use_unsafe_pre22_gencode=true"

assemblies/static/src/main/resources-filtered/Spoon.bat

@@ -138,7 +138,7 @@ REM ******************************************************************
 
 if "%PENTAHO_DI_JAVA_OPTIONS%"=="" SET "PENTAHO_DI_JAVA_OPTIONS=-Xms1024m -Xmx2048m"
 
-SET "OPT=%OPT% %PENTAHO_DI_JAVA_OPTIONS% -Djava.library.path=%LIBSPATH%;%HADOOP_HOME%/bin %JAVA_LOCALE_COMPAT% -DKETTLE_HOME=%KETTLE_HOME% -DKETTLE_REPOSITORY=%KETTLE_REPOSITORY% -DKETTLE_USER=%KETTLE_USER% -DKETTLE_PASSWORD=%KETTLE_PASSWORD% -DKETTLE_PLUGIN_PACKAGES=%KETTLE_PLUGIN_PACKAGES% -DKETTLE_LOG_SIZE_LIMIT=%KETTLE_LOG_SIZE_LIMIT% -DKETTLE_JNDI_ROOT=%KETTLE_JNDI_ROOT%"
+SET "OPT=%OPT% %PENTAHO_DI_JAVA_OPTIONS% -Djava.library.path="%LIBSPATH%;%HADOOP_HOME%/bin" %JAVA_LOCALE_COMPAT% -DKETTLE_HOME="%KETTLE_HOME%" -DKETTLE_REPOSITORY="%KETTLE_REPOSITORY%" -DKETTLE_USER="%KETTLE_USER%" -DKETTLE_PASSWORD="%KETTLE_PASSWORD%" -DKETTLE_PLUGIN_PACKAGES="%KETTLE_PLUGIN_PACKAGES%" -DKETTLE_LOG_SIZE_LIMIT="%KETTLE_LOG_SIZE_LIMIT%" -DKETTLE_JNDI_ROOT="%KETTLE_JNDI_ROOT%""
 
 REM Add this option to allow orc's compatibility with protobuf-java 3.25.6 libraries
 SET "OPT=%OPT% -Dcom.google.protobuf.use_unsafe_pre22_gencode=true"

assemblies/static/src/main/resources-filtered/carte.sh

@@ -26,8 +26,8 @@ DIR="`pwd`"
 cd - > /dev/null
 OPT="$OPT -Dorg.mortbay.util.URI.charset=UTF-8"
 if [ ! "x$JAAS_LOGIN_MODULE_CONFIG" = "x" -a ! "x$JAAS_LOGIN_MODULE_NAME" = "x" ]; then
-	OPT="$OPT -Djava.security.auth.login.config=$JAAS_LOGIN_MODULE_CONFIG"
-	OPT="$OPT -Dloginmodulename=$JAAS_LOGIN_MODULE_NAME"
+	OPT="$OPT -Djava.security.auth.login.config=\"$JAAS_LOGIN_MODULE_CONFIG\""
+	OPT="$OPT -Dloginmodulename=\"$JAAS_LOGIN_MODULE_NAME\""
 fi
 if [ "${darwin}" = "true" ]; then
   OPT="$OPT -Djava.awt.headless=true"