1.1 --- a/en/Makefile	Wed Aug 20 15:27:06 2008 -0700
     1.2 +++ b/en/Makefile	Wed Aug 20 15:27:13 2008 -0700
     1.3 @@ -161,10 +161,10 @@
     1.4  
     1.5  # Produce 90dpi PNGs for the web.
     1.6  
     1.7 -%.png: %.svg
     1.8 +%.png: %.svg fixsvg
     1.9  	./fixsvg $<
    1.10 -	mv $<.tmp foobar.svg
    1.11 -	inkscape -D -e $@ foobar.svg
    1.12 +	inkscape -D -e $@ $<-tmp.svg
    1.13 +	rm $<-tmp.svg
    1.14  
    1.15  %.svg: %.dot
    1.16  	dot -Tsvg -o $@ $<

     2.1 --- a/en/fixsvg	Wed Aug 20 15:27:06 2008 -0700
     2.2 +++ b/en/fixsvg	Wed Aug 20 15:27:13 2008 -0700
     2.3 @@ -1,26 +1,29 @@
     2.4  #!/bin/bash
     2.5  
     2.6 -REPO=/home/ostkamp/mercurial/hello.repo
     2.7 +test -d hello || hg clone http://hg.serpentine.com/tutorial/hello
     2.8 +
     2.9 +set -e
    2.10  
    2.11  for i in 0 1 2 3 4
    2.12  do
    2.13 -  export REV$i=`cd $REPO; hg log -r $i | grep changeset | cut -c 16-19 2>//dev/null`
    2.14 +  export REV$i=$(hg --cwd hello log -r $i --template '{node|short}' | cut -c1-4)
    2.15  done
    2.16 -export REV_my_hello=`cat /tmp/REV5.my-hello`
    2.17 -export REV_my_new_hello=`cat /tmp/REV5.my-new-hello`
    2.18 -export REV6_my_new_hello=`cat /tmp/REV6.my-new-hello`
    2.19 -export REV7_my_new_hello=`cat /tmp/REV7.my-new-hello`
    2.20 +export REV_my_hello=$(cat /tmp/REV5.my-hello)
    2.21 +export REV_my_new_hello=$(cat /tmp/REV5.my-new-hello)
    2.22 +export REV6_my_new_hello=$(cat /tmp/REV6.my-new-hello)
    2.23 +export REV7_my_new_hello=$(cat /tmp/REV7.my-new-hello)
    2.24  
    2.25  FILE=$1
    2.26 -rm -f $FILE.tmp
    2.27 +OUTFILE=$FILE-tmp.svg
    2.28 +rm -f $OUTFILE
    2.29  echo "Fixing $FILE"
    2.30 -cp $FILE $FILE.tmp
    2.31 -perl -p -i -e "s#REV0#$REV0#" $FILE.tmp
    2.32 -perl -p -i -e "s#REV1#$REV1#" $FILE.tmp
    2.33 -perl -p -i -e "s#REV2#$REV2#" $FILE.tmp
    2.34 -perl -p -i -e "s#REV3#$REV3#" $FILE.tmp
    2.35 -perl -p -i -e "s#REV4#$REV4#" $FILE.tmp
    2.36 -perl -p -i -e "s#REV_my_hello#$REV_my_hello#" $FILE.tmp
    2.37 -perl -p -i -e "s#REV_my_new_hello#$REV_my_new_hello#" $FILE.tmp
    2.38 -perl -p -i -e "s#REV6_my_new_hello#$REV6_my_new_hello#" $FILE.tmp
    2.39 -perl -p -i -e "s#REV7_my_new_hello#$REV7_my_new_hello#" $FILE.tmp
    2.40 +cp $FILE $OUTFILE
    2.41 +perl -p -i -e "s#REV0#$REV0#" $OUTFILE
    2.42 +perl -p -i -e "s#REV1#$REV1#" $OUTFILE
    2.43 +perl -p -i -e "s#REV2#$REV2#" $OUTFILE
    2.44 +perl -p -i -e "s#REV3#$REV3#" $OUTFILE
    2.45 +perl -p -i -e "s#REV4#$REV4#" $OUTFILE
    2.46 +perl -p -i -e "s#REV_my_hello#$REV_my_hello#" $OUTFILE
    2.47 +perl -p -i -e "s#REV_my_new_hello#$REV_my_new_hello#" $OUTFILE
    2.48 +perl -p -i -e "s#REV6_my_new_hello#$REV6_my_new_hello#" $OUTFILE
    2.49 +perl -p -i -e "s#REV7_my_new_hello#$REV7_my_new_hello#" $OUTFILE