Rename function that parses JVM options

This commit renames the function that parses JVM options in
bin/elasticsearch from jvm_options to parse_jvm_options. The reason for
the rename is because a for-loop variable was shadowing the name of this
function and changing the function name further clarifies the purpose of
the function.
This commit is contained in:
Jason Tedor 2016-04-12 11:42:06 -04:00
parent 00033b3da3
commit 9460289bee

View File

@ -54,7 +54,7 @@ EOF
exit 1
fi
jvm_options() {
parse_jvm_options() {
if [ -f "$1" ]; then
echo "$(grep "^-" "$1" | tr '\n' ' ')"
fi
@ -91,7 +91,7 @@ if [ -z "$ES_JVM_OPTIONS" ]; then
done
fi
ES_JAVA_OPTS="$(jvm_options "$ES_JVM_OPTIONS") $ES_JAVA_OPTS"
ES_JAVA_OPTS="$(parse_jvm_options "$ES_JVM_OPTIONS") $ES_JAVA_OPTS"
# If an include wasn't specified in the environment, then search for one...
if [ "x$ES_INCLUDE" = "x" ]; then