[Koha-cvs] CVS: koha/misc Install.pm,1.11,1.12
Ambrose Li
acli at users.sourceforge.net
Sat Jan 25 08:25:33 CET 2003
Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1:/tmp/cvs-serv27677/misc
Modified Files:
Install.pm
Log Message:
Corrected POD syntax errors.
Creating a function "heading" to avoid syntax errors due to our use of
boxes consisting of equal signs to create headings.
Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** Install.pm 25 Jan 2003 06:38:08 -0000 1.11
--- Install.pm 25 Jan 2003 07:25:31 -0000 1.12
***************
*** 25,28 ****
--- 25,45 ----
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
+ =head1 NAME
+
+ Install.pm - Perl module containing the bulk of the installation logic
+
+ =head1 DESCRIPTION
+
+ The Install.pm module contains the bulk
+ of the code to do installation;
+ this code is used by installer.pl
+ to perform an actual installation.
+
+ =head2 Internal functions (not meant to be used outside of Install.pm)
+
+ =over 4
+
+ =cut
+
# set the version for version checking
$VERSION = 0.01;
***************
*** 49,59 ****
my $messages;
$messages->{'continuing'}->{en}="Great! Continuing setup.\n\n";
! $messages->{'WelcomeToKohaInstaller'}->{en}=qq|
! =================================
! = Welcome to the Koha Installer =
! =================================
!
Welcome to the Koha install script! This script will prompt you for some
basic information about your desired setup, then install Koha according to
--- 66,95 ----
+ =item heading
+
+ $messages->{'WelcomeToKohaInstaller'
+ = heading('Welcome to the Koha Installer') . qq|...|;
+
+ The heading function takes one string, the text to be displayed as
+ the heading, and returns a formatted heading (currently formatted
+ in the "traditional Koha installer" style, i.e., surrounded by a
+ box of equal signs).
+
+ This reduces the likelihood of pod2man(1) etc. misinterpreting
+ a line of equal signs as POD directives.
+
+ =cut
+
+ sub heading ($) {
+ my($s) = @_;
+ my $n = length($s) + 4;
+ my $line = ('=' x $n) . "\n";
+ "\n$line= $s =\n$line\n";
+ }
+
my $messages;
$messages->{'continuing'}->{en}="Great! Continuing setup.\n\n";
! $messages->{'WelcomeToKohaInstaller'}->{en} =
! heading('Welcome to the Koha Installer') . qq|
Welcome to the Koha install script! This script will prompt you for some
basic information about your desired setup, then install Koha according to
***************
*** 65,73 ****
Are you ready to begin the installation? (Y/[N]): |;
! $messages->{'ReleaseCandidateWarning'}->{en}=qq|
! =====================
! = RELEASE CANDIDATE =
! =====================
!
WARNING WARNING WARNING WARNING WARNING
--- 101,106 ----
Are you ready to begin the installation? (Y/[N]): |;
! $messages->{'ReleaseCandidateWarning'}->{en} =
! heading('RELEASE CANDIDATE') . qq|
WARNING WARNING WARNING WARNING WARNING
***************
*** 97,106 ****
Press the <ENTER> key to continue: |;
! $messages->{'CheckingPerlModules'}->{en}=qq|
!
! ==================
! = PERL & MODULES =
! ==================
!
Checking perl modules ...
|;
--- 130,134 ----
Press the <ENTER> key to continue: |;
! $messages->{'CheckingPerlModules'}->{en} = heading('PERL & MODULES') . qq|
Checking perl modules ...
|;
***************
*** 108,117 ****
$messages->{'PerlVersionFailure'}->{en}="Sorry, you need at least Perl %s\n";
! $messages->{'MissingPerlModules'}->{en}=qq|
!
! ========================
! = MISSING PERL MODULES =
! ========================
!
You are missing some Perl modules which are required by Koha.
Once these modules have been installed, rerun this installer.
--- 136,140 ----
$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.
***************
*** 121,130 ****
|;
! $messages->{'AllPerlModulesInstalled'}->{en}=qq|
!
! ==============================
! = ALL PERL MODULES INSTALLED =
! ==============================
!
All mandatory perl modules are installed.
--- 144,149 ----
|;
! $messages->{'AllPerlModulesInstalled'}->{en} =
! heading('ALL PERL MODULES INSTALLED') . qq|
All mandatory perl modules are installed.
***************
*** 132,140 ****
$messages->{'KohaVersionInstalled'}->{en}="You currently have Koha %s on your system.";
$messages->{'KohaUnknownVersionInstalled'}->{en}="I am not able to determine what version of Koha is installed now.";
! $messages->{'KohaAlreadyInstalled'}->{en}=qq|
! ==========================
! = Koha already installed =
! ==========================
!
It looks like Koha is already installed on your system (%s/koha.conf exists
already). If you would like to upgrade your system to %s, please use
--- 151,156 ----
$messages->{'KohaVersionInstalled'}->{en}="You currently have Koha %s on your system.";
$messages->{'KohaUnknownVersionInstalled'}->{en}="I am not able to determine what version of Koha is installed now.";
! $messages->{'KohaAlreadyInstalled'}->{en} =
! heading('Koha already installed') . qq|
It looks like Koha is already installed on your system (%s/koha.conf exists
already). If you would like to upgrade your system to %s, please use
***************
*** 144,152 ****
|;
! $messages->{'GetOpacDir'}->{en}=qq|
! ==================
! = OPAC DIRECTORY =
! ==================
!
Please supply the directory you want Koha to store its OPAC files in. This
directory will be auto-created for you if it doesn't exist.
--- 160,164 ----
|;
! $messages->{'GetOpacDir'}->{en} = heading('OPAC DIRECTORY') . qq|
Please supply the directory you want Koha to store its OPAC files in. This
directory will be auto-created for you if it doesn't exist.
***************
*** 154,162 ****
OPAC Directory [%s]: |;
! $messages->{'GetIntranetDir'}->{en}=qq|
! =================================
! = INTRANET/LIBRARIANS DIRECTORY =
! =================================
!
Please supply the directory you want Koha to store its Intranet/Librarians
files in. This directory will be auto-created for you if it doesn't exist.
--- 166,171 ----
OPAC Directory [%s]: |;
! $messages->{'GetIntranetDir'}->{en} =
! heading('INTRANET/LIBRARIANS DIRECTORY') . qq|
Please supply the directory you want Koha to store its Intranet/Librarians
files in. This directory will be auto-created for you if it doesn't exist.
***************
*** 164,181 ****
Intranet Directory [%s]: |;
! $messages->{'GetKohaLogDir'}->{en}=qq|
! ======================
! = KOHA LOG DIRECTORY =
! ======================
!
Specify a log directory where any Koha daemons can create log files.
Koha Log Directory [%s]: |;
! $messages->{'AuthenticationWarning'}->{en}=qq|
! ==================
! = Authentication =
! ==================
!
This release of Koha has a new authentication module. If you are not already
using basic authentication on your intranet, you will be required to log in to
--- 173,182 ----
Intranet Directory [%s]: |;
! $messages->{'GetKohaLogDir'}->{en} = heading('KOHA LOG DIRECTORY') . qq|
Specify a log directory where any Koha daemons can create log files.
Koha Log Directory [%s]: |;
! $messages->{'AuthenticationWarning'}->{en} = heading('Authentication') . qq|
This release of Koha has a new authentication module. If you are not already
using basic authentication on your intranet, you will be required to log in to
***************
*** 186,194 ****
Press the <ENTER> key to continue: |;
! $messages->{'Completed'}->{en}=qq|
! ==============================
! = KOHA INSTALLATION COMPLETE =
! ==============================
!
Congratulations ... your Koha installation is complete!
--- 187,191 ----
Press the <ENTER> key to continue: |;
! $messages->{'Completed'}->{en} = heading('KOHA INSTALLATION COMPLETE') . qq|
Congratulations ... your Koha installation is complete!
***************
*** 221,224 ****
--- 218,229 ----
+ =back
+
+ =head2 Miscellaneous utility functions
+
+ =over 4
+
+ =cut
+
=item dirname
***************
*** 272,275 ****
--- 277,288 ----
}
+ =back
+
+ =head2 Subtasks of doing an installation
+
+ =over 4
+
+ =cut
+
=item checkabortedinstall
***************
*** 365,374 ****
}
! $messages->{'NoUsrBinPerl'}->{en}=qq|
!
! ========================================
! = Perl is not located in /usr/bin/perl =
! ========================================
!
The Koha perl scripts expect to find the perl executable in the /usr/bin
directory. It is not there on your system.
--- 378,383 ----
}
! $messages->{'NoUsrBinPerl'}->{en} =
! heading('Perl is not located in /usr/bin/perl') . qq|
The Koha perl scripts expect to find the perl executable in the /usr/bin
directory. It is not there on your system.
***************
*** 527,544 ****
! $messages->{'DatabaseName'}->{en}=qq|
! ==========================
! = Name of MySQL database =
! ==========================
!
Please provide the name of the mysql database for your koha installation.
Database name [%s]: |;
! $messages->{'DatabaseHost'}->{en}=qq|
! =================
! = Database Host =
! =================
!
Please provide the hostname for mysql. Unless the database is located on
another machine this will be "localhost".
--- 536,545 ----
! $messages->{'DatabaseName'}->{en} = heading('Name of MySQL database') . qq|
Please provide the name of the mysql database for your koha installation.
Database name [%s]: |;
! $messages->{'DatabaseHost'}->{en} = heading('Database Host') . qq|
Please provide the hostname for mysql. Unless the database is located on
another machine this will be "localhost".
***************
*** 546,554 ****
Database host [%s]: |;
! $messages->{'DatabaseUser'}->{en}=qq|
! =================
! = Database User =
! =================
!
Please provide the name of the user, who will have full administrative rights
to the %s database, when authenticating from %s.
--- 547,551 ----
Database host [%s]: |;
! $messages->{'DatabaseUser'}->{en} = heading('Database User') . qq|
Please provide the name of the user, who will have full administrative rights
to the %s database, when authenticating from %s.
***************
*** 558,575 ****
Database user [%s]: |;
! $messages->{'DatabasePassword'}->{en}=qq|
! =====================
! = Database Password =
! =====================
!
Please provide a good password for the user %s.
Database Password: |;
! $messages->{'BlankPassword'}->{en}=qq|
! ==================
! = BLANK PASSWORD =
! ==================
!
You must not use a blank password for your MySQL user!
--- 555,564 ----
Database user [%s]: |;
! $messages->{'DatabasePassword'}->{en} = heading('Database Password') . qq|
Please provide a good password for the user %s.
Database Password: |;
! $messages->{'BlankPassword'}->{en} = heading('BLANK PASSWORD') . qq|
You must not use a blank password for your MySQL user!
***************
*** 613,621 ****
! $messages->{'FoundMultipleApacheConfFiles'}->{en}=qq|
! ================================
! = MULTIPLE APACHE CONFIG FILES =
! ================================
!
I found more than one possible Apache configuration file:
--- 602,607 ----
! $messages->{'FoundMultipleApacheConfFiles'}->{en} =
! heading('MULTIPLE APACHE CONFIG FILES') . qq|
I found more than one possible Apache configuration file:
***************
*** 624,632 ****
Choose the correct file [1]: |;
! $messages->{'NoApacheConfFiles'}->{en}=qq|
! ===============================
! = NO APACHE CONFIG FILE FOUND =
! ===============================
!
I was not able to find your Apache configuration file.
--- 610,615 ----
Choose the correct file [1]: |;
! $messages->{'NoApacheConfFiles'}->{en} =
! heading('NO APACHE CONFIG FILE FOUND') . qq|
I was not able to find your Apache configuration file.
***************
*** 635,652 ****
Please specify the location of your config file: |;
! $messages->{'NotAFile'}->{en}=qq|
! =======================
! = FILE DOES NOT EXIST =
! =======================
!
The file %s does not exist.
Please press <ENTER> to continue: |;
! $messages->{'EnterApacheUser'}->{en}=qq|
! ====================
! = NEED APACHE USER =
! ====================
!
I was not able to determine the user that Apache is running as. This
information is necessary in order to set the access privileges correctly on
--- 618,627 ----
Please specify the location of your config file: |;
! $messages->{'NotAFile'}->{en} = heading('FILE DOES NOT EXIST') . qq|
The file %s does not exist.
Please press <ENTER> to continue: |;
! $messages->{'EnterApacheUser'}->{en} = heading('NEED APACHE USER') . qq|
I was not able to determine the user that Apache is running as. This
information is necessary in order to set the access privileges correctly on
***************
*** 656,664 ****
Enter the Apache userid: |;
! $messages->{'InvalidUserid'}->{en}=qq|
! ==================
! = INVALID USERID =
! ==================
!
The userid %s is not a valid userid on this system.
--- 631,635 ----
Enter the Apache userid: |;
! $messages->{'InvalidUserid'}->{en} = heading('INVALID USERID') . qq|
The userid %s is not a valid userid on this system.
***************
*** 741,749 ****
! $messages->{'ApacheConfigIntroduction'}->{en}=qq|
! ========================
! = APACHE CONFIGURATION =
! ========================
!
Koha needs to setup your Apache configuration file for the
OPAC and LIBRARIAN virtual hosts. By default this installer
--- 712,717 ----
! $messages->{'ApacheConfigIntroduction'}->{en} =
! heading('APACHE CONFIGURATION') . qq|
Koha needs to setup your Apache configuration file for the
OPAC and LIBRARIAN virtual hosts. By default this installer
***************
*** 756,764 ****
Press <ENTER> to continue: |;
! $messages->{'GetVirtualHostEmail'}->{en}=qq|
! =============================
! = WEB SERVER E-MAIL CONTACT =
! =============================
!
Enter the e-mail address to be used as a contact for the virtual hosts (this
address is displayed if any errors are encountered).
--- 724,729 ----
Press <ENTER> to continue: |;
! $messages->{'GetVirtualHostEmail'}->{en} =
! heading('WEB SERVER E-MAIL CONTACT') . qq|
Enter the e-mail address to be used as a contact for the virtual hosts (this
address is displayed if any errors are encountered).
***************
*** 766,783 ****
E-mail contact [%s]: |;
! $messages->{'GetServerName'}->{en}=qq|
! ======================================
! = WEB SERVER HOST NAME OR IP ADDRESS =
! ======================================
!
Please enter the domain name or ip address of your computer.
Host name or IP Address [%s]: |;
! $messages->{'GetOpacPort'}->{en}=qq|
! ==========================
! = OPAC VIRTUAL HOST PORT =
! ==========================
!
Please enter the port for your OPAC interface. This defaults to port 80, but
if you are already serving web content from this server, you should change it
--- 731,741 ----
E-mail contact [%s]: |;
! $messages->{'GetServerName'}->{en} =
! heading('WEB SERVER HOST NAME OR IP ADDRESS') . qq|
Please enter the domain name or ip address of your computer.
Host name or IP Address [%s]: |;
! $messages->{'GetOpacPort'}->{en} = heading('OPAC VIRTUAL HOST PORT') . qq|
Please enter the port for your OPAC interface. This defaults to port 80, but
if you are already serving web content from this server, you should change it
***************
*** 786,794 ****
Enter the OPAC Port [%s]: |;
! $messages->{'GetIntranetPort'}->{en}=qq|
! ==============================
! = INTRANET VIRTUAL HOST PORT =
! ==============================
!
Please enter the port for your Intranet interface. This must be different from
the OPAC port (%s).
--- 744,749 ----
Enter the OPAC Port [%s]: |;
! $messages->{'GetIntranetPort'}->{en} =
! heading('INTRANET VIRTUAL HOST PORT') . qq|
Please enter the port for your Intranet interface. This must be different from
the OPAC port (%s).
***************
*** 816,824 ****
}
! $messages->{'StartUpdateApache'}->{en}=qq|
! =================================
! = UPDATING APACHE CONFIGURATION =
! =================================
!
Checking for modules that need to be loaded...
|;
--- 771,776 ----
}
! $messages->{'StartUpdateApache'}->{en} =
! heading('UPDATING APACHE CONFIGURATION') . qq|
Checking for modules that need to be loaded...
|;
***************
*** 828,836 ****
$messages->{'LoadingApacheModuleModInc'}->{en}="Loading Includes Apache module.\n";
! $messages->{'ApacheConfigBackupFailed'}->{en}=qq|
! ======================================
! = APACHE CONFIGURATION BACKUP FAILED =
! ======================================
!
An error occurred while trying to make a backup copy of %s.
--- 780,785 ----
$messages->{'LoadingApacheModuleModInc'}->{en}="Loading Includes Apache module.\n";
! $messages->{'ApacheConfigBackupFailed'}->{en} =
! heading('APACHE CONFIGURATION BACKUP FAILED') . qq|
An error occurred while trying to make a backup copy of %s.
***************
*** 842,850 ****
! $messages->{'ApacheAlreadyConfigured'}->{en}=qq|
! =============================
! = APACHE ALREADY CONFIGURED =
! =============================
!
%s appears to already have an entry for Koha
Virtual Hosts. You may need to edit %s
--- 791,796 ----
! $messages->{'ApacheAlreadyConfigured'}->{en} =
! heading('APACHE ALREADY CONFIGURED') . qq|
%s appears to already have an entry for Koha
Virtual Hosts. You may need to edit %s
***************
*** 975,983 ****
}
! $messages->{'IntranetAuthenticationQuestion'}->{en}=qq|
! ===========================
! = INTRANET AUTHENTICATION =
! ===========================
!
I can set it up so that the Intranet/Librarian site is password protected using
Apache's Basic Authorization.
--- 921,926 ----
}
! $messages->{'IntranetAuthenticationQuestion'}->{en} =
! heading('INTRANET AUTHENTICATION') . qq|
I can set it up so that the Intranet/Librarian site is password protected using
Apache's Basic Authorization.
***************
*** 1028,1036 ****
}
! $messages->{'InstallFiles'}->{en}=qq|
! ====================
! = INSTALLING FILES =
! ====================
!
Copying files to installation directories:
--- 971,975 ----
}
! $messages->{'InstallFiles'}->{en} = heading('INSTALLING FILES') . qq|
Copying files to installation directories:
***************
*** 1095,1103 ****
}
! $messages->{'MysqlRootPassword'}->{en}=qq|
! ============================
! = MYSQL ROOT USER PASSWORD =
! ============================
!
To allow us to create the koha database please supply your
mysql server's root user password:
--- 1034,1039 ----
}
! $messages->{'MysqlRootPassword'}->{en} =
! heading('MYSQL ROOT USER PASSWORD') . qq|
To allow us to create the koha database please supply your
mysql server's root user password:
***************
*** 1107,1124 ****
$messages->{'InvalidMysqlRootPassword'}->{en}="Invalid Password. Please try again.";
! $messages->{'CreatingDatabase'}->{en}=qq|
! =====================
! = CREATING DATABASE =
! =====================
!
Creating the MySQL database for Koha...
|;
! $messages->{'CreatingDatabaseError'}->{en}=qq|
! ===========================
! = ERROR CREATING DATABASE =
! ===========================
!
Couldn't connect to the MySQL server for the reason given above.
This is a serious problem, the database will not get installed.
--- 1043,1053 ----
$messages->{'InvalidMysqlRootPassword'}->{en}="Invalid Password. Please try again.";
! $messages->{'CreatingDatabase'}->{en} = heading('CREATING DATABASE') . qq|
Creating the MySQL database for Koha...
|;
! $messages->{'CreatingDatabaseError'}->{en} =
! heading('ERROR CREATING DATABASE') . qq|
Couldn't connect to the MySQL server for the reason given above.
This is a serious problem, the database will not get installed.
***************
*** 1126,1134 ****
Press <ENTER> to continue: |;
! $messages->{'SampleData'}->{en}=qq|
! ===============
! = SAMPLE DATA =
! ===============
!
If you are installing Koha for evaluation purposes, I have a batch of sample
data that you can install now.
--- 1055,1059 ----
Press <ENTER> to continue: |;
! $messages->{'SampleData'}->{en} = heading('SAMPLE DATA') . qq|
If you are installing Koha for evaluation purposes, I have a batch of sample
data that you can install now.
***************
*** 1139,1147 ****
Would you like to install the sample data? Y/[N]: |;
! $messages->{'SampleDataInstalled'}->{en}=qq|
! =========================
! = SAMPLE DATA INSTALLED =
! =========================
!
Sample data has been installed. For some suggestions on testing Koha, please
read the file doc/HOWTO-Testing. If you find any bugs, please submit them at
--- 1064,1069 ----
Would you like to install the sample data? Y/[N]: |;
! $messages->{'SampleDataInstalled'}->{en} =
! heading('SAMPLE DATA INSTALLED') . qq|
Sample data has been installed. For some suggestions on testing Koha, please
read the file doc/HOWTO-Testing. If you find any bugs, please submit them at
***************
*** 1157,1165 ****
Press <ENTER> to continue: |;
! $messages->{'AddBranchPrinter'}->{en}=qq|
! ==========================
! = Add Branch and Printer =
! ==========================
!
Would you like to install an initial branch and printer? [Y]/N: |;
--- 1079,1083 ----
Press <ENTER> to continue: |;
! $messages->{'AddBranchPrinter'}->{en} = heading('Add Branch and Printer') . qq|
Would you like to install an initial branch and printer? [Y]/N: |;
***************
*** 1168,1178 ****
$messages->{'PrinterQueue'}->{en}="Printer Queue [%s]: ";
$messages->{'PrinterName'}->{en}="Printer Name [%s]: ";
! $messages->{'BlankMysqlPassword'}->{en}=qq|
! ========================
! = Blank MySql Password =
! ========================
!
! Do not leave your MySql root password blank unless you know exactly what you
! are doing. To change your MySql root password use the mysqladmin command:
mysqladmin password NEWPASSWORDHERE
--- 1086,1092 ----
$messages->{'PrinterQueue'}->{en}="Printer Queue [%s]: ";
$messages->{'PrinterName'}->{en}="Printer Name [%s]: ";
! $messages->{'BlankMysqlPassword'}->{en} = heading('Blank MySQL Password') . qq|
! Do not leave your MySQL root password blank unless you know exactly what you
! are doing. To change your MySQL root password use the mysqladmin command:
mysqladmin password NEWPASSWORDHERE
***************
*** 1251,1259 ****
}
! $messages->{'UpdateMarcTables'}->{en}=qq|
! =========================================
! = UPDATING MARC FIELD DEFINITION TABLES =
! =========================================
!
You can import marc parameters for :
--- 1165,1170 ----
}
! $messages->{'UpdateMarcTables'}->{en} =
! heading('UPDATING MARC FIELD DEFINITION TABLES') . qq|
You can import marc parameters for :
***************
*** 1267,1274 ****
Choose MARC definition [1]: |;
! $messages->{'Language'}->{en}=qq|
! ====================
! = CHOOSE LANGUAGES =
! ====================
This version of koha supports a few languages.
Enter you languages preferences : either en, fr, es or pl.
--- 1178,1182 ----
Choose MARC definition [1]: |;
! $messages->{'Language'}->{en} = heading('CHOOSE LANGUAGES') . qq|
This version of koha supports a few languages.
Enter you languages preferences : either en, fr, es or pl.
***************
*** 1356,1364 ****
}
! $messages->{'RestartApache'}->{en}=qq|
! ==================
! = RESTART APACHE =
! ==================
!
Apache needs to be restarted to load the new configuration for Koha.
--- 1264,1268 ----
}
! $messages->{'RestartApache'}->{en} = heading('RESTART APACHE') . qq|
Apache needs to be restarted to load the new configuration for Koha.
***************
*** 1415,1418 ****
--- 1319,1331 ----
END { } # module clean-up code here (global destructor)
+
+ =back
+
+ =head1 SEE ALSO
+
+ buildrelease.pl,
+ installer.pl
+
+ =cut
1;
More information about the Koha-cvs
mailing list