Compare commits

..

No commits in common. "c4ee461925b859e831ee0acf9ce58ac5b48b1462" and "c4e95e3e481f6c287a4a52698eb0b876f8534315" have entirely different histories.

4 changed files with 16 additions and 74 deletions

View file

@ -21,33 +21,25 @@ multiple times:
#### CLI: portzap
# Clone the HardenedBSD ports tree into /home/_portzap/ports/
# This command is delegated to the '_portzap' user and
# limited to members of the '_portzap' group
# This command is delegated to the '_portzap' user
user@localhost$ portzap clone
# Pull updates into /home/_portzap/ports/
# This command is delegated to the '_portzap' user and
# limited to members of the '_portzap' group
# This command is delegated to the '_portzap' user
user@localhost$ portzap pull
# Checkout a branch other than the default: hardenedbsd/main
# This command is delegated to the '_portzap' user and
# limited to members of the '_portzap' group
# This command is delegated to the '_portzap' user
user@localhost$ portzap checkout freebsd/main
# Run /bin/sh within /home/_portzap/ports/
# This command is delegated to the '_portzap' user and
# limited to members of the '_portzap' group
user@localhost$ portzap sh
# Remove the contents of /usr/ports/ and /home/_portzap/ports/
# This command requires root privileges
root@localhost# portzap rm
# Install /home/_portzap/ports/ into /usr/ports/
# This command requires root privileges
root@localhost# portzap install
# Remove the contents of /usr/ports/ and /home/_portzap/ports/
# This command requires root privileges
root@localhost# portzap rm
#### Environment
* __$PORTZAP\_CLONEURL__ <br>

View file

@ -54,10 +54,6 @@ case $1 in
require_dependency "git doas"
"${libexec}"/commands/portzap-checkout "${gitdir}" "${2}"
;;
"sh")
require_dependency "doas"
"${libexec}"/commands/portzap-sh "${gitdir}"
;;
"rm")
"${libexec}"/commands/portzap-rm "${gitdir}" "${installdir}"
;;
@ -72,7 +68,6 @@ case $1 in
printf " clone Clone the hardenedbsd ports tree\n"
printf " pull Pull updates from the hardenedbsd ports tree\n"
printf " checkout Checkout a branch other than the default\n"
printf " sh Run /bin/sh within /home/_portzap/ports/\n"
printf " rm Remove /usr/ports/ and /home/_portzap/ports/\n"
printf " install Install the ports tree into /usr/ports/\n"
;;

View file

@ -1,35 +0,0 @@
#!/bin/sh
set -e
##
# variables
localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../..)}
libexec="${localbase}"/libexec/portzap
user=_portzap
gitdir="${1}"
##
# functions
# shellcheck source=/dev/null
. "${libexec}"/functions/print.sh
##
# main
if [ "$(id -u)" = "0" ]; then
printerr "you must be a user other than root"
exit 1
fi
if [ ! -e "${gitdir}" ]; then
printerr "try 'portzap clone' instead"
exit 1
fi
if ! "${libexec}"/utils/isportzap-member; then
printerr "$(id -un) is not a member of _portzap"
fi
cd "${gitdir}"
doas -n \
-u "${user}" \
/bin/sh

View file

@ -23,42 +23,32 @@ can be installed into /usr/ports/ by root.
.br
Clone the HardenedBSD ports tree into /home/_portzap/ports/
.br
This command is delegated to the '_portzap' user and
limited to members of the '_portzap' group
This command is delegated to the '_portzap' user
.Pp
.Nm portzap pull
.br
Pull updates into /home/_portzap/ports/
.br
This command is delegated to the '_portzap' user and
limited to members of the '_portzap' group
This command is delegated to the '_portzap' user
.br
.Pp
.Nm portzap checkout
.br
Checkout a branch other than the default: hardenedbsd/main
.br
This command is delegated to the '_portzap' user and
limited to members of the '_portzap' group
.Pp
.Nm portzap sh
.br
Run /bin/sh within /home/_portzap/ports/
.br
This command is delegated to the '_portzap' user and
limited to members of the '_portzap' group
.Pp
.Nm portzap rm
.br
Remove the contents of /usr/ports/ and /home/_portzap/ports/
.br
This command requires root privileges
This command is delegated to the '_portzap' user
.Pp
.Nm portzap install
.br
Install /home/_portzap/ports/ into /usr/ports/
.br
This command requires root privileges
.Pp
.Nm portzap rm
.br
Remove the contents of /usr/ports/ and /home/_portzap/ports/
.br
This command requires root privileges
.br
.Sh ENVIRONMENT
.sp