From 951bba52a0341958b4286e94ad1c77268a7b181e Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Sun, 17 Dec 2023 16:14:39 -0800 Subject: [PATCH] hide +editable from version string in output because all docker installs are editable --- archivebox/config.py | 2 +- archivebox/main.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/archivebox/config.py b/archivebox/config.py index 424cf918..9f373004 100644 --- a/archivebox/config.py +++ b/archivebox/config.py @@ -81,7 +81,7 @@ CONFIG_SCHEMA: Dict[str, ConfigDefaultDict] = { 'IN_QEMU': {'type': bool, 'default': False}, 'PUID': {'type': int, 'default': os.getuid()}, 'PGID': {'type': int, 'default': os.getgid()}, - # TODO: 'SHOW_HINTS': {'type: bool, 'default': True}, + # TODO: 'SHOW_HINTS': {'type: bool, 'default': True}, # hints are hidden automatically once collection contains >0 Snapshots, no need to configure }, 'GENERAL_CONFIG': { diff --git a/archivebox/main.py b/archivebox/main.py index b0e45bac..8968dea6 100755 --- a/archivebox/main.py +++ b/archivebox/main.py @@ -214,7 +214,7 @@ def version(quiet: bool=False, out_dir: Path=OUTPUT_DIR) -> None: """Print the ArchiveBox version and dependency information""" - print(VERSION) + print(VERSION.split('+')[0]) if not quiet: # 0.7.1 @@ -1005,9 +1005,9 @@ def setup(out_dir: Path=OUTPUT_DIR) -> None: stderr('\n Installing SINGLEFILE_BINARY, READABILITY_BINARY, MERCURY_BINARY automatically using npm...') if not NODE_VERSION: - stderr('[X] You must first install node using your system package manager', color='red') + stderr('[X] You must first install node & npm using your system package manager', color='red') hint([ - 'curl -sL https://deb.nodesource.com/setup_15.x | sudo -E bash -', + 'https://github.com/nodesource/distributions#table-of-contents', 'or to disable all node-based modules run: archivebox config --set USE_NODE=False', ]) raise SystemExit(1)