Skip to content

Remove redundant Java check from Sys V init #45793

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 2 commits into from
Aug 23, 2019
Merged

Remove redundant Java check from Sys V init #45793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6fe44d
Remove redundant Java check from Sys V init
jasontedor Aug 21, 2019
767df8c
Merge branch 'master' into redundant-check-java
elasticmachine Aug 22, 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
14 changes: 0 additions & 14 deletions distribution/packages/src/deb/init.d/elasticsearch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,22 +80,8 @@ if [ ! -x "$DAEMON" ]; then
exit 1
fi

checkJava() {
if [ ! -z "${JAVA_HOME}" ]; then
JAVA="${JAVA_HOME}"/bin/java
else
JAVA="${ES_HOME}"/jdk/bin/java
fi

if [ ! -x "$JAVA" ]; then
echo "could not find java in JAVA_HOME or bundled at ${JAVA}"
exit 1
fi
}

case "$1" in
start)
checkJava

log_daemon_msg "Starting $DESC"

Expand Down
14 changes: 0 additions & 14 deletions distribution/packages/src/rpm/init.d/elasticsearch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,21 +67,7 @@ if [ ! -x "$exec" ]; then
exit 1
fi

checkJava() {
if [ ! -z "${JAVA_HOME}" ]; then
JAVA="${JAVA_HOME}"/bin/java
else
JAVA="${ES_HOME}"/jdk/bin/java
fi

if [ ! -x "$JAVA" ]; then
echo "could not find java in JAVA_HOME or bundled at ${JAVA}"
exit 1
fi
}

start() {
checkJava
[ -x $exec ] || exit 5

if [ -n "$MAX_OPEN_FILES" ]; then
Expand Down