Attachment 226153 Details for Bug 256921 – properly find java in elasticsearch support tools

[patch] properly find java in elasticsearch support tools

elastic.diff (text/plain), 1.33 KB, created by Palle Girgensohn on 2021-07-01 15:41:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Palle Girgensohn

Created: 2021-07-01 15:41:36 UTC

Size: 1.33 KB

patch

obsolete

>diff --git a/textproc/elasticsearch7/Makefile b/textproc/elasticsearch7/Makefile
>index c2ba301f73bf..c1442b8a5a02 100644
>--- a/textproc/elasticsearch7/Makefile
>+++ b/textproc/elasticsearch7/Makefile
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	elasticsearch
> PORTVERSION=	7.10.1
>+PORTREVISION=	1
> CATEGORIES=	textproc java devel
> MASTER_SITES=	https://artifacts.elastic.co/downloads/${PORTNAME}/
> PKGNAMESUFFIX=	7
>diff --git a/textproc/elasticsearch7/files/patch-bin__elasticsearch-env b/textproc/elasticsearch7/files/patch-bin__elasticsearch-env
>new file mode 100644
>index 000000000000..17918772f6cf
>--- /dev/null
>+++ b/textproc/elasticsearch7/files/patch-bin__elasticsearch-env
>@@ -0,0 +1,26 @@
>+--- bin/elasticsearch-env.orig	2021-07-01 17:19:56.338467000 +0200
>++++ bin/elasticsearch-env	2021-07-01 17:20:48.513451000 +0200
>+@@ -40,12 +40,17 @@
>+   JAVA="$JAVA_HOME/bin/java"
>+   JAVA_TYPE="JAVA_HOME"
>+ else
>+-  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
>+

Actions: View | Diff

Attachments on bug 256921: 226153