honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-30 11:58:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rewrite if-statement for shell compatibility

Browse Source 
This commit rewrites an if-statement in bin/elasticsearch for
compatibility with some shells (e.g., dash on Ubuntu).
This commit is contained in:
Jason Tedor 2016-04-12 22:19:03 -04:00
parent 27867c729d
commit 5662a14d22
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
distribution/src/main/resources/bin/elasticsearch
View File

@ -56,19 +56,19 @@ fi
# TODO: remove for Elasticsearch 6.x # TODO: remove for Elasticsearch 6.x
unsupported_environment_variable() { unsupported_environment_variable() {
if [ ! -z "$1" ]; then if test -n "$1"; then
echo "$2=$1: $3" echo "$2=$1: $3"
fi fi
} }
if [[ !(-z "$ES_MIN_MEM" && if test -n "$ES_MIN_MEM" ||
-z "$ES_MAX_MEM" && test -n "$ES_MAX_MEM" ||
-z "$ES_HEAP_SIZE" && test -n "$ES_HEAP_SIZE" ||
-z "$ES_HEAP_NEWSIZE" && test -n "$ES_HEAP_NEWSIZE" ||
-z "$ES_DIRECT_SIZE" && test -n "$ES_DIRECT_SIZE" ||
-z "$ES_USE_IPV4" && test -n "$ES_USE_IPV4" ||
-z "$ES_GC_OPTS" && test -n "$ES_GC_OPTS" ||
-z "$ES_GC_LOG_FILE") ]]; then test -n "$ES_GC_LOG_FILE"; then
echo "Error: encountered environment variables that are no longer supported" echo "Error: encountered environment variables that are no longer supported"
echo "Use jvm.options or ES_JAVA_OPTS to configure the JVM" echo "Use jvm.options or ES_JAVA_OPTS to configure the JVM"
unsupported_environment_variable "$ES_MIN_MEM" ES_MIN_MEM "set -Xms$ES_MIN_MEM in jvm.options or add \"-Xms$ES_MIN_MEM\" to ES_JAVA_OPTS" unsupported_environment_variable "$ES_MIN_MEM" ES_MIN_MEM "set -Xms$ES_MIN_MEM in jvm.options or add \"-Xms$ES_MIN_MEM\" to ES_JAVA_OPTS"