@@ -, +, @@ --- Koha/Template/Plugin/Asset.pm | 4 ++-- Makefile.PL | 8 ++++---- rewrite-config.PL | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) --- a/Koha/Template/Plugin/Asset.pm +++ a/Koha/Template/Plugin/Asset.pm @@ -141,8 +141,8 @@ sub url { $version =~ s/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/$1.$2$3$4/; my $shared = $args->{shared}; - if ($shared){ - my $url = File::Spec->catfile('/shared',$dirname, "${basename}_${version}${suffix}"); + if ($shared) { + my $url = File::Spec->catfile( '/shared', $dirname, "${basename}_${version}${suffix}" ); return $url; } --- a/Makefile.PL +++ a/Makefile.PL @@ -335,7 +335,7 @@ my $target_map = { './Koha.pm' => 'PERL_MODULE_DIR', './koha-tmpl/intranet-tmpl' => { target => 'INTRANET_TMPL_DIR', trimdir => -1 }, './koha-tmpl/opac-tmpl' => { target => 'OPAC_TMPL_DIR', trimdir => -1 }, - './public' => { target => 'PUBLIC_WWW_DIR', trimdir => -1 }, + './public' => { target => 'PUBLIC_WWW_DIR', trimdir => -1 }, './kohaversion.pl' => 'INTRANET_CGI_DIR', './labels' => 'INTRANET_CGI_DIR', './lib' => { target => 'PERL_MODULE_LIB_DIR', trimdir => -1 }, @@ -1463,7 +1463,7 @@ sub get_target_directories { $dirmap{'OPAC_CGI_DIR'} = File::Spec->catdir(@basedir, $package, 'opac', 'cgi-bin'); $dirmap{'OPAC_TMPL_DIR'} = File::Spec->catdir(@basedir, $package, 'opac', 'htdocs', 'opac-tmpl'); $dirmap{'OPAC_WWW_DIR'} = File::Spec->catdir(@basedir, $package, 'opac', 'htdocs'); - $dirmap{'PUBLIC_WWW_DIR'} = File::Spec->catdir(@basedir, $package, 'public'); + $dirmap{'PUBLIC_WWW_DIR'} = File::Spec->catdir( @basedir, $package, 'public' ); $dirmap{'PERL_MODULE_DIR'} = File::Spec->catdir(@basedir, $package, 'lib'); $dirmap{'PERL_MODULE_LIB_DIR'} = File::Spec->catdir(@basedir, $package, 'lib'); $dirmap{'KOHA_CONF_DIR'} = File::Spec->catdir(@basedir, $package, 'etc'); @@ -1497,7 +1497,7 @@ sub get_target_directories { $skipdirs{'OPAC_TMPL_DIR'} = 1; $dirmap{'OPAC_WWW_DIR'} = File::Spec->catdir($curdir, 'koha-tmpl'); $skipdirs{'OPAC_WWW_DIR'} = 1; - $dirmap{'PUBLIC_WWW_DIR'} = File::Spec->catdir($curdir, 'public'); + $dirmap{'PUBLIC_WWW_DIR'} = File::Spec->catdir( $curdir, 'public' ); $skipdirs{'PUBLIC_WWW_DIR'} = 1; #NOTE: We're hacking the dirmap here, so that PERL_MODULE_DIR tokens get rewritten correctly for git installs $dirmap{'PERL_MODULE_DIR'} = File::Spec->catdir($curdir); @@ -1531,7 +1531,7 @@ sub get_target_directories { $dirmap{'OPAC_CGI_DIR'} = File::Spec->catdir(@basedir, $package, 'opac', 'cgi-bin'); $dirmap{'OPAC_TMPL_DIR'} = File::Spec->catdir(@basedir, $package, 'opac', 'htdocs', 'opac-tmpl'); $dirmap{'OPAC_WWW_DIR'} = File::Spec->catdir(@basedir, $package, 'opac', 'htdocs'); - $dirmap{'PUBLIC_WWW_DIR'} = File::Spec->catdir(@basedir, $package, 'public'); + $dirmap{'PUBLIC_WWW_DIR'} = File::Spec->catdir( @basedir, $package, 'public' ); $dirmap{'PERL_MODULE_DIR'} = File::Spec->catdir(@basedir, $package, 'lib'); $dirmap{'PERL_MODULE_LIB_DIR'} = File::Spec->catdir(@basedir, $package, 'lib'); $dirmap{'KOHA_CONF_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'etc', $package); --- a/rewrite-config.PL +++ a/rewrite-config.PL @@ -118,7 +118,7 @@ my %configuration = ( '__OPAC_CGI_DIR__' => "$prefix/opac/cgi-bin", '__OPAC_TMPL_DIR__' => "$prefix/opac/templates", '__OPAC_WWW_DIR__' => "$prefix/opac/www", - '__PUBLIC_WWW_DIR__' => "$prefix/public", +'__PUBLIC_WWW_DIR__' => "$prefix/public", '__PERL_MODULE_DIR__' => ($ENV{'INSTALLSITELIB'} || sprintf($prefix."/lib/perl5/site_perl/%vd",$^V))."/koha", '__KOHA_CONF_DIR__' => "$prefix/etc/koha", '__ZEBRA_CONF_DIR__' => "$prefix/etc/koha/zebradb", --