Date: Mon, 9 Nov 2015 12:39:13 +0000 (UTC) From: William Grzybowski <wg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r401095 - in head/sysutils/riak-cs: . files Message-ID: <201511091239.tA9CdDix073762@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wg Date: Mon Nov 9 12:39:13 2015 New Revision: 401095 URL: https://svnweb.freebsd.org/changeset/ports/401095 Log: sysutils/riak-cs: fix rc.d script regarding hyphens and shell script Added: head/sysutils/riak-cs/files/riak_cs.in - copied, changed from r401094, head/sysutils/riak-cs/files/riak-cs.in Deleted: head/sysutils/riak-cs/files/riak-cs.in Modified: head/sysutils/riak-cs/Makefile Modified: head/sysutils/riak-cs/Makefile ============================================================================== --- head/sysutils/riak-cs/Makefile Mon Nov 9 12:31:29 2015 (r401094) +++ head/sysutils/riak-cs/Makefile Mon Nov 9 12:39:13 2015 (r401095) @@ -2,7 +2,7 @@ PORTNAME= riak-cs PORTVERSION= 2.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://s3.amazonaws.com/downloads.basho.com/riak-cs/${PORTVERSION:R}/${PORTVERSION}/ \ http://downloads.basho.com.s3.amazonaws.com/riak-cs/${PORTVERSION:R}/${PORTVERSION}/ @@ -19,7 +19,7 @@ USES= gmake readline shebangfix SHEBANG_FILES= deps/eper/priv/bin/dtop \ deps/eper/priv/bin/ntop \ deps/eper/priv/bin/redbug -USE_RC_SUBR= riak-cs +USE_RC_SUBR= riak_cs USERS= riakcs GROUPS= riak Copied and modified: head/sysutils/riak-cs/files/riak_cs.in (from r401094, head/sysutils/riak-cs/files/riak-cs.in) ============================================================================== --- head/sysutils/riak-cs/files/riak-cs.in Mon Nov 9 12:31:29 2015 (r401094, copy source) +++ head/sysutils/riak-cs/files/riak_cs.in Mon Nov 9 12:39:13 2015 (r401095) @@ -13,31 +13,31 @@ . /etc/rc.subr -name="riak-cs" +name=riak_cs rcvar=riak_cs_enable pidfile=/var/run/riak-cs/riak-cs.pid -start_cmd="riak-cs_start" -stop_cmd="riak-cs_stop" -restart_cdm="riak-cs_restart" -status_cmd="riak-cs_status" +start_cmd="riak_cs_start" +stop_cmd="riak_cs_stop" +restart_cdm="riak_cs_restart" +status_cmd="riak_cs_status" command="%%PREFIX%%/sbin/riak-cs" load_rc_config $name # Read rc.d config and set defaults load_rc_config "$name" -: ${riak-cs_enable="NO"} +: ${riak_cs_enable="NO"} -riak-cs_start() +riak_cs_start() { echo "Starting Riak." %%PREFIX%%/sbin/riak-cs start return 0 } -riak-cs_stop() +riak_cs_stop() { echo "Stopping Riak processes" %%PREFIX%%/sbin/riak-cs stop @@ -45,16 +45,16 @@ riak-cs_stop() return 0 } -riak-cs_restart() +riak_cs_restart() { - riak-cs_stop - riak-cs_start + riak_cs_stop + riak_cs_start return 0 } -riak-cs_status() +riak_cs_status() { - if riak-cs_running; then + if riak_cs_running; then echo "Riak is running." return 0 else @@ -63,7 +63,7 @@ riak-cs_status() fi } -riak-cs_running() +riak_cs_running() { local pid result ps pid=`%%PREFIX%%/sbin/riak-cs getpid`
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511091239.tA9CdDix073762>