Replace script

Remove scripts that have been replaced by alternatives

bin/portzap

@@ -13,10 +13,7 @@ revfile="${installdir}"/.portzap
 
 ##
 # functions
-printerr()
+. "${libexec}"/functions/print.sh
-{
-    "${libexec}"/utils/printerr "$1"
-}
 
 require_dependency()
 {

bin/setup-portzap

@@ -8,15 +8,7 @@ libexec="${localbase}"/libexec/portzap
 
 ##
 # functions
-printok()
+. "${libexec}"/functions/print.sh
-{
-    "${libexec}"/utils/printok "$1"
-}
-
-printerr()
-{
-    "${libexec}"/utils/printerr "$1"
-}
 
 ##
 # main

libexec/portzap/commands/portzap-checkout

@@ -5,23 +5,13 @@ set -e
 # variables
 localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../..)}
 libexec="${localbase}"/libexec/portzap
+git="${libexec}"/utils/git/run
 gitdir=$1
 branch=$2
 
 ##
 # functions
-gitexec()
+. "${libexec}"/functions/print.sh
-{
-    "${libexec}"/utils/gitexec "${1}"
-}
-
-printok() {
-    "${libexec}"/utils/printok "${1}"
-}
-
-printerr() {
-    "${libexec}"/utils/printerr "${1}"
-}
 
 ##
 # main
@@ -41,7 +31,7 @@ if [ ! -e "${gitdir}/.git" ]; then
 fi
 
 cd "${gitdir}"
-gitexec "fetch origin"
+"${git}" fetch origin
-gitexec "checkout ${branch}" ||
+"${git}" checkout "${branch}" ||
-gitexec "checkout -t origin/${branch}"
+"${git}" checkout -t origin/"${branch}"
 printok "${branch} checked out"

libexec/portzap/commands/portzap-clone

@@ -12,13 +12,7 @@ branch=$3
 
 ##
 # functions
-printok() {
+. "${libexec}"/functions/print.sh
-    "${libexec}"/utils/printok "${1}"
-}
-
-printerr() {
-    "${libexec}"/utils/printerr "${1}"
-}
 
 ##
 # main

libexec/portzap/commands/portzap-install

@@ -13,6 +13,8 @@ revfile=$3
 
 ##
 # functions
+. "${libexec}"/functions/print.sh
+
 perform_update()
 {
     rev=$(cat "${revfile}")
@@ -58,14 +60,6 @@ run_install()
     install -o root -g _portzap -m "${mode}" -v "${@}"
 }
 
-printok() {
-    "${libexec}"/utils/printok "${1}"
-}
-
-printerr() {
-    "${libexec}"/utils/printerr "${1}"
-}
-
 ##
 # main
 if [ "$(id -u)" != "0" ]; then

libexec/portzap/commands/portzap-pull

@@ -10,13 +10,7 @@ gitdir=$1
 
 ##
 # functions
-printok() {
+. "${libexec}"/functions/print.sh
-    "${libexec}"/utils/printok "${1}"
-}
-
-printerr() {
-    "${libexec}"/utils/printerr "${1}"
-}
 
 ##
 # main

libexec/portzap/commands/portzap-rm

@@ -10,6 +10,8 @@ installdir=$2
 
 ##
 # functions
+. "${libexec}"/functions/print.sh
+
 erase()
 {
     dir="${1}"
@@ -24,10 +26,6 @@ erase()
     echo
 }
 
-printerr() {
-    "${libexec}"/utils/printerr "${1}"
-}
-
 ##
 # main
 if [ "$(id -u)" != "0" ]; then

libexec/portzap/functions/print.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+printok()
+{
+    printf "ok: %s\n" "${1}" > /dev/stdout
+}
+
+printerr()
+{
+    printf "error: %s\n" "${1}" > /dev/stderr
+}

libexec/portzap/setup/setup-cron

@@ -10,15 +10,7 @@ sharedir="${localbase}"/share/portzap
 
 ##
 # functions
-printok()
+. "${libexec}"/functions/print.sh
-{
-    "${libexec}"/utils/printok "$1"
-}
-
-printerr()
-{
-    "${libexec}"/utils/printerr "$1"
-}
 
 verify_allowfile()
 {

libexec/portzap/setup/setup-doas

@@ -9,15 +9,7 @@ sharedir="${localbase}/share/portzap"
 
 ##
 # functions
-printok()
+. "${libexec}"/functions/print.sh
-{
-    "${libexec}"/utils/printok "$1"
-}
-
-printerr()
-{
-    "${libexec}"/utils/printerr "$1"
-}
 
 install_doasconf()
 {

libexec/portzap/utils/printerr

@@ -1,10 +0,0 @@
-#!/bin/sh
-set -e
-
-##
-# variables
-err="${1}"
-
-##
-# main
-printf "error: %s\n" "${err}" > /dev/stderr

libexec/portzap/utils/printok

@@ -1,10 +0,0 @@
-#!/bin/sh
-set -e
-
-##
-# variables
-msg="${1}"
-
-##
-# main
-printf "ok: %s\n" "${msg}" > /dev/stdout

share/portzap/RELNOTES

@@ -8,3 +8,6 @@ v?.?.?
 
 | Remove "set -x"
   After this change, portzap emits less output
+
+| Remove scripts
+  Remove "utils/printok", "utils/printerr", and "utils/git-rev"