fixed git clone paths

This commit is contained in:
H0mire
2024-05-06 22:20:23 +02:00
parent 313f0ed178
commit c860974e8e
+4 -4
View File
@@ -58,7 +58,7 @@ if ! git fetch; then
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 "Repository is already up-to-date. Do not run git pull before this script. Exiting."
exit 0 exit 0
fi fi
@@ -158,7 +158,7 @@ else
fi fi
# Then update the repository # Then update the repository
if git pull; then if ! git pull; then
echo "Git pull successful." echo "Git pull successful."
else else
# If the pull failed, clone the repository to a temporary folder and copy the files from there # If the pull failed, clone the repository to a temporary folder and copy the files from there
@@ -178,11 +178,11 @@ else
for folder in "${folders[@]}"; do for folder in "${folders[@]}"; do
# Find all files (including those in subdirectories) and copy them # 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 # Construct the destination path
# Remove the temporary folder path # Remove the temporary folder path