From e400a65fe47912b87ee128193a6aab52e90d827f Mon Sep 17 00:00:00 2001
From: Ryan Hughes <ryan@heyoodle.com>
Date: Mon, 27 Oct 2025 00:23:29 -0400
Subject: [PATCH] Consolidate docker checks

---
 bin/build              | 19 ++++---------------
 bin/sign               | 17 +++--------------
 bin/update-repo        | 20 ++++----------------
 lib/message-helpers.sh | 21 +++++++++++++++++++++
 4 files changed, 32 insertions(+), 45 deletions(-)

diff --git a/bin/build b/bin/build
index be9ed66..be56dda 100755
--- a/bin/build
+++ b/bin/build
@@ -17,21 +17,11 @@ BUILD_DIR="$BUILD_ROOT/build"
 # Create directories if they don't exist
 mkdir -p "$BUILD_OUTPUT_DIR" "$FINAL_OUTPUT_DIR" "$SRC_DIR"
 
-# Check for Docker
-if ! command -v docker &>/dev/null; then
-  print_error "Docker is not installed"
-  exit 1
-fi
-
-# Check if Docker daemon is running
-if ! docker info &>/dev/null; then
-  print_error "Docker daemon is not running"
-  print_warning "Start Docker with: sudo systemctl start docker"
-  exit 1
-fi
-
 print_header "Omarchy AUR Package Builder"
 
+# Check Docker is available
+check_docker
+
 # Parse command line arguments
 while [[ $# -gt 0 ]]; do
   case $1 in
@@ -94,8 +84,7 @@ else
 fi
 
 # Build/update the Docker image
-print_info "Building Docker image..."
-docker build -t omarchy-aur-builder:latest -f "$BUILD_DIR/Dockerfile" "$BUILD_DIR"
+build_docker_image "$BUILD_DIR"
 
 print_info "Running AUR package build..."
 
diff --git a/bin/sign b/bin/sign
index 9e98d94..bf4feea 100755
--- a/bin/sign
+++ b/bin/sign
@@ -46,18 +46,8 @@ if [[ ! -d "$BUILD_OUTPUT_DIR" ]]; then
   exit 1
 fi
 
-# Check for Docker
-if ! command -v docker &>/dev/null; then
-  print_error "Docker is not installed"
-  exit 1
-fi
-
-# Check if Docker daemon is running
-if ! docker info &>/dev/null; then
-  print_error "Docker daemon is not running"
-  print_warning "Start Docker with: sudo systemctl start docker"
-  exit 1
-fi
+# Check Docker is available
+check_docker
 
 # Check GPG credentials are in environment
 if [[ -z "$GPG_PRIVATE_KEY" ]]; then
@@ -71,8 +61,7 @@ if [[ -z "$GPG_PASSPHRASE" ]]; then
 fi
 
 # Build/update the Docker image (reuse same image as build)
-print_info "Building Docker image..."
-docker build -t omarchy-aur-builder:latest -f "$BUILD_DIR/Dockerfile" "$BUILD_DIR"
+build_docker_image "$BUILD_DIR"
 
 print_info "Running package signing..."
 
diff --git a/bin/update-repo b/bin/update-repo
index 5675251..00080e5 100755
--- a/bin/update-repo
+++ b/bin/update-repo
@@ -16,17 +16,8 @@ ARCH_DIR="$BUILD_ROOT/pkgs.omarchy.org/$ARCH"
 update_database() {
   print_info "Updating repository database in Docker container..."
 
-  # Check for Docker
-  if ! command -v docker &>/dev/null; then
-    print_error "Docker is not installed"
-    exit 1
-  fi
-
-  # Check if Docker daemon is running
-  if ! docker info &>/dev/null; then
-    print_error "Docker daemon is not running"
-    exit 1
-  fi
+  # Check Docker is available
+  check_docker
 
   # Ensure output directory exists
   if [[ ! -d "$ARCH_DIR" ]]; then
@@ -42,11 +33,8 @@ update_database() {
     sudo chown -R $(id -u):$(id -g) "$ARCH_DIR" 2>/dev/null || chmod -R 777 "$ARCH_DIR"
   fi
 
-  # Build Docker image if needed (reuse the same image as build)
-  if ! docker image inspect omarchy-aur-builder:latest &>/dev/null; then
-    print_info "Building Docker image..."
-    docker build -t omarchy-aur-builder:latest -f "$BUILD_DIR/Dockerfile" "$BUILD_DIR"
-  fi
+  # Build Docker image
+  build_docker_image "$BUILD_DIR"
 
   # Run repo-add in Docker container
   docker run --rm \
diff --git a/lib/message-helpers.sh b/lib/message-helpers.sh
index 69679b0..203f382 100644
--- a/lib/message-helpers.sh
+++ b/lib/message-helpers.sh
@@ -36,3 +36,24 @@ print_header() {
   echo -e "${BOLD}$1${NC}"
   echo -e "${BOLD}================================${NC}"
 }
+
+# Check Docker is available and running
+check_docker() {
+  if ! command -v docker &>/dev/null; then
+    print_error "Docker is not installed"
+    exit 1
+  fi
+
+  if ! docker info &>/dev/null; then
+    print_error "Docker daemon is not running"
+    print_warning "Start Docker with: sudo systemctl start docker"
+    exit 1
+  fi
+}
+
+# Build the Docker image if needed
+build_docker_image() {
+  local build_dir="$1"
+  print_info "Building Docker image..."
+  docker build -t omarchy-aur-builder:latest -f "$build_dir/Dockerfile" "$build_dir"
+}