From 8271994c6cb66f4fb6ef672af2d325891afcae53 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pj@pehjota.net>
Date: Sun, 24 May 2015 15:37:22 -0400
Subject: lib/install.sh: Rename message strings

---
diff --git a/lib/install.sh b/lib/install.sh
index 5e6d4aa..0f11573 100644
--- a/lib/install.sh
+++ b/lib/install.sh
@@ -48,32 +48,32 @@ install_system()
 		plat="$(profile_default_plat)"
 	fi
 	if ! profile_validate_archplat "${arch}" "${plat}"; then
-		error 2 "$(get_msg 'cmd_install_bad_archplat')" \
+		error 2 "$(get_msg 'install_bad_archplat')" \
 			"${arch}" "${plat}"
 	fi
-	info "$(get_msg 'cmd_install_selected_arch')" "${arch}"
-	info "$(get_msg 'cmd_install_selected_plat')" "${plat}"
+	info "$(get_msg 'install_selected_arch')" "${arch}"
+	info "$(get_msg 'install_selected_plat')" "${plat}"
 
 	if [ "x${mirror}" = 'x' ]; then
 		mirror="$(profile_select_mirror)"
 	fi
-	info "$(get_msg 'cmd_install_selected_mirror')" "${mirror}"
+	info "$(get_msg 'install_selected_mirror')" "${mirror}"
 
-	info "$(get_msg 'cmd_install_setting_up_chroot')"
+	info "$(get_msg 'install_setting_up_chroot')"
 	if [ -d "${chroot}" ] && ! dir_is_empty "${chroot}" 'lost+found'; then
-		error 2 "$(get_msg 'cmd_install_chroot_dir_exists')" "${chroot}"
+		error 2 "$(get_msg 'install_chroot_dir_exists')" "${chroot}"
 	fi
 	if ! mkdir -p "${chroot}/.prokit" "${chroot}/prokit"; then
-		error 2 "$(get_msg 'cmd_install_mkdir_chroot_fail')" "${chroot}"
+		error 2 "$(get_msg 'install_mkdir_chroot_fail')" "${chroot}"
 	fi
 	>"${chroot}/prokit/installing"
 
-	info "$(get_msg 'cmd_install_find_pkgs')"
+	info "$(get_msg 'install_find_pkgs')"
 	install_find_pkgs "${mirror}" "${suite}" "${arch}" "${plat}" \
 		"${chroot}"
 	install_get_pkgs "${chroot}"
 
-	info "$(get_msg 'cmd_install_configuring')"
+	info "$(get_msg 'install_configuring')"
 	if ! ${foreign}; then
 		profile_configure_system_native "${chroot}" "${arch}" "${plat}"
 	else
@@ -195,7 +195,7 @@ install_get_pkgs()
 	status_fd=${FD}
 
 	for pkg in $(cat "${chroot}/.prokit/packages"); do
-		info "$(get_msg 'cmd_install_downloading_pkg')" "${pkg}"
+		info "$(get_msg 'install_downloading_pkg')" "${pkg}"
 		fname="$(printf '%s\n' "${install_fnames}" | \
 			sed -n "s/^${pkg} //p")"
 		md5sum="$(printf '%s\n' "${install_md5sums}" | \
@@ -204,22 +204,22 @@ install_get_pkgs()
 			sed -n "s/^${pkg} //p")"
 		wget -q -O "${chroot}/var/cache/opkg/archives/${fname##*/}" \
 			"${fname}" || \
-			error 2 "$(get_msg 'cmd_install_downloading_pkg_fail')"
+			error 2 "$(get_msg 'install_downloading_pkg_fail')"
 		fname="var/cache/opkg/archives/${fname##*/}"
 		if [ "x${md5sum}" != 'x' ]; then
 			printf '%s  %s\n' \
 				"${md5sum}" "${chroot}/${fname}" | \
 				md5sum -c >/dev/null 2>&1 || \
-				error 2 "$(get_msg 'cmd_install_checksum_fail')"
+				error 2 "$(get_msg 'install_checksum_fail')"
 		fi
 		if [ "x${sha256sum}" != 'x' ]; then
 			printf '%s  %s\n' \
 				"${sha256sum}" "${chroot}/${fname}" | \
 				sha256sum -c >/dev/null 2>&1 || \
-				error 2 "$(get_msg 'cmd_install_checksum_fail')"
+				error 2 "$(get_msg 'install_checksum_fail')"
 		fi
 
-		info "$(get_msg 'cmd_install_unpacking_pkg')" "${pkg}"
+		info "$(get_msg 'install_unpacking_pkg')" "${pkg}"
 		mkdir "${chroot}/tmp/opkg/${pkg}"
 		(
 			cd "${chroot}"
--
cgit v0.9.1