From 8ecce49efbdb1575c5b75340aa73dfbc6e619dd6 Mon Sep 17 00:00:00 2001
From: rsoulliere <robert.soulliere@mohawkcollege.ca>
Date: Thu, 9 Aug 2012 14:33:12 -0400
Subject: [PATCH] Update upgrading instruction to 2.1.2.

---
 admin/upgrading.xml | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/admin/upgrading.xml b/admin/upgrading.xml
index fc71aa7..a820d83 100644
--- a/admin/upgrading.xml
+++ b/admin/upgrading.xml
@@ -62,15 +62,15 @@
 				<para>As the <systemitem class="username">opensrf</systemitem> user, download and extract <application>Evergreen 2.1</application>
 				</para>
 <screen><userinput>
-wget http://www.open-ils.org/downloads/Evergreen-ILS-2.1.1.tar.gz
-tar xzf Evergreen-ILS-2.1.1.tar.gz
+wget http://www.open-ils.org/downloads/Evergreen-ILS-2.1.2.tar.gz
+tar xzf Evergreen-ILS-2.1.2.tar.gz
 </userinput></screen>
 				<note><para>For the latest edition of Evergreen 2.1, check the Evergreen download page at
 				<ulink url="http://www.open-ils.org/downloads.php" /> and adjust upgrading instructions accordingly.</para></note>
 			</step>
 			<step>
 				<para>As the <systemitem class="username">root</systemitem> user, install the prerequisites:</para> 
-				<screen><userinput>cd /home/opensrf/Evergreen-ILS-2.1.1</userinput></screen>	
+				<screen><userinput>cd /home/opensrf/Evergreen-ILS-2.1.2</userinput></screen>	
 				<para>On the next command, replace <option>[distribution]</option> with one of 
 				these values for your distribution of Debian or Ubuntu:</para>
 				<itemizedlist>
@@ -89,14 +89,14 @@ tar xzf Evergreen-ILS-2.1.1.tar.gz
 			<step>
 				<para>As the <systemitem class="username">opensrf</systemitem> user, configure and compile 
 				<application>Evergreen</application>:</para>
-				<screen><userinput>cd /home/opensrf/Evergreen-ILS-2.1.1</userinput></screen>
+				<screen><userinput>cd/home/opensrf/Evergreen-ILS-2.1.2</userinput></screen>
 				<screen><userinput>./configure --prefix=/openils --sysconfdir=/openils/conf</userinput></screen>
 				<screen><userinput>make</userinput></screen>
 			</step>
 			<step>
 				<para>As the <systemitem class="username">root</systemitem> user, install 
 				<application>Evergreen</application>:</para>
-				<screen><userinput>make STAFF_CLIENT_BUILD_ID=rel_2_1_1 install</userinput></screen>
+				<screen><userinput>make STAFF_CLIENT_BUILD_ID=rel_2_1_2 install</userinput></screen>
 			</step>
 			<step>
 				<para>As the <emphasis>root</emphasis> user, change all files to be owned by the 
@@ -106,7 +106,7 @@ tar xzf Evergreen-ILS-2.1.1.tar.gz
 			<step>
 				<para>As the <systemitem class="username">opensrf</systemitem> user, update configuration files:</para>
 <screen><userinput>
-cd /home/opensrf/Evergreen-ILS-2.1.1
+cd /home/opensrf/Evergreen-ILS-2.1.2
 # and offline-config.pl for the offline staff client data uploader
 perl Open-ILS/src/support-scripts/eg_db_config.pl \
   --create-offline --user evergreen --password evergreen \
@@ -119,13 +119,13 @@ perl Open-ILS/src/support-scripts/eg_db_config.pl \
 <screen><userinput>
 cd /openils/var/web/xul/
 rm server
-ln -s rel_2_1_1/server
+ln -s rel_2_1_2/server
 </userinput></screen>
 			</step>
 			<step>
 				<para>Change to the <application>Evergreen</application> installation 
 				directory:</para>
-<screen><userinput>cd /home/opensrf/Evergreen-ILS-2.1.1</userinput></screen>
+<screen><userinput>cd /home/opensrf/Evergreen-ILS-2.1.2</userinput></screen>
 			</step>
 
 			<step>
@@ -174,9 +174,10 @@ psql -U evergreen -h localhost -f /usr/share/postgresql/9.0/contrib/hstore.sql -
 				</para></caution> 
 <screen>
 <userinput>
-cd /home/opensrf/Evergreen-ILS-2.1.1
-psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/2.0-2.1-upgrade-db.sql evergreen
-psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/2.1.0-2.1.1-upgrade-db.sql evergreen
+cd /home/opensrf/Evergreen-ILS-2.1.2
+psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/version-upgrade/2.0-2.1-upgrade-db.sql evergreen
+psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/version-upgrade/2.1.0-2.1.1-upgrade-db.sql evergreen
+psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/version-upgrade/2.1.1-2.1.2-upgrade-db.sql evergreen
 </userinput>
 </screen> 	        
 			</step>
-- 
2.11.0