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

cleaned up code for readability, added colours

Browse Source
This commit is contained in:
H0mire
2024-05-16 19:53:42 +02:00
parent a4434dd709
commit 207c81bd55
1 changed files with 111 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
update-dots.sh
+111 -124
View File
@@ -2,67 +2,77 @@
# This script updates the dotfiles by fetching the latest version from the Git repository and then replacing files # This script updates the dotfiles by fetching the latest version from the Git repository and then replacing files
# that have not been modified by the user to preserve changes. The remaining files will be replaced with the new ones. # that have not been modified by the user to preserve changes. The remaining files will be replaced with the new ones.
set -e set -euo pipefail
cd "$(dirname "$0")" cd "$(dirname "$0")"
export base="$(pwd)" export base="$(pwd)"
# Define colors
GREEN="\033[0;32m"
RED="\033[0;31m"
BLUE="\033[0;34m"
CYAN="\033[0;36m"
YELLOW="\033[1;33m"
MAGENTA="\033[0;35m"
RESET="\033[0m"
# Define paths to update # Define paths to update
folders=(".config" ".local") folders=(".config" ".local")
excludes=(".config/hypr/custom" ".config/ags/user_options.js" ".config/hypr/hyprland.conf") excludes=(".config/hypr/custom" ".config/ags/user_options.js" ".config/hypr/hyprland.conf")
function get_checksum() { get_checksum() {
# Get the checksum of a specific file # Get the checksum of a specific file
md5sum "$1" | awk '{print $1}' local file="$1"
md5sum "$file" | awk '{print $1}'
} }
function file_in_excludes() { file_in_excludes() {
# Check if a file is in the exclude_folders # Check if a file is in the exclude_folders
for exc in "${excludes[@]}"; do local file="$1"
if [[ $1 == $exc* ]]; then for exc in "${excludes[@]}"; do
return 0 if [[ $file == "$exc"* ]]; then
fi return 0
done fi
return 1 done
return 1
} }
# Greetings!
cat << 'EOF'
###################################################################################################
| |
| Hi there! |
| |
| 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 |
| files untouched. |
| |
###################################################################################################
EOF
# Greetings! read -rp "Do you want to continue? [Y/n] " REPLY
echo "###################################################################################################"
echo "| |"
echo "| Welcome to the dotfiles updater script! |"
echo "| |"
echo "| This script will update your dotfiles (.config, .local, etc) by retrieving the latest version |"
echo "| from the Git repository and then replacing files that have not been modified |"
echo "| by you to preserve changes. |"
echo "| |"
echo "###################################################################################################"
echo "Do you want to continue? [Y/n] "
read -r
echo echo
if [[ $REPLY =~ ^[Nn]$ ]]; then if [[ $REPLY =~ ^[Nn]$ ]]; then
echo "Exiting." echo -e "${RED}Exiting.${RESET}"
exit 0 exit 0
fi fi
# End of Greetings # End of Greetings
current_branch=$(git rev-parse --abbrev-ref HEAD) current_branch=$(git rev-parse --abbrev-ref HEAD)
# fetch the latest version of the repository # fetch the latest version of the repository
if ! git fetch; then if ! git fetch; then
echo "Failed to fetch the latest version of the repository. Exiting." echo -e "${RED}Failed to fetch the latest version of the repository. Exiting.${RESET}"
exit 1 exit 1
fi fi
# Check if there are any changes # Check if there are any changes
if [[ $(git rev-list HEAD...origin/$current_branch --count) -eq 0 ]]; then if [[ $(git rev-list HEAD...origin/"$current_branch" --count) -eq 0 ]]; then
echo "Repository is already up-to-date. Do not run git pull before this script. Exiting." 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 "Excluding files and folders: ${excludes[@]}" echo -e "${CYAN}Excluding files and folders: ${excludes[@]}${RESET}"
# Then check which files have been modified by the user since the last update to preserve user configurations # Then check which files have been modified by the user since the last update to preserve user configurations
modified_files=() modified_files=()
@@ -70,16 +80,15 @@ modified_files=()
# Find all files in the specified folders and their subfolders # Find all files in the specified folders and their subfolders
while IFS= read -r -d '' file; do while IFS= read -r -d '' file; do
# If the file is not in the home directory, skip it # If the file is not in the home directory, skip it
if [[ ! -f "$HOME/$file" ]] || file_in_excludes "$file" ; then if [[ ! -f "$HOME/$file" ]] || file_in_excludes "$file"; then
echo "Skipping $file" echo -e "${YELLOW}Skipping $file${RESET}"
continue continue
fi fi
# Calculate checksums # Calculate checksums
base_checksum=$(get_checksum "$base/$file") base_checksum=$(get_checksum "$base/$file")
home_checksum=$(get_checksum "$HOME/$file") home_checksum=$(get_checksum "$HOME/$file")
# Compare checksums and add to modified_files if necessary # Compare checksums and add to modified_files if necessary
if [[ $base_checksum != $home_checksum ]]; then if [[ $base_checksum != $home_checksum ]]; then
modified_files+=("$file") modified_files+=("$file")
@@ -87,138 +96,116 @@ while IFS= read -r -d '' file; do
done < <(find "${folders[@]}" -type f -print0) done < <(find "${folders[@]}" -type f -print0)
echo echo
echo
# Output all modified files # Output all modified files
if [[ ${#modified_files[@]} -gt 0 ]]; then if [[ ${#modified_files[@]} -gt 0 ]]; then
echo "The following files have been modified since the last update:" echo -e "${MAGENTA}The following files have been modified since the last update:${RESET}"
for file in "${modified_files[@]}"; do for file in "${modified_files[@]}"; do
echo "$file" echo -e "${BLUE}$file${RESET}"
done done
else else
echo "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] " 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 -r
echo echo
if [[ ! $REPLY =~ ^[Nn]$ ]]; then if [[ $REPLY =~ ^[Nn]$ ]]; then
echo "Exiting." echo -e "${RED}Exiting.${RESET}"
exit 0 exit 0
fi fi
fi fi
echo "Do you want to keep these files untouched?" cat << 'EOF'
echo "[Y] Yes, keep them." Do you want to keep these files untouched?
echo "[n] No, replace them." [Y] Yes, keep them.
echo "[i] Check the files individually." [n] No, replace them.
# Ask if the user wants to keep them [i] Check the files individually.
read -p "Answer: " -r EOF
read -rp "Answer: " REPLY
echo echo
if [[ $REPLY =~ ^[Nn]$ ]]; then
echo "Replacing all files."
modified_files=()
elif [[ $REPLY =~ ^[Ii]$ ]]; then
new_modified_files=()
replaced_files=()
for file in "${modified_files[@]}"; do
echo "Do you want to keep $file untouched?"
echo "[Y] Yes, keep it."
echo "[n] No, replace it."
read -p "Answer: " -n 1 -r
echo
if [[ ! $REPLY =~ ^[Nn]$ ]]; then
echo "Keeping $file."
new_modified_files+=("$file")
else
replaced_files+=("$file")
fi
done
modified_files=("${new_modified_files[@]}")
# verify the files that will be kept
echo "_____________________________________________________"
echo "These User configured/modifed files will be kept:"
for file in "${modified_files[@]}"; do
echo "$file"
done
echo "_____________________________________________________"
echo "These User configured/modifed files will be replaced:"
for file in "${replaced_files[@]}"; do
echo "$file"
done
echo "_____________________________________________________"
echo "Do you want to continue?"
echo "[y] Yes, continue."
echo "[N] No, exit."
read -p "Answer: " -r
echo
if [[ ! $REPLY =~ ^[Yy]$ ]]; then
echo "Exiting..."
exit 0
fi
else
echo "Keeping every modified file"
fi
# Then update the repository case $REPLY in
if git pull; then [Nn])
echo "Git pull successful." echo -e "${RED}Replacing all files.${RESET}"
else modified_files=()
# If the pull failed, clone the repository to a temporary folder and copy the files from there ;;
echo "Git pull failed. Consider recloning the project or resolving conflicts manually." [Ii])
echo "Should I clone the repository to a temporary folder in cache and copy the files from there? [y/N] " new_modified_files=()
read -r replaced_files=()
for file in "${modified_files[@]}"; do
read -rp "Do you want to keep $file untouched? [Y/n] " REPLY
echo
if [[ $REPLY =~ ^[Nn]$ ]]; then
replaced_files+=("$file")
else
new_modified_files+=("$file")
fi
done
modified_files=("${new_modified_files[@]}")
echo -e "${CYAN}_____________________________________________________${RESET}"
echo -e "${MAGENTA}These User configured/modified files will be kept:${RESET}"
for file in "${modified_files[@]}"; do
echo -e "${BLUE}$file${RESET}"
done
echo -e "${CYAN}_____________________________________________________${RESET}"
echo -e "${MAGENTA}These User configured/modified files will be replaced:${RESET}"
for file in "${replaced_files[@]}"; do
echo -e "${BLUE}$file${RESET}"
done
echo -e "${CYAN}_____________________________________________________${RESET}"
read -rp "Do you want to continue? [y/N] " REPLY
echo
if [[ ! $REPLY =~ ^[Yy]$ ]]; then
echo -e "${RED}Exiting...${RESET}"
exit 0
fi
;;
*)
echo -e "${GREEN}Keeping every modified file${RESET}"
;;
esac
# Update the repository
if ! git pull; then
echo -e "${RED}Git pull failed. Consider recloning the project or resolving conflicts manually.${RESET}"
read -rp "Should I clone the repository to a temporary folder in cache and copy the files from there? [y/N] " REPLY
echo echo
if [[ ! $REPLY =~ ^[Yy]$ ]]; then if [[ ! $REPLY =~ ^[Yy]$ ]]; then
echo "Exiting..." echo -e "${RED}Exiting...${RESET}"
exit 1 exit 1
fi fi
mkdir -p ./cache mkdir -p ./cache
temp_folder=$(mktemp -d -p ./cache) temp_folder=$(mktemp -d -p ./cache)
git clone https://github.com/end-4/dots-hyprland/ --depth=1 "$temp_folder" git clone https://github.com/end-4/dots-hyprland/ --depth=1 "$temp_folder"
# Replace the existing dotfiles with the new ones # Replace the existing dotfiles with the new ones
for folder in "${folders[@]}"; do for folder in "${folders[@]}"; do
# Find all files (including those in subdirectories) and copy them
find "$temp_folder/$folder" -print0 | while IFS= read -r -d '' file; do find "$temp_folder/$folder" -print0 | while IFS= read -r -d '' file; do
file=${file//$temp_folder\//} file=${file//$temp_folder\//}
if [[ -d "$temp_folder/$file" ]]; then if [[ -d "$temp_folder/$file" ]]; then
mkdir -p "$HOME/$file" mkdir -p "$HOME/$file"
fi fi
if [[ -f "$temp_folder/$file" ]] && ! file_in_excludes "$file" && [[ ! " ${modified_files[@]} " =~ " ${file} " ]]; then if [[ -f "$temp_folder/$file" ]] && ! file_in_excludes "$file" && [[ ! " ${modified_files[*]} " =~ " $file " ]]; then
# Construct the destination path
# Remove the temporary folder path
destination="$HOME/$file" destination="$HOME/$file"
echo "Replacing $destination ..." echo -e "${BLUE}Replacing $destination ...${RESET}"
# Create the destination folder if it doesn't exist
mkdir -p "$(dirname "$destination")" mkdir -p "$(dirname "$destination")"
# Copy the file
cp -f "$temp_folder/$file" "$destination" cp -f "$temp_folder/$file" "$destination"
fi fi
done done
done done
echo "New dotfiles have been copied. Cleaning up temporary folder." echo -e "${GREEN}New dotfiles have been copied. Cleaning up temporary folder.${RESET}"
rm -rf "$temp_folder" rm -rf "$temp_folder"
exit 0 exit 0
fi fi
# Replace unmodified files
# Now only replace the files that are not modified by the user
for folder in "${folders[@]}"; do for folder in "${folders[@]}"; do
# Find all files (including those in subdirectories) and copy them
find "$folder" -print0 | while IFS= read -r -d '' file; do find "$folder" -print0 | while IFS= read -r -d '' file; do
# if the file is a directory, ensure it exists in the home directory
if [[ -d "$file" ]]; then if [[ -d "$file" ]]; then
mkdir -p "$HOME/$file" mkdir -p "$HOME/$file"
fi fi
# Check if the file is a regular file and not in the exclude_folders if [[ -f "$file" ]] && ! file_in_excludes "$file" && [[ ! " ${modified_files[*]} " =~ " $file " ]]; then
if [[ -f "$file" ]] && ! file_in_excludes "$file" && [[ ! " ${modified_files[@]} " =~ " ${file} " ]]; then
# Construct the destination path
destination="$HOME/$file" destination="$HOME/$file"
echo "Replacing \"$destination\" ..." echo -e "${BLUE}Replacing \"$destination\" ...${RESET}"
# Copy the file
# Create the destination folder if it doesn't exist
mkdir -p "$(dirname "$destination")" mkdir -p "$(dirname "$destination")"
cp -f "$base/$file" "$destination" cp -f "$base/$file" "$destination"
fi fi
done done
done done