[Koha-cvs] CVS: koha/misc auto_install_file,NONE,1.1 installer.pl,1.16,1.17 Install.pm,1.73,1.74
Paul POULAIN
tipaul at users.sourceforge.net
Tue Jun 22 13:33:50 CEST 2004
Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18341/misc
Modified Files:
installer.pl Install.pm
Added Files:
auto_install_file
Log Message:
adding auto-install option.
run ./installer -i /path/to/install_file
--- NEW FILE ---
# set here your mysql root password
# XXX is the CVS default. It is considered as INVALID, and installer will die if called with such a parameter
MysqlRootPassword=XXX
# directories & Apache setup
EnterApacheUser=paul
GetOpacDir = /home/httpd/html/koha/opac
GetIntranetDir = /home/httpd/html/koha/intranet
KohaLogDir = /var/log/httpd
# database parameters
# name
database=koha_test
# host
DatabaseHost=localhost
# user
DatabaseUser=koha_test
# password
DatabasePassword=koha_test
# webmaster email
GetVirtualHostEmail=email at host.com
# server name
servername=127.0.0.1
# opac port
opacport=1000
# the intranet port
intranetport=1001
# intranet will be on 127.0.0.1:1001
# opac will be on 127.0.0.1:1000
# set this field to ON to answer OK to any question just requiring and <ENTER>
NoPressEnter=ON
# MARC flavour : 1=MARC21, 2=UNIMARC, N=None
UpdateMarcTables=2
BranchName=XXXX
BranchCode=XXXX
Language=fr
PrinterName=lp
PrinterQueue=/path/to/lp
Index: installer.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/installer.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** installer.pl 21 Jun 2004 17:13:32 -0000 1.16
--- installer.pl 22 Jun 2004 11:33:47 -0000 1.17
***************
*** 120,126 ****
databasesetup($auto_install);
! updatedatabase();
! populatedatabase();
restoremycnf();
--- 120,126 ----
databasesetup($auto_install);
! updatedatabase($auto_install);
! populatedatabase($auto_install);
restoremycnf();
***************
*** 128,144 ****
finalizeconfigfile();
! restartapache();
!
!
!
!
! showmessage(getmessage('AuthenticationWarning', [$etcdir]), 'PressEnter');
showmessage(getmessage('Completed', [ Install::getservername(), Install::getintranetport(), Install::getservername(), Install::getopacport()]), 'PressEnter');
-
-
-
if (-f "kohareporter") {
my $reply=showmessage('Would you like to complete a survey about your library?', 'yn', 'y');
--- 128,137 ----
finalizeconfigfile();
! restartapache($auto_install);
+ showmessage(getmessage('AuthenticationWarning', [$etcdir]), 'PressEnter') unless ($auto_install->{NoPressEnter});
showmessage(getmessage('Completed', [ Install::getservername(), Install::getintranetport(), Install::getservername(), Install::getopacport()]), 'PressEnter');
if (-f "kohareporter") {
my $reply=showmessage('Would you like to complete a survey about your library?', 'yn', 'y');
Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -r1.73 -r1.74
*** Install.pm 21 Jun 2004 17:13:33 -0000 1.73
--- Install.pm 22 Jun 2004 11:33:47 -0000 1.74
***************
*** 110,114 ****
$termios->getattr();
my $terminal = Term::Cap->Tgetent({OSPEED=>$termios->getospeed()});
! my $clear_string = "\n\n"; #MJR: was $terminal->Tputs('cl');
sub heading ($) {
--- 110,114 ----
$termios->getattr();
my $terminal = Term::Cap->Tgetent({OSPEED=>$termios->getospeed()});
! my $clear_string = "\n";
sub heading ($) {
***************
*** 261,277 ****
$messages->{'Completed'}->{en} = heading('INSTALLATION COMPLETE') . qq|
Congratulations ... your Koha installation is complete!
-
You will be able to connect to your Librarian interface at:
-
http://%s\:%s/
-
use the koha admin mysql login and password to connect to this interface.
-
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: |;
--- 261,270 ----
***************
*** 357,360 ****
--- 350,356 ----
}
close CONF;
+ if ($retval->{MysqlRootPassword} eq "XXX") {
+ print "ERROR : the root password is XXX. It is NOT valid. Edit your auto_install_file\n";
+ }
return $retval;
}
***************
*** 963,967 ****
if ($auto_install->{GetOpacDir}) {
$opacdir=$auto_install->{GetOpacDir};
! print "auto-setting OpacDir to $opacdir\n";
} else {
$message=getmessage('GetOpacDir', [$opacdir]);
--- 959,963 ----
if ($auto_install->{GetOpacDir}) {
$opacdir=$auto_install->{GetOpacDir};
! print ON_YELLOW.BLACK."auto-setting OpacDir to : $opacdir".RESET."\n";
} else {
$message=getmessage('GetOpacDir', [$opacdir]);
***************
*** 970,974 ****
if ($auto_install->{GetIntranetDir}) {
$intranetdir=$auto_install->{GetIntranetDir};
! print "auto-setting IntranetDir to $intranetdir\n";
} else {
$message=getmessage('GetIntranetDir', [$intranetdir]);
--- 966,970 ----
if ($auto_install->{GetIntranetDir}) {
$intranetdir=$auto_install->{GetIntranetDir};
! print ON_YELLOW.BLACK."auto-setting IntranetDir to : $intranetdir".RESET."\n";
} else {
$message=getmessage('GetIntranetDir', [$intranetdir]);
***************
*** 989,993 ****
if ($auto_install->{GetOpacDir}) {
$kohalogdir=$auto_install->{KohaLogDir};
! print "auto-setting OpacDir to $opacdir\n";
} else {
my $message=getmessage('GetKohaLogDir', [$kohalogdir]);
--- 985,989 ----
if ($auto_install->{GetOpacDir}) {
$kohalogdir=$auto_install->{KohaLogDir};
! print ON_YELLOW.BLACK."auto-setting log dir to : $kohalogdir".RESET."\n";
} else {
my $message=getmessage('GetKohaLogDir', [$kohalogdir]);
***************
*** 1121,1125 ****
if ($auto_install->{database}) {
$database=$auto_install->{database};
! print "auto-setting database to $database\n";
} else {
$message=getmessage('DatabaseName', [$database]);
--- 1117,1121 ----
if ($auto_install->{database}) {
$database=$auto_install->{database};
! print ON_YELLOW.BLACK."auto-setting database to : $database".RESET."\n";
} else {
$message=getmessage('DatabaseName', [$database]);
***************
*** 1130,1134 ****
if ($auto_install->{DatabaseHost}) {
$hostname=$auto_install->{DatabaseHost};
! print "auto-setting database host to $hostname\n";
} else {
$message=getmessage('DatabaseHost', [$hostname]);
--- 1126,1130 ----
if ($auto_install->{DatabaseHost}) {
$hostname=$auto_install->{DatabaseHost};
! print ON_YELLOW.BLACK."auto-setting database host to : $hostname".RESET."\n";
} else {
$message=getmessage('DatabaseHost', [$hostname]);
***************
*** 1139,1143 ****
if ($auto_install->{DatabaseUser}) {
$user=$auto_install->{DatabaseUser};
! print "auto-setting DB user to $user\n";
} else {
$message=getmessage('DatabaseUser', [$database, $hostname, $user]);
--- 1135,1139 ----
if ($auto_install->{DatabaseUser}) {
$user=$auto_install->{DatabaseUser};
! print ON_YELLOW.BLACK."auto-setting DB user to : $user".RESET."\n";
} else {
$message=getmessage('DatabaseUser', [$database, $hostname, $user]);
***************
*** 1150,1154 ****
if ($auto_install->{DatabasePassword}) {
$pass=$auto_install->{DatabasePassword};
! print "auto-setting database password to $pass\n";
} else {
$pass=showmessage($message, 'free', $pass);
--- 1146,1150 ----
if ($auto_install->{DatabasePassword}) {
$pass=$auto_install->{DatabasePassword};
! print ON_YELLOW.BLACK."auto-setting database password to : $pass".RESET."\n";
} else {
$pass=showmessage($message, 'free', $pass);
***************
*** 1278,1282 ****
if ($auto_install->{EnterApacheUser}) {
$message = $auto_install->{EnterApacheUser};
! print "auto-setting ApacheUser to $message\n";
} else {
$message=getmessage('EnterApacheUser', [$etcdir]);
--- 1274,1278 ----
if ($auto_install->{EnterApacheUser}) {
$message = $auto_install->{EnterApacheUser};
! print ON_YELLOW.BLACK."auto-setting Apache User to : $message".RESET."\n";
} else {
$message=getmessage('EnterApacheUser', [$etcdir]);
***************
*** 1368,1372 ****
if ($auto_install->{GetVirtualHostEmail}) {
$svr_admin=$auto_install->{GetVirtualHostEmail};
! print "auto-setting VirtualHostEmail to $svr_admin\n";
} else {
showmessage(getmessage('ApacheConfigIntroduction',[$etcdir,$etcdir]), 'PressEnter');
--- 1364,1368 ----
if ($auto_install->{GetVirtualHostEmail}) {
$svr_admin=$auto_install->{GetVirtualHostEmail};
! print ON_YELLOW.BLACK."auto-setting VirtualHostEmail to : $svr_admin".RESET."\n";
} else {
showmessage(getmessage('ApacheConfigIntroduction',[$etcdir,$etcdir]), 'PressEnter');
***************
*** 1375,1379 ****
if ($auto_install->{servername}) {
$servername=$auto_install->{servername};
! print "auto-setting server name to $servername\n";
} else {
$servername=showmessage(getmessage('GetServerName', [$servername]), 'free', $servername);
--- 1371,1375 ----
if ($auto_install->{servername}) {
$servername=$auto_install->{servername};
! print ON_YELLOW.BLACK."auto-setting server name to : $servername".RESET."\n";
} else {
$servername=showmessage(getmessage('GetServerName', [$servername]), 'free', $servername);
***************
*** 1381,1391 ****
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);
--- 1377,1387 ----
if ($auto_install->{opacport}) {
$opacport=$auto_install->{opacport};
! print ON_YELLOW.BLACK."auto-setting opac port to : $opacport".RESET."\n";
} else {
$opacport=showmessage(getmessage('GetOpacPort', [$opacport]), 'numerical', $opacport);
}
if ($auto_install->{intranetport}) {
! $intranetport=$auto_install->{intranetport};
! print ON_YELLOW.BLACK."auto-setting intranet port to : $intranetport".RESET."\n";
} else {
$intranetport=showmessage(getmessage('GetIntranetPort', [$opacport, $intranetport]), 'numerical', $intranetport);
***************
*** 1643,1675 ****
system("mv ".$tgt." ".$tgt.strftime("%Y%m%d%H%M",localtime()));
}
!
! print getmessage('CopyingFiles', [$desc,$tgt]);
! startsysout;
! system("cp -R ".$src." ".$tgt);
}
my ($auto_install) = @_;
! showmessage(getmessage('InstallFiles'),'none');
! 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");
#MJR: is this necessary?
if ($> == 0) {
! system("chown -R $httpduser:$httpduser $opacdir $intranetdir");
! }
system("chmod -R a+rx $opacdir $intranetdir");
! # Create /etc/koha.conf
! my $old_umask = umask(027); # make sure koha.conf is never world-readable
! open(SITES,">$etcdir/koha.conf.tmp") or warn "Couldn't create file at $etcdir. Must have write capability.\n";
! print SITES qq|
database=$database
hostname=$hostname
--- 1639,1670 ----
system("mv ".$tgt." ".$tgt.strftime("%Y%m%d%H%M",localtime()));
}
! print getmessage('CopyingFiles', [$desc,$tgt]);
! startsysout;
! system("cp -R ".$src." ".$tgt);
}
my ($auto_install) = @_;
! showmessage(getmessage('InstallFiles'),'none');
! 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");
#MJR: is this necessary?
if ($> == 0) {
! system("chown -R $httpduser:$httpduser $opacdir $intranetdir");
! }
system("chmod -R a+rx $opacdir $intranetdir");
! # Create /etc/koha.conf
! my $old_umask = umask(027); # make sure koha.conf is never world-readable
! open(SITES,">$etcdir/koha.conf.tmp") or warn "Couldn't create file at $etcdir. Must have write capability.\n";
! print SITES qq|
database=$database
hostname=$hostname
***************
*** 1684,1712 ****
opachtdocs=$opacdir/htdocs/opac-tmpl
|;
! close(SITES);
! umask($old_umask);
startsysout();
#MJR: can't help but this be broken, can we?
! chmod 0440, "$etcdir/koha.conf.tmp";
#MJR: does this contain any passwords?
! 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";
! 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: report that we haven't chown()d.
else {
print "Please check permissions in $intranetdir/scripts/z3950daemon\n";
}
!
! showmessage(getmessage('OldFiles'),'PressEnter') unless $auto_install->{NoPressEnter};
}
--- 1679,1706 ----
opachtdocs=$opacdir/htdocs/opac-tmpl
|;
! close(SITES);
! umask($old_umask);
startsysout();
#MJR: can't help but this be broken, can we?
! chmod 0440, "$etcdir/koha.conf.tmp";
#MJR: does this contain any passwords?
! 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";
! 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: report that we haven't chown()d.
else {
print "Please check permissions in $intranetdir/scripts/z3950daemon\n";
}
! showmessage(getmessage('OldFiles'),'PressEnter') unless $auto_install->{NoPressEnter};
}
***************
*** 1857,1865 ****
sub updatedatabase {
# At this point, $etcdir/koha.conf must exist, for C4::Context
$ENV{"KOHA_CONF"}=$etcdir.'/koha.conf';
if (! -e $ENV{"KOHA_CONF"}) { $ENV{"KOHA_CONF"}=$etcdir.'/koha.conf.tmp'; }
startsysout();
! my $result=system ("perl -I $intranetdir/modules scripts/updater/updatedatabase");
if ($result) {
restoremycnf();
--- 1851,1860 ----
sub updatedatabase {
+ my ($auto_install) = @_;
# At this point, $etcdir/koha.conf must exist, for C4::Context
$ENV{"KOHA_CONF"}=$etcdir.'/koha.conf';
if (! -e $ENV{"KOHA_CONF"}) { $ENV{"KOHA_CONF"}=$etcdir.'/koha.conf.tmp'; }
startsysout();
! my $result=system ("perl -I $intranetdir/modules scripts/updater/updatedatabase -s");
if ($result) {
restoremycnf();
***************
*** 1867,1873 ****
exit;
}
!
! my $response=showmessage(getmessage('UpdateMarcTables'), 'restrictchar 12N', '1');
!
startsysout();
if ($response eq '1') {
--- 1862,1872 ----
exit;
}
! my $response;
! if ($auto_install->{UpdateMarcTables}) {
! $response=$auto_install->{UpdateMarcTables};
! print ON_YELLOW.BLACK."auto-setting UpdateMarcTable to : $response".RESET."\n";
! } else {
! $response=showmessage(getmessage('UpdateMarcTables'), 'restrictchar 12N', '1');
! }
startsysout();
if ($response eq '1') {
***************
*** 1881,1886 ****
delete($ENV{"KOHA_CONF"});
! print RESET."\n\nFinished updating of database. Press <ENTER> to continue...";
! <STDIN>;
}
--- 1880,1885 ----
delete($ENV{"KOHA_CONF"});
! print RESET."\nFinished updating of database. Press <ENTER> to continue..." unless ($auto_install->{NoPressEnter});
! <STDIN> unless ($auto_install->{NoPressEnter});
}
***************
*** 1896,1925 ****
sub populatedatabase {
! # my $response=showmessage(getmessage('SampleData'), 'yn', 'n');
! # if ($response =~/^y/i) {
! #
! # FIXME: These calls are now unsafe and should either be removed
! # or updated to use -u$user and no mysqlpass_quoted
! #
! # system("gunzip -d < sampledata-1.2.gz | $mysqldir/bin/mysql -u$mysqluser $mysqlpass_quoted $database");
! # system("$mysqldir/bin/mysql -u$mysqluser $mysqlpass_quoted $database -e \"insert into branches (branchcode,branchname,issuing) values ('MAIN', 'Main Library', 1)\"");
! # system("$mysqldir/bin/mysql -u$mysqluser $mysqlpass_quoted $database -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'IS')\"");
! # system("$mysqldir/bin/mysql -u$mysqluser $mysqlpass_quoted $database -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'CU')\"");
! # system("$mysqldir/bin/mysql -u$mysqluser $mysqlpass_quoted $database -e \"insert into printers (printername,printqueue,printtype) values ('Circulation Desk Printer', 'lp', 'hp')\"");
! # showmessage(getmessage('SampleDataInstalled'), 'PressEnter','',1);
! # } else {
! my $input;
! my $response=showmessage(getmessage('AddBranchPrinter'), 'yn', 'y');
!
unless ($response =~/^n/i) {
! my $branch='Main Library';
! $branch=showmessage(getmessage('BranchName', [$branch]), 'free', $branch, 1);
! $branch=~s/[^A-Za-z0-9\s]//g;
!
my $branchcode=$branch;
$branchcode=~s/[^A-Za-z0-9]//g;
$branchcode=uc($branchcode);
$branchcode=substr($branchcode,0,4);
! $branchcode=showmessage(getmessage('BranchCode', [$branchcode]), 'free', $branchcode, 1);
$branchcode=~s/[^A-Za-z0-9]//g;
$branchcode=uc($branchcode);
--- 1895,1923 ----
sub populatedatabase {
! my ($auto_install) = @_;
! my $input;
! my $response;
! my $branch;
! if ($auto_install->{BranchName}) {
! $branch=$auto_install->{BranchName};
! print ON_YELLOW.BLACK."auto-setting a branch : $branch".RESET."\n";
! } else {
! $response=showmessage(getmessage('AddBranchPrinter'), 'yn', 'y');
unless ($response =~/^n/i) {
! $branch=showmessage(getmessage('BranchName', [$branch]), 'free', $branch, 1);
! $branch=~s/[^A-Za-z0-9\s]//g;
! }
! }
! if ($branch) {
my $branchcode=$branch;
$branchcode=~s/[^A-Za-z0-9]//g;
$branchcode=uc($branchcode);
$branchcode=substr($branchcode,0,4);
! if ($auto_install->{BranchCode}) {
! $branchcode=$auto_install->{BranchCode};
! print ON_YELLOW.BLACK."auto-setting branch code : $branchcode".RESET."\n";
! } else {
! $branchcode=showmessage(getmessage('BranchCode', [$branchcode]), 'free', $branchcode, 1);
! }
$branchcode=~s/[^A-Za-z0-9]//g;
$branchcode=uc($branchcode);
***************
*** 1932,1949 ****
system("$mysqldir/bin/mysql -u$user $database -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'CU')\"");
! my $printername='Library Printer';
! $printername=showmessage(getmessage('PrinterName', [$printername]), 'free', $printername, 1);
! $printername=~s/[^A-Za-z0-9\s]//g;
!
! my $printerqueue='lp';
! $printerqueue=showmessage(getmessage('PrinterQueue', [$printerqueue]), 'free', $printerqueue, 1);
! $printerqueue=~s/[^A-Za-z0-9]//g;
startsysout();
system("$mysqldir/bin/mysql -u$user $database -e \"insert into printers (printername,printqueue,printtype) values ('$printername', '$printerqueue', '')\"");
! # }
! my $language=showmessage(getmessage('Language'), 'free', 'en');
startsysout();
system("$mysqldir/bin/mysql -u$user $database -e \"update systempreferences set value='$language' where variable='opaclanguages'\"");
- }
}
--- 1930,1961 ----
system("$mysqldir/bin/mysql -u$user $database -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'CU')\"");
! my $printername;
! my $printerqueue;
! if ($auto_install->{PrinterName}) {
! $printername=$auto_install->{PrinterName};
! print ON_YELLOW.BLACK."auto-setting a printer : $printername".RESET."\n";
! } else {
! $printername=showmessage(getmessage('PrinterName', [$printername]), 'free', $printername, 1);
! $printername=~s/[^A-Za-z0-9\s]//g;
! }
! if ($auto_install->{PrinterQueue}) {
! $printerqueue=$auto_install->{PrinterQueue};
! print ON_YELLOW.BLACK."auto-setting printer queue to : $printerqueue".RESET."\n";
! } else {
! $printerqueue=showmessage(getmessage('PrinterQueue', [$printerqueue]), 'free', $printerqueue, 1);
! $printerqueue=~s/[^A-Za-z0-9]//g;
! }
startsysout();
system("$mysqldir/bin/mysql -u$user $database -e \"insert into printers (printername,printqueue,printtype) values ('$printername', '$printerqueue', '')\"");
! }
! my $language;
! if ($auto_install->{Language}) {
! $language=$auto_install->{Language};
! print ON_YELLOW.BLACK."auto-setting language to : $language".RESET."\n";
! } else {
! $language=showmessage(getmessage('Language'), 'free', 'en');
! }
startsysout();
system("$mysqldir/bin/mysql -u$user $database -e \"update systempreferences set value='$language' where variable='opaclanguages'\"");
}
***************
*** 1965,1983 ****
sub restartapache {
!
! my $response=showmessage(getmessage('RestartApache'), 'yn', 'y');
unless ($response=~/^n/i) {
! startsysout();
! # Need to support other init structures here?
! if (-e "/etc/rc.d/init.d/httpd") {
! system('su root -c /etc/rc.d/init.d/httpd restart');
! } elsif (-e "/etc/init.d/apache") {
! system('su root -c /etc/init.d/apache restart');
! } elsif (-e "/etc/init.d/apache-ssl") {
! system('su root -c /etc/init.d/apache-ssl restart');
}
- }
-
}
--- 1977,1996 ----
sub restartapache {
! my ($auto_install)=@_;
! my $response;
! $response=showmessage(getmessage('RestartApache'), 'yn', 'y') unless ($auto_install->{NoPressEnter});
! $response='y' if ($auto_install->{NoPressEnter});
unless ($response=~/^n/i) {
! startsysout();
! # Need to support other init structures here?
! if (-e "/etc/rc.d/init.d/httpd") {
! system('su root -c /etc/rc.d/init.d/httpd restart');
! } elsif (-e "/etc/init.d/apache") {
! system('su root -c /etc/init.d/apache restart');
! } elsif (-e "/etc/init.d/apache-ssl") {
! system('su root -c /etc/init.d/apache-ssl restart');
! }
}
}
More information about the Koha-cvs
mailing list