[Koha-cvs] CVS: koha/misc buildrelease,1.21,1.22 installer.pl,1.18,1.19 Install.pm,1.78,1.79
Paul POULAIN
tipaul at users.sourceforge.net
Tue Nov 16 14:04:21 CET 2004
Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14744/misc
Modified Files:
buildrelease installer.pl Install.pm
Log Message:
bugfixes in installer
Index: buildrelease
===================================================================
RCS file: /cvsroot/koha/koha/misc/buildrelease,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** buildrelease 28 Nov 2003 09:40:18 -0000 1.21
--- buildrelease 16 Nov 2004 13:04:18 -0000 1.22
***************
*** 283,287 ****
system("mv $rootdir/intranet-cgi/updater $rootdir/scripts");
system("mv $rootdir/intranet-cgi/misc $rootdir/scripts");
- system("mv $rootdir/intranet-cgi/marc $rootdir/scripts");
# move only batch & daemon. pl script stay here
--- 283,286 ----
Index: installer.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/installer.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** installer.pl 22 Jun 2004 15:32:43 -0000 1.18
--- installer.pl 16 Nov 2004 13:04:18 -0000 1.19
***************
*** 36,44 ****
system("mkdir -p $etcdir");
! my $auto_install_file;
GetOptions(
'i:s' => \$auto_install_file,
);
! my $auto_install = read_autoinstall_file($auto_install_file);
Install::setetcdir $etcdir;
--- 36,44 ----
system("mkdir -p $etcdir");
! my ($auto_install_file,$auto_install);
GetOptions(
'i:s' => \$auto_install_file,
);
! $auto_install = read_autoinstall_file($auto_install_file) if $auto_install_file;
Install::setetcdir $etcdir;
***************
*** 70,76 ****
my $installedversionmsg;
if ($installedversion) {
! $installedversionmsg=getmessage('KohaVersionInstalled', [$installedversion]);
} else {
! $installedversionmsg=getmessage('KohaUnknownVersionInstalled');
}
--- 70,76 ----
my $installedversionmsg;
if ($installedversion) {
! $installedversionmsg=getmessage('KohaVersionInstalled', [$installedversion]);
} else {
! $installedversionmsg=getmessage('KohaUnknownVersionInstalled');
}
***************
*** 114,118 ****
# basicauthentication();
! installfiles($auto_install);
backupmycnf();
--- 114,118 ----
# basicauthentication();
! installfiles(1,$auto_install);
backupmycnf();
Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -r1.78 -r1.79
*** Install.pm 2 Nov 2004 18:03:15 -0000 1.78
--- Install.pm 16 Nov 2004 13:04:18 -0000 1.79
***************
*** 127,134 ****
heading('Welcome to the Koha Installer') . qq|
This program will ask some questions and try to install koha for you.
! You need to know: where most koha files should be stored (you can set
! the prefix environment variable for this); the username and password of
! a mysql superuser; and details of your library setup. You may also need
! to know details of your Apache setup.
If you want to install the Koha configuration files somewhere other than
--- 127,135 ----
heading('Welcome to the Koha Installer') . qq|
This program will ask some questions and try to install koha for you.
! You need to know:
! * where most koha files should be stored (you can set the prefix environment variable for this);
! * the username and password of a mysql superuser;
! * Details of your library setup.
! * Details of your Apache setup.
If you want to install the Koha configuration files somewhere other than
***************
*** 141,145 ****
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
--- 142,146 ----
at the prompt.
! Note that 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
***************
*** 266,270 ****
and the OPAC interface at:
http://%s\:%s/
! Please read the Hints file and visit http://www.koha.org
Press <ENTER> to exit the installer: |;
--- 267,276 ----
and the OPAC interface at:
http://%s\:%s/
!
! NOTE: You need to add lines to your main httpd.conf to include
! /etc/koha-httpd.conf and to make sure it is listening on the right ports
! (using the Listen directive). Then, restart Apache.
!
! Please read the Hints file and visit http://www.koha.org (in english) or www.koha-fr.org (in french)
Press <ENTER> to exit the installer: |;
***************
*** 1607,1624 ****
sub installfiles {
! my ($auto_install) = @_;
! #MJR: preserve old files, just in case
sub neatcopy {
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())]) unless ($auto_install->{NoPressEnter});
- startsysout();
system("mv ".$tgt." ".$tgt.strftime("%Y%m%d%H%M",localtime()));
}
print getmessage('CopyingFiles', [$desc,$tgt]) unless ($auto_install->{NoPressEnter});
! startsysout;
! system("cp -R ".$src." ".$tgt);
}
--- 1613,1631 ----
sub installfiles {
! my ($is_first_install,$auto_install) = @_;
! # $is_install is set if it's a fresh install and not an upgrade. If it's an upgrade, copy old files.
!
sub neatcopy {
my $desc = shift;
my $src = shift;
my $tgt = shift;
! my $auto_install = shift;
! my $is_first_install = shift;
! if (!$is_first_install && -e $tgt) {
print getmessage('CopyingFiles', ["old ".$desc,$tgt.strftime("%Y%m%d%H%M",localtime())]) unless ($auto_install->{NoPressEnter});
system("mv ".$tgt." ".$tgt.strftime("%Y%m%d%H%M",localtime()));
}
print getmessage('CopyingFiles', [$desc,$tgt]) unless ($auto_install->{NoPressEnter});
! system("cp -R ".$src."/* ".$tgt);
}
***************
*** 1626,1635 ****
showmessage(getmessage('InstallFiles'),'none') unless ($auto_install->{NoPressEnter});
! neatcopy("admin templates", 'intranet-html', "$intranetdir/htdocs");
! neatcopy("admin interface", 'intranet-cgi', "$intranetdir/cgi-bin");
! neatcopy("main scripts", 'scripts', "$intranetdir/scripts");
! neatcopy("perl modules", 'modules', "$intranetdir/modules");
! neatcopy("OPAC templates", 'opac-html', "$opacdir/htdocs");
! neatcopy("OPAC interface", 'opac-cgi', "$opacdir/cgi-bin");
startsysout();
system("touch $opacdir/cgi-bin/opac");
--- 1633,1642 ----
showmessage(getmessage('InstallFiles'),'none') unless ($auto_install->{NoPressEnter});
! neatcopy("admin templates", 'intranet-html', "$intranetdir/htdocs",$auto_install,$is_first_install);
! neatcopy("admin interface", 'intranet-cgi', "$intranetdir/cgi-bin",$auto_install,$is_first_install);
! neatcopy("main scripts", 'scripts', "$intranetdir/scripts",$auto_install,$is_first_install);
! neatcopy("perl modules", 'modules', "$intranetdir/modules",$auto_install,$is_first_install);
! neatcopy("OPAC templates", 'opac-html', "$opacdir/htdocs",$auto_install,$is_first_install);
! neatcopy("OPAC interface", 'opac-cgi', "$opacdir/cgi-bin",$auto_install,$is_first_install);
startsysout();
system("touch $opacdir/cgi-bin/opac");
***************
*** 1668,1672 ****
chmod 0755, "$intranetdir/scripts/z3950daemon/z3950-daemon-launch.sh", "$intranetdir/scripts/z3950daemon/z3950-daemon-shell.sh", "$intranetdir/scripts/z3950daemon/processz3950queue";
- #MJR: generate our own settings, to remove the /home/paul hardwired links
open(FILE,">$intranetdir/scripts/z3950daemon/z3950-daemon-options");
print FILE "RunAsUser=$httpduser\nKohaZ3950Dir=$intranetdir/scripts/z3950daemon\nKohaModuleDir=$intranetdir/modules\nLogDir=$kohalogdir\nKohaConf=$etcdir/koha.conf";
--- 1675,1678 ----
***************
*** 1681,1685 ****
print "Please check permissions in $intranetdir/scripts/z3950daemon\n";
}
! showmessage(getmessage('OldFiles'),'PressEnter') unless $auto_install->{NoPressEnter};
}
--- 1687,1691 ----
print "Please check permissions in $intranetdir/scripts/z3950daemon\n";
}
! showmessage(getmessage('OldFiles'),'PressEnter') unless ($auto_install->{NoPressEnter} or $is_first_install);
}
***************
*** 1811,1815 ****
such as DANMARC. We would like to hear from you if you do.
! UPDATE : If you UPDATE your version from a previous 2.x.x, the right choice here is N (None) to preserve your local MARC setup.
Choose MARC definition [1]: |;
--- 1817,1821 ----
such as DANMARC. We would like to hear from you if you do.
! UPGRADE : If you UPGRADE your version from a previous 2.x.x, the right choice here is N (None) to preserve your local MARC setup.
Choose MARC definition [1]: |;
***************
*** 1848,1852 ****
print ON_YELLOW.BLACK."auto-setting UpdateMarcTable to : $response".RESET."\n";
} else {
! $response=showmessage(getmessage('UpdateMarcTables'), 'restrictchar 12N', '1');
}
startsysout();
--- 1854,1858 ----
print ON_YELLOW.BLACK."auto-setting UpdateMarcTable to : $response".RESET."\n";
} else {
! $response=showmessage(getmessage('UpdateMarcTables'), 'restrictchar 12Nn', '1');
}
startsysout();
More information about the Koha-cvs
mailing list