Revision: 10276 http://pure-data.svn.sourceforge.net/pure-data/?rev=10276&view=rev Author: zmoelnig Date: 2008-09-04 08:47:24 +0000 (Thu, 04 Sep 2008)
Log Message: ----------- changed the non-portable "tail +2" to a hopefully more portable sed-script; use $() instead of ``; generally use ${VAR} rather than $VAR;
Modified Paths: -------------- trunk/scripts/pd-diff
Modified: trunk/scripts/pd-diff =================================================================== --- trunk/scripts/pd-diff 2008-09-03 09:34:50 UTC (rev 10275) +++ trunk/scripts/pd-diff 2008-09-04 08:47:24 UTC (rev 10276) @@ -1,21 +1,26 @@ #!/bin/sh
-DATE=`date '+%Y-%m-%d_%H.%M.%S'` +DATE=$(date '+%Y-%m-%d_%H.%M.%S') TMPDIR=/tmp/pd-diff
#------------------------------------------------------------------------------ # FUNCTIONS generate_tmp_filename () { - echo $TMPDIR/`echo $1 | sed -e 's|/|_|g'`-$DATE + echo ${TMPDIR}/$(echo $1 | sed -e 's|/|_|g')-${DATE} }
prep_for_diff () { - TMPFILE=`generate_tmp_filename "$1"` + TMPFILE=$(generate_tmp_filename "$1") + + # everything but the first line + # no "connect" lines + # remove position information + cat "$1" | \ - tail +2 | \ + sed '2,$!d' | \ grep -v '#X connect ' | \ sed 's/(#[XN] [a-z]+) [0-9]+ [0-9]+/\1/' \ - > $TMPFILE + > ${TMPFILE} }
#------------------------------------------------------------------------------ @@ -23,26 +28,26 @@
if [ $# -ne 2 ]; then echo "ERROR: Invalid number of arguments ($#)" - echo "Usage: $0 FILE FILE" + echo "Usage: $0 FILE1 FILE2" else - if [ ! -d $TMPDIR ]; then - mkdir $TMPDIR + if [ ! -d ${TMPDIR} ]; then + mkdir ${TMPDIR} fi - TMP1=`generate_tmp_filename "$1"` - TMP2=`generate_tmp_filename "$2"` + TMP1=$(generate_tmp_filename "$1") + TMP2=$(generate_tmp_filename "$2") prep_for_diff "$1" prep_for_diff "$2"
# diff of everything except "#X connect"'s - diff -uw "$TMP1" "$TMP2" + diff -uw "${TMP1}" "${TMP2}"
- file1count=`grep -v '#X connect ' "$1" | wc -l` - file2count=`grep -v '#X connect ' "$2" | wc -l` + file1count=$(grep -v '#X connect ' "$1" | wc -l) + file2count=$(grep -v '#X connect ' "$2" | wc -l) if [ $file1count -ne $file2count ]; then echo "---------------------------------------------------------" - echo Connections differ: $file1count vs. $file2count + echo Connections differ: ${file1count} vs. ${file2count} fi fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.