From 056c211411a1897a8e703db769451d19a014d2d0 Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Wed, 5 Jan 2005 14:31:06 +0000
Subject: [PATCH] minor update just before releasing official 2.2.0

---
 misc/Install.pm   | 10 +++++-----
 misc/buildrelease |  2 +-
 misc/koha.upgrade | 17 ++++++++---------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/misc/Install.pm b/misc/Install.pm
index 2f3649ce10..97c82c5855 100644
--- a/misc/Install.pm
+++ b/misc/Install.pm
@@ -148,7 +148,7 @@ Are you ready to begin the installation? ([Y]/N): |;
 
 $messages->{'WelcomeToUpgrader'}->{en} =
    heading('Welcome to the Koha Upgrader') . qq|
-You are attempting to upgrade from Koha %s to %s.
+You are attempting to upgrade to Koha %s.
 
 We recommend that you do a complete backup of all your files before upgrading.
 This upgrade script will make a backup copy of your files for you.
@@ -1818,7 +1818,8 @@ nothing will be added, and you must create them all yourself.
 Only choose N if you want to use a MARC format not listed here,
 such as DANMARC.  We would like to hear from you if you do.
 
-UPGRADE : If you UPGRADE your version from a previous 2.x.x, the right choice here is N (None) to preserve your local MARC setup.
+*** UPGRADE ***
+If you UPGRADE your version from a previous 2.x.x, the right choice here is N (None) to preserve your local MARC setup.
 
 Choose MARC definition [1]: |;
 
@@ -1826,9 +1827,8 @@ $messages->{'Language'}->{en} = heading('CHOOSE LANGUAGE') . qq|
 This version of koha supports a few languages.
 
   en : default language, all pages available
-  fr : complete translation (except pictures)
-  es : partial librarian site translation (including pictures)
-  pl : complete OPAC and partial librarian translation
+  fr : complete translation
+  es : partial librarian site translation
   zh_TW : partial translation
 
 en is used when a screen is not available in your language
diff --git a/misc/buildrelease b/misc/buildrelease
index 5afef9875a..340a81d2f2 100644
--- a/misc/buildrelease
+++ b/misc/buildrelease
@@ -218,7 +218,7 @@ You may need to enter your SourceForge password.
 Using $kohadir.
 |;
 chdir($kohadir) || die "$kohadir: $!\n";
-system("cvs update -P");
+# system("cvs update -P");
 if ($cvstag) {
     print qq|
 Tagging koha with tag R_$tagname
diff --git a/misc/koha.upgrade b/misc/koha.upgrade
index e7b3e257e5..d0a1fe079c 100644
--- a/misc/koha.upgrade
+++ b/misc/koha.upgrade
@@ -14,22 +14,21 @@ Install::setetcdir($ENV{etcdir}||'/etc');
 my $input;
 loadconfigfile();
 
-my $kohaversion=`cat koha.version`;
-chomp $kohaversion;
-Install::setkohaversion $kohaversion;
+$::newversion=`cat koha.version`;
+chomp $::newversion;
+Install::setkohaversion $::newversion;
 
 
-if ($kohaversion =~ /RC/) {
+if ($::newversion =~ /RC/) {
     releasecandidatewarning();
 }
 
-my $answer = showmessage(getmessage('WelcomeToUpgrader',[$kohaversion,$::newversion]),'yn');
-
-unless ($answer =~/y/i) {
+my $answer = showmessage(getmessage('WelcomeToUpgrader',[$::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);
-- 
2.39.5