patch::: 1.1.23.jbr1

[lilypond.git] / scripts / ly2dvi.py

diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py
index 7c36e368e6dcb4d5488966d5246e14587d55abe5..cf8de43e2f9f69606d5cce5ed9b6f386e01ce9ae 100644 (file)
--- a/scripts/ly2dvi.py
+++ b/scripts/ly2dvi.py
@@ -14,7 +14,7 @@ Output: DVI file
 """
 
 name = 'ly2dvi'
-version = '0.0.9'
+version = '0.0.10'
 errorlog = ''
 
 import sys
@@ -341,7 +341,7 @@ class TeXOutput:
             psoutfile=this.__base + '.ps'
             if Props.get('output') != '':
                 psoutfile = os.path.join(Props.get('output'), psoutfile )
-            stat = os.system('dvips -o %s %s 2>&1' % (psoutfile,outfile))
+            stat = os.system('dvips -o %s %s' % (psoutfile,outfile))
             if stat:
                 sys.exit('ExitBadPostscript')
             
@@ -1016,7 +1016,11 @@ def main():
             type = infile.type()
             infile.close()
             if type == 'source':
-                cmd = 'lilypond %s %s 2>&1' % (getLilyopts(), file)
+                if os.environ.has_key('OS') and \
+                   os.environ['OS'] == 'Windows_95':
+                    cmd = 'ash -c "lilypond %s %s 2>&1"' %(getLilyopts(), file)
+                else:
+                    cmd = 'lilypond %s %s 2>&1' % (getLilyopts(), file)
                sys.stderr.write ('executing: %s\n'% cmd)
                
                 fd = os.popen(cmd , 'r')