Compare commits

...

3 commits

Author SHA1 Message Date
9db88b16b1 Silence "git checkout" output
Some checks failed
portzap / shellcheck (push) Has been cancelled
2024-07-27 05:23:30 -03:00
eca5d5585d Fix shellcheck errors (includes a bug in setup-user) 2024-07-26 22:26:07 -03:00
bf7cc3627e Inline function in setup-doas 2024-07-26 15:42:21 -03:00
10 changed files with 22 additions and 18 deletions

View file

@ -17,4 +17,4 @@ deinstall:
rm -rf $(SHAREDIR)
shellcheck:
find bin/ libexec/ -type f -exec shellcheck "{}" \;
find bin/ libexec/ -type f -exec shellcheck -x "{}" \;

View file

@ -13,6 +13,7 @@ revfile="${installdir}"/.portzap
##
# functions
# shellcheck source=/dev/null
. "${libexec}"/functions/print.sh
require_dependency()

View file

@ -8,6 +8,7 @@ libexec="${localbase}"/libexec/portzap
##
# functions
# shellcheck source=/dev/null
. "${libexec}"/functions/print.sh
##

View file

@ -11,6 +11,7 @@ branch=$2
##
# functions
# shellcheck source=/dev/null
. "${libexec}"/functions/print.sh
##

View file

@ -12,6 +12,7 @@ branch=$3
##
# functions
# shellcheck source=/dev/null
. "${libexec}"/functions/print.sh
##
@ -34,5 +35,5 @@ fi
"${git}" clone "${giturl}" "${gitdir}"
cd "${gitdir}"
"${git}" config core.filemode off
"${git}" checkout -t origin/"${branch}" || true
"${git}" checkout -t origin/"${branch}" > /dev/null 2>&1 || true
printok "clone complete"

View file

@ -13,6 +13,7 @@ revfile=$3
##
# functions
# shellcheck source=/dev/null
. "${libexec}"/functions/print.sh
perform_update()

View file

@ -10,6 +10,7 @@ gitdir=$1
##
# functions
# shellcheck source=/dev/null
. "${libexec}"/functions/print.sh
##

View file

@ -10,6 +10,7 @@ installdir=$2
##
# functions
# shellcheck source=/dev/null
. "${libexec}"/functions/print.sh
erase()

View file

@ -4,25 +4,21 @@ set -e
##
# variables
localbase=$(realpath "$(dirname "$0")"/../../..)
libexec="${localbase}/libexec/portzap"
sharedir="${localbase}/share/portzap"
libexec="${localbase}"/libexec/portzap
sharedir="${localbase}"/share/portzap
##
# functions
# shellcheck source=/dev/null
. "${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

View file

@ -9,6 +9,7 @@ user="_portzap"
##
# functions
# shellcheck source=/dev/null
. "${libexec}"/functions/print.sh
##
@ -16,7 +17,7 @@ user="_portzap"
if id -u "${user}" > /dev/null 2>&1; then
printok "${user} user exists"
else
pw useradd
pw useradd \
-n "${user}" \
-c "portzap user" \
-m \