diff --git a/linux/debian/km-config.desktop b/linux/debian/km-config.desktop index 83bf1a8b99..5646f67601 100644 --- a/linux/debian/km-config.desktop +++ b/linux/debian/km-config.desktop @@ -3,7 +3,7 @@ Name=Keyman Keyboards Name[en_GB]=Keyman Keyboards Comment=Configure Keyman keyboards Comment[en_GB]=Configure Keyman keyboards -Exec=km-config -i %u +Exec=km-config %u Icon=km-config Terminal=false Type=Application diff --git a/linux/keyman-config/km-config b/linux/keyman-config/km-config index 4345d25a1c..b7e73bf46d 100755 --- a/linux/keyman-config/km-config +++ b/linux/keyman-config/km-config @@ -12,7 +12,11 @@ if __name__ == '__main__': versionstring = "%s (package version %s)" % (__versionwithtag__, __pkgversion__) else: versionstring = "%s" % __versionwithtag__ - parser = argparse.ArgumentParser(description='Keyman keyboards installation and information') + parser = argparse.ArgumentParser(description='km-config shows the currently installed ' + + 'Keyman keyboard packages and allows you to view ' + + 'information about them. It enables you to download new ' + + 'keyboard packages from the website or install from ' + + 'local files.') parser.add_argument('--version', action='version', version='%(prog)s version ' + versionstring) parser.add_argument('-v', '--verbose', action='store_true', help='verbose logging') parser.add_argument('-vv', '--veryverbose', action='store_true', help='very verbose logging') @@ -20,6 +24,11 @@ if __name__ == '__main__': 'package. INSTALL can either be a downloaded .kmp file, a file:// URL ' + 'pointing to a .kmp file, or a keyman:// URL, possibly with a ' + 'bcp47= specified.') + parser.add_argument('url', nargs='?', default='', metavar='INSTALL', + help='download and/or install .kmp ' + + 'package. INSTALL can either be a downloaded .kmp file, a file:// URL ' + + 'pointing to a .kmp file, or a keyman:// URL, possibly with a ' + + 'bcp47= specified.') args = parser.parse_args() if args.verbose: @@ -31,6 +40,8 @@ if __name__ == '__main__': if args.install: download_and_install_package(args.install) + elif args.url: + download_and_install_package(args.url) else: from keyman_config.view_installed import ViewInstalledWindow w = ViewInstalledWindow() diff --git a/linux/keyman-config/maninc/km-config.inc b/linux/keyman-config/maninc/km-config.inc index 9e12939e24..9783cd6b60 100644 --- a/linux/keyman-config/maninc/km-config.inc +++ b/linux/keyman-config/maninc/km-config.inc @@ -1,14 +1,10 @@ -[=DESCRIPTION] +[