forked from Shinonome/dots-hyprland
Update update.sh script to copy with -p option (preserve mode)
This commit is contained in:
@@ -214,7 +214,7 @@ handle_file_conflict() {
|
|||||||
|
|
||||||
case $choice in
|
case $choice in
|
||||||
1)
|
1)
|
||||||
cp "$repo_file" "$home_file"
|
cp -p "$repo_file" "$home_file"
|
||||||
log_success "Replaced $home_file with repository version"
|
log_success "Replaced $home_file with repository version"
|
||||||
break
|
break
|
||||||
;;
|
;;
|
||||||
@@ -224,12 +224,12 @@ handle_file_conflict() {
|
|||||||
;;
|
;;
|
||||||
3)
|
3)
|
||||||
mv "$home_file" "${dirname}/${filename}.old"
|
mv "$home_file" "${dirname}/${filename}.old"
|
||||||
cp "$repo_file" "$home_file"
|
cp -p "$repo_file" "$home_file"
|
||||||
log_success "Backed up local file to ${filename}.old and updated with repository version"
|
log_success "Backed up local file to ${filename}.old and updated with repository version"
|
||||||
break
|
break
|
||||||
;;
|
;;
|
||||||
4)
|
4)
|
||||||
cp "$repo_file" "${dirname}/${filename}.new"
|
cp -p "$repo_file" "${dirname}/${filename}.new"
|
||||||
log_success "Saved repository version as ${filename}.new, kept local file"
|
log_success "Saved repository version as ${filename}.new, kept local file"
|
||||||
break
|
break
|
||||||
;;
|
;;
|
||||||
@@ -251,7 +251,7 @@ handle_file_conflict() {
|
|||||||
|
|
||||||
case $subchoice in
|
case $subchoice in
|
||||||
r)
|
r)
|
||||||
cp "$repo_file" "$home_file"
|
cp -p "$repo_file" "$home_file"
|
||||||
log_success "Replaced $home_file with repository version"
|
log_success "Replaced $home_file with repository version"
|
||||||
break
|
break
|
||||||
;;
|
;;
|
||||||
@@ -261,12 +261,12 @@ handle_file_conflict() {
|
|||||||
;;
|
;;
|
||||||
b)
|
b)
|
||||||
mv "$home_file" "${dirname}/${filename}.old"
|
mv "$home_file" "${dirname}/${filename}.old"
|
||||||
cp "$repo_file" "$home_file"
|
cp -p "$repo_file" "$home_file"
|
||||||
log_success "Backed up local file to ${filename}.old and updated"
|
log_success "Backed up local file to ${filename}.old and updated"
|
||||||
break
|
break
|
||||||
;;
|
;;
|
||||||
n)
|
n)
|
||||||
cp "$repo_file" "${dirname}/${filename}.new"
|
cp -p "$repo_file" "${dirname}/${filename}.new"
|
||||||
log_success "Saved repository version as ${filename}.new"
|
log_success "Saved repository version as ${filename}.new"
|
||||||
break
|
break
|
||||||
;;
|
;;
|
||||||
@@ -756,7 +756,7 @@ if [[ "$process_files" == true ]]; then
|
|||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
# New file, copy it
|
# New file, copy it
|
||||||
cp "$repo_file" "$home_file"
|
cp -p "$repo_file" "$home_file"
|
||||||
log_success "Created new file: $home_file"
|
log_success "Created new file: $home_file"
|
||||||
((files_created++))
|
((files_created++))
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user