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.

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

Jump to bottom

error when JAVA_HOME is set to invalid value (DAT-10545) #3074

Merged
merged 5 commits into from Jul 19, 2022
Merged

error when JAVA_HOME is set to invalid value (DAT-10545) #3074

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dc8a750
properly handle multiple JAVA_HOME values separated by semicolons
StevenMassaro Jul 18, 2022
58058e4
check only if JAVA_HOME path exists
StevenMassaro Jul 18, 2022
8989b31
do not require JAVA_HOME value on Windows
StevenMassaro Jul 18, 2022
1cd638e
change error message
StevenMassaro Jul 19, 2022
6ec6897
do not exit entire cmd prompt, only the script
StevenMassaro Jul 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions liquibase-dist/src/main/archive/liquibase
View file
Open in desktop
Expand Up @@ -30,6 +30,11 @@ if [ -z "${JAVA_HOME}" ]; then
elif [ -d "${LIQUIBASE_HOME}/.install4j/jre.bundle/Contents/Home" ]; then
JAVA_HOME="${LIQUIBASE_HOME}/.install4j/jre.bundle/Contents/Home"
fi
else
if [ ! -x "$JAVA_HOME" ] ; then
echo "ERROR: Liquibase cannot determine a valid JAVA_PATH or JAVA_HOME. Please inspect your configurations and try again." >&2
exit 1
fi
fi

if [ -z "${JAVA_HOME}" ]; then
Expand Down
5 changes: 5 additions & 0 deletions liquibase-dist/src/main/archive/liquibase.bat
View file
Open in desktop
Expand Up @@ -17,6 +17,11 @@ if exist "%LIQUIBASE_HOME%\jre" if "%JAVA_HOME%"=="" (
set JAVA_HOME=%LIQUIBASE_HOME%\jre
)

if NOT "%JAVA_HOME%" == "" if not exist "%JAVA_HOME%" (
echo ERROR: Liquibase cannot determine a valid JAVA_PATH or JAVA_HOME. Please inspect your configurations and try again. >&2
exit 1
)

rem special characters may be lost
setlocal DISABLEDELAYEDEXPANSION

Expand Down