Repository: ignite Updated Branches: refs/heads/ignite-2.5 5efc589fc -> af46856d7
IGNITE-8274 sqlline.sh script uses JAVA_HOME now Signed-off-by: Andrey Gura <[email protected]> (cherry picked from commit c3ff274) Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/af46856d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/af46856d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/af46856d Branch: refs/heads/ignite-2.5 Commit: af46856d7f7ec88aa663865a108900abb8314ffe Parents: 5efc589 Author: oleg-ostanin <[email protected]> Authored: Wed Apr 18 00:58:53 2018 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Wed Apr 18 15:45:45 2018 +0700 ---------------------------------------------------------------------- modules/sqlline/bin/sqlline.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/af46856d/modules/sqlline/bin/sqlline.sh ---------------------------------------------------------------------- diff --git a/modules/sqlline/bin/sqlline.sh b/modules/sqlline/bin/sqlline.sh index 5745aea..552440d 100644 --- a/modules/sqlline/bin/sqlline.sh +++ b/modules/sqlline/bin/sqlline.sh @@ -36,6 +36,11 @@ SCRIPTS_HOME="${IGNITE_HOME_TMP}/bin" source "${SCRIPTS_HOME}"/include/functions.sh # +# Discover path to Java executable and check it's version. +# +checkJava + +# # Discover IGNITE_HOME environment variable. # setIgniteHome @@ -51,4 +56,4 @@ CP="${IGNITE_LIBS}" CP="${CP}${SEP}${IGNITE_HOME_TMP}/bin/include/sqlline/*" -java -cp ${CP} sqlline.SqlLine -d org.apache.ignite.IgniteJdbcThinDriver $@ \ No newline at end of file +"$JAVA" -cp ${CP} sqlline.SqlLine -d org.apache.ignite.IgniteJdbcThinDriver $@ \ No newline at end of file
