[Bug 16749] New: Follow-up for bug 16733: changes for koha-translate
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 Bug ID: 16749 Summary: Follow-up for bug 16733: changes for koha-translate 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 watching all bug changes. You are the assignee for the bug.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |16733 Status|NEW |ASSIGNED Patch complexity|--- |Small patch Assignee|koha-bugs@lists.koha-commun |m.de.rooy@rijksmuseum.nl |ity.org | Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 [Bug 16733] Adjust or make flexible some paths in debian scripts -- 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=16749 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also| |https://bugs.koha-community | |.org/bugzilla3/show_bug.cgi | |?id=16733 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 --- Comment #1 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 52561 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=52561&action=edit Bug 16749: Adjustments for koha-translate [1] Add a -d|--dev parameter for dev installs. [2] KOHA_CONF is not needed in this script. [3] No hardcoded PERL5LIB, following bug 16733. [4] Adjust template paths for dev installs: OPAC_TMPL, INTRANET_TMPL. [5] Remove reference now to obsolete thems ccsr and prog. Test plan: [1] Regular package install: Run koha-translate -l to show installed languages. Run koha-translate -l -a to show available languages. Add a language: koha-translate -i nl-NL. Check the nl-NL folder. Remove a language: koha-translate -r nl-NL. Check again. [2] If you have a dev install too, try: Add the <dev_install> line to koha-conf.xml. (See 16733.) Run koha-translate -l -d yourinstance to show installed languages. (Note: You only see the languages installed in that instance.) Add a language: koha-translate -i nl-NL -d yourinstance. Remove a language: koha-translate -r nl-NL -d yourinstance. 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=16749 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |bgkriegel@gmail.com -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |mtj@kohaaloha.com --- Comment #2 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- *** Bug 13295 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=16749 Magnus Enger <magnus@libriotech.no> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |magnus@libriotech.no --- Comment #3 from Magnus Enger <magnus@libriotech.no> --- debian/docs/koha-translate.xml needs to be updated with the --dev option. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 --- Comment #4 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 55490 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=55490&action=edit Bug 16749: Update debian docs for koha-translate This patch adds the -d option to the documentation (with thanks to Magnus Enger). -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |jonathan.druart@bugs.koha-c | |ommunity.org --- Comment #5 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- % sudo koha-translate --dev kohadev --install es-ES % ls koha-tmpl/intranet-tmpl/prog|grep es-ES Does not return anything, what did I miss? I have used a very new script to update the debian files, cp_debian_files.pl on koha-misc4dev (see https://github.com/joubu/koha-misc4dev). -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 --- Comment #6 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- (In reply to Jonathan Druart from comment #5)
% sudo koha-translate --dev kohadev --install es-ES % ls koha-tmpl/intranet-tmpl/prog|grep es-ES
Does not return anything, what did I miss?
Will have a look again. This was written six months ago without much attention ever since.. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 --- Comment #7 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- (In reply to Jonathan Druart from comment #5)
% sudo koha-translate --dev kohadev --install es-ES % ls koha-tmpl/intranet-tmpl/prog|grep es-ES
Does not return anything, what did I miss?
I have used a very new script to update the debian files, cp_debian_files.pl on koha-misc4dev (see https://github.com/joubu/koha-misc4dev).
Dumb question, but you checked this? Add the <dev_install> line to koha-conf.xml. (See 16733.) -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 --- Comment #8 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- (In reply to Marcel de Rooy from comment #7)
(In reply to Jonathan Druart from comment #5)
% sudo koha-translate --dev kohadev --install es-ES % ls koha-tmpl/intranet-tmpl/prog|grep es-ES
Does not return anything, what did I miss?
I have used a very new script to update the debian files, cp_debian_files.pl on koha-misc4dev (see https://github.com/joubu/koha-misc4dev).
Dumb question, but you checked this? Add the <dev_install> line to koha-conf.xml. (See 16733.)
Nope :) Why don't you use intranetdir? -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 --- Comment #9 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- (In reply to Jonathan Druart from comment #8)
(In reply to Marcel de Rooy from comment #7)
(In reply to Jonathan Druart from comment #5)
% sudo koha-translate --dev kohadev --install es-ES % ls koha-tmpl/intranet-tmpl/prog|grep es-ES
Does not return anything, what did I miss?
I have used a very new script to update the debian files, cp_debian_files.pl on koha-misc4dev (see https://github.com/joubu/koha-misc4dev).
Dumb question, but you checked this? Add the <dev_install> line to koha-conf.xml. (See 16733.)
Nope :) Why don't you use intranetdir?
dev_install tells you too that this is a gitified install -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 --- Comment #10 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- (In reply to Marcel de Rooy from comment #9)
(In reply to Jonathan Druart from comment #8)
Why don't you use intranetdir?
dev_install tells you too that this is a gitified install
In that case, does a boolean flag would be enough? If dev_install will always be equal to intranetdir it would make more sense to have a flag. What do you think? -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 --- Comment #11 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- (In reply to Jonathan Druart from comment #10)
(In reply to Marcel de Rooy from comment #9)
(In reply to Jonathan Druart from comment #8)
Why don't you use intranetdir?
dev_install tells you too that this is a gitified install
In that case, does a boolean flag would be enough? If dev_install will always be equal to intranetdir it would make more sense to have a flag. What do you think?
That sounds reasonable ;) -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 --- Comment #12 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- test: obsoleted comment 2 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 --- Comment #13 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- (In reply to Marcel de Rooy from comment #12)
test: obsoleted comment 2
does not seem to work -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 Bug 16749 depends on bug 16733, which changed state. Bug 16733 Summary: More flexible paths in debian scripts (for dev installs) https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 What |Removed |Added ---------------------------------------------------------------------------- Status|Pushed to Master |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |tomascohen@gmail.com --- Comment #14 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Tomas, can we get your opinion on comment 10? -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 --- Comment #15 from Tomás Cohen Arazi <tomascohen@gmail.com> --- (In reply to Jonathan Druart from comment #10)
(In reply to Marcel de Rooy from comment #9)
(In reply to Jonathan Druart from comment #8)
Why don't you use intranetdir?
dev_install tells you too that this is a gitified install
In that case, does a boolean flag would be enough? If dev_install will always be equal to intranetdir it would make more sense to have a flag. What do you think?
I think we should go with a boolean flag. We love booleans. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 --- Comment #16 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 60064 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=60064&action=edit Bug 17049: Improve PERL5LIB handling for packaged dev install This is a small follow-up for report 16733. 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 16733 and 17049. [2] Add a <dev_install>/just/a/path</dev_install> 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 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Summary|Follow-up for bug 16733: |Additional fixes for debian |changes for koha-translate |scripts -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |ASSIGNED -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 --- Comment #17 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Moving a patch from 17049 here. Im having an issue on kohadevbox with the xmlstarlet subshell in the bash function adjust_paths.. If the key is not found, it fails silently. While it normally should not. Will be contacting Tomas about this soon. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also| |https://bugs.koha-community | |.org/bugzilla3/show_bug.cgi | |?id=17049 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also|https://bugs.koha-community | |.org/bugzilla3/show_bug.cgi | |?id=16733 | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 --- Comment #18 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 60103 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=60103&action=edit Bug 16749: Adjust xmlstarlet calls in koha-functions WORK_IN_PROGRESS -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 --- Comment #19 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 60106 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=60106&action=edit Bug 16749: Adjustments for koha-plack [1] Use run_safe_xmlstarlet for plack workers and requests [2] Simplify adjust_paths -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 --- Comment #20 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Comment on attachment 60064 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=60064 Bug 17049: Improve PERL5LIB handling for packaged dev install Obsoleting this theoretical approach -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #60064|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #60103|0 |1 is obsolete| | --- Comment #21 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 60109 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=60109&action=edit Bug 16749: Adjust xmlstarlet calls in koha-functions In various scripts we use xmlstarlet to extract values from koha-conf. If we call xmlstarlet on non-existing entries in koha-conf, this may however result in silently failing scripts. A function run_safe_xmlstarlet is added for situations where the entry might not be there. No need to use it everywhere rightaway. This patch only adjusts koha-functions and modifies the xmlstarlet calls for dev_install and zebra_loglevels. Test plan: [1] Apply the patch for koha-plack too. [2] Copy koha-functions.sh and koha-plack from clone to default locations. [3] Start and stop koha-plack while you have dev_install in koha-conf. Verify with ps aux|grep plack. [4] Rename dev_install to nodev_install and start/stop koha-plack. Verify with ps aux|grep plack. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Tested on a Debian VM and with a Windows kohadevbox :) -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #60106|0 |1 is obsolete| | --- Comment #22 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 60110 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=60110&action=edit Bug 16749: Adjustments for koha-plack [1] Use run_safe_xmlstarlet for plack workers and requests [2] Simplify adjust_paths. The lazy export statement is actually enough to replace adjust_paths by one direct call to adjust_paths_dev_install. Test plan: [1] See patch for adjusting xmlstarlet calls. [2] Change plack_requests to 51 in your koha-conf. Restart Plack and check that you see 51 in ps aux|grep plack. 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=16749 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #60109|0 |1 is obsolete| | --- Comment #23 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 60111 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=60111&action=edit Bug 16749: Adjust xmlstarlet calls in koha-functions In various scripts we use xmlstarlet to extract values from koha-conf. If we call xmlstarlet on non-existing entries in koha-conf, this may however result in silently failing scripts. A function run_safe_xmlstarlet is added for situations where the entry might not be there. No need to use it everywhere rightaway. This patch only adjusts koha-functions and modifies the xmlstarlet calls for dev_install and zebra_loglevels. Test plan: [1] Apply the patch for koha-plack too. [2] Copy koha-functions.sh and koha-plack from clone to default locations. [3] Start and stop koha-plack while you have dev_install in koha-conf. Verify with ps aux|grep plack. [4] Rename dev_install to nodev_install and start/stop koha-plack. Verify with ps aux|grep plack. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Tested on a Debian VM and with a Windows kohadevbox :) -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #60110|0 |1 is obsolete| | --- Comment #24 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 60112 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=60112&action=edit Bug 16749: Adjustments for koha-plack [1] Use run_safe_xmlstarlet for plack workers and requests [2] Simplify adjust_paths. The lazy export statement is actually enough to replace adjust_paths by one direct call to adjust_paths_dev_install. Test plan: [1] See patch for adjusting xmlstarlet calls. [2] Change plack_requests to 51 in your koha-conf. Restart Plack and check that you see 51 in ps aux|grep plack. 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=16749 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #52561|0 |1 is obsolete| | --- Comment #25 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 60113 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=60113&action=edit Bug 16749: Adjustments for koha-translate [1] Add a -d|--dev parameter for dev installs. [2] KOHA_CONF is not needed in this script. [3] No hardcoded PERL5LIB, following bug 16733. [4] Adjust template paths for dev installs: OPAC_TMPL, INTRANET_TMPL. [5] Remove reference now to obsolete thems ccsr and prog. Test plan: [1] Regular package install: Run koha-translate -l to show installed languages. Run koha-translate -l -a to show available languages. Add a language: koha-translate -i nl-NL. Check the nl-NL folder. Remove a language: koha-translate -r nl-NL. Check again. [2] If you have a dev install too, try: Add the <dev_install> line to koha-conf.xml. (See 16733.) Run koha-translate -l -d yourinstance to show installed languages. (Note: You only see the languages installed in that instance.) Add a language: koha-translate -i nl-NL -d yourinstance. Remove a language: koha-translate -r nl-NL -d yourinstance. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> EDIT (Feb 10, 2017): Added KOHA_CONF variable when calling translate. (Needed on kohadevbox.) -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 --- Comment #26 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- PERL5DIR typo ?? -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #60113|0 |1 is obsolete| | --- Comment #27 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 60114 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=60114&action=edit Bug 16749: Adjustments for koha-translate [1] Add a -d|--dev parameter for dev installs. [2] KOHA_CONF is not needed in this script. [3] No hardcoded PERL5LIB, following bug 16733. [4] Adjust template paths for dev installs: OPAC_TMPL, INTRANET_TMPL. [5] Remove reference now to obsolete thems ccsr and prog. Test plan: [1] Regular package install: Run koha-translate -l to show installed languages. Run koha-translate -l -a to show available languages. Add a language: koha-translate -i nl-NL. Check the nl-NL folder. Remove a language: koha-translate -r nl-NL. Check again. [2] If you have a dev install too, try: Add the <dev_install> line to koha-conf.xml. (See 16733.) Run koha-translate -l -d yourinstance to show installed languages. (Note: You only see the languages installed in that instance.) Add a language: koha-translate -i nl-NL -d yourinstance. Remove a language: koha-translate -r nl-NL -d yourinstance. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> EDIT (Feb 10, 2017): Fixed a typ PERL5DIR. Decided to not pass KOHA_CONF after all. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #60114|0 |1 is obsolete| | --- Comment #28 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 60125 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=60125&action=edit Bug 16749: Adjustments for koha-translate [AMENDED February 10, 2017] [1] Add a -d|--dev parameter for dev installs. [2] No hardcoded PERL5LIB or KOHA_INSTALL_DIR (KOHA_HOME). They are read from /etc/default or set by adjust_paths_dev_install. [3] Adjust template paths for dev installs: OPAC_TMPL, INTRANET_TMPL. [4] Remove references to obsolete themes ccsr and prog. Test plan: [1] Regular package install: Run koha-translate -l to show installed languages. Run koha-translate -l -a to show available languages. Add a language: koha-translate -i nl-NL. Check the nl-NL folder. Remove a language: koha-translate -r nl-NL. Check again. [2] Dev install or kohadevbox: If needed, add the <dev_install> line to koha-conf.xml. Run koha-translate -l -d yourinstance to show installed languages. (Note: You only see the languages installed in that instance.) Add a language: koha-translate -i nl-NL -d yourinstance. Remove a language: koha-translate -r nl-NL -d yourinstance. 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=16749 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #60125|0 |1 is obsolete| | --- Comment #29 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 60126 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=60126&action=edit Bug 16749: Adjustments for koha-translate [AMENDED February 10, 2017] [1] Added reading /etc/default as in the other debian scripts. Used later. [2] Add a -d|--dev parameter for dev installs. [3] No hardcoded PERL5LIB or KOHA_INSTALL_DIR (KOHA_HOME). They are read from /etc/default or set by adjust_paths_dev_install. [4] Adjust template paths for dev installs: OPAC_TMPL, INTRANET_TMPL. [5] Remove references to obsolete themes ccsr and prog. Test plan: [1] Regular package install: Run koha-translate -l to show installed languages. Run koha-translate -l -a to show available languages. Add a language: koha-translate -i nl-NL. Check the nl-NL folder. Remove a language: koha-translate -r nl-NL. Check again. [2] Dev install or kohadevbox: If needed, add the <dev_install> line to koha-conf.xml. Run koha-translate -l -d yourinstance to show installed languages. (Note: You only see the languages installed in that instance.) Add a language: koha-translate -i nl-NL -d yourinstance. Remove a language: koha-translate -r nl-NL -d yourinstance. 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=16749 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #60111|0 |1 is obsolete| | --- Comment #30 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 60129 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=60129&action=edit Bug 16749: Adjust xmlstarlet calls in koha-functions In various scripts we use xmlstarlet to extract values from koha-conf. If we call xmlstarlet on non-existing entries in koha-conf, this may however result in silently failing scripts (when set -e is in effect). A function run_safe_xmlstarlet is added for situations where the entry might not exist. It will not halt execution. This patch only adjusts koha-functions.sh and modifies the xmlstarlet calls for dev_install and zebra_loglevels. Note: The function does not need to check file existence. If the file does not exist, xmlstarlet warns about it; the function returns empty string, but does not set an error exit status. Test plan: See second patch ("koha-plack adjustments"). 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=16749 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #60112|0 |1 is obsolete| | --- Comment #31 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 60130 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=60130&action=edit Bug 16749: Adjustments for koha-plack [1] Use run_safe_xmlstarlet for plack workers and requests [2] Simplify adjust_paths. The lazy export statement is actually enough to replace adjust_paths by one direct call to adjust_paths_dev_install. Test plan: [1] Copy koha-functions.sh and koha-plack: cp [YOUR_PATH]/debian/scripts/koha-functions.sh /usr/share/koha/bin/ cp [YOUR_PATH]/debian/scripts/koha-plack /usr/sbin/ where YOUR_PATH might well be /home/vagrant/kohaclone. [2] Make sure that you have dev_install in koha-conf. Stop and start koha-plack. Verify with ps aux|grep plack. [3] Rename dev_install to nodev_install (in start and end tag). Now stop/start koha-plack. Verify with ps aux|grep plack. [4] Change plack_requests to 51 in your koha-conf. Restart Plack and check that you see 51 in ps aux|grep plack. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Tested on Jessie (Debian VM and Kohadevbox) -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #60126|0 |1 is obsolete| | --- Comment #32 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 60131 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=60131&action=edit Bug 16749: Adjustments for koha-translate [AMENDED February 10, 2017] [1] Added reading /etc/default/koha-common as in the other debian scripts. We need it for KOHA_HOME. [2] Add a -d|--dev parameter for dev installs. [3] No hardcoded PERL5LIB or KOHA_INSTALL_DIR (KOHA_HOME). They are read from default file or set by adjust_paths_dev_install. [4] Adjust template paths for dev installs: OPAC_TMPL, INTRANET_TMPL. [5] Remove references to obsolete themes ccsr and prog. Test plan: [1] Regular package install: Copy koha-translate to /usr/sbin. Run koha-translate -l to show installed languages. Run koha-translate -l -a to show available languages. Add a language: koha-translate -i nl-NL. Check template folders in regular location (/usr/share/koha/...) Remove a language: koha-translate -r nl-NL. Check again. [2] Dev install or kohadevbox: Copy koha-translate to /usr/sbin. If needed, add the <dev_install> line to koha-conf.xml. Run koha-translate -l -d yourinstance to show installed languages. (Note: You only see the languages installed in this instance.) Add a language: koha-translate -i nl-NL -d yourinstance. Check template folders in the clone. Remove a language: koha-translate -r nl-NL -d yourinstance. 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=16749 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #60131|0 |1 is obsolete| | --- Comment #33 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 60132 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=60132&action=edit Bug 16749: Adjustments for koha-translate [AMENDED February 10, 2017] [1] Added reading /etc/default/koha-common as in the other debian scripts. We need it for KOHA_HOME. [2] Add a -d|--dev parameter for dev installs. [3] No hardcoded PERL5LIB or KOHA_INSTALL_DIR (KOHA_HOME). They are read from default file or set by adjust_paths_dev_install. [4] Adjust template paths for dev installs: OPAC_TMPL, INTRANET_TMPL. [5] Remove references to obsolete themes ccsr and prog. Test plan: [1] Regular package install: Copy koha-translate to /usr/sbin. Run koha-translate -l to show installed languages. Run koha-translate -l -a to show available languages. Add a language: koha-translate -i nl-NL. Check template folders in regular location (/usr/share/koha/...) Remove a language: koha-translate -r nl-NL. Check again. [2] Dev install or kohadevbox: Copy koha-translate to /usr/sbin. If needed, add the <dev_install> line to koha-conf.xml. Run koha-translate -l -d yourinstance to show installed languages. (Note: You only see the languages installed in this instance.) Add a language: koha-translate -i nl-NL -d yourinstance. Check template folders in the clone. Remove a language: koha-translate -r nl-NL -d yourinstance. Note: Make sure you have sufficient file permissions for the kohaclone files and koha-conf.xml. On kohadevbox you might need to run sudo koha-translate within the the vagrant user context. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Tested on Jessie (Debian VM and Kohadevbox) -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #55490|0 |1 is obsolete| | --- Comment #34 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 60139 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=60139&action=edit Bug 16749: Update debian docs for koha-translate This patch adds the -d option to the documentation (with thanks to Magnus Enger). -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 --- Comment #35 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 60140 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=60140&action=edit Bug 16749: Go with a boolean flag, we love booleans As requested by Jonathan on comment 10 on Bugzilla and supported by Tomas, we should use the dev_install entry in koha-conf as a boolean flag. Since we already used it as a path, this patch is not too strict about it. If the entry is not empty and not equal to "0", we will interpret it as a true value. The path is taken from the intranetdir entry. Test plan: [1] Copy debian/scripts/koha-functions.sh to /usr/share/koha/bin [2] For a dev install: Remove the dev install line, or toggle its value between empty string, 0 or 1 and each time test stop/start koha-indexer. Check the path to rebuild_zebra with ps aux|grep indexer. If you have no entry, an empty entry or a zero, you should see a regular path. (Note: You can do something similar with koha-start-sip.) [3] For a regular install: Remove the dev install line. Stop/start koha-indexer or koha-plack, and verify that it still works. Add a dev_install line with 0, and repeat stop/start. 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=16749 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |Needs Signoff --- Comment #36 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- This should do it for now. We need these patches following 16733 in 17.05 (especially the first two). Have been testing them quite extensively. Hoping for further attention soon.. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 --- Comment #37 from Mirko Tietgen <mirko@abunchofthings.net> --- This patch set appears to fix the koha-common.postinst error presumably introduced in bug 16733. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 --- Comment #38 from Mirko Tietgen <mirko@abunchofthings.net> --- I have tested patch 3 and 4 in a regular package installation of master+all patches from this bug and they work. I can also confirm that the postinst issue is gone with this patch set. i tried plack_requests from the test plan in patch 2 in koha-conf.xml but it did not have any effect in the regular installation. I may be missing a parameter or it is not applicable for a regular install? -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 --- Comment #39 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- (In reply to Mirko Tietgen from comment #38)
I have tested patch 3 and 4 in a regular package installation of master+all patches from this bug and they work. I can also confirm that the postinst issue is gone with this patch set.
i tried plack_requests from the test plan in patch 2 in koha-conf.xml but it did not have any effect in the regular installation. I may be missing a parameter or it is not applicable for a regular install?
Thanks for testing. Should work on a regular instance too. Just to be sure: Master up-to-date including 17610? Did you copy the debian scripts from the master clone to /usr/sbin? And koha-functions.sh to /usr/share/koha/bin? And did you edit the koha-conf of the instance for which you are restarting plack? This setting is instance specific. You should see something like (52 coming from my koha-conf): master-+ 28433 0.0 0.1 61320 14636 ? Ss 18:57 0:00 starman master -M FindBin --max-requests 52 --workers 2 --user=master-koha --group master-koha --pid /var/run/koha/master/plack.pid --daemonize --access-log /var/log/koha/master/plack.log --error-log /var/log/koha/master/plack-error.log -E deployment --socket /var/run/koha/master/plack.sock /etc/koha/plack.psgi -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 --- Comment #40 from Mirko Tietgen <mirko@abunchofthings.net> --- I did not copy anything, I built a Debian package, so everything is in place already. I edited the correct instance koha-conf file. According to bug 17610 it is plack_max_requests, not plack_requests. I will try that. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 --- Comment #41 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- (In reply to Mirko Tietgen from comment #40)
I did not copy anything, I built a Debian package, so everything is in place already. I edited the correct instance koha-conf file.
According to bug 17610 it is plack_max_requests, not plack_requests. I will try that.
Oh sorry! You are of course completely right: <plack_max_requests>52</plack_max_requests> <plack_workers>2</plack_workers> These unreliable test plans :) -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 Mirko Tietgen <mirko@abunchofthings.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #60129|0 |1 is obsolete| | --- Comment #42 from Mirko Tietgen <mirko@abunchofthings.net> --- Created attachment 60193 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=60193&action=edit Bug 16749: Adjust xmlstarlet calls in koha-functions In various scripts we use xmlstarlet to extract values from koha-conf. If we call xmlstarlet on non-existing entries in koha-conf, this may however result in silently failing scripts (when set -e is in effect). A function run_safe_xmlstarlet is added for situations where the entry might not exist. It will not halt execution. This patch only adjusts koha-functions.sh and modifies the xmlstarlet calls for dev_install and zebra_loglevels. Note: The function does not need to check file existence. If the file does not exist, xmlstarlet warns about it; the function returns empty string, but does not set an error exit status. Test plan: See second patch ("koha-plack adjustments"). Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net> Tested in a package installation of master+16749 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 Mirko Tietgen <mirko@abunchofthings.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #60130|0 |1 is obsolete| | --- Comment #43 from Mirko Tietgen <mirko@abunchofthings.net> --- Created attachment 60194 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=60194&action=edit Bug 16749: Adjustments for koha-plack [1] Use run_safe_xmlstarlet for plack workers and requests [2] Simplify adjust_paths. The lazy export statement is actually enough to replace adjust_paths by one direct call to adjust_paths_dev_install. Test plan: [1] Copy koha-functions.sh and koha-plack: cp [YOUR_PATH]/debian/scripts/koha-functions.sh /usr/share/koha/bin/ cp [YOUR_PATH]/debian/scripts/koha-plack /usr/sbin/ where YOUR_PATH might well be /home/vagrant/kohaclone. [2] Make sure that you have dev_install in koha-conf. Stop and start koha-plack. Verify with ps aux|grep plack. [3] Rename dev_install to nodev_install (in start and end tag). Now stop/start koha-plack. Verify with ps aux|grep plack. [4] Change plack_requests to 51 in your koha-conf. Restart Plack and check that you see 51 in ps aux|grep plack. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Tested on Jessie (Debian VM and Kohadevbox) Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net> Tested in a package installation of master+16749 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 Mirko Tietgen <mirko@abunchofthings.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #60132|0 |1 is obsolete| | --- Comment #44 from Mirko Tietgen <mirko@abunchofthings.net> --- Created attachment 60195 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=60195&action=edit Bug 16749: Adjustments for koha-translate [AMENDED February 10, 2017] [1] Added reading /etc/default/koha-common as in the other debian scripts. We need it for KOHA_HOME. [2] Add a -d|--dev parameter for dev installs. [3] No hardcoded PERL5LIB or KOHA_INSTALL_DIR (KOHA_HOME). They are read from default file or set by adjust_paths_dev_install. [4] Adjust template paths for dev installs: OPAC_TMPL, INTRANET_TMPL. [5] Remove references to obsolete themes ccsr and prog. Test plan: [1] Regular package install: Copy koha-translate to /usr/sbin. Run koha-translate -l to show installed languages. Run koha-translate -l -a to show available languages. Add a language: koha-translate -i nl-NL. Check template folders in regular location (/usr/share/koha/...) Remove a language: koha-translate -r nl-NL. Check again. [2] Dev install or kohadevbox: Copy koha-translate to /usr/sbin. If needed, add the <dev_install> line to koha-conf.xml. Run koha-translate -l -d yourinstance to show installed languages. (Note: You only see the languages installed in this instance.) Add a language: koha-translate -i nl-NL -d yourinstance. Check template folders in the clone. Remove a language: koha-translate -r nl-NL -d yourinstance. Note: Make sure you have sufficient file permissions for the kohaclone files and koha-conf.xml. On kohadevbox you might need to run sudo koha-translate within the the vagrant user context. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Tested on Jessie (Debian VM and Kohadevbox) Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net> Tested in a package installation of master+16749 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 Mirko Tietgen <mirko@abunchofthings.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #60139|0 |1 is obsolete| | --- Comment #45 from Mirko Tietgen <mirko@abunchofthings.net> --- Created attachment 60196 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=60196&action=edit Bug 16749: Update debian docs for koha-translate This patch adds the -d option to the documentation (with thanks to Magnus Enger). Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net> Tested in a package installation of master+16749 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 Mirko Tietgen <mirko@abunchofthings.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #60140|0 |1 is obsolete| | --- Comment #46 from Mirko Tietgen <mirko@abunchofthings.net> --- Created attachment 60197 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=60197&action=edit Bug 16749: Go with a boolean flag, we love booleans As requested by Jonathan on comment 10 on Bugzilla and supported by Tomas, we should use the dev_install entry in koha-conf as a boolean flag. Since we already used it as a path, this patch is not too strict about it. If the entry is not empty and not equal to "0", we will interpret it as a true value. The path is taken from the intranetdir entry. Test plan: [1] Copy debian/scripts/koha-functions.sh to /usr/share/koha/bin [2] For a dev install: Remove the dev install line, or toggle its value between empty string, 0 or 1 and each time test stop/start koha-indexer. Check the path to rebuild_zebra with ps aux|grep indexer. If you have no entry, an empty entry or a zero, you should see a regular path. (Note: You can do something similar with koha-start-sip.) [3] For a regular install: Remove the dev install line. Stop/start koha-indexer or koha-plack, and verify that it still works. Add a dev_install line with 0, and repeat stop/start. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net> Tested in a package installation of master+16749 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 Mirko Tietgen <mirko@abunchofthings.net> 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=16749 --- Comment #47 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- (In reply to Mirko Tietgen from comment #46)
Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Great, thanks. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 --- Comment #48 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Why do not we use the dev_install flag 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=16749 --- Comment #49 from Tomás Cohen Arazi <tomascohen@gmail.com> --- (In reply to Jonathan Druart from comment #48)
Why do not we use the dev_install flag for koha-translate?
Why not leave koha-translate alone? Remember there might be dev and non-dev installs. It is easy to just go to the source code and run perl translate install <code>. And koha-translate is system-wide, so not attached to a specific instance -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 --- Comment #50 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- (In reply to Jonathan Druart from comment #48)
Why do not we use the dev_install flag for koha-translate?
Because we do not pass an instance name when using it for regular installs. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 --- Comment #51 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- (In reply to Tomás Cohen Arazi from comment #49)
(In reply to Jonathan Druart from comment #48)
Why do not we use the dev_install flag for koha-translate?
Why not leave koha-translate alone? Remember there might be dev and non-dev installs. It is easy to just go to the source code and run perl translate install <code>. And koha-translate is system-wide, so not attached to a specific instance
It is not that hard to make it work. The patch may prove that. Any specific objection ? -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 --- Comment #52 from Tomás Cohen Arazi <tomascohen@gmail.com> --- (In reply to Marcel de Rooy from comment #51)
(In reply to Tomás Cohen Arazi from comment #49)
(In reply to Jonathan Druart from comment #48)
Why do not we use the dev_install flag for koha-translate?
Why not leave koha-translate alone? Remember there might be dev and non-dev installs. It is easy to just go to the source code and run perl translate install <code>. And koha-translate is system-wide, so not attached to a specific instance
It is not that hard to make it work. The patch may prove that. Any specific objection ?
It felt a bit overkill to me, but no objections. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 --- Comment #53 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 60335 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=60335&action=edit Bug 16749: Use is_instance to make sure the dev instance exist -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 --- Comment #54 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- % sudo koha-upgrade-schema failed to load external entity "/etc/koha/sites/dev_install/koha-conf.xml" -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 --- Comment #55 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- (In reply to Jonathan Druart from comment #54)
% sudo koha-upgrade-schema failed to load external entity "/etc/koha/sites/dev_install/koha-conf.xml"
Same for koha-rebuild-zebra, and certainly others. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 --- Comment #56 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- What instances do you use and what command did you type? -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 --- Comment #57 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 60340 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=60340&action=edit Bug 16749: Check instancename in adjust_paths_dev_install Check if the instance does not exist (or was not even passed). -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #60193|0 |1 is obsolete| | --- Comment #58 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 60343 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=60343&action=edit Bug 16749: Adjust xmlstarlet calls in koha-functions In various scripts we use xmlstarlet to extract values from koha-conf. If we call xmlstarlet on non-existing entries in koha-conf, this may however result in silently failing scripts (when set -e is in effect). A function run_safe_xmlstarlet is added for situations where the entry might not exist. It will not halt execution. This patch only adjusts koha-functions.sh and modifies the xmlstarlet calls for dev_install and zebra_loglevels. Note: The function does not need to check file existence. If the file does not exist, xmlstarlet warns about it; the function returns empty string, but does not set an error exit status. Test plan: See second patch ("koha-plack adjustments"). Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net> Tested in a package installation of master+16749 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=16749 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #60194|0 |1 is obsolete| | --- Comment #59 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 60344 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=60344&action=edit Bug 16749: Adjustments for koha-plack [1] Use run_safe_xmlstarlet for plack workers and requests [2] Simplify adjust_paths. The lazy export statement is actually enough to replace adjust_paths by one direct call to adjust_paths_dev_install. Test plan: [1] Copy koha-functions.sh and koha-plack: cp [YOUR_PATH]/debian/scripts/koha-functions.sh /usr/share/koha/bin/ cp [YOUR_PATH]/debian/scripts/koha-plack /usr/sbin/ where YOUR_PATH might well be /home/vagrant/kohaclone. [2] Make sure that you have dev_install in koha-conf. Stop and start koha-plack. Verify with ps aux|grep plack. [3] Rename dev_install to nodev_install (in start and end tag). Now stop/start koha-plack. Verify with ps aux|grep plack. [4] Change plack_requests to 51 in your koha-conf. Restart Plack and check that you see 51 in ps aux|grep plack. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Tested on Jessie (Debian VM and Kohadevbox) Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net> Tested in a package installation of master+16749 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=16749 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #60195|0 |1 is obsolete| | --- Comment #60 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 60345 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=60345&action=edit Bug 16749: Adjustments for koha-translate [AMENDED February 10, 2017] [1] Added reading /etc/default/koha-common as in the other debian scripts. We need it for KOHA_HOME. [2] Add a -d|--dev parameter for dev installs. [3] No hardcoded PERL5LIB or KOHA_INSTALL_DIR (KOHA_HOME). They are read from default file or set by adjust_paths_dev_install. [4] Adjust template paths for dev installs: OPAC_TMPL, INTRANET_TMPL. [5] Remove references to obsolete themes ccsr and prog. Test plan: [1] Regular package install: Copy koha-translate to /usr/sbin. Run koha-translate -l to show installed languages. Run koha-translate -l -a to show available languages. Add a language: koha-translate -i nl-NL. Check template folders in regular location (/usr/share/koha/...) Remove a language: koha-translate -r nl-NL. Check again. [2] Dev install or kohadevbox: Copy koha-translate to /usr/sbin. If needed, add the <dev_install> line to koha-conf.xml. Run koha-translate -l -d yourinstance to show installed languages. (Note: You only see the languages installed in this instance.) Add a language: koha-translate -i nl-NL -d yourinstance. Check template folders in the clone. Remove a language: koha-translate -r nl-NL -d yourinstance. Note: Make sure you have sufficient file permissions for the kohaclone files and koha-conf.xml. On kohadevbox you might need to run sudo koha-translate within the the vagrant user context. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Tested on Jessie (Debian VM and Kohadevbox) Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net> Tested in a package installation of master+16749 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=16749 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #60196|0 |1 is obsolete| | --- Comment #61 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 60346 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=60346&action=edit Bug 16749: Update debian docs for koha-translate This patch adds the -d option to the documentation (with thanks to Magnus Enger). Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net> Tested in a package installation of master+16749 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=16749 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #60197|0 |1 is obsolete| | --- Comment #62 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 60347 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=60347&action=edit Bug 16749: Go with a boolean flag, we love booleans As requested by Jonathan on comment 10 on Bugzilla and supported by Tomas, we should use the dev_install entry in koha-conf as a boolean flag. Since we already used it as a path, this patch is not too strict about it. If the entry is not empty and not equal to "0", we will interpret it as a true value. The path is taken from the intranetdir entry. Test plan: [1] Copy debian/scripts/koha-functions.sh to /usr/share/koha/bin [2] For a dev install: Remove the dev install line, or toggle its value between empty string, 0 or 1 and each time test stop/start koha-indexer. Check the path to rebuild_zebra with ps aux|grep indexer. If you have no entry, an empty entry or a zero, you should see a regular path. (Note: You can do something similar with koha-start-sip.) [3] For a regular install: Remove the dev install line. Stop/start koha-indexer or koha-plack, and verify that it still works. Add a dev_install line with 0, and repeat stop/start. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net> Tested in a package installation of master+16749 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=16749 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #60335|0 |1 is obsolete| | --- Comment #63 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 60348 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=60348&action=edit Bug 16749: Use is_instance to make sure the dev instance exist 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=16749 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #60340|0 |1 is obsolete| | --- Comment #64 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 60349 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=60349&action=edit Bug 16749: Check instancename in adjust_paths_dev_install Check if the instance does not exist (or was not even passed). 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=16749 --- Comment #65 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 60350 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=60350&action=edit Bug 16749: Add is_instance check to koha-upgrade-schema 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=16749 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=16749 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |kyle@bywatersolutions.com Status|Passed QA |Pushed to Master --- Comment #66 from Kyle M Hall <kyle@bywatersolutions.com> --- Pushed to master for 17.05, thanks Marcel, Jonathan! -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|--- |FIXED CC| |katrin.fischer@bsz-bw.de Status|Pushed to Master |RESOLVED --- Comment #67 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Depends on bug 16733 which is not in 16.11.x. 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=16749 Tomás Cohen Arazi <tomascohen@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |18502 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18502 [Bug 18502] koha-shell broken on dev installs -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 Bug 16749 depends on bug 16733, which changed state. Bug 16733 Summary: More flexible paths in debian scripts (for dev installs) https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16733 What |Removed |Added ---------------------------------------------------------------------------- Status|RESOLVED |REOPENED Resolution|FIXED |--- -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|RESOLVED |REOPENED Resolution|FIXED |--- -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16749 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=16749 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=16749 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=16749 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Pushed to Stable Severity|enhancement |normal --- Comment #68 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=16749 --- Comment #69 from Mason James <mtj@kohaaloha.com> --- Blocked by 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=16749 Tomás Cohen Arazi <tomascohen@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |jweaver@bywatersolutions.co | |m --- Comment #70 from Tomás Cohen Arazi <tomascohen@gmail.com> --- *** Bug 16226 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