Skip to content

Commit 2e9495f

Browse files
befcbefc
committed
fix:[PDI-20435] Refactor shell scripts for improved variable handling and quoting
1 parent c504415 commit 2e9495f

File tree

24 files changed

+179
-179
lines changed

24 files changed

+179
-179
lines changed

‎Translator.bat‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ REM ****************************************************************************
1313

1414
setlocal
1515

16-
set XMLFILE=%1%
17-
set SRCDIR=%2%
16+
set "XMLFILE=%1%"
17+
set "SRCDIR=%2%"
1818

1919
echo XMLFILE=%XMLFILE%
2020
echo SRCDIR=%SRCDIR%
@@ -46,30 +46,30 @@ IF %IS64BITJAVA% == 1 GOTO :USE64
4646
REM ===========================================
4747
REM Using 32bit Java, so include 32bit SWT Jar
4848
REM ===========================================
49-
set LIBSPATH=libswt\win32
49+
set "LIBSPATH=libswt\win32"
5050
GOTO :CONTINUE
5151
:USE64
5252
REM ===========================================
5353
REM Using 64bit java, so include 64bit SWT Jar
5454
REM ===========================================
55-
set LIBSPATH=libswt\win64
56-
set SWTJAR=..\libswt\win64
55+
set "LIBSPATH=libswt\win64"
56+
set "SWTJAR=..\libswt\win64"
5757
:CONTINUE
5858

5959
REM ******************************************************************
6060
REM ** Set java runtime options **
6161
REM ** Change 512m to higher values in case you run out of memory **
6262
REM ******************************************************************
6363

64-
set OPT="-Xmx512m"
64+
set "OPT=-Xmx512m"
6565

6666
REM ***************
6767
REM ** Run... **
6868
REM ***************
6969

7070
REM Eventually call java instead of javaw and do not run in a separate window
71-
set TRANSLATOR_START_OPTION=start "Translator"
71+
set "TRANSLATOR_START_OPTION=start "Translator""
7272

7373
@echo on
74-
%TRANSLATOR_START_OPTION% java %OPT% -jar launcher\launcher.jar -lib ..\%LIBSPATH% -main org.pentaho.di.ui.i18n.editor.Translator2 %XMLFILE% %SRCDIR%
74+
%TRANSLATOR_START_OPTION% java %OPT% -jar launcher\launcher.jar -lib "..\%LIBSPATH%" -main org.pentaho.di.ui.i18n.editor.Translator2 "%XMLFILE%" "%SRCDIR%"
7575
@echo off

‎assemblies/core/static/src/main/resources-filtered/Kitchen.bat‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ REM Change Date: 2029-07-20
1212
REM ******************************************************************************
1313

1414
setlocal
15-
SET initialDir=%cd%
16-
pushd %~dp0
17-
SET STARTTITLE="Kitchen"
18-
SET SPOON_CONSOLE=1
15+
SET "initialDir=%cd%"
16+
pushd "%~dp0"
17+
SET "STARTTITLE=Kitchen"
18+
SET "SPOON_CONSOLE=1"
1919
call Spoon.bat -main org.pentaho.di.kitchen.Kitchen -initialDir "%initialDir%"\ %*
2020
popd

‎assemblies/core/static/src/main/resources-filtered/Pan.bat‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ REM Change Date: 2029-07-20
1212
REM ******************************************************************************
1313

1414
setlocal
15-
SET initialDir=%cd%
16-
pushd %~dp0
17-
SET STARTTITLE="Pan"
18-
SET SPOON_CONSOLE=1
15+
SET "initialDir=%cd%"
16+
pushd "%~dp0"
17+
SET "STARTTITLE=Pan"
18+
SET "SPOON_CONSOLE=1"
1919
call Spoon.bat -main org.pentaho.di.pan.Pan -initialDir "%initialDir%"\ %*
2020
popd

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

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ REM ****************************************************************************
1313

1414
setlocal
1515

16-
cd /D %~dp0
16+
cd /D "%~dp0"
1717

1818
REM **************************************************
1919
REM ** Set console window properties **
@@ -25,15 +25,15 @@ REM COLOR F0
2525
:: ** Kettle home **
2626
:: **************************************************
2727

28-
if "%KETTLE_DIR%"=="" set KETTLE_DIR=%~dp0
29-
if %KETTLE_DIR:~-1%==\ set KETTLE_DIR=%KETTLE_DIR:~0,-1%
28+
if "%KETTLE_DIR%"=="" set "KETTLE_DIR=%~dp0"
29+
if %KETTLE_DIR:~-1%==\ set "KETTLE_DIR=%KETTLE_DIR:~0,-1%"
3030

31-
cd %KETTLE_DIR%
31+
cd "%KETTLE_DIR%"
3232

3333
REM Special console/debug options when called from SpoonConsole.bat or SpoonDebug.bat
34-
if "%SPOON_CONSOLE%"=="1" set PENTAHO_JAVA=java.exe
35-
if not "%SPOON_CONSOLE%"=="1" set PENTAHO_JAVA=javaw.exe
36-
set IS64BITJAVA=0
34+
if "%SPOON_CONSOLE%"=="1" set "PENTAHO_JAVA=java.exe"
35+
if not "%SPOON_CONSOLE%"=="1" set "PENTAHO_JAVA=javaw.exe"
36+
set "IS64BITJAVA=0"
3737

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

@@ -76,34 +76,34 @@ IF %IS64BITJAVA% == 1 GOTO :USE64
7676
REM ===========================================
7777
REM Using 32bit Java, so include 32bit SWT Jar
7878
REM ===========================================
79-
set LIBSPATH=libswt\win32
79+
set "LIBSPATH=libswt\win32"
8080
GOTO :CONTINUE
8181
:USE64
8282
REM ===========================================
8383
REM Using 64bit java, so include 64bit SWT Jar
8484
REM ===========================================
8585

86-
set LIBSPATH=libswt\win64
87-
set SWTJAR=..\libswt\win64
86+
set "LIBSPATH=libswt\win64"
87+
set "SWTJAR=..\libswt\win64"
8888
:CONTINUE
8989
popd
9090

9191
REM **************************************************
9292
REM ** Setup Karaf endorsed libraries directory **
9393
REM **************************************************
94-
set JAVA_ENDORSED_DIRS=
95-
set JAVA_LOCALE_COMPAT=
96-
set JAVA_ADD_OPENS=
94+
set "JAVA_ENDORSED_DIRS="
95+
set "JAVA_LOCALE_COMPAT="
96+
set "JAVA_ADD_OPENS="
9797

9898
IF NOT %ISJAVA8% == 1 GOTO :SKIPENDORSEDJARS
9999

100-
if not "%_PENTAHO_JAVA_HOME%" == "" set JAVA_ENDORSED_DIRS=%_PENTAHO_JAVA_HOME%\jre\lib\endorsed;%_PENTAHO_JAVA_HOME%\lib\endorsed;
101-
set JAVA_ENDORSED_DIRS="-Djava.endorsed.dirs=%JAVA_ENDORSED_DIRS%%KETTLE_DIR%\system\karaf\lib\endorsed"
100+
if not "%_PENTAHO_JAVA_HOME%" == "" set "JAVA_ENDORSED_DIRS=%_PENTAHO_JAVA_HOME%\jre\lib\endorsed;%_PENTAHO_JAVA_HOME%\lib\endorsed;"
101+
set "JAVA_ENDORSED_DIRS=-Djava.endorsed.dirs=%JAVA_ENDORSED_DIRS%%KETTLE_DIR%\system\karaf\lib\endorsed"
102102
GOTO :COLLECTARGUMENTS
103103

104104
:SKIPENDORSEDJARS
105105
REM required for Java 11 date/time formatting backwards compatibility
106-
set JAVA_LOCALE_COMPAT=-Djava.locale.providers=COMPAT,SPI
106+
set "JAVA_LOCALE_COMPAT=-Djava.locale.providers=COMPAT,SPI"
107107
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/sun.net.www.protocol.jar=ALL-UNNAMED"
108108
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/java.lang=ALL-UNNAMED"
109109
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/java.io=ALL-UNNAMED"
@@ -129,10 +129,10 @@ REM **********************
129129
REM Collect arguments
130130
REM **********************
131131

132-
set _cmdline=
132+
set "_cmdline="
133133
:TopArg
134134
if %1!==! goto EndArg
135-
set _cmdline=%_cmdline% %1
135+
set "_cmdline=%_cmdline% %1"
136136
shift
137137
goto TopArg
138138
:EndArg
@@ -143,25 +143,25 @@ REM ** Change 2048m to higher values in case you run out of memory **
143143
REM ** or set the PENTAHO_DI_JAVA_OPTIONS environment variable **
144144
REM ******************************************************************
145145

146-
if "%PENTAHO_DI_JAVA_OPTIONS%"=="" set PENTAHO_DI_JAVA_OPTIONS="-Xms1024m" "-Xmx2048m"
146+
if "%PENTAHO_DI_JAVA_OPTIONS%"=="" set "PENTAHO_DI_JAVA_OPTIONS=-Xms1024m -Xmx2048m"
147147

148-
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%"
148+
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%"
149149

150150
REM Add this option to allow orc's compatibility with protobuf-java 3.25.6 libraries
151-
set OPT=%OPT% "-Dcom.google.protobuf.use_unsafe_pre22_gencode=true"
151+
set "OPT=%OPT% -Dcom.google.protobuf.use_unsafe_pre22_gencode=true"
152152

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

156156
REM ***************
157157
REM ** Run... **
158158
REM ***************
159159

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

164164
@echo on
165-
%SPOON_START_OPTION% "%_PENTAHO_JAVA%" %JAVA_ADD_OPENS% %OPT% -jar launcher\launcher.jar -lib ..\%LIBSPATH% %_cmdline%
165+
%SPOON_START_OPTION% "%_PENTAHO_JAVA%" %JAVA_ADD_OPENS% %OPT% -jar launcher\launcher.jar -lib "..\%LIBSPATH%" %_cmdline%
166166
@echo off
167167
if "%SPOON_PAUSE%"=="1" pause

‎assemblies/core/static/src/main/resources-filtered/kitchen.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ DIR="`pwd`"
1919
cd - > /dev/null
2020

2121
if [ "$1" = "-x" ]; then
22-
set LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$BASEDIR/lib
22+
set LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$BASEDIR/lib"
2323
export LD_LIBRARY_PATH
2424
export OPT="-Xruntracer $OPT"
2525
shift

‎assemblies/core/static/src/main/resources-filtered/pan.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ DIR="`pwd`"
1919
cd - > /dev/null
2020

2121
if [ "$1" = "-x" ]; then
22-
set LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$BASEDIR/lib
22+
set LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$BASEDIR/lib"
2323
export LD_LIBRARY_PATH
2424
export OPT="-Xruntracer $OPT"
2525
shift

‎assemblies/core/static/src/main/resources-filtered/set-pentaho-env.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ setPentahoEnv() {
102102
else
103103
# echo "WARNING: Using java from path"
104104
_PENTAHO_JAVA_HOME=
105-
_PENTAHO_JAVA=$__LAUNCHER
105+
_PENTAHO_JAVA="$__LAUNCHER"
106106
fi
107107
# echo "DEBUG: _PENTAHO_JAVA_HOME=$_PENTAHO_JAVA_HOME"
108108
# echo "DEBUG: _PENTAHO_JAVA=$_PENTAHO_JAVA"

‎assemblies/core/static/src/main/resources-filtered/spoon.sh‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
# ** Gtk2 and Fte enabled.
1919
# **************************************************
2020

21-
# set MOZILLA_FIVE_HOME=/usr/local/mozilla
22-
# set LD_LIBRARY_PATH=/usr/local/mozilla
21+
# set MOZILLA_FIVE_HOME="/usr/local/mozilla"
22+
# set LD_LIBRARY_PATH="/usr/local/mozilla"
2323

2424
# Try to guess xulrunner location - change this if you need to
25-
MOZILLA_FIVE_HOME=$(find /usr/lib -maxdepth 1 -name xulrunner-[0-9]* | head -1)
26-
LD_LIBRARY_PATH=${MOZILLA_FIVE_HOME}:${LD_LIBRARY_PATH}
25+
MOZILLA_FIVE_HOME="$(find /usr/lib -maxdepth 1 -name xulrunner-[0-9]* | head -1)"
26+
LD_LIBRARY_PATH="${MOZILLA_FIVE_HOME}:${LD_LIBRARY_PATH}"
2727
export MOZILLA_FIVE_HOME LD_LIBRARY_PATH
2828

2929
# Fix for GTK Windows issues with SWT
@@ -61,7 +61,7 @@ STARTUP="$BASEDIR/launcher/launcher.jar"
6161

6262
if [ -z "$IS_YARN" ]; then
6363
# Go to directory where spoon.sh located
64-
cd $BASEDIR
64+
cd "$BASEDIR"
6565
else
6666
cd "$BASEDIR"
6767
fi
@@ -72,11 +72,11 @@ case `uname -s` in
7272
case $ARCH in
7373

7474
ppc)
75-
LIBPATH=$CURRENTDIR/../libswt/aix/
75+
LIBPATH="$CURRENTDIR/../libswt/aix/"
7676
;;
7777

7878
ppc64)
79-
LIBPATH=$CURRENTDIR/../libswt/aix64/
79+
LIBPATH="$CURRENTDIR/../libswt/aix64/"
8080
;;
8181

8282
*)
@@ -90,11 +90,11 @@ case `uname -s` in
9090
case $ARCH in
9191

9292
i[3-6]86)
93-
LIBPATH=$CURRENTDIR/../libswt/solaris-x86/
93+
LIBPATH="$CURRENTDIR/../libswt/solaris-x86/"
9494
;;
9595

9696
*)
97-
LIBPATH=$CURRENTDIR/../libswt/solaris/
97+
LIBPATH="$CURRENTDIR/../libswt/solaris/"
9898
;;
9999
esac
100100
;;
@@ -108,9 +108,9 @@ case `uname -s` in
108108
x86_64)
109109
if $($_PENTAHO_JAVA -version 2>&1 | grep "64-Bit" > /dev/null )
110110
then
111-
LIBPATH=$CURRENTDIR/../libswt/osx64/
111+
LIBPATH="$CURRENTDIR/../libswt/osx64/"
112112
else
113-
LIBPATH=$CURRENTDIR/../libswt/osx/
113+
LIBPATH="$CURRENTDIR/../libswt/osx/"
114114
fi
115115
;;
116116
arm64)
@@ -119,11 +119,11 @@ case `uname -s` in
119119
echo "I'm sorry, this Mac platform [$ARCH] is not supported in Java 8"
120120
exit
121121
else
122-
LIBPATH=$CURRENTDIR/../libswt/osx64_aarch/
122+
LIBPATH="$CURRENTDIR/../libswt/osx64_aarch/"
123123
fi
124124
;;
125125
i[3-6]86)
126-
LIBPATH=$CURRENTDIR/../libswt/osx/
126+
LIBPATH="$CURRENTDIR/../libswt/osx/"
127127
;;
128128

129129
*)
@@ -139,9 +139,9 @@ case `uname -s` in
139139
Linux)
140140

141141
if [ -f /sbin/ldconfig ]; then
142-
LDCONFIG=/sbin/ldconfig
142+
LDCONFIG="/sbin/ldconfig"
143143
else
144-
LDCONFIG=ldconfig
144+
LDCONFIG="ldconfig"
145145
fi
146146
HASWEBKITGTK=`$LDCONFIG -p | grep webkitgtk-1.0`
147147
export LIBWEBKITGTK="$HASWEBKITGTK"
@@ -159,22 +159,22 @@ case `uname -s` in
159159
x86_64)
160160
if $($_PENTAHO_JAVA -version 2>&1 | grep "64-Bit" > /dev/null )
161161
then
162-
LIBPATH=$CURRENTDIR/../libswt/linux/x86_64/
162+
LIBPATH="$CURRENTDIR/../libswt/linux/x86_64/"
163163
else
164-
LIBPATH=$CURRENTDIR/../libswt/linux/x86/
164+
LIBPATH="$CURRENTDIR/../libswt/linux/x86/"
165165
fi
166166
;;
167167

168168
i[3-6]86)
169-
LIBPATH=$CURRENTDIR/../libswt/linux/x86/
169+
LIBPATH="$CURRENTDIR/../libswt/linux/x86/"
170170
;;
171171

172172
ppc)
173-
LIBPATH=$CURRENTDIR/../libswt/linux/ppc/
173+
LIBPATH="$CURRENTDIR/../libswt/linux/ppc/"
174174
;;
175175

176176
ppc64)
177-
LIBPATH=$CURRENTDIR/../libswt/linux/ppc64/
177+
LIBPATH="$CURRENTDIR/../libswt/linux/ppc64/"
178178
;;
179179

180180
*)
@@ -190,17 +190,17 @@ case `uname -s` in
190190
ARCH=`uname -m`
191191
case $ARCH in
192192
x86_64)
193-
LIBPATH=$CURRENTDIR/../libswt/linux/x86_64/
193+
LIBPATH="$CURRENTDIR/../libswt/linux/x86_64/"
194194
echo "I'm sorry, this FreeBSD platform [$ARCH] is not yet supported!"
195195
exit
196196
;;
197197

198198
i[3-6]86)
199-
LIBPATH=$CURRENTDIR/../libswt/linux/x86/
199+
LIBPATH="$CURRENTDIR/../libswt/linux/x86/"
200200
;;
201201

202202
ppc)
203-
LIBPATH=$CURRENTDIR/../libswt/linux/ppc/
203+
LIBPATH="$CURRENTDIR/../libswt/linux/ppc/"
204204
echo "I'm sorry, this FreeBSD platform [$ARCH] is not yet supported!"
205205
exit
206206
;;
@@ -213,7 +213,7 @@ case `uname -s` in
213213
;;
214214

215215
HP-UX)
216-
LIBPATH=$CURRENTDIR/../libswt/hpux/
216+
LIBPATH="$CURRENTDIR/../libswt/hpux/"
217217
;;
218218
CYGWIN*)
219219
./Spoon.bat

‎assemblies/static/src/main/resources-filtered/Carte.bat‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ REM Change Date: 2029-07-20
1212
REM ******************************************************************************
1313

1414
setlocal
15-
pushd %~dp0
15+
pushd "%~dp0"
1616

17-
SET OPT=%OPT% "-Dorg.mortbay.util.URI.charset=UTF-8"
18-
SET STARTTITLE="Carte"
19-
SET SPOON_CONSOLE=1
17+
SET "OPT=%OPT% -Dorg.mortbay.util.URI.charset=UTF-8"
18+
SET "STARTTITLE=Carte"
19+
SET "SPOON_CONSOLE=1"
2020
REM ***********************************************************************
2121
REM ** Optionally set up the options for JAAS (uncomment to make active) **
2222
REM ***********************************************************************

0 commit comments

Comments
 (0)