Merge branch 'master' of http://manage-gmc.dev.kohalibrary.com/koha-installer
This commit is contained in:
commit
666f9ebef0
1 changed files with 4 additions and 2 deletions
|
@ -956,7 +956,7 @@ sub get_target_directories {
|
|||
$skipdirs{'INTRANET_TMPL_DIR'} = 1;
|
||||
$dirmap{'INTRANET_WWW_DIR'} = File::Spec->catdir($curdir, 'koha-tmpl');
|
||||
$skipdirs{'INTRANET_WWW_DIR'} = 1;
|
||||
$dirmap{'OPAC_CGI_DIR'} = File::Spec->catdir($curdir, 'opac');
|
||||
$dirmap{'OPAC_CGI_DIR'} = File::Spec->catdir($curdir);
|
||||
$skipdirs{'OPAC_CGI_DIR'} = 1;
|
||||
$dirmap{'OPAC_TMPL_DIR'} = File::Spec->catdir($curdir, 'koha-tmpl', 'opac-tmpl');
|
||||
$skipdirs{'OPAC_TMPL_DIR'} = 1;
|
||||
|
@ -1165,7 +1165,9 @@ sub postamble {
|
|||
# quote '$' in the two password parameters
|
||||
my %config = %config;
|
||||
$config{'DB_PASS'} =~ s/\$/\$\$/g;
|
||||
$config{'ZEBRA_PASS'} =~ s/\$/\$\$/g;
|
||||
if ($config{'INSTALL_ZEBRA'} eq "yes") {
|
||||
$config{'ZEBRA_PASS'} =~ s/\$/\$\$/g;
|
||||
}
|
||||
|
||||
# Hereagain, we must alter syntax per platform...
|
||||
if ( $^O eq 'MSWin32' ) {
|
||||
|
|
Loading…
Reference in a new issue