Skip to content

Commit

Permalink
Fix liquibase bat (#4985)
Browse files Browse the repository at this point in the history
* Fix environment variable handling in liquibase.bat
1: Don't error if JAVA_HOME is defined and surrounded by double-quotes
2: If auto-setting JAVA_HOME, fix double-backslash before jre
3: If auto-setting JAVA_HOME, remove quotes around JAVA_HOME

* Fix missing space before nested IF statement
  • Loading branch information
erasmussen-first committed Oct 9, 2023
1 parent 4f59c96 commit f3ae024
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions liquibase-dist/src/main/archive/liquibase.bat
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,14 @@ rem remove quotes around LIQUIBASE_HOME
set LIQUIBASE_HOME=%LIQUIBASE_HOME:"=%

rem remove quotes around JAVA_HOME if set
if NOT "%JAVA_HOME%" == "" set JAVA_HOME=%JAVA_HOME:"=%
if DEFINED JAVA_HOME if NOT JAVA_HOME == "" set JAVA_HOME=%JAVA_HOME:"=%

rem set JAVA_HOME to local jre dir if not set
if exist "%LIQUIBASE_HOME%\jre" if "%JAVA_HOME%"=="" (
set JAVA_HOME=%LIQUIBASE_HOME%\jre
set JAVA_HOME="%LIQUIBASE_HOME%jre"

rem remove quotes around JAVA_HOME
set JAVA_HOME=!JAVA_HOME:"=!
)

if NOT "%JAVA_HOME%" == "" if not exist "%JAVA_HOME%" (
Expand Down

0 comments on commit f3ae024

Please sign in to comment.