From cdeca985f3d6acd427f50d4c170d77d9e134b7ca Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Tue, 9 Aug 2016 15:52:34 +0200 Subject: [PATCH] Bug 17049: Improve PERL5LIB handling for packaged dev install Content-Type: text/plain; charset=utf-8 This is a small follow-up for report 16033. If you would have multiple paths in PERL5LIB from /etc/defaults, adjust_paths_dev_install would agressively replace them for dev installs. This patch makes it remove usr/share/koha/lib only and add the new dev install path. Test plan: [1] Apply the patches for 16033 and 17049. [2] Add a /just/a/path to koha-conf.xml. [3] Source the adjusted koha-functions.sh within your master clone: . debian/scripts/koha-functions.sh [4] Enter unset PERL5LIB; adjust_paths_dev_install [your-clone] [5] Check the result with echo $PERL5LIB. Should be /just/a/path. [6] Try PERL5LIB=/usr/share/koha/lib Run adjust_paths_dev_install [your-clone] Check the result with echo $PERL5LIB. Should be /just/a/path. [7] Similarly, try /a:/usr/share/koha/lib Expect: /just/a/path:/a And /a:/usr/share/koha/lib:/b. Expect: /just/a/path:/a:/b --- debian/scripts/koha-functions.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/scripts/koha-functions.sh b/debian/scripts/koha-functions.sh index 889fb10..10a4e92 100755 --- a/debian/scripts/koha-functions.sh +++ b/debian/scripts/koha-functions.sh @@ -231,7 +231,10 @@ adjust_paths_dev_install() if [ "$dev_install" != "" ]; then DEV_INSTALL=1 KOHA_HOME=$dev_install - PERL5LIB=$dev_install + # Remove usr/share/koha/lib, add dev_install and cleanup + PERL5LIB=$(echo $PERL5LIB|sed -e 's/\/usr\/share\/koha\/lib\(:\|$\)/\1/') + PERL5LIB=$dev_install:$PERL5LIB + PERL5LIB=$(echo $PERL5LIB|sed -e 's/::/:/' -e 's/:$//') fi } -- 1.7.10.4