git://git.onelab.eu
/
infrastructure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
turn off f24 build
[infrastructure.git]
/
scripts
/
svn-keywords.sh
diff --git
a/scripts/svn-keywords.sh
b/scripts/svn-keywords.sh
index
518ff8a
..
caa4cb9
100755
(executable)
--- a/
scripts/svn-keywords.sh
+++ b/
scripts/svn-keywords.sh
@@
-1,6
+1,4
@@
#!/bin/bash
#!/bin/bash
-# $Id$
-# $URL$
COMMAND=$(basename $0)
COMMAND=$(basename $0)
@@
-63,14
+61,25
@@
function run_keywords () {
cd $dir
echo "xxxxxxxxxxxxxxxxxxxx Fixing keywords props in $(pwd)"
echo -n "xxxxxxxxxx Gathering files under subversion "
cd $dir
echo "xxxxxxxxxxxxxxxxxxxx Fixing keywords props in $(pwd)"
echo -n "xxxxxxxxxx Gathering files under subversion "
- svnfiles=$(svn list -R)
- echo $(ls -1 $svnfiles | wc -l) files found
+ svnfiles=$(svn list -R | grep -v '/$')
+ # handle this, as otherwise grep hangs on stdin
+ if [ -z "$svnfiles" ] ; then
+ echo "xxxxx Nothing applicable in $dir - skipping"
+ continue
+ fi
+
+ echo $(ls -1 $svnfiles | wc -l) files found
+
for keyword in $keywords ; do
files=$(grep -l '$'"$keyword" $svnfiles)
for keyword in $keywords ; do
files=$(grep -l '$'"$keyword" $svnfiles)
+ if [ -z "$files" ] ; then
+ echo "xxxxx No file found with \$$keyword"
+ continue
+ fi
nbfiles=$(ls -1 $files | wc -l)
nbfiles=$(ls -1 $files | wc -l)
- echo
Found $nbfiles with \$$keyword
+ echo
"xxxxx Found" $nbfiles "with \$$keyword"
for file in $files ; do
run_keyword_on_file $keyword $file
for file in $files ; do
run_keyword_on_file $keyword $file
@@
-78,7
+87,7
@@
function run_keywords () {
done
else
for keyword in $keywords ; do
done
else
for keyword in $keywords ; do
- run_keyword_on_file $keyword $dir
+
grep '$'"$keyword" $dir > /dev/null &&
run_keyword_on_file $keyword $dir
done
fi
done
done
fi
done
@@
-113,7
+122,7
@@
function run_normalize () {
fi
done
echo $(ls -1 $files |wc -l) files found
fi
done
echo $(ls -1 $files |wc -l) files found
- run_normalize_on_files$files
+ run_normalize_on_files
$files
echo Done
else
run_normalize_on_files $dir
echo Done
else
run_normalize_on_files $dir