View | Details | Raw Unified | Return to bug 39740
Collapse All | Expand All

(-)a/debian/scripts/koha-shell (-3 / +2 lines)
Lines 84-92 sub read_perl5lib { Link Here
84
    my $result = `grep "^PERL5LIB=" /etc/default/koha-common`;
84
    my $result = `grep "^PERL5LIB=" /etc/default/koha-common`;
85
    chomp $result;
85
    chomp $result;
86
    $result =~ s/^PERL5LIB=\s*//;
86
    $result =~ s/^PERL5LIB=\s*//;
87
    my $dev_install = `xmlstarlet sel -t -v 'yazgfs/config/dev_install' /etc/koha/sites/$instance/koha-conf.xml`;
87
    my $git_install = `. /usr/share/koha/bin/koha-functions.sh; if is_git_install $instance; then echo 1; fi`;
88
    chomp $dev_install;
88
    if ( $git_install ) {
89
    if ( $dev_install ) {
90
        # pick PERL5LIB from the intranetdir entry
89
        # pick PERL5LIB from the intranetdir entry
91
        $result = `xmlstarlet sel -t -v "yazgfs/config/intranetdir" /etc/koha/sites/$instance/koha-conf.xml`;
90
        $result = `xmlstarlet sel -t -v "yazgfs/config/intranetdir" /etc/koha/sites/$instance/koha-conf.xml`;
92
        $result = "$result:$result/lib";
91
        $result = "$result:$result/lib";
(-)a/t/Koha/Config.t (-1 / +1 lines)
Lines 226-232 subtest 'read_from_file() tests' => sub { Link Here
226
            'timezone'           => '',
226
            'timezone'           => '',
227
            'bcrypt_settings'    => '__BCRYPT_SETTINGS__',
227
            'bcrypt_settings'    => '__BCRYPT_SETTINGS__',
228
            'encryption_key'     => '__ENCRYPTION_KEY__',
228
            'encryption_key'     => '__ENCRYPTION_KEY__',
229
            'dev_install'        => '0',
229
            'git_install'        => '0',
230
            'strict_sql_modes'   => '0',
230
            'strict_sql_modes'   => '0',
231
            'plugin_repos'       => '',
231
            'plugin_repos'       => '',
232
            'koha_xslt_security' => '',
232
            'koha_xslt_security' => '',
(-)a/t/data/koha-conf.xml (-3 / +2 lines)
Lines 229-238 Link Here
229
 <encryption_key>__ENCRYPTION_KEY__</encryption_key>
229
 <encryption_key>__ENCRYPTION_KEY__</encryption_key>
230
230
231
 <!-- flag for development purposes
231
 <!-- flag for development purposes
232
      dev_install is used to adjust some paths specific to dev installations
232
      git_install is used to adjust some paths specific to dev installations
233
      strict_sql_modes should not be used in a production environment
233
      strict_sql_modes should not be used in a production environment
234
      developers use it to catch bugs related to strict SQL modes -->
234
      developers use it to catch bugs related to strict SQL modes -->
235
 <dev_install>0</dev_install>
235
 <git_install>0</git_install>
236
 <strict_sql_modes>0</strict_sql_modes>
236
 <strict_sql_modes>0</strict_sql_modes>
237
 <plugin_repos>
237
 <plugin_repos>
238
    <!--
238
    <!--
239
- 

Return to bug 39740