mirror of
https://github.com/kossakovsky/n8n-install.git
synced 2026-03-07 22:33:11 +00:00
eeb19f590f
- Enhanced user feedback by replacing echo statements with log_info and log_error for better consistency in logging. - Added empty echo statements before user prompts in 03_generate_secrets.sh to improve readability. - Removed unnecessary log messages related to Caddy installation and uninstallation in 03_generate_secrets.sh. - Updated 04_wizard.sh to include utility sourcing and improved logging for service selection and profile updates. - Streamlined apply_update.sh by removing redundant log messages regarding Supabase compose file checks.
51 lines
2.0 KiB
Bash
Executable File
51 lines
2.0 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
set -e
|
|
|
|
# Source the utilities file
|
|
source "$(dirname "$0")/utils.sh"
|
|
|
|
# Set the compose command explicitly to use docker compose subcommand
|
|
|
|
# Navigate to the directory where this script is located
|
|
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
|
|
# Project root directory (one level up from scripts)
|
|
PROJECT_ROOT="$( cd "$SCRIPT_DIR/.." &> /dev/null && pwd )"
|
|
# Path to the apply_update.sh script
|
|
APPLY_UPDATE_SCRIPT="$SCRIPT_DIR/apply_update.sh"
|
|
|
|
# Check if apply update script exists
|
|
if [ ! -f "$APPLY_UPDATE_SCRIPT" ]; then
|
|
log_error "Crucial update script $APPLY_UPDATE_SCRIPT not found. Cannot proceed."
|
|
exit 1
|
|
fi
|
|
|
|
|
|
log_info "Starting update process..."
|
|
|
|
# Pull the latest repository changes
|
|
log_info "Pulling latest repository changes..."
|
|
# Check if git is installed
|
|
if ! command -v git &> /dev/null; then
|
|
log_warning "'git' command not found. Skipping repository update."
|
|
# Decide if we should proceed without git pull or exit. Exiting is safer.
|
|
log_error "Cannot proceed with update without git. Please install git."
|
|
exit 1
|
|
# Or, if allowing update without pull:
|
|
# log_warning "Proceeding without pulling latest changes..."
|
|
else
|
|
# Change to project root for git pull
|
|
cd "$PROJECT_ROOT" || { log_error "Failed to change directory to $PROJECT_ROOT"; exit 1; }
|
|
git reset --hard HEAD || { log_warning "Failed to reset repository. Continuing update with potentially unreset local changes..."; }
|
|
git pull || { log_warning "Failed to pull latest repository changes. Continuing update with potentially old version of apply_update.sh..."; }
|
|
# Change back to script dir or ensure apply_update.sh uses absolute paths or cd's itself
|
|
# (apply_update.sh already handles cd to PROJECT_ROOT, so we're good)
|
|
fi
|
|
|
|
# Execute the rest of the update process using the (potentially updated) apply_update.sh
|
|
bash "$APPLY_UPDATE_SCRIPT"
|
|
|
|
# The final success message will now come from apply_update.sh
|
|
log_info "Update script finished." # Changed final message
|
|
|
|
exit 0 |