diff options
| author | Juraj Lutter <otis@FreeBSD.org> | 2021-07-03 23:41:57 +0200 |
|---|---|---|
| committer | Juraj Lutter <otis@FreeBSD.org> | 2021-07-06 22:44:37 +0200 |
| commit | f950a15f3858d0b8abdb4357219058c3eed56fca (patch) | |
| tree | a7cbc317f28ae5088222c4b893e813c73984af99 /textproc/elasticsearch7/files/patch-bin_elasticsearch-env | |
| parent | sysutils/logstash7: Update to 7.13.2 (diff) | |
textproc/elasticsearch7: Update to 7.13.2
- Update to 7.13.2
- Fix support tools to find java correctly [1]
- Needs enforce_statfs = 1 in jails [2]
- Fix rc order [3]
PR: 256921 [1]
PR: 254777 [2]
PR: 254776 [3]
Diffstat (limited to 'textproc/elasticsearch7/files/patch-bin_elasticsearch-env')
| -rw-r--r-- | textproc/elasticsearch7/files/patch-bin_elasticsearch-env | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/textproc/elasticsearch7/files/patch-bin_elasticsearch-env b/textproc/elasticsearch7/files/patch-bin_elasticsearch-env new file mode 100644 index 000000000000..4dee506b5784 --- /dev/null +++ b/textproc/elasticsearch7/files/patch-bin_elasticsearch-env @@ -0,0 +1,26 @@ +--- bin/elasticsearch-env.orig 2021-07-05 19:40:21 UTC ++++ bin/elasticsearch-env +@@ -46,12 +46,17 @@ elif [ ! -z "$JAVA_HOME" ]; then + JAVA_TYPE="JAVA_HOME" + else + # use the bundled JDK (default) +- if [ "$(uname -s)" = "Darwin" ]; then +- # macOS has a different structure +- JAVA="$ES_HOME/jdk.app/Contents/Home/bin/java" +- else +- JAVA="$ES_HOME/jdk/bin/java" +- fi ++ case "$(uname -s)" in ++ "Darwin") ++ JAVA="$ES_HOME/jdk.app/Contents/Home/bin/java" ++ ;; ++ "FreeBSD") ++ JAVA=%%LOCALBASE%%/bin/java ++ ;; ++ *) ++ JAVA="$ES_HOME/jdk/bin/java" ++ ;; ++ esac + JAVA_TYPE="bundled JDK" + fi + |