From 4ef7fa8e8d61a4f417ea9925c38c0e02e178157a Mon Sep 17 00:00:00 2001
From: Mason James <mtj@kohaaloha.com>
Date: Wed, 24 May 2017 15:40:37 +1200
Subject: [PATCH] Revert "Bug 16749: Adjustments for koha-plack"

This reverts commit a470b372778d05685b87c7850947aedf107d0a86.
---
 debian/scripts/koha-plack | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/debian/scripts/koha-plack b/debian/scripts/koha-plack
index d39922d97d..55261056dc 100755
--- a/debian/scripts/koha-plack
+++ b/debian/scripts/koha-plack
@@ -233,6 +233,22 @@ set_action()
     fi
 }
 
+adjust_paths()
+{
+    # Optionally use alternative paths for a dev install
+    adjust_paths_dev_install $1
+
+    # PERL5LIB has been read from etc/default, add lib/installer
+    # export some vars (for plack.psgi)
+    export KOHA_HOME
+    if [ "$DEV_INSTALL" = "" ]; then
+        export PERL5LIB=$PERL5LIB:$KOHA_HOME/lib/installer
+    else
+        export DEV_INSTALL
+        export PERL5LIB=$PERL5LIB:$KOHA_HOME/installer
+    fi
+}
+
 STARMAN=$(which starman)
 op=""
 quiet="no"
@@ -278,9 +294,7 @@ if [ $# -gt 0 ]; then
 
         if is_instance $name; then
 
-            adjust_paths_dev_install $name
-            export DEV_INSTALL KOHA_HOME PERL5LIB=$PERL5LIB:$KOHA_HOME/installer:$KOHA_HOME/lib/installer
-
+            adjust_paths $name
             case $op in
                 "start")
                     start_plack $name
-- 
2.39.5