honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15755 from droberts195/grep_minus_e_portability_fix 

Use egrep instead of grep -E for Solaris
This commit is contained in:
Lee Hinman 2016-01-06 14:18:52 -07:00
parent 2cc979ee77 febc2f08d6
commit cb8d378c2a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,7 +132,7 @@ HOSTNAME=`hostname | cut -d. -f1`
export HOSTNAME export HOSTNAME
# manual parsing to find out, if process should be detached # manual parsing to find out, if process should be detached
daemonized=`echo $* | grep -E -- '(^-d |-d$| -d |--daemonize$|--daemonize )'` daemonized=`echo $* | egrep -- '(^-d |-d$| -d |--daemonize$|--daemonize )'`
if [ -z "$daemonized" ] ; then if [ -z "$daemonized" ] ; then
exec "$JAVA" $JAVA_OPTS $ES_JAVA_OPTS -Des.path.home="$ES_HOME" -cp "$ES_CLASSPATH" \ exec "$JAVA" $JAVA_OPTS $ES_JAVA_OPTS -Des.path.home="$ES_HOME" -cp "$ES_CLASSPATH" \
org.elasticsearch.bootstrap.Elasticsearch start "$@" org.elasticsearch.bootstrap.Elasticsearch start "$@"