From ef27033e386f8942029c04d996e002e19e0d478f Mon Sep 17 00:00:00 2001
From: dbs <dbs@6d9bc8c9-1ec2-4278-b937-99fde70a366f>
Date: Mon, 15 Feb 2010 03:12:42 +0000
Subject: [PATCH] Take a stab at keeping default pristine and creating
 default_conifer to hold our modifications instead

git-svn-id: svn://svn.open-ils.org/ILS-Contrib/conifer/branches/rel_1_6_0@782 6d9bc8c9-1ec2-4278-b937-99fde70a366f
---
 tools/patch_conifer.sh | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/tools/patch_conifer.sh b/tools/patch_conifer.sh
index fab8986253..10124760a0 100644
--- a/tools/patch_conifer.sh
+++ b/tools/patch_conifer.sh
@@ -53,11 +53,12 @@ copy_web_common()
 copy_opac_skins()
 {
 	SKINS=`cd "$LOCAL_EXPORT_DIR"/"$BRANCH"/web/opac/skin; ls -1`
+	SKINS="default default_conifer $SKINS"
 	LINKS=`cd "$INSTALL_DIR"/var/web/opac/skin/default/; find xml -type l -print`
 
 	# For skins, create a _test variation of each
 	# 1. Copy the default skin in place first
-	# 2. Copy our custom default files over top, creating default_test
+	# 2. Copy our custom default files over top of default_conifer, creating default_conifer_test
 	# 3. Copy the default_test skin into place as "$skin"_test
 	# 4. Copy the custom skin files over top "$skin"_test
 
@@ -66,11 +67,11 @@ copy_opac_skins()
 	for skin in $SKINS
 	do
 		rm -fr "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test
-		if [ "$skin" == "default" ]
+		if [ "$skin" == "default_conifer" ]
 		then
 			cp -r "$CANONICAL_EXPORT_DIR"/Open-ILS/web/opac/skin/default "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test
 		else
-			cp -r "$INSTALL_DIR"/var/web/opac/skin/default_test "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test
+			cp -r "$INSTALL_DIR"/var/web/opac/skin/default_conifer_test "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test
 		fi
 
 		cp -r "$LOCAL_EXPORT_DIR"/"$BRANCH"/web/opac/skin/"$skin"/* "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test/.
@@ -84,15 +85,15 @@ copy_opac_skins()
 		# Point at theme-specific JS, as we have our own copies
 		for munge_file in 'page_rdetail.xml' 'page_mresult.xml' 'page_rresult.xml'
 		do
-			sed -i -e "s/skin\/default\/js/skin\/$skin\_test\/js/" "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test/xml/"$munge_file"
-			sed -i -e "s/skin\/default_test\/js/skin\/$skin\_test\/js/" "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test/xml/"$munge_file"
+			sed -i -e "s/skin\/default_conifer\/js/skin\/$skin\_test\/js/" "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test/xml/"$munge_file"
+			sed -i -e "s/skin\/default_conifer_test\/js/skin\/$skin\_test\/js/" "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test/xml/"$munge_file"
 		done
 		sed -i -e "s/\/$skin\/css\/layout.css/\/$skin\_test\/css\/layout.css/" "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test/xml/common/css_common.xml
 
 		sed -i -e 's/var googleBooksLink = true/var googleBooksLink = false/' "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test/js/result_common.js
 
 		# Make global config default to grouping metarecords and formats
-		sed -i -e 's/var SHOW_MR_DEFAULT = false/var SHOW_MR_DEFAULT = true/' "$INSTALL_DIR"/var/web/opac/common/js/config.js
+		# sed -i -e 's/var SHOW_MR_DEFAULT = false/var SHOW_MR_DEFAULT = true/' "$INSTALL_DIR"/var/web/opac/common/js/config.js
 		
 	done
 }
@@ -113,7 +114,7 @@ copy_circ_rules()
 		if cmp "$circ_rule" "$LOCAL_EG_DIR"/var/circ/"$base_circ" &> /dev/null
 		then echo -n
 		else
-			cp --backup=numbered "$circ_rule" "$INSTALL_DIR"/var/circ/.
+			mv --backup=numbered "$circ_rule" "$INSTALL_DIR"/var/circ/.
 		fi
 	done
 }
@@ -152,10 +153,10 @@ copy_conf_files()
 
 # Here end the functions; let the fun begin
 
-update_repository
-copy_web_common
+#update_repository
+#copy_web_common
 copy_opac_skins
-copy_circ_rules
-copy_xul
+#copy_circ_rules
+#copy_xul
 #copy_perl_modules
 #copy_conf_files
-- 
2.11.0