# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Date 1219271233 25200
# Node ID 028543f67bea35f64b5a2b6f65bc07889d20b9d9
# Parent  e6d9741c893399d2ea44521df388a776f64e24aa
Fix build

diff -r e6d9741c8933 -r 028543f67bea en/Makefile
--- a/en/Makefile	Wed Aug 20 15:27:06 2008 -0700
+++ b/en/Makefile	Wed Aug 20 15:27:13 2008 -0700
@@ -161,10 +161,10 @@
 
 # Produce 90dpi PNGs for the web.
 
-%.png: %.svg
+%.png: %.svg fixsvg
 	./fixsvg $<
-	mv $<.tmp foobar.svg
-	inkscape -D -e $@ foobar.svg
+	inkscape -D -e $@ $<-tmp.svg
+	rm $<-tmp.svg
 
 %.svg: %.dot
 	dot -Tsvg -o $@ $<
diff -r e6d9741c8933 -r 028543f67bea en/fixsvg
--- a/en/fixsvg	Wed Aug 20 15:27:06 2008 -0700
+++ b/en/fixsvg	Wed Aug 20 15:27:13 2008 -0700
@@ -1,26 +1,29 @@
 #!/bin/bash
 
-REPO=/home/ostkamp/mercurial/hello.repo
+test -d hello || hg clone http://hg.serpentine.com/tutorial/hello
+
+set -e
 
 for i in 0 1 2 3 4
 do
-  export REV$i=`cd $REPO; hg log -r $i | grep changeset | cut -c 16-19 2>//dev/null`
+  export REV$i=$(hg --cwd hello log -r $i --template '{node|short}' | cut -c1-4)
 done
-export REV_my_hello=`cat /tmp/REV5.my-hello`
-export REV_my_new_hello=`cat /tmp/REV5.my-new-hello`
-export REV6_my_new_hello=`cat /tmp/REV6.my-new-hello`
-export REV7_my_new_hello=`cat /tmp/REV7.my-new-hello`
+export REV_my_hello=$(cat /tmp/REV5.my-hello)
+export REV_my_new_hello=$(cat /tmp/REV5.my-new-hello)
+export REV6_my_new_hello=$(cat /tmp/REV6.my-new-hello)
+export REV7_my_new_hello=$(cat /tmp/REV7.my-new-hello)
 
 FILE=$1
-rm -f $FILE.tmp
+OUTFILE=$FILE-tmp.svg
+rm -f $OUTFILE
 echo "Fixing $FILE"
-cp $FILE $FILE.tmp
-perl -p -i -e "s#REV0#$REV0#" $FILE.tmp
-perl -p -i -e "s#REV1#$REV1#" $FILE.tmp
-perl -p -i -e "s#REV2#$REV2#" $FILE.tmp
-perl -p -i -e "s#REV3#$REV3#" $FILE.tmp
-perl -p -i -e "s#REV4#$REV4#" $FILE.tmp
-perl -p -i -e "s#REV_my_hello#$REV_my_hello#" $FILE.tmp
-perl -p -i -e "s#REV_my_new_hello#$REV_my_new_hello#" $FILE.tmp
-perl -p -i -e "s#REV6_my_new_hello#$REV6_my_new_hello#" $FILE.tmp
-perl -p -i -e "s#REV7_my_new_hello#$REV7_my_new_hello#" $FILE.tmp
+cp $FILE $OUTFILE
+perl -p -i -e "s#REV0#$REV0#" $OUTFILE
+perl -p -i -e "s#REV1#$REV1#" $OUTFILE
+perl -p -i -e "s#REV2#$REV2#" $OUTFILE
+perl -p -i -e "s#REV3#$REV3#" $OUTFILE
+perl -p -i -e "s#REV4#$REV4#" $OUTFILE
+perl -p -i -e "s#REV_my_hello#$REV_my_hello#" $OUTFILE
+perl -p -i -e "s#REV_my_new_hello#$REV_my_new_hello#" $OUTFILE
+perl -p -i -e "s#REV6_my_new_hello#$REV6_my_new_hello#" $OUTFILE
+perl -p -i -e "s#REV7_my_new_hello#$REV7_my_new_hello#" $OUTFILE