From: dbs <dbs@6d9bc8c9-1ec2-4278-b937-99fde70a366f>
Date: Sun, 15 Mar 2009 17:56:07 +0000 (+0000)
Subject: Replace the missing Open-ILS directory; fix find output.
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=141c41c4f2aa0df0bae36d7262150c352e3bb0a7;p=contrib%2FConifer.git

Replace the missing Open-ILS directory; fix find output.


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

diff --git a/tools/patch_conifer.sh b/tools/patch_conifer.sh
index 29faa66581..00cb6d4820 100644
--- a/tools/patch_conifer.sh
+++ b/tools/patch_conifer.sh
@@ -56,7 +56,7 @@ copy_opac_skins()
 	# 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 @@ copy_perl_modules()
 {
 	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