forked from Shinonome/dots-hyprland
Remove exp-update-old
This commit is contained in:
clsty
@@ -1,783 +0,0 @@
|
|||||||
# This script is meant to be sourced.
|
|
||||||
# It's not for directly running.
|
|
||||||
|
|
||||||
# shellcheck shell=bash
|
|
||||||
|
|
||||||
#####################################################################################
|
|
||||||
#
|
|
||||||
# exp-update-old.sh - Enhanced dotfiles update script (Old version)
|
|
||||||
#
|
|
||||||
# Features:
|
|
||||||
# - Pull latest commits from remote
|
|
||||||
# - Rebuild packages if PKGBUILD files changed (user choice)
|
|
||||||
# - Handle config file conflicts with user choices
|
|
||||||
# - Respect .updateignore file for exclusions
|
|
||||||
#
|
|
||||||
set -uo pipefail
|
|
||||||
|
|
||||||
# === Configuration ===
|
|
||||||
DOTS_ROOT="${REPO_ROOT}/dots"
|
|
||||||
ARCH_PACKAGES_DIR="${REPO_ROOT}/sdata/dist-arch"
|
|
||||||
UPDATE_IGNORE_FILE="${REPO_ROOT}/.updateignore"
|
|
||||||
HOME_UPDATE_IGNORE_FILE="${HOME}/.updateignore"
|
|
||||||
|
|
||||||
# Directories to monitor for changes
|
|
||||||
MONITOR_DIRS=(".config" ".local/bin")
|
|
||||||
|
|
||||||
# === Color Codes ===
|
|
||||||
|
|
||||||
# Function to safely read input with terminal compatibility
|
|
||||||
safe_read() {
|
|
||||||
local prompt="$1"
|
|
||||||
local varname="$2"
|
|
||||||
local default="${3:-}"
|
|
||||||
|
|
||||||
# Simple approach: just use read with /dev/tty and handle errors
|
|
||||||
local input_value=""
|
|
||||||
|
|
||||||
# Display prompt and read from terminal
|
|
||||||
echo -n "$prompt"
|
|
||||||
if read input_value </dev/tty 2>/dev/null || read input_value 2>/dev/null; then
|
|
||||||
eval "$varname='$input_value'"
|
|
||||||
return 0
|
|
||||||
else
|
|
||||||
# If read failed and we have a default, use it
|
|
||||||
if [[ -n "$default" ]]; then
|
|
||||||
echo
|
|
||||||
log_warning "Using default: $default"
|
|
||||||
eval "$varname='$default'"
|
|
||||||
return 0
|
|
||||||
else
|
|
||||||
echo
|
|
||||||
log_error "Failed to read input"
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# Function to check if a file should be ignored
|
|
||||||
should_ignore() {
|
|
||||||
local file_path="$1"
|
|
||||||
local relative_path="${file_path#$HOME/}"
|
|
||||||
|
|
||||||
# Also get path relative to repo for repo-level ignores
|
|
||||||
local repo_relative=""
|
|
||||||
if [[ "$file_path" == "$REPO_ROOT"* ]]; then
|
|
||||||
repo_relative="${file_path#$REPO_ROOT/}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check both repo and home ignore files
|
|
||||||
for ignore_file in "$UPDATE_IGNORE_FILE" "$HOME_UPDATE_IGNORE_FILE"; do
|
|
||||||
if [[ -f "$ignore_file" ]]; then
|
|
||||||
while IFS= read -r pattern || [[ -n "$pattern" ]]; do
|
|
||||||
# Skip empty lines and comments
|
|
||||||
[[ -z "$pattern" || "$pattern" =~ ^[[:space:]]*# ]] && continue
|
|
||||||
# Remove leading/trailing whitespace
|
|
||||||
pattern=$(echo "$pattern" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
|
|
||||||
[[ -z "$pattern" ]] && continue
|
|
||||||
|
|
||||||
# Handle different gitignore-style patterns
|
|
||||||
local should_skip=false
|
|
||||||
|
|
||||||
# Exact match
|
|
||||||
if [[ "$relative_path" == "$pattern" ]] || [[ "$repo_relative" == "$pattern" ]]; then
|
|
||||||
should_skip=true
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Wildcard patterns (basic glob matching)
|
|
||||||
if [[ "$relative_path" == $pattern ]] || [[ "$repo_relative" == $pattern ]]; then
|
|
||||||
should_skip=true
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Directory patterns (ending with /)
|
|
||||||
if [[ "$pattern" == */ ]]; then
|
|
||||||
local dir_pattern="${pattern%/}"
|
|
||||||
if [[ "$relative_path" == "$dir_pattern"/* ]] || [[ "$repo_relative" == "$dir_pattern"/* ]]; then
|
|
||||||
should_skip=true
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Patterns starting with / (from root)
|
|
||||||
if [[ "$pattern" == /* ]]; then
|
|
||||||
local root_pattern="${pattern#/}"
|
|
||||||
if [[ "$relative_path" == "$root_pattern" ]] || [[ "$relative_path" == "$root_pattern"/* ]] ||
|
|
||||||
[[ "$repo_relative" == "$root_pattern" ]] || [[ "$repo_relative" == "$root_pattern"/* ]]; then
|
|
||||||
should_skip=true
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Patterns with wildcards
|
|
||||||
if [[ "$pattern" == *"*"* ]]; then
|
|
||||||
if [[ "$relative_path" == $pattern ]] || [[ "$repo_relative" == $pattern ]]; then
|
|
||||||
should_skip=true
|
|
||||||
fi
|
|
||||||
# Also check if any parent directory matches
|
|
||||||
local temp_path="$relative_path"
|
|
||||||
while [[ "$temp_path" == */* ]]; do
|
|
||||||
temp_path="${temp_path%/*}"
|
|
||||||
if [[ "$temp_path" == $pattern ]]; then
|
|
||||||
should_skip=true
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Simple substring matching (for backward compatibility)
|
|
||||||
if [[ ! "$should_skip" == true ]]; then
|
|
||||||
if [[ "$file_path" == *"$pattern"* ]] || [[ "$relative_path" == *"$pattern"* ]]; then
|
|
||||||
should_skip=true
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ "$should_skip" == true ]]; then
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
done <"$ignore_file"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
# Function to show file diff with syntax highlighting if possible
|
|
||||||
show_diff() {
|
|
||||||
local file1="$1"
|
|
||||||
local file2="$2"
|
|
||||||
|
|
||||||
echo -e "\n${STY_CYAN}Showing differences:${STY_RST}"
|
|
||||||
echo -e "${STY_CYAN}Old file: $file1${STY_RST}"
|
|
||||||
echo -e "${STY_CYAN}New file: $file2${STY_RST}"
|
|
||||||
echo "----------------------------------------"
|
|
||||||
|
|
||||||
if command -v diff &>/dev/null; then
|
|
||||||
diff -u "$file1" "$file2" || true
|
|
||||||
else
|
|
||||||
echo "diff command not available"
|
|
||||||
fi
|
|
||||||
echo "----------------------------------------"
|
|
||||||
}
|
|
||||||
|
|
||||||
# Function to handle file conflicts
|
|
||||||
handle_file_conflict() {
|
|
||||||
local repo_file="$1"
|
|
||||||
local home_file="$2"
|
|
||||||
local filename=$(basename "$home_file")
|
|
||||||
local dirname=$(dirname "$home_file")
|
|
||||||
|
|
||||||
echo -e "\n${STY_YELLOW}Conflict detected:${STY_RST} $home_file"
|
|
||||||
echo "Repository version differs from your local version."
|
|
||||||
echo
|
|
||||||
echo "Choose an action:"
|
|
||||||
echo "1) Replace local file with repository version"
|
|
||||||
echo "2) Keep local file unchanged"
|
|
||||||
echo "3) Backup local file as ${filename}.old, use repository version"
|
|
||||||
echo "4) Save repository version as ${filename}.new, keep local file"
|
|
||||||
echo "5) Show diff and decide"
|
|
||||||
echo "6) Skip this file"
|
|
||||||
echo "7) Add to ignore and skip"
|
|
||||||
echo
|
|
||||||
|
|
||||||
while true; do
|
|
||||||
if ! safe_read "Enter your choice (1-7): " choice "6"; then
|
|
||||||
echo
|
|
||||||
log_warning "Failed to read input. Skipping file."
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
|
|
||||||
case $choice in
|
|
||||||
1)
|
|
||||||
cp -p "$repo_file" "$home_file"
|
|
||||||
log_success "Replaced $home_file with repository version"
|
|
||||||
break
|
|
||||||
;;
|
|
||||||
2)
|
|
||||||
log_info "Keeping local version of $home_file"
|
|
||||||
break
|
|
||||||
;;
|
|
||||||
3)
|
|
||||||
mv "$home_file" "${dirname}/${filename}.old"
|
|
||||||
cp -p "$repo_file" "$home_file"
|
|
||||||
log_success "Backed up local file to ${filename}.old and updated with repository version"
|
|
||||||
break
|
|
||||||
;;
|
|
||||||
4)
|
|
||||||
cp -p "$repo_file" "${dirname}/${filename}.new"
|
|
||||||
log_success "Saved repository version as ${filename}.new, kept local file"
|
|
||||||
break
|
|
||||||
;;
|
|
||||||
5)
|
|
||||||
show_diff "$home_file" "$repo_file"
|
|
||||||
echo
|
|
||||||
echo "After reviewing the diff, choose:"
|
|
||||||
echo "r) Replace with repository version"
|
|
||||||
echo "k) Keep local version"
|
|
||||||
echo "b) Backup local and use repository version"
|
|
||||||
echo "n) Save repository version as .new"
|
|
||||||
echo "s) Skip this file"
|
|
||||||
echo "i) Add to ignore and skip"
|
|
||||||
|
|
||||||
if ! safe_read "Enter your choice (r/k/b/n/s/i): " subchoice "s"; then
|
|
||||||
echo
|
|
||||||
log_warning "Failed to read input. Skipping file."
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
|
|
||||||
case $subchoice in
|
|
||||||
r)
|
|
||||||
cp -p "$repo_file" "$home_file"
|
|
||||||
log_success "Replaced $home_file with repository version"
|
|
||||||
break
|
|
||||||
;;
|
|
||||||
k)
|
|
||||||
log_info "Keeping local version of $home_file"
|
|
||||||
break
|
|
||||||
;;
|
|
||||||
b)
|
|
||||||
mv "$home_file" "${dirname}/${filename}.old"
|
|
||||||
cp -p "$repo_file" "$home_file"
|
|
||||||
log_success "Backed up local file to ${filename}.old and updated"
|
|
||||||
break
|
|
||||||
;;
|
|
||||||
n)
|
|
||||||
cp -p "$repo_file" "${dirname}/${filename}.new"
|
|
||||||
log_success "Saved repository version as ${filename}.new"
|
|
||||||
break
|
|
||||||
;;
|
|
||||||
s)
|
|
||||||
log_info "Skipping $home_file"
|
|
||||||
break
|
|
||||||
;;
|
|
||||||
i)
|
|
||||||
local relative_path_to_home="${home_file#$HOME/}"
|
|
||||||
echo "$relative_path_to_home" >>"$HOME_UPDATE_IGNORE_FILE"
|
|
||||||
log_success "Added '$relative_path_to_home' to $HOME_UPDATE_IGNORE_FILE and skipped."
|
|
||||||
break
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo "Invalid choice. Please try again."
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
6)
|
|
||||||
log_info "Skipping $home_file"
|
|
||||||
break
|
|
||||||
;;
|
|
||||||
7)
|
|
||||||
local relative_path_to_home="${home_file#$HOME/}"
|
|
||||||
echo "$relative_path_to_home" >>"$HOME_UPDATE_IGNORE_FILE"
|
|
||||||
log_success "Added '$relative_path_to_home' to $HOME_UPDATE_IGNORE_FILE and skipped."
|
|
||||||
break
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo "Invalid choice. Please enter 1-7."
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
# Function to check if PKGBUILD has changed
|
|
||||||
check_pkgbuild_changed() {
|
|
||||||
local pkg_dir="$1"
|
|
||||||
local pkgbuild_path="${pkg_dir}/PKGBUILD"
|
|
||||||
|
|
||||||
[[ ! -f "$pkgbuild_path" ]] && return 1
|
|
||||||
|
|
||||||
# Get the path relative to repo
|
|
||||||
local relative_path="${pkgbuild_path#$REPO_ROOT/}"
|
|
||||||
|
|
||||||
# If force check is enabled, always return true
|
|
||||||
if [[ "$FORCE_CHECK" == true ]]; then
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check if file changed in the last pull
|
|
||||||
if git diff --name-only HEAD@{1} HEAD 2>/dev/null | grep -q "^${relative_path}$"; then
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
# Function to list available packages
|
|
||||||
list_packages() {
|
|
||||||
local available_packages=()
|
|
||||||
local changed_packages=()
|
|
||||||
|
|
||||||
if [[ ! -d "$ARCH_PACKAGES_DIR" ]]; then
|
|
||||||
log_warning "No sdata/dist-arch directory found"
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
for pkg_dir in "$ARCH_PACKAGES_DIR"/*/; do
|
|
||||||
if [[ -f "${pkg_dir}/PKGBUILD" ]]; then
|
|
||||||
local pkg_name=$(basename "$pkg_dir")
|
|
||||||
available_packages+=("$pkg_name")
|
|
||||||
|
|
||||||
if check_pkgbuild_changed "$pkg_dir"; then
|
|
||||||
changed_packages+=("$pkg_name")
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
if [[ ${#available_packages[@]} -eq 0 ]]; then
|
|
||||||
log_info "No packages found in sdata/dist-arch directory"
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo -e "\n${STY_CYAN}Available packages:${STY_RST}"
|
|
||||||
for pkg in "${available_packages[@]}"; do
|
|
||||||
if [[ " ${changed_packages[*]} " =~ " ${pkg} " ]]; then
|
|
||||||
echo -e " ${STY_GREEN}● ${pkg}${STY_RST} (PKGBUILD changed)"
|
|
||||||
else
|
|
||||||
echo -e " ○ ${pkg}"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
if [[ ${#changed_packages[@]} -gt 0 ]]; then
|
|
||||||
echo -e "\n${STY_YELLOW}Packages with changed PKGBUILDs: ${changed_packages[*]}${STY_RST}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
# Function to build selected packages
|
|
||||||
build_packages() {
|
|
||||||
local build_mode="$1" # "changed", "all", or "select"
|
|
||||||
local packages_to_build=()
|
|
||||||
local rebuilt_packages=0
|
|
||||||
|
|
||||||
case "$build_mode" in
|
|
||||||
"changed")
|
|
||||||
for pkg_dir in "$ARCH_PACKAGES_DIR"/*/; do
|
|
||||||
if [[ -f "${pkg_dir}/PKGBUILD" ]]; then
|
|
||||||
local pkg_name=$(basename "$pkg_dir")
|
|
||||||
if check_pkgbuild_changed "$pkg_dir"; then
|
|
||||||
packages_to_build+=("$pkg_name")
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
;;
|
|
||||||
"all")
|
|
||||||
for pkg_dir in "$ARCH_PACKAGES_DIR"/*/; do
|
|
||||||
if [[ -f "${pkg_dir}/PKGBUILD" ]]; then
|
|
||||||
local pkg_name=$(basename "$pkg_dir")
|
|
||||||
packages_to_build+=("$pkg_name")
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
;;
|
|
||||||
"select")
|
|
||||||
echo -e "\nEnter package names separated by spaces (or 'all' for all packages):"
|
|
||||||
if ! safe_read "Packages to build: " user_selection ""; then
|
|
||||||
log_warning "Failed to read input. Skipping package builds."
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ "$user_selection" == "all" ]]; then
|
|
||||||
for pkg_dir in "$ARCH_PACKAGES_DIR"/*/; do
|
|
||||||
if [[ -f "${pkg_dir}/PKGBUILD" ]]; then
|
|
||||||
local pkg_name=$(basename "$pkg_dir")
|
|
||||||
packages_to_build+=("$pkg_name")
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
else
|
|
||||||
read -ra packages_to_build <<<"$user_selection"
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
if [[ ${#packages_to_build[@]} -eq 0 ]]; then
|
|
||||||
log_info "No packages selected for building"
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo -e "\n${STY_CYAN}Packages to build: ${packages_to_build[*]}${STY_RST}"
|
|
||||||
|
|
||||||
if ! safe_read "Proceed with building these packages? (Y/n): " confirm "Y"; then
|
|
||||||
log_warning "Failed to read input. Skipping package builds."
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ "$confirm" =~ ^[Nn]$ ]]; then
|
|
||||||
log_info "Package building cancelled by user"
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
|
|
||||||
for pkg_name in "${packages_to_build[@]}"; do
|
|
||||||
local pkg_dir="${ARCH_PACKAGES_DIR}/${pkg_name}"
|
|
||||||
|
|
||||||
if [[ ! -d "$pkg_dir" || ! -f "${pkg_dir}/PKGBUILD" ]]; then
|
|
||||||
log_error "Package not found or missing PKGBUILD: $pkg_name"
|
|
||||||
continue
|
|
||||||
fi
|
|
||||||
|
|
||||||
log_info "Building package: $pkg_name"
|
|
||||||
cd "$pkg_dir" || continue
|
|
||||||
|
|
||||||
if makepkg -si --noconfirm; then
|
|
||||||
log_success "Successfully built and installed $pkg_name"
|
|
||||||
((rebuilt_packages++))
|
|
||||||
else
|
|
||||||
log_error "Failed to build package $pkg_name"
|
|
||||||
fi
|
|
||||||
|
|
||||||
cd "$REPO_ROOT" || log_die "Failed to return to repository directory"
|
|
||||||
done
|
|
||||||
|
|
||||||
if [[ $rebuilt_packages -eq 0 ]]; then
|
|
||||||
log_warning "No packages were successfully built"
|
|
||||||
else
|
|
||||||
log_success "Successfully rebuilt $rebuilt_packages package(s)"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# Function to get list of changed files since last pull or all files if force check
|
|
||||||
get_changed_files() {
|
|
||||||
local dir_path="$1"
|
|
||||||
|
|
||||||
if [[ "$FORCE_CHECK" == true ]]; then
|
|
||||||
# Return all files in the directory
|
|
||||||
find "$dir_path" -type f -print0 2>/dev/null
|
|
||||||
else
|
|
||||||
# Get files that changed in the last pull
|
|
||||||
local changed_files=()
|
|
||||||
while IFS= read -r file; do
|
|
||||||
local full_path="${REPO_ROOT}/${file}"
|
|
||||||
# Check if file is in the directory we're processing
|
|
||||||
if [[ "$full_path" == "$dir_path"/* ]] && [[ -f "$full_path" ]]; then
|
|
||||||
printf '%s\0' "$full_path"
|
|
||||||
fi
|
|
||||||
done < <(git diff --name-only HEAD@{1} HEAD 2>/dev/null || true)
|
|
||||||
|
|
||||||
# If no files changed via git, but force_check is false, still check all files
|
|
||||||
# This handles the case where there were no new commits but files might differ
|
|
||||||
if ! git diff --quiet HEAD@{1} HEAD 2>/dev/null; then
|
|
||||||
: # Files were found via git diff
|
|
||||||
else
|
|
||||||
# No git changes detected, check all files anyway for local differences
|
|
||||||
find "$dir_path" -type f -print0 2>/dev/null
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# Function to check if we have new commits
|
|
||||||
has_new_commits() {
|
|
||||||
# Check if HEAD@{1} exists (meaning there was a previous commit)
|
|
||||||
if git rev-parse --verify HEAD@{1} &>/dev/null; then
|
|
||||||
# Check if HEAD and HEAD@{1} are different
|
|
||||||
[[ "$(git rev-parse HEAD)" != "$(git rev-parse HEAD@{1})" ]]
|
|
||||||
else
|
|
||||||
# No previous commit reference, assume we have commits
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# Main script starts here
|
|
||||||
log_header "Dotfiles Update Script"
|
|
||||||
|
|
||||||
if [[ "${SKIP_NOTICE}" == false ]]; then
|
|
||||||
log_warning "THIS SCRIPT IS NOT FULLY TESTED AND MAY CAUSE ISSUES!"
|
|
||||||
log_warning "It might be safer if you want to preserve your modifications and not delete added files,"
|
|
||||||
log_warning " but this can cause partial updates and therefore unexpected behavior like in #1856."
|
|
||||||
log_warning "In general, prefer ./setup install for updates."
|
|
||||||
safe_read "Continue? (y/N): " response "N"
|
|
||||||
|
|
||||||
if [[ ! "$response" =~ ^[Yy]$ ]]; then
|
|
||||||
log_error "Update aborted by user"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check if we're in a git repository
|
|
||||||
cd "$REPO_ROOT" || log_die "Failed to change to repository directory"
|
|
||||||
|
|
||||||
if git rev-parse --is-inside-work-tree &>/dev/null; then
|
|
||||||
log_info "Running in git repository: $(git rev-parse --show-toplevel)"
|
|
||||||
else
|
|
||||||
log_error "Not in a git repository. Please run this script from your dotfiles repository."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Step 1: Pull latest commits
|
|
||||||
log_header "Pulling Latest Changes"
|
|
||||||
|
|
||||||
# Check current branch
|
|
||||||
current_branch=$(git branch --show-current)
|
|
||||||
if [[ -z "$current_branch" ]]; then
|
|
||||||
log_warning "In detached HEAD state. Checking out main/master branch..."
|
|
||||||
if git show-ref --verify --quiet refs/heads/main; then
|
|
||||||
git checkout main
|
|
||||||
current_branch="main"
|
|
||||||
elif git show-ref --verify --quiet refs/heads/master; then
|
|
||||||
git checkout master
|
|
||||||
current_branch="master"
|
|
||||||
else
|
|
||||||
log_die "Could not find main or master branch"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
log_info "Current branch: $current_branch"
|
|
||||||
|
|
||||||
# Check for uncommitted changes
|
|
||||||
if ! git diff --quiet || ! git diff --cached --quiet; then
|
|
||||||
log_warning "You have uncommitted changes:"
|
|
||||||
git status --short
|
|
||||||
echo
|
|
||||||
|
|
||||||
if ! safe_read "Do you want to continue? This will stash your changes. (y/N): " response "N"; then
|
|
||||||
echo
|
|
||||||
log_error "Failed to read input. Aborting."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ ! "$response" =~ ^[Yy]$ ]]; then
|
|
||||||
log_die "Aborted by user"
|
|
||||||
fi
|
|
||||||
git stash push -m "Auto-stash before update $(date)"
|
|
||||||
log_info "Changes stashed"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check if remote exists
|
|
||||||
if git remote get-url origin &>/dev/null; then
|
|
||||||
# Pull changes
|
|
||||||
log_info "Pulling changes from origin/$current_branch..."
|
|
||||||
if git pull; then
|
|
||||||
log_success "Successfully pulled latest changes"
|
|
||||||
git submodule update --init --recursive
|
|
||||||
else
|
|
||||||
log_warning "Failed to pull changes from remote. Continuing with local repository..."
|
|
||||||
log_info "You may need to resolve conflicts manually later."
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
log_warning "No remote 'origin' configured. Skipping pull operation."
|
|
||||||
log_info "This appears to be a local-only repository."
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Step 2: Handle package building (only if requested)
|
|
||||||
rebuilt_packages=0
|
|
||||||
|
|
||||||
if [[ "$CHECK_PACKAGES" == true ]]; then
|
|
||||||
log_header "Package Management"
|
|
||||||
|
|
||||||
if [[ ! -d "$ARCH_PACKAGES_DIR" ]]; then
|
|
||||||
log_warning "No sdata/dist-arch directory found. Skipping package management."
|
|
||||||
else
|
|
||||||
# Check if any PKGBUILDs have changed
|
|
||||||
changed_pkgbuilds=()
|
|
||||||
for pkg_dir in "$ARCH_PACKAGES_DIR"/*/; do
|
|
||||||
if [[ -f "${pkg_dir}/PKGBUILD" ]]; then
|
|
||||||
local pkg_name=$(basename "$pkg_dir")
|
|
||||||
if check_pkgbuild_changed "$pkg_dir"; then
|
|
||||||
changed_pkgbuilds+=("$pkg_name")
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
if [[ ${#changed_pkgbuilds[@]} -gt 0 ]]; then
|
|
||||||
log_info "Found ${#changed_pkgbuilds[@]} package(s) with changed PKGBUILDs: ${changed_pkgbuilds[*]}"
|
|
||||||
echo
|
|
||||||
echo "Package build options:"
|
|
||||||
echo "1) Build only packages with changed PKGBUILDs"
|
|
||||||
echo "2) List all packages and select which to build"
|
|
||||||
echo "3) Build all packages"
|
|
||||||
echo "4) Skip package building"
|
|
||||||
echo
|
|
||||||
|
|
||||||
if safe_read "Choose an option (1-4): " pkg_choice "1"; then
|
|
||||||
case $pkg_choice in
|
|
||||||
1)
|
|
||||||
build_packages "changed"
|
|
||||||
;;
|
|
||||||
2)
|
|
||||||
if list_packages; then
|
|
||||||
build_packages "select"
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
3)
|
|
||||||
build_packages "all"
|
|
||||||
;;
|
|
||||||
4 | *)
|
|
||||||
log_info "Skipping package building"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
else
|
|
||||||
log_warning "Failed to read input. Skipping package building."
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
log_info "No PKGBUILDs have changed since last update."
|
|
||||||
echo
|
|
||||||
if safe_read "Do you want to check and build packages anyway? (y/N): " check_anyway "N"; then
|
|
||||||
if [[ "$check_anyway" =~ ^[Yy]$ ]]; then
|
|
||||||
if list_packages; then
|
|
||||||
echo
|
|
||||||
echo "Package build options:"
|
|
||||||
echo "1) Select specific packages to build"
|
|
||||||
echo "2) Build all packages"
|
|
||||||
echo "3) Skip package building"
|
|
||||||
|
|
||||||
if safe_read "Choose an option (1-3): " build_choice "3"; then
|
|
||||||
case $build_choice in
|
|
||||||
1)
|
|
||||||
build_packages "select"
|
|
||||||
;;
|
|
||||||
2)
|
|
||||||
build_packages "all"
|
|
||||||
;;
|
|
||||||
3 | *)
|
|
||||||
log_info "Skipping package building"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
else
|
|
||||||
log_info "Skipping package building"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
log_info "Skipping package management"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
log_info "Skipping package management"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
log_header "Package Management"
|
|
||||||
log_info "Package checking disabled. Use -p or --packages flag to enable package management."
|
|
||||||
|
|
||||||
# Still show a hint if there are changed PKGBUILDs
|
|
||||||
if [[ -d "$ARCH_PACKAGES_DIR" ]]; then
|
|
||||||
changed_count=0
|
|
||||||
for pkg_dir in "$ARCH_PACKAGES_DIR"/*/; do
|
|
||||||
if [[ -f "${pkg_dir}/PKGBUILD" ]] && check_pkgbuild_changed "$pkg_dir"; then
|
|
||||||
((changed_count++))
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
if [[ $changed_count -gt 0 ]]; then
|
|
||||||
log_warning "Note: $changed_count package(s) have changed PKGBUILDs. Use -p flag to manage packages."
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Step 3: Update configuration files
|
|
||||||
log_header "Updating Configuration Files"
|
|
||||||
|
|
||||||
# Check if we should process files
|
|
||||||
process_files=false
|
|
||||||
if [[ "$FORCE_CHECK" == true ]]; then
|
|
||||||
process_files=true
|
|
||||||
log_info "Force mode: checking all configuration files"
|
|
||||||
elif has_new_commits; then
|
|
||||||
process_files=true
|
|
||||||
log_info "New commits detected: checking changed configuration files"
|
|
||||||
else
|
|
||||||
log_info "No new commits found: checking for local file differences"
|
|
||||||
process_files=true # Always check for differences even without commits
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ "$process_files" == true ]]; then
|
|
||||||
files_processed=0
|
|
||||||
files_updated=0
|
|
||||||
files_created=0
|
|
||||||
|
|
||||||
for dir_name in "${MONITOR_DIRS[@]}"; do
|
|
||||||
repo_dir_path="${DOTS_ROOT}/${dir_name}"
|
|
||||||
home_dir_path="${HOME}/${dir_name}"
|
|
||||||
|
|
||||||
if [[ ! -d "$repo_dir_path" ]]; then
|
|
||||||
log_warning "Repository directory not found: $repo_dir_path"
|
|
||||||
continue
|
|
||||||
fi
|
|
||||||
|
|
||||||
log_info "Processing directory: $dir_name"
|
|
||||||
|
|
||||||
# Create home directory if it doesn't exist
|
|
||||||
mkdir -p "$home_dir_path"
|
|
||||||
|
|
||||||
# Get files to process (changed files or all files based on mode)
|
|
||||||
while IFS= read -r -d '' repo_file; do
|
|
||||||
# Calculate relative path and corresponding home file path
|
|
||||||
rel_path="${repo_file#$repo_dir_path/}"
|
|
||||||
home_file="${home_dir_path}/${rel_path}"
|
|
||||||
|
|
||||||
# Check if file should be ignored
|
|
||||||
if should_ignore "$home_file"; then
|
|
||||||
continue
|
|
||||||
fi
|
|
||||||
|
|
||||||
((files_processed++))
|
|
||||||
|
|
||||||
# Create directory structure if needed
|
|
||||||
mkdir -p "$(dirname "$home_file")"
|
|
||||||
|
|
||||||
if [[ -f "$home_file" ]]; then
|
|
||||||
# File exists, check if different
|
|
||||||
if ! cmp -s "$repo_file" "$home_file"; then
|
|
||||||
log_info "Found difference in: $rel_path"
|
|
||||||
handle_file_conflict "$repo_file" "$home_file"
|
|
||||||
((files_updated++))
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
# New file, copy it
|
|
||||||
cp -p "$repo_file" "$home_file"
|
|
||||||
log_success "Created new file: $home_file"
|
|
||||||
((files_created++))
|
|
||||||
fi
|
|
||||||
done < <(get_changed_files "$repo_dir_path")
|
|
||||||
done
|
|
||||||
|
|
||||||
# Show processing summary
|
|
||||||
echo
|
|
||||||
log_info "File processing summary:"
|
|
||||||
log_info "- Files processed: $files_processed"
|
|
||||||
log_info "- Files with conflicts: $files_updated"
|
|
||||||
log_info "- New files created: $files_created"
|
|
||||||
else
|
|
||||||
log_info "Skipping file updates (no changes detected and not in force mode)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Step 4: Update script permissions
|
|
||||||
log_header "Updating Script Permissions"
|
|
||||||
|
|
||||||
# Make sure local bin scripts are executable
|
|
||||||
if [[ -d "${HOME}/.local/bin" ]]; then
|
|
||||||
find "${HOME}/.local/bin" -type f -exec chmod +x {} \; 2>/dev/null || true
|
|
||||||
log_success "Updated ~/.local/bin script permissions"
|
|
||||||
fi
|
|
||||||
|
|
||||||
log_header "Update Complete"
|
|
||||||
log_success "Dotfiles update completed successfully!"
|
|
||||||
|
|
||||||
# Show summary
|
|
||||||
echo
|
|
||||||
echo -e "${STY_CYAN}Summary:${STY_RST}"
|
|
||||||
echo "- Repository: $(git log -1 --pretty=format:'%h - %s (%cr)')"
|
|
||||||
echo "- Branch: $current_branch"
|
|
||||||
echo "- Mode: $([ "$FORCE_CHECK" == true ] && echo "Force check" || echo "Normal")"
|
|
||||||
echo "- Package checking: $([ "$CHECK_PACKAGES" == true ] && echo "Enabled" || echo "Disabled")"
|
|
||||||
|
|
||||||
if [[ $rebuilt_packages -gt 0 ]]; then
|
|
||||||
echo "- Packages rebuilt: $rebuilt_packages"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ "$process_files" == true ]]; then
|
|
||||||
echo "- Files processed: $files_processed"
|
|
||||||
echo "- Files updated/conflicted: $files_updated"
|
|
||||||
echo "- New files created: $files_created"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "- Configuration directories: ${MONITOR_DIRS[*]}"
|
|
||||||
|
|
||||||
# Remind about ignore files and show examples
|
|
||||||
if [[ ! -f "$HOME_UPDATE_IGNORE_FILE" && ! -f "$UPDATE_IGNORE_FILE" ]]; then
|
|
||||||
echo
|
|
||||||
log_info "Tip: Create ignore files to exclude files from updates:"
|
|
||||||
echo " - Repository ignore: ${REPO_ROOT}/.updateignore"
|
|
||||||
echo " - User ignore: ~/.updateignore"
|
|
||||||
echo
|
|
||||||
echo "Example patterns:"
|
|
||||||
echo " *.log # Ignore all .log files"
|
|
||||||
echo " .config/personal/ # Ignore entire directory"
|
|
||||||
echo " secret-config.conf # Ignore specific file"
|
|
||||||
echo " /temp-file # Ignore from root only"
|
|
||||||
echo " *secret* # Ignore files containing 'secret'"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo
|
|
||||||
@@ -1,67 +0,0 @@
|
|||||||
# Handle args for subcmd: exp-update-old
|
|
||||||
# shellcheck shell=bash
|
|
||||||
|
|
||||||
showhelp(){
|
|
||||||
echo -e "Syntax: $0 exp-update-old [OPTIONS]...
|
|
||||||
|
|
||||||
Options:
|
|
||||||
-f, --force Force check all files even if no new commits
|
|
||||||
-p, --packages Enable package checking and building
|
|
||||||
-h, --help Show this help message
|
|
||||||
-s, --skip-notice Skip the notice message at the beginning
|
|
||||||
|
|
||||||
It updates your dotfiles by:
|
|
||||||
1. Pulling latest changes from git remote
|
|
||||||
2. Optionally rebuilding packages (if -p flag is used)
|
|
||||||
3. Syncing configuration files
|
|
||||||
4. Updating script permissions
|
|
||||||
|
|
||||||
Package modes (when -p is used):
|
|
||||||
- If no PKGBUILDs changed: asks if you want to check packages anyway
|
|
||||||
- If PKGBUILDs changed: offers to build changed packages
|
|
||||||
- Interactive selection of packages to build
|
|
||||||
"
|
|
||||||
}
|
|
||||||
# `man getopt` to see more
|
|
||||||
para=$(getopt \
|
|
||||||
-o hfps \
|
|
||||||
-l help,force,packages,skip-notice \
|
|
||||||
-n "$0" -- "$@")
|
|
||||||
[ $? != 0 ] && echo "$0: Error when getopt, please recheck parameters." && exit 1
|
|
||||||
#####################################################################################
|
|
||||||
## getopt Phase 1
|
|
||||||
# ignore parameter's order, execute options below first
|
|
||||||
eval set -- "$para"
|
|
||||||
while true ; do
|
|
||||||
case "$1" in
|
|
||||||
-h|--help) showhelp;exit;;
|
|
||||||
--) break ;;
|
|
||||||
*) shift ;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
#####################################################################################
|
|
||||||
## getopt Phase 2
|
|
||||||
|
|
||||||
FORCE_CHECK=false
|
|
||||||
CHECK_PACKAGES=false
|
|
||||||
SKIP_NOTICE=false
|
|
||||||
|
|
||||||
eval set -- "$para"
|
|
||||||
while true ; do
|
|
||||||
case "$1" in
|
|
||||||
## Ones without parameter
|
|
||||||
-f|--force) FORCE_CHECK=true;shift
|
|
||||||
log_info "Force check mode enabled - will check all files regardless of git changes"
|
|
||||||
;;
|
|
||||||
-p|--packages) CHECK_PACKAGES=true;shift
|
|
||||||
log_info "Package checking enabled"
|
|
||||||
;;
|
|
||||||
-s|--skip-notice) SKIP_NOTICE=true;shift
|
|
||||||
log_warning "Skipping notice about script being untested"
|
|
||||||
;;
|
|
||||||
|
|
||||||
## Ending
|
|
||||||
--) break ;;
|
|
||||||
*) echo -e "$0: Wrong parameters.";exit 1;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
@@ -29,14 +29,14 @@ Subcommands:
|
|||||||
install-setups Run the install step \"2. Setup for permissions/services etc\"
|
install-setups Run the install step \"2. Setup for permissions/services etc\"
|
||||||
install-files Run the install step \"3. Copying config files\"
|
install-files Run the install step \"3. Copying config files\"
|
||||||
resetfirstrun Reset firstrun state.
|
resetfirstrun Reset firstrun state.
|
||||||
|
|
||||||
uninstall Uninstall illogical-impulse.
|
uninstall Uninstall illogical-impulse.
|
||||||
|
|
||||||
exp-update (Experimental) Update illogical-impulse without fully reinstall.
|
exp-update (Experimental) Update illogical-impulse without fully reinstall.
|
||||||
exp-update-old (Experimental) exp-update but use behaves like old version.
|
|
||||||
exp-merge (Experimental) Merge upstream changes with local configs using git rebase.
|
exp-merge (Experimental) Merge upstream changes with local configs using git rebase.
|
||||||
|
|
||||||
virtmon (For dev only) Create virtual monitors for testing multi-monitors.
|
virtmon (For dev only) Create virtual monitors for testing multi-monitors.
|
||||||
checkdeps (For dev only) Check whether pkgs exist in AUR or repos of Arch.
|
checkdeps (For dev only) Check whether pkgs exist in AUR or repos of Arch.
|
||||||
|
|
||||||
help Show this help message.
|
help Show this help message.
|
||||||
|
|
||||||
For each <subcommand>, use -h for details:
|
For each <subcommand>, use -h for details:
|
||||||
@@ -49,7 +49,7 @@ case $1 in
|
|||||||
# Global help
|
# Global help
|
||||||
""|help|--help|-h)showhelp_global;exit;;
|
""|help|--help|-h)showhelp_global;exit;;
|
||||||
# Correct subcommand
|
# Correct subcommand
|
||||||
install|uninstall|exp-update|exp-update-old|exp-merge|resetfirstrun|checkdeps|virtmon)
|
install|uninstall|exp-update|exp-merge|resetfirstrun|checkdeps|virtmon)
|
||||||
SUBCMD_NAME=$1
|
SUBCMD_NAME=$1
|
||||||
SUBCMD_DIR=./sdata/subcmd-$1
|
SUBCMD_DIR=./sdata/subcmd-$1
|
||||||
shift;;
|
shift;;
|
||||||
|
|||||||
Reference in New Issue
Block a user