From 1df7a4538ca41f849ac9c4b0abd9468d8928ae5e Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Sat, 1 Aug 2026 05:13:54 -0700 Subject: [PATCH] Persist setup dependency library path --- archivebox/tests/test_setup_script.py | 11 +++++++++++ bin/setup.sh | 1 + 2 files changed, 12 insertions(+) diff --git a/archivebox/tests/test_setup_script.py b/archivebox/tests/test_setup_script.py index 1822ce35..7ca5dc96 100644 --- a/archivebox/tests/test_setup_script.py +++ b/archivebox/tests/test_setup_script.py @@ -75,6 +75,17 @@ def test_setup_script_keeps_optional_binary_probes_quiet(): assert 'if [ -n "$OPEN_BINARY" ] && [ -t 1 ]; then' in script +def test_setup_script_persists_bootstrap_library_before_installing_dependencies(): + script = SETUP_SCRIPT.read_text() + native_install = script.partition(': | "$ARCHIVEBOX_BINARY" init')[2] + + persist_config = '"$ARCHIVEBOX_BINARY" config --set "ABXPKG_LIB_DIR=$ABXPKG_LIB_DIR"' + install_dependencies = '"$ARCHIVEBOX_BINARY" install' + + assert persist_config in native_install + assert native_install.index(persist_config) < native_install.index(install_dependencies) + + def test_setup_script_moves_legacy_collection_without_moving_compose(tmp_path): script = SETUP_SCRIPT.read_text() function_prefix = script.partition("\ndocker_pull_archivebox() {")[0] diff --git a/bin/setup.sh b/bin/setup.sh index 4b374fb8..f2f197b6 100755 --- a/bin/setup.sh +++ b/bin/setup.sh @@ -420,6 +420,7 @@ cd "$ARCHIVEBOX_HOME_DIR" migrate_legacy_collection_dir cd ./data : | "$ARCHIVEBOX_BINARY" init # pipe in empty command to make sure stdin is closed +"$ARCHIVEBOX_BINARY" config --set "ABXPKG_LIB_DIR=$ABXPKG_LIB_DIR" "$ARCHIVEBOX_BINARY" install # init shows version output at the end too echo