# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Current maintainer MJR http://mjr.towers.org.uk/
-# See http://www.koha.org/wiki/?page=KohaInstaller
#
use strict;
use POSIX;
use File::Spec;
use Getopt::Long;
+use FindBin; # we need to enforce which C4::Installer::PerlModule is used in case more than one is installed
+
+use lib $FindBin::Bin;
+
+use C4::Installer;
+
+my $koha_pm = C4::Installer::PerlModules->new;
my $DEBUG = 0;
-die "perl 5.6.1 or later required" unless ($] >= 5.006001);
+die "perl 5.8.8 or later required" unless ($] >= 5.008008);
# Hash up directory structure & files beginning with the directory we were called from (should be the base of koha)...
sudo make install
=head2 UPGRADE INSTALLATION
-
+
NOTE: This option is only available if koha-install-log exists.
perl Makefile.PL --prev-install-log /path/to/koha-install-log
=item If a subdirectory of a mapped directory is specified,
its target overrides the parent's target for that subdirectory.
-=item The value of each map entry may either be a scalar containing
+=item The value of each map entry may either be a scalar containing
one target or a reference to a hash containing 'target' and 'trimdir'
keys.
=over 4
-=item INTRANET_CGI_DIR
+=item INTRANET_CGI_DIR
CGI scripts for intranet (staff) interface.
=item DOC_DIR
-Directory for Koha documentation accessed from the
+Directory for Koha documentation accessed from the
command-line, e.g., READMEs.
=item LOG_DIR
'./acqui' => 'INTRANET_CGI_DIR',
'./admin' => 'INTRANET_CGI_DIR',
'./authorities' => 'INTRANET_CGI_DIR',
+ './basket' => 'INTRANET_CGI_DIR',
'./C4' => 'PERL_MODULE_DIR',
'./C4/SIP/t' => 'NONE',
'./C4/SIP/koha_test' => 'NONE',
'./changelanguage.pl' => 'INTRANET_CGI_DIR',
'./check_sysprefs.pl' => 'NONE',
'./circ' => 'INTRANET_CGI_DIR',
+ './offline_circ' => 'INTRANET_CGI_DIR',
'./edithelp.pl' => 'INTRANET_CGI_DIR',
'./etc' => { target => 'KOHA_CONF_DIR', trimdir => -1 },
'./etc/zebradb' => { target => 'ZEBRA_CONF_DIR', trimdir => -1 },
'./etc/pazpar2' => { target => 'PAZPAR2_CONF_DIR', trimdir => -1 },
- './help.pl' => 'INTRANET_CGI_DIR',
+ './help.pl' => 'INTRANET_CGI_DIR',
'./installer-CPAN.pl' => 'NONE',
'./installer' => 'INTRANET_CGI_DIR',
'./errors' => {target => 'INTRANET_CGI_DIR'},
'./Makefile.PL' => 'NONE',
'./MANIFEST.SKIP' => 'NONE',
'./members' => 'INTRANET_CGI_DIR',
- './misc' => { target => 'SCRIPT_NONDEV_DIR', trimdir => -1 },
- './misc/bin' => { target => 'SCRIPT_DIR', trimdir => -1 },
+ './misc' => { target => 'SCRIPT_NONDEV_DIR', trimdir => -1 },
+ './misc/bin' => { target => 'SCRIPT_DIR', trimdir => -1 },
'./misc/release_notes' => { target => 'DOC_DIR', trimdir => 2 },
- './misc/translator' => { target => 'MISC_DIR', trimdir => 2 },
+ './misc/translator' => { target => 'MISC_DIR', trimdir => 2 },
'./misc/koha-install-log' => { target => 'MISC_DIR', trimdir => -1 },
'./misc/installer_devel_notes' => 'NONE',
'./opac' => 'OPAC_CGI_DIR',
'./README.txt' => 'NONE',
+ './patroncards' => 'INTRANET_CGI_DIR',
'./reports' => 'INTRANET_CGI_DIR',
'./reserve' => 'INTRANET_CGI_DIR',
'./reviews' => 'INTRANET_CGI_DIR',
'./rewrite-config.PL' => 'NONE',
'./reviews' => 'INTRANET_CGI_DIR',
- './rss' => 'MISC_DIR',
'./serials' => 'INTRANET_CGI_DIR',
'./skel' => 'NONE',
'./skel/var/log/koha' => { target => 'LOG_DIR', trimdir => -1 },
'./suggestion' => 'INTRANET_CGI_DIR',
'./svc' => 'INTRANET_CGI_DIR',
'./t' => 'NONE',
- './tmp' => 'NONE', # FIXME need to determine whether
+ './tags' => 'INTRANET_CGI_DIR',
+ './tmp' => 'NONE', # FIXME need to determine whether
# Koha generates any persistent temp files
# that should go in /var/tmp/koha
'./tools' => 'INTRANET_CGI_DIR',
Specifies whether installation will be FHS-compliant (default,
assumes user has root), put everything under
a single directory (for users installing on a web host
-that allows CGI scripts and a MySQL database but not root
+that allows CGI scripts and a MySQL database but not root
access), or development (for a developer who wants to run
Koha from a git clone with no fuss).
=item ZEBRA_LANGUAGE
-Specifies primary language of records that will be
+Specifies primary language of records that will be
indexed by Zebra.
=item ZEBRA_USER
my %config_defaults = (
'DB_TYPE' => 'mysql',
'DB_HOST' => 'localhost',
- 'DB_NAME' => 'koha',
+ 'DB_NAME' => 'koha',
'DB_USER' => 'kohaadmin',
'DB_PASS' => 'katikoan',
'INSTALL_ZEBRA' => 'yes',
'INSTALL_SRU' => 'yes',
'INSTALL_PAZPAR2' => 'no',
- 'AUTH_INDEX_MODE' => 'grs1',
+ 'AUTH_INDEX_MODE' => 'dom',
'ZEBRA_MARC_FORMAT' => 'marc21',
'ZEBRA_LANGUAGE' => 'en',
'ZEBRA_USER' => 'kohauser',
'PAZPAR2_PORT' => '11002',
'RUN_DATABASE_TESTS' => 'no',
'PATH_TO_ZEBRA' => '',
+ 'USE_MEMCACHED' => 'no',
+ 'MEMCACHED_SERVERS' => '127.0.0.1:11211',
+ 'MEMCACHED_NAMESPACE' => 'KOHA'
);
-# set some default configuratio options based on OS
+# set some default configuration options based on OS
# more conditions need to be added for other OS's
# this should probably also incorporate usage of Win32::GetOSName() and/or Win32::GetOSVersion()
# to allow for more granular decisions based on which Win32 platform
'ZEBRA_MARC_FORMAT' => { 'marc21' => 1, 'unimarc' => 1 }, # FIXME should generate from contents of distributation
'ZEBRA_LANGUAGE' => { 'en' => 1, 'fr' => 1 }, # FIXME should generate from contents of distribution
'RUN_DATABASE_TESTS' => { 'yes' => 1, 'no' => 1 },
+ 'USE_MEMCACHED' => { 'yes' => 1, 'no' => 1 },
);
# get settings from command-line
);
}
$config{'ZEBRA_AUTH_CFG'} = $config{'AUTH_INDEX_MODE'} eq 'dom' ? 'zebra-authorities-dom.cfg' : 'zebra-authorities.cfg';
- $config{'AUTH_RETRIEVAL_CFG'} =
+ $config{'AUTH_RETRIEVAL_CFG'} =
$config{'AUTH_INDEX_MODE'} eq 'dom' ? 'retrieval-info-auth-dom.xml' : 'retrieval-info-auth-grs1.xml';
}
ZEBRA_DATA_DIR => ['var', 'lib', 'zebradb'],
ZEBRA_RUN_DIR => ['var', 'run', 'zebradb'],
);
-
+
WriteMakefile(
NAME => 'koha',
#VERSION => strftime('2.9.%Y%m%d%H',gmtime),
VERSION_FROM => 'kohaversion.pl',
ABSTRACT => 'Award-winning integrated library system (ILS) and Web OPAC',
- AUTHOR => 'Koha Developers <koha-devel@nongnu.org>',
+ AUTHOR => 'Koha Contributors <http://koha-community.org/>',
NO_META => 1,
- PREREQ_PM => {
- # awaiting package maintainer's use of $VERSION
- #'Algorithm::CheckDigits' => 0.48,
- #'Algorithm::CheckDigits::M43_001' => 0.48,
- 'Biblio::EndnoteStyle' => 0.05,
- 'CGI' => 3.15,
- 'CGI::Carp' => 1.29,
- 'CGI::Session' => '4.10',
- 'Class::Factory::Util' => 1.6,
- 'Class::Accessor' => 0.30,
- 'DBD::mysql' => 4.004,
- 'DBI' => 1.53,
- 'Data::ICal' => 0.13,
- 'Data::Dumper' => 2.121,
- 'Date::Calc' => 5.4,
- 'Date::ICal' => 1.72,
- 'Date::Manip' => 5.44,
- 'Digest::MD5' => 2.36,
- 'File::Temp' => 0.16,
- 'GD::Barcode::UPCE' => 1.1,
- 'Getopt::Long' => 2.35,
- 'Getopt::Std' => 1.05,
- 'HTML::Template::Pro' => 0.69,
- 'HTML::Scrubber' => 0.08,
- 'HTTP::Cookies' => 1.39,
- 'HTTP::Request::Common' => 1.26,
- 'Image::Magick' => 6.2,
- 'LWP::Simple' => 1.41,
- 'LWP::UserAgent' => 2.033,
- 'Lingua::Stem' => 0.82,
- 'List::Util' => 1.18,
- 'List::MoreUtils' => 0.21,
- 'Locale::Language' => 2.07,
- 'MARC::Charset' => 0.98,
- 'MARC::Crosswalk::DublinCore' => 0.02,
- 'MARC::File::XML' => 0.88,
- 'MARC::Record' => 2.00,
- 'MIME::Base64' => 3.07,
- 'MIME::QuotedPrint' => 3.07,
- 'Mail::Sendmail' => 0.79,
- 'Net::LDAP' => 0.33,
- 'Net::LDAP::Filter' => 0.14,
- 'Net::Z3950::ZOOM' => 1.16,
- 'PDF::API2' => 2.000,
- 'PDF::API2::Page' => 2.000,
- 'PDF::API2::Util' => 2.000,
- 'PDF::Reuse' => 0.33,
- 'PDF::Reuse::Barcode' => 0.05,
- 'POE' => 0.9999,
- 'POSIX' => 1.09,
- 'Schedule::At' => 1.06,
- 'SMS::Send' => 0.05,
- 'Term::ANSIColor' => 1.10,
- 'Test' => 1.25,
- 'Test::Harness' => 2.56,
- 'Test::More' => 0.62,
- 'Text::CSV' => 0.01,
- 'Text::CSV_XS' => 0.32,
- 'Text::Iconv' => 1.7,
- 'Text::Wrap' => 2005.082401,
- 'Time::HiRes' => 1.86,
- 'Time::localtime' => 1.02,
- 'Unicode::Normalize' => 0.32,
- 'XML::Dumper' => 0.81,
- 'XML::LibXML' => 1.59,
- 'XML::LibXSLT' => 1.59,
- 'XML::SAX::ParserFactory' => 1.01,
- 'XML::Simple' => 2.14,
- 'XML::RSS' => 1.31,
- 'YAML::Syck' => 0.71,
- },
+ PREREQ_PM => $koha_pm->prereq_pm,
# File tree mapping
PM => $file_map,
# Man pages generated from POD
- INSTALLMAN1DIR => File::Spec->catdir($target_directories->{'MAN_DIR'}, 'man1'),
- INSTALLMAN3DIR => File::Spec->catdir($target_directories->{'MAN_DIR'}, 'man3'),
+ # ExtUtils::MakeMaker already manage $(DESTDIR)
+ INSTALLMAN1DIR => File::Spec->catdir(_strip_destdir($target_directories->{'MAN_DIR'}), 'man1'),
+ INSTALLMAN3DIR => File::Spec->catdir(_strip_destdir($target_directories->{'MAN_DIR'}), 'man3'),
PL_FILES => $pl_files,
);
return $tree;
}
-=head2 get_file_map
+=head2 get_file_map
This function combines the target_map and file hash to
map each source file to its destination relative to
# spaces and shell metacharacters from all file names
$source =~ s/ /\\ /g;
$destination =~ s/ /\\ /g;
-
+
$file_map->{$source} = $destination unless (!$install_zebra and $targetdir =~ /ZEBRA/);
}
}
sub get_install_log_values {
my $install_log = shift;
my $values = shift;
-
+
open LOG, "<$install_log" or die "Cannot open install log $install_log: $!\n";
while (<LOG>) {
chomp;
standard: Install files in conformance with the Filesystem
Hierarchy Standard (FHS). This is the default mode
and should be used when installing a production
- Koha system. On Unix systems, root access is
+ Koha system. On Unix systems, root access is
needed to complete a standard installation.
single: Install files under a single directory. This option
Configuration directory:);
# FIXME - home directory portability consideration apply
- $install_base_default = (exists $ENV{'HOME'}) ? "$ENV{'HOME'}/koha-dev" : "$defaults->{'INSTALL_BASE'}-dev";
+ $install_base_default =
+ $ENV{DESTDIR}
+ || ( exists $ENV{HOME} ? "$ENV{HOME}/koha-dev" : "$defaults->{'INSTALL_BASE'}-dev" )
+ ;
} elsif ($config{'INSTALL_MODE'} eq 'single') {
$msg = "\nPlease specify the directory in which to install Koha";
# FIXME -- we're assuming under a 'single' mode install
# that user will likely want to install under the home
# directory. This is OK in and of itself, but we should
- # use File::HomeDir to locate the home directory portably.
+ # use File::HomeDir to locate the home directory portably.
# This is deferred for now because File::HomeDir is not yet
# core.
# --we must also keep this portable to the major OS's -fbcit
} else {
# must be standard
$msg = q(
-Please specify the directory under which most Koha files
+Please specify the directory under which most Koha files
will be installed.
-Note that if you are planning in installing more than
+Note that if you are planning in installing more than
one instance of Koha, you may want to modify the last
component of the directory path, which will be used
as the package name in the FHS layout.
Since you are using the 'standard' install
mode, you should run 'make install' as root.
However, it is recommended that a non-root
-user (on Unix and Linux platforms) have
+user (on Unix and Linux platforms) have
ownership of Koha's files, including the
Zebra indexes if applicable.
$config{'DB_TYPE'} = _get_value('DB_TYPE', $msg, $defaults->{'DB_TYPE'}, $valid_values, $install_log_values);
$msg = q(
-Please specify the name or address of your
-database server. Note that the database
+Please specify the name or address of your
+database server. Note that the database
does not have to exist at this point, it
can be created after running 'make install'
and before you try using Koha for the first time.
$config{'DB_USER'} = _get_value('DB_USER', $msg, $defaults->{'DB_USER'}, $valid_values, $install_log_values);
$msg = q(
-Please specify the password of the user that owns the
+Please specify the password of the user that owns the
database to be used by Koha);
$config{'DB_PASS'} = _get_value('DB_PASS', $msg, $defaults->{'DB_PASS'}, $valid_values, $install_log_values);
Koha can use the Zebra search engine for high-performance
searching of bibliographic and authority records. If you
have installed the Zebra software and would like to use it,
-please answer 'yes' to the following question. Otherwise,
+please answer 'yes' to the following question. Otherwise,
Koha will default to using its internal search engine.
Please note that if you choose *NOT* to install Zebra,
Primary language for Zebra indexing);
$msg .= _add_valid_values_disp('ZEBRA_LANGUAGE', $valid_values);
$config{'ZEBRA_LANGUAGE'} = _get_value('ZEBRA_LANGUAGE', $msg, $defaults->{'ZEBRA_LANGUAGE'}, $valid_values, $install_log_values);
-
+
$msg = q(
-Koha can use one of two different indexing modes
+Koha can use one of two different indexing modes
for the MARC authorities records:
-grs1 - uses the Zebra GRS-1 filter, available
+grs1 - uses the Zebra GRS-1 filter, available
for legacy support
dom - uses the DOM XML filter; offers improved
functionality.
Authorities indexing mode);
$msg .= _add_valid_values_disp('AUTH_INDEX_MODE', $valid_values);
$config{'AUTH_INDEX_MODE'} = _get_value('AUTH_INDEX_MODE', $msg, $defaults->{'AUTH_INDEX_MODE'}, $valid_values, $install_log_values);
-
+
$msg = q(
Please specify Zebra database user);
$config{'ZEBRA_USER'} = _get_value('ZEBRA_USER', $msg, $defaults->{'ZEBRA_USER'}, $valid_values, $install_log_values);
}
}
+ $msg = q(
+Use memcached and memoize to cache the results of some function calls?
+This provides a signficant performance improvement.
+You will need a Memcached server running.);
+ $msg .= _add_valid_values_disp('USE_MEMCACHED', $valid_values);
+ $config{'USE_MEMCACHED'} = _get_value('USE_MEMCACHED', $msg, $defaults->{'USE_MEMCACHED'}, $valid_values, $install_log_values);
+ if ($config{'USE_MEMCACHED'} eq 'yes'){
+ $msg = q(
+Since you've chosen to use caching, you must specify the memcached servers and the namespace to use:
+);
+ $msg = q(
+Memcached server address?);
+ $config{'MEMCACHED_SERVERS'} = _get_value('MEMCACHED_SERVERS', $msg, $defaults->{'MEMCACHED_SERVERS'}, $valid_values, $install_log_values);
+
+ $msg = q(
+Memcached namespace?);
+ $config{'MEMCACHED_NAMESPACE'} = _get_value('MEMCACHED_NAMESPACE', $msg, $defaults->{'MEMCACHED_NAMESPACE'}, $valid_values, $install_log_values);
+ }
+
+
$msg = q(
Would you like to run the database-dependent test suite?);
Please specify the name of the test database to be
used by Koha);
-
+
$config{'TEST_DB_NAME'} = _get_value('TEST_DB_NAME', $msg, $defaults->{'TEST_DB_NAME'}, $valid_values, $install_log_values);
while ( $config{'TEST_DB_NAME'} eq $config{'DB_NAME'} ) {
$msg = q(Please do not use the same database for testing as you do for production. You run the severe risk of data loss.);
Please specify the user that owns the database to be
used by Koha);
$config{'TEST_DB_USER'} = _get_value('TEST_DB_USER', $msg, $defaults->{'TEST_DB_USER'}, $valid_values, $install_log_values);
-
+
$msg = q(
-Please specify the password of the user that owns the
+Please specify the password of the user that owns the
database to be used by Koha);
$config{'TEST_DB_PASS'} = _get_value('TEST_DB_PASS', $msg, $defaults->{'TEST_DB_PASS'}, $valid_values, $install_log_values);
}
sub _add_valid_values_disp {
my $key = shift;
my $valid_values = shift;
-
+
my $disp = "";
if (exists $valid_values->{$key}) {
$disp = " (" . join(", ", sort keys %{ $valid_values->{$key} }) . ")";
# take value from install log if present
if (exists $install_log_values{$key}) {
+ $install_log_values{$key} =~ s/\$/\$\$/g;
return $install_log_values{$key};
}
my $val = prompt($msg, $default);
- while (exists $valid_values->{$key} and
+ while (exists $valid_values->{$key} and
$val ne $default and
not exists $valid_values->{$key}->{$val}) {
my $retry_msg = "Value '$val' is not a valid option.\n";
$retry_msg .= _add_valid_values_disp($key, $valid_values);
$val = prompt($retry_msg, $default);
}
+ $val =~ s/\$/\$\$/g;
return $val;
}
-=head2 get_target_directories
+=head2 get_target_directories
Creates a hash mapping from symbols for installation target
directories to actual directory paths.
-Also returns a hash indicating targets for which
+Also returns a hash indicating targets for which
files need not be copied -- this is used for the 'dev'
mode installation, where some files are installed in place.
_get_env_overrides(\%dirmap);
_get_argv_overrides(\%dirmap);
+ _add_destdir(\%dirmap) unless ($^O eq 'MSWin32');
return \%dirmap, \%skipdirs;
}
-=head2 get_test_dir
+=head2 get_test_dir
Map a directory target to the corresponding path for
the test suite.
sub get_test_dir {
my ($dirname) = @_;
-
- my @basedir = (File::Spec->rel2abs(File::Spec->curdir()), 't', 'run');
+
+ my @basedir = (File::Spec->rel2abs(File::Spec->curdir()), 't', 'run');
if (exists $test_suite_override_dirs{$dirname}) {
return File::Spec->catdir(@basedir, @{ $test_suite_override_dirs{$dirname} });
} else {
return;
}
-
+
}
sub _get_env_overrides {
sub _get_argv_overrides {
my $dirmap = shift;
-
+
my @new_argv = ();
for (my $i = 0; $i <= $#ARGV; $i++) {
if ($ARGV[$i] =~ /^([^=]+)=([^=]+)$/ and exists $dirmap->{$1}) {
@ARGV = @new_argv;
}
+sub _strip_destdir {
+ my $dir = shift;
+ $dir =~ s/^\$\(DESTDIR\)//;
+ return $dir;
+}
+
+sub _add_destdir {
+ my $dirmap = shift;
+
+ foreach my $key (keys %$dirmap) {
+ $dirmap->{$key} = '$(DESTDIR)'.$dirmap->{$key};
+ }
+}
+
sub display_configuration {
my $config = shift;
my $dirmap = shift;
my $test = $self->SUPER::test(@_);
$test =~ s!\$\(INST_LIB\)!blib/PERL_MODULE_DIR!g;
- # set KOHA_CONF
+ # set KOHA_CONF
$test =~ s!\$\(FULLPERLRUN\)!KOHA_CONF=blib/KOHA_CONF_DIR/koha-conf.xml \$(FULLPERLRUN)!g;
return $test;
}
sub install {
my $self = shift;
- my $install = "";
+ my $install = "";
# NOTE: we're *not* doing this: my $install = $self->SUPER::install(@_);
# This means that we're completely overriding EU::MM's default
# installation and uninstallation targets.
# If installation is on Win32, we need to do permissions different from *nix
- if ( $^O =~ /darwin|linux|cygwin|freebsd/ ) { # this value needs to be verified for each platform and modified accordingly
+ if ( $^O =~ /darwin|linux|cygwin|freebsd|solaris/ ) { # this value needs to be verified for each platform and modified accordingly
foreach my $key (sort keys %$target_directories) {
$install .= qq(
KOHA_INST_$key = blib/$key
install :: all install_koha set_koha_ownership set_koha_permissions warn_koha_env_vars
\t\$(NOECHO) \$(NOOP)
);
- $install .= "install_koha ::\n";
+ $install .= "install_koha ::\n";
$install .= "\t\$(NOECHO) umask 022; \$(MOD_INSTALL) \\\n";
foreach my $key (sort keys %$target_directories) {
- $install .= "\t\t\$(KOHA_INST_$key) \$(KOHA_DEST_$key) \\\n"
+ $install .= "\t\t\$(KOHA_INST_$key) \$(KOHA_DEST_$key) \\\n"
unless ($config{'INSTALL_ZEBRA'} ne "yes" and $key =~ /ZEBRA/) or exists $skip_directories->{$key};
}
$install .= "\t\t\$(INST_MAN1DIR) \$(DESTINSTALLMAN1DIR) \\\n";
$install .= "\n";
$install .= "set_koha_ownership ::\n";
+# Do not try to change ownership if DESTDIR is set
if ($config{'INSTALL_MODE'} eq 'standard' and $config{'KOHA_USER'} ne "root") {
foreach my $key (sort keys %$target_directories) {
- $install .= "\t\$(NOECHO) chown -R $config{'KOHA_USER'}:$config{'KOHA_GROUP'} \$(KOHA_DEST_$key)\n"
+ $install .= "\t\$(NOECHO) if test -z \"\$(DESTDIR)\"; then chown -R $config{'KOHA_USER'}:$config{'KOHA_GROUP'} \$(KOHA_DEST_$key); fi\n"
unless ($config{'INSTALL_ZEBRA'} ne "yes" and $key =~ /ZEBRA/) or exists $skip_directories->{$key};
}
} else {
$install .= "install_koha ::\n";
$install .= "\t\$(MOD_INSTALL) \\\n";
foreach my $key (sort keys %$target_directories) {
- $install .= "\t\t\$(KOHA_INST_$key) \$(KOHA_DEST_$key) \\\n"
+ $install .= "\t\t\$(KOHA_INST_$key) \$(KOHA_DEST_$key) \\\n"
unless ($config{'INSTALL_ZEBRA'} ne "yes" and $key =~ /ZEBRA/) or exists $skip_directories->{$key};
}
}
}
sub upgrade {
- my $upgrade = "";
+ my $upgrade = "";
my $backup_suffix;
if (exists $install_log_values{'KOHA_INSTALLED_VERSION'}) {
/;
foreach my $key (qw/KOHA_CONF_DIR INTRANET_TMPL_DIR INTRANET_WWW_DIR OPAC_TMPL_DIR OPAC_WWW_DIR
PAZPAR2_CONF_DIR ZEBRA_CONF_DIR/) {
- $upgrade .= "\t\t\$(KOHA_INST_$key) \$(KOHA_DEST_$key) \\\n"
+ $upgrade .= "\t\t\$(KOHA_INST_$key) \$(KOHA_DEST_$key) \\\n"
unless ($config{'INSTALL_ZEBRA'} ne "yes" and $key =~ /ZEBRA/) or
exists $skip_directories->{$key} or
not exists $target_directories->{$key};
# variables -- this is for the use of
# rewrite-confg.PL
- # quote '$' in the two password parameters
- my %config = %config;
- $config{'DB_PASS'} =~ s/\$/\$\$/g;
- if ($config{'INSTALL_ZEBRA'} eq "yes") {
- $config{'ZEBRA_PASS'} =~ s/\$/\$\$/g;
- }
-
my $env;
# Hereagain, we must alter syntax per platform...
if ( $^O eq 'MSWin32' ) {
# NOTE: it is imperative that there be no whitespaces in ENV=value...
- $env = join("\n", map { "__${_}__=$target_directories->{$_}" } keys %$target_directories);
+ $env = join("\n", map { "__${_}__=$target_directories->{$_}" } keys %$target_directories);
$env .= "\n\n";
$env .= join("\n", map { "__${_}__=$config{$_}" } keys %config);
}
else {
- $env = join("\n", map { "export __${_}__ := $target_directories->{$_}" } keys %$target_directories);
+ $env = join("\n", map { "export __${_}__ := $target_directories->{$_}" } keys %$target_directories);
$env .= "\n\n";
$env .= join("\n", map { "export __${_}__ := $config{$_}" } keys %config);
}
-
+
if ( $config{'RUN_DATABASE_TESTS'} eq 'yes' ) {
if ( open( my $confhandle, '>', 't/test-config.txt' ) ) {
print $confhandle "# This configuration file lets the t/Makefile prepare a test koha-conf.xml file.\n";
# these directories will be relocated to the 't' directory
foreach my $dirname ( keys %$target_directories ) {
- my $dir = $target_directories->{$dirname};
+ my $dir = main::_strip_destdir( $target_directories->{$dirname} );
if ( exists $test_suite_override_dirs{$dirname} ) {
$dir = main::get_test_dir($dirname);
}
} else {
warn 'unable to open conf file for database dependent tests: $!';
}
-
+
}
return "$env\n";
}
Galen Charlton galen.charlton at liblime.com
=cut
+
FIXME: deal with .htaccess