--- a/Toolbox/Startup.py Fri Nov 01 15:48:48 2013 +0100 +++ b/Toolbox/Startup.py Sun Nov 03 15:58:22 2013 +0100 @@ -31,18 +31,18 @@ @param appinfo dictionary describing the application @param optlen length of the field for the commandline option (integer) """ - options = [\ + options = [ ("--version", "show the program's version number and exit"), ("-h, --help", "show this help message and exit") ] options.extend(appinfo["options"]) - print(""" -Usage: {bin} [OPTIONS] {arg} - -{name} - {description} - -Options:""".format(**appinfo)) + print("""\n""" + """Usage: {bin} [OPTIONS] {arg}\n""" + """\n""" + """{name} - {description}\n""" + """\n""" + """Options:""".format(**appinfo)) for opt in options: print(" {0} {1}".format(opt[0].ljust(optlen), opt[1])) sys.exit(0) @@ -54,15 +54,18 @@ @param appinfo dictionary describing the application """ - print(""" -{name} {version} - -{description} - -Copyright (c) 2002 - 2013 Detlev Offenbach <detlev@die-offenbachs.de> -This is free software; see LICENSE.GPL3 for copying conditions. -There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A -PARTICULAR PURPOSE.""".format(**appinfo)) + print("""\n""" + """{name} {version}\n""" + """\n""" + """{description}\n""" + """\n""" + """Copyright (c) 2002 - 2013 Detlev Offenbach""" + """ <detlev@die-offenbachs.de>\n""" + """This is free software; see LICENSE.GPL3 for copying""" + """ conditions.\n""" + """There is NO warranty; not even for MERCHANTABILITY or FITNESS""" + """ FOR A\n""" + """PARTICULAR PURPOSE.""".format(**appinfo)) sys.exit(0) @@ -81,7 +84,7 @@ "--version": version, "--help": usage, "-h": usage - } + } if '--' in argv: ddindex = argv.index("--") for a in args: