kenji/illogical-impulse
1
0
Fork 0
forked from Shinonome/dots-hyprland
Code Pull Requests Activity

[bugfix] update dots script (#530)

Browse Source
This commit is contained in:
Celestial.y
2024-05-30 11:47:36 +08:00
committed by GitHub
parent c38bfe86cb 4d738a63e9
commit a10d45883c
1 changed files with 82 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
update-dots.sh
+82 -10
View File
@@ -44,7 +44,7 @@ cat << 'EOF'
| |
| This script will update your dotfiles (.config, .local, etc) by retrieving the latest version |
| from the Git repository and then replacing the old config files with the updated ones. |
| To preserve your customizations, it will ask you if you wanna keep some modified |
| To preserve your customizations, it will ask you if you wanna keep some customized |
| files untouched. |
| |
###################################################################################################
@@ -63,18 +63,18 @@ current_branch=$(git rev-parse --abbrev-ref HEAD)
# fetch the latest version of the repository
if ! git fetch; then
echo -e "${RED}Failed to fetch the latest version of the repository. Exiting.${RESET}"
echo -e "${RED}Failed to fetch the latest version of the repository. Exiting...${RESET}"
exit 1
fi
# Check if there are any changes
if [[ $(git rev-list HEAD...origin/"$current_branch" --count) -eq 0 ]]; then
echo -e "${GREEN}Repository is already up-to-date. Do not run git pull before this script. Exiting.${RESET}"
echo -e "${GREEN}Repository is already up-to-date. Do not run git pull before this script. Exiting...${RESET}"
exit 0
fi
echo -e "${CYAN}Excluding files and folders: ${excludes[@]}${RESET}"
echo -e "${CYAN}Excluding files and folders that remain untouched:${RESET} ${excludes[@]}"
# Then check which files have been modified by the user since the last update to preserve user configurations
# Then check which files have been customized by the user since the last update to preserve user configurations
modified_files=()
# Find all files in the specified folders and their subfolders
@@ -99,12 +99,12 @@ echo
# Output all modified files
if [[ ${#modified_files[@]} -gt 0 ]]; then
echo -e "${MAGENTA}The following files have been modified since the last update:${RESET}"
echo -e "${MAGENTA}Customized Files detected: ${RESET}The following files have been customized by you or your system:"
for file in "${modified_files[@]}"; do
echo -e "${BLUE}$file${RESET}"
done
else
read -rp "No files found that have been modified since the last update. All files will be replaced. Are you sure you want to continue? [Y/n] " REPLY
read -rp "${YELLOW}No files detected that have been customized since the last update. All files will be replaced. Are you sure you want to continue? [Y/n] ${RESET}" REPLY
echo
if [[ $REPLY =~ ^[Nn]$ ]]; then
echo -e "${RED}Exiting.${RESET}"
@@ -158,7 +158,7 @@ case $REPLY in
fi
;;
*)
echo -e "${GREEN}Keeping every modified file${RESET}"
echo -e "${GREEN}Keeping every customized file${RESET}"
;;
esac
@@ -174,7 +174,7 @@ if ! git pull; then
mkdir -p ./cache
temp_folder=$(mktemp -d -p ./cache)
git clone https://github.com/end-4/dots-hyprland/ --depth=1 "$temp_folder"
git clone --branch "$current_branch" https://github.com/end-4/dots-hyprland/ --depth=1 "$temp_folder"
# Replace the existing dotfiles with the new ones
for folder in "${folders[@]}"; do
find "$temp_folder/$folder" -print0 | while IFS= read -r -d '' file; do
@@ -190,11 +190,80 @@ if ! git pull; then
fi
done
done
echo -e "${GREEN}New dotfiles have been copied. Cleaning up temporary folder.${RESET}"
deleted_files=()
renamed_files=()
# Extract deleted files and save to variable
deleted_files=$(git diff --name-status HEAD origin/$current_branch | awk '$1 == "D" {print $2}')
# Extract renamed files and save to variable
renamed_files=$(git diff --name-status HEAD origin/$current_branch | awk '$1 ~ /^R/ {print $2}')
files_to_remove=()
for file in $deleted_files; do
if ! file_in_excludes "$file" && [[ ! " ${modified_files[*]} " =~ " $file " ]]; then
files_to_remove+=("$file")
fi
done
for file in $renamed_files; do
if ! file_in_excludes "$file" && [[ ! " ${modified_files[*]} " =~ " $file " ]]; then
files_to_remove+=("$file")
fi
done
# Remove files
for file in "${files_to_remove[@]}"; do
echo -e "${YELLOW}Removing $file ...${RESET}"
if [[ -f "$HOME/$file" ]]; then
rm -rf "$HOME/$file"
fi
done
echo -e "${GREEN}New dotfiles have been copied. Cleaning up temporary folder...${RESET}"
rm -rf "$temp_folder"
echo -e "${GREEN}Done. You may exit now.${RESET}"
exit 0
fi
# Check git diff to determine which files have been removed and which have been renamed
deleted_files=()
renamed_files=()
# Extract deleted files and save to variable
deleted_files=$(git diff --name-status @{1} | awk '$1 == "D" {print $2}')
# Extract renamed files and save to variable
renamed_files=$(git diff --name-status @{1} | awk '$1 ~ /^R/ {print $2}')
files_to_remove=()
for file in $deleted_files; do
if ! file_in_excludes "$file" && [[ ! " ${modified_files[*]} " =~ " $file " ]]; then
files_to_remove+=("$file")
fi
done
for file in $renamed_files; do
if ! file_in_excludes "$file" && [[ ! " ${modified_files[*]} " =~ " $file " ]]; then
files_to_remove+=("$file")
fi
done
# Remove files
for file in "${files_to_remove[@]}"; do
echo -e "${YELLOW}Removing $file ...${RESET}"
if [[ -f "$HOME/$file" ]]; then
rm -rf "$HOME/$file"
fi
done
# Replace unmodified files
for folder in "${folders[@]}"; do
find "$folder" -print0 | while IFS= read -r -d '' file; do
@@ -209,3 +278,6 @@ for folder in "${folders[@]}"; do
fi
done
done
echo -e "${GREEN}Done. You may exit now.${RESET}"