Date: Thursday, April 11, 2019 @ 15:23:55 Author: mtorromeo Revision: 451123
upgpkg: elasticsearch 7.0.0-1 Modified: elasticsearch/trunk/PKGBUILD elasticsearch/trunk/elasticsearch-env -------------------+ PKGBUILD | 2 +- elasticsearch-env | 29 ++++++++++++++++++++--------- 2 files changed, 21 insertions(+), 10 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-04-11 15:23:50 UTC (rev 451122) +++ PKGBUILD 2019-04-11 15:23:55 UTC (rev 451123) @@ -23,7 +23,7 @@ elasticsearch.default ) sha256sums=('c81751ba0b033581dba7eed6081de736e106fff7f3c0b12754c8711d6a6f2ccb' - '1607adfcdefc2a55d7d4c7e8a15669da2cc8096029cce5dd5b9279d4966ceabe' + 'ff530bf9440364955e9f38b5c5cc0782da1b1ac1c54870b162b7ded81e56eebc' 'de3842935b6ef9cb8a05dc18334112f534dccc2292e36052df942a92de7e66db' '13090c1d23ae0a21bf6f0f1d1da795d38972f1674b20c3d2d32f54311aa99094' 'bac40d87acaa5bee209ceb6dfa253009a072e9243fe3b94be42fb5cd44727d6f' Modified: elasticsearch-env =================================================================== --- elasticsearch-env 2019-04-11 15:23:50 UTC (rev 451122) +++ elasticsearch-env 2019-04-11 15:23:55 UTC (rev 451123) @@ -2,6 +2,7 @@ set -e -o pipefail +JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/default-runtime} ES_HOME=/usr/share/elasticsearch # now set the classpath @@ -8,16 +9,19 @@ ES_CLASSPATH="$ES_HOME/lib/*" # now set the path to java -if [ -x "$JAVA_HOME/bin/java" ]; then +if [ ! -z "$JAVA_HOME" ]; then JAVA="$JAVA_HOME/bin/java" else - set +e - JAVA=`which java` - set -e + if [ "$(uname -s)" = "Darwin" ]; then + # OSX has a different structure + JAVA="$ES_HOME/jdk/Contents/Home/bin/java" + else + JAVA="$ES_HOME/jdk/bin/java" + fi fi if [ ! -x "$JAVA" ]; then - echo "could not find java; set JAVA_HOME or ensure java is in PATH" + echo "could not find java in JAVA_HOME or bundled at $JAVA" >&2 exit 1 fi @@ -39,12 +43,19 @@ export HOSTNAME=$HOSTNAME -if [ -z "$ES_PATH_CONF" ]; then ES_PATH_CONF=/etc/elasticsearch; fi - if [ -z "$ES_PATH_CONF" ]; then - echo "ES_PATH_CONF must be set to the configuration path" - exit 1 + ES_PATH_CONF=/etc/elasticsearch fi +# now make ES_PATH_CONF absolute +ES_PATH_CONF=`cd "$ES_PATH_CONF"; pwd` + ES_DISTRIBUTION_FLAVOR=default ES_DISTRIBUTION_TYPE=tar +ES_BUNDLED_JDK=false + +if [ -z "$ES_TMPDIR" ]; then + ES_TMPDIR=`"$JAVA" -cp "$ES_CLASSPATH" org.elasticsearch.tools.launchers.TempDirectory` +fi + +cd "$ES_HOME"