Fabian wrote:

Update of /cvsroot/monetdb/clients/src/java In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15410

Modified Files: Tag: Clients_1-20 version.sh Log Message: de-complicate.

( actually: - use shell globbing - avoid needless fork/execs - use bashisms for consistency - fix "$[f}" - don't do it difficult if it can be done simple )

Index: version.sh =================================================================== RCS file: /cvsroot/monetdb/clients/src/java/Attic/version.sh,v retrieving revision 1.10.2.6 retrieving revision 1.10.2.7 diff -u -d -r1.10.2.6 -r1.10.2.7 --- version.sh 5 Dec 2007 10:35:28 -0000 1.10.2.6 +++ version.sh 5 Dec 2007 10:55:00 -0000 1.10.2.7 @@ -112,15 +112,9 @@ ../../../sql/src/jdbc/tests/Tests/Test.SQL.bat \ ../../../sql/NT/MonetDB4-SQL/MonetDB4-SQL-Installer.vdproj \ ../../../sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj \ - ../../../pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj \ + ../../../"*"/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj \ ; do - if [[ ! -f ${file} ]] ; then - f="`echo ${file} | sed 's=\.\./\(sql\|pathfinder\)/=../*/='`" - f="`ls ${f} 2>/dev/null`" - if [[ -f $[f} ]] ; then - file=${f} - fi - fi + file=$(eval echo ${file})

This does not work if $file contains "funny" characters. It will also collapse multiple spaces in $file to a single space.

if [[ -f ${file} ]] ; then for f in $FILES ; do fr=${f//XXX/${NEW_MAJOR}.${NEW_MINOR}}

------------------------------------------------------------------------- SF.Net email is sponsored by: The Future of Linux Business White Paper from Novell. From the desktop to the data center, Linux is going mainstream. Let it simplify your IT future. http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4 _______________________________________________ Monetdb-checkins mailing list Monetdb-checkins@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/monetdb-checkins

-- Sjoerd Mullender