mirror of
https://github.com/ArchiveBox/ArchiveBox.git
synced 2026-01-03 01:15:57 +10:00
Update install hooks to respect XYZ_BINARY env vars
- All install hooks now respect their respective XYZ_BINARY env vars (e.g., WGET_BINARY, CHROME_BINARY, YTDLP_BINARY, etc.) - Support both absolute paths (/usr/bin/wget2) and binary names (wget2) - Dynamic bin_name used in Dependency JSONL output - Updated 11 install hooks to follow the new pattern - Mark checklist items as complete in TODO_hook_architecture.md
This commit is contained in:
@@ -1,25 +1,39 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
Validation hook for git binary.
|
||||
Install hook for git binary.
|
||||
|
||||
Runs at crawl start to verify git is available.
|
||||
Outputs JSONL for InstalledBinary and Machine config updates.
|
||||
Respects GIT_BINARY env var for custom binary paths.
|
||||
"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
import json
|
||||
from pathlib import Path
|
||||
|
||||
|
||||
def find_git() -> dict | None:
|
||||
"""Find git binary."""
|
||||
"""Find git binary, respecting GIT_BINARY env var."""
|
||||
try:
|
||||
from abx_pkg import Binary, EnvProvider
|
||||
|
||||
binary = Binary(name='git', binproviders=[EnvProvider()])
|
||||
# Check if user has configured a custom binary
|
||||
configured_binary = os.environ.get('GIT_BINARY', '').strip()
|
||||
|
||||
if configured_binary:
|
||||
if '/' in configured_binary:
|
||||
bin_name = Path(configured_binary).name
|
||||
else:
|
||||
bin_name = configured_binary
|
||||
else:
|
||||
bin_name = 'git'
|
||||
|
||||
binary = Binary(name=bin_name, binproviders=[EnvProvider()])
|
||||
loaded = binary.load()
|
||||
if loaded and loaded.abspath:
|
||||
return {
|
||||
'name': 'git',
|
||||
'name': bin_name,
|
||||
'abspath': str(loaded.abspath),
|
||||
'version': str(loaded.version) if loaded.version else None,
|
||||
'sha256': loaded.sha256 if hasattr(loaded, 'sha256') else None,
|
||||
@@ -32,6 +46,15 @@ def find_git() -> dict | None:
|
||||
|
||||
|
||||
def main():
|
||||
# Determine binary name from config
|
||||
configured_binary = os.environ.get('GIT_BINARY', '').strip()
|
||||
if configured_binary and '/' in configured_binary:
|
||||
bin_name = Path(configured_binary).name
|
||||
elif configured_binary:
|
||||
bin_name = configured_binary
|
||||
else:
|
||||
bin_name = 'git'
|
||||
|
||||
result = find_git()
|
||||
|
||||
if result and result.get('abspath'):
|
||||
@@ -63,10 +86,10 @@ def main():
|
||||
else:
|
||||
print(json.dumps({
|
||||
'type': 'Dependency',
|
||||
'bin_name': 'git',
|
||||
'bin_name': bin_name,
|
||||
'bin_providers': 'apt,brew,env',
|
||||
}))
|
||||
print(f"git binary not found", file=sys.stderr)
|
||||
print(f"{bin_name} binary not found", file=sys.stderr)
|
||||
sys.exit(1)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user