don't use CLASSPATH in plugin, and simplify plugin.bat
This commit is contained in:
parent
28c9595af3
commit
e0acf13a12
|
@ -28,6 +28,4 @@ else
|
||||||
JAVA=`which java`
|
JAVA=`which java`
|
||||||
fi
|
fi
|
||||||
|
|
||||||
CLASSPATH=$CLASSPATH:$ES_HOME/lib/*
|
exec $JAVA -Delasticsearch -Des.path.home="$ES_HOME" -cp $ES_HOME/lib/* org.elasticsearch.plugins.PluginManager $*
|
||||||
|
|
||||||
exec $JAVA -Delasticsearch -Des.path.home="$ES_HOME" -cp $CLASSPATH org.elasticsearch.plugins.PluginManager $*
|
|
||||||
|
|
|
@ -8,10 +8,7 @@ set SCRIPT_DIR=%~dp0
|
||||||
for %%I in ("%SCRIPT_DIR%..") do set ES_HOME=%%~dpfI
|
for %%I in ("%SCRIPT_DIR%..") do set ES_HOME=%%~dpfI
|
||||||
|
|
||||||
|
|
||||||
set ES_CLASSPATH=%CLASSPATH%;%ES_HOME%/lib/*
|
"%JAVA_HOME%\bin\java" -Des.path.home="%ES_HOME%" -cp "%ES_HOME%/lib/*" "org.elasticsearch.plugins.PluginManager" %*
|
||||||
set ES_PARAMS=-Delasticsearch -Des.path.home="%ES_HOME%"
|
|
||||||
|
|
||||||
"%JAVA_HOME%\bin\java" %JAVA_OPTS% %ES_JAVA_OPTS% %ES_PARAMS% -cp "%ES_CLASSPATH%" "org.elasticsearch.plugins.PluginManager" %*
|
|
||||||
goto finally
|
goto finally
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue