fix: harden runtime detection and complete OrbStack setup docs

Author: liamvibecodes

SETUP.md

@@ -11,20 +11,35 @@ A personal media server that automatically finds, downloads, and organizes movie
 
 ---
 ## Quick Option: One-Command Install
-If you already have Docker Desktop and Plex installed, you can run a single command that handles everything:
+If you already have OrbStack (or Docker Desktop) and Plex installed, you can run a single command that handles everything:
 ```bash
 curl -fsSL https://raw.githubusercontent.com/liamvibecodes/mac-media-stack/main/bootstrap.sh | bash
 ```
 It will prompt you for VPN keys and walk you through the Seerr login. If you'd rather do each step yourself, continue with the manual guide below.
 ---
 ## What You Need
 - A Mac (any recent macOS)
+- [OrbStack](https://orbstack.dev) (recommended) or [Docker Desktop](https://www.docker.com/products/docker-desktop/) installed and running
 - An internet connection
 - Your VPN keys (two values: a private key and an address)
 - A free Plex account (create one at https://plex.tv if you don't have one)
 ---
-## Step 1: Install Docker Desktop
-Docker runs all the behind-the-scenes services. You install it once and forget about it.
+## Step 1: Install A Container Runtime
+You can use OrbStack (recommended) or Docker Desktop. Both run the same `docker` commands.
+
+### Option A: OrbStack (Recommended)
+1. Install OrbStack:
+```bash
+brew install --cask orbstack
+```
+2. Open OrbStack from Applications
+3. Wait for it to fully start, then run:
+```bash
+docker info
+```
+If it prints Docker system information, you're ready.
+
+### Option B: Docker Desktop
 1. Go to https://www.docker.com/products/docker-desktop/
 2. Click "Download for Mac"
    - If you have an M-series Mac (M1, M2, M3, M4): choose "Apple Silicon"
@@ -163,7 +178,7 @@ You probably won't need these, but just in case:
 ---
 ## Troubleshooting
 **Nothing is working after reboot:**
-Open Docker Desktop. Wait 30 seconds. Run `bash scripts/health-check.sh`.
+Open OrbStack or Docker Desktop. Wait 30 seconds. Run `bash scripts/health-check.sh`.
 **VPN health check fails:**
 Double-check your WireGuard keys in `.env`. Make sure there are no extra spaces. Then restart:
 ```bash

bootstrap.sh

@@ -17,31 +17,56 @@ echo "=============================="
 echo ""
 
 # Detect container runtime
-detect_runtime() {
+detect_installed_runtime() {
+    local has_orbstack=0
+    local has_docker_desktop=0
+
     if [[ -d "/Applications/OrbStack.app" ]] || command -v orbstack &>/dev/null; then
+        has_orbstack=1
+    fi
+    if [[ -d "/Applications/Docker.app" ]]; then
+        has_docker_desktop=1
+    fi
+
+    if [[ $has_orbstack -eq 1 && $has_docker_desktop -eq 1 ]]; then
+        echo "OrbStack or Docker Desktop"
+    elif [[ $has_orbstack -eq 1 ]]; then
         echo "OrbStack"
-    elif [[ -d "/Applications/Docker.app" ]]; then
+    elif [[ $has_docker_desktop -eq 1 ]]; then
         echo "Docker Desktop"
     else
         echo "none"
     fi
 }
 
-RUNTIME=$(detect_runtime)
+detect_running_runtime() {
+    local os_name
+    os_name=$(docker info --format '{{.OperatingSystem}}' 2>/dev/null || true)
+    if [[ "$os_name" == *"OrbStack"* ]]; then
+        echo "OrbStack"
+    elif [[ "$os_name" == *"Docker Desktop"* ]]; then
+        echo "Docker Desktop"
+    else
+        echo "Docker"
+    fi
+}
+
+INSTALLED_RUNTIME=$(detect_installed_runtime)
 
 if ! docker info &>/dev/null; then
-    if [[ "$RUNTIME" == "none" ]]; then
+    if [[ "$INSTALLED_RUNTIME" == "none" ]]; then
         echo -e "${RED}No container runtime found.${NC}"
         echo ""
         echo "Install one of these:"
-        echo "  OrbStack (recommended):  brew install orbstack"
+        echo "  OrbStack (recommended):  brew install --cask orbstack"
         echo "  Docker Desktop:          https://www.docker.com/products/docker-desktop/"
     else
-        echo -e "${RED}$RUNTIME is not running.${NC}"
-        echo "Open $RUNTIME, wait for it to start, then run this again."
+        echo -e "${RED}No container runtime is running.${NC}"
+        echo "Start $INSTALLED_RUNTIME, wait for it to start, then run this again."
     fi
     exit 1
 fi
+RUNTIME=$(detect_running_runtime)
 echo -e "${GREEN}OK${NC}  $RUNTIME is running"
 
 # Check Plex

scripts/health-check.sh

@@ -32,19 +32,44 @@ check_service() {
 }
 
 # Detect container runtime
-detect_runtime() {
+detect_installed_runtime() {
+    local has_orbstack=0
+    local has_docker_desktop=0
+
     if [[ -d "/Applications/OrbStack.app" ]] || command -v orbstack &>/dev/null; then
+        has_orbstack=1
+    fi
+    if [[ -d "/Applications/Docker.app" ]]; then
+        has_docker_desktop=1
+    fi
+
+    if [[ $has_orbstack -eq 1 && $has_docker_desktop -eq 1 ]]; then
+        echo "OrbStack or Docker Desktop"
+    elif [[ $has_orbstack -eq 1 ]]; then
+        echo "OrbStack"
+    elif [[ $has_docker_desktop -eq 1 ]]; then
+        echo "Docker Desktop"
+    else
+        echo "Docker"
+    fi
+}
+
+detect_running_runtime() {
+    local os_name
+    os_name=$(docker info --format '{{.OperatingSystem}}' 2>/dev/null || true)
+    if [[ "$os_name" == *"OrbStack"* ]]; then
         echo "OrbStack"
-    elif [[ -d "/Applications/Docker.app" ]]; then
+    elif [[ "$os_name" == *"Docker Desktop"* ]]; then
         echo "Docker Desktop"
     else
         echo "Docker"
     fi
 }
 
-RUNTIME=$(detect_runtime)
+RUNTIME=$(detect_installed_runtime)
 
 if docker info &>/dev/null; then
+    RUNTIME=$(detect_running_runtime)
     echo -e "  ${GREEN}OK${NC}  $RUNTIME"
     ((PASS++))
 else
@@ -113,7 +138,7 @@ fi
 
 echo ""
 echo "=============================="
-echo "  Results: ${GREEN}$PASS passed${NC}, ${RED}$FAIL failed${NC}"
+echo -e "  Results: ${GREEN}$PASS passed${NC}, ${RED}$FAIL failed${NC}"
 echo "=============================="
 echo ""