Release v3.2.0: Major macOS compatibility improvements and bug fixes
### Major macOS Compatibility Improvements - Enhanced Docker Desktop installation and startup process for macOS - Fixed Docker authentication with macOS keychain integration - Resolved user directory issues - all directories now use actual user home instead of root - Fixed password generation issues with missing shuf command and encoding errors - Improved container creation with proper working directory context - Enhanced healthcheck monitoring, particularly for Jellyseerr service ### Bug Fixes - Fixed Docker Compose version warnings by removing obsolete version attribute - Resolved container startup issues with proper directory navigation - Fixed file permission issues for config and media directories - Enhanced cross-platform path handling functions - Improved error handling and user feedback throughout installation process ### Code Quality Improvements - Updated all version references to v3.2.0 - Enhanced documentation with macOS-specific improvements - Improved cross-platform compatibility across all components - Better error messages and troubleshooting guidance This release significantly improves the macOS user experience and resolves numerous compatibility issues that were preventing successful installation and operation on macOS systems. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Stephen Klein
+40
-2
@@ -2,7 +2,7 @@
|
||||
|
||||
# HOPS - Common Utility Functions
|
||||
# Shared functions for logging, error handling, and UI
|
||||
# Version: 3.1.0-beta
|
||||
# Version: 3.2.0
|
||||
|
||||
# Prevent multiple sourcing
|
||||
if [[ -n "${HOPS_COMMON_LOADED:-}" ]]; then
|
||||
@@ -101,7 +101,7 @@ show_hops_header() {
|
||||
local subtitle="$2"
|
||||
|
||||
if [[ -z "$version" ]]; then
|
||||
version="3.1.0"
|
||||
version="3.2.0"
|
||||
fi
|
||||
|
||||
clear
|
||||
@@ -266,4 +266,42 @@ get_available_port() {
|
||||
done
|
||||
|
||||
echo "$port"
|
||||
}
|
||||
|
||||
# Cross-platform shuffle function (alternative to shuf)
|
||||
shuffle_string() {
|
||||
local input_string="$1"
|
||||
local chars=()
|
||||
local i
|
||||
|
||||
# Convert string to array of characters
|
||||
for (( i=0; i<${#input_string}; i++ )); do
|
||||
chars+=("${input_string:$i:1}")
|
||||
done
|
||||
|
||||
# Fisher-Yates shuffle algorithm
|
||||
for (( i=${#chars[@]}-1; i>0; i-- )); do
|
||||
local j=$((RANDOM % (i+1)))
|
||||
local temp="${chars[i]}"
|
||||
chars[i]="${chars[j]}"
|
||||
chars[j]="$temp"
|
||||
done
|
||||
|
||||
# Convert back to string
|
||||
printf '%s' "${chars[@]}"
|
||||
}
|
||||
|
||||
# Cross-platform character generation (alternative to tr with better encoding)
|
||||
generate_chars() {
|
||||
local char_set="$1"
|
||||
local count="$2"
|
||||
local result=""
|
||||
local i
|
||||
|
||||
for (( i=0; i<count; i++ )); do
|
||||
local char_index=$((RANDOM % ${#char_set}))
|
||||
result+="${char_set:$char_index:1}"
|
||||
done
|
||||
|
||||
echo "$result"
|
||||
}
|
||||
@@ -442,8 +442,6 @@ generate_docker_compose() {
|
||||
|
||||
# Generate compose file header
|
||||
cat > "$compose_file" << EOF
|
||||
version: '3.8'
|
||||
|
||||
services:
|
||||
EOF
|
||||
|
||||
|
||||
+6
-6
@@ -75,23 +75,23 @@ generate_secure_password() {
|
||||
# Fallback: construct guaranteed compliant password
|
||||
debug "Using fallback password generation method"
|
||||
|
||||
local upper=$(tr -dc 'A-Z' < /dev/urandom | head -c2)
|
||||
local lower=$(tr -dc 'a-z' < /dev/urandom | head -c4)
|
||||
local digits=$(tr -dc '0-9' < /dev/urandom | head -c2)
|
||||
local symbols=$(tr -dc '!@#$%^&*' < /dev/urandom | head -c2)
|
||||
local upper=$(generate_chars 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 2)
|
||||
local lower=$(generate_chars 'abcdefghijklmnopqrstuvwxyz' 4)
|
||||
local digits=$(generate_chars '0123456789' 2)
|
||||
local symbols=$(generate_chars '!@#$%^&*' 2)
|
||||
local remaining_length=$((length - 10))
|
||||
|
||||
local password=""
|
||||
|
||||
if [[ $remaining_length -gt 0 ]]; then
|
||||
local remaining=$(tr -dc 'A-Za-z0-9' < /dev/urandom | head -c$remaining_length)
|
||||
local remaining=$(generate_chars 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789' $remaining_length)
|
||||
password="${upper}${lower}${digits}${symbols}${remaining}"
|
||||
else
|
||||
password="${upper}${lower}${digits}${symbols}"
|
||||
fi
|
||||
|
||||
# Shuffle the password
|
||||
password=$(echo "$password" | fold -w1 | shuf | tr -d '\n')
|
||||
password=$(shuffle_string "$password")
|
||||
|
||||
echo "$password"
|
||||
}
|
||||
|
||||
+193
-20
@@ -379,15 +379,36 @@ run_system_checks() {
|
||||
# Get platform-specific default paths
|
||||
get_default_media_path() {
|
||||
if [[ "$OS_NAME_LOWER" == "macos" ]]; then
|
||||
echo "/Users/$USER/hops/media"
|
||||
# Use actual user, not root when running via sudo
|
||||
local actual_user
|
||||
if [[ -n "$SUDO_USER" ]]; then
|
||||
actual_user="$SUDO_USER"
|
||||
else
|
||||
actual_user="$USER"
|
||||
fi
|
||||
echo "/Users/$actual_user/hops/media"
|
||||
else
|
||||
echo "/mnt/media"
|
||||
# Use actual user, not root when running via sudo
|
||||
local actual_user
|
||||
if [[ -n "$SUDO_USER" ]]; then
|
||||
actual_user="$SUDO_USER"
|
||||
else
|
||||
actual_user="$USER"
|
||||
fi
|
||||
echo "/home/$actual_user/hops/media"
|
||||
fi
|
||||
}
|
||||
|
||||
get_default_config_path() {
|
||||
if [[ "$OS_NAME_LOWER" == "macos" ]]; then
|
||||
echo "/Users/$USER/hops/config"
|
||||
# Use actual user, not root when running via sudo
|
||||
local actual_user
|
||||
if [[ -n "$SUDO_USER" ]]; then
|
||||
actual_user="$SUDO_USER"
|
||||
else
|
||||
actual_user="$USER"
|
||||
fi
|
||||
echo "/Users/$actual_user/hops/config"
|
||||
else
|
||||
echo "/opt/appdata"
|
||||
fi
|
||||
@@ -395,9 +416,23 @@ get_default_config_path() {
|
||||
|
||||
get_default_homelab_path() {
|
||||
if [[ "$OS_NAME_LOWER" == "macos" ]]; then
|
||||
echo "/Users/$USER/hops"
|
||||
# Use actual user, not root when running via sudo
|
||||
local actual_user
|
||||
if [[ -n "$SUDO_USER" ]]; then
|
||||
actual_user="$SUDO_USER"
|
||||
else
|
||||
actual_user="$USER"
|
||||
fi
|
||||
echo "/Users/$actual_user/hops"
|
||||
else
|
||||
echo "/home/$USER/hops"
|
||||
# Use actual user, not root when running via sudo
|
||||
local actual_user
|
||||
if [[ -n "$SUDO_USER" ]]; then
|
||||
actual_user="$SUDO_USER"
|
||||
else
|
||||
actual_user="$USER"
|
||||
fi
|
||||
echo "/home/$actual_user/hops"
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -872,35 +907,127 @@ install_docker() {
|
||||
actual_user="$(whoami)"
|
||||
fi
|
||||
|
||||
# Remove conflicting compose-bridge binary if it exists
|
||||
if [[ -f "/usr/local/bin/compose-bridge" ]]; then
|
||||
info "🗑️ Removing conflicting compose-bridge binary..."
|
||||
rm -f "/usr/local/bin/compose-bridge" 2>/dev/null || true
|
||||
# Check for and handle conflicting files
|
||||
local conflicting_files=()
|
||||
local potential_conflicts=(
|
||||
"/usr/local/bin/compose-bridge"
|
||||
"/usr/local/bin/docker"
|
||||
"/usr/local/bin/docker-compose"
|
||||
"/usr/local/bin/docker-credential-desktop"
|
||||
"/usr/local/bin/docker-credential-osxkeychain"
|
||||
"/usr/local/bin/hub-tool"
|
||||
"/usr/local/bin/kubectl"
|
||||
"/Applications/Docker.app"
|
||||
"/usr/local/Caskroom/docker"
|
||||
"/usr/local/Caskroom/docker-desktop"
|
||||
"/opt/homebrew/Caskroom/docker"
|
||||
"/opt/homebrew/Caskroom/docker-desktop"
|
||||
)
|
||||
|
||||
for file in "${potential_conflicts[@]}"; do
|
||||
if [[ -e "$file" ]]; then
|
||||
conflicting_files+=("$file")
|
||||
fi
|
||||
done
|
||||
|
||||
if [[ ${#conflicting_files[@]} -gt 0 ]]; then
|
||||
warning "⚠️ Conflicting Docker files detected:"
|
||||
for file in "${conflicting_files[@]}"; do
|
||||
info " - $file"
|
||||
done
|
||||
echo
|
||||
|
||||
read -p "❓ Do you want to remove these conflicting files before installing Docker? (y/N): " -n 1 -r
|
||||
echo
|
||||
|
||||
if [[ $REPLY =~ ^[Yy]$ ]]; then
|
||||
for file in "${conflicting_files[@]}"; do
|
||||
info "🗑️ Removing conflicting file: $file"
|
||||
if [[ -d "$file" ]]; then
|
||||
rm -rf "$file" 2>/dev/null || {
|
||||
warning "Failed to remove $file - you may need to remove it manually"
|
||||
}
|
||||
else
|
||||
rm -f "$file" 2>/dev/null || {
|
||||
warning "Failed to remove $file - you may need to remove it manually"
|
||||
}
|
||||
fi
|
||||
done
|
||||
success "Conflicting files removed"
|
||||
else
|
||||
warning "Keeping existing files. Installation may fail due to conflicts."
|
||||
fi
|
||||
fi
|
||||
|
||||
sudo -u "$actual_user" brew install --cask docker
|
||||
# Install Docker Desktop with force flag to overwrite existing files
|
||||
info "📦 Installing Docker Desktop via Homebrew..."
|
||||
sudo -u "$actual_user" brew install --cask docker --force
|
||||
|
||||
# Start Docker Desktop
|
||||
# Start Docker Desktop with user interaction guidance
|
||||
info "🚀 Starting Docker Desktop..."
|
||||
open -a Docker
|
||||
open -a "Docker Desktop"
|
||||
|
||||
echo
|
||||
warning "📋 IMPORTANT: Docker Desktop First-Time Setup Required"
|
||||
warning "=============================================="
|
||||
info "Docker Desktop will now open and may require user interaction:"
|
||||
info " 1. ✅ Click 'Open' if macOS asks to confirm opening Docker Desktop"
|
||||
info " 2. ✅ Accept the Docker Desktop license agreement"
|
||||
info " 3. ✅ Complete the Docker Desktop onboarding/tutorial"
|
||||
info " 4. ✅ Sign in to Docker Hub (optional, can skip)"
|
||||
info " 5. ✅ Configure Docker settings if prompted"
|
||||
info " 6. ⚠️ Do NOT close Docker Desktop during setup"
|
||||
echo
|
||||
warning "The installation will wait for you to complete these steps..."
|
||||
echo
|
||||
|
||||
# Wait for user to complete setup
|
||||
read -p "❓ Press ENTER after you've completed the Docker Desktop setup and it's running..."
|
||||
echo
|
||||
|
||||
# Wait for Docker to start
|
||||
info "⏳ Waiting for Docker Desktop to start (this may take a few minutes)..."
|
||||
local max_wait=120
|
||||
info "⏳ Verifying Docker Desktop is running..."
|
||||
local max_wait=60
|
||||
local wait_time=0
|
||||
local docker_started=false
|
||||
|
||||
while ! docker info >/dev/null 2>&1; do
|
||||
if [[ $wait_time -ge $max_wait ]]; then
|
||||
error_exit "Docker Desktop failed to start within $max_wait seconds. Please start it manually and try again."
|
||||
while [[ $wait_time -lt $max_wait ]]; do
|
||||
# Try to connect to Docker daemon
|
||||
if docker info >/dev/null 2>&1; then
|
||||
docker_started=true
|
||||
break
|
||||
fi
|
||||
|
||||
sleep 5
|
||||
((wait_time += 5))
|
||||
sleep 2
|
||||
((wait_time += 2))
|
||||
echo -n "."
|
||||
done
|
||||
|
||||
echo
|
||||
success "Docker Desktop installed and started successfully"
|
||||
|
||||
if [[ "$docker_started" == true ]]; then
|
||||
success "✅ Docker Desktop is running and ready!"
|
||||
else
|
||||
warning "❌ Docker Desktop doesn't appear to be running."
|
||||
warning "Please ensure Docker Desktop is:"
|
||||
info " 1. Completely started (not just the app, but the Docker engine)"
|
||||
info " 2. Shows 'Docker Desktop is running' in the menu bar"
|
||||
info " 3. The whale icon in the menu bar is solid (not animated)"
|
||||
echo
|
||||
|
||||
read -p "❓ Try verification again? (y/N): " -n 1 -r
|
||||
echo
|
||||
|
||||
if [[ $REPLY =~ ^[Yy]$ ]]; then
|
||||
if docker info >/dev/null 2>&1; then
|
||||
success "✅ Docker Desktop is now running!"
|
||||
else
|
||||
error_exit "Docker Desktop still not responding. Please resolve the issue and re-run HOPS installation."
|
||||
fi
|
||||
else
|
||||
error_exit "Installation cancelled. Please ensure Docker Desktop is running and try again."
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
"ubuntu"|"debian"|"linuxmint"|"mint")
|
||||
# Check for existing Docker installation
|
||||
@@ -946,6 +1073,52 @@ install_docker() {
|
||||
fi
|
||||
fi
|
||||
|
||||
# Check for and handle conflicting files
|
||||
local conflicting_files=()
|
||||
local potential_conflicts=(
|
||||
"/usr/bin/docker"
|
||||
"/usr/bin/docker-compose"
|
||||
"/usr/local/bin/docker"
|
||||
"/usr/local/bin/docker-compose"
|
||||
"/etc/docker"
|
||||
"/var/lib/docker"
|
||||
)
|
||||
|
||||
for file in "${potential_conflicts[@]}"; do
|
||||
if [[ -e "$file" ]]; then
|
||||
conflicting_files+=("$file")
|
||||
fi
|
||||
done
|
||||
|
||||
if [[ ${#conflicting_files[@]} -gt 0 ]]; then
|
||||
warning "⚠️ Conflicting Docker files detected:"
|
||||
for file in "${conflicting_files[@]}"; do
|
||||
info " - $file"
|
||||
done
|
||||
echo
|
||||
|
||||
read -p "❓ Do you want to remove these conflicting files before installing Docker? (y/N): " -n 1 -r
|
||||
echo
|
||||
|
||||
if [[ $REPLY =~ ^[Yy]$ ]]; then
|
||||
for file in "${conflicting_files[@]}"; do
|
||||
info "🗑️ Removing conflicting file: $file"
|
||||
if [[ -d "$file" ]]; then
|
||||
rm -rf "$file" 2>/dev/null || {
|
||||
warning "Failed to remove $file - you may need to remove it manually"
|
||||
}
|
||||
else
|
||||
rm -f "$file" 2>/dev/null || {
|
||||
warning "Failed to remove $file - you may need to remove it manually"
|
||||
}
|
||||
fi
|
||||
done
|
||||
success "Conflicting files removed"
|
||||
else
|
||||
warning "Keeping existing files. Installation may fail due to conflicts."
|
||||
fi
|
||||
fi
|
||||
|
||||
# Install fresh Docker using the official script
|
||||
info "📦 Installing Docker Engine..."
|
||||
curl -fsSL https://get.docker.com | sh
|
||||
|
||||
Reference in New Issue
Block a user