diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 16:08:32 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 16:08:32 +0000 |
commit | d068e649053949f8bd682f7db0a0d4d61024e4e7 (patch) | |
tree | d99cbf5b93bfe1605650382d58bf2969d8a8078e /litecli/main.py | |
parent | Releasing debian version 1.10.1-2. (diff) | |
download | litecli-d068e649053949f8bd682f7db0a0d4d61024e4e7.tar.xz litecli-d068e649053949f8bd682f7db0a0d4d61024e4e7.zip |
Merging upstream version 1.11.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'litecli/main.py')
-rw-r--r-- | litecli/main.py | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/litecli/main.py b/litecli/main.py index 268ede2..ebbc5ba 100644 --- a/litecli/main.py +++ b/litecli/main.py @@ -10,7 +10,7 @@ from time import time from datetime import datetime from io import open from collections import namedtuple -from sqlite3 import OperationalError +from sqlite3 import OperationalError, sqlite_version import shutil from cli_helpers.tabular_output import TabularOutputFormatter @@ -380,10 +380,8 @@ class LiteCli(object): key_bindings = cli_bindings(self) if not self.less_chatty: - print("Version:", __version__) - print("Mail: https://groups.google.com/forum/#!forum/litecli-users") + print(f"LiteCli: {__version__} (SQLite: {sqlite_version})") print("GitHub: https://github.com/dbcli/litecli") - # print("Home: https://litecli.com") def get_message(): prompt = self.get_prompt(self.prompt_format) @@ -588,7 +586,11 @@ class LiteCli(object): def startup_commands(): if self.startup_commands: if "commands" in self.startup_commands: - for command in self.startup_commands["commands"]: + if isinstance(self.startup_commands["commands"], str): + commands = [self.startup_commands["commands"]] + else: + commands = self.startup_commands["commands"] + for command in commands: try: res = sqlexecute.run(command) except Exception as e: @@ -819,7 +821,7 @@ class LiteCli(object): headers, format_name="vertical" if expanded else None, column_types=column_types, - **output_kwargs + **output_kwargs, ) if isinstance(formatted, (text_type)): @@ -841,7 +843,7 @@ class LiteCli(object): headers, format_name="vertical", column_types=column_types, - **output_kwargs + **output_kwargs, ) if isinstance(formatted, (text_type)): formatted = iter(formatted.splitlines()) |