Skip to content

Commit 44ccd11

Browse files
befcbefc
committed
refactor: always use SET uppercase for conformity in .bat scripts
1 parent 2e9495f commit 44ccd11

File tree

9 files changed

+217
-217
lines changed

9 files changed

+217
-217
lines changed

‎Translator.bat‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ 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%
2121

22-
set IS64BITJAVA=0
22+
SET IS64BITJAVA=0
2323

2424
REM **************************************************
2525
REM Platform Specific SWT **
@@ -46,29 +46,29 @@ 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
7474
%TRANSLATOR_START_OPTION% java %OPT% -jar launcher\launcher.jar -lib "..\%LIBSPATH%" -main org.pentaho.di.ui.i18n.editor.Translator2 "%XMLFILE%" "%SRCDIR%"

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

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -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

3131
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,63 +76,63 @@ 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"
107-
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/sun.net.www.protocol.jar=ALL-UNNAMED"
108-
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/java.lang=ALL-UNNAMED"
109-
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/java.io=ALL-UNNAMED"
110-
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/java.lang.reflect=ALL-UNNAMED"
111-
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/java.net=ALL-UNNAMED"
112-
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/java.security=ALL-UNNAMED"
113-
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/java.util=ALL-UNNAMED"
114-
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/sun.net.www.protocol.file=ALL-UNNAMED"
115-
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/sun.net.www.protocol.ftp=ALL-UNNAMED"
116-
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/sun.net.www.protocol.http=ALL-UNNAMED"
117-
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/sun.net.www.protocol.https=ALL-UNNAMED"
118-
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/sun.reflect.misc=ALL-UNNAMED"
119-
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.management/javax.management=ALL-UNNAMED"
120-
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.management/javax.management.openmbean=ALL-UNNAMED"
121-
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.naming/com.sun.jndi.ldap=ALL-UNNAMED"
122-
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/java.math=ALL-UNNAMED"
123-
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/sun.nio.ch=ALL-UNNAMED"
124-
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/java.nio=ALL-UNNAMED"
125-
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.security.jgss/sun.security.krb5=ALL-UNNAMED"
106+
SET "JAVA_LOCALE_COMPAT=-Djava.locale.providers=COMPAT,SPI"
107+
SET "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/sun.net.www.protocol.jar=ALL-UNNAMED"
108+
SET "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/java.lang=ALL-UNNAMED"
109+
SET "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/java.io=ALL-UNNAMED"
110+
SET "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/java.lang.reflect=ALL-UNNAMED"
111+
SET "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/java.net=ALL-UNNAMED"
112+
SET "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/java.security=ALL-UNNAMED"
113+
SET "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/java.util=ALL-UNNAMED"
114+
SET "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/sun.net.www.protocol.file=ALL-UNNAMED"
115+
SET "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/sun.net.www.protocol.ftp=ALL-UNNAMED"
116+
SET "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/sun.net.www.protocol.http=ALL-UNNAMED"
117+
SET "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/sun.net.www.protocol.https=ALL-UNNAMED"
118+
SET "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/sun.reflect.misc=ALL-UNNAMED"
119+
SET "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.management/javax.management=ALL-UNNAMED"
120+
SET "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.management/javax.management.openmbean=ALL-UNNAMED"
121+
SET "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.naming/com.sun.jndi.ldap=ALL-UNNAMED"
122+
SET "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/java.math=ALL-UNNAMED"
123+
SET "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/sun.nio.ch=ALL-UNNAMED"
124+
SET "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/java.nio=ALL-UNNAMED"
125+
SET "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.security.jgss/sun.security.krb5=ALL-UNNAMED"
126126

127127
:COLLECTARGUMENTS
128128
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,23 +143,23 @@ 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

160160
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
165165
%SPOON_START_OPTION% "%_PENTAHO_JAVA%" %JAVA_ADD_OPENS% %OPT% -jar launcher\launcher.jar -lib "..\%LIBSPATH%" %_cmdline%

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

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -10,46 +10,46 @@ REM
1010
REM Change Date: 2029-07-20
1111
REM ******************************************************************************
1212

13-
rem ---------------------------------------------------------------------------
14-
rem Finds a suitable Java
15-
rem
16-
rem Looks in well-known locations to find a suitable Java then sets two
17-
rem environment variables for use in other bat files. The two environment
18-
rem variables are:
19-
rem
20-
rem * _PENTAHO_JAVA_HOME - absolute path to Java home
21-
rem * _PENTAHO_JAVA - absolute path to Java launcher (e.g. java.exe)
22-
rem
23-
rem The order of the search is as follows:
24-
rem
25-
rem 1. argument #1 - path to Java home
26-
rem 2. environment variable PENTAHO_JAVA_HOME - path to Java home
27-
rem 3. jre folder at current folder level
28-
rem 4. java folder at current folder level
29-
rem 5. jre folder one level up
30-
rem 6 java folder one level up
31-
rem 7. jre folder two levels up
32-
rem 8. java folder two levels up
33-
rem 9. environment variable JAVA_HOME - path to Java home
34-
rem 10. environment variable JRE_HOME - path to Java home
35-
rem
36-
rem If a suitable Java is found at one of these locations, then
37-
rem _PENTAHO_JAVA_HOME is set to that location and _PENTAHO_JAVA is set to the
38-
rem absolute path of the Java launcher at that location. If none of these
39-
rem locations are suitable, then _PENTAHO_JAVA_HOME is set to empty string and
40-
rem _PENTAHO_JAVA is set to java.exe.
41-
rem
42-
rem Finally, there is one final optional environment variable: PENTAHO_JAVA.
43-
rem If set, this value is used in the construction of _PENTAHO_JAVA. If not
44-
rem set, then the value java.exe is used.
45-
rem ---------------------------------------------------------------------------
13+
REM ---------------------------------------------------------------------------
14+
REM Finds a suitable Java
15+
REM
16+
REM Looks in well-known locations to find a suitable Java then sets two
17+
REM environment variables for use in other bat files. The two environment
18+
REM variables are:
19+
REM
20+
REM * _PENTAHO_JAVA_HOME - absolute path to Java home
21+
REM * _PENTAHO_JAVA - absolute path to Java launcher (e.g. java.exe)
22+
REM
23+
REM The order of the search is as follows:
24+
REM
25+
REM 1. argument #1 - path to Java home
26+
REM 2. environment variable PENTAHO_JAVA_HOME - path to Java home
27+
REM 3. jre folder at current folder level
28+
REM 4. java folder at current folder level
29+
REM 5. jre folder one level up
30+
REM 6 java folder one level up
31+
REM 7. jre folder two levels up
32+
REM 8. java folder two levels up
33+
REM 9. environment variable JAVA_HOME - path to Java home
34+
REM 10. environment variable JRE_HOME - path to Java home
35+
REM
36+
REM If a suitable Java is found at one of these locations, then
37+
REM _PENTAHO_JAVA_HOME is set to that location and _PENTAHO_JAVA is set to the
38+
REM absolute path of the Java launcher at that location. If none of these
39+
REM locations are suitable, then _PENTAHO_JAVA_HOME is set to empty string and
40+
REM _PENTAHO_JAVA is set to java.exe.
41+
REM
42+
REM Finally, there is one final optional environment variable: PENTAHO_JAVA.
43+
REM If set, this value is used in the construction of _PENTAHO_JAVA. If not
44+
REM set, then the value java.exe is used.
45+
REM ---------------------------------------------------------------------------
4646

4747
if not "%PENTAHO_JAVA%" == "" goto gotPentahoJava
48-
set __LAUNCHER=java.exe
48+
SET "__LAUNCHER=java.exe"
4949
goto checkPentahoJavaHome
5050

5151
:gotPentahoJava
52-
set __LAUNCHER=%PENTAHO_JAVA%
52+
SET "__LAUNCHER=%PENTAHO_JAVA%"
5353
goto checkPentahoJavaHome
5454

5555
:checkPentahoJavaHome
@@ -67,62 +67,62 @@ goto gotPath
6767

6868
:gotPentahoJavaHome
6969
echo DEBUG: Using PENTAHO_JAVA_HOME
70-
set _PENTAHO_JAVA_HOME=%PENTAHO_JAVA_HOME%
71-
set _PENTAHO_JAVA=%_PENTAHO_JAVA_HOME%\bin\%__LAUNCHER%
70+
SET "_PENTAHO_JAVA_HOME=%PENTAHO_JAVA_HOME%"
71+
SET "_PENTAHO_JAVA=%_PENTAHO_JAVA_HOME%\bin\%__LAUNCHER%"
7272
goto end
7373

7474
:gotJreCurrentFolder
7575
echo DEBUG: Found JRE at the current folder
76-
set _PENTAHO_JAVA_HOME=%~dp0jre
77-
set _PENTAHO_JAVA=%_PENTAHO_JAVA_HOME%\bin\%__LAUNCHER%
76+
SET "_PENTAHO_JAVA_HOME=%~dp0jre"
77+
SET "_PENTAHO_JAVA=%_PENTAHO_JAVA_HOME%\bin\%__LAUNCHER%"
7878
goto end
7979

8080
:gotJavaCurrentFolder
8181
echo DEBUG: Found JAVA at the current folder
82-
set _PENTAHO_JAVA_HOME=%~dp0java
83-
set _PENTAHO_JAVA=%_PENTAHO_JAVA_HOME%\bin\%__LAUNCHER%
82+
SET "_PENTAHO_JAVA_HOME=%~dp0java"
83+
SET "_PENTAHO_JAVA=%_PENTAHO_JAVA_HOME%\bin\%__LAUNCHER%"
8484
goto end
8585

8686
:gotJreOneFolderUp
8787
echo DEBUG: Found JRE one folder up
88-
set _PENTAHO_JAVA_HOME=%~dp0..\jre
89-
set _PENTAHO_JAVA=%_PENTAHO_JAVA_HOME%\bin\%__LAUNCHER%
88+
SET "_PENTAHO_JAVA_HOME=%~dp0..\jre"
89+
SET "_PENTAHO_JAVA=%_PENTAHO_JAVA_HOME%\bin\%__LAUNCHER%"
9090
goto end
9191

9292
:gotJavaOneFolderUp
9393
echo DEBUG: Found JAVA one folder up
94-
set _PENTAHO_JAVA_HOME=%~dp0..\java
95-
set _PENTAHO_JAVA=%_PENTAHO_JAVA_HOME%\bin\%__LAUNCHER%
94+
SET "_PENTAHO_JAVA_HOME=%~dp0..\java"
95+
SET "_PENTAHO_JAVA=%_PENTAHO_JAVA_HOME%\bin\%__LAUNCHER%"
9696
goto end
9797

9898
:gotJreTwoFolderUp
9999
echo DEBUG: Found JRE two folder up
100-
set _PENTAHO_JAVA_HOME=%~dp0..\..\jre
101-
set _PENTAHO_JAVA=%_PENTAHO_JAVA_HOME%\bin\%__LAUNCHER%
100+
SET "_PENTAHO_JAVA_HOME=%~dp0..\..\jre"
101+
SET "_PENTAHO_JAVA=%_PENTAHO_JAVA_HOME%\bin\%__LAUNCHER%"
102102
goto end
103103

104104
:gotJavaTwoFolderUp
105105
echo DEBUG: Found JAVA two folder up
106-
set _PENTAHO_JAVA_HOME=%~dp0..\..\java
107-
set _PENTAHO_JAVA=%_PENTAHO_JAVA_HOME%\bin\%__LAUNCHER%
106+
SET "_PENTAHO_JAVA_HOME=%~dp0..\..\java"
107+
SET "_PENTAHO_JAVA=%_PENTAHO_JAVA_HOME%\bin\%__LAUNCHER%"
108108
goto end
109109

110110
:gotJdkHome
111111
echo DEBUG: Using JAVA_HOME
112-
set _PENTAHO_JAVA_HOME=%JAVA_HOME%
113-
set _PENTAHO_JAVA=%_PENTAHO_JAVA_HOME%\bin\%__LAUNCHER%
112+
SET "_PENTAHO_JAVA_HOME=%JAVA_HOME%"
113+
SET "_PENTAHO_JAVA=%_PENTAHO_JAVA_HOME%\bin\%__LAUNCHER%"
114114
goto end
115115

116116
:gotJreHome
117117
echo DEBUG: Using JRE_HOME
118-
set _PENTAHO_JAVA_HOME=%JRE_HOME%
119-
set _PENTAHO_JAVA=%_PENTAHO_JAVA_HOME%\bin\%__LAUNCHER%
118+
SET "_PENTAHO_JAVA_HOME=%JRE_HOME%"
119+
SET "_PENTAHO_JAVA=%_PENTAHO_JAVA_HOME%\bin\%__LAUNCHER%"
120120
goto end
121121

122122
:gotValueFromCaller
123123
echo DEBUG: Using value (%~1) from calling script
124-
set _PENTAHO_JAVA_HOME=%~1
125-
set _PENTAHO_JAVA=%_PENTAHO_JAVA_HOME%\bin\%__LAUNCHER%
124+
SET "_PENTAHO_JAVA_HOME=%~1"
125+
SET "_PENTAHO_JAVA=%_PENTAHO_JAVA_HOME%\bin\%__LAUNCHER%"
126126
goto end
127127

128128
:gotPath
@@ -135,10 +135,10 @@ FOR /F "tokens=* delims= " %%a IN ("%_PENTAHO_JAVA_HOME%") DO (SET _PENTAHO_JAVA
135135

136136
if exist "%_PENTAHO_JAVA_HOME%\bin\%__LAUNCHER%" (
137137
echo DEBUG: Getting java.home from java settings
138-
set "_PENTAHO_JAVA=%_PENTAHO_JAVA_HOME%\bin\%__LAUNCHER%"
138+
SET "_PENTAHO_JAVA=%_PENTAHO_JAVA_HOME%\bin\%__LAUNCHER%"
139139
) else (
140-
set _PENTAHO_JAVA_HOME=
141-
set _PENTAHO_JAVA=%__LAUNCHER%
140+
SET "_PENTAHO_JAVA_HOME="
141+
SET "_PENTAHO_JAVA=%__LAUNCHER%"
142142
)
143143

144144
goto end

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ setlocal
1515
pushd "%~dp0"
1616
SET "STARTTITLE=Encr"
1717
SET "SPOON_CONSOLE=1"
18-
set "JAVA_TOOL_OPTIONS="
19-
rem 9.1.0.0-SNAPSHOT
18+
SET "JAVA_TOOL_OPTIONS="
19+
REM 9.1.0.0-SNAPSHOT
2020
java -cp classes;lib/pentaho-encryption-support-${encryption-support.version}.jar;lib/jetty-util-${jetty.version}.jar org.pentaho.support.encryption.Encr %*
2121
popd

0 commit comments

Comments
 (0)