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

[svn at svn.open-ils.org]

Author: dbs
Date: 2009-03-15 13:56:07 -0400 (Sun, 15 Mar 2009)
New Revision: 180

Modified:
   conifer/trunk/tools/patch_conifer.sh
Log:
Replace the missing Open-ILS directory; fix find output.


Modified: conifer/trunk/tools/patch_conifer.sh
===================================================================
--- conifer/trunk/tools/patch_conifer.sh	2009-03-15 17:51:37 UTC (rev 179)
+++ conifer/trunk/tools/patch_conifer.sh	2009-03-15 17:56:07 UTC (rev 180)
@@ -56,7 +56,7 @@
 	# We probably need to munge the links to point to default_test for rdetail.js (possibly others?)
 	for skin in $SKINS
 	do
-		cp -r "$CANONICAL_EXPORT_DIR"/web/opac/skin/default "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test
+		cp -r "$CANONICAL_EXPORT_DIR"/Open-ILS/web/opac/skin/default "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test
 		cp -r "$LOCAL_EXPORT_DIR"/web/opac/skin/"$skin"/* "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test/.
 		for munge_file in 'page_rdetail.xml'
 		do
@@ -85,10 +85,10 @@
 {
 	for perl_mod in `cd "$LOCAL_EXPORT_DIR"/src/perlmods/; find . -name "*.pm" -print0`
 	do
-		if cmp "$LOCAL_EXPORT_DIR"/src/perlmods/"$perl_mod" "$LOCAL_EG_DIR"/lib/perl5/"$perl_mod" &> /dev/null
+		if cmp "$perl_mod" "$LOCAL_EG_DIR"/lib/perl5/"$perl_mod" &> /dev/null
 		then echo -n
 		else
-			cp --backup=numbered "$LOCAL_EXPORT_DIR"/src/perlmods/"$perl_mod" "$INSTALL_DIR"/lib/perl5/"$perl_mod"
+			cp --backup=numbered "$perl_mod" "$INSTALL_DIR"/lib/perl5/"$perl_mod"
 			osrf_ctl.sh -a restart_perl > /dev/null
 		fi
 	done