From: dbs <dbs@6d9bc8c9-1ec2-4278-b937-99fde70a366f>
Date: Mon, 15 Feb 2010 02:31:00 +0000 (+0000)
Subject: Complete the conversion from trunk to rel_1_6_0
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=dc94d6d72b09e522acff7a9226a746b82dd90036;p=contrib%2FConifer.git

Complete the conversion from trunk to rel_1_6_0


git-svn-id: svn://svn.open-ils.org/ILS-Contrib/conifer/branches/rel_1_6_0@781 6d9bc8c9-1ec2-4278-b937-99fde70a366f
---

diff --git a/tools/patch_conifer.sh b/tools/patch_conifer.sh
index 79f1905583..fab8986253 100644
--- a/tools/patch_conifer.sh
+++ b/tools/patch_conifer.sh
@@ -1,12 +1,13 @@
 #!/bin/bash
 
-REMOTE_CANONICAL_SVN_DIR=svn://svn.open-ils.org/ILS/trunk
-CANONICAL_SVN_DIR=/home/opensrf/Evergreen-trunk
-CANONICAL_EXPORT_DIR=/home/opensrf/EGtrunk-export
+REMOTE_CANONICAL_SVN_DIR=svn://svn.open-ils.org/ILS/branches/rel_1_6_0
+CANONICAL_SVN_DIR=/home/opensrf/Evergreen-rel_1_6_0
+CANONICAL_EXPORT_DIR=/home/opensrf/EG_1_6_0-export
 REMOTE_SVN_DIR=svn://svn.open-ils.org/ILS-Contrib/conifer
 LOCAL_SVN_DIR=/home/opensrf/conifer-svn
 LOCAL_EXPORT_DIR=/home/opensrf/conifer-export
 INSTALL_DIR=/openils
+BRANCH=branches/rel_1_6_0
 
 update_repository()
 {
@@ -42,16 +43,16 @@ copy_web_common()
 {
 	# Copy the impossible-to-be-harmful (really!) Web stuff in place
 	# Images
-	cp -r "$LOCAL_EXPORT_DIR"/trunk/web/opac/images/* "$INSTALL_DIR"/var/web/opac/images/.
+	cp -r "$LOCAL_EXPORT_DIR"/"$BRANCH"/web/opac/images/* "$INSTALL_DIR"/var/web/opac/images/.
 	# DTD files for replacement strings
-	cp -r "$LOCAL_EXPORT_DIR"/trunk/web/opac/locale/* "$INSTALL_DIR"/var/web/opac/locale/.
+	cp -r "$LOCAL_EXPORT_DIR"/"$BRANCH"/web/opac/locale/* "$INSTALL_DIR"/var/web/opac/locale/.
 	# Themes
-	cp -r "$LOCAL_EXPORT_DIR"/trunk/web/opac/theme/* "$INSTALL_DIR"/var/web/opac/theme/.
+	cp -r "$LOCAL_EXPORT_DIR"/"$BRANCH"/web/opac/theme/* "$INSTALL_DIR"/var/web/opac/theme/.
 }
 
 copy_opac_skins()
 {
-	SKINS=`cd "$LOCAL_EXPORT_DIR"/trunk/web/opac/skin; ls -1`
+	SKINS=`cd "$LOCAL_EXPORT_DIR"/"$BRANCH"/web/opac/skin; ls -1`
 	LINKS=`cd "$INSTALL_DIR"/var/web/opac/skin/default/; find xml -type l -print`
 
 	# For skins, create a _test variation of each
@@ -72,7 +73,7 @@ copy_opac_skins()
 			cp -r "$INSTALL_DIR"/var/web/opac/skin/default_test "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test
 		fi
 
-		cp -r "$LOCAL_EXPORT_DIR"/trunk/web/opac/skin/"$skin"/* "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test/.
+		cp -r "$LOCAL_EXPORT_DIR"/"$BRANCH"/web/opac/skin/"$skin"/* "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test/.
 
 		for xml_link in $LINKS
 		do
@@ -99,14 +100,14 @@ copy_opac_skins()
 # We need the Canuck patch in place. Save us, Canuck patch!
 copy_xul()
 {
-	cp "$LOCAL_EXPORT_DIR"/trunk/xul/server/cat/* "$INSTALL_DIR"/var/web/xul/server/cat/.
-	cp "$LOCAL_EXPORT_DIR"/trunk/xul/server/patron/* "$INSTALL_DIR"/var/web/xul/server/patron/.
+	cp "$LOCAL_EXPORT_DIR"/"$BRANCH"/xul/server/cat/* "$INSTALL_DIR"/var/web/xul/server/cat/.
+	cp "$LOCAL_EXPORT_DIR"/"$BRANCH"/xul/server/patron/* "$INSTALL_DIR"/var/web/xul/server/patron/.
 }
 
 # Update our circ rules
 copy_circ_rules()
 {
-	for circ_rule in `ls -1 "$LOCAL_EXPORT_DIR"/trunk/circ/*`
+	for circ_rule in `ls -1 "$LOCAL_EXPORT_DIR"/"$BRANCH"/circ/*`
 	do
 		base_circ=`basename "$circ_rule"`
 		if cmp "$circ_rule" "$LOCAL_EG_DIR"/var/circ/"$base_circ" &> /dev/null
@@ -121,9 +122,9 @@ copy_circ_rules()
 # And similarly, we might want to only trigger these manually
 copy_perl_modules()
 {
-	for perl_mod in `cd "$LOCAL_EXPORT_DIR"/trunk/src/perlmods/; find OpenILS -name "*.pm" -print0`
+	for perl_mod in `cd "$LOCAL_EXPORT_DIR"/"$BRANCH"/src/perlmods/; find OpenILS -name "*.pm" -print0`
 	do
-		if cmp "$LOCAL_EXPORT_DIR"/trunk/src/perlmods/"$perl_mod" "$LOCAL_EG_DIR"/lib/perl5/"$perl_mod" &> /dev/null
+		if cmp "$LOCAL_EXPORT_DIR"/"$BRANCH"/src/perlmods/"$perl_mod" "$LOCAL_EG_DIR"/lib/perl5/"$perl_mod" &> /dev/null
 		then echo -n
 		else
 			cp --backup=numbered "$perl_mod" "$INSTALL_DIR"/lib/perl5/"$perl_mod"
@@ -139,12 +140,12 @@ copy_perl_modules()
 # And it could potentially break the whole thing.
 copy_conf_files()
 {
-	for conf in `ls -1 "$LOCAL_EXPORT_DIR"/trunk/conf/*`
+	for conf in `ls -1 "$LOCAL_EXPORT_DIR"/"$BRANCH"/conf/*`
 	do
-		if cmp "$LOCAL_EXPORT_DIR"/trunk/conf/"$conf" "$LOCAL_EG_DIR"/conf/"$conf" &> /dev/null
+		if cmp "$LOCAL_EXPORT_DIR"/"$BRANCH"/conf/"$conf" "$LOCAL_EG_DIR"/conf/"$conf" &> /dev/null
 		then echo -n
 		else
-			cp --backup=numbered "$LOCAL_EXPORT_DIR"/trunk/conf/"$conf" "$INSTALL_DIR"/conf/.
+			cp --backup=numbered "$LOCAL_EXPORT_DIR"/"$BRANCH"/conf/"$conf" "$INSTALL_DIR"/conf/.
 		fi
 	done
 }