Bug 13876: Add the from => to versions in the filenames

Additionally to the datetime, it could be useful to have the version
numbers in the log filenames.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>

diff --git a/installer/install.pl b/installer/install.pl
index e43caa0..1fbc685 100755 (executable)
--- a/installer/install.pl
+++ b/installer/install.pl
@@ -322,7 +322,12 @@ elsif ( $step && $step == 3 ) {
 
         my $now = POSIX::strftime( "%Y-%m-%dT%H:%M:%S", localtime() );
         my $logdir = C4::Context->config('logdir');
-        my ( $logfilepath, $logfilepath_errors ) = ( chk_log($logdir, "updatedatabase_$now"), chk_log($logdir, "updatedatabase-error_$now") );
+        my $dbversion = C4::Context->preference('Version');
+        my $kohaversion = C4::Context->KOHAVERSION;
+        $kohaversion =~ s/(.*\..*)\.(.*)\.(.*)/$1$2$3/;
+
+        my $filename_suffix = join '_', $now, $dbversion, $kohaversion;
+        my ( $logfilepath, $logfilepath_errors ) = ( chk_log($logdir, "updatedatabase_$filename_suffix"), chk_log($logdir, "updatedatabase-error_$filename_suffix") );
 
         my $cmd = C4::Context->config("intranetdir") . "/installer/data/$info{dbms}/updatedatabase.pl >> $logfilepath 2>> $logfilepath_errors";