Skip to content

Commit b9cd985

Browse files
committed
sdk-installer: silence the conditional clauses
Even if the 'IF' statement already was silenced by prefixing it with an '@', the actual clause was not, so it would be printed to the console in addition to being executed. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 350624b commit b9cd985

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

sdk-installer/setup-git-sdk.bat

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
@SET /A counter=0
1717
:INSTALL_RUNTIME
1818
@SET /A counter+=1
19-
@IF %counter% GEQ 5 (
19+
@IF %counter% GEQ 5 @(
2020
@ECHO Could not install msys2-runtime
2121
@PAUSE
2222
@EXIT 1
2323
)
2424

2525
@REM Maybe we need a proxy?
26-
@IF %counter% GEQ 2 (
26+
@IF %counter% GEQ 2 @(
2727
@ECHO.
2828
@ECHO There was a problem accessing the MSys2 repositories
2929
@ECHO If your setup requires an HTTP proxy to access the web,
@@ -32,7 +32,7 @@
3232
@SET /p proxy= "HTTP proxy: "
3333
)
3434
@REM Check the proxy variable here because of delayed expansion
35-
@IF NOT "%proxy%" == "" (
35+
@IF NOT "%proxy%" == "" @(
3636
@SET http_proxy=%proxy%
3737
@SET https_proxy=%proxy%
3838
)
@@ -47,7 +47,7 @@
4747
@SET /A counter=0
4848
:INSTALL_PACMAN
4949
@SET /A counter+=1
50-
@IF %counter% GEQ 5 (
50+
@IF %counter% GEQ 5 @(
5151
@ECHO Could not install pacman
5252
@PAUSE
5353
@EXIT 1
@@ -61,7 +61,7 @@
6161
@SET /A counter=0
6262
:INSTALL_REST
6363
@SET /A counter+=1
64-
@IF %counter% GEQ 5 (
64+
@IF %counter% GEQ 5 @(
6565
@ECHO Could not install the remaining packages
6666
@PAUSE
6767
@EXIT 1
@@ -82,14 +82,14 @@
8282
@IF ERRORLEVEL 1 GOTO INSTALL_REST
8383

8484
@REM Avoid overlapping address ranges
85-
@IF MINGW32 == %MSYSTEM% (
85+
@IF MINGW32 == %MSYSTEM% @(
8686
ECHO Auto-rebasing .dll files
8787
CALL %cwd%\autorebase.bat
8888
)
8989

9090
@REM If an HTTP proxy is requires, configure it for Git Bash sessions,
9191
@REM but only if the environment variable was not already set globally
92-
@IF DEFINED proxy (
92+
@IF DEFINED proxy @(
9393
@ECHO http_proxy=%proxy% > etc\profile.d\proxy.sh
9494
@ECHO https_proxy=%proxy% >> etc\profile.d\proxy.sh
9595
@ECHO export http_proxy https_proxy >> etc\profile.d\proxy.sh
@@ -102,7 +102,7 @@
102102
@MKDIR %cwd%\dev\shm 2> NUL
103103
@MKDIR %cwd%\dev\mqueue 2> NUL
104104

105-
@IF NOT DEFINED JENKINS_URL (
105+
@IF NOT DEFINED JENKINS_URL @(
106106
@REM Install shortcut on the desktop
107107
@ECHO.
108108
@ECHO Installing the 'Git SDK @@BITNESS@@-bit' shortcut on the Desktop

0 commit comments

Comments
 (0)