From bf7cc3627e57409c44795223c81a33ec9f44654e Mon Sep 17 00:00:00 2001 From: 0x1eef <0x1eef@protonmail.com> Date: Fri, 26 Jul 2024 15:42:21 -0300 Subject: [PATCH] Inline function in setup-doas --- libexec/portzap/setup/setup-doas | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/libexec/portzap/setup/setup-doas b/libexec/portzap/setup/setup-doas index c8db1a4..0dd0e82 100644 --- a/libexec/portzap/setup/setup-doas +++ b/libexec/portzap/setup/setup-doas @@ -4,25 +4,20 @@ set -e ## # variables localbase=$(realpath "$(dirname "$0")"/../../..) -libexec="${localbase}/libexec/portzap" -sharedir="${localbase}/share/portzap" +libexec="${localbase}"/libexec/portzap +sharedir="${localbase}"/share/portzap ## # functions . "${libexec}"/functions/print.sh -install_doasconf() -{ - 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}" >> "${dest}" - printok "${dest} updated" - fi -} - ## # main -install_doasconf +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}" >> "${dest}" + printok "${dest} updated" +fi