Fix up reference to LOCAL_EG_DIR and copy symbolic links rather than moving files

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

diff --git a/tools/patch_conifer.sh b/tools/patch_conifer.sh
index 8df01ca..cb3701f 100644 (file)
--- a/tools/patch_conifer.sh
+++ b/tools/patch_conifer.sh
@@ -112,10 +112,10 @@ copy_circ_rules()
        for circ_rule in `ls -1 "$LOCAL_EXPORT_DIR"/"$BRANCH"/circ/*`
        do
                base_circ=`basename "$circ_rule"`
-               if cmp "$circ_rule" "$LOCAL_EG_DIR"/var/circ/"$base_circ" &> /dev/null
-               then echo -n
+               if cmp --silent "$circ_rule" "$INSTALL_DIR"/var/circ/"$base_circ"; then 
+                       echo -n
                else
-                       mv --backup=numbered "$circ_rule" "$INSTALL_DIR"/var/circ/.
+                       cp -d --backup=numbered "$circ_rule" "$INSTALL_DIR"/var/circ/.
                fi
        done
 }