Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 3 May 2015 19:44:07 +0000 (UTC)
From:      Jimmy Olgeni <olgeni@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r385341 - in head/textproc/elasticsearch: . files
Message-ID:  <201505031944.t43Ji7YF077455@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: olgeni
Date: Sun May  3 19:44:06 2015
New Revision: 385341
URL: https://svnweb.freebsd.org/changeset/ports/385341

Log:
  Fix pidfile check when jps does not return full process information.
  
  PR:		197595 (comment)
  Submitted by:	cheffo@freebsd-bg.org

Modified:
  head/textproc/elasticsearch/Makefile
  head/textproc/elasticsearch/files/elasticsearch.in

Modified: head/textproc/elasticsearch/Makefile
==============================================================================
--- head/textproc/elasticsearch/Makefile	Sun May  3 19:40:34 2015	(r385340)
+++ head/textproc/elasticsearch/Makefile	Sun May  3 19:44:06 2015	(r385341)
@@ -3,6 +3,7 @@
 
 PORTNAME=	elasticsearch
 PORTVERSION=	1.5.1
+PORTREVISION=	1
 CATEGORIES=	textproc java devel
 MASTER_SITES=	http://download.elasticsearch.org/${PORTNAME}/${PORTNAME}/ \
 		http://mirrors.rit.edu/zi/

Modified: head/textproc/elasticsearch/files/elasticsearch.in
==============================================================================
--- head/textproc/elasticsearch/files/elasticsearch.in	Sun May  3 19:40:34 2015	(r385340)
+++ head/textproc/elasticsearch/files/elasticsearch.in	Sun May  3 19:44:06 2015	(r385341)
@@ -122,7 +122,7 @@ elasticsearch_check_pidfile() {
 		debug "pid file ($_pidfile): no pid in file."
 		return
 	fi
-	if [ -n "`%%LOCALBASE%%/bin/jps -l | grep -e "^$_pid org.elasticsearch.bootstrap.Elasticsearch\$"`" ]; then
+	if [ -n "`%%LOCALBASE%%/bin/jps -l | grep -e "^$_pid"`" ]; then
 		echo -n $_pid
 	fi
 }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505031944.t43Ji7YF077455>