From owner-svn-ports-all@freebsd.org Fri Mar 25 15:28:04 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5B37FADDF4E; Fri, 25 Mar 2016 15:28:04 +0000 (UTC) (envelope-from tj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1D9DE1F83; Fri, 25 Mar 2016 15:28:04 +0000 (UTC) (envelope-from tj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2PFS3kQ089085; Fri, 25 Mar 2016 15:28:03 GMT (envelope-from tj@FreeBSD.org) Received: (from tj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2PFS3Td089082; Fri, 25 Mar 2016 15:28:03 GMT (envelope-from tj@FreeBSD.org) Message-Id: <201603251528.u2PFS3Td089082@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tj set sender to tj@FreeBSD.org using -f From: Tom Judge Date: Fri, 25 Mar 2016 15:28:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r411850 - in head/textproc/elasticsearch: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Mar 2016 15:28:04 -0000 Author: tj Date: Fri Mar 25 15:28:02 2016 New Revision: 411850 URL: https://svnweb.freebsd.org/changeset/ports/411850 Log: Update to 1.7.5 Changes: https://www.elastic.co/downloads/past-releases/elasticsearch-1-7-5 PR: 206844 Modified: head/textproc/elasticsearch/Makefile head/textproc/elasticsearch/distinfo head/textproc/elasticsearch/files/elasticsearch.in Modified: head/textproc/elasticsearch/Makefile ============================================================================== --- head/textproc/elasticsearch/Makefile Fri Mar 25 15:15:52 2016 (r411849) +++ head/textproc/elasticsearch/Makefile Fri Mar 25 15:28:02 2016 (r411850) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= elasticsearch -PORTVERSION= 1.7.4 +PORTVERSION= 1.7.5 CATEGORIES= textproc java devel MASTER_SITES= http://download.elasticsearch.org/${PORTNAME}/${PORTNAME}/ \ http://mirrors.rit.edu/zi/ Modified: head/textproc/elasticsearch/distinfo ============================================================================== --- head/textproc/elasticsearch/distinfo Fri Mar 25 15:15:52 2016 (r411849) +++ head/textproc/elasticsearch/distinfo Fri Mar 25 15:28:02 2016 (r411850) @@ -1,2 +1,2 @@ -SHA256 (elasticsearch-1.7.4.tar.gz) = 395f3417c26a6b36125f6a062c1129b454a961efea09151c692adc63562e5a94 -SIZE (elasticsearch-1.7.4.tar.gz) = 28510433 +SHA256 (elasticsearch-1.7.5.tar.gz) = 0aa58947d66b487488e86059352deb7c6cab5da4accdff043cce9fed7c3d2fa7 +SIZE (elasticsearch-1.7.5.tar.gz) = 28487351 Modified: head/textproc/elasticsearch/files/elasticsearch.in ============================================================================== --- head/textproc/elasticsearch/files/elasticsearch.in Fri Mar 25 15:15:52 2016 (r411849) +++ head/textproc/elasticsearch/files/elasticsearch.in Fri Mar 25 15:28:02 2016 (r411850) @@ -73,6 +73,13 @@ command_args="-f %%LOCALBASE%%/bin/java elasticsearch_precmd() { + rc_pid=$(elasticsearch_check_pidfile $pidfile) + + if [ -n "$rc_pid" ]; then + [ -n "$rc_fast" ] && return 0 + echo "${name} is already running: $rc_pid" + return 1 + fi touch ${pidfile} chown ${elasticsearch_user}:${elasticsearch_group} ${pidfile} /usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 750 ${elasticsearch_tmp} @@ -82,6 +89,13 @@ elasticsearch_precmd() elasticsearch_console() { + rc_pid=$(elasticsearch_check_pidfile $pidfile) + + if [ -n "$rc_pid" ]; then + [ -n "$rc_fast" ] && return 0 + echo "${name} is already running: $rc_pid" + return 1 + fi %%LOCALBASE%%/bin/java -Des.foreground=yes ${elasticsearch_props} ${java_options} org.elasticsearch.bootstrap.Elasticsearch } @@ -127,7 +141,7 @@ elasticsearch_check_pidfile() debug "pid file ($_pidfile): no pid in file." return fi - if [ -n "`%%LOCALBASE%%/bin/jps -l | grep -e "^$_pid"`" ]; then + if [ -n "`/usr/bin/su -m ${elasticsearch_user} -c '%%LOCALBASE%%/bin/jps -l' | grep -e "^$_pid"`" ]; then echo -n $_pid fi }