Skip to content

Exit Windows scripts promptly on failure #25959

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

Merged
merged 2 commits into from
Jul 31, 2017
Merged

Exit Windows scripts promptly on failure #25959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
594ab17
Exit Windows scripts promptly on failure
jasontedor Jul 30, 2017
14abd1b
Merge branch 'master' into exit-promptly
jasontedor Jul 31, 2017
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
4 changes: 2 additions & 2 deletions distribution/src/main/resources/bin/elasticsearch-env.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ if defined JAVA_HOME (

if not exist %JAVA% (
echo could not find java; set JAVA_HOME or ensure java is in PATH 1>&2
exit /B 1
exit /b 1
)

rem JAVA_OPTS is not a built-in JVM mechanism but some people think it is so we
Expand All @@ -41,7 +41,7 @@ rem check the Java version
if errorlevel 1 (
echo|set /p="the minimum required Java version is 8; "
echo your Java version from %JAVA% does not meet this requirement
exit /B 1
exit /b 1
)

if "%CONF_DIR%" == "" (
Expand Down
2 changes: 1 addition & 1 deletion distribution/src/main/resources/bin/elasticsearch-keystore.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

setlocal enabledelayedexpansion

call "%~dp0elasticsearch-env.bat"
call "%~dp0elasticsearch-env.bat" || exit /b 1

%JAVA% ^
%ES_JAVA_OPTS% ^
Expand Down
2 changes: 1 addition & 1 deletion distribution/src/main/resources/bin/elasticsearch-plugin.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

setlocal enabledelayedexpansion

call "%~dp0elasticsearch-env.bat"
call "%~dp0elasticsearch-env.bat" || exit /b 1

%JAVA% ^
%ES_JAVA_OPTS% ^
Expand Down
2 changes: 1 addition & 1 deletion distribution/src/main/resources/bin/elasticsearch-service.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

setlocal enabledelayedexpansion

call "%~dp0elasticsearch-env.bat"
call "%~dp0elasticsearch-env.bat" || exit /b 1

set EXECUTABLE=%ES_HOME%\bin\elasticsearch-service-x64.exe
set SERVICE_ID=elasticsearch-service-x64
Expand Down
2 changes: 1 addition & 1 deletion distribution/src/main/resources/bin/elasticsearch-translog.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

setlocal enabledelayedexpansion

call "%~dp0elasticsearch-env.bat"
call "%~dp0elasticsearch-env.bat" || exit /b 1

%JAVA% ^
%ES_JAVA_OPTS% ^
Expand Down
2 changes: 1 addition & 1 deletion distribution/src/main/resources/bin/elasticsearch.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ FOR /F "usebackq tokens=1* delims= " %%A IN (!params!) DO (
)
)

CALL "%~dp0elasticsearch-env.bat"
CALL "%~dp0elasticsearch-env.bat" || exit /b 1
IF ERRORLEVEL 1 (
IF NOT DEFINED nopauseonerror (
PAUSE
Expand Down