[open-ils-commits] r343 - conifer/trunk/tools (dbs)

[svn at svn.open-ils.org]

Author: dbs
Date: 2009-04-17 13:36:16 -0400 (Fri, 17 Apr 2009)
New Revision: 343

Modified:
   conifer/trunk/tools/patch_conifer.sh
Log:
Get this closer to the current reality, as we're running from trunk atm
Should make branches/rel_1_4 / trunk a variable but oh well


Modified: conifer/trunk/tools/patch_conifer.sh
===================================================================
--- conifer/trunk/tools/patch_conifer.sh	2009-04-17 03:39:15 UTC (rev 342)
+++ conifer/trunk/tools/patch_conifer.sh	2009-04-17 17:36:16 UTC (rev 343)
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-REMOTE_CANONICAL_SVN_DIR=svn://svn.open-ils.org/ILS/branches/rel_1_4
-CANONICAL_SVN_DIR=/home/opensrf/Evergreen-rel_1_4
-CANONICAL_EXPORT_DIR=/home/opensrf/rel_1_4_export
+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_SVN_DIR=svn://svn.open-ils.org/ILS-Contrib/conifer
 LOCAL_SVN_DIR=/home/opensrf/conifer-svn
 LOCAL_EXPORT_DIR=/home/opensrf/conifer-export
@@ -49,7 +49,7 @@
 
 copy_opac_skins()
 {
-	SKINS=`cd "$LOCAL_EXPORT_DIR"/branches/rel_1_4/web/opac/skin; ls -1`
+	SKINS=`cd "$LOCAL_EXPORT_DIR"/trunk/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
@@ -58,7 +58,8 @@
 	# 3. Copy the default_test skin into place as "$skin"_test
 	# 4. Copy the custom skin files over top "$skin"_test
 
-	# We probably need to munge the links to point to default_test for rdetail.js (possibly others?)
+	# Munge the links to point to default_test for rdetail.js
+	# Munge the links to point to "$skin"_test for all
 	for skin in $SKINS
 	do
 		rm -fr "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test
@@ -81,13 +82,14 @@
 		do
 			sed -i -e 's/skin\/default\/js/skin\/default_test\/js/' "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test/xml/"$munge_file"
 		done
+		sed -i -e "s/\/$skin\/css//\$skin_test\/css/" "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test/xml/common/css_common.xml
 	done
 }
 
 # We need the Canuck patch in place. Save us, Canuck patch!
 copy_xul()
 {
-	cp -r "$LOCAL_EXPORT_DIR"/branches/rel_1_4/xul/server/patron/ue_config.js "$INSTALL_DIR"/var/web/xul/server/patron/ue_config.js
+	cp -r "$LOCAL_EXPORT_DIR"/trunk/xul/server/patron/ue_config.js "$INSTALL_DIR"/var/web/xul/server/patron/ue_config.js
 }
 
 # We'll need to restart Perl services after an update of circ rules
@@ -127,12 +129,12 @@
 # And it could potentially break the whole thing.
 copy_conf_files()
 {
-	for conf in `ls -1 "$LOCAL_EXPORT_DIR"/branches/rel_1_4/conf/*`
+	for conf in `ls -1 "$LOCAL_EXPORT_DIR"/trunk/conf/*`
 	do
-		if cmp "$LOCAL_EXPORT_DIR"/branches/rel_1_4/conf/"$conf" "$LOCAL_EG_DIR"/conf/"$conf" &> /dev/null
+		if cmp "$LOCAL_EXPORT_DIR"/trunk/conf/"$conf" "$LOCAL_EG_DIR"/conf/"$conf" &> /dev/null
 		then echo -n
 		else
-			cp --backup=numbered "$LOCAL_EXPORT_DIR"/branches/rel_1_4/conf/"$conf" "$INSTALL_DIR"/conf/.
+			cp --backup=numbered "$LOCAL_EXPORT_DIR"/trunk/conf/"$conf" "$INSTALL_DIR"/conf/.
 		fi
 	done
 }