Plugin for field 110a

[koha.git] / misc / koha.upgrade

diff --git a/misc/koha.upgrade b/misc/koha.upgrade
index 83e6d3d..0449c10 100644 (file)
--- a/misc/koha.upgrade
+++ b/misc/koha.upgrade
@@ -14,35 +14,38 @@ Install::setetcdir($ENV{etcdir}||'/etc');
 my $input;
 loadconfigfile();
 
-($::kohaversion) || ($::kohaversion='unknown version');
+my $curr_ver = Install::getkohaversion();
 $::newversion=`cat koha.version`;
 chomp $::newversion;
+Install::setkohaversion $::newversion;
+
+
 if ($::newversion =~ /RC/) {
-       releasecandidatewarning();
+    releasecandidatewarning();
 }
 
-#FIXME: need kohaversion number
-my $answer = showmessage(getmessage('WelcomeToUpgrader',[$::kohaversion,$::newversion]),'yn');
-
-unless ($answer =~/y/i) {
+my $answer = showmessage(getmessage('WelcomeToUpgrader',[$curr_ver,$::newversion]),'yn','n');
+if ($answer eq "Y" || $answer eq "y") {
+       print "Great! continuing upgrade... \n";
+} else {
        showmessage(getmessage('AbortingInstall'),'none');
        exit;
-} else {
-       print "Great! continuing upgrade... \n";
 };
 
 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');
 
-my $reply=showmessage('Would you like to complete a survey about your library? [Y]/N: ', 'yn', 'y');
-if ($reply=~/y/i) {
-    system("perl kohareporter");
-}
+# my $reply=showmessage('Would you like to complete a survey about your library? [Y]/N: ', 'yn', 'y');
+# if ($reply=~/y/i) {
+#     system("perl kohareporter");
+# }