From 3d7dbb3cfa69c15c2431eaca723e07d50b30d3f4 Mon Sep 17 00:00:00 2001
From: Mason James <mtj@kohaaloha.com>
Date: Wed, 24 May 2017 15:40:43 +1200
Subject: [PATCH] Revert "Bug 16733: Adjust koha-rebuild-zebra"

This reverts commit e9a1fa07b5209bb5a53b653d870c7463adc1f699.
---
 debian/scripts/koha-rebuild-zebra | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/debian/scripts/koha-rebuild-zebra b/debian/scripts/koha-rebuild-zebra
index 6c0fce3883..b17efe37a2 100755
--- a/debian/scripts/koha-rebuild-zebra
+++ b/debian/scripts/koha-rebuild-zebra
@@ -56,18 +56,12 @@ run_rebuild_zebra()
        [     "${full_reindex}" = "yes" ] ||
        [            "${force}" = "yes" ] ; then
 
-        if [ "$DEV_INSTALL" = "" ]; then
-            KOHA_BINDIR=$KOHA_HOME/bin
-        else
-            KOHA_BINDIR=$KOHA_HOME/misc
-        fi
-
         # TODO: This comment is here to remind us that we should make
         # rebuild_zebra.pl return error codes on failure
         if sudo -u "$instancename-koha" -H \
-            env PERL5LIB=$PERL5LIB \
+            env PERL5LIB=/usr/share/koha/lib \
             KOHA_CONF="/etc/koha/sites/$instancename/koha-conf.xml" \
-            $KOHA_BINDIR/migration_tools/rebuild_zebra.pl $@ ; then
+            /usr/share/koha/bin/migration_tools/rebuild_zebra.pl $@ ; then
             return 0
         else
             return 1
@@ -148,9 +142,6 @@ while [ -n "$*" ]; do
     shift
 done
 
-# Optionally use alternative paths for a dev install
-adjust_paths_dev_install $1
-
 # Parse command line.
 if [ $# -lt 1 ]; then
     if [ "$quiet" = "no" ]; then
-- 
2.39.5