Bugzilla – Attachment 59146 Details for
Bug 16733
More flexible paths in debian scripts (for dev installs)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 16733: Add adjust_paths_dev_install to koha-functions.sh
Bug-16733-Add-adjustpathsdevinstall-to-koha-functi.patch (text/plain), 2.17 KB, created by
Jonathan Druart
on 2017-01-18 09:48:58 UTC
(
hide
)
Description:
Bug 16733: Add adjust_paths_dev_install to koha-functions.sh
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2017-01-18 09:48:58 UTC
Size:
2.17 KB
patch
obsolete
>From 1178a565dbdc672af69b27a4d77df71fa2b35c14 Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Tue, 14 Jun 2016 16:00:58 +0200 >Subject: [PATCH] Bug 16733: Add adjust_paths_dev_install to koha-functions.sh > >This new function checks koha-conf.xml for a given instance and if it >contains a dev_install line, it adjusts PERL5LIB and KOHA_HOME >accordingly. Otherwise it does not touch the values of these >variables as normally read from /etc/default/koha-common. > >The function will be used in various debian scripts to allow for more >flexibility with dev installs. And at the same time aiming to make better >use of PERL5LIB and KOHA_HOME. > >Test plan: >[1] Add <dev_install>/not/there</dev_install> to your koha-conf.xml. >[2] Run on the command line: > PERL5LIB=test > source [path-to-your-instance]/debian/scripts/koha-functions.sh > echo $PERL5LIB > adjust_paths_dev_install [name-of-your-instance] > echo $PERL5LIB > The last echo should be: /not/there >[3] Remove the <dev_install> line and repeat step 2. > The last echo should be: test > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Signed-off-by: Owen Leonard <oleonard@myacpl.org> > >Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >--- > debian/scripts/koha-functions.sh | 19 +++++++++++++++++++ > 1 file changed, 19 insertions(+) > >diff --git a/debian/scripts/koha-functions.sh b/debian/scripts/koha-functions.sh >index cf6835d..889fb10 100755 >--- a/debian/scripts/koha-functions.sh >+++ b/debian/scripts/koha-functions.sh >@@ -216,6 +216,25 @@ is_plack_running() > fi > } > >+adjust_paths_dev_install() >+{ >+# Adjust KOHA_HOME, PERL5LIB for dev installs, as indicated by >+# corresponding tag in koha-conf.xml >+ >+ local instancename=$1 >+ local dev_install >+ >+ if [ -e /etc/koha/sites/$instancename/koha-conf.xml ]; then >+ dev_install=$(xmlstarlet sel -t -v 'yazgfs/config/dev_install' /etc/koha/sites/$instancename/koha-conf.xml) >+ fi >+ >+ if [ "$dev_install" != "" ]; then >+ DEV_INSTALL=1 >+ KOHA_HOME=$dev_install >+ PERL5LIB=$dev_install >+ fi >+} >+ > get_instances() > { > find /etc/koha/sites -mindepth 1 -maxdepth 1\ >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 16733
:
52464
|
52465
|
52466
|
52467
|
52559
|
52560
|
53384
|
53385
|
53386
|
53387
|
55491
| 59146 |
59147
|
59148
|
59149
|
59150