Skip to content

Commit

Permalink
Merge branch 'main' into devonfw#734-improve-process-result
Browse files Browse the repository at this point in the history
  • Loading branch information
alfeilex authored Jan 7, 2025
2 parents 34fa698 + 3a24512 commit 6100259
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ This file documents all notable changes to https://github.com/devonfw/IDEasy[IDE

Release with new features and bugfixes:

* https://github.com/devonfw/IDEasy/issues/894[#894]: Fix ide.bat printing for initialization and error output

The full list of changes for this release can be found in https://github.com/devonfw/IDEasy/milestone/18?closed=1[milestone 2025.01.001].

Expand Down
15 changes: 10 additions & 5 deletions cli/src/main/package/bin/ide.bat
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,22 @@ if exist "%GIT_CORE%" (

if not "%1%" == "" (
ideasy %IDE_OPTIONS% %*
if not %ERRORLEVEL% == 0 (
echo %_fBRed%Error: IDEasy failed with exit code %ERRORLEVEL% %_RESET%
exit /b %ERRORLEVEL%
)
goto :output_error
)

REM https://stackoverflow.com/questions/61888625/what-is-f-in-the-for-loop-command
for /f "tokens=*" %%i in ('ideasy %IDE_OPTIONS% env') do (
call set %%i
)

if not %ERRORLEVEL% == 0 (
ideasy %IDE_OPTIONS% env>nul

if %ERRORLEVEL% == 0 (
echo IDE environment variables have been set for %IDE_HOME% in workspace %WORKSPACE%
)

:output_error
if not %ERRORLEVEL% == 0 (
echo %_fBRed%Error: IDEasy failed with exit code %ERRORLEVEL% %_RESET%
exit /b %ERRORLEVEL%
)

0 comments on commit 6100259

Please sign in to comment.