 @@ -1,89 +1,81 @@
-# $NetBSD: Makefile,v 1.1 2012/08/06 17:06:17 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2012/08/15 21:21:15 jmmv Exp $
-DISTNAME=	sysupgrade-1.0
+DISTNAME=	sysupgrade-1.1
 CATEGORIES=	sysutils
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 MAINTAINER=	jmmv@NetBSD.org
 COMMENT=	Automate upgrades of NetBSD
 LICENSE=	modified-bsd
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 WRKSRC=			${WRKDIR}
 NO_CONFIGURE=		YES
-UPGRADE_SUBST+=		-e 's,@SYSUPGRADE_CACHEDIR@,${CACHEDIR},g'
+BUILD_SUBST+=		-e 's,@SYSUPGRADE_CACHEDIR@,${CACHEDIR},g'
-UPGRADE_SUBST+=		-e 's,@SYSUPGRADE_ETCDIR@,${PKG_SYSCONFDIR},g'
+BUILD_SUBST+=		-e 's,@SYSUPGRADE_ETCDIR@,${PKG_SYSCONFDIR},g'
 BUILD_DEFS+=		VARBASE
 CACHEDIR=		${VARBASE}/cache/sysupgrade
 OWN_DIRS=		${CACHEDIR} root wheel
 EGDIR=			${PREFIX}/share/examples/sysupgrade
 CONF_FILES+=		${EGDIR}/default.conf ${PKG_SYSCONFDIR}/sysupgrade.conf
 PKG_OPTIONS_VAR=	PKG_OPTIONS.sysupgrade
 PKG_SUPPORTED_OPTIONS=	tests
 PKG_SUGGESTED_OPTIONS=	tests
 .include "../../mk/bsd.options.mk"
 .if $(PKG_OPTIONS:Mtests)
 TEST_PROGS=	config_test sysupgrade_test utils_test
 PLIST_SUBST+=	TESTS=
 .  include "../../devel/atf-libs/buildlink3.mk"
 BUILD_SUBST+=		-e 's,@ATF_SH@,${BUILDLINK_PREFIX.atf-libs}/bin/atf-sh,g'
 do-build: build-tests
 build-tests:
 	cp ${FILESDIR}/Kyuafile ${WRKSRC}
-.for file in ${TEST_PROGS}
+	sed ${BUILD_SUBST} ${FILESDIR}/sysupgrade_test.sh \
-	${ECHO} '#! ${BUILDLINK_PREFIX.atf-libs}/bin/atf-sh' \
+	    >${WRKSRC}/sysupgrade_test
-	    >${WRKSRC}/${file}
+	chmod +x ${WRKSRC}/sysupgrade_test
 	${CAT} ${FILESDIR}/*.subr ${FILESDIR}/${file}.sh \
 	    | ${SED} ${UPGRADE_SUBST} >>${WRKSRC}/${file}
 	${CHMOD} +x ${WRKSRC}/${file}
 .endfor
 INSTALLATION_DIRS+=	tests/sysupgrade
 do-install: install-tests
 install-tests:
 	${INSTALL_DATA} ${WRKSRC}/Kyuafile ${DESTDIR}${PREFIX}/tests/sysupgrade
-.for file in ${TEST_PROGS}
+	${INSTALL_SCRIPT} ${WRKSRC}/sysupgrade_test \
 	${INSTALL_SCRIPT} ${WRKSRC}/${file} \
 	    ${DESTDIR}${PREFIX}/tests/sysupgrade/
 .endfor
 do-test:
 	cd ${WRKSRC} && PATH="${WRKSRC}:${PATH}" kyua test
 .else
 PLIST_SUBST+=	TESTS=@comment
 .endif
 do-build:
-	${ECHO} '#! ${SH}' >${WRKSRC}/sysupgrade
+	sed ${BUILD_SUBST} ${FILESDIR}/sysupgrade.sh \
-	${ECHO} 'set -e' >>${WRKSRC}/sysupgrade
+	    | ${BUILDLINK_PREFIX.shtk}/bin/shtk build \
-	${CAT} ${FILESDIR}/*.subr ${FILESDIR}/sysupgrade.sh \
+	    -s ${SH} -m sysupgrade_main -o ${WRKSRC}/sysupgrade -
 	    | ${SED} ${UPGRADE_SUBST} >>${WRKSRC}/sysupgrade
 	${ECHO} 'sysupgrade_main "$${@}"' >>${WRKSRC}/sysupgrade
 	${CHMOD} +x ${WRKSRC}/sysupgrade
 .for file in sysupgrade.8 sysupgrade.conf.5 default.conf
-	sed ${UPGRADE_SUBST} <${FILESDIR}/${file} >${WRKSRC}/${file}
+	sed ${BUILD_SUBST} <${FILESDIR}/${file} >${WRKSRC}/${file}
 .endfor
 INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 \
 			share/examples/sysupgrade
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/sysupgrade ${DESTDIR}${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKSRC}/sysupgrade.8 \
 	    ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/
 	${INSTALL_MAN} ${WRKSRC}/sysupgrade.conf.5 \
 	    ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/
 	${INSTALL_DATA} ${WRKSRC}/default.conf ${DESTDIR}${EGDIR}
 .include "../../devel/shtk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -19,26 +19,31 @@
 # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 # \file sysupgrade.sh
 # Entry point and main program logic.
 shtk_import cli
 shtk_import config
 shtk_import list
 shtk_import process
 # List of valid configuration variables.
+#
 # Please remember to update sysbuild(1) if you change this list.
 SYSUPGRADE_CONFIG_VARS="AUTOCLEAN CACHEDIR DESTDIR ETCUPDATE KERNEL
                         POSTINSTALL_AUTOFIX RELEASEDIR SETS"
 # Directory in which to keep downloaded release files.
+#
 # Can be overriden for test purposes only.
 : ${SYSUPGRADE_CACHEDIR:="@SYSUPGRADE_CACHEDIR@"}
 @@ -46,414 +51,414 @@ SYSUPGRADE_CONFIG_VARS="AUTOCLEAN CACHED
 # Paths to installed files.
+#
 # Can be overriden for test purposes only.
 : ${SYSUPGRADE_ETCDIR:="@SYSUPGRADE_ETCDIR@"}
 # Sets defaults for configuration variables that need a value.
+#
 # This function should be called before the configuration file has been loaded.
 # This means that the user can undefine a required configuration variable, but
 # we let him shoot himself in the foot if he so desires.
 sysupgrade_set_defaults() {
     # Please remember to update sysupgrade(8) if you change any default values.
-    config_set AUTOCLEAN "yes"
+    shtk_config_set AUTOCLEAN "yes"
-    config_set CACHEDIR "${SYSUPGRADE_CACHEDIR}"
+    shtk_config_set CACHEDIR "${SYSUPGRADE_CACHEDIR}"
-    config_set ETCUPDATE "yes"
+    shtk_config_set ETCUPDATE "yes"
-    config_set KERNEL "AUTO"
+    shtk_config_set KERNEL "AUTO"
-    config_set SETS "AUTO"
+    shtk_config_set SETS "AUTO"
+}
 # Interprets magic configuration values.
+#
 # This function should be called after the configuration file has been loaded.
 # It takes care of performing any required post-processing on the configuration
 # variables, such as expanding the magic AUTO keyword to the actual value.
 sysupgrade_auto_config() {
-    if [ "$(config_get_default KERNEL "")" = "AUTO" ]; then
+    if [ "$(shtk_config_get_default KERNEL "")" = "AUTO" ]; then
-        local kernel="$(config_get_default DESTDIR "")/netbsd"
+        local kernel="$(shtk_config_get_default DESTDIR "")/netbsd"
         if [ -e "${kernel}" ]; then
             local kernel_name="$(config -x "${kernel}" | head -n 1 \
                                  | cut -d \" -f 2)"
-            [ -n "${kernel_name}" ] || utils_error "Failed to determine" \
+            [ -n "${kernel_name}" ] || shtk_cli_error "Failed to determine" \
                 "kernel name; please set KERNEL explicitly"
-            config_set KERNEL "${kernel_name}"
+            shtk_config_set KERNEL "${kernel_name}"
         else
-            config_unset KERNEL
+            shtk_config_unset KERNEL
         fi
     fi
-    if [ "$(config_get_default SETS "")" = "AUTO" ]; then
+    if [ "$(shtk_config_get_default SETS "")" = "AUTO" ]; then
-        local mtree="$(config_get_default DESTDIR "")/etc/mtree/"
+        local mtree="$(shtk_config_get_default DESTDIR "")/etc/mtree/"
         if [ -d "${mtree}" ]; then
             local all_sets="$(cd "${mtree}" && echo set.* \
                               | sed -e 's,set\.,,g')"
-            config_set SETS "${all_sets}"
+            shtk_config_set SETS "${all_sets}"
         else
-            config_unset SETS
+            shtk_config_unset SETS
         fi
     fi
+}
 # Dumps the loaded configuration.
+#
 # \params ... The options and arguments to the command.
 sysupgrade_config() {
     local eval_auto=no
     while getopts ':a' arg "${@}"; do
         case "${arg}" in
             a)  # Evaluate automatic settings.
                 eval_auto=yes
                 ;;
             \?)
-                utils_usage_error "Unknown option -${OPTARG}"
+                shtk_cli_usage_error "Unknown option -${OPTARG}"
                 ;;
         esac
     done
     shift $((${OPTIND} - 1))
-    [ ${#} -eq 0 ] || utils_usage_error "config does not take any arguments"
+    [ ${#} -eq 0 ] || shtk_cli_usage_error "config does not take any arguments"
     [ "${eval_auto}" = no ] || sysupgrade_auto_config
     for var in ${SYSUPGRADE_CONFIG_VARS}; do
-        if config_has "${var}"; then
+        if shtk_config_has "${var}"; then
-            echo "${var} = $(config_get "${var}")"
+            echo "${var} = $(shtk_config_get "${var}")"
         else
             echo "${var} is undefined"
         fi
     done
+}
 # Gets the path to a set, and ensures it exists.
+#
 # \post The path to the tgz of the set is printed on stdout.
+#
 # \param set_name The name of the set to query.
 get_set() {
     local set_name="${1}"; shift
-    echo "$(config_get CACHEDIR)/${set_name}.tgz"
+    echo "$(shtk_config_get CACHEDIR)/${set_name}.tgz"
+}
 # Ensures that a given set exists.
+#
 # \param set_name The name of the set to query.
 require_set() {
     local set_name="${1}"; shift
     local set_tgz="$(get_set "${set_name}")"
-    [ -f "${set_tgz}" ] || utils_error "Cannot find ${set_name}; did you run" \
+    [ -f "${set_tgz}" ] || shtk_cli_error "Cannot find ${set_name}; did you run" \
-        "'${Utils_ProgName} fetch' first?"
+        "'$(shtk_cli_progname) fetch' first?"
+}
 # Extracts a set into the destdir.
+#
 # The set to be extracted must have been previously fetched into the cache
 # directory by sysupgrade_fetch command.
+#
 # \param set_name Name of the set to extract, without the .tgz extension.
 extract_set() {
     local set_name="${1}"; shift
     require_set "${set_name}"
-    local destdir="$(config_get_default DESTDIR "")"
+    local destdir="$(shtk_config_get_default DESTDIR "")"
     local set_tgz="$(get_set "${set_name}")"
-    utils_info "Extracting ${set_name} into ${destdir}/"
+    shtk_cli_info "Extracting ${set_name} into ${destdir}/"
-    [ -z "${destdir}" ] || utils_run mkdir -p "${destdir}"
+    [ -z "${destdir}" ] || shtk_process_run mkdir -p "${destdir}"
     progress -zf "${set_tgz}" tar -xp -C "${destdir}/" -f -
+}
 # Fetches the release sets into the cache directory.
+#
 # \param releasedir Optional override of the release directory to use.
 sysupgrade_fetch() {
     [ ${#} -lt 2 ] \
-        || utils_usage_error "fetch takes zero or one arguments"
+        || shtk_cli_usage_error "fetch takes zero or one arguments"
-    [ -z "${1}" ] || config_set "RELEASEDIR" "${1}"
+    [ -z "${1}" ] || shtk_config_set "RELEASEDIR" "${1}"
-    local releasedir="$(config_get RELEASEDIR)"
+    local releasedir="$(shtk_config_get RELEASEDIR)"
-    local cachedir="$(config_get CACHEDIR)"
+    local cachedir="$(shtk_config_get CACHEDIR)"
-    local fetch_sets="$(config_get SETS)"
+    local fetch_sets="$(shtk_config_get SETS)"
-    if config_has KERNEL; then
+    if shtk_config_has KERNEL; then
-        fetch_sets="${fetch_sets} kern-$(config_get KERNEL)"
+        fetch_sets="${fetch_sets} kern-$(shtk_config_get KERNEL)"
     fi
     case "${releasedir}" in
         ftp://*|http://*)
             mkdir -p "${cachedir}"
             for set_name in ${fetch_sets}; do
                 local file="${cachedir}/${set_name}.tgz"
                 if [ -f "${file}" ]; then
-                    utils_warning "Reusing existing ${file}"
+                    shtk_cli_warning "Reusing existing ${file}"
                 else
                     local url="${releasedir}/binary/sets/${set_name}.tgz"
-                    utils_info "Downloading ${url} into ${cachedir}"
+                    shtk_cli_info "Downloading ${url} into ${cachedir}"
                     rm -f "${file}"
                     ftp -R -o"${file}.tmp" "${url}" \
-                        || utils_error "Failed to fetch ${url}"
+                        || shtk_cli_error "Failed to fetch ${url}"
                     mv "${file}.tmp" "${file}"
                 fi
             done
             ;;
         /*)
             mkdir -p "${cachedir}"
             for set_name in ${fetch_sets}; do
                 local src="${releasedir}/binary/sets/${set_name}.tgz"
-                utils_info "Linking local ${src} into ${cachedir}"
+                shtk_cli_info "Linking local ${src} into ${cachedir}"
-                [ -f "${src}" ] || utils_error "Cannot open ${src}"
+                [ -f "${src}" ] || shtk_cli_error "Cannot open ${src}"
                 ln -s -f "${src}" "${cachedir}/${set_name}.tgz" \
-                    || utils_error "Failed to link ${src} into ${cachedir}"
+                    || shtk_cli_error "Failed to link ${src} into ${cachedir}"
             done
             ;;
         *)
-            utils_error "Don't know how to fetch from ${releasedir}; must" \
+            shtk_cli_error "Don't know how to fetch from ${releasedir}; must" \
                 "be an absolute path or an FTP/HTTP site"
             ;;
     esac
+}
 # Installs a new kernel from a set.
+#
 # \param kernel_name Name of the kernel set to use; optional.
 sysupgrade_kernel() {
     [ ${#} -lt 2 ] \
-        || utils_usage_error "kernel takes zero or one arguments"
+        || shtk_cli_usage_error "kernel takes zero or one arguments"
     local kernel_name
     if [ -n "${1}" ]; then
         kernel_name="${1}"
-    elif config_has KERNEL; then
+    elif shtk_config_has KERNEL; then
-        kernel_name="$(config_get KERNEL)"
+        kernel_name="$(shtk_config_get KERNEL)"
     else
-        utils_info "Skipping kernel installation (KERNEL not set)"
+        shtk_cli_info "Skipping kernel installation (KERNEL not set)"
         return 0
     fi
     require_set "kern-${kernel_name}"
-    local destdir="$(config_get_default DESTDIR "")"
+    local destdir="$(shtk_config_get_default DESTDIR "")"
-    utils_info "Upgrading kernel using ${kernel_name} in ${destdir}/"
+    shtk_cli_info "Upgrading kernel using ${kernel_name} in ${destdir}/"
     if [ -f "${destdir}/netbsd" ]; then
-        utils_info "Backing up 'netbsd' kernel as 'onetbsd'"
+        shtk_cli_info "Backing up 'netbsd' kernel as 'onetbsd'"
         cp "${destdir}/netbsd" "${destdir}/onetbsd"
     fi
     extract_set "kern-${kernel_name}"
+}
 # Installs new kernel modules.
 sysupgrade_modules() {
     [ ${#} -eq 0 ] \
-        || utils_usage_error "modules does not take any arguments"
+        || shtk_cli_usage_error "modules does not take any arguments"
-    if ! utils_contains modules $(config_get SETS); then
+    if ! shtk_list_contains modules $(shtk_config_get SETS); then
-        utils_info "Skipping modules installation (modules not in SETS)"
+        shtk_cli_info "Skipping modules installation (modules not in SETS)"
         return 0
     fi
-    utils_info "Upgrading kernel modules"
+    shtk_cli_info "Upgrading kernel modules"
     extract_set modules
+}
 # Installs new sets.
+#
 # \param ... Names of the sets to extract, to override SETS.
 sysupgrade_sets() {
-    utils_info "Upgrading base system"
+    shtk_cli_info "Upgrading base system"
     local sets=
-    for set_name in "${@:-$(config_get SETS)}"; do
+    for set_name in "${@:-$(shtk_config_get SETS)}"; do
         case "${set_name}" in
             *etc) ;;  # Handled by etcupdate.
             kern-*) ;;  # Handled by kernel.
             modules) ;;  # Handled by modules.
             *) sets="${sets} ${set_name}" ;;
         esac
     done
     for set_name in ${sets}; do
         require_set "${set_name}"
     done
     for set_name in ${sets}; do
         extract_set "${set_name}"
     done
+}
 # Runs etcupdate to install new configuration files.
 sysupgrade_etcupdate() {
-    [ ${#} -eq 0 ] || utils_usage_error "etcupdate does not take any arguments"
+    [ ${#} -eq 0 ] || shtk_cli_usage_error "etcupdate does not take any arguments"
-    if config_has DESTDIR; then
+    if shtk_config_has DESTDIR; then
-        utils_info "Skipping etcupdate (DESTDIR upgrades not supported)"
+        shtk_cli_info "Skipping etcupdate (DESTDIR upgrades not supported)"
         return 0
     fi
-    local sets="$(utils_filter '*etc' $(config_get SETS))"
+    local sets="$(shtk_list_filter '*etc' $(shtk_config_get SETS))"
     if [ -z "${sets}" ]; then
-        utils_info "Skipping etcupdate (no etc sets in SETS)"
+        shtk_cli_info "Skipping etcupdate (no etc sets in SETS)"
         return 0
     fi
-    if ! utils_contains etc ${sets}; then
+    if ! shtk_list_contains etc ${sets}; then
-        utils_info "Skipping etcupdate (required etc not in SETS)"
+        shtk_cli_info "Skipping etcupdate (required etc not in SETS)"
         return 0
     fi
     local sflags=
     for set_name in ${sets}; do
         require_set "${set_name}"
         sflags="${sflags} -s$(get_set "${set_name}")"
     done
-    utils_info "Upgrading /etc interactively"
+    shtk_cli_info "Upgrading /etc interactively"
     etcupdate -a -l ${sflags}
+}
 # Runs postinstall to validate the updated system.
+#
 # \param ... Arguments to pass to postinstall(8).
 sysupgrade_postinstall() {
     local sets=
-    local sets="$(utils_filter '*etc' $(config_get SETS))"
+    local sets="$(shtk_list_filter '*etc' $(shtk_config_get SETS))"
     if [ -z "${sets}" ]; then
-        utils_info "Skipping postinstall (no etc sets in SETS)"
+        shtk_cli_info "Skipping postinstall (no etc sets in SETS)"
         return 0
     fi
-    if ! utils_contains etc ${sets}; then
+    if ! shtk_list_contains etc ${sets}; then
-        utils_info "Skipping postinstall (required etc not in SETS)"
+        shtk_cli_info "Skipping postinstall (required etc not in SETS)"
         return 0
     fi
     local sflags=
     for set_name in ${sets}; do
         require_set "${set_name}"
         sflags="${sflags} -s$(get_set "${set_name}")"
     done
-    utils_info "Performing postinstall checks"
+    shtk_cli_info "Performing postinstall checks"
-    local destdir="$(config_get_default DESTDIR "")"
+    local destdir="$(shtk_config_get_default DESTDIR "")"
-    if config_has POSTINSTALL_AUTOFIX; then
+    if shtk_config_has POSTINSTALL_AUTOFIX; then
         postinstall "-d${destdir}/" ${sflags} fix \
-            $(config_get POSTINSTALL_AUTOFIX)
+            $(shtk_config_get POSTINSTALL_AUTOFIX)
     fi
     postinstall "-d${destdir}/" ${sflags} "${@:-check}" \
-        || utils_error "Some postinstall(8) checks have failed"
+        || shtk_cli_error "Some postinstall(8) checks have failed"
+}
 # Cleans up the cache directory.
 sysupgrade_clean() {
-    [ ${#} -eq 0 ] || utils_usage_error "clean does not take any arguments"
+    [ ${#} -eq 0 ] || shtk_cli_usage_error "clean does not take any arguments"
-    utils_info "Cleaning downloaded files"
+    shtk_cli_info "Cleaning downloaded files"
-    rm -f "$(config_get CACHEDIR)"/*.tgz*
+    rm -f "$(shtk_config_get CACHEDIR)"/*.tgz*
+}
 # Automated upgrade procedure.
+#
 # This is just a convenience mechanism to execute all the different steps of the
 # upgrade.
+#
 # \param releasedir Optional override of the release directory to use.
 sysupgrade_auto() {
     [ ${#} -lt 2 ] \
-        || utils_usage_error "auto takes zero or one arguments"
+        || shtk_cli_usage_error "auto takes zero or one arguments"
-    [ -z "${1}" ] || config_set "RELEASEDIR" "${1}"
+    [ -z "${1}" ] || shtk_config_set "RELEASEDIR" "${1}"
     local stages=
     stages="fetch modules kernel sets"
-    config_get_bool "ETCUPDATE" && stages="${stages} etcupdate"
+    shtk_config_get_bool "ETCUPDATE" && stages="${stages} etcupdate"
     stages="${stages} postinstall"
-    config_get_bool "AUTOCLEAN" && stages="${stages} clean"
+    shtk_config_get_bool "AUTOCLEAN" && stages="${stages} clean"
-    utils_info "Starting auto-update with stages: ${stages}"
+    shtk_cli_info "Starting auto-update with stages: ${stages}"
     for stage in ${stages}; do
         sysupgrade_${stage}
     done
-    config_get_bool "AUTOCLEAN" || utils_info "Distribution sets not deleted;" \
+    shtk_config_get_bool "AUTOCLEAN" || shtk_cli_info "Distribution sets not deleted;" \
-        "further ${Utils_ProgName} commands will reuse them"
+        "further $(shtk_cli_progname) commands will reuse them"
+}
 # Entry point to the program.
+#
 # \param ... Command-line arguments to be processed.
+#
 # \return An exit code to be returned to the user.
 sysupgrade_main() {
     local config_file="${SYSUPGRADE_ETCDIR}/sysupgrade.conf"
-    config_init ${SYSUPGRADE_CONFIG_VARS}
+    shtk_config_init ${SYSUPGRADE_CONFIG_VARS}
     while getopts ':c:d:o:' arg "${@}"; do
         case "${arg}" in
             c)  # Path to the configuration file.
                 config_file="${OPTARG}"
                 ;;
             d)  # Path to the destdir.
-                config_set DESTDIR "${OPTARG}"
+                shtk_config_set DESTDIR "${OPTARG}"
                 ;;
             o)  # Override for a particular configuration variable.
-                config_override "${OPTARG}"
+                shtk_config_override "${OPTARG}"
                 ;;
             \?)
-                utils_usage_error "Unknown option -${OPTARG}"
+                shtk_cli_usage_error "Unknown option -${OPTARG}"
                 ;;
         esac
     done
     shift $((${OPTIND} - 1))
-    [ ${#} -ge 1 ] || utils_usage_error "No command specified"
+    [ ${#} -ge 1 ] || shtk_cli_usage_error "No command specified"
     local exit_code=0
     local command="${1}"; shift
     case "${command}" in
         auto|clean|etcupdate|fetch|kernel|modules|sets|postinstall)
             sysupgrade_set_defaults
-            config_load "${config_file}"
+            shtk_config_load "${config_file}"
             sysupgrade_auto_config
             "sysupgrade_$(echo "${command}" | tr - _)" "${@}" \
                 || exit_code="${?}"
             ;;
         config)
             sysupgrade_set_defaults
-            config_load "${config_file}"
+            shtk_config_load "${config_file}"
             "sysupgrade_$(echo "${command}" | tr - _)" "${@}" \
                 || exit_code="${?}"
             ;;
         *)
-            utils_usage_error "Unknown command ${command}"
+            shtk_cli_usage_error "Unknown command ${command}"
             ;;
     esac
     return "${exit_code}"
+}

 @@ -1,9 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2012/08/06 17:06:17 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/08/15 21:21:15 jmmv Exp $
 bin/sysupgrade
 man/man5/sysupgrade.conf.5
 man/man8/sysupgrade.8
 share/examples/sysupgrade/default.conf
 ${TESTS}tests/sysupgrade/Kyuafile
 ${TESTS}tests/sysupgrade/config_test
 ${TESTS}tests/sysupgrade/sysupgrade_test
 ${TESTS}tests/sysupgrade/utils_test

 @@ -1,13 +1,16 @@
 Things that sysupgrade could do
 ===============================
 - Deduce the current NetBSD release from /etc/release and the target
   release from etc.tgz and inform the user about the changes.  This will be
   necessary if the upgrade process needs to apply specific tweaks depending
   on the affected NetBSD releases (which is not the case at the moment).
 - Ability to automatically deduce the next upgrade target from a collection
   of directories (e.g. from FTP).  We should be able to tell sysupgrade to
   follow along 6.0.x, or 6.x, or the daily builds and get it to pick the
   most recent available build.  Having to manually scan FTP directories to
   select the correct build is... inconvenient.
 - Ensure that the fetched sets belong to the current architecture.  I have
   bitten once by mistakenly pointing my custom update scripts to the wrong
 @@ -18,13 +21,24 @@
   command should unconditionally download the checksums every time it is
   run and then deduce whether it needs to redownload (possibly-newer) sets
   or do nothing.
 - Add destdir support to etcupdate(8) and allow the 'etcupdate' command to
   run when destdir is enabled.
 - Maybe sysupgrade should be more interactive by default, letting the user
   know what exactly is going to happen before doing so (e.g. what will be
   the new version, where things are being downloaded from, etc.), and
   providing a "quiet mode" flag instead.  etcupdate is interactive anyway,
   so adding more interactive steps (as long as they can be disabled) does
   not seem a big deal.
 Things that sysupgrade will NOT do
 ==================================
 - Non-trivial rollbacks.  If rollbacks are ever implemented, they should
   be in the form of file system snapshots OR in the form of syspkgs.
   Getting sysupgrade to magically store files aside to allow a later
   rollback is just too fragile and hard to get right: rollbacks will
   rarely will be necessary, but when they are it's very likely that a
   tool like this is broken.

 @@ -1,7 +1,5 @@
 syntax("kyuafile", 1)
 test_suite("sysupgrade")
 atf_test_program{name="config_test"}
 atf_test_program{name="sysupgrade_test"}
 atf_test_program{name="utils_test"}

 @@ -1,13 +1,14 @@
 #! @ATF_SH@
 # Copyright 2012 Google Inc.
 # All rights reserved.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
+#
 # * Redistributions of source code must retain the above copyright
 #   notice, this list of conditions and the following disclaimer.
 # * Redistributions in binary form must reproduce the above copyright
 #   notice, this list of conditions and the following disclaimer in the
 #   documentation and/or other materials provided with the distribution.
 # * Neither the name of Google Inc. nor the names of its contributors