X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=misc%2Finstaller.pl;h=68ba55aa34b78641057db127209ca293505c2145;hb=e449c139fff95241bd3b9f1ddfc506d786a6e9a6;hp=2f6642420e3d223851003ffe7bce05cd1bd26af8;hpb=19bbe6a37e838cb27bc80a0bb138cfdbc1b5cdd1;p=koha_fer

diff --git a/misc/installer.pl b/misc/installer.pl
index 2f6642420e..68ba55aa34 100644
--- a/misc/installer.pl
+++ b/misc/installer.pl
@@ -35,11 +35,11 @@ Install::setdomainname $domainname;
 my $etcdir = $ENV{etcdir}||'/etc';
 system("mkdir -p $etcdir");
 
-my $auto_install_file;
+my ($auto_install_file,$auto_install);
 GetOptions(
     'i:s'    => \$auto_install_file,
 );
-my $auto_install = read_autoinstall_file($auto_install_file);
+$auto_install = read_autoinstall_file($auto_install_file) if $auto_install_file;
 
 Install::setetcdir $etcdir;
 
@@ -69,9 +69,9 @@ if (-e "$etcdir/koha.conf") {
     $installedversion=$1;
     my $installedversionmsg;
     if ($installedversion) {
-	$installedversionmsg=getmessage('KohaVersionInstalled', [$installedversion]);
+		$installedversionmsg=getmessage('KohaVersionInstalled', [$installedversion]);
     } else {
-	$installedversionmsg=getmessage('KohaUnknownVersionInstalled');
+		$installedversionmsg=getmessage('KohaUnknownVersionInstalled');
     }
 
     my $message=getmessage('KohaAlreadyInstalled', [$etcdir, $kohaversion, $installedversionmsg]);
@@ -109,11 +109,11 @@ getdatabaseinfo($auto_install);
 
 getapachevhostinfo($auto_install);
 
-updateapacheconf();
+updateapacheconf($auto_install);
 
 # basicauthentication();
 
-installfiles($auto_install);
+installfiles(1,$auto_install);
 
 backupmycnf();