Full pathname issues - hmm

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

diff --git a/tools/patch_conifer.sh b/tools/patch_conifer.sh
index f247e2f..a8db92b 100644 (file)
--- a/tools/patch_conifer.sh
+++ b/tools/patch_conifer.sh
@@ -42,9 +42,9 @@ copy_web_common()
 {
        # Copy the impossible-to-be-harmful (really!) Web stuff in place
        # Images
-       cp "$LOCAL_EXPORT_DIR"/web/opac/images/* "$INSTALL_DIR"/var/web/opac/images/.
+       cp -r "$LOCAL_EXPORT_DIR"/web/opac/images/* "$INSTALL_DIR"/var/web/opac/images/.
        # DTD files for replacement strings
-       cp "$LOCAL_EXPORT_DIR"/web/opac/locale/* "$INSTALL_DIR"/var/web/opac/locale/.
+       cp -r "$LOCAL_EXPORT_DIR"/web/opac/locale/* "$INSTALL_DIR"/var/web/opac/locale/.
 }
 
 copy_opac_skins()
@@ -70,10 +70,11 @@ copy_circ_rules()
 {
        for circ_rule in `ls -1 "$LOCAL_EXPORT_DIR"/circ/*`
        do
-               if cmp "$LOCAL_EXPORT_DIR"/circ/"$circ_rule" "$LOCAL_EG_DIR"/var/circ/"$circ_rule" &> /dev/null
+               base_circ=`basename "$circ_rule"`
+               if cmp "$circ_rule" "$LOCAL_EG_DIR"/var/circ/"$base_circ" &> /dev/null
                then echo -n
                else
-                       cp --backup=numbered "$LOCAL_EXPORT_DIR"/circ/"$circ_rule" "$INSTALL_DIR"/var/circ/.
+                       cp --backup=numbered "$circ_rule" "$INSTALL_DIR"/var/circ/.
                        osrf_ctl.sh -a restart_perl > /dev/null
                fi
        done
@@ -83,9 +84,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"/src/perlmods/; find . -name "*.pm" -print0`
+       for perl_mod in `cd "$LOCAL_EXPORT_DIR"/src/perlmods/; find OpenILS -name "*.pm" -print0`
        do
-               if cmp "$perl_mod" "$LOCAL_EG_DIR"/lib/perl5/"$perl_mod" &> /dev/null
+               if cmp "$LOCAL_EXPORT_DIR"/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"