blob: 397e7728dd8c5d726224860b742d7c34e1204630 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
|
#!/usr/bin/env bash
# ==================================================
# KoolDots (2026)
# Project URL: https://github.com/LinuxBeginnings
# License: GNU GPLv3
# SPDX-License-Identifier: GPL-3.0-or-later
# ==================================================
# run_repo_update
# Arguments:
# $1 - expected repository root (typically SCRIPT_DIR from copy.sh)
# Behavior:
# * Verifies the script is executed from Hyprland-Dots root.
# * Stashes local changes (including untracked), pulls latest changes.
# * Shows progress, reports errors, and summarizes results.
# * Waits for user input before returning control to caller.
run_repo_update() {
local repo_dir="${1:-$(pwd)}"
local expected_name="Hyprland-Dots"
local log_dir="$repo_dir/Copy-Logs"
local log_file="$log_dir/update-$(date +%d-%H%M%S)_git.log"
mkdir -p "$log_dir"
echo "${INFO} Starting repository update..." | tee -a "$log_file"
if [ ! -d "$repo_dir" ] || [ "$(basename "$repo_dir")" != "$expected_name" ]; then
echo "${ERROR} This helper must be run from the $expected_name directory. Current: $(pwd)" | tee -a "$log_file"
read -n1 -s -r -p "Press any key to return to the menu..."
echo
return 1
fi
if [ "$PWD" != "$repo_dir" ]; then
echo "${INFO} Changing directory to $repo_dir" | tee -a "$log_file"
cd "$repo_dir" || {
echo "${ERROR} Failed to change directory to $repo_dir" | tee -a "$log_file"
read -n1 -s -r -p "Press any key to return to the menu..."
echo
return 1
}
fi
local head_before stash_msg pull_status=0
head_before=$(git rev-parse --short HEAD 2>/dev/null || echo "unknown")
echo "${INFO} Checking working tree..." | tee -a "$log_file"
if git diff --quiet && git diff --cached --quiet; then
stash_msg="No local changes; no stash created."
echo "${NOTE} $stash_msg" | tee -a "$log_file"
else
echo "${INFO} Stashing local changes (tracked + untracked)..." | tee -a "$log_file"
if stash_output=$(git stash push -u 2>&1); then
stash_msg="Created stash: $(echo "$stash_output" | head -n1)"
echo "${OK} $stash_msg" | tee -a "$log_file"
else
echo "${ERROR} git stash failed. Details:" | tee -a "$log_file"
echo "$stash_output" | tee -a "$log_file"
read -n1 -s -r -p "Press any key to return to the menu..."
echo
return 1
fi
fi
echo "${INFO} Pulling latest changes..." | tee -a "$log_file"
if git pull --ff-only 2>&1 | tee -a "$log_file"; then
pull_status=0
echo "${OK} Repository updated successfully." | tee -a "$log_file"
else
pull_status=$?
echo "${ERROR} git pull failed (exit $pull_status)." | tee -a "$log_file"
fi
local head_after
head_after=$(git rev-parse --short HEAD 2>/dev/null || echo "unknown")
echo "----------------------------------------" | tee -a "$log_file"
echo "Summary:" | tee -a "$log_file"
echo " Repo : $repo_dir" | tee -a "$log_file"
echo " HEAD before : $head_before" | tee -a "$log_file"
echo " HEAD after : $head_after" | tee -a "$log_file"
echo " Stash : $stash_msg" | tee -a "$log_file"
echo " Pull status : $( [ $pull_status -eq 0 ] && echo success || echo failure )" | tee -a "$log_file"
echo "----------------------------------------" | tee -a "$log_file"
# Also run the UserConfigs duplicate cleanup for existing installs,
# using the same version gating as the main copy workflow (<= v2.3.19).
if declare -f get_installed_dotfiles_version >/dev/null 2>&1 \
&& declare -f cleanup_duplicate_userconfigs >/dev/null 2>&1; then
local installed_version
installed_version=$(get_installed_dotfiles_version)
if [ -n "$installed_version" ]; then
echo "${INFO:-[INFO]} Checking for duplicate UserConfigs entries after repo update (detected v$installed_version)..." | tee -a "$log_file"
cleanup_duplicate_userconfigs "$installed_version" "$log_file"
else
echo "${NOTE:-[NOTE]} Skipping UserConfigs duplicate cleanup; installed version could not be detected." | tee -a "$log_file"
fi
fi
read -n1 -s -r -p "Press any key to return to the main menu..."
echo
return $pull_status
}
|
