Bug 11404: koha-functions.sh introduced for reuse

[koha_fer] / debian / scripts / koha-restart-zebra

diff --git a/debian/scripts/koha-restart-zebra b/debian/scripts/koha-restart-zebra
index 8b4b681..1c8ace9 100755 (executable)
--- a/debian/scripts/koha-restart-zebra
+++ b/debian/scripts/koha-restart-zebra
@@ -18,59 +18,13 @@
 
 set -e
 
-die()
-{
-    echo "$@" 1>&2
+# include helper functions
+if [ -f "/usr/share/koha/bin/koha-functions.sh" ]; then
+    . "/usr/share/koha/bin/koha-functions.sh"
+else
+    echo "Error: /usr/share/koha/bin/koha-functions.sh not present." 1>&2
     exit 1
-}
-
-warn()
-{
-    echo "$@" 1>&2
-}
-
-is_enabled()
-{
-    local instancename=$1
-    local instancefile="/etc/apache2/sites-available/$instancename.conf"
-
-    if ! is_instance $instancename; then
-        return 1
-    fi
-
-    if grep -q '^[[:space:]]*Include /etc/koha/apache-shared-disable.conf' \
-            "$instancefile" ; then
-        return 1
-    else
-        return 0
-    fi
-}
-
-is_instance()
-{
-    local instancename=$1
-
-    if find /etc/koha/sites -mindepth 1 -maxdepth 1 \
-                         -type d -printf '%f\n'\
-          | grep -q -x $instancename ; then
-        return 0
-    else
-        return 1
-    fi
-}
-
-is_zebra_running()
-{
-    local instancename=$1
-
-    if daemon --name="$instancename-koha-zebra" \
-            --user="$instancename-koha.$instancename-koha" \
-            --running ; then
-        return 0
-    else
-        return 1
-    fi
-}
+fi
 
 restart_zebra_instance()
 {