$VERSION = 0.01;
@ISA = qw(Exporter);
-@EXPORT = qw( &checkperlmodules
- &checkabortedinstall
+@EXPORT = qw(
+ &read_autoinstall_file
+ &checkperlmodules
+ &checkabortedinstall
&getmessage
&showmessage
&releasecandidatewarning
the default value for any question (indicated by []), simply hit Enter
at the prompt.
+You also can define an auto_install_file, that will answer every question automatically.
+To use this feature, run ./installer.pl -i /path/to/auto_install_file
+
Are you ready to begin the installation? ([Y]/N): |;
$messages->{'WelcomeToUpgrader'}->{en} =
$messages->{'ReleaseCandidateWarning'}->{en} =
heading('RELEASE CANDIDATE') . qq|
WARNING: You are about to install Koha version %s. This is a
-release candidate, not intended for production systems.
-It is being released so that users can test it before we release a final
-version and report bugs to us.
+release candidate, It is NOT bugfree.
+However, it works, and has been declared stable enough to
+be released.
Most people should answer Yes here.
$messages->{'PerlVersionFailure'}->{en}="Sorry, you need at least Perl %s\n";
$messages->{'MissingPerlModules'}->{en} = heading('MISSING PERL MODULES') . qq|
-You are missing some Perl modules which are required by Koha.
-Once these modules have been installed, rerun this installer.
-They may be installed by running (as root) the following:
+You are missing some Perl modules required by Koha.
+Please run this again after installing them.
+They may be installed by finding packages from your operating system supplier, or running (as root) the following commands:
%s
|;
$messages->{'AllPerlModulesInstalled'}->{en} =
heading('PERL MODULES AVAILABLE') . qq|
-All mandatory perl modules are installed.
+All required perl modules are installed.
Press <ENTER> to continue: |;
$messages->{'KohaVersionInstalled'}->{en}="You currently have Koha %s on your system.";
Press <ENTER> to exit the installer: |;
+#'
sub releasecandidatewarning {
my $message=getmessage('ReleaseCandidateWarning', [$newversion, $newversion]);
my $answer=showmessage($message, 'yn', 'n');
};
}
+sub read_autoinstall_file
+{
+ my $fname = shift; # Config file to read
+ my $retval = {}; # Return value: ref-to-hash holding the
+ # configuration
+
+ open (CONF, $fname) or return undef;
+
+ while (<CONF>)
+ {
+ my $var; # Variable name
+ my $value; # Variable value
+
+ chomp;
+ s/#.*//; # Strip comments
+ next if /^\s*$/; # Ignore blank lines
+
+ # Look for a line of the form
+ # var = value
+ if (!/^\s*(\w+)\s*=\s*(.*?)\s*$/)
+ {
+ next;
+ }
+
+ # Found a variable assignment
+ # variable that was already set.
+ $var = $1;
+ $value = $2;
+ $retval->{$var} = $value;
+ }
+ close CONF;
+ return $retval;
+}
=back
($etcdir) = @_;
}
+=item getkohaversion
+
+ getkohaversion();
+
+Gets the Koha version as known by the previous config file.
+
+=cut
+
+sub getkohaversion () {
+ return($kohaversion);
+}
+
=item setkohaversion
setkohaversion('1.3.3RC26');
#
# Test for Perl and Modules
#
-
+ my ($auto_install) = @_;
my $message = getmessage('CheckingPerlModules');
showmessage($message, 'none');
if (@missing > 0) {
my $missing='';
- if (POSIX::setlocale(LC_ALL) != "C") {
+ if (POSIX::setlocale(LC_ALL) ne "C") {
$missing.=" export LC_ALL=C\n";
}
foreach my $module (@missing) {
print "\n";
exit;
} else {
- showmessage(getmessage('AllPerlModulesInstalled'), 'PressEnter', '', 1);
+ showmessage(getmessage('AllPerlModulesInstalled'), 'PressEnter', '', 1) unless $auto_install->{NoPressEnter};
}
=cut
sub getinstallationdirectories {
- if (!$ENV{prefix}) { $ENV{prefix} = "/usr/local"; }
+ my ($auto_install) = @_;
+ if (!$ENV{prefix}) { $ENV{prefix} = "/usr/local"; } #"
$opacdir = $ENV{prefix}.'/koha/opac';
$intranetdir = $ENV{prefix}.'/koha/intranet';
my $getdirinfo=1;
while ($getdirinfo) {
# Loop until opac directory and koha directory are different
- my $message=getmessage('GetOpacDir', [$opacdir]);
- $opacdir=showmessage($message, 'free', $opacdir);
-
- $message=getmessage('GetIntranetDir', [$intranetdir]);
- $intranetdir=showmessage($message, 'free', $intranetdir);
-
+ my $message;
+ if ($auto_install->{GetOpacDir}) {
+ $opacdir=$auto_install->{GetOpacDir};
+ print "auto-setting OpacDir to $opacdir\n";
+ } else {
+ $message=getmessage('GetOpacDir', [$opacdir]);
+ $opacdir=showmessage($message, 'free', $opacdir);
+ }
+ if ($auto_install->{GetIntranetDir}) {
+ $intranetdir=$auto_install->{GetIntranetDir};
+ print "auto-setting IntranetDir to $intranetdir\n";
+ } else {
+ $message=getmessage('GetIntranetDir', [$intranetdir]);
+ $intranetdir=showmessage($message, 'free', $intranetdir);
+ }
if ($intranetdir eq $opacdir) {
print qq|
}
}
$kohalogdir=$ENV{prefix}.'/koha/log';
- my $message=getmessage('GetKohaLogDir', [$kohalogdir]);
- $kohalogdir=showmessage($message, 'free', $kohalogdir);
+ if ($auto_install->{GetOpacDir}) {
+ $kohalogdir=$auto_install->{KohaLogDir};
+ print "auto-setting OpacDir to $opacdir\n";
+ } else {
+ my $message=getmessage('GetKohaLogDir', [$kohalogdir]);
+ $kohalogdir=showmessage($message, 'free', $kohalogdir);
+ }
# FIXME: Need better error handling for all mkdir calls here
=cut
$messages->{'WhereIsMySQL'}->{en} = heading('MYSQL LOCATION').qq|
-Koha can't find MySQL. If you compiled mysql yourself,
+Koha can't find the MySQL command-line tools. If you installed a MySQL package, you may need to install an additional package containing mysqladmin.
+If you compiled mysql yourself,
please give the value of --prefix when you ran configure.
The file mysqladmin should be in bin/mysqladmin under the directory that you give here.
MySQL installation directory: |;
-
+#'
sub getmysqldir {
foreach my $mysql (qw(/usr/local/mysql
/opt/mysql
+ /usr/local
/usr
)) {
- if ( -d $mysql && -f "$mysql/bin/mysqladmin") {
+ if ( -d $mysql && -f "$mysql/bin/mysqladmin") { #"
$mysqldir=$mysql;
}
}
if (!$mysqldir){
for (;;) {
- $mysqldir = showmessage(getmessage('WhereisMySQL'),'free');
+ $mysqldir = showmessage(getmessage('WhereIsMySQL'),'free');
last if -f "$mysqldir/bin/mysqladmin";
}
}
|;
sub getdatabaseinfo {
-
+ my ($auto_install) = @_;
$database = 'Koha';
$hostname = 'localhost';
$user = 'kohaadmin';
$pass = '';
#Get the database name
-
- my $message=getmessage('DatabaseName', [$database]);
- $database=showmessage($message, 'free', $database);
-
+ my $message;
+
+ if ($auto_install->{database}) {
+ $database=$auto_install->{database};
+ print "auto-setting database to $database\n";
+ } else {
+ $message=getmessage('DatabaseName', [$database]);
+ $database=showmessage($message, 'free', $database);
+ }
#Get the hostname for the database
- $message=getmessage('DatabaseHost', [$hostname]);
- $hostname=showmessage($message, 'free', $hostname);
-
+ if ($auto_install->{DatabaseHost}) {
+ $hostname=$auto_install->{DatabaseHost};
+ print "auto-setting database host to $hostname\n";
+ } else {
+ $message=getmessage('DatabaseHost', [$hostname]);
+ $hostname=showmessage($message, 'free', $hostname);
+ }
#Get the username for the database
- $message=getmessage('DatabaseUser', [$database, $hostname, $user]);
- $user=showmessage($message, 'free', $user);
-
+ if ($auto_install->{DatabaseUser}) {
+ $user=$auto_install->{DatabaseUser};
+ print "auto-setting DB user to $user\n";
+ } else {
+ $message=getmessage('DatabaseUser', [$database, $hostname, $user]);
+ $user=showmessage($message, 'free', $user);
+ }
#Get the password for the database user
while ($pass eq '') {
- my $message=getmessage('DatabasePassword', [$user, $user]);
- $pass=showmessage($message, 'free', $pass);
- if ($pass eq '') {
- my $message=getmessage('BlankPassword');
- showmessage($message,'PressEnter');
- }
+ my $message=getmessage('DatabasePassword', [$user, $user]);
+ if ($auto_install->{DatabasePassword}) {
+ $pass=$auto_install->{DatabasePassword};
+ print "auto-setting database password to $pass\n";
+ } else {
+ $pass=showmessage($message, 'free', $pass);
+ }
+ if ($pass eq '') {
+ my $message=getmessage('BlankPassword');
+ showmessage($message,'PressEnter');
+ }
}
}
Press <ENTER> to continue: |;
sub getapacheinfo {
+ my ($auto_install) = @_;
my @confpossibilities;
foreach my $httpdconf (qw(/usr/local/apache/conf/httpd.conf
/etc/apache2/apache2.conf
/etc/apache/conf/httpd.conf
/etc/apache/conf/apache.conf
+ /etc/apache/httpd.conf
/etc/apache-ssl/conf/apache.conf
/etc/apache-ssl/httpd.conf
/etc/httpd/conf/httpd.conf
/etc/httpd/httpd.conf
/etc/httpd/2.0/conf/httpd2.conf
)) {
- if ( -f $httpdconf ) {
- push @confpossibilities, $httpdconf;
- }
+ if ( -f $httpdconf ) {
+ push @confpossibilities, $httpdconf;
+ }
}
if ($#confpossibilities==-1) {
- my $message=getmessage('NoApacheConfFiles');
- my $choice='';
- $realhttpdconf='';
- until (-f $realhttpdconf) {
- $choice=showmessage($message, "free", 1);
- if (-f $choice) {
- $realhttpdconf=$choice;
- } else {
- showmessage(getmessage('NotAFile', [$choice]),'PressEnter', '', 1);
- }
- }
+ my $message=getmessage('NoApacheConfFiles');
+ my $choice='';
+ $realhttpdconf='';
+ until (-f $realhttpdconf) {
+ $choice=showmessage($message, "free", 1);
+ if (-f $choice) {
+ $realhttpdconf=$choice;
+ } else {
+ showmessage(getmessage('NotAFile', [$choice]),'PressEnter', '', 1);
+ }
+ }
} elsif ($#confpossibilities>0) {
- my $conffiles='';
- my $counter=1;
- my $options='';
- foreach (@confpossibilities) {
- $conffiles.=" $counter: $_\n";
- $options.="$counter";
- $counter++;
- }
- my $message=getmessage('FoundMultipleApacheConfFiles', [$conffiles]);
- my $choice=showmessage($message, "restrictchar $options", 1);
- $realhttpdconf=$confpossibilities[$choice-1];
+ my $conffiles='';
+ my $counter=1;
+ my $options='';
+ foreach (@confpossibilities) {
+ $conffiles.=" $counter: $_\n";
+ $options.="$counter";
+ $counter++;
+ }
+ my $message=getmessage('FoundMultipleApacheConfFiles', [$conffiles]);
+ my $choice=showmessage($message, "restrictchar $options", 1);
+ $realhttpdconf=$confpossibilities[$choice-1];
} else {
- $realhttpdconf=$confpossibilities[0];
+ $realhttpdconf=$confpossibilities[0];
}
unless (open (HTTPDCONF, "<$realhttpdconf")) {
warn RED."Insufficient privileges to open $realhttpdconf for reading.\n";
}
while (<HTTPDCONF>) {
- if (/^\s*User\s+"?([-\w]+)"?\s*$/) {
- $httpduser = $1;
- }
+ if (/^\s*User\s+"?([-\w]+)"?\s*$/) {
+ $httpduser = $1;
+ }
}
close(HTTPDCONF);
unless (defined($httpduser)) {
- my $message=getmessage('EnterApacheUser', [$etcdir]);
- until (defined($httpduser) && length($httpduser) && getpwnam($httpduser)) {
- $httpduser=showmessage($message, "free", '');
- if (length($httpduser)>0) {
- unless (getpwnam($httpduser)) {
- my $message=getmessage('InvalidUserid', [$httpduser]);
- showmessage($message,'PressEnter');
+ my $message;
+ if ($auto_install->{EnterApacheUser}) {
+ $message = $auto_install->{EnterApacheUser};
+ print "auto-setting ApacheUser to $message\n";
+ } else {
+ $message=getmessage('EnterApacheUser', [$etcdir]);
+ }
+ until (defined($httpduser) && length($httpduser) && getpwnam($httpduser)) {
+ if ($auto_install->{EnterApacheUser}) {
+ $httpduser = $auto_install->{EnterApacheUser};
+ } else {
+ $httpduser=showmessage($message, "free", '');
+ }
+ if (length($httpduser)>0) {
+ unless (getpwnam($httpduser)) {
+ my $message=getmessage('InvalidUserid', [$httpduser]);
+ showmessage($message,'PressEnter');
+ }
+ } else {
+ }
}
- } else {
- }
}
- }
}
sub getapachevhostinfo {
-
+ my ($auto_install) = @_;
$svr_admin = "webmaster\@$domainname";
$servername=`hostname`;
chomp $servername;
$opacport=80;
$intranetport=8080;
- showmessage(getmessage('ApacheConfigIntroduction',[$etcdir,$etcdir]), 'PressEnter');
-
- $svr_admin=showmessage(getmessage('GetVirtualHostEmail', [$svr_admin]), 'email', $svr_admin);
- $servername=showmessage(getmessage('GetServerName', [$servername]), 'free', $servername);
-
-
- $opacport=showmessage(getmessage('GetOpacPort', [$opacport]), 'numerical', $opacport);
- $intranetport=showmessage(getmessage('GetIntranetPort', [$opacport, $intranetport]), 'numerical', $intranetport);
+ if ($auto_install->{GetVirtualHostEmail}) {
+ $svr_admin=$auto_install->{GetVirtualHostEmail};
+ print "auto-setting VirtualHostEmail to $svr_admin\n";
+ } else {
+ showmessage(getmessage('ApacheConfigIntroduction',[$etcdir,$etcdir]), 'PressEnter');
+ $svr_admin=showmessage(getmessage('GetVirtualHostEmail', [$svr_admin]), 'email', $svr_admin);
+ }
+ if ($auto_install->{servername}) {
+ $servername=$auto_install->{servername};
+ print "auto-setting server name to $servername\n";
+ } else {
+ $servername=showmessage(getmessage('GetServerName', [$servername]), 'free', $servername);
+ }
+ if ($auto_install->{opacport}) {
+ $opacport=$auto_install->{opacport};
+ print "auto-setting opac port to $opacport\n";
+ } else {
+ $opacport=showmessage(getmessage('GetOpacPort', [$opacport]), 'numerical', $opacport);
+ }
+ if ($auto_install->{intranetport}) {
+ $servername=$auto_install->{intranetport};
+ print "auto-setting intranet port to $intranetport\n";
+ } else {
+ $intranetport=showmessage(getmessage('GetIntranetPort', [$opacport, $intranetport]), 'numerical', $intranetport);
+ }
}
=cut
-$messages->{'IntranetAuthenticationQuestion'}->{en} =
- heading('LIBRARIAN AUTHENTICATION') . qq|
-The Librarian site can be password protected using
-Apache's Basic Authorization instead of Koha user details.
-
-This method going to be phased out very soon. Most users should answer N here.
-
-Would you like to do this (Y/[N]): |; #'
-
-$messages->{'BasicAuthUsername'}->{en}="Please enter a username for librarian access [%s]: ";
-$messages->{'BasicAuthPassword'}->{en}="Please enter a password for %s: ";
-$messages->{'BasicAuthPasswordWasBlank'}->{en}="\nYou cannot use a blank password!\n\n";
-
-sub basicauthentication {
- my $message=getmessage('IntranetAuthenticationQuestion');
- my $answer=showmessage($message, 'yn', 'n');
- my $httpdconf = $etcdir."/koha-httpd.conf";
-
- my $apacheauthusername='librarian';
- my $apacheauthpassword='';
- if ($answer=~/^y/i) {
- ($apacheauthusername) = showmessage(getmessage('BasicAuthUsername', [ $apacheauthusername]), 'free', $apacheauthusername, 1);
- $apacheauthusername=~s/[^a-zA-Z0-9]//g;
- while (! $apacheauthpassword) {
- ($apacheauthpassword) = showmessage(getmessage('BasicAuthPassword', [ $apacheauthusername]), 'free', 1);
- if (!$apacheauthpassword) {
- ($apacheauthpassword) = showmessage(getmessage('BasicAuthPasswordWasBlank'), 'none', '', 1);
- }
- }
- open AUTH, ">$etcdir/kohaintranet.pass";
- my $chars='ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
- my $salt=substr($chars, int(rand(length($chars))),1);
- $salt.=substr($chars, int(rand(length($chars))),1);
- print AUTH $apacheauthusername.":".crypt($apacheauthpassword, $salt)."\n";
- close AUTH;
- open(SITE,">>$httpdconf") or warn "Insufficient priveleges to open $realhttpdconf for writing.\n";
- print SITE <<EOP
-
-<Directory $intranetdir>
- AuthUserFile $etcdir/kohaintranet.pass
- AuthType Basic
- AuthName "Koha Intranet (for librarians only)"
- Require valid-user
-</Directory>
-EOP
- }
- close(SITE);
-}
+# $messages->{'IntranetAuthenticationQuestion'}->{en} =
+# heading('LIBRARIAN AUTHENTICATION') . qq|
+# The Librarian site can be password protected using
+# Apache's Basic Authorization instead of Koha user details.
+#
+# This method going to be phased out very soon. Most users should answer N here.
+#
+# Would you like to do this (Y/[N]): |; #'
+#
+# $messages->{'BasicAuthUsername'}->{en}="Please enter a username for librarian access [%s]: ";
+# $messages->{'BasicAuthPassword'}->{en}="Please enter a password for %s: ";
+# $messages->{'BasicAuthPasswordWasBlank'}->{en}="\nYou cannot use a blank password!\n\n";
+#
+# sub basicauthentication {
+# my $message=getmessage('IntranetAuthenticationQuestion');
+# my $answer=showmessage($message, 'yn', 'n');
+# my $httpdconf = $etcdir."/koha-httpd.conf";
+#
+# my $apacheauthusername='librarian';
+# my $apacheauthpassword='';
+# if ($answer=~/^y/i) {
+# ($apacheauthusername) = showmessage(getmessage('BasicAuthUsername', [ $apacheauthusername]), 'free', $apacheauthusername, 1);
+# $apacheauthusername=~s/[^a-zA-Z0-9]//g;
+# while (! $apacheauthpassword) {
+# ($apacheauthpassword) = showmessage(getmessage('BasicAuthPassword', [ $apacheauthusername]), 'free', 1);
+# if (!$apacheauthpassword) {
+# ($apacheauthpassword) = showmessage(getmessage('BasicAuthPasswordWasBlank'), 'none', '', 1);
+# }
+# }
+# open AUTH, ">$etcdir/kohaintranet.pass";
+# my $chars='ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+# my $salt=substr($chars, int(rand(length($chars))),1);
+# $salt.=substr($chars, int(rand(length($chars))),1);
+# print AUTH $apacheauthusername.":".crypt($apacheauthpassword, $salt)."\n";
+# close AUTH;
+# open(SITE,">>$httpdconf") or warn "Insufficient priveleges to open $realhttpdconf for writing.\n";
+# print SITE <<EOP
+#
+# <Directory $intranetdir>
+# AuthUserFile $etcdir/kohaintranet.pass
+# AuthType Basic
+# AuthName "Koha Intranet (for librarians only)"
+# Require valid-user
+# </Directory>
+# EOP
+# }
+# close(SITE);
+# }
=item installfiles
my $desc = shift;
my $src = shift;
my $tgt = shift;
-
if (-e $tgt) {
print getmessage('CopyingFiles', ["old ".$desc,$tgt.strftime("%Y%m%d%H%M",localtime())]);
startsysout();
system("cp -R ".$src." ".$tgt);
}
+ my ($auto_install) = @_;
showmessage(getmessage('InstallFiles'),'none');
neatcopy("admin templates", 'intranet-html', "$intranetdir/htdocs");
hostname=$hostname
user=$user
pass=$pass
-includes=$opacdir/htdocs/includes
intranetdir=$intranetdir
opacdir=$opacdir
kohalogdir=$kohalogdir
#MJR: generate our own settings, to remove the /home/paul hardwired links
open(FILE,">$intranetdir/scripts/z3950daemon/z3950-daemon-options");
- print FILE "RunAsUser=apache\nKohaZ3950Dir=$intranetdir/scripts/z3950daemon\nKohaModuleDir=$intranetdir/modules\nLogDir=$kohalogdir\nKohaConf=$etcdir/koha.conf";
+ print FILE "RunAsUser=$httpduser\nKohaZ3950Dir=$intranetdir/scripts/z3950daemon\nKohaModuleDir=$intranetdir/modules\nLogDir=$kohalogdir\nKohaConf=$etcdir/koha.conf";
close(FILE);
if ($> == 0) {
chown((getpwnam($httpduser)) [2,3], "$etcdir/koha.conf.tmp") or warn "can't chown koha.conf: $!";
chown(0, (getpwnam($httpduser)) [3], "$intranetdir/scripts/z3950daemon/z3950-daemon-shell.sh") or warn "can't chown $intranetdir/scripts/z3950daemon/z3950-daemon-shell.sh: $!";
chown(0, (getpwnam($httpduser)) [3], "$intranetdir/scripts/z3950daemon/processz3950queue") or warn "can't chown $intranetdir/scripts/z3950daemon/processz3950queue: $!";
- } #MJR: FIXME: Should report that we haven't chown()d.
+ } #MJR: report that we haven't chown()d.
+ else {
+ print "Please check permissions in $intranetdir/scripts/z3950daemon\n";
+ }
- showmessage(getmessage('OldFiles'),'PressEnter');
+ showmessage(getmessage('OldFiles'),'PressEnter') unless $auto_install->{NoPressEnter};
}
$messages->{'PrinterName'}->{en}="Printer Name [%s]: ";
sub databasesetup {
+ my ($auto_install) = @_;
$mysqluser = 'root';
$mysqlpass = '';
my $mysqldir = getmysqldir();
- # we must not put the mysql root password on the command line
- $mysqlpass= showmessage(getmessage('MysqlRootPassword'),'silentfree');
+ if ($auto_install->{MysqlRootPassword}) {
+ $mysqlpass=$auto_install->{MysqlRootPassword};
+ } else {
+ # we must not put the mysql root password on the command line
+ $mysqlpass= showmessage(getmessage('MysqlRootPassword'),'silentfree');
+ }
- showmessage(getmessage('CreatingDatabase'),'none');
+ showmessage(getmessage('CreatingDatabase'),'none') unless ($auto_install->{NoPressEnter});
# set the login up
setmysqlclipass($mysqlpass);
# Set up permissions
startsysout();
- print system("$mysqldir/bin/mysql -u$mysqluser mysql -e \"insert into user (Host,User,Password) values ('$hostname','$user',password('$pass'))\"\;");
+ print system("$mysqldir/bin/mysql -u$mysqluser mysql -e \"insert into user (Host,User,Password) values ('$hostname','$user',password('$pass'))\"\;");#"
system("$mysqldir/bin/mysql -u$mysqluser mysql -e \"insert into db (Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv, index_priv, alter_priv) values ('%','$database','$user','Y','Y','Y','Y','Y','Y','Y','Y')\"");
system("$mysqldir/bin/mysqladmin -u$mysqluser reload");
# Change to admin user login
exit;
}
- if ($kohaversion =~ /^1\.[012]\./) {
- my $response=showmessage(getmessage('UpdateMarcTables'), 'restrictchar 12N', '1');
+ my $response=showmessage(getmessage('UpdateMarcTables'), 'restrictchar 12N', '1');
- startsysout();
- if ($response eq '1') {
- system("cat scripts/misc/marc_datas/marc21_en/structure_def.sql | $mysqldir/bin/mysql -u$user $database");
- }
- if ($response eq '2') {
- system("cat scripts/misc/marc_datas/unimarc_fr/structure_def.sql | $mysqldir/bin/mysql -u$user $database");
- system("cat scripts/misc/lang-datas/fr/stopwords.sql | $mysqldir/bin/mysql -u$user $database");
- }
- delete($ENV{"KOHA_CONF"});
+ startsysout();
+ if ($response eq '1') {
+ system("cat scripts/misc/marc_datas/marc21_en/structure_def.sql | $mysqldir/bin/mysql -u$user $database");
+ system("cat scripts/misc/lang-datas/en/stopwords.sql | $mysqldir/bin/mysql -u$user $database");
}
+ if ($response eq '2') {
+ system("cat scripts/misc/marc_datas/unimarc_fr/structure_def.sql | $mysqldir/bin/mysql -u$user $database");
+ system("cat scripts/misc/lang-datas/fr/stopwords.sql | $mysqldir/bin/mysql -u$user $database");
+ }
+ delete($ENV{"KOHA_CONF"});
print RESET."\n\nFinished updating of database. Press <ENTER> to continue...";
<STDIN>;
}
sub restoremycnf {
- if (-e $mycnf) {
+ if (defined $mycnf && -e $mycnf) {
unlink($mycnf);
}
- if (-e $mytmpcnf) {
+ if (defined $mytmpcnf && -e $mytmpcnf) {
rename $mytmpcnf,$mycnf;
}
}
projects / koha.git / blobdiff