Bug 13784: (QA followup) allow running Zebra for disabled instances on packages

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>

diff --git a/debian/scripts/koha-restart-zebra b/debian/scripts/koha-restart-zebra
index 1c8ace9..866dafd 100755 (executable)
--- a/debian/scripts/koha-restart-zebra
+++ b/debian/scripts/koha-restart-zebra
@@ -95,21 +95,16 @@ EOF
 for name in "$@"
 do
     if is_instance $name ; then
-        if is_enabled $name ; then
+        if ! is_zebra_running $name; then
+            warn "Zebra does not appear to have been running for instance $name."
 
-            if ! is_zebra_running $name; then
-                warn "Zebra does not appear to have been running for instance $name."
-
-                if ! start_zebra_instance $name ; then
-                    warn "Something went wrong starting Zebra for $name."
-                fi
-            else
-                if ! restart_zebra_instance $name; then
-                  warn "Something went wrong restarting Zebra for $name."
-                fi
+            if ! start_zebra_instance $name ; then
+                warn "Something went wrong starting Zebra for $name."
             fi
         else
-            warn "Instance $name disabled. No action taken."
+            if ! restart_zebra_instance $name; then
+              warn "Something went wrong restarting Zebra for $name."
+            fi
         fi
     else
         warn "Unknown instance $name."

diff --git a/debian/scripts/koha-start-zebra b/debian/scripts/koha-start-zebra
index 7d25b81..185a650 100755 (executable)
--- a/debian/scripts/koha-start-zebra
+++ b/debian/scripts/koha-start-zebra
@@ -73,16 +73,12 @@ EOF
 for name in "$@"
 do
     if is_instance $name ; then
-        if is_enabled $name ; then
-            if ! is_zebra_running $name; then
-                if ! start_zebra_instance $name; then
-                    warn "Something went wrong starting Zebra for $name."
-                fi
-            else
-                warn "Zebra already running for instance $name."
+        if ! is_zebra_running $name; then
+            if ! start_zebra_instance $name; then
+                warn "Something went wrong starting Zebra for $name."
             fi
         else
-            warn "Instance $name disabled. No action taken."
+            warn "Zebra already running for instance $name."
         fi
     else
         warn "Unknown instance $name."