[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 5cb1c09ab3390fa5cc4208dfbb33704991fdd1cc
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Fri Jan 9 14:55:42 2009 +1100

    Fix for hevea bug in gfs2doc
    
    darcs-hash:20090109035542-d4795-a1ba66bed44119a5384ecbab53c99433a948073e.gz

diff --git a/doc/examples/gfs2doc.in b/doc/examples/gfs2doc.in
index cf2e83a..469b410 100755
--- a/doc/examples/gfs2doc.in
+++ b/doc/examples/gfs2doc.in
@@ -59,14 +59,16 @@ for d in sys.argv[1:]:
     hname = wdname + "/" + example.name + "_html"
     os.mkdir(hname)
     os.symlink("../" + example.name, hname + "/" + example.name)
+    wdir = os.getcwd()
     if os.system("cd " + wdname + \
-		 "&& hevea -fix " + example.name + ".tex" + \
-		 "&& imagen -res 600 -extra \"pnmscale 0.24\" " + example.name + " " + \
-		 "&& mv " + example.name + "[0-9][0-9][0-9].png " + example.name + ".html " + \
-		 hname + \
-                  " && mv " + hname + " " + os.getcwd()):
+		 "&& hevea -fix " + example.name + ".tex"):
         print "\n\n**** Errors occured while generating directory ****: " + example.name + "_html"
         myexit(1)
+    os.system("cd " + wdname + \
+                  "; imagen -res 600 -extra \"pnmscale 0.24\" " + example.name + " " + \
+                  "; mv -f " + example.name + "[0-9][0-9][0-9].png " + example.name + ".html " + \
+                  hname + \
+                  "; mv " + hname + " " + wdir)
         
     print "\n\n**** Successfully generated directory ****: " + example.name + "_html\n"
     files = example.name + "/" + example.name + ".gfs"

-- 
Gerris Flow Solver