Bugzilla – Attachment 184992 Details for
Bug 39740
[Follow-up of 36932] Split dev_install into git_install and debug_mode
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 39740: Fix a few occurrences of dev_install in code
Bug-39740-Fix-a-few-occurrences-of-devinstall-in-c.patch (text/plain), 2.81 KB, created by
Tomás Cohen Arazi (tcohen)
on 2025-08-01 12:13:47 UTC
(
hide
)
Description:
Bug 39740: Fix a few occurrences of dev_install in code
Filename:
MIME Type:
Creator:
Tomás Cohen Arazi (tcohen)
Created:
2025-08-01 12:13:47 UTC
Size:
2.81 KB
patch
obsolete
>From 753b7edc60dbd49e5bc4caeba1d620facb95a608 Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Thu, 24 Jul 2025 15:00:23 +0200 >Subject: [PATCH] Bug 39740: Fix a few occurrences of dev_install in code > >Test plan: >Check if git_install is set correctly for your system >in koha-conf.xml. Adjust otherwise. >cp debian/scripts/koha-functions.sh /usr/share/koha/bin/ >cp debian/scripts/koha-* /usr/sbin/ >Run koha-shell your_clone. Does that works like expected? >Run t/Koha/Config.t. > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> >--- > debian/scripts/koha-shell | 5 ++--- > t/Koha/Config.t | 2 +- > t/data/koha-conf.xml | 4 ++-- > 3 files changed, 5 insertions(+), 6 deletions(-) > >diff --git a/debian/scripts/koha-shell b/debian/scripts/koha-shell >index 808fc13b64a..4711dc8cf51 100755 >--- a/debian/scripts/koha-shell >+++ b/debian/scripts/koha-shell >@@ -84,9 +84,8 @@ sub read_perl5lib { > my $result = `grep "^PERL5LIB=" /etc/default/koha-common`; > chomp $result; > $result =~ s/^PERL5LIB=\s*//; >- my $dev_install = `xmlstarlet sel -t -v 'yazgfs/config/dev_install' /etc/koha/sites/$instance/koha-conf.xml`; >- chomp $dev_install; >- if ( $dev_install ) { >+ my $git_install = `. /usr/share/koha/bin/koha-functions.sh; if is_git_install $instance; then echo 1; fi`; >+ if ( $git_install ) { > # pick PERL5LIB from the intranetdir entry > $result = `xmlstarlet sel -t -v "yazgfs/config/intranetdir" /etc/koha/sites/$instance/koha-conf.xml`; > $result = "$result:$result/lib"; >diff --git a/t/Koha/Config.t b/t/Koha/Config.t >index 7172647ff6f..b7534f0bcad 100755 >--- a/t/Koha/Config.t >+++ b/t/Koha/Config.t >@@ -226,7 +226,7 @@ subtest 'read_from_file() tests' => sub { > 'timezone' => '', > 'bcrypt_settings' => '__BCRYPT_SETTINGS__', > 'encryption_key' => '__ENCRYPTION_KEY__', >- 'dev_install' => '0', >+ 'git_install' => '0', > 'strict_sql_modes' => '0', > 'plugin_repos' => '', > 'koha_xslt_security' => '', >diff --git a/t/data/koha-conf.xml b/t/data/koha-conf.xml >index 1accab3c205..404939818f9 100644 >--- a/t/data/koha-conf.xml >+++ b/t/data/koha-conf.xml >@@ -229,10 +229,10 @@ > <encryption_key>__ENCRYPTION_KEY__</encryption_key> > > <!-- flag for development purposes >- dev_install is used to adjust some paths specific to dev installations >+ git_install is used to adjust some paths specific to dev installations > strict_sql_modes should not be used in a production environment > developers use it to catch bugs related to strict SQL modes --> >- <dev_install>0</dev_install> >+ <git_install>0</git_install> > <strict_sql_modes>0</strict_sql_modes> > <plugin_repos> > <!-- >-- >2.50.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 39740
:
184187
|
184432
|
184798
|
184799
|
184800
|
184801
|
184802
|
184803
|
184804
|
184873
|
184874
|
184920
|
184989
|
184990
|
184991
| 184992 |
184993
|
184994
|
184995
|
184996
|
184997
|
184998