sysutils/riak-cs: fix rc.d script regarding hyphens and shell script

2 files changed, 16 insertions, 16 deletions

diff --git a/sysutils/riak-cs/Makefile b/sysutils/riak-cs/Makefile
index 7049c4e7a80a..79d5ec3e41b7 100644
--- a/sysutils/riak-cs/Makefile
+++ b/sysutils/riak-cs/Makefile
@@ -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
diff --git a/sysutils/riak-cs/files/riak-cs.in b/sysutils/riak-cs/files/riak_cs.in
index 843f5a308597..ca96ba25a553 100644
--- a/sysutils/riak-cs/files/riak-cs.in
+++ b/sysutils/riak-cs/files/riak_cs.in
@@ -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`