Gah, broken script fixes

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

diff --git a/tools/patch_conifer.sh b/tools/patch_conifer.sh
index 40a70d6..29faa66 100644 (file)
--- a/tools/patch_conifer.sh
+++ b/tools/patch_conifer.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-REMOTE_CANONICAL_SVN_DIR=svn://svn.open-ils.org/ILS-/branches/rel_1_4
+REMOTE_CANONICAL_SVN_DIR=svn://svn.open-ils.org/ILS/branches/rel_1_4
 CANONICAL_SVN_DIR=/home/opensrf/Evergreen-rel_1_4/Open-ILS
 CANONICAL_EXPORT_DIR=/home/opensrf/rel_1_4_export
 REMOTE_SVN_DIR=svn://svn.open-ils.org/ILS-Contrib/conifer/trunk
@@ -69,6 +69,7 @@ copy_opac_skins()
 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
                then echo -n
                else
@@ -78,6 +79,22 @@ copy_circ_rules()
        done
 }
 
+# Corresponding with some configuration changes, we also have to customize some Perl modules
+# 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`
+       do
+               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 "$LOCAL_EXPORT_DIR"/src/perlmods/"$perl_mod" "$INSTALL_DIR"/lib/perl5/"$perl_mod"
+                       osrf_ctl.sh -a restart_perl > /dev/null
+               fi
+       done
+
+}
+
 # Not sure if we really want to do this in an automated fashion, because it would mean:
 # 1. restarting Perl and possibly C services to pick up the new configuration file(s)
 # 2. running autogen.sh to generate updates for fm_IDL.xml