Skip to content
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.

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

Added Safer empty variable . Fixes #11729 #15479

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions bin/benchmark.bat
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@echo off
setlocal enabledelayedexpansion
setlocal enableextensions

cd /d "%~dp0.."
for /f %%i in ('cd') do set RESULT=%%i
Expand Down
1 change: 1 addition & 0 deletions bin/logstash-keystore.bat
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@echo off
setlocal enabledelayedexpansion
setlocal enableextensions

call "%~dp0setup.bat" || exit /b 1
if errorlevel 1 (
Expand Down
1 change: 1 addition & 0 deletions bin/logstash-plugin.bat
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@echo off
setlocal enabledelayedexpansion
setlocal enableextensions

call "%~dp0setup.bat" || exit /b 1
if errorlevel 1 (
Expand Down
1 change: 1 addition & 0 deletions bin/logstash.bat
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@echo off
setlocal enabledelayedexpansion
setlocal enableextensions
set params='%*'


Expand Down
3 changes: 2 additions & 1 deletion bin/pqcheck.bat
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@echo off
setlocal enabledelayedexpansion
setlocal enabledelayedexpansion
setlocal enableextensions

call "%~dp0setup.bat" || exit /b 1
if errorlevel 1 (
Expand Down
3 changes: 2 additions & 1 deletion bin/pqrepair.bat
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@echo off
setlocal enabledelayedexpansion
setlocal enabledelayedexpansion
setlocal enableextensions

call "%~dp0setup.bat" || exit /b 1
if errorlevel 1 (
Expand Down
1 change: 1 addition & 0 deletions bin/rspec.bat
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@echo off
setlocal enabledelayedexpansion
setlocal enableextensions
set params='%*'

call "%~dp0setup.bat" || exit /b 1
Expand Down
4 changes: 2 additions & 2 deletions bin/setup.bat
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ if not exist "%JAVACMD%" (
)

rem do not let JAVA_TOOL_OPTIONS slip in (as the JVM does by default)
if not "%JAVA_TOOL_OPTIONS%" == "" (
if defined JAVA_TOOL_OPTIONS (
echo "warning: ignoring JAVA_TOOL_OPTIONS=$JAVA_TOOL_OPTIONS"
set JAVA_TOOL_OPTIONS=
)

rem JAVA_OPTS is not a built-in JVM mechanism but some people think it is so we
rem warn them that we are not observing the value of %JAVA_OPTS%
if not "%JAVA_OPTS%" == "" (
if defined JAVA_OPTS (
echo|set /p="warning: ignoring JAVA_OPTS=%JAVA_OPTS%; "
echo pass JVM parameters via LS_JAVA_OPTS
)
Expand Down