[open-ils-commits] r784 - conifer/branches/rel_1_6_0/tools (dbs)

[svn at svn.open-ils.org]

Author: dbs
Date: 2010-02-14 23:19:18 -0500 (Sun, 14 Feb 2010)
New Revision: 784

Modified:
   conifer/branches/rel_1_6_0/tools/patch_conifer.sh
Log:
Fix up reference to LOCAL_EG_DIR and copy symbolic links rather than moving files


Modified: conifer/branches/rel_1_6_0/tools/patch_conifer.sh
===================================================================
--- conifer/branches/rel_1_6_0/tools/patch_conifer.sh	2010-02-15 03:49:08 UTC (rev 783)
+++ conifer/branches/rel_1_6_0/tools/patch_conifer.sh	2010-02-15 04:19:18 UTC (rev 784)
@@ -112,10 +112,10 @@
 	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
 }