help_summary = _ ("lilylib module")
option_definitions = [
- ('', 'h', 'help', _ ("this help")),
+ ('', 'h', 'help', _ ("print this help")),
]
from lilylib import *
if o[1]:
sh = '-%s' % o[1]
- sep = ' '
+ sep = ' '
if o[1] and o[2]:
- sep = ','
+ sep = ', '
long = ''
if o[2]:
return str
def help ():
- ls = [(_ ("Usage: %s [OPTION]... FILE") % __main__.program_name),
+ ls = [(_ ("Usage: %s [OPTIONS]... FILE") % __main__.program_name),
('\n\n'),
(__main__.help_summary),
('\n\n'),
('\n'),
(options_help_str (__main__.option_definitions)),
('\n\n'),
- (_ ("Report bugs to %s") % 'bug-lilypond@gnu.org'),
+ (_ ("Report bugs to %s.") % 'bug-lilypond@gnu.org'),
('\n')]
map (sys.stdout.write, ls)
def lilypond_version (binary):
p = read_pipe ('%s --version ' % binary)
- x = []
- def catch_version (match):
- x.append (match.group (1))
- return ''
-
- re.sub ('GNU LilyPond ([^\n]+)\n', catch_version, p)
- x.append ('not found')
-
- return x[0]
+
+ ls = p.split ('\n')
+ v= '<not found>'
+ for l in ls:
+ m = re.search ('GNU LilyPond ([0-9a-z.]+)', p)
+ if m:
+ v = m.group (1)
+
+ return v
def lilypond_version_check (binary, req):
if req[0] <> '@' :
return __main__.temp_dir
def command_name (cmd):
- return re.match ('^[ \t]*([^ \t]*)', cmd).group (1)
+ return re.match ('^[^a-z0-9_-]*([a-z0-9_-]*)', cmd).group (1)
def error_log (name):
+ name = re.sub('[^a-z]','x',name)
return tempfile.mktemp ('%s.errorlog' % name)
def read_pipe (cmd, mode = 'r'):
+
+
redirect = ''
+ error_log_file = ''
if __main__.verbose_p:
progress (_ ("Opening pipe `%s\'") % cmd)
- redirect = ' 2>%s' % error_log (command_name (cmd))
+ else:
+ error_log_file = error_log (command_name (cmd))
+ redirect = ' 2>%s' % error_log_file
+
pipe = os.popen (cmd + redirect, mode)
output = pipe.read ()
status = pipe.close ()
if status:
error (_ ("`%s\' failed (%d)") % (cmd, exit_status))
+
if not __main__.verbose_p:
- error (_ ("The error log is as follows:"))
- sys.stderr.write (open (error_log (command_name (cmd)).read ()))
+ contents = open (error_log_file).read ()
+ if contents:
+ error (_ ("The error log is as follows:"))
+ sys.stderr.write (contents)
+
+ # Ugh. code dup
+ if error_log_file:
+ os.unlink (error_log_file)
+
exit (status)
+
if __main__.verbose_p:
progress ('\n')
+
+ if error_log_file:
+ os.unlink (error_log_file)
+
return output
def system (cmd, ignore_error = 0, progress_p = 0):
Exit status of CMD '''
name = command_name (cmd)
-
+ error_log_file = ''
+
if __main__.verbose_p:
progress_p = 1
progress (_ ("Invoking `%s\'") % cmd)
redirect = ''
if not progress_p:
- redirect = ' 1>/dev/null 2>' + error_log (name)
+ error_log_file = error_log (name)
+ redirect = ' 1>/dev/null 2>' + error_log_file
elif __main__.pseudo_filter_p:
redirect = ' 1>/dev/null'
-
+
status = os.system (cmd + redirect)
signal = 0x0f & status
exit_status = status >> 8
warning (msg + ' ' + _ ("(ignored)"))
else:
error (msg)
- if not progress_p:
+ if not progress_p and error_log_file:
error (_ ("The error log is as follows:"))
- sys.stderr.write (open (error_log (name)).read ())
+ sys.stderr.write (error_log_file).read ()
+ if error_log_file:
+ os.unlink (error_log_file)
exit (status)
+ if error_log_file:
+ os.unlink (error_log_file)
progress ('\n')
return status