mirror of
https://git.freebsd.org/ports.git
synced 2025-04-29 18:16:48 -04:00
f950a15f38
- 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]
26 lines
640 B
Text
26 lines
640 B
Text
--- 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
|
|
|