wyj/leaf
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

new: compare /etc/* before create ._ file

Browse Source
This commit is contained in:
Yingjie Wang
2025-12-23 02:26:03 -05:00
parent da89bf2079
commit 64fbd9fc01
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
leaf
+4
View File
@@ -223,8 +223,12 @@ leaf_merge_package() {
_group=$(stat -c %g ."${_item}") _group=$(stat -c %g ."${_item}")
if [[ "${_item}" == /etc/* && -e "${_item}" ]]; then if [[ "${_item}" == /etc/* && -e "${_item}" ]]; then
_item_conflict="$(dirname "${_item}")/._$(basename "${_item}").conflict_${PKG_NAME}_${_time}" _item_conflict="$(dirname "${_item}")/._$(basename "${_item}").conflict_${PKG_NAME}_${_time}"
if (diff ."${_item}" "${_item}" > /dev/null); then
install -D -m ${_mode} -o ${_owner} -g ${_group} ."${_item}" "${_item}"
else
install -D -m ${_mode} -o ${_owner} -g ${_group} ."${_item}" "${_item_conflict}" install -D -m ${_mode} -o ${_owner} -g ${_group} ."${_item}" "${_item_conflict}"
leaf_record_message "Config file confliction on ${_item}, the package provided version is installed as ${_item_conflict}." leaf_record_message "Config file confliction on ${_item}, the package provided version is installed as ${_item_conflict}."
fi
else else
install -D -m ${_mode} -o ${_owner} -g ${_group} ."${_item}" "${_item}" install -D -m ${_mode} -o ${_owner} -g ${_group} ."${_item}" "${_item}"
fi fi