Repository: trafficserver
Updated Branches:
  refs/heads/master 44b74971b -> 589d8013e


Fic launchctl invocation in startup script


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/589d8013
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/589d8013
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/589d8013

Branch: refs/heads/master
Commit: 589d8013e8555e05982d66cf06d33bd2d6acb388
Parents: 44b7497
Author: James Peach <[email protected]>
Authored: Thu Oct 30 15:52:00 2014 -0700
Committer: James Peach <[email protected]>
Committed: Thu Oct 30 15:57:17 2014 -0700

----------------------------------------------------------------------
 rc/trafficserver.in | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/589d8013/rc/trafficserver.in
----------------------------------------------------------------------
diff --git a/rc/trafficserver.in b/rc/trafficserver.in
index eacd6b0..16ced7c 100644
--- a/rc/trafficserver.in
+++ b/rc/trafficserver.in
@@ -279,8 +279,8 @@ case "$1" in
             rc_status -v
         elif [ "$DISTRIB_ID" = "Darwin" ]; then
             echo "Starting ${TS_PACKAGE_NAME}"
-            launchctl bsexec / list $TC_NAME > /dev/null 2>&1 && exit 0
-            launchctl bsexec / submit -l $TC_NAME -p $TC_DAEMON -o $STDOUTLOG 
-e $STDERRLOG -- $TC_DAEMON_ARGS
+            launchctl bsexec / launchctl list $TC_NAME > /dev/null 2>&1 && 
exit 0
+            launchctl bsexec / launchctl submit -l $TC_NAME -p $TC_DAEMON -o 
$STDOUTLOG -e $STDERRLOG -- $TC_DAEMON_ARGS
         elif [ "$DISTRIB_ID" = "FreeBSD" ]; then
             echo "Starting ${TS_PACKAGE_NAME}"
             name="$TC_NAME"
@@ -317,9 +317,9 @@ case "$1" in
             rc_status -v
         elif [ "$DISTRIB_ID" = "Darwin" ]; then
             echo "Stopping ${TS_PACKAGE_NAME}"
-            launchctl bsexec / list $TC_NAME > /dev/null 2>&1 || exit 0
+            launchctl bsexec / launchctl list $TC_NAME > /dev/null 2>&1 || 
exit 0
             echo "Stopping ${TC_NAME}"
-            launchctl bsexec / remove ${TC_NAME}
+            launchctl bsexec / launchctl remove ${TC_NAME}
             rm -f ${TC_PIDFILE}
             echo "Stopping ${TM_NAME}"
             kill $(cat $TM_PIDFILE)
@@ -408,7 +408,7 @@ case "$1" in
             rc_status -v
         elif [ "$DISTRIB_ID" = "Darwin" ]; then
             /bin/echo -n "${TS_PACKAGE_NAME} is "
-            launchctl bsexec / list $TC_NAME > /dev/null 2>&1
+            launchctl bsexec / launchctl list $TC_NAME > /dev/null 2>&1
             status=$?
             [ $status -eq 0 ] || /bin/echo -n "not "
             echo "running."

Reply via email to