From d68e2f2d0be6ac49e547775ece8655a720f6292f Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Sat, 07 Feb 2026 23:18:28 +0000
Subject: [PATCH] Try to fix cli
---
src/archbuild/cli.py | 171 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 167 insertions(+), 4 deletions(-)
diff --git a/src/archbuild/cli.py b/src/archbuild/cli.py
index e016c29..a05b9ba 100644
--- a/src/archbuild/cli.py
+++ b/src/archbuild/cli.py
@@ -22,7 +22,7 @@
def run_async(coro: Any) -> Any:
"""Run async function in sync context."""
- return asyncio.get_event_loop().run_until_complete(coro)
+ return asyncio.run(coro)
class Context:
@@ -314,9 +314,15 @@
@cli.command()
+@click.option("--systemd", is_flag=True, help="Set up systemd service and timer for automated builds")
+@click.option("--gpg", is_flag=True, help="Set up GPG signing for the repository")
@pass_context
-def init(ctx: Context) -> None:
- """Initialize repository directories and configuration."""
+def init(ctx: Context, systemd: bool, gpg: bool) -> None:
+ """Initialize repository directories and configuration.
+
+ This command is idempotent and can be run multiple times to add features
+ like systemd automation or GPG signing.
+ """
config = ctx.config
# Create directories
@@ -326,9 +332,15 @@
repo = RepoManager(config)
repo.ensure_repo_exists()
- console.print(f"[green]✓[/] Repository initialized at {config.repository.path}")
+ console.print(f"[green]✓[/] Repository directory: {config.repository.path}")
console.print(f"[green]✓[/] Build directory: {config.repository.build_dir}")
+ if systemd:
+ _setup_systemd(ctx)
+
+ if gpg:
+ _setup_gpg(ctx)
+
# Check pacman.conf
pacman_conf = Path("/etc/pacman.conf")
if pacman_conf.exists():
@@ -342,6 +354,157 @@
)
+def _setup_systemd(ctx: Context) -> None:
+ """Helper to set up systemd service and timer."""
+ import subprocess
+
+ console.print("\n[bold blue]═══ Systemd Setup ═══[/]")
+
+ interval = click.prompt("How often should builds run? (systemd Calendar spec, e.g., 12h, daily)", default="12h")
+
+ # Get absolute path to archbuild executable
+ import shutil
+ archbuild_path = shutil.which("archbuild")
+ if not archbuild_path:
+ # Fallback to current sys.executable if running as module or in venv
+ archbuild_path = f"{sys.executable} -m archbuild.cli"
+
+ user_systemd_dir = Path.home() / ".config" / "systemd" / "user"
+ user_systemd_dir.mkdir(parents=True, exist_ok=True)
+
+ service_content = f"""[Unit]
+Description=Archbuild - Automatic AUR Package Builder
+After=network.target
+
+[Service]
+Type=oneshot
+ExecStart={archbuild_path} build-all
+Environment="PATH={Path.home()}/.local/bin:/usr/bin:/bin"
+"""
+
+ timer_content = f"""[Unit]
+Description=Timer for Archbuild Automatic Builds
+
+[Timer]
+OnCalendar={interval}
+Persistent=true
+
+[Install]
+WantedBy=timers.target
+"""
+
+ service_file = user_systemd_dir / "archbuild.service"
+ timer_file = user_systemd_dir / "archbuild.timer"
+
+ service_file.write_text(service_content)
+ timer_file.write_text(timer_content)
+
+ try:
+ subprocess.run(["systemctl", "--user", "daemon-reload"], check=True)
+ subprocess.run(["systemctl", "--user", "enable", "--now", "archbuild.timer"], check=True)
+ console.print(f"[green]✓[/] Systemd timer enabled (running every {interval})")
+ except subprocess.CalledProcessError as e:
+ console.print(f"[red]✗[/] Failed to enable systemd timer: {e}")
+
+
+def _setup_gpg(ctx: Context) -> None:
+ """Helper to set up GPG signing."""
+ import subprocess
+
+ console.print("\n[bold blue]═══ GPG Signing Setup ═══[/]")
+
+ config = ctx.config
+
+ # Check for existing keys
+ try:
+ result = subprocess.run(
+ ["gpg", "--list-secret-keys", "--keyid-format", "LONG"],
+ capture_output=True, text=True, check=True
+ )
+ keys = []
+ for line in result.stdout.splitlines():
+ if line.startswith("sec"):
+ parts = line.split()
+ if len(parts) >= 2:
+ key_id = parts[1].split("/")[-1]
+ keys.append(key_id)
+
+ if keys:
+ console.print("Found existing GPG keys:")
+ for i, key in enumerate(keys):
+ console.print(f" [{i}] {key}")
+
+ choice = click.prompt(
+ "Select a key index, enter a Key ID manually, or type 'new' to generate",
+ default="0"
+ )
+
+ if choice.lower() == "new":
+ key_id = _generate_gpg_key()
+ elif choice.isdigit() and int(choice) < len(keys):
+ key_id = keys[int(choice)]
+ else:
+ key_id = choice
+ else:
+ if click.confirm("No secret keys found. Generate a new one?"):
+ key_id = _generate_gpg_key()
+ else:
+ key_id = click.prompt("Enter Key ID manually")
+
+ except (subprocess.CalledProcessError, FileNotFoundError):
+ console.print("[yellow]GPG not found or failed to list keys.[/]")
+ key_id = click.prompt("Enter Key ID manually")
+
+ if key_id:
+ config.signing.enabled = True
+ config.signing.key = key_id
+ save_config(config, ctx.config_path)
+ console.print(f"[green]✓[/] Signing enabled with key: {key_id}")
+ console.print(f"[green]✓[/] Configuration updated: {ctx.config_path}")
+
+
+def _generate_gpg_key() -> str:
+ """Generate a new GPG key and return its ID."""
+ import subprocess
+ import tempfile
+
+ console.print("Generating new GPG key (this may take a while)...")
+
+ name = click.prompt("Name for GPG key", default="Archbuild Repo")
+ email = click.prompt("Email for GPG key")
+
+ batch_content = f"""
+ Key-Type: RSA
+ Key-Length: 4096
+ Subkey-Type: RSA
+ Subkey-Length: 4096
+ Name-Real: {name}
+ Name-Email: {email}
+ Expire-Date: 0
+ %no-protection
+ %commit
+ """
+
+ with tempfile.NamedTemporaryFile(mode="w") as f:
+ f.write(batch_content)
+ f.flush()
+ try:
+ subprocess.run(["gpg", "--batch", "--generate-key", f.name], check=True)
+
+ # Get the ID of the key we just created
+ result = subprocess.run(
+ ["gpg", "--list-secret-keys", "--keyid-format", "LONG", email],
+ capture_output=True, text=True, check=True
+ )
+ for line in result.stdout.splitlines():
+ if line.startswith("sec"):
+ return line.split()[1].split("/")[-1]
+ except subprocess.CalledProcessError as e:
+ console.print(f"[red]✗[/] Failed to generate GPG key: {e}")
+ return ""
+ return ""
+
+
def _print_results(results: list[Any]) -> None:
"""Print build results summary table."""
if not results:
--
Gitblit v1.10.0