projects
/
koha_fer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add configuration file helper to the installer
[koha_fer]
/
misc
/
installer.pl
diff --git
a/misc/installer.pl
b/misc/installer.pl
index
2f66424
..
68ba55a
100644
(file)
--- 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 $etcdir = $ENV{etcdir}||'/etc';
system("mkdir -p $etcdir");
-my
$auto_install_file
;
+my
($auto_install_file,$auto_install)
;
GetOptions(
'i:s' => \$auto_install_file,
);
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;
Install::setetcdir $etcdir;
@@
-69,9
+69,9
@@
if (-e "$etcdir/koha.conf") {
$installedversion=$1;
my $installedversionmsg;
if ($installedversion) {
$installedversion=$1;
my $installedversionmsg;
if ($installedversion) {
- $installedversionmsg=getmessage('KohaVersionInstalled', [$installedversion]);
+
$installedversionmsg=getmessage('KohaVersionInstalled', [$installedversion]);
} else {
} else {
- $installedversionmsg=getmessage('KohaUnknownVersionInstalled');
+
$installedversionmsg=getmessage('KohaUnknownVersionInstalled');
}
my $message=getmessage('KohaAlreadyInstalled', [$etcdir, $kohaversion, $installedversionmsg]);
}
my $message=getmessage('KohaAlreadyInstalled', [$etcdir, $kohaversion, $installedversionmsg]);
@@
-109,11
+109,11
@@
getdatabaseinfo($auto_install);
getapachevhostinfo($auto_install);
getapachevhostinfo($auto_install);
-updateapacheconf();
+updateapacheconf(
$auto_install
);
# basicauthentication();
# basicauthentication();
-installfiles($auto_install);
+installfiles(
1,
$auto_install);
backupmycnf();
backupmycnf();