|
|
@@ -44,7 +44,7 @@ while [ $# -gt 0 ]; do
|
|
|
done
|
|
|
|
|
|
if [ -z "$ES_TMPDIR" ]; then
|
|
|
- ES_TMPDIR=`"$JAVA" "$XSHARE" -cp "$LAUNCHERS_CLASSPATH" org.elasticsearch.tools.launchers.TempDirectory`
|
|
|
+ ES_TMPDIR=`"$JAVA" -cp "$LAUNCHERS_CLASSPATH" org.elasticsearch.tools.launchers.TempDirectory`
|
|
|
fi
|
|
|
|
|
|
if [ -z "$LIBFFI_TMPDIR" ]; then
|
|
|
@@ -98,7 +98,7 @@ fi
|
|
|
# - second, JVM options are read from jvm.options and jvm.options.d/*.options
|
|
|
# - third, JVM options from ES_JAVA_OPTS are applied
|
|
|
# - fourth, ergonomic JVM options are applied
|
|
|
-ES_JAVA_OPTS=`export ES_TMPDIR; "$JAVA" "$XSHARE" -cp "$LAUNCHERS_CLASSPATH" org.elasticsearch.tools.launchers.JvmOptionsParser "$ES_PATH_CONF" "$ES_HOME/plugins"`
|
|
|
+ES_JAVA_OPTS=`export ES_TMPDIR; "$JAVA" -cp "$LAUNCHERS_CLASSPATH" org.elasticsearch.tools.launchers.JvmOptionsParser "$ES_PATH_CONF" "$ES_HOME/plugins"`
|
|
|
|
|
|
# Remove enrollment related parameters before passing the arg list to Elasticsearch
|
|
|
for i in "${!ARG_LIST[@]}"; do
|
|
|
@@ -111,7 +111,6 @@ done
|
|
|
if [[ $DAEMONIZE = false ]]; then
|
|
|
exec \
|
|
|
"$JAVA" \
|
|
|
- "$XSHARE" \
|
|
|
$ES_JAVA_OPTS \
|
|
|
-Des.path.home="$ES_HOME" \
|
|
|
-Des.path.conf="$ES_PATH_CONF" \
|
|
|
@@ -124,7 +123,6 @@ if [[ $DAEMONIZE = false ]]; then
|
|
|
else
|
|
|
exec \
|
|
|
"$JAVA" \
|
|
|
- "$XSHARE" \
|
|
|
$ES_JAVA_OPTS \
|
|
|
-Des.path.home="$ES_HOME" \
|
|
|
-Des.path.conf="$ES_PATH_CONF" \
|