honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-23 05:15:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

[packaging] remove JAVA_HOME detection

Browse Source 
Only the debian init script did JAVA_HOME detection. Everything else just
relied on `bin/elasticsearch`'s `which java` style detection. This strips
the detection from the debian init script so its like the rpm init script.

Closes #13403
This commit is contained in:
Nik Everett 2015-09-11 08:37:42 -04:00
parent c598271076
commit 2a5bb4e648
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
distribution/deb/src/main/packaging/init.d/elasticsearch
View File

@ -43,17 +43,6 @@ fi
ES_USER=elasticsearch ES_USER=elasticsearch
ES_GROUP=elasticsearch ES_GROUP=elasticsearch
# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT)
JDK_DIRS="/usr/lib/jvm/java-8-oracle/ /usr/lib/jvm/j2sdk1.8-oracle/ /usr/lib/jvm/jdk-7-oracle-x64 /usr/lib/jvm/java-7-oracle /usr/lib/jvm/j2sdk1.7-oracle/ /usr/lib/jvm/java-7-openjdk /usr/lib/jvm/java-7-openjdk-amd64/ /usr/lib/jvm/java-7-openjdk-armhf /usr/lib/jvm/java-7-openjdk-i386/ /usr/lib/jvm/default-java"
# Look for the right JVM to use
for jdir in $JDK_DIRS; do
if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then
JAVA_HOME="$jdir"
fi
done
export JAVA_HOME
# Directory where the Elasticsearch binary distribution resides # Directory where the Elasticsearch binary distribution resides
ES_HOME=/usr/share/$NAME ES_HOME=/usr/share/$NAME
@ -114,6 +103,7 @@ export ES_HEAP_NEWSIZE
export ES_DIRECT_SIZE export ES_DIRECT_SIZE
export ES_JAVA_OPTS export ES_JAVA_OPTS
export ES_GC_LOG_FILE export ES_GC_LOG_FILE
export JAVA_HOME
# Check DAEMON exists # Check DAEMON exists
test -x $DAEMON || exit 0 test -x $DAEMON || exit 0