Plugin for field 126

[koha.git] / misc / koha.upgrade

diff --git a/misc/koha.upgrade b/misc/koha.upgrade
index d0a1fe0..0449c10 100644 (file)
--- a/misc/koha.upgrade
+++ b/misc/koha.upgrade
@@ -14,6 +14,7 @@ Install::setetcdir($ENV{etcdir}||'/etc');
 my $input;
 loadconfigfile();
 
+my $curr_ver = Install::getkohaversion();
 $::newversion=`cat koha.version`;
 chomp $::newversion;
 Install::setkohaversion $::newversion;
@@ -23,7 +24,7 @@ if ($::newversion =~ /RC/) {
     releasecandidatewarning();
 }
 
-my $answer = showmessage(getmessage('WelcomeToUpgrader',[$::newversion]),'yn','n');
+my $answer = showmessage(getmessage('WelcomeToUpgrader',[$curr_ver,$::newversion]),'yn','n');
 if ($answer eq "Y" || $answer eq "y") {
        print "Great! continuing upgrade... \n";
 } else {
@@ -33,11 +34,13 @@ if ($answer eq "Y" || $answer eq "y") {
 
 Install::setkohaversion($::newversion);
 checkperlmodules();
+backupmycnf();
 backupkoha();
 getapacheinfo();
 installfiles();
 # custom templates warning added to installfiles();
 updatedatabase();
+restoremycnf();
 finalizeconfigfile();
 
 showmessage(getmessage('UpgradeCompleted',['FIXME','FIXME','FIXME','FIXME','FIXME','FIXME']),'PressEnter');