diff --git a/libexec/sourcezap/setup/setup-doas b/libexec/sourcezap/setup/setup-doas index 9e858e4..40bb3ae 100755 --- a/libexec/sourcezap/setup/setup-doas +++ b/libexec/sourcezap/setup/setup-doas @@ -16,9 +16,12 @@ sharedir="${localbase}"/share/sourcezap # main src="${sharedir}"/doas.conf dest="${localbase}"/etc/doas.conf -if grep -Fq "$(cat "${src}")" "${dest}"; then - printok "doas.conf is up to date" -else +cat "${src}" | +while read -r line; do + if grep -q "${line}" "${dest}"; then + continue + fi cat "${src}" >> "${dest}" - printok "${dest} updated" -fi + printok "modified ${dest}" + break +done diff --git a/share/sourcezap/CHANGELOG b/share/sourcezap/CHANGELOG index a7dfb5a..b418d37 100644 --- a/share/sourcezap/CHANGELOG +++ b/share/sourcezap/CHANGELOG @@ -1,5 +1,8 @@ * vNEXT +** Add 'setup/setup-doas' improvements +More likely to do what's expected, but blind spots still exist + ** Add 'sourcezap setup', 'sourcezap teardown' Replaces and enhances 'setup-sourcezap'