[Bug 16733] New: Adjust or make flexible some paths in debian scripts
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 Bug ID: 16733 Summary: Adjust or make flexible some paths in debian scripts Change sponsored?: --- Product: Koha Version: master Hardware: All OS: All Status: NEW Severity: enhancement Priority: P5 - low Component: Packaging Assignee: koha-bugs@lists.koha-community.org Reporter: m.de.rooy@rijksmuseum.nl QA Contact: testopia@bugs.koha-community.org CC: mirko@abunchofthings.net -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Assignee|koha-bugs@lists.koha-commun |m.de.rooy@rijksmuseum.nl |ity.org | -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |16749 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 [Bug 16749] Follow-up for bug 16733: changes for koha-translate -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 --- Comment #1 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 52464 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=52464&action=edit 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> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 --- Comment #2 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 52465 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=52465&action=edit Bug 16733: Adjust koha-indexer [1] Add a call to the new adjust_paths_dev_install [2] Differentiate location of rebuild_zebra.pl NOTE: The scripts assume koha-functions.sh to be in /usr/share/koha/bin. Finding a better location for this shell library may be hard. Test plan: Run koha-indexer for a regular package install or a dev install. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 --- Comment #3 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 52466 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=52466&action=edit Bug 16733: Adjust koha-rebuild-zebra [1] Add a call to the new adjust_paths_dev_install [2] Differentiate location of rebuild_zebra.pl [3] Replace a hardcoded path by $PERL5LIB Test plan: Adjust a biblio record in package or dev install. Run koha-rebuild-zebra -b -z for same instance. Verify that the change has been indexed. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 --- Comment #4 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 52467 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=52467&action=edit Bug 16733: Adjust debian scripts for hardcoded PERL5LIBs koha-foreach, koha-upgrade-schema (shell scripts): [1] Read default file [2] Include helper functions [3] Add call to adjust_paths_dev_install [4] Replace hardcoded path by $PERL5LIB koha-shell (perl script): [1] Remove hardcoded lib path [2] Add a sub that reads PERL5LIB from default or koha-conf, just as the shell scripts do. koha-plack (shell script), plack.psgi: [1] Add call to adjust_paths_dev_install [2] Remove hardcoded lib path [3] Add installer path to PERL5LIB, remove it from plack.pgsi koha-sitemap (shell script): [1] Add call to adjust_paths_dev_install [2] Remove hardcoded lib path [3] Add installer path to PERL5LIB [4] Adjust path for call to sitemap cron job koha-start-sip (shell script): [1] Read default file [2] Include helper functions [3] Add call to adjust_paths_dev_install [4] Adjust path to C4/SIP koha-stop-sip (shell script): [1] Remove KOHA_CONF and PERL5LIB (not needed to stop the daemon) [2] Same for paths in daemon client options NOTE: Script debian/scripts/koha-upgrade-to-3.4 has been left out intentionally. Test plan: [1] Regular install: Run koha-foreach echo Hi Run koha-upgrade-schema yourinstance Run koha-shell yourinstance If you have plack, run koha-plack --start|--stop yourinstance Run koha-sitemap --generate yourinstance Run koha-start-sip yourinstance Run koha-stop-sip yourinstance [2] Dev install [yourinstance] with <dev_install> in koha-conf.xml: Run koha-upgrade-schema yourinstance Run koha-shell yourinstance If you have plack: koha-plack --start|--stop yourinstance Run koha-sitemap --generate yourinstance Run koha-start-sip yourinstance Run koha-stop-sip yourinstance [3] Git grep on koha/lib You should no longer see occurrences in debian/scripts except: koha-translate: see report 16749 koha-upgrade-to-3.4: left out intentionally [4] Git grep on koha/bin You should only see hits for lines with koha-functions in the debian scripts except: koha-upgrade-to-3.4: left out intentionally -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 --- Comment #5 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- WIP: Still working on the last patch a little. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also| |https://bugs.koha-community | |.org/bugzilla3/show_bug.cgi | |?id=16749 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Summary|Adjust or make flexible |More flexible paths in |some paths in debian |debian scripts (for dev |scripts |installs) -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #52467|0 |1 is obsolete| | --- Comment #6 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 52559 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=52559&action=edit Bug 16733: Adjust other debian scripts using PERL5LIB This patch makes the following changes: koha-foreach, koha-upgrade-schema (shell scripts): [1] Read default file [2] Include helper functions [3] Add call to adjust_paths_dev_install [4] Replace hardcoded path by $PERL5LIB koha-shell (perl script): [1] Remove hardcoded lib path [2] Add a sub that reads PERL5LIB from default or koha-conf, just as the shell scripts do. koha-plack (shell script), plack.psgi: [1] Add call to adjust_paths_dev_install [2] Remove hardcoded lib path [3] Add installer path to PERL5LIB, remove it from plack.pgsi koha-sitemap (shell script): [1] Add call to adjust_paths_dev_install [2] Remove hardcoded lib path [3] Add installer path to PERL5LIB [4] Adjust path for call to sitemap cron job koha-start-sip (shell script): [1] Read default file [2] Include helper functions [3] Add call to adjust_paths_dev_install [4] Adjust path to C4/SIP koha-stop-sip (shell script): [1] Remove KOHA_CONF and PERL5LIB (not needed to stop the daemon) [2] Same for paths in daemon client options NOTE: Script debian/scripts/koha-upgrade-to-3.4 has been left out intentionally. Test plan: [1] Regular install: Run koha-foreach echo Hi Run koha-upgrade-schema yourinstance Run koha-shell yourinstance If you have plack, run koha-plack --start|--stop yourinstance Run koha-sitemap --generate yourinstance Run koha-start-sip yourinstance Run koha-stop-sip yourinstance [2] Dev install [yourinstance] with <dev_install> in koha-conf.xml: Run koha-upgrade-schema yourinstance Run koha-shell yourinstance If you have plack: koha-plack --start|--stop yourinstance Run koha-sitemap --generate yourinstance Run koha-start-sip yourinstance Run koha-stop-sip yourinstance [3] Git grep on koha/lib You should no longer see occurrences in debian/scripts except: koha-translate: see report 16749 koha-upgrade-to-3.4: left out intentionally [4] Git grep on koha/bin You should only see hits for lines with koha-functions in the debian scripts except: koha-upgrade-to-3.4: left out intentionally -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #52559|0 |1 is obsolete| | --- Comment #7 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 52560 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=52560&action=edit Bug 16733: Adjust other debian scripts using PERL5LIB This patch makes the following changes: koha-foreach, koha-upgrade-schema (shell scripts): [1] Read default file [2] Include helper functions [3] Add call to adjust_paths_dev_install [4] Replace hardcoded path by $PERL5LIB koha-shell (perl script): [1] Remove hardcoded lib path [2] Add a sub that reads PERL5LIB from default or koha-conf, just as the shell scripts do. koha-plack (shell script), plack.psgi: [1] Add call to adjust_paths_dev_install [2] Remove hardcoded lib path [3] Add installer path to PERL5LIB, remove it from plack.pgsi koha-sitemap (shell script): [1] Add call to adjust_paths_dev_install [2] Remove hardcoded lib path [3] Add installer path to PERL5LIB [4] Adjust path for call to sitemap cron job koha-start-sip (shell script): [1] Read default file [2] Include helper functions [3] Add call to adjust_paths_dev_install [4] Adjust path to C4/SIP koha-stop-sip (shell script): [1] Remove KOHA_CONF and PERL5LIB (not needed to stop the daemon) [2] Same for paths in daemon client options NOTE: Script debian/scripts/koha-upgrade-to-3.4 has been left out intentionally. Test plan: [1] Regular install: Run koha-foreach echo Hi Run koha-upgrade-schema yourinstance Run koha-shell yourinstance If you have plack, run koha-plack --start|--stop yourinstance Run koha-sitemap --generate yourinstance Run koha-start-sip yourinstance Run koha-stop-sip yourinstance [2] Dev install [yourinstance] with <dev_install> in koha-conf.xml: Run koha-upgrade-schema yourinstance Run koha-shell yourinstance If you have plack: koha-plack --start|--stop yourinstance Run koha-sitemap --generate yourinstance Run koha-start-sip yourinstance Run koha-stop-sip yourinstance [3] Git grep on koha/lib You should no longer see occurrences in debian/scripts except: koha-translate: see report 16749 koha-upgrade-to-3.4: left out intentionally [4] Git grep on koha/bin You should only see hits for lines with koha-functions in the debian scripts except: koha-upgrade-to-3.4: left out intentionally Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Most scripts tested on Wheezy (although it would not matter much). Plack script tested on Jessie. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |Needs Signoff Patch complexity|--- |Small patch -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also| |https://bugs.koha-community | |.org/bugzilla3/show_bug.cgi | |?id=13217 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 --- Comment #8 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- *** Bug 13971 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also| |https://bugs.koha-community | |.org/bugzilla3/show_bug.cgi | |?id=13216 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |16644 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16644 [Bug 16644] Plack: Use to_app to remove warning about Plack::App::CGIBin instance -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 Fridolin SOMERS <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |fridolin.somers@biblibre.co | |m -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 Mason James <mtj@kohaaloha.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |mtj@kohaaloha.com -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA --- Comment #9 from Owen Leonard <oleonard@myacpl.org> --- (In reply to Marcel de Rooy from comment #1)
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]
This last step results in an error in my gitified package installation. It says "bash: adjust_paths_dev_install: command not found." -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Needs Signoff --- Comment #10 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- (In reply to Owen Leonard from comment #9)
(In reply to Marcel de Rooy from comment #1)
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]
This last step results in an error in my gitified package installation. It says "bash: adjust_paths_dev_install: command not found."
Hi Owen, Nice to see you test this. The command not found-response sounds to me that you did not source the right koha-functions file? Somehow the function was not loaded. You should source the koha-functions file that has been adjusted by this patch. If I follow the test plan, the output is as expected. Could you clarify? -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #52464|0 |1 is obsolete| | --- Comment #11 from Owen Leonard <oleonard@myacpl.org> --- Created attachment 53384 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=53384&action=edit [SIGNED-OFF] 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> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #52465|0 |1 is obsolete| | --- Comment #12 from Owen Leonard <oleonard@myacpl.org> --- Created attachment 53385 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=53385&action=edit [SIGNED-OFF] Bug 16733: Adjust koha-indexer [1] Add a call to the new adjust_paths_dev_install [2] Differentiate location of rebuild_zebra.pl NOTE: The scripts assume koha-functions.sh to be in /usr/share/koha/bin. Finding a better location for this shell library may be hard. Test plan: Run koha-indexer for a regular package install or a dev install. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #52466|0 |1 is obsolete| | --- Comment #13 from Owen Leonard <oleonard@myacpl.org> --- Created attachment 53386 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=53386&action=edit [SIGNED-OFF] Bug 16733: Adjust koha-rebuild-zebra [1] Add a call to the new adjust_paths_dev_install [2] Differentiate location of rebuild_zebra.pl [3] Replace a hardcoded path by $PERL5LIB Test plan: Adjust a biblio record in package or dev install. Run koha-rebuild-zebra -b -z for same instance. Verify that the change has been indexed. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #52560|0 |1 is obsolete| | --- Comment #14 from Owen Leonard <oleonard@myacpl.org> --- Created attachment 53387 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=53387&action=edit [SIGNED-OFF] Bug 16733: Adjust other debian scripts using PERL5LIB This patch makes the following changes: koha-foreach, koha-upgrade-schema (shell scripts): [1] Read default file [2] Include helper functions [3] Add call to adjust_paths_dev_install [4] Replace hardcoded path by $PERL5LIB koha-shell (perl script): [1] Remove hardcoded lib path [2] Add a sub that reads PERL5LIB from default or koha-conf, just as the shell scripts do. koha-plack (shell script), plack.psgi: [1] Add call to adjust_paths_dev_install [2] Remove hardcoded lib path [3] Add installer path to PERL5LIB, remove it from plack.pgsi koha-sitemap (shell script): [1] Add call to adjust_paths_dev_install [2] Remove hardcoded lib path [3] Add installer path to PERL5LIB [4] Adjust path for call to sitemap cron job koha-start-sip (shell script): [1] Read default file [2] Include helper functions [3] Add call to adjust_paths_dev_install [4] Adjust path to C4/SIP koha-stop-sip (shell script): [1] Remove KOHA_CONF and PERL5LIB (not needed to stop the daemon) [2] Same for paths in daemon client options NOTE: Script debian/scripts/koha-upgrade-to-3.4 has been left out intentionally. Test plan: [1] Regular install: Run koha-foreach echo Hi Run koha-upgrade-schema yourinstance Run koha-shell yourinstance If you have plack, run koha-plack --start|--stop yourinstance Run koha-sitemap --generate yourinstance Run koha-start-sip yourinstance Run koha-stop-sip yourinstance [2] Dev install [yourinstance] with <dev_install> in koha-conf.xml: Run koha-upgrade-schema yourinstance Run koha-shell yourinstance If you have plack: koha-plack --start|--stop yourinstance Run koha-sitemap --generate yourinstance Run koha-start-sip yourinstance Run koha-stop-sip yourinstance [3] Git grep on koha/lib You should no longer see occurrences in debian/scripts except: koha-translate: see report 16749 koha-upgrade-to-3.4: left out intentionally [4] Git grep on koha/bin You should only see hits for lines with koha-functions in the debian scripts except: koha-upgrade-to-3.4: left out intentionally Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Most scripts tested on Wheezy (although it would not matter much). Plack script tested on Jessie. Signed-off-by: Owen Leonard <oleonard@myacpl.org> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off --- Comment #15 from Owen Leonard <oleonard@myacpl.org> --- Tested successfully in a gitified package installation. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 --- Comment #16 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- (In reply to Owen Leonard from comment #15)
Tested successfully in a gitified package installation.
Thanks! -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |17049 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=17049 [Bug 17049] Plack: Handle multiple paths in PERL5LIB -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 --- Comment #17 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 55491 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=55491&action=edit Bug 16733: [Follow-up] Add $home to api path too In the meantime api was enabled in plack.psgi and needs a little tweak too for a dev install. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |jonathan.druart@bugs.koha-c | |ommunity.org --- Comment #18 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Yesterday I faced the problem of using koha-translate on a gitified intall, `koha-translate --install es-ES` won't install the Spanish templates in the gitified dirs. I remembered this bug and thought it would have fixed it, but it does not. Is it expected? -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 --- Comment #19 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- See dependency 16749 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 David Cook <dcook@prosentient.com.au> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |dcook@prosentient.com.au --- Comment #20 from David Cook <dcook@prosentient.com.au> --- I like this idea, but I don't use Debian often enough to be useful in terms of testing... -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #53384|0 |1 is obsolete| | Attachment #53385|0 |1 is obsolete| | Attachment #53386|0 |1 is obsolete| | Attachment #53387|0 |1 is obsolete| | Attachment #55491|0 |1 is obsolete| | --- Comment #21 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 59146 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=59146&action=edit 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> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 --- Comment #22 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 59147 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=59147&action=edit Bug 16733: Adjust koha-indexer [1] Add a call to the new adjust_paths_dev_install [2] Differentiate location of rebuild_zebra.pl NOTE: The scripts assume koha-functions.sh to be in /usr/share/koha/bin. Finding a better location for this shell library may be hard. Test plan: Run koha-indexer for a regular package install or a dev install. 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> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 --- Comment #23 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 59148 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=59148&action=edit Bug 16733: Adjust koha-rebuild-zebra [1] Add a call to the new adjust_paths_dev_install [2] Differentiate location of rebuild_zebra.pl [3] Replace a hardcoded path by $PERL5LIB Test plan: Adjust a biblio record in package or dev install. Run koha-rebuild-zebra -b -z for same instance. Verify that the change has been indexed. 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> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 --- Comment #24 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 59149 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=59149&action=edit Bug 16733: Adjust other debian scripts using PERL5LIB This patch makes the following changes: koha-foreach, koha-upgrade-schema (shell scripts): [1] Read default file [2] Include helper functions [3] Add call to adjust_paths_dev_install [4] Replace hardcoded path by $PERL5LIB koha-shell (perl script): [1] Remove hardcoded lib path [2] Add a sub that reads PERL5LIB from default or koha-conf, just as the shell scripts do. koha-plack (shell script), plack.psgi: [1] Add call to adjust_paths_dev_install [2] Remove hardcoded lib path [3] Add installer path to PERL5LIB, remove it from plack.pgsi koha-sitemap (shell script): [1] Add call to adjust_paths_dev_install [2] Remove hardcoded lib path [3] Add installer path to PERL5LIB [4] Adjust path for call to sitemap cron job koha-start-sip (shell script): [1] Read default file [2] Include helper functions [3] Add call to adjust_paths_dev_install [4] Adjust path to C4/SIP koha-stop-sip (shell script): [1] Remove KOHA_CONF and PERL5LIB (not needed to stop the daemon) [2] Same for paths in daemon client options NOTE: Script debian/scripts/koha-upgrade-to-3.4 has been left out intentionally. Test plan: [1] Regular install: Run koha-foreach echo Hi Run koha-upgrade-schema yourinstance Run koha-shell yourinstance If you have plack, run koha-plack --start|--stop yourinstance Run koha-sitemap --generate yourinstance Run koha-start-sip yourinstance Run koha-stop-sip yourinstance [2] Dev install [yourinstance] with <dev_install> in koha-conf.xml: Run koha-upgrade-schema yourinstance Run koha-shell yourinstance If you have plack: koha-plack --start|--stop yourinstance Run koha-sitemap --generate yourinstance Run koha-start-sip yourinstance Run koha-stop-sip yourinstance [3] Git grep on koha/lib You should no longer see occurrences in debian/scripts except: koha-translate: see report 16749 koha-upgrade-to-3.4: left out intentionally [4] Git grep on koha/bin You should only see hits for lines with koha-functions in the debian scripts except: koha-upgrade-to-3.4: left out intentionally Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Most scripts tested on Wheezy (although it would not matter much). Plack script tested on Jessie. Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 --- Comment #25 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 59150 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=59150&action=edit Bug 16733: [Follow-up] Add $home to api path too In the meantime api was enabled in plack.psgi and needs a little tweak too for a dev install. Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 --- Comment #26 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Thanks Jonathan -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Pushed to Master CC| |kyle@bywatersolutions.com --- Comment #27 from Kyle M Hall <kyle@bywatersolutions.com> --- Pushed to master for 17.05, thanks Marcel! -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Pushed to Master |RESOLVED CC| |katrin.fischer@bsz-bw.de Resolution|--- |FIXED --- Comment #28 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- This won't get ported back to 16.11.x as it is an enhancement. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 --- Comment #29 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- (In reply to Katrin Fischer from comment #28)
This won't get ported back to 16.11.x as it is an enhancement.
It would be very useful for devs to get it backported to stable releases. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 --- Comment #30 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- I have no strong opinion on it, but I am using a rebased version on 3.22 in production. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 --- Comment #31 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Can you explain why this is helpful? More worried about breaking something for the non-devs to be honest - devs always find a way ;) -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 --- Comment #32 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- (In reply to Katrin Fischer from comment #31)
Can you explain why this is helpful? More worried about breaking something for the non-devs to be honest - devs always find a way ;)
Typically to avoid the issue you just got on bug 17731 :) With these patches the debian script will execute the rebuild_zebra script from the gitified repo and not from the /usr/share/koha dir. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 Tomás Cohen Arazi <tomascohen@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |tomascohen@gmail.com --- Comment #33 from Tomás Cohen Arazi <tomascohen@gmail.com> --- Guys, this patchset broke kohadevbox. It is probably an integration issue, but as dev_install is not present I would expect it to use the package's paths, and instead of that it just breaks. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 --- Comment #34 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- (In reply to Tomás Cohen Arazi from comment #33)
Guys, this patchset broke kohadevbox. It is probably an integration issue, but as dev_install is not present I would expect it to use the package's paths, and instead of that it just breaks.
Yes, that should be. Will have a look too.. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 --- Comment #35 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- I have decided not to push these patches to 16.11.x as there appear to be some issues and they touch code in a lot of places. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also|https://bugs.koha-community | |.org/bugzilla3/show_bug.cgi | |?id=16749 | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 --- Comment #36 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Further fixes or discussion on bug 16749 please. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 --- Comment #37 from Mirko Tietgen <mirko@abunchofthings.net> --- Looks like this breaks koha-common.postinst. Do not push to *stable. Thanks. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 --- Comment #38 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- (In reply to Mirko Tietgen from comment #37)
Looks like this breaks koha-common.postinst. Do not push to *stable. Thanks. Enhancement :) Not for backporting. Note that bug 16749 should follow it. First two patches may solve your problem..
-- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 --- Comment #39 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- I really would like to see them backported, it will greatly simplify setup of installation based on stable releases and so backporting. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 --- Comment #40 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- What about comment #37? -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 --- Comment #41 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- (In reply to Katrin Fischer from comment #40)
What about comment #37?
Comment 38 says it is fixes on bug 16749 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 --- Comment #42 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Waiting for bug 18502 to reconsider backporting (visible when checking the graph) -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 --- Comment #43 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- I have made an attempt to backport this, but I am running into conflicts. - Patches from this (bug 16733) apply cleanly - Patches from next dependency bug 16749 conflict: could not apply 35fad66... Bug 16749: Adjustments for koha-plack Jonathan, if you still want this in, please help me figure this out! -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 --- Comment #44 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- I have fixed the conflict, applied all patches and pushed the branch on my github account, on the branch bug_16733-16.11.x: https://github.com/joubu/Koha/tree/bug_16733-16.11.x -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|RESOLVED |REOPENED Resolution|FIXED |--- --- Comment #45 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- I've merged these patches in from Jonathan's branch, no conflicts this time. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|REOPENED |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Pushed to Stable -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 --- Comment #46 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- These patches have been pushed to 16.11.x and will be in 16.11.08. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 --- Comment #47 from Mason James <mtj@kohaaloha.com> --- Enhancement, skipping for 16.05.x -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 Mason James <mtj@kohaaloha.com> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also| |https://bugs.koha-community | |.org/bugzilla3/show_bug.cgi | |?id=18377 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 Nick Clemens <nick@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |julian.maurice@biblibre.com --- Comment #48 from Nick Clemens <nick@bywatersolutions.com> --- *** Bug 18377 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are watching all bug changes.
participants (1)
-
bugzilla-daemon＠bugs.koha-community.org