This commit is contained in:
parent
21cc967587
commit
e06f8aea79
2 changed files with 23 additions and 9 deletions
|
@ -17,12 +17,21 @@ sharedir="${localbase}"/share/portzap
|
|||
src="${sharedir}"/doas.conf
|
||||
dest="${localbase}"/etc/doas.conf
|
||||
# shellcheck disable=SC2002
|
||||
cat "${src}" |
|
||||
while read -r line; do
|
||||
if grep -q "${line}" "${dest}"; then
|
||||
continue
|
||||
fi
|
||||
cat "${src}" >> "${dest}"
|
||||
printok "modified ${dest}"
|
||||
break
|
||||
done
|
||||
if [ -e "${dest}" ]; then
|
||||
cat "${src}" |
|
||||
while read -r line; do
|
||||
if grep -q "${line}" "${dest}"; then
|
||||
continue
|
||||
fi
|
||||
cat "${src}" >> "${dest}"
|
||||
printok "modified ${dest}"
|
||||
break
|
||||
done
|
||||
else
|
||||
install -m "u=rw,go=" \
|
||||
-o root \
|
||||
-g wheel \
|
||||
"${src}" \
|
||||
"${localbase}"/etc
|
||||
printok "installed ${dest}"
|
||||
fi
|
||||
|
|
|
@ -2,6 +2,11 @@
|
|||
|
||||
** vNEXT
|
||||
|
||||
**** Try to install ~doas.conf~ when it does not exist
|
||||
When ~${PREFIX}/etc/doas.conf~ does not exist the ~setup-doas~
|
||||
script will try to install ~/usr/local/etc/doas.conf~ with
|
||||
~root:wheel~ as the owner, and with ~u=rw,go=~ as the filemode
|
||||
|
||||
**** Log when ~portzap rm~ completes successfully
|
||||
Similar to other commands, log when the ~portzap rm~ command
|
||||
completes successfully
|
||||
|
|
Loading…
Reference in a new issue