This commit is contained in:
H0mire
2024-05-22 21:23:45 +02:00
parent 637e3cea3b
commit 3319021d95
+4 -4
View File
@@ -72,7 +72,7 @@ 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 exit 0
fi fi
echo -e "${CYAN}Excluding files and folders that remain untouched: ${excludes[@]}${RESET}" echo -e "${CYAN}Excluding files and folders that remain untouched:${RESET} ${excludes[@]}"
# Then check which files have been customized 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=() modified_files=()
@@ -222,15 +222,15 @@ renamed_files=$(git diff --name-status @{1} | awk '$1 ~ /^R/ {print $2, "->", $3
files_to_remove=() files_to_remove=()
for file in $files_to_remove; do for file in $deleted_files; do
if ! file_in_excludes "$file" && [[ ! " ${modified_files[*]} " =~ " $file " ]]; then if ! file_in_excludes "$file" && [[ ! " ${modified_files[*]} " =~ " $file " ]]; then
files_to_remove+=("$file") files_to_remove+=("$file")
fi fi
done done
for file in $files_renamed; do for file in $renamed_files; do
if ! file_in_excludes "$file" && [[ ! " ${modified_files[*]} " =~ " $file " ]]; then if ! file_in_excludes "$file" && [[ ! " ${modified_files[*]} " =~ " $file " ]]; then
files_renamed+=("$file") files_to_remove+=("$file")
fi fi
done done