Skip to content

Source additional files correctly in elasticsearch-cli #40890

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

Merged
merged 4 commits into from
Apr 5, 2019
Merged

Source additional files correctly in elasticsearch-cli #40890

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
68f35c3
Source additional sources correctly
jkakavas Apr 5, 2019
d9859ae
add quotes to the path so that it can properly handle spaces
jkakavas Apr 5, 2019
6c323ce
Make quoting consistent with elsewhere
jasontedor Apr 5, 2019
1686b21
Add packaging test, running CLI commands from a dir other than
jkakavas Apr 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion distribution/src/bin/elasticsearch-cli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ source "`dirname "$0"`"/elasticsearch-env
IFS=';' read -r -a additional_sources <<< "$ES_ADDITIONAL_SOURCES"
for additional_source in "${additional_sources[@]}"
do
source "`dirname "$0"`"/$additional_source
source $ES_HOME/bin/$additional_source
Copy link
Member

@jasontedor jasontedor Apr 5, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We probably need quotes here since ES_HOME could have spaces. Can you verify this, and quote if needed.

Also, does Windows have the same problem and need a fix too?

Copy link
Contributor Author

@jkakavas jkakavas Apr 5, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, does Windows have the same problem and need a fix too?

we use:

if defined ES_ADDITIONAL_SOURCES (
  for %%a in ("%ES_ADDITIONAL_SOURCES:;=","%") do (
    call "%~dp0%%a"
  )
)

%~dp0 will always expand to the full path where the batch file is located and not one relative to where the batch script is executed from, so it will not be affected by the cd that happens when we source elasticsearch-env.bat . That said, I'd have nothing against a manual confirmation, I don't have access to a windows machine right now :/

Copy link
Member

@jasontedor jasontedor Apr 5, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That looks right to me, thanks for checking.

done

IFS=';' read -r -a additional_classpath_directories <<< "$ES_ADDITIONAL_CLASSPATH_DIRECTORIES"
Expand Down