From 0ef2b17678884f9d629d5a9dae3c9724b2b5f2e1 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Thu, 13 Aug 2020 23:21:57 -0400
Subject: [PATCH] only show data locations in version output when in a data dir
---
archivebox/config/__init__.py | 3 +--
archivebox/main.py | 11 ++++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/archivebox/config/__init__.py b/archivebox/config/__init__.py
index 70b0fea8..952929a1 100644
--- a/archivebox/config/__init__.py
+++ b/archivebox/config/__init__.py
@@ -100,8 +100,7 @@ CONFIG_DEFAULTS: Dict[str, ConfigDefaultDict] = {
'CHROME_USER_DATA_DIR': {'type': str, 'default': None},
'CHROME_HEADLESS': {'type': bool, 'default': True},
- 'CHROME_SANDBOX': {'type': bool, 'default': True},
-
+ 'CHROME_SANDBOX': {'type': bool, 'default': lambda c: not c['IN_DOCKER']},
},
'DEPENDENCY_CONFIG': {
diff --git a/archivebox/main.py b/archivebox/main.py
index 652f2d5e..361859b4 100644
--- a/archivebox/main.py
+++ b/archivebox/main.py
@@ -216,14 +216,15 @@ def version(quiet: bool=False,
print(printable_folder_status(name, folder))
print()
- print('{white}[i] External locations:{reset}'.format(**ANSI))
+ print('{white}[i] Secrets locations:{reset}'.format(**ANSI))
for name, folder in EXTERNAL_LOCATIONS.items():
print(printable_folder_status(name, folder))
- print()
- print('{white}[i] Data locations:{reset}'.format(**ANSI))
- for name, folder in DATA_LOCATIONS.items():
- print(printable_folder_status(name, folder))
+ if DATA_LOCATIONS['OUTPUT_DIR']['is_valid']:
+ print()
+ print('{white}[i] Data locations:{reset}'.format(**ANSI))
+ for name, folder in DATA_LOCATIONS.items():
+ print(printable_folder_status(name, folder))
print()
check_dependencies()