From: thierry <thierry@41d37cc5-eb28-0410-a9bf-d37491348ade>
Date: Mon, 5 Nov 2007 23:21:56 +0000 (+0000)
Subject: forgotten change - was made in princeton
X-Git-Tag: foo~424
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c8d1b5999ab4e76732a4af6747a0c6c832dd9be4;p=infrastructure.git

forgotten change - was made in princeton
---

diff --git a/scripts/svn-keywords.sh b/scripts/svn-keywords.sh
index 8518756..518ff8a 100755
--- a/scripts/svn-keywords.sh
+++ b/scripts/svn-keywords.sh
@@ -38,6 +38,7 @@ if [ "$mode" == keywords -o -z "$dirs" -o -z "$keywords" ] ; then
 fi
 
 function run_keyword_on_file () {
+    keyword=$1; shift
     file=$1; shift
     echo -n "$file "
     if [ ! -f $file ] ; then
@@ -72,12 +73,12 @@ function run_keywords () {
 		echo Found $nbfiles with \$$keyword
 	    
 		for file in $files ; do
-		    run_keywords_on_file $file
+		    run_keyword_on_file $keyword $file
 		done
 	    done
 	else 
 	    for keyword in $keywords ; do
-		run_keyword_on_file $dir
+		run_keyword_on_file $keyword $dir
 	    done
 	fi
     done
@@ -88,7 +89,10 @@ function run_keywords () {
 function run_normalize_on_files () {
     for keyword in $keywords ; do
 	echo "Deflating \$$keyword on $# files"
-	sed -i -e 's,$'"$keyword"'.*\$,\$'"$keyword"'$,' "$@"
+	for file in "$@" ; do
+	    sed -e 's,$'"$keyword"'.*\$,\$'"$keyword"'$,' $file > $file.new
+	    mv $file.new $file
+	done
     done
 }    
 
@@ -97,7 +101,7 @@ function run_normalize () {
 	cd $here
 	if [ -d $dir ] ; then
 	    cd $dir
-	    echo "xxxxxxxxxxxxxxxxxxxx Normalizing keywords $keywords in $dir(pwd) "
+	    echo "xxxxxxxxxxxxxxxxxxxx Normalizing keywords $keywords in $(pwd) "
 	    echo -n "xxxxxxxxxx Gathering actual files under subversion "
 	    svnfiles=$(svn list -R)