From 537bff6acfedc58eb3a601bd140a5466da053df0 Mon Sep 17 00:00:00 2001
From: Mark Tompsett <mtompset@hotmail.com>
Date: Sun, 1 Jan 2017 07:17:55 +0000
Subject: [PATCH] Bug 17467: Restart failing, missing instance parameter

This follow up should make it work. Perhaps there is a more
elegant way, but wanted to generate something that works.

Before this patch, the --restart stops Zebra, but does not
restart it. After, it does restart.

Before this patch, the --status gives nasty long help.
After this patch, reasonable output.
---
 debian/scripts/koha-zebra | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/scripts/koha-zebra b/debian/scripts/koha-zebra
index 3a8f662..944e2e1 100755
--- a/debian/scripts/koha-zebra
+++ b/debian/scripts/koha-zebra
@@ -134,9 +134,10 @@ restart_zebra()
     local name=$1
 
     if is_zebra_running ${name}; then
-
-        stop_zebra ${name} && \
-        start_zebra ${name}
+        local noLF="-n"
+        [ "$verbose" != "no" ] && noLF=""
+        echo $noLF `stop_zebra ${name}`
+        echo $noLF `start_zebra ${name}`
     else
         if [ "$verbose" != "no" ]; then
             log_daemon_msg "Error: Zebra not running for ${name}"
@@ -149,7 +150,7 @@ zebra_status()
 {
     local name=$1
 
-    if is_zebra_running; then
+    if is_zebra_running ${name}; then
         log_daemon_msg "Zebra running for ${name}"
         log_end_msg 0
     else
-- 
2.1.4