--- trunk/bin/rename-method.sh	2008/11/19 19:27:38	466
+++ trunk/bin/rename-method.sh	2008/11/27 17:37:52	554
@@ -1,15 +1,10 @@
 #!/bin/sh
 
-# rename methods
+from='params_form';
+to='as_markup'
 
-perl -p -i -n -e 's/sub markup/sub as_markup/'	`grep -lr 'sub markup' lib t`
-perl -p -i -n -e 's/sub data/sub as_data/'	`grep -lr 'sub data' lib t`
-perl -p -i -n -e 's/sub sponge/sub as_sponge/'	`grep -lr 'sub sponge' lib t`
+echo "rename method $from -> $to"
 
-perl -p -i -n -e 's/->markup/->as_markup/'	`grep -lr -- '->markup' lib t`
-perl -p -i -n -e 's/->data/->as_data/'		`grep -lr -- '->data' lib t`
-perl -p -i -n -e 's/->sponge/->as_sponge/' 	`grep -lr -- '->sponge' lib t`
-
-perl -p -i -n -e 's!/markup!/as_markup!'	`grep -lr -- '/markup' lib t etc`
-perl -p -i -n -e 's!/data!/as_data!'		`grep -lr -- '/data' lib t etc`
-perl -p -i -n -e 's!/sponge!/as_sponge!' 	`grep -lr -- '/sponge' lib t etc`
+grep -lr $from lib t etc | xargs --verbose -i sh -c "perl -p -i -n -e 's{(sub |->|/)$from}{\1$to}g' {}" && (
+	svk diff | vi -R -
+)