honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-17 10:25:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix sql cli sourcing of x-pack-env (#52613)

Browse Source 
The sql-cli script sources x-pack-env, but it does so assuming the
current directory is ES_HOME. This commit alters the source command to
use ES_HOME which is available after running elasticsearch-env.

closes #47803
This commit is contained in:
Ryan Ernst 2020-02-24 11:13:06 -08:00 committed by Ryan Ernst
parent 7d9de8412a
commit 8c295cdc87
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x-pack/plugin/sql/src/main/bin/elasticsearch-sql-cli
View File

@ -6,9 +6,9 @@
source "`dirname "$0"`"/elasticsearch-env source "`dirname "$0"`"/elasticsearch-env
source "`dirname "$0"`"/x-pack-env source "$ES_HOME"/bin/x-pack-env
CLI_JAR=$(ls $ES_HOME/bin/elasticsearch-sql-cli-*.jar) CLI_JAR=$(ls "$ES_HOME"/bin/elasticsearch-sql-cli-*.jar)
exec \ exec \
"$JAVA" \ "$JAVA" \

BIN
x-pack/plugin/sql/src/main/bin/elasticsearch-sql-cli.bat
View File

Binary file not shown.