cmd/installer-pc: Remove distinct command

6 files changed, 3 insertions, 219 deletions

diff --git a/NEWS b/NEWS
index 248b0d6..4d9b986 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,9 @@ Released: ????-??-??
 
 New features:
 
+  * "prokit install" is now a frontend for all installers.  The separate
+    "prokit installer-pc" command has been removed and merged into
+    "prokit install".
   * "prokit build" now passes an "-a" option, if supported, to opkg to
     install host-architecture non-coinstallable dependencies (such as
     library development packages) when cross building.
@@ -21,8 +24,6 @@ New features:
     packages marked "Essential: yes" and their dependencies were
     installed, which was a long-standing misuse of the "Essential"
     field.
-  * "prokit installer-pc" now supports foreign installations using an
-    "-F" option.
   * "prokit build" now saves logs of builds and prints detailed
     information about the build and its results.
   * "C" and "POSIX" locales have been added.  They are identical to the
diff --git a/man/local.mk b/man/local.mk
index f557941..3acf881 100644
--- a/man/local.mk
+++ b/man/local.mk
@@ -8,5 +8,4 @@ man8_sources = \
 	man/prokit-shell.8in \
 	man/prokit-opkg.8in \
 	man/prokit-build.8in \
-	man/prokit-installer-pc.8in \
 	man/prokit-mkinitramfs.8in
diff --git a/man/prokit-installer-pc.8in b/man/prokit-installer-pc.8in
deleted file mode 100644
index d1a32e2..0000000
--- a/man/prokit-installer-pc.8in
+++ /dev/null
@@ -1,55 +0,0 @@
-.TH PROKIT-INSTALLER-PC 8 \
-"2019-04-27" "@PACKAGE_NAME@ @PACKAGE_VERSION@" "@MANUAL@"
-
-.SH NAME
-prokit-installer-pc \- Install a PC system onto a block device
-
-.SH SYNOPSIS
-\fBprokit installer-pc\fP \fB-a\fP \fIarch\fP \fB-p\fP \fIplat\fP
-[\fB-m\fP \fImirror\fP] \fIsuite\fP \fIdevice\fP
-
-.SH DESCRIPTION
-\fBprokit installer-pc\fP installs a basic PC system of \fIsuite\fP onto
-\fIdevice\fP.
-.P
-\fIsuite\fP can be a distribution like \fItrunk\fP; a channel and distribution
-like \fIdev/trunk\fP; a profile and distribution like \fIproteanos:trunk\fP; or
-a profile, channel, and distribution like \fIproteanos:dev/trunk\fP.
-.P
-\fIdevice\fP must be a block device file representing a whole storage device,
-not a partition.
-
-.SH OPTIONS
-.TP
-.BI \-a \ arch
-Install packages built for the \fIarch\fP architecture.
-.TP
-.BI \-p \ plat
-Install packages built for the \fIplat\fP platform.
-.TP
-.BI \-m \ mirror
-Download packages from \fImirror\fP instead of automatically selecting one at
-random.  \fImirror\fP is a base URL like
-\fIhttp://mirror.fsf.org/proteanos\fP.
-
-.SH EXAMPLES
-
-.IP \[bu]
-# prokit installer-pc -a i686-linux-glibc -p x60 dev/trunk /dev/sdb
-
-.SH COPYRIGHT
-Copyright (C) 2014, 2015  Patrick McDermott
-.P
-The ProteanOS Development Kit is free software: you can redistribute
-it and/or modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-.P
-The ProteanOS Development Kit is distributed in the hope that it
-will be useful, but WITHOUT ANY WARRANTY; without even the implied
-warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-See the GNU General Public License for more details.
-.P
-You should have received a copy of the GNU General Public License
-along with the ProteanOS Development Kit.  If not, see
-<http://www.gnu.org/licenses/>.
diff --git a/man/prokit.1in b/man/prokit.1in
index ada64bd..df8693e 100644
--- a/man/prokit.1in
+++ b/man/prokit.1in
@@ -41,9 +41,6 @@ Manage packages with opkg
 .BR prokit-build (8)
 Build a package
 .TP
-.BR prokit-installer-pc (8)
-Install a PC system onto a block device
-.TP
 .BR prokit-mkinitramfs (8)
 Generate an initramfs containing an installed system
 
diff --git a/src/cmd/installer-pc.sh b/src/cmd/installer-pc.sh
deleted file mode 100644
index fc58331..0000000
--- a/src/cmd/installer-pc.sh
+++ /dev/null
@@ -1,157 +0,0 @@
-# "installer-pc" command
-#
-# Copyright (C) 2014, 2015  Patrick McDermott
-#
-# This file is part of the ProteanOS Development Kit.
-#
-# The ProteanOS Development Kit is free software: you can redistribute
-# it and/or modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# The ProteanOS Development Kit is distributed in the hope that it
-# will be useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with the ProteanOS Development Kit.  If not, see
-# <http://www.gnu.org/licenses/>.
-
-cmd_installer_pc_optstring='a:p:m:F'
-
-_cmd_installer_pc_log_print()
-{
-	local prefix="${1}"
-	local log="${2}"
-	shift 2
-	local line=
-
-	IFS="${LF}"
-	for line in ${log}; do
-		error '%s: %s' "${prefix}" "${line}"
-	done
-	unset IFS
-}
-
-_cmd_installer_pc_make_partition_and_fs()
-{
-	local dev="${1}"
-	shift 1
-	local log=
-
-	info "$(get_msg 'cmd_installer_pc_dd')"
-	if ! log="$(dd if=/dev/zero of="${dev}" bs=512 count=1 2>&1)"; then
-		error "$(get_msg 'cmd_installer_pc_dd_fail')"
-		_cmd_installer_pc_log_print 'dd' "${log}"
-		return 1
-	fi
-
-	info "$(get_msg 'cmd_installer_pc_fdisk')"
-	if ${HAVE_SFDISK}; then
-		if ! log="$(printf ',,83,*\n' | ${SFDISK} -- "${dev}" 2>&1)"
-		then
-			error "$(get_msg 'cmd_installer_pc_fdisk_fail')"
-			_cmd_installer_pc_log_print 'sfdisk' "${log}"
-			return 1
-		fi
-	elif ${HAVE_FDISK}; then
-		if ! log="$(printf 'n\np\n1\n\n\nt\n83\na\n1\nw\n' |
-				${FDISK} -- "${dev}" 2>&1)"; then
-			error "$(get_msg 'cmd_installer_pc_fdisk_fail')"
-			_cmd_installer_pc_log_print 'fdisk' "${log}"
-			return 1
-		fi
-	fi
-
-	info "$(get_msg 'cmd_installer_pc_mkfs')"
-	if ! log="$(${MKE2FS} -t ext4 -- "${dev}1" 2>&1)"; then
-		error "$(get_msg 'cmd_installer_pc_mkfs_fail')"
-		_cmd_installer_pc_log_print 'mke2fs' "${log}"
-		return 1
-	fi
-
-	return 0
-}
-
-cmd_installer_pc_main()
-{
-	local foreign=
-	local suite=
-	local dev=
-	local profile=
-	local root=
-	local b4=
-	local b3=
-	local b2=
-	local b1=
-
-	if ! get_options "${@}"; then
-		print_cmd_usage 'installer-pc' >&2
-		return 1
-	fi
-	shift $((${OPTIND} - 1))
-
-	if [ "x${cmd_installer_pc_opt_a-}" = 'x' ]; then
-		print_cmd_usage 'installer-pc' >&2
-		return 1
-	fi
-	if [ "x${cmd_installer_pc_opt_p-}" = 'x' ]; then
-		print_cmd_usage 'installer-pc' >&2
-		return 1
-	fi
-	if [ ${#} -ne 2 ]; then
-		print_cmd_usage 'installer-pc' >&2
-		return 1
-	fi
-
-	if [ "x${cmd_installer_pc_opt_F+set}" = 'xset' ]; then
-		foreign=true
-	else
-		foreign=false
-	fi
-
-	suite="${1}"
-	dev="${2}"
-	shift 2
-
-	if ! check_block "${dev}"; then
-		return 2
-	fi
-
-	if [ "x${suite%%:*}" != "x${suite}" ]; then
-		profile="${suite%%:*}"
-		suite="${suite#*:}"
-	else
-		profile='proteanos'
-	fi
-	if ! profile_set "${profile}"; then
-		return 2
-	fi
-	suite="$(profile_normalize_suite "${suite}")"
-
-	if ! _cmd_installer_pc_make_partition_and_fs "${dev}"; then
-		return 2
-	fi
-	if ! root="$(block_mount "${dev}1")"; then
-		return 2
-	fi
-
-	if ! install_system "${cmd_installer_pc_opt_m-}" "${suite}" \
-			"${cmd_installer_pc_opt_a-}" \
-			"${cmd_installer_pc_opt_p-}" \
-			"${root}" "${foreign}"; then
-		block_umount "${root}"
-		return 2
-	fi
-
-	block_umount "${root}"
-
-	return 0
-}
-
-cmd_installer_pc_register()
-{
-	register_cmd 'installer-pc'
-}
-__init cmd_installer_pc_register
diff --git a/src/cmd/local.mk b/src/cmd/local.mk
index 700e5ee..a925de2 100644
--- a/src/cmd/local.mk
+++ b/src/cmd/local.mk
@@ -5,5 +5,4 @@ prokit_SOURCES += \
 	src/cmd/shell.sh \
 	src/cmd/opkg.sh \
 	src/cmd/build.sh \
-	src/cmd/installer-pc.sh \
 	src/cmd/mkinitramfs.sh