# 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.10 or later required" unless ($] >= 5.010000);
# 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 ZEBRA_LOCK_DIR
-Directory for Zebra's lock files.
+Directory for Zebra's lock files. This includes subdirs for authorities,
+biblios, and the zebra rebuild function. Any activity to reindex
+zebra from koha should interlock here with rebuild_zebra.pl.
=item ZEBRA_DATA_DIR
=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
Directory for Apache and Zebra logs produced by Koha.
+=item BACKUP_DIR
+
+Directory for backup files produced by Koha.
+
+=item PLUGINS_DIR
+
+Directory for external Koha plugins.
+
=item PAZPAR2_CONF_DIR
Directory for PazPar2 configuration files.
'./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',
+ './course_reserves' => 'INTRANET_CGI_DIR',
+ './docs/history.txt' => { target => 'DOC_DIR', trimdir => -1 },
'./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'},
+ './Koha' => 'PERL_MODULE_DIR',
'./koha-tmpl/intranet-tmpl' => {target => 'INTRANET_TMPL_DIR', trimdir => -1},
'./koha-tmpl/opac-tmpl' => {target => 'OPAC_TMPL_DIR', trimdir => -1},
'./kohaversion.pl' => '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',
+ './OpenILS' => 'PERL_MODULE_DIR',
'./README.txt' => 'NONE',
+ './patroncards' => 'INTRANET_CGI_DIR',
+ './patron_lists' => 'INTRANET_CGI_DIR',
+ './plugins' => 'INTRANET_CGI_DIR',
'./reports' => 'INTRANET_CGI_DIR',
'./reserve' => 'INTRANET_CGI_DIR',
'./reviews' => 'INTRANET_CGI_DIR',
'./rewrite-config.PL' => 'NONE',
'./reviews' => 'INTRANET_CGI_DIR',
'./serials' => 'INTRANET_CGI_DIR',
+ './services' => 'INTRANET_CGI_DIR',
'./skel' => 'NONE',
'./skel/var/log/koha' => { target => 'LOG_DIR', trimdir => -1 },
+ './skel/var/spool/koha' => { target => 'BACKUP_DIR', trimdir => -1 },
'./skel/var/run/koha/zebradb' => { target => 'ZEBRA_RUN_DIR', trimdir => -1 },
'./skel/var/lock/koha/zebradb/authorities' => { target => 'ZEBRA_LOCK_DIR', trimdir => 6 },
'./skel/var/lib/koha/zebradb/authorities/key' => { target => 'ZEBRA_DATA_DIR', trimdir => 6 },
'./skel/var/lib/koha/zebradb/biblios/register' => { target => 'ZEBRA_DATA_DIR', trimdir => 6 },
'./skel/var/lib/koha/zebradb/biblios/shadow' => { target => 'ZEBRA_DATA_DIR', trimdir => 6 },
'./skel/var/lib/koha/zebradb/biblios/tmp' => { target => 'ZEBRA_DATA_DIR', trimdir => 6 },
+ './skel/var/lock/koha/zebradb/rebuild' => { target => 'ZEBRA_LOCK_DIR', trimdir => 6 },
+ './skel/var/lib/koha/plugins' => { target => 'PLUGINS_DIR', trimdir => 6 },
'./sms' => 'INTRANET_CGI_DIR',
'./suggestion' => 'INTRANET_CGI_DIR',
'./svc' => 'INTRANET_CGI_DIR',
'./t' => 'NONE',
'./tags' => 'INTRANET_CGI_DIR',
- './tmp' => 'NONE', # FIXME need to determine whether
+ './tmp' => 'NONE', # FIXME need to determine whether
# Koha generates any persistent temp files
# that should go in /var/tmp/koha
'./tools' => 'INTRANET_CGI_DIR',
'./virtualshelves' => 'INTRANET_CGI_DIR',
+ './xml_sax.pl' => 'PERL_MODULE_DIR',
# ignore files and directories created by the install itself
'./pm_to_blib' => 'NONE',
'./blib' => 'NONE',
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).
Pasword of DMBS user account for Koha's database.
-=item INSTALL_ZEBRA
-
-Whether to install Zebra configuration files and data
-directories.
-
=item ZEBRA_MARC_FORMAT
Specifies format of MARC records to be indexed by Zebra.
=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',
+ 'BIB_INDEX_MODE' => 'dom',
'ZEBRA_MARC_FORMAT' => 'marc21',
'ZEBRA_LANGUAGE' => 'en',
+ 'ZEBRA_TOKENIZER' => 'chr',
'ZEBRA_USER' => 'kohauser',
'ZEBRA_PASS' => 'zebrastripes',
'ZEBRA_SRU_HOST' => 'localhost',
my %valid_config_values = (
'INSTALL_MODE' => { 'standard' => 1, 'single' => 1, 'dev' => 1 },
'DB_TYPE' => { 'mysql' => 1, 'Pg' => 1 },
- 'INSTALL_ZEBRA' => { 'yes' => 1, 'no' => 1 },
'INSTALL_SRU' => { 'yes' => 1, 'no' => 1 },
'AUTH_INDEX_MODE' => { 'grs1' => 1, 'dom' => 1 },
- '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
+ 'BIB_INDEX_MODE' => { 'grs1' => 1, 'dom' => 1 },
+ 'ZEBRA_MARC_FORMAT' => { 'marc21' => 1, 'normarc' => 1, 'unimarc' => 1 }, # FIXME should generate from contents of distributation
+ 'ZEBRA_LANGUAGE' => { 'en' => 1, 'es' => 1, 'fr' => 1, 'nb' => 1, 'ru' => 1, 'uk' => 1 }, # FIXME should generate from contents of distribution
+ 'ZEBRA_TOKENIZER' => { chr => 1, icu => 1 },
'RUN_DATABASE_TESTS' => { 'yes' => 1, 'no' => 1 },
'USE_MEMCACHED' => { 'yes' => 1, 'no' => 1 },
);
my ($target_directories, $skip_directories) = get_target_directories(\%config);
display_configuration(\%config, $target_directories);
my $file_map = {};
-get_file_map($target_map, $dirtree, $file_map, $config{'INSTALL_ZEBRA'} eq "yes" ? 1: 0);
+get_file_map($target_map, $dirtree, $file_map);
my $pl_files = {
'rewrite-config.PL' => [
'blib/KOHA_CONF_DIR/koha-conf.xml',
'blib/KOHA_CONF_DIR/koha-httpd.conf',
+ 'blib/ZEBRA_CONF_DIR/etc/default.idx',
'blib/MISC_DIR/koha-install-log'
],
'fix-perl-path.PL' => [ # this script ensures the correct shebang line for the platform installed on...
'blib'
- ]
+ ],
};
-if ($config{'INSTALL_ZEBRA'} eq "yes") {
- push @{ $pl_files->{'rewrite-config.PL'} }, (
- 'blib/ZEBRA_CONF_DIR/etc/passwd',
- 'blib/ZEBRA_CONF_DIR/zebra-biblios.cfg',
- 'blib/ZEBRA_CONF_DIR/zebra-authorities.cfg',
- 'blib/ZEBRA_CONF_DIR/zebra-authorities-dom.cfg',
- 'blib/ZEBRA_CONF_DIR/explain-authorities.xml',
- 'blib/ZEBRA_CONF_DIR/explain-biblios.xml',
- 'blib/ZEBRA_CONF_DIR/retrieval-info-auth-grs1.xml',
- 'blib/ZEBRA_CONF_DIR/retrieval-info-auth-dom.xml',
- );
+push @{ $pl_files->{'rewrite-config.PL'} }, (
+ 'blib/ZEBRA_CONF_DIR/etc/passwd',
+ 'blib/ZEBRA_CONF_DIR/zebra-biblios.cfg',
+ 'blib/ZEBRA_CONF_DIR/zebra-biblios-dom.cfg',
+ 'blib/ZEBRA_CONF_DIR/zebra-authorities.cfg',
+ 'blib/ZEBRA_CONF_DIR/zebra-authorities-dom.cfg',
+ 'blib/ZEBRA_CONF_DIR/explain-authorities.xml',
+ 'blib/ZEBRA_CONF_DIR/explain-biblios.xml',
+ 'blib/ZEBRA_CONF_DIR/retrieval-info-auth-grs1.xml',
+ 'blib/ZEBRA_CONF_DIR/retrieval-info-auth-dom.xml',
+ 'blib/ZEBRA_CONF_DIR/retrieval-info-bib-grs1.xml',
+ 'blib/ZEBRA_CONF_DIR/retrieval-info-bib-dom.xml',
+);
+push @{ $pl_files->{'rewrite-config.PL'} }, (
+ 'blib/SCRIPT_DIR/koha-zebra-ctl.sh',
+ 'blib/SCRIPT_DIR/koha-pazpar2-ctl.sh',
+ 'blib/SCRIPT_DIR/koha-index-daemon-ctl.sh',
+);
+if ($config{'INSTALL_PAZPAR2'} eq 'yes') {
push @{ $pl_files->{'rewrite-config.PL'} }, (
- 'blib/SCRIPT_DIR/koha-zebra-ctl.sh',
- 'blib/SCRIPT_DIR/koha-pazpar2-ctl.sh',
- 'blib/SCRIPT_DIR/koha-zebraqueue-ctl.sh',
+ 'blib/PAZPAR2_CONF_DIR/koha-biblios.xml',
+ 'blib/PAZPAR2_CONF_DIR/pazpar2.xml'
);
- if ($config{'INSTALL_PAZPAR2'} eq 'yes') {
- push @{ $pl_files->{'rewrite-config.PL'} }, (
- 'blib/PAZPAR2_CONF_DIR/koha-biblios.xml',
- 'blib/PAZPAR2_CONF_DIR/pazpar2.xml'
- );
- }
- $config{'ZEBRA_AUTH_CFG'} = $config{'AUTH_INDEX_MODE'} eq 'dom' ? 'zebra-authorities-dom.cfg' : 'zebra-authorities.cfg';
- $config{'AUTH_RETRIEVAL_CFG'} =
- $config{'AUTH_INDEX_MODE'} eq 'dom' ? 'retrieval-info-auth-dom.xml' : 'retrieval-info-auth-grs1.xml';
}
+$config{'ZEBRA_AUTH_CFG'} = $config{'AUTH_INDEX_MODE'} eq 'dom'
+ ? 'zebra-authorities-dom.cfg'
+ : 'zebra-authorities.cfg';
+$config{'ZEBRA_BIB_CFG'} = $config{'BIB_INDEX_MODE'} eq 'dom'
+ ? 'zebra-biblios-dom.cfg'
+ : 'zebra-biblios.cfg';
+$config{'AUTH_RETRIEVAL_CFG'} = $config{'AUTH_INDEX_MODE'} eq 'dom'
+ ? 'retrieval-info-auth-dom.xml'
+ : 'retrieval-info-auth-grs1.xml';
+$config{'BIB_RETRIEVAL_CFG'} = $config{'BIB_INDEX_MODE'} eq 'dom'
+ ? 'retrieval-info-bib-dom.xml'
+ : 'retrieval-info-bib-grs1.xml';
+
if ($config{'INSTALL_MODE'} ne "dev") {
push @{ $pl_files->{'rewrite-config.PL'} }, (
);
}
+$config{ZEBRA_TOKENIZER_STMT} = $config{ZEBRA_TOKENIZER} eq 'icu'
+ ? 'icuchain words-icu.xml'
+ : 'charmap word-phrase-utf.chr';
+
+$config{ZEBRA_PTOKENIZER_STMT} = $config{ZEBRA_TOKENIZER} eq 'icu'
+ ? 'icuchain phrases-icu.xml'
+ : 'charmap word-phrase-utf.chr';
+
my %test_suite_override_dirs = (
KOHA_CONF_DIR => ['etc'],
ZEBRA_CONF_DIR => ['etc', 'zebradb'],
LOG_DIR => ['var', 'log'],
+ BACKUP_DIR => ['var', 'spool'],
SCRIPT_DIR => ['bin'],
ZEBRA_LOCK_DIR => ['var', 'lock', 'zebradb'],
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 => {
- 'Algorithm::CheckDigits' => 0.50,
- 'Biblio::EndnoteStyle' => 0.05,
- 'CGI' => 3.15,
- 'CGI::Carp' => 1.29,
- 'CGI::Session' => 4.20,
- 'CGI::Session::Serialize::yaml' => 4.20,
- 'Class::Factory::Util' => 1.6,
- 'Class::Accessor' => 0.30,
- 'DBD::mysql' => 4.004,
- 'DBD::SQLite2' => 0.33, # optional, used for offline circulation
- 'DBI' => 1.53,
- 'Data::Dumper' => 2.121,
- 'Data::ICal' => 0.13,
- 'Date::Calc' => 5.4,
- 'Date::ICal' => 1.72,
- 'Date::Manip' => 5.44,
- 'Digest::MD5' => 2.36,
- 'Digest::SHA' => 5.43,
- 'Email::Date' => 1.103,
- 'File::Temp' => 0.16,
- 'GD' => 2.39, #optional
- '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::OAI' => 3.20,
- 'HTTP::Request::Common' => 1.26,
- 'IPC::Cmd' => 0.46,
- 'JSON' => 2.07, # Needed by admin/item_circulation_alerts.pl
- '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::Lite' => 3.00,
- 'MIME::QuotedPrint' => 3.07,
- 'Mail::Sendmail' => 0.79,
- 'Memoize::Memcached' => 0.03, # optional
- 'Net::LDAP' => 0.33, # optional
- 'Net::LDAP::Filter' => 0.14, # optional
- '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,
- 'Storable' => 2.21,
- 'SMS::Send' => 0.05, # optional
- 'Term::ANSIColor' => 1.10,
- 'Test' => 1.25,
- 'Test::Harness' => 2.56,
- 'Test::More' => 0.80,
- '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,
- 'URI::Escape' => 1.36,
- 'XML::Dumper' => 0.81,
- 'XML::LibXML' => 1.59,
- 'XML::LibXSLT' => 1.59,
- 'XML::SAX::ParserFactory' => 1.01,
- 'XML::SAX::Writer' => 0.44,
- 'XML::Simple' => 2.14,
- 'XML::RSS' => 1.31,
- 'YAML::Syck' => 0.71,
- },
+ PREREQ_PM => $koha_pm->prereq_pm,
# File tree mapping
PM => $file_map,
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
my $target_map = shift;
my $dirtree = shift;
my $file_map = shift;
- my $install_zebra = shift;
my $curr_path = @_ ? shift : ['.'];
# Traverse the directory tree.
}
}
if (defined $targetdir) {
- _add_to_file_map($file_map, $targetdir, $curr_path, $file, $matchlevel, $install_zebra);
+ _add_to_file_map($file_map, $targetdir, $curr_path, $file, $matchlevel);
} else {
my $path = join("/", @$curr_path);
print "failed to map: $path/$file\n" if $DEBUG;
} else {
# dealing with subdirectory
push @$curr_path, $dir;
- get_file_map($target_map, $dirtree->{$dir}, $file_map, $install_zebra, $curr_path);
+ get_file_map($target_map, $dirtree->{$dir}, $file_map, $curr_path);
pop @$curr_path;
}
}
my $curr_path = shift;
my $file = shift;
my $matchlevel = shift;
- my $install_zebra = shift;
my $dest_path = @_ ? shift : $curr_path;
# The target can be one of the following:
} else {
splice @new_dest_path, 0, $targetdir->{trimdir};
}
- _add_to_file_map($file_map, $subtarget, $curr_path, $file, $matchlevel, $install_zebra, \@new_dest_path);
+ _add_to_file_map($file_map, $subtarget, $curr_path, $file, $matchlevel, \@new_dest_path);
} else {
# actually getting here means that the
# target was unnecessarily listed
# as a hash, but we'll forgive that
- _add_to_file_map($file_map, $subtarget, $curr_path, $file, $matchlevel, $install_zebra);
+ _add_to_file_map($file_map, $subtarget, $curr_path, $file, $matchlevel);
}
} elsif ($targetdir ne 'NONE' and $targetdir ne '') {
my $source = File::Spec->catfile(@$curr_path, $file);
# spaces and shell metacharacters from all file names
$source =~ s/ /\\ /g;
$destination =~ s/ /\\ /g;
-
- $file_map->{$source} = $destination unless (!$install_zebra and $targetdir =~ /ZEBRA/);
+
+ $file_map->{$source} = $destination;
}
}
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 =
+ $install_base_default =
$ENV{DESTDIR}
- || ( exists $ENV{HOME} ? "$ENV{HOME}/koha-dev" : "$defaults->{'INSTALL_BASE'}-dev" )
+ || ( 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);
- $msg = q(
-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,
-Koha will default to using its internal search engine.
-
-Please note that if you choose *NOT* to install Zebra,
-koha-conf.xml will still contain some references to Zebra
-settings. Those references will be ignored by Koha.
-
-Install the Zebra configuration files?);
- $msg .= _add_valid_values_disp('INSTALL_ZEBRA', $valid_values);
- $config{'INSTALL_ZEBRA'} = _get_value('INSTALL_ZEBRA', $msg, $defaults->{'INSTALL_ZEBRA'}, $valid_values, $install_log_values);
-
- if ($config{'INSTALL_ZEBRA'} eq 'yes') {
+ print q(
+Koha uses the Zebra search engine for high-performance
+searching of bibliographic and authority records. Checking
+to see if you have installed the Zebra software...
+);
- if (defined(my $zebra_path = find_zebra())) {
- $config{'PATH_TO_ZEBRA'} = $zebra_path;
- print qq(
+ if (defined(my $zebra_path = find_zebra())) {
+ $config{'PATH_TO_ZEBRA'} = $zebra_path;
+ print qq(
Found 'zebrasrv' and 'zebraidx' in $zebra_path.
);
- } else {
- print q(
+ } else {
+ print q(
Unable to find the Zebra programs 'zebrasrv' and 'zebraidx'
in your PATH or in some of the usual places. If you haven't
installed Zebra yet, please do so and run Makefile.PL again.
);
- }
+ }
- $msg = q(
-Since you've chosen to use Zebra with Koha,
-you must specify the primary MARC format of the
+ $msg = q(
+You must specify the primary MARC format of the
records to be indexed by Zebra.
-Koha provides Zebra configuration files for MARC 21
-and UNIMARC.
+Koha provides Zebra configuration files for MARC21,
+NORMARC and UNIMARC.
MARC format for Zebra indexing);
- $msg .= _add_valid_values_disp('ZEBRA_MARC_FORMAT', $valid_values);
- $config{'ZEBRA_MARC_FORMAT'} = _get_value('ZEBRA_MARC_FORMAT', $msg, $defaults->{'ZEBRA_MARC_FORMAT'}, $valid_values, $install_log_values);
- $msg = q(
+ $msg .= _add_valid_values_disp('ZEBRA_MARC_FORMAT', $valid_values);
+ $config{'ZEBRA_MARC_FORMAT'} = _get_value('ZEBRA_MARC_FORMAT', $msg, $defaults->{'ZEBRA_MARC_FORMAT'}, $valid_values, $install_log_values);
+ $msg = q(
Koha supplies Zebra configuration files tuned for
searching either English (en) or French (fr) MARC
records.
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
+ $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
+for the MARC bibliographic records:
+
+grs1 - uses the Zebra GRS-1 filter, available
+ for legacy support
+dom - uses the DOM XML filter; offers improved
+ functionality.
+
+Bibliographic indexing mode);
+ $msg .= _add_valid_values_disp('BIB_INDEX_MODE', $valid_values);
+ $config{'BIB_INDEX_MODE'} = _get_value('BIB_INDEX_MODE', $msg, $defaults->{'BIB_INDEX_MODE'}, $valid_values, $install_log_values);
+
+
+ $msg = q(
+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(
+ $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(
+Zebra has two methods to perform records tokenization
+and characters normalization: CHR and ICU. ICU is
+recommended for catalogs containing non-Latin
+characters.);
+
+ $msg .= _add_valid_values_disp('ZEBRA_TOKENIZER', $valid_values);
+ $config{'ZEBRA_TOKENIZER'} = _get_value('ZEBRA_TOKENIZER', $msg, $defaults->{'ZEBRA_TOKENIZER'}, $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);
+ $config{'ZEBRA_USER'} = _get_value('ZEBRA_USER', $msg, $defaults->{'ZEBRA_USER'}, $valid_values, $install_log_values);
- $msg = q(
+ $msg = q(
Please specify the Zebra database password);
- $config{'ZEBRA_PASS'} = _get_value('ZEBRA_PASS', $msg, $defaults->{'ZEBRA_PASS'}, $valid_values, $install_log_values);
+ $config{'ZEBRA_PASS'} = _get_value('ZEBRA_PASS', $msg, $defaults->{'ZEBRA_PASS'}, $valid_values, $install_log_values);
- $msg = q(
+ $msg = q(
Since you've chosen to use Zebra, you can enable the SRU/
Z39.50 Server if you so choose, but you must specify a
few configuration options for it.
settings. Those references will be ignored by Koha.
Install the SRU configuration files?);
- $msg .= _add_valid_values_disp('INSTALL_SRU', $valid_values);
- $config{'INSTALL_SRU'} = _get_value('INSTALL_SRU', $msg, $defaults->{'INSTALL_SRU'}, $valid_values, $install_log_values);
+ $msg .= _add_valid_values_disp('INSTALL_SRU', $valid_values);
+ $config{'INSTALL_SRU'} = _get_value('INSTALL_SRU', $msg, $defaults->{'INSTALL_SRU'}, $valid_values, $install_log_values);
- if ($config{'INSTALL_SRU'} eq 'yes') {
- $msg = q(
+ if ($config{'INSTALL_SRU'} eq 'yes') {
+ $msg = q(
Since you've chosen to configure SRU, you must
specify the host and port(s) that the SRU
Servers (bibliographic and authority) should run on.
);
- $msg = q(
+ $msg = q(
SRU Database host?);
- $config{'ZEBRA_SRU_HOST'} = _get_value('ZEBRA_SRU_HOST', $msg, $defaults->{'ZEBRA_SRU_HOST'}, $valid_values, $install_log_values);
+ $config{'ZEBRA_SRU_HOST'} = _get_value('ZEBRA_SRU_HOST', $msg, $defaults->{'ZEBRA_SRU_HOST'}, $valid_values, $install_log_values);
- $msg = q(
+ $msg = q(
SRU port for bibliographic data?);
- $config{'ZEBRA_SRU_BIBLIOS_PORT'} = _get_value('ZEBRA_SRU_BIBLIOS_PORT', $msg, $defaults->{'ZEBRA_SRU_BIBLIOS_PORT'}, $valid_values, $install_log_values);
+ $config{'ZEBRA_SRU_BIBLIOS_PORT'} = _get_value('ZEBRA_SRU_BIBLIOS_PORT', $msg, $defaults->{'ZEBRA_SRU_BIBLIOS_PORT'}, $valid_values, $install_log_values);
- $msg = q(
+ $msg = q(
SRU port for authority data?);
- $config{'ZEBRA_SRU_AUTHORITIES_PORT'} = _get_value('ZEBRA_SRU_AUTHORITIES_PORT', $msg, $defaults->{'ZEBRA_SRU_AUTHORITIES_PORT'}, $valid_values, $install_log_values);
+ $config{'ZEBRA_SRU_AUTHORITIES_PORT'} = _get_value('ZEBRA_SRU_AUTHORITIES_PORT', $msg, $defaults->{'ZEBRA_SRU_AUTHORITIES_PORT'}, $valid_values, $install_log_values);
- }
+ }
- $msg = q(
-Since you've chosen to use Zebra, you can also choose to
-install PazPar2, which is a metasearch tool. With PazPar2,
+ $msg = q(
+Along with Zebra, you can also choose to install PazPar2,
+which is a metasearch tool. With PazPar2,
Koha can perform on-the-fly merging of bibliographic
records during searching, allowing for FRBRization of
the results list.
Install the PazPar2 configuration files?);
- $msg .= _add_valid_values_disp('INSTALL_PAZPAR2', $valid_values);
- $config{'INSTALL_PAZPAR2'} = _get_value('INSTALL_PAZPAR2', $msg, $defaults->{'INSTALL_PAZPAR2'}, $valid_values, $install_log_values);
+ $msg .= _add_valid_values_disp('INSTALL_PAZPAR2', $valid_values);
+ $config{'INSTALL_PAZPAR2'} = _get_value('INSTALL_PAZPAR2', $msg, $defaults->{'INSTALL_PAZPAR2'}, $valid_values, $install_log_values);
- if ($config{'INSTALL_PAZPAR2'} eq 'yes') {
- $msg = q(
+ if ($config{'INSTALL_PAZPAR2'} eq 'yes') {
+ $msg = q(
Since you've chosen to configure PazPar2, you must
specify the host and port(s) that PazPar2
uses:
);
- $msg = q(
+ $msg = q(
Zebra bibliographic server host?);
- $config{'MERGE_SERVER_HOST'} = _get_value('MERGE_SERVER_HOST', $msg, $defaults->{'MERGE_SERVER_HOST'}, $valid_values, $install_log_values);
+ $config{'MERGE_SERVER_HOST'} = _get_value('MERGE_SERVER_HOST', $msg, $defaults->{'MERGE_SERVER_HOST'}, $valid_values, $install_log_values);
- $msg = q(
+ $msg = q(
Zebra bibliographic port for PazPar2 to use?);
- $config{'MERGE_SERVER_PORT'} = _get_value('MERGE_SERVER_PORT', $msg, $defaults->{'MERGE_SERVER_PORT'}, $valid_values, $install_log_values);
+ $config{'MERGE_SERVER_PORT'} = _get_value('MERGE_SERVER_PORT', $msg, $defaults->{'MERGE_SERVER_PORT'}, $valid_values, $install_log_values);
- $msg = q(
+ $msg = q(
PazPar2 host?);
- $config{'PAZPAR2_HOST'} = _get_value('PAZPAR2_HOST', $msg, $defaults->{'PAZPAR2_HOST'}, $valid_values, $install_log_values);
+ $config{'PAZPAR2_HOST'} = _get_value('PAZPAR2_HOST', $msg, $defaults->{'PAZPAR2_HOST'}, $valid_values, $install_log_values);
- $msg = q(
+ $msg = q(
PazPar2 port?);
- $config{'PAZPAR2_PORT'} = _get_value('PAZPAR2_PORT', $msg, $defaults->{'PAZPAR2_PORT'}, $valid_values, $install_log_values);
+ $config{'PAZPAR2_PORT'} = _get_value('PAZPAR2_PORT', $msg, $defaults->{'PAZPAR2_PORT'}, $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.
+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);
$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);
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.
$dirmap{'DOC_DIR'} = File::Spec->catdir(@basedir, $package, 'doc');
$dirmap{'ZEBRA_LOCK_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lock', 'zebradb');
$dirmap{'LOG_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'log');
+ $dirmap{'BACKUP_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'spool');
+ $dirmap{'PLUGINS_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lib', 'koha', 'plugins');
$dirmap{'ZEBRA_DATA_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lib', 'zebradb');
$dirmap{'ZEBRA_RUN_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'run', 'zebradb');
} elsif ($mode eq 'dev') {
$dirmap{'DOC_DIR'} = File::Spec->catdir(@basedir, $package, 'doc');
$dirmap{'ZEBRA_LOCK_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lock', 'zebradb');
$dirmap{'LOG_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'log');
+ $dirmap{'BACKUP_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'spool');
+ $dirmap{'PLUGINS_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lib', 'plugins');
$dirmap{'ZEBRA_DATA_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lib', 'zebradb');
$dirmap{'ZEBRA_RUN_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'run', 'zebradb');
} else {
$dirmap{'DOC_DIR'} = File::Spec->catdir(@basedir, $package, 'doc');
$dirmap{'ZEBRA_LOCK_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'lock', $package, 'zebradb');
$dirmap{'LOG_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'log', $package);
+ $dirmap{'BACKUP_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'spool', $package);
+ $dirmap{'PLUGINS_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'lib', $package, 'plugins');
$dirmap{'ZEBRA_DATA_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'lib', $package, 'zebradb');
$dirmap{'ZEBRA_RUN_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'run', $package, 'zebradb');
}
_get_env_overrides(\%dirmap);
_get_argv_overrides(\%dirmap);
- _add_destdir(\%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}) {
sub display_configuration {
my $config = shift;
my $dirmap = shift;
+ my @version = grep /\/usr\/share\/perl\//, @INC;
+ push @version, ('/usr/share/perl/5.10') if !$version[0];
print "\n\nKoha will be installed with the following configuration parameters:\n\n";
foreach my $key (sort keys %$config) {
print sprintf("%-25.25s%s\n", $key, $config->{$key});
print "\n\nTo change any configuration setting, please run\n";
print "perl Makefile.PL again. To override one of the target\n";
print "directories, you can do so on the command line like this:\n";
- print "\nperl Makefile.PL PERL_MODULE_DIR=/usr/share/perl/5.8\n\n";
+ print "\nperl Makefile.PL PERL_MODULE_DIR=$version[0]\n\n";
print "You can also set different default values for parameters\n";
print "or override directory locations by using environment variables.\n";
print "\nFor example:\n\n";
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.
$install .= qq(
KOHA_INST_$key = blib/$key
KOHA_DEST_$key = $target_directories->{$key}
-) unless ($config{'INSTALL_ZEBRA'} ne "yes" and $key =~ /ZEBRA/) or exists $skip_directories->{$key};
+) unless exists $skip_directories->{$key};
}
$install .= qq(
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"
- unless ($config{'INSTALL_ZEBRA'} ne "yes" and $key =~ /ZEBRA/) or exists $skip_directories->{$key};
+ $install .= "\t\t\$(KOHA_INST_$key) \$(KOHA_DEST_$key) \\\n"
+ unless exists $skip_directories->{$key};
}
$install .= "\t\t\$(INST_MAN1DIR) \$(DESTINSTALLMAN1DIR) \\\n";
$install .= "\t\t\$(INST_MAN3DIR) \$(DESTINSTALLMAN3DIR)\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) 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};
+ $install .= "\t\$(NOECHO) if test -z \"\$(DESTDIR)\"; then chown -R $config{'KOHA_USER'}:$config{'KOHA_GROUP'} \$(KOHA_DEST_$key); fi\n"
+ unless exists $skip_directories->{$key};
}
} else {
$install .= "\t\t\$(NOECHO) \$(NOOP)\n\n";
# of Koha's files to have write permission by default.
foreach my $key (sort keys %$target_directories) {
$install .= "\t\$(NOECHO) chmod -R u+w \$(KOHA_DEST_$key)\n"
- unless ($config{'INSTALL_ZEBRA'} ne "yes" and $key =~ /ZEBRA/) or exists $skip_directories->{$key};
+ unless exists $skip_directories->{$key};
}
}
elsif ($^O eq 'MSWin32' ) { # On Win32, the install probably needs to be done under the user account koha will be running as...
$install .= qq(
KOHA_INST_$key = blib/$key
KOHA_DEST_$key = $target_directories->{$key}
-) unless ($config{'INSTALL_ZEBRA'} ne "yes" and $key =~ /ZEBRA/) or exists $skip_directories->{$key};
+) unless exists $skip_directories->{$key};
}
$install .= qq(
install :: all install_koha warn_koha_env_vars
$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"
- unless ($config{'INSTALL_ZEBRA'} ne "yes" and $key =~ /ZEBRA/) or exists $skip_directories->{$key};
+ $install .= "\t\t\$(KOHA_INST_$key) \$(KOHA_DEST_$key) \\\n"
+ unless exists $skip_directories->{$key};
}
}
$install .= "\n";
$install .= "\t\$(NOECHO) \$(ECHO) For other post-installation tasks, please consult the README.\n";
$install .= "\t\$(NOECHO) \$(ECHO)\n";
- if ($config{'INSTALL_ZEBRA'} eq "yes") {
- $install .= _update_zebra_conf_target();
- }
+ $install .= _update_zebra_conf_target();
$install .= upgrade();
}
sub upgrade {
- my $upgrade = "";
+ my $upgrade = "";
my $backup_suffix;
if (exists $install_log_values{'KOHA_INSTALLED_VERSION'}) {
\t\$(NOECHO) umask 022; \$(MOD_BACKUP) \\
/;
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"
- unless ($config{'INSTALL_ZEBRA'} ne "yes" and $key =~ /ZEBRA/) or
- exists $skip_directories->{$key} or
+ PAZPAR2_CONF_DIR ZEBRA_CONF_DIR PLUGINS_DIR/) {
+ $upgrade .= "\t\t\$(KOHA_INST_$key) \$(KOHA_DEST_$key) \\\n"
+ unless exists $skip_directories->{$key} or
not exists $target_directories->{$key};
}
$upgrade =~ s/\\\n$/\n/;
# 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";
- print $confhandle "# It is generated by the top-level Makefile.PL.\n";
- print $confhandle "# It is separate from the standard koha-conf.xml so that you can edit this by hand and test with different configurations.\n";
-
- # these directories will be relocated to the 't' directory
- foreach my $dirname ( keys %$target_directories ) {
- my $dir = main::_strip_destdir( $target_directories->{$dirname} );
- if ( exists $test_suite_override_dirs{$dirname} ) {
- $dir = main::get_test_dir($dirname);
- }
- print $confhandle "$dirname = $dir\n"
- }
- print $confhandle "\n";
- print $confhandle join( "\n", map { "$_ = $config{$_}" } keys( %config ) ), "\n";
- close( $confhandle );
- } 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
projects / koha_fer / blobdiff