Skip to content

fix[PDI-20435]: Refactor shell scripts for improved variable handling and quoting #10294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

fix[PDI-20435]: Refactor shell scripts for improved variable handling and quoting #10294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2e9495f
fix:[PDI-20435] Refactor shell scripts for improved variable handling…
befc Nov 11, 2025
44ccd11
refactor: always use SET uppercase for conformity in .bat scripts
befc Nov 18, 2025
9aae738
fix: revert changes of CLASSPATH to LIBPATH in translator.sh
befc Nov 18, 2025
a77e7a2
fix: additional fixes
befc Nov 20, 2025
10eab09
fix: additional fixes
befc Nov 20, 2025
59acaa5
fix: additional fixes
befc Nov 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions Translator.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ REM ****************************************************************************

setlocal

set XMLFILE=%1%
set SRCDIR=%2%
SET "XMLFILE=%1%"
SET "SRCDIR=%2%"

echo XMLFILE=%XMLFILE%
echo SRCDIR=%SRCDIR%

set IS64BITJAVA=0
SET IS64BITJAVA=0

REM **************************************************
REM Platform Specific SWT **
Expand All @@ -46,30 +46,30 @@ IF %IS64BITJAVA% == 1 GOTO :USE64
REM ===========================================
REM Using 32bit Java, so include 32bit SWT Jar
REM ===========================================
set LIBSPATH=libswt\win32
SET "LIBSPATH=libswt\win32"
GOTO :CONTINUE
:USE64
REM ===========================================
REM Using 64bit java, so include 64bit SWT Jar
REM ===========================================
set LIBSPATH=libswt\win64
set SWTJAR=..\libswt\win64
SET "LIBSPATH=libswt\win64"
SET "SWTJAR=..\libswt\win64"
:CONTINUE

REM ******************************************************************
REM ** Set java runtime options **
REM ** Change 512m to higher values in case you run out of memory **
REM ******************************************************************

set OPT="-Xmx512m"
SET "OPT=-Xmx512m"

REM ***************
REM ** Run... **
REM ***************

REM Eventually call java instead of javaw and do not run in a separate window
set TRANSLATOR_START_OPTION=start "Translator"
SET "TRANSLATOR_START_OPTION=start "Translator""

@echo on
%TRANSLATOR_START_OPTION% java %OPT% -jar launcher\launcher.jar -lib ..\%LIBSPATH% -main org.pentaho.di.ui.i18n.editor.Translator2 %XMLFILE% %SRCDIR%
%TRANSLATOR_START_OPTION% java %OPT% -jar launcher\launcher.jar -lib "..\%LIBSPATH%" -main org.pentaho.di.ui.i18n.editor.Translator2 "%XMLFILE%" "%SRCDIR%"
@echo off
8 changes: 4 additions & 4 deletions assemblies/core/static/src/main/resources-filtered/Kitchen.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ REM Change Date: 2029-07-20
REM ******************************************************************************

setlocal
SET initialDir=%cd%
pushd %~dp0
SET STARTTITLE="Kitchen"
SET SPOON_CONSOLE=1
SET "initialDir=%cd%"
pushd "%~dp0"
SET "STARTTITLE=Kitchen"
SET "SPOON_CONSOLE=1"
call Spoon.bat -main org.pentaho.di.kitchen.Kitchen -initialDir "%initialDir%"\ %*
popd
8 changes: 4 additions & 4 deletions assemblies/core/static/src/main/resources-filtered/Pan.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ REM Change Date: 2029-07-20
REM ******************************************************************************

setlocal
SET initialDir=%cd%
pushd %~dp0
SET STARTTITLE="Pan"
SET SPOON_CONSOLE=1
SET "initialDir=%cd%"
pushd "%~dp0"
SET "STARTTITLE=Pan"
SET "SPOON_CONSOLE=1"
call Spoon.bat -main org.pentaho.di.pan.Pan -initialDir "%initialDir%"\ %*
popd
88 changes: 44 additions & 44 deletions assemblies/core/static/src/main/resources-filtered/Spoon.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ REM ****************************************************************************

setlocal

cd /D %~dp0
cd /D "%~dp0"

REM **************************************************
REM ** Set console window properties **
Expand All @@ -25,15 +25,15 @@ REM COLOR F0
:: ** Kettle home **
:: **************************************************

if "%KETTLE_DIR%"=="" set KETTLE_DIR=%~dp0
if %KETTLE_DIR:~-1%==\ set KETTLE_DIR=%KETTLE_DIR:~0,-1%
if "%KETTLE_DIR%"=="" SET "KETTLE_DIR=%~dp0"
if "%KETTLE_DIR:~-1%"=="\" SET "KETTLE_DIR=%KETTLE_DIR:~0,-1%"

cd %KETTLE_DIR%
cd "%KETTLE_DIR%"

REM Special console/debug options when called from SpoonConsole.bat or SpoonDebug.bat
if "%SPOON_CONSOLE%"=="1" set PENTAHO_JAVA=java.exe
if not "%SPOON_CONSOLE%"=="1" set PENTAHO_JAVA=javaw.exe
set IS64BITJAVA=0
if "%SPOON_CONSOLE%"=="1" SET "PENTAHO_JAVA=java.exe"
if not "%SPOON_CONSOLE%"=="1" SET "PENTAHO_JAVA=javaw.exe"
SET "IS64BITJAVA=0"

call "%~dp0set-pentaho-env.bat"

Expand Down Expand Up @@ -76,63 +76,63 @@ IF %IS64BITJAVA% == 1 GOTO :USE64
REM ===========================================
REM Using 32bit Java, so include 32bit SWT Jar
REM ===========================================
set LIBSPATH=libswt\win32
SET "LIBSPATH=libswt\win32"
GOTO :CONTINUE
:USE64
REM ===========================================
REM Using 64bit java, so include 64bit SWT Jar
REM ===========================================

set LIBSPATH=libswt\win64
set SWTJAR=..\libswt\win64
SET "LIBSPATH=libswt\win64"
SET "SWTJAR=..\libswt\win64"
:CONTINUE
popd

REM **************************************************
REM ** Setup Karaf endorsed libraries directory **
REM **************************************************
set JAVA_ENDORSED_DIRS=
set JAVA_LOCALE_COMPAT=
set JAVA_ADD_OPENS=
SET "JAVA_ENDORSED_DIRS="
SET "JAVA_LOCALE_COMPAT="
SET "JAVA_ADD_OPENS="

IF NOT %ISJAVA8% == 1 GOTO :SKIPENDORSEDJARS

if not "%_PENTAHO_JAVA_HOME%" == "" set JAVA_ENDORSED_DIRS=%_PENTAHO_JAVA_HOME%\jre\lib\endorsed;%_PENTAHO_JAVA_HOME%\lib\endorsed;
set JAVA_ENDORSED_DIRS="-Djava.endorsed.dirs=%JAVA_ENDORSED_DIRS%%KETTLE_DIR%\system\karaf\lib\endorsed"
if not "%_PENTAHO_JAVA_HOME%" == "" SET "JAVA_ENDORSED_DIRS=%_PENTAHO_JAVA_HOME%\jre\lib\endorsed;%_PENTAHO_JAVA_HOME%\lib\endorsed;"
SET "JAVA_ENDORSED_DIRS=-Djava.endorsed.dirs=%JAVA_ENDORSED_DIRS%%KETTLE_DIR%\system\karaf\lib\endorsed"
GOTO :COLLECTARGUMENTS

:SKIPENDORSEDJARS
REM required for Java 11 date/time formatting backwards compatibility
set JAVA_LOCALE_COMPAT=-Djava.locale.providers=COMPAT,SPI
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/sun.net.www.protocol.jar=ALL-UNNAMED"
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/java.lang=ALL-UNNAMED"
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/java.io=ALL-UNNAMED"
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/java.lang.reflect=ALL-UNNAMED"
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/java.net=ALL-UNNAMED"
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/java.security=ALL-UNNAMED"
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/java.util=ALL-UNNAMED"
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/sun.net.www.protocol.file=ALL-UNNAMED"
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/sun.net.www.protocol.ftp=ALL-UNNAMED"
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/sun.net.www.protocol.http=ALL-UNNAMED"
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/sun.net.www.protocol.https=ALL-UNNAMED"
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/sun.reflect.misc=ALL-UNNAMED"
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.management/javax.management=ALL-UNNAMED"
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.management/javax.management.openmbean=ALL-UNNAMED"
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.naming/com.sun.jndi.ldap=ALL-UNNAMED"
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/java.math=ALL-UNNAMED"
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/sun.nio.ch=ALL-UNNAMED"
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/java.nio=ALL-UNNAMED"
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.security.jgss/sun.security.krb5=ALL-UNNAMED"
SET "JAVA_LOCALE_COMPAT=-Djava.locale.providers=COMPAT,SPI"
SET "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/sun.net.www.protocol.jar=ALL-UNNAMED"
SET "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/java.lang=ALL-UNNAMED"
SET "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/java.io=ALL-UNNAMED"
SET "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/java.lang.reflect=ALL-UNNAMED"
SET "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/java.net=ALL-UNNAMED"
SET "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/java.security=ALL-UNNAMED"
SET "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/java.util=ALL-UNNAMED"
SET "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/sun.net.www.protocol.file=ALL-UNNAMED"
SET "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/sun.net.www.protocol.ftp=ALL-UNNAMED"
SET "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/sun.net.www.protocol.http=ALL-UNNAMED"
SET "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/sun.net.www.protocol.https=ALL-UNNAMED"
SET "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/sun.reflect.misc=ALL-UNNAMED"
SET "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.management/javax.management=ALL-UNNAMED"
SET "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.management/javax.management.openmbean=ALL-UNNAMED"
SET "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.naming/com.sun.jndi.ldap=ALL-UNNAMED"
SET "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/java.math=ALL-UNNAMED"
SET "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/sun.nio.ch=ALL-UNNAMED"
SET "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/java.nio=ALL-UNNAMED"
SET "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.security.jgss/sun.security.krb5=ALL-UNNAMED"

:COLLECTARGUMENTS
REM **********************
REM Collect arguments
REM **********************

set _cmdline=
SET "_cmdline="
:TopArg
if %1!==! goto EndArg
set _cmdline=%_cmdline% %1
SET "_cmdline=%_cmdline% %1"
shift
goto TopArg
:EndArg
Expand All @@ -143,25 +143,25 @@ REM ** Change 2048m to higher values in case you run out of memory **
REM ** or set the PENTAHO_DI_JAVA_OPTIONS environment variable **
REM ******************************************************************

if "%PENTAHO_DI_JAVA_OPTIONS%"=="" set PENTAHO_DI_JAVA_OPTIONS="-Xms1024m" "-Xmx2048m"
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"
SET "OPT=%OPT% -Dcom.google.protobuf.use_unsafe_pre22_gencode=true"

REM Force SWT to use Edge instead of Internet Explorer (not supported by Pentaho anymore)
set OPT=%OPT% "-Dorg.eclipse.swt.browser.DefaultType=edge"
SET "OPT=%OPT% -Dorg.eclipse.swt.browser.DefaultType=edge"

REM ***************
REM ** Run... **
REM ***************

if %STARTTITLE%!==! SET STARTTITLE="Spoon"
if %STARTTITLE%!==! SET "STARTTITLE=Spoon"
REM Eventually call java instead of javaw and do not run in a separate window
if not "%SPOON_CONSOLE%"=="1" set SPOON_START_OPTION=start %STARTTITLE%
if not "%SPOON_CONSOLE%"=="1" SET "SPOON_START_OPTION=start %STARTTITLE%"

@echo on
%SPOON_START_OPTION% "%_PENTAHO_JAVA%" %JAVA_ADD_OPENS% %OPT% -jar launcher\launcher.jar -lib ..\%LIBSPATH% %_cmdline%
%SPOON_START_OPTION% "%_PENTAHO_JAVA%" %JAVA_ADD_OPENS% %OPT% -jar launcher\launcher.jar -lib "..\%LIBSPATH%" %_cmdline%
@echo off
if "%SPOON_PAUSE%"=="1" pause
2 changes: 1 addition & 1 deletion assemblies/core/static/src/main/resources-filtered/kitchen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ DIR="`pwd`"
cd - > /dev/null

if [ "$1" = "-x" ]; then
set LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$BASEDIR/lib
set LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$BASEDIR/lib"
export LD_LIBRARY_PATH
export OPT="-Xruntracer $OPT"
shift
Expand Down
2 changes: 1 addition & 1 deletion assemblies/core/static/src/main/resources-filtered/pan.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ DIR="`pwd`"
cd - > /dev/null

if [ "$1" = "-x" ]; then
set LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$BASEDIR/lib
set LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$BASEDIR/lib"
export LD_LIBRARY_PATH
export OPT="-Xruntracer $OPT"
shift
Expand Down
Loading